From 93277a685b3bedd2a46c908e5690cf74c647a4f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 6 Nov 2016 09:52:18 +0000 Subject: drop kupertino and elementary icons, adjust steam and calamares patches --- app-emulation/steam/files/kogaion-steam | 49 --------------- app-emulation/steam/files/kogaion-steam.patch | 86 --------------------------- app-emulation/steam/files/redcore-steam | 49 +++++++++++++++ app-emulation/steam/files/redcore-steam.patch | 86 +++++++++++++++++++++++++++ app-emulation/steam/steam-1.0.0.45-r7.ebuild | 4 +- 5 files changed, 137 insertions(+), 137 deletions(-) delete mode 100755 app-emulation/steam/files/kogaion-steam delete mode 100644 app-emulation/steam/files/kogaion-steam.patch create mode 100755 app-emulation/steam/files/redcore-steam create mode 100644 app-emulation/steam/files/redcore-steam.patch (limited to 'app-emulation') diff --git a/app-emulation/steam/files/kogaion-steam b/app-emulation/steam/files/kogaion-steam deleted file mode 100755 index f83f5115..00000000 --- a/app-emulation/steam/files/kogaion-steam +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash - -# steam-runtime is a mess with old libraries from Ubuntu 12.04 -# so native drivers compiled on anything newer may not load -# if we remove some bundled libs, like gcclibs, native drivers -# will be able to load, because system libs will be used instead -# -# but we have to do this everytime when we launch steam, because -# steam-runtime is being fixed right away by steam client - - -remove_some_bundled_libs () { - # force steam to use some system libraries - find /home/$USER/.local/share/Steam -name 'libxcb*' -type f | grep -v installed | xargs rm -rf - find /home/$USER/.local/share/Steam -name 'libstdc++.so.6*' -type f | grep -v installed | xargs rm -rf - find /home/$USER/.local/share/Steam -name 'libgcc_s*' -type f | grep -v installed | xargs rm -rf -} - -preload_some_system_libs () { - export LD_PRELOAD='/usr/lib32/gcc/x86_64-pc-linux-gnu/4.9.3/32/libstdc++.so.6 /usr/lib32/gcc/x86_64-pc-linux-gnu/4.9.3/32/libgcc_s.so.1 /usr/lib64/gcc/x86_64-pc-linux-gnu/4.9.3/libgcc_s.so.1 /usr/lib64/gcc/x86_64-pc-linux-gnu/4.9.3/32/libstdc++.so.6' - # steam must be told where nvidia opengl libs live on gentoo systems - # but this will break optimus, so check if we detect bbswitch in here - # if we do, we do not preload nvidia opengl, as it will break steam - if [[ "$(lsmod|grep bbswitch)" ]] ; then - echo "" - echo "nvidia optimus detected, we will not preload nvidia libs" - echo "" - export __GLVND_DISALLOW_PATCHING=1 - elif [[ "$(lsmod|grep nvidia)" && ! "$(lsmod|grep bbswitch)" ]] ; then - echo "" - echo "nvidia optimus not detected, we will preload nvidia libs" - echo "" - export LD_LIBRARY_PATH='$LD_LIBRARY_PATH:/usr/lib32/opengl/nvidia/lib:/usr/lib64/opengl/nvidia/lib' - export __GLVND_DISALLOW_PATCHING=1 - else - echo "" - echo "no nvidia card detected, moving on" - echo "" - fi -} - -launch_steam () { - remove_some_bundled_libs - preload_some_system_libs - export DISPLAY=:0 - steam -} - -launch_steam diff --git a/app-emulation/steam/files/kogaion-steam.patch b/app-emulation/steam/files/kogaion-steam.patch deleted file mode 100644 index 0a1470ec..00000000 --- a/app-emulation/steam/files/kogaion-steam.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -Nur a/steam.desktop b/steam.desktop ---- a/steam.desktop 2013-03-01 23:29:41.000000000 +0000 -+++ b/steam.desktop 2016-04-10 13:07:27.191010332 +0100 -@@ -1,7 +1,7 @@ - [Desktop Entry] - Name=Steam - Comment=Application for managing and playing games on Steam --Exec=/usr/bin/steam %U -+Exec=/usr/bin/kogaion-steam %U - Icon=steam - Terminal=false - Type=Application -@@ -19,7 +19,7 @@ - Name[ru]=Магазин - Name[zh_CN]=商店 - Name[zh_TW]=商店 --Exec=steam steam://store -+Exec=kogaion-steam steam://store - - [Desktop Action Community] - Name=Community -@@ -30,7 +30,7 @@ - Name[ru]=Сообщество - Name[zh_CN]=社区 - Name[zh_TW]=社群 --Exec=steam steam://url/SteamIDControlPage -+Exec=kogaion-steam steam://url/SteamIDControlPage - - [Desktop Action Library] - Name=Library -@@ -42,7 +42,7 @@ - Name[ru]=Библиотека - Name[zh_CN]=库 - Name[zh_TW]=遊戲庫 --Exec=steam steam://open/games -+Exec=kogaion-steam steam://open/games - - [Desktop Action Servers] - Name=Servers -@@ -54,7 +54,7 @@ - Name[ru]=Серверы - Name[zh_CN]=服务器 - Name[zh_TW]=伺服器 --Exec=steam steam://open/servers -+Exec=kogaion-steam steam://open/servers - - [Desktop Action Screenshots] - Name=Screenshots -@@ -64,7 +64,7 @@ - Name[ru]=Скриншоты - Name[zh_CN]=截图 - Name[zh_TW]=螢幕擷圖 --Exec=steam steam://open/screenshots -+Exec=kogaion-steam steam://open/screenshots - - [Desktop Action News] - Name=News -@@ -76,7 +76,7 @@ - Name[ru]=Новости - Name[zh_CN]=新闻 - Name[zh_TW]=新聞 --Exec=steam steam://open/news -+Exec=kogaion-steam steam://open/news - - [Desktop Action Settings] - Name=Settings -@@ -88,11 +88,11 @@ - Name[ru]=Настройки - Name[zh_CN]=设置 - Name[zh_TW]=設定 --Exec=steam steam://open/settings -+Exec=kogaion-steam steam://open/settings - - [Desktop Action BigPicture] - Name=Big Picture --Exec=steam steam://open/bigpicture -+Exec=kogaion-steam steam://open/bigpicture - - [Desktop Action Friends] - Name=Friends -@@ -104,4 +104,4 @@ - Name[ru]=Друзья - Name[zh_CN]=好友 - Name[zh_TW]=好友 --Exec=steam steam://open/friends -+Exec=kogaion-steam steam://open/friends diff --git a/app-emulation/steam/files/redcore-steam b/app-emulation/steam/files/redcore-steam new file mode 100755 index 00000000..f83f5115 --- /dev/null +++ b/app-emulation/steam/files/redcore-steam @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# steam-runtime is a mess with old libraries from Ubuntu 12.04 +# so native drivers compiled on anything newer may not load +# if we remove some bundled libs, like gcclibs, native drivers +# will be able to load, because system libs will be used instead +# +# but we have to do this everytime when we launch steam, because +# steam-runtime is being fixed right away by steam client + + +remove_some_bundled_libs () { + # force steam to use some system libraries + find /home/$USER/.local/share/Steam -name 'libxcb*' -type f | grep -v installed | xargs rm -rf + find /home/$USER/.local/share/Steam -name 'libstdc++.so.6*' -type f | grep -v installed | xargs rm -rf + find /home/$USER/.local/share/Steam -name 'libgcc_s*' -type f | grep -v installed | xargs rm -rf +} + +preload_some_system_libs () { + export LD_PRELOAD='/usr/lib32/gcc/x86_64-pc-linux-gnu/4.9.3/32/libstdc++.so.6 /usr/lib32/gcc/x86_64-pc-linux-gnu/4.9.3/32/libgcc_s.so.1 /usr/lib64/gcc/x86_64-pc-linux-gnu/4.9.3/libgcc_s.so.1 /usr/lib64/gcc/x86_64-pc-linux-gnu/4.9.3/32/libstdc++.so.6' + # steam must be told where nvidia opengl libs live on gentoo systems + # but this will break optimus, so check if we detect bbswitch in here + # if we do, we do not preload nvidia opengl, as it will break steam + if [[ "$(lsmod|grep bbswitch)" ]] ; then + echo "" + echo "nvidia optimus detected, we will not preload nvidia libs" + echo "" + export __GLVND_DISALLOW_PATCHING=1 + elif [[ "$(lsmod|grep nvidia)" && ! "$(lsmod|grep bbswitch)" ]] ; then + echo "" + echo "nvidia optimus not detected, we will preload nvidia libs" + echo "" + export LD_LIBRARY_PATH='$LD_LIBRARY_PATH:/usr/lib32/opengl/nvidia/lib:/usr/lib64/opengl/nvidia/lib' + export __GLVND_DISALLOW_PATCHING=1 + else + echo "" + echo "no nvidia card detected, moving on" + echo "" + fi +} + +launch_steam () { + remove_some_bundled_libs + preload_some_system_libs + export DISPLAY=:0 + steam +} + +launch_steam diff --git a/app-emulation/steam/files/redcore-steam.patch b/app-emulation/steam/files/redcore-steam.patch new file mode 100644 index 00000000..a8134b20 --- /dev/null +++ b/app-emulation/steam/files/redcore-steam.patch @@ -0,0 +1,86 @@ +diff -Nur a/steam.desktop b/steam.desktop +--- a/steam.desktop 2013-03-01 23:29:41.000000000 +0000 ++++ b/steam.desktop 2016-04-10 13:07:27.191010332 +0100 +@@ -1,7 +1,7 @@ + [Desktop Entry] + Name=Steam + Comment=Application for managing and playing games on Steam +-Exec=/usr/bin/steam %U ++Exec=/usr/bin/redcore-steam %U + Icon=steam + Terminal=false + Type=Application +@@ -19,7 +19,7 @@ + Name[ru]=Магазин + Name[zh_CN]=商店 + Name[zh_TW]=商店 +-Exec=steam steam://store ++Exec=redcore-steam steam://store + + [Desktop Action Community] + Name=Community +@@ -30,7 +30,7 @@ + Name[ru]=Сообщество + Name[zh_CN]=社区 + Name[zh_TW]=社群 +-Exec=steam steam://url/SteamIDControlPage ++Exec=redcore-steam steam://url/SteamIDControlPage + + [Desktop Action Library] + Name=Library +@@ -42,7 +42,7 @@ + Name[ru]=Библиотека + Name[zh_CN]=库 + Name[zh_TW]=遊戲庫 +-Exec=steam steam://open/games ++Exec=redcore-steam steam://open/games + + [Desktop Action Servers] + Name=Servers +@@ -54,7 +54,7 @@ + Name[ru]=Серверы + Name[zh_CN]=服务器 + Name[zh_TW]=伺服器 +-Exec=steam steam://open/servers ++Exec=redcore-steam steam://open/servers + + [Desktop Action Screenshots] + Name=Screenshots +@@ -64,7 +64,7 @@ + Name[ru]=Скриншоты + Name[zh_CN]=截图 + Name[zh_TW]=螢幕擷圖 +-Exec=steam steam://open/screenshots ++Exec=redcore-steam steam://open/screenshots + + [Desktop Action News] + Name=News +@@ -76,7 +76,7 @@ + Name[ru]=Новости + Name[zh_CN]=新闻 + Name[zh_TW]=新聞 +-Exec=steam steam://open/news ++Exec=redcore-steam steam://open/news + + [Desktop Action Settings] + Name=Settings +@@ -88,11 +88,11 @@ + Name[ru]=Настройки + Name[zh_CN]=设置 + Name[zh_TW]=設定 +-Exec=steam steam://open/settings ++Exec=redcore-steam steam://open/settings + + [Desktop Action BigPicture] + Name=Big Picture +-Exec=steam steam://open/bigpicture ++Exec=redcore-steam steam://open/bigpicture + + [Desktop Action Friends] + Name=Friends +@@ -104,4 +104,4 @@ + Name[ru]=Друзья + Name[zh_CN]=好友 + Name[zh_TW]=好友 +-Exec=steam steam://open/friends ++Exec=redcore-steam steam://open/friends diff --git a/app-emulation/steam/steam-1.0.0.45-r7.ebuild b/app-emulation/steam/steam-1.0.0.45-r7.ebuild index 5d2ebc9d..e4a19487 100644 --- a/app-emulation/steam/steam-1.0.0.45-r7.ebuild +++ b/app-emulation/steam/steam-1.0.0.45-r7.ebuild @@ -37,13 +37,13 @@ RDEPEND=" S=${WORKDIR}/${PN} src_prepare() { - epatch "${FILESDIR}"/kogaion-${PN}.patch + epatch "${FILESDIR}"/redcore-${PN}.patch } src_install() { emake DESTDIR="${D}" install || die "make install failed" exeinto /usr/bin || die - doexe ${FILESDIR}/kogaion-steam || die + doexe ${FILESDIR}/redcore-steam || die rm -rf "${D}"/usr/bin/steamdeps || die dosym /bin/true /usr/bin/steamdeps || die } -- cgit v1.2.3