| 1 |
commit: 4f74a03e5eab0f11d5802a525e65f22e310faf5a |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 19 15:46:50 2016 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 19 15:47:14 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f74a03e |
| 7 |
|
| 8 |
media-gfx/valentina: fixed qa warning about insecure runpaths |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
|
| 12 |
.../valentina/files/fix-insecure-runpaths.patch | 56 ++++++++++++++++++++++ |
| 13 |
...a-0.4.2-r2.ebuild => valentina-0.4.2-r3.ebuild} | 5 +- |
| 14 |
media-gfx/valentina/valentina-9999.ebuild | 2 +- |
| 15 |
3 files changed, 60 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-gfx/valentina/files/fix-insecure-runpaths.patch b/media-gfx/valentina/files/fix-insecure-runpaths.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..a98a069 |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-gfx/valentina/files/fix-insecure-runpaths.patch |
| 22 |
@@ -0,0 +1,56 @@ |
| 23 |
+# HG changeset patch |
| 24 |
+# User Roman Telezhynskyi <kroluku@×××××.com> |
| 25 |
+# Date 1455895311 -7200 |
| 26 |
+# Branch develop |
| 27 |
+# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725 |
| 28 |
+# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c |
| 29 |
+CONFIG key to disable setting custom rpath option. |
| 30 |
+ |
| 31 |
+diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro |
| 32 |
+--- a/src/app/tape/tape.pro |
| 33 |
++++ b/src/app/tape/tape.pro |
| 34 |
+@@ -348,10 +348,16 @@ |
| 35 |
+ # Path to recource file. |
| 36 |
+ win32:RC_FILE = share/resources/tape.rc |
| 37 |
+ |
| 38 |
+-unix:!macx{ |
| 39 |
+- # suppress the default RPATH |
| 40 |
+- QMAKE_LFLAGS_RPATH = |
| 41 |
+- QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" |
| 42 |
++noRunPath{ # For enable run qmake with CONFIG+=noRunPath |
| 43 |
++ # do nothing |
| 44 |
++} else { |
| 45 |
++ unix:!macx{ |
| 46 |
++ # suppress the default RPATH |
| 47 |
++ # helps to run the program without Qt Creator |
| 48 |
++ # see problem with path to libqmuparser and libpropertybrowser |
| 49 |
++ QMAKE_LFLAGS_RPATH = |
| 50 |
++ QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" |
| 51 |
++ } |
| 52 |
+ } |
| 53 |
+ |
| 54 |
+ # When the GNU linker sees a library, it discards all symbols that it doesn't need. |
| 55 |
+diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro |
| 56 |
+--- a/src/app/valentina/valentina.pro |
| 57 |
++++ b/src/app/valentina/valentina.pro |
| 58 |
+@@ -476,10 +476,16 @@ |
| 59 |
+ copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR)) |
| 60 |
+ } |
| 61 |
+ |
| 62 |
+-unix:!macx{ |
| 63 |
+- # suppress the default RPATH |
| 64 |
+- QMAKE_LFLAGS_RPATH = |
| 65 |
+- QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" |
| 66 |
++noRunPath{ # For enable run qmake with CONFIG+=noRunPath |
| 67 |
++ # do nothing |
| 68 |
++} else { |
| 69 |
++ unix:!macx{ |
| 70 |
++ # suppress the default RPATH |
| 71 |
++ # helps to run the program without Qt Creator |
| 72 |
++ # see problem with path to libqmuparser and libpropertybrowser |
| 73 |
++ QMAKE_LFLAGS_RPATH = |
| 74 |
++ QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" |
| 75 |
++ } |
| 76 |
+ } |
| 77 |
+ |
| 78 |
+ # When the GNU linker sees a library, it discards all symbols that it doesn't need. |
| 79 |
|
| 80 |
diff --git a/media-gfx/valentina/valentina-0.4.2-r2.ebuild b/media-gfx/valentina/valentina-0.4.2-r3.ebuild |
| 81 |
similarity index 92% |
| 82 |
rename from media-gfx/valentina/valentina-0.4.2-r2.ebuild |
| 83 |
rename to media-gfx/valentina/valentina-0.4.2-r3.ebuild |
| 84 |
index 76ac359..30affd1 100644 |
| 85 |
--- a/media-gfx/valentina/valentina-0.4.2-r2.ebuild |
| 86 |
+++ b/media-gfx/valentina/valentina-0.4.2-r3.ebuild |
| 87 |
@@ -39,7 +39,8 @@ DEPEND="${CDEPEND} |
| 88 |
S=${WORKDIR}/dismine-${PN}-44d43351cb59 |
| 89 |
|
| 90 |
src_prepare() { |
| 91 |
- epatch "${FILESDIR}/locales.patch" |
| 92 |
+ epatch "${FILESDIR}/locales.patch" \ |
| 93 |
+ "${FILESDIR}/fix-insecure-runpaths.patch" |
| 94 |
} |
| 95 |
|
| 96 |
src_configure() { |
| 97 |
@@ -51,7 +52,7 @@ src_configure() { |
| 98 |
fi |
| 99 |
done |
| 100 |
|
| 101 |
- eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r |
| 102 |
+ eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r |
| 103 |
} |
| 104 |
|
| 105 |
src_install() { |
| 106 |
|
| 107 |
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild |
| 108 |
index 7ddd9fa..70fd441 100644 |
| 109 |
--- a/media-gfx/valentina/valentina-9999.ebuild |
| 110 |
+++ b/media-gfx/valentina/valentina-9999.ebuild |
| 111 |
@@ -46,7 +46,7 @@ src_configure() { |
| 112 |
fi |
| 113 |
done |
| 114 |
|
| 115 |
- eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r |
| 116 |
+ eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache CONFIG+=noRunPath Valentina.pro -r |
| 117 |
} |
| 118 |
|
| 119 |
src_install() { |
Archives