diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-03-05 12:56:07 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-03-05 12:56:07 +0000 |
| commit | f0acc6d3dffc7855cba44bd0a73ef48cd753dd4a (patch) | |
| tree | 6cd4fff7667fdcf49a588a29b519dbb837d3c9d1 /x11-libs/qwt/files/qwt-5.2.3-install_qt.patch | |
| parent | Migrate to EAPI 5. (diff) | |
| download | gentoo-2-f0acc6d3dffc7855cba44bd0a73ef48cd753dd4a.tar.gz gentoo-2-f0acc6d3dffc7855cba44bd0a73ef48cd753dd4a.tar.bz2 gentoo-2-f0acc6d3dffc7855cba44bd0a73ef48cd753dd4a.zip | |
x11-libs/qwt: Fix installation location for designer and plugin stuff, #460256; add static-libs support, #260324
(Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
Diffstat (limited to 'x11-libs/qwt/files/qwt-5.2.3-install_qt.patch')
| -rw-r--r-- | x11-libs/qwt/files/qwt-5.2.3-install_qt.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch b/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch new file mode 100644 index 000000000000..48e9385811f8 --- /dev/null +++ b/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch @@ -0,0 +1,28 @@ +diff -up qwt-5.2.2/designer/designer.pro.install_qt qwt-5.2.2/designer/designer.pro +--- qwt-5.2.2/designer/designer.pro.install_qt 2011-08-01 04:28:22.000000000 -0500 ++++ qwt-5.2.2/designer/designer.pro 2012-08-14 11:11:22.569229749 -0500 +@@ -36,6 +37,7 @@ contains(CONFIG, QwtDesigner) { + else { + SUFFIX_STR = $${RELEASE_SUFFIX} + } ++ LIBNAME = qwt$${SUFFIX_STR} + } + + TEMPLATE = lib +@@ -45,7 +47,6 @@ contains(CONFIG, QwtDesigner) { + INCLUDEPATH += $${QWT_ROOT}/src + DEPENDPATH += $${QWT_ROOT}/src + +- LIBNAME = qwt$${SUFFIX_STR} + contains(CONFIG, QwtDll) { + win32 { + DEFINES += QT_DLL QWT_DLL +@@ -103,7 +104,7 @@ contains(CONFIG, QwtDesigner) { + + # Qt 4 + +- TARGET = qwt_designer_plugin$${SUFFIX_STR} ++ TARGET = qwt5_designer_plugin$${SUFFIX_STR} + CONFIG += qt designer plugin + + RCC_DIR = resources |