| 1 |
commit: da3156b09574679cf1fcb885dd5e441e21800905 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 8 19:21:35 2018 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 8 19:21:55 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da3156b0 |
| 7 |
|
| 8 |
www-client/firefox-bin: don't hardcode 'lib/' in GTK_LIBS assignment |
| 9 |
|
| 10 |
Until now, the 'firefox-bin' wrapper hard-coded the path to GTK_LIBS |
| 11 |
to /usr/lib/gtk-3.0 ; this patch uses get_libdir to ensure the proper |
| 12 |
value for 'lib' is assigned instead. Required for SYMLINK_LIB=no |
| 13 |
in the 17.1 profiles. |
| 14 |
|
| 15 |
Bug: http://bugs.gentoo.org/643798 |
| 16 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 17 |
|
| 18 |
.../{firefox-bin-52.5.3.ebuild => firefox-bin-52.5.3-r1.ebuild} | 2 +- |
| 19 |
.../{firefox-bin-57.0.4.ebuild => firefox-bin-57.0.4-r1.ebuild} | 2 +- |
| 20 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 21 |
|
| 22 |
diff --git a/www-client/firefox-bin/firefox-bin-52.5.3.ebuild b/www-client/firefox-bin/firefox-bin-52.5.3-r1.ebuild |
| 23 |
similarity index 99% |
| 24 |
rename from www-client/firefox-bin/firefox-bin-52.5.3.ebuild |
| 25 |
rename to www-client/firefox-bin/firefox-bin-52.5.3-r1.ebuild |
| 26 |
index 76afcebbc27..fe974f2962a 100644 |
| 27 |
--- a/www-client/firefox-bin/firefox-bin-52.5.3.ebuild |
| 28 |
+++ b/www-client/firefox-bin/firefox-bin-52.5.3-r1.ebuild |
| 29 |
@@ -140,7 +140,7 @@ src_install() { |
| 30 |
#!/bin/sh |
| 31 |
unset LD_PRELOAD |
| 32 |
LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\ |
| 33 |
- GTK_PATH=/usr/lib/gtk-3.0/ \\ |
| 34 |
+ GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\ |
| 35 |
exec /opt/${MOZ_PN}/${MOZ_PN} "\$@" |
| 36 |
EOF |
| 37 |
fperms 0755 /usr/bin/${PN} |
| 38 |
|
| 39 |
diff --git a/www-client/firefox-bin/firefox-bin-57.0.4.ebuild b/www-client/firefox-bin/firefox-bin-57.0.4-r1.ebuild |
| 40 |
similarity index 99% |
| 41 |
rename from www-client/firefox-bin/firefox-bin-57.0.4.ebuild |
| 42 |
rename to www-client/firefox-bin/firefox-bin-57.0.4-r1.ebuild |
| 43 |
index 67998ff7ceb..e3d638ecc9d 100644 |
| 44 |
--- a/www-client/firefox-bin/firefox-bin-57.0.4.ebuild |
| 45 |
+++ b/www-client/firefox-bin/firefox-bin-57.0.4-r1.ebuild |
| 46 |
@@ -139,7 +139,7 @@ src_install() { |
| 47 |
#!/bin/sh |
| 48 |
unset LD_PRELOAD |
| 49 |
LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\ |
| 50 |
- GTK_PATH=/usr/lib/gtk-3.0/ \\ |
| 51 |
+ GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\ |
| 52 |
exec /opt/${MOZ_PN}/${MOZ_PN} "\$@" |
| 53 |
EOF |
| 54 |
fperms 0755 /usr/bin/${PN} |
Archives