Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qwt/files: qwt-5.2.3-install_qt.patch
Date: Tue, 05 Mar 2013 12:56:11
Message-Id: 20130305125607.2A2D320081@flycatcher.gentoo.org
1 jlec 13/03/05 12:56:07
2
3 Added: qwt-5.2.3-install_qt.patch
4 Log:
5 x11-libs/qwt: Fix installation location for designer and plugin stuff, #460256; add static-libs support, #260324
6
7 (Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
8
9 Revision Changes Path
10 1.1 x11-libs/qwt/files/qwt-5.2.3-install_qt.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch?rev=1.1&content-type=text/plain
14
15 Index: qwt-5.2.3-install_qt.patch
16 ===================================================================
17 diff -up qwt-5.2.2/designer/designer.pro.install_qt qwt-5.2.2/designer/designer.pro
18 --- qwt-5.2.2/designer/designer.pro.install_qt 2011-08-01 04:28:22.000000000 -0500
19 +++ qwt-5.2.2/designer/designer.pro 2012-08-14 11:11:22.569229749 -0500
20 @@ -36,6 +37,7 @@ contains(CONFIG, QwtDesigner) {
21 else {
22 SUFFIX_STR = $${RELEASE_SUFFIX}
23 }
24 + LIBNAME = qwt$${SUFFIX_STR}
25 }
26
27 TEMPLATE = lib
28 @@ -45,7 +47,6 @@ contains(CONFIG, QwtDesigner) {
29 INCLUDEPATH += $${QWT_ROOT}/src
30 DEPENDPATH += $${QWT_ROOT}/src
31
32 - LIBNAME = qwt$${SUFFIX_STR}
33 contains(CONFIG, QwtDll) {
34 win32 {
35 DEFINES += QT_DLL QWT_DLL
36 @@ -103,7 +104,7 @@ contains(CONFIG, QwtDesigner) {
37
38 # Qt 4
39
40 - TARGET = qwt_designer_plugin$${SUFFIX_STR}
41 + TARGET = qwt5_designer_plugin$${SUFFIX_STR}
42 CONFIG += qt designer plugin
43
44 RCC_DIR = resources