commit: 70c3a1179797cd8c09c6894e4c34640212511766 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> AuthorDate: Mon May 12 16:32:09 2014 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Mon May 12 16:32:09 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=70c3a117
[dev-qt/qtcore:5] Backport upstream patchset to fix bug #451456. Package-Manager: portage-2.2.10 --- .../0001-fix-default-QMAKE_PKGCONFIG_LIBDIR.patch | 31 +++++++ ...-replacement-in-installed-qml-plugin-prl-.patch | 39 +++++++++ ...place-windows-paths-in-installed-qml-plug.patch | 27 ++++++ ...pt-to-replace-include-paths-in-meta-files.patch | 57 +++++++++++++ .../files/0005-reshuffle-code-for-clarity.patch | 89 ++++++++++++++++++++ ...e-setup-of-libdir-replacement-in-prl-file.patch | 98 ++++++++++++++++++++++ ...ith-system-paths-when-installing-meta-fil.patch | 64 ++++++++++++++ dev-qt/qtcore/qtcore-5.3.0_rc.ebuild | 11 +++ 8 files changed, 416 insertions(+) diff --git a/dev-qt/qtcore/files/0001-fix-default-QMAKE_PKGCONFIG_LIBDIR.patch b/dev-qt/qtcore/files/0001-fix-default-QMAKE_PKGCONFIG_LIBDIR.patch new file mode 100644 index 0000000..d2d828d --- /dev/null +++ b/dev-qt/qtcore/files/0001-fix-default-QMAKE_PKGCONFIG_LIBDIR.patch @@ -0,0 +1,31 @@ +From 50bc2b25d8dc3e420be63da7af3b2bc8bd38bb2b Mon Sep 17 00:00:00 2001 +From: Oswald Buddenhagen <[email protected]> +Date: Mon, 14 Apr 2014 17:07:26 +0200 +Subject: [PATCH 1/7] fix default QMAKE_PKGCONFIG_LIBDIR + +it needs neither native separators, nor a trailing separator. + +the QMAKE_PKGCONFIG_INCDIR default was already ok. + +Change-Id: I1048b3870fd3ca09aa76b41aecda7d90402aa64a +Reviewed-by: Joerg Bornemann <[email protected]> +--- + qmake/generators/makefile.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp +index a20e8ff..3870d1e 100644 +--- a/qmake/generators/makefile.cpp ++++ b/qmake/generators/makefile.cpp +@@ -3217,7 +3217,7 @@ MakefileGenerator::writePkgConfigFile() + QString prefix = pkgConfigPrefix(); + QString libDir = project->first("QMAKE_PKGCONFIG_LIBDIR").toQString(); + if(libDir.isEmpty()) +- libDir = prefix + Option::dir_sep + "lib" + Option::dir_sep; ++ libDir = prefix + "/lib"; + QString includeDir = project->first("QMAKE_PKGCONFIG_INCDIR").toQString(); + if(includeDir.isEmpty()) + includeDir = prefix + "/include"; +-- +1.9.2 + diff --git a/dev-qt/qtcore/files/0002-enable-path-replacement-in-installed-qml-plugin-prl-.patch b/dev-qt/qtcore/files/0002-enable-path-replacement-in-installed-qml-plugin-prl-.patch new file mode 100644 index 0000000..efc9c08 --- /dev/null +++ b/dev-qt/qtcore/files/0002-enable-path-replacement-in-installed-qml-plugin-prl-.patch @@ -0,0 +1,39 @@ +From 8d04d622b9ebbe8a6d1ec4d1362b6fc01e56eece Mon Sep 17 00:00:00 2001 +From: Oswald Buddenhagen <[email protected]> +Date: Mon, 14 Apr 2014 16:28:17 +0200 +Subject: [PATCH 2/7] enable path replacement in installed qml plugin prl files + on all platforms + +amends 08a2d8df4, take 2. + +Change-Id: If827612caf15b0d5d79fea38fa4915b1d36743d6 +Reviewed-by: Joerg Bornemann <[email protected]> +--- + mkspecs/features/qml_plugin.prf | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf +index f373957..0b47a2b 100644 +--- a/mkspecs/features/qml_plugin.prf ++++ b/mkspecs/features/qml_plugin.prf +@@ -101,11 +101,9 @@ load(qt_common) + + load(qml_module) + +-unix|mingw { +- !isEmpty(_QMAKE_SUPER_CACHE_): \ +- lib_replace.match = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*/lib +- else: \ +- lib_replace.match = $$MODULE_BASE_OUTDIR +- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- QMAKE_PRL_INSTALL_REPLACE += lib_replace +-} ++!isEmpty(_QMAKE_SUPER_CACHE_): \ ++ lib_replace.match = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*/lib ++else: \ ++ lib_replace.match = $$MODULE_BASE_OUTDIR ++lib_replace.replace = $$[QT_INSTALL_LIBS/raw] ++QMAKE_PRL_INSTALL_REPLACE += lib_replace +-- +1.9.2 + diff --git a/dev-qt/qtcore/files/0003-properly-replace-windows-paths-in-installed-qml-plug.patch b/dev-qt/qtcore/files/0003-properly-replace-windows-paths-in-installed-qml-plug.patch new file mode 100644 index 0000000..318dc63 --- /dev/null +++ b/dev-qt/qtcore/files/0003-properly-replace-windows-paths-in-installed-qml-plug.patch @@ -0,0 +1,27 @@ +From a5e4d3d4db03ba3092d0d415cee6c5ed1a7b4f5b Mon Sep 17 00:00:00 2001 +From: Oswald Buddenhagen <[email protected]> +Date: Mon, 14 Apr 2014 17:17:49 +0200 +Subject: [PATCH 3/7] properly replace windows paths in installed qml plugin + prl files + +amends 53f48a4b, take 2. + +Change-Id: Ia20d7879e4e1b6a34d5bb9e36b4fd7f17139b5fe +Reviewed-by: Joerg Bornemann <[email protected]> +--- + mkspecs/features/qml_plugin.prf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf +index 0b47a2b..7314cb1 100644 +--- a/mkspecs/features/qml_plugin.prf ++++ b/mkspecs/features/qml_plugin.prf +@@ -106,4 +106,5 @@ load(qml_module) + else: \ + lib_replace.match = $$MODULE_BASE_OUTDIR + lib_replace.replace = $$[QT_INSTALL_LIBS/raw] ++lib_replace.CONFIG = path + QMAKE_PRL_INSTALL_REPLACE += lib_replace +-- +1.9.2 + diff --git a/dev-qt/qtcore/files/0004-don-t-attempt-to-replace-include-paths-in-meta-files.patch b/dev-qt/qtcore/files/0004-don-t-attempt-to-replace-include-paths-in-meta-files.patch new file mode 100644 index 0000000..03856ec --- /dev/null +++ b/dev-qt/qtcore/files/0004-don-t-attempt-to-replace-include-paths-in-meta-files.patch @@ -0,0 +1,57 @@ +From ee86ce89a63a5a7b071ec4116987609aa2a17600 Mon Sep 17 00:00:00 2001 +From: Oswald Buddenhagen <[email protected]> +Date: Mon, 14 Apr 2014 16:53:55 +0200 +Subject: [PATCH 4/7] don't attempt to replace include paths in meta files + +neither .prl nor .la files even contain include paths. +in .pc files, we assign the final path to start with, so there is +nothing to replace, either. + +Change-Id: I919dfa01e0a1d0ef8ef1220174de1d33c66cedf9 +Reviewed-by: Joerg Bornemann <[email protected]> +--- + mkspecs/features/qt_module.prf | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 2134077..1ff5501 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -170,30 +170,27 @@ load(qt_installs) + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ + rplbase = $$MODULE_BASE_OUTDIR +-include_replace.match = $$rplbase/include +-include_replace.replace = $$[QT_INSTALL_HEADERS/raw] +-include_replace.CONFIG = path + lib_replace.match = $$rplbase/lib + host_build: \ + lib_replace.replace = $$[QT_HOST_LIBS] + else: \ + lib_replace.replace = $$[QT_INSTALL_LIBS/raw] + lib_replace.CONFIG = path +-QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace ++QMAKE_PRL_INSTALL_REPLACE += lib_replace + + unix|mingw { + CONFIG += create_pc + QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace +- QMAKE_PKGCONFIG_INCDIR = $$include_replace.replace ++ QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] + QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME + QMAKE_PKGCONFIG_DESTDIR = pkgconfig +- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace ++ QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace + } + + unix { + CONFIG += create_libtool explicitlib + QMAKE_LIBTOOL_LIBDIR = $$lib_replace.replace +- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace ++ QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace + } + + unix|mingw { +-- +1.9.2 + diff --git a/dev-qt/qtcore/files/0005-reshuffle-code-for-clarity.patch b/dev-qt/qtcore/files/0005-reshuffle-code-for-clarity.patch new file mode 100644 index 0000000..14a75b7 --- /dev/null +++ b/dev-qt/qtcore/files/0005-reshuffle-code-for-clarity.patch @@ -0,0 +1,89 @@ +From aa20e7f9d86cb43462d835e4e9c7ce1905478c30 Mon Sep 17 00:00:00 2001 +From: Oswald Buddenhagen <[email protected]> +Date: Mon, 14 Apr 2014 17:51:41 +0200 +Subject: [PATCH 5/7] reshuffle code for clarity + +move a bit around, nest/de-duplicate dependent conditionals + +Change-Id: I048bd3f409ce42b4138bccb28fcc513840202e7a +Reviewed-by: Joerg Bornemann <[email protected]> +--- + mkspecs/features/qt_module.prf | 38 +++++++++++++++++--------------------- + 1 file changed, 17 insertions(+), 21 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 1ff5501..a247b2c 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -127,6 +127,8 @@ win32 { + # keeps the code clean and helps in writing code that is + # safe across all platforms. + DEFINES *= _CRT_SECURE_NO_WARNINGS ++ ++ DEFINES += _USE_MATH_DEFINES + } + + aix-g++* { +@@ -166,6 +168,9 @@ android: CONFIG += qt_android_deps + #install directives + load(qt_installs) + ++load(qt_targets) ++load(qt_common) ++ + !isEmpty(_QMAKE_SUPER_CACHE_): \ + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ +@@ -179,27 +184,24 @@ lib_replace.CONFIG = path + QMAKE_PRL_INSTALL_REPLACE += lib_replace + + unix|mingw { +- CONFIG += create_pc +- QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace +- QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] +- QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME +- QMAKE_PKGCONFIG_DESTDIR = pkgconfig +- QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace +-} +- +-unix { +- CONFIG += create_libtool explicitlib +- QMAKE_LIBTOOL_LIBDIR = $$lib_replace.replace +- QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace +-} +- +-unix|mingw { ++ CONFIG += create_pc ++ QMAKE_PKGCONFIG_DESTDIR = pkgconfig ++ QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace ++ QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] ++ QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME + QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$section(VERSION, ., 0, 0) ") + QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$section(VERSION, ., 0, 0)) + for(i, MODULE_DEPENDS): \ + QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$eval(QT.$${i}.MAJOR_VERSION)) + isEmpty(QMAKE_PKGCONFIG_DESCRIPTION): \ + QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module ++ QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace ++ ++ unix { ++ CONFIG += create_libtool explicitlib ++ QMAKE_LIBTOOL_LIBDIR = $$lib_replace.replace ++ QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace ++ } + } + + contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE +@@ -218,9 +220,3 @@ win32 { + } + + TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end +- +-load(qt_targets) +-load(qt_common) +- +-win32:DEFINES+=_USE_MATH_DEFINES +- +-- +1.9.2 + diff --git a/dev-qt/qtcore/files/0006-de-duplicate-setup-of-libdir-replacement-in-prl-file.patch b/dev-qt/qtcore/files/0006-de-duplicate-setup-of-libdir-replacement-in-prl-file.patch new file mode 100644 index 0000000..f4df5af --- /dev/null +++ b/dev-qt/qtcore/files/0006-de-duplicate-setup-of-libdir-replacement-in-prl-file.patch @@ -0,0 +1,98 @@ +From a33afed1989d08d6f76994052f0d34ea50bfd01e Mon Sep 17 00:00:00 2001 +From: Oswald Buddenhagen <[email protected]> +Date: Mon, 14 Apr 2014 16:33:18 +0200 +Subject: [PATCH 6/7] de-duplicate setup of libdir replacement in prl files + +Change-Id: Ia93fa02d9e63597d3347fee3aaf2aca65e7cc83a +Reviewed-by: Joerg Bornemann <[email protected]> +Reviewed-by: Davide Pesavento <[email protected]> +--- + mkspecs/features/qml_plugin.prf | 8 -------- + mkspecs/features/qt_common.prf | 12 ++++++++++++ + mkspecs/features/qt_module.prf | 13 +------------ + mkspecs/features/qt_plugin.prf | 9 --------- + 4 files changed, 13 insertions(+), 29 deletions(-) + +diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf +index 7314cb1..f161a71 100644 +--- a/mkspecs/features/qml_plugin.prf ++++ b/mkspecs/features/qml_plugin.prf +@@ -100,11 +100,3 @@ load(qt_common) + } + + load(qml_module) +- +-!isEmpty(_QMAKE_SUPER_CACHE_): \ +- lib_replace.match = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*/lib +-else: \ +- lib_replace.match = $$MODULE_BASE_OUTDIR +-lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +-lib_replace.CONFIG = path +-QMAKE_PRL_INSTALL_REPLACE += lib_replace +diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf +index 6cd848b..b58f969 100644 +--- a/mkspecs/features/qt_common.prf ++++ b/mkspecs/features/qt_common.prf +@@ -19,6 +19,18 @@ contains(TEMPLATE, .*lib) { + unix:contains(QT_CONFIG, reduce_relocations): CONFIG += bsymbolic_functions + contains(QT_CONFIG, largefile): CONFIG += largefile + contains(QT_CONFIG, separate_debug_info): CONFIG += separate_debug_info ++ ++ !isEmpty(_QMAKE_SUPER_CACHE_): \ ++ rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* ++ else: \ ++ rplbase = $$MODULE_BASE_OUTDIR ++ lib_replace.match = $$rplbase/lib ++ host_build: \ ++ lib_replace.replace = $$[QT_HOST_LIBS] ++ else: \ ++ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] ++ lib_replace.CONFIG = path ++ QMAKE_PRL_INSTALL_REPLACE += lib_replace + } + + warnings_are_errors:warning_clean { +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index a247b2c..e250f93 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -171,18 +171,7 @@ load(qt_installs) + load(qt_targets) + load(qt_common) + +-!isEmpty(_QMAKE_SUPER_CACHE_): \ +- rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* +-else: \ +- rplbase = $$MODULE_BASE_OUTDIR +-lib_replace.match = $$rplbase/lib +-host_build: \ +- lib_replace.replace = $$[QT_HOST_LIBS] +-else: \ +- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +-lib_replace.CONFIG = path +-QMAKE_PRL_INSTALL_REPLACE += lib_replace +- ++# this builds on top of qt_common + unix|mingw { + CONFIG += create_pc + QMAKE_PKGCONFIG_DESTDIR = pkgconfig +diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf +index c020bd2..52567ea 100644 +--- a/mkspecs/features/qt_plugin.prf ++++ b/mkspecs/features/qt_plugin.prf +@@ -83,12 +83,3 @@ load(qt_common) + + wince*:LIBS += $$QMAKE_LIBS_GUI + QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF +- +-!isEmpty(_QMAKE_SUPER_CACHE_): \ +- rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* +-else: \ +- rplbase = $$MODULE_BASE_OUTDIR +-lib_replace.match = $$rplbase/lib +-lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +-lib_replace.CONFIG = path +-QMAKE_PRL_INSTALL_REPLACE += lib_replace +-- +1.9.2 + diff --git a/dev-qt/qtcore/files/0007-snuff-L-I-with-system-paths-when-installing-meta-fil.patch b/dev-qt/qtcore/files/0007-snuff-L-I-with-system-paths-when-installing-meta-fil.patch new file mode 100644 index 0000000..ffc3a4b --- /dev/null +++ b/dev-qt/qtcore/files/0007-snuff-L-I-with-system-paths-when-installing-meta-fil.patch @@ -0,0 +1,64 @@ +From eaefbe36e88e75725083d52e03d3a7843aa418f6 Mon Sep 17 00:00:00 2001 +From: Oswald Buddenhagen <[email protected]> +Date: Mon, 14 Apr 2014 17:32:23 +0200 +Subject: [PATCH 7/7] snuff -L/-I with system paths when installing meta files + +Task-number: QTBUG-37963 +Change-Id: I8e268387f9dc33d7fab76395301b1396ca0445ff +Reviewed-by: Joerg Bornemann <[email protected]> +Reviewed-by: Davide Pesavento <[email protected]> +--- + mkspecs/features/qt_common.prf | 12 +++++++++--- + mkspecs/features/qt_module.prf | 4 ++-- + 2 files changed, 11 insertions(+), 5 deletions(-) + +diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf +index b58f969..4dcabe9 100644 +--- a/mkspecs/features/qt_common.prf ++++ b/mkspecs/features/qt_common.prf +@@ -24,11 +24,17 @@ contains(TEMPLATE, .*lib) { + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ + rplbase = $$MODULE_BASE_OUTDIR +- lib_replace.match = $$rplbase/lib + host_build: \ +- lib_replace.replace = $$[QT_HOST_LIBS] ++ qt_libdir = $$[QT_HOST_LIBS] + else: \ +- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] ++ qt_libdir = $$[QT_INSTALL_LIBS/raw] ++ contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { ++ lib_replace.match = "[^ ']*$$rplbase/lib" ++ lib_replace.replace = ++ } else { ++ lib_replace.match = $$rplbase/lib ++ lib_replace.replace = $$qt_libdir ++ } + lib_replace.CONFIG = path + QMAKE_PRL_INSTALL_REPLACE += lib_replace + } +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index e250f93..5dac025 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -175,7 +175,7 @@ load(qt_common) + unix|mingw { + CONFIG += create_pc + QMAKE_PKGCONFIG_DESTDIR = pkgconfig +- QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace ++ QMAKE_PKGCONFIG_LIBDIR = $$qt_libdir + QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] + QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME + QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$section(VERSION, ., 0, 0) ") +@@ -188,7 +188,7 @@ unix|mingw { + + unix { + CONFIG += create_libtool explicitlib +- QMAKE_LIBTOOL_LIBDIR = $$lib_replace.replace ++ QMAKE_LIBTOOL_LIBDIR = $$qt_libdir + QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace + } + } +-- +1.9.2 + diff --git a/dev-qt/qtcore/qtcore-5.3.0_rc.ebuild b/dev-qt/qtcore/qtcore-5.3.0_rc.ebuild index 475c6cb..08c5132 100644 --- a/dev-qt/qtcore/qtcore-5.3.0_rc.ebuild +++ b/dev-qt/qtcore/qtcore-5.3.0_rc.ebuild @@ -35,6 +35,17 @@ QT5_TARGET_SUBDIRS=( ) QCONFIG_DEFINE=( QT_ZLIB ) +PATCHES=( + # bug 451456 + "${FILESDIR}/0001-fix-default-QMAKE_PKGCONFIG_LIBDIR.patch" + "${FILESDIR}/0002-enable-path-replacement-in-installed-qml-plugin-prl-.patch" + "${FILESDIR}/0003-properly-replace-windows-paths-in-installed-qml-plug.patch" + "${FILESDIR}/0004-don-t-attempt-to-replace-include-paths-in-meta-files.patch" + "${FILESDIR}/0005-reshuffle-code-for-clarity.patch" + "${FILESDIR}/0006-de-duplicate-setup-of-libdir-replacement-in-prl-file.patch" + "${FILESDIR}/0007-snuff-L-I-with-system-paths-when-installing-meta-fil.patch" +) + pkg_setup() { QCONFIG_REMOVE=( $(usev !glib)
