* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
@ 2013-03-07 21:13 Markos Chandras
0 siblings, 0 replies; 9+ messages in thread
From: Markos Chandras @ 2013-03-07 21:13 UTC (permalink / raw
To: gentoo-commits
commit: f8b0c3ab9de766567b5151cdd77070b8302ab410
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 20:14:06 2013 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 20:18:15 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f8b0c3ab
dev-qt/qtcore: Remove obsolete boost patch.
Applied upstream in
http://qt.gitorious.org/qt/qt/commit/a6305580b27f0bf1d268b5a3531c8332a57c3864
---
.../files/moc-workaround-for-BOOST_JOIN.patch | 15 ---------------
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 4 ----
2 files changed, 0 insertions(+), 19 deletions(-)
diff --git a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch b/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch
deleted file mode 100644
index fa82334..0000000
--- a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp
---- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 2012-11-23 04:09:53.000000000 -0600
-+++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-02-11 07:07:18.942748176 -0600
-@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv)
- Moc moc;
- pp.macros["Q_MOC_RUN"];
- pp.macros["__cplusplus"];
-+
-+ // Workaround a bugs while parsing some boost headers. See QTBUG-22829
-+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
-+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
-+
- QByteArray filename;
- QByteArray output;
- FILE *in = 0;
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index 583f197..ff004f9 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -27,10 +27,6 @@ PDEPEND="
qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] )
"
-PATCHES=(
- "${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch"
-)
-
pkg_setup() {
QT4_TARGET_DIRECTORIES="
src/tools/bootstrap
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
@ 2013-03-08 18:39 Markos Chandras
0 siblings, 0 replies; 9+ messages in thread
From: Markos Chandras @ 2013-03-08 18:39 UTC (permalink / raw
To: gentoo-commits
commit: 60db688930cf450c24b716ce212824fd035aec54
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 8 18:12:31 2013 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 18:12:31 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=60db6889
Revert "dev-qt/qtcore: Remove obsolete boost patch."
This reverts commit f8b0c3ab9de766567b5151cdd77070b8302ab410.
---
.../files/moc-workaround-for-BOOST_JOIN.patch | 15 +++++++++++++++
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 4 ++++
2 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch b/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch
new file mode 100644
index 0000000..fa82334
--- /dev/null
+++ b/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch
@@ -0,0 +1,15 @@
+diff -up qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 2012-11-23 04:09:53.000000000 -0600
++++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-02-11 07:07:18.942748176 -0600
+@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv)
+ Moc moc;
+ pp.macros["Q_MOC_RUN"];
+ pp.macros["__cplusplus"];
++
++ // Workaround a bugs while parsing some boost headers. See QTBUG-22829
++ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++
+ QByteArray filename;
+ QByteArray output;
+ FILE *in = 0;
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index ff004f9..583f197 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -27,6 +27,10 @@ PDEPEND="
qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] )
"
+PATCHES=(
+ "${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch"
+)
+
pkg_setup() {
QT4_TARGET_DIRECTORIES="
src/tools/bootstrap
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
@ 2013-07-10 9:05 Davide Pesavento
0 siblings, 0 replies; 9+ messages in thread
From: Davide Pesavento @ 2013-07-10 9:05 UTC (permalink / raw
To: gentoo-commits
commit: f101a3fe9c4d37078fb0d16e534c5de128fb35a3
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Jul 10 09:05:51 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jul 10 09:05:51 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f101a3fe
[dev-qt/qtcore:4] Sync with portage.
Package-Manager: portage-2.2.0_alpha186
---
...OST_JOIN.patch => moc-boost-lexical-cast.patch} | 0
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 10 ++-----
dev-qt/qtcore/qtcore-5.9999.ebuild | 31 ++++++++++++++++++++++
3 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch b/dev-qt/qtcore/files/moc-boost-lexical-cast.patch
similarity index 100%
rename from dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch
rename to dev-qt/qtcore/files/moc-boost-lexical-cast.patch
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index e7f143c..40c483b 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -28,7 +28,7 @@ PDEPEND="
"
PATCHES=(
- "${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch"
+ "${FILESDIR}/moc-boost-lexical-cast.patch"
)
pkg_setup() {
@@ -46,13 +46,7 @@ pkg_setup() {
tools/linguist/lupdate"
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt
- include/QtCore
- include/QtDeclarative
- include/QtGui
- include/QtNetwork
- include/QtScript
- include/QtXml
+ include
src/plugins/plugins.pro
src/plugins/qpluginbase.pri
src/src.pro
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index c6b55df..e4bf21b 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -50,3 +50,34 @@ src_configure() {
)
qt5-build_src_configure
}
+
+# Test dependencies
+#
+# kernel/qobject/test/test.pro: network
+# kernel/qpointer/qpointer.pro: widgets (opt)
+# kernel/qmetaproperty/qmetaproperty.pro: gui
+# kernel/qeventloop/qeventloop.pro: network
+# kernel/qsocketnotifier/qsocketnotifier.pro: network
+# kernel/qsignalmapper/qsignalmapper.pro: gui?
+# kernel/qmetaobject/qmetaobject.pro: gui
+# kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro: gui
+# kernel/qmimedata/qmimedata.pro: gui?
+# codecs/qtextcodec/test/test.pro: gui?
+# xml/qxmlstream/qxmlstream.pro: xml network
+# itemmodels/qabstractitemmodel/qabstractitemmodel.pro: gui?
+# itemmodels/qitemselectionmodel/qitemselectionmodel.pro: widgets
+# itemmodels/qabstractproxymodel/qabstractproxymodel.pro: gui?
+# itemmodels/qsortfilterproxymodel/qsortfilterproxymodel.pro: gui widgets
+# itemmodels/qidentityproxymodel/qidentityproxymodel.pro: gui?
+# itemmodels/qitemmodel/qitemmodel.pro: widgets sql
+# statemachine/qstatemachine/qstatemachine.pro: gui widgets (opt)
+# animation/qparallelanimationgroup/qparallelanimationgroup.pro: gui
+# animation/qpauseanimation/qpauseanimation.pro: gui
+# animation/qpropertyanimation/qpropertyanimation.pro: gui widgets
+# io/qiodevice/qiodevice.pro: network
+# io/qsettings/qsettings.pro: gui
+# io/qprocess/testGuiProcess/testGuiProcess.pro: widgets
+# io/qprocess/test/test.pro: network
+# io/qtextstream/test/test.pro: network
+# io/qdatastream/qdatastream.pro: gui?
+# io/qfile/test/test.pro: network
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
@ 2013-11-13 19:47 Johannes Huber
0 siblings, 0 replies; 9+ messages in thread
From: Johannes Huber @ 2013-11-13 19:47 UTC (permalink / raw
To: gentoo-commits
commit: 454ff99f4be796b36686e042ac4ff9259bfc1f87
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 19:47:03 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 19:47:03 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=454ff99f
[dev-qt/qtcore] Revision bump adds upstream patch to unbreak cmake qt5 builds.
Package-Manager: portage-2.2.7
---
.../qtcore-5.2.0_beta1-cmake-regression.patch | 58 ++++++++++++++++++++++
dev-qt/qtcore/qtcore-5.2.0_beta1-r1.ebuild | 56 +++++++++++++++++++++
2 files changed, 114 insertions(+)
diff --git a/dev-qt/qtcore/files/qtcore-5.2.0_beta1-cmake-regression.patch b/dev-qt/qtcore/files/qtcore-5.2.0_beta1-cmake-regression.patch
new file mode 100644
index 0000000..597c004
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.2.0_beta1-cmake-regression.patch
@@ -0,0 +1,58 @@
+From c0e826e244632d340d4bd4892ba450d19a70fca2 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <stephen.kelly@kdab.com>
+Date: Thu, 24 Oct 2013 15:14:59 +0200
+Subject: [PATCH] Set PRIVATE includes variable to empty, not undefined.
+
+This is necessary so that list(REMOVE_DUPLICATES) works properly.
+
+Change-Id: Id268637d76b1a8785c9ff0c6e09e9ad8a62bbfb6
+Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
+---
+ .../features/data/cmake/Qt5BasicConfig.cmake.in | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+index 0cdaafe..296ea2c 100644
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -95,7 +95,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
+ )
+ !!ELSE
+- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
++ set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ELSE
+ !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
+@@ -106,7 +106,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
+ )
+ !!ELSE
+- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
++ set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ELSE
+ set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\" \"$${CMAKE_INCLUDE_DIR}Qt$${CMAKE_MODULE_NAME}\")
+@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ \"$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
+ )
+ !!ELSE
+- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
++ set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ENDIF
+ !!ENDIF
+@@ -124,8 +124,8 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
+ !!ENDIF
+ !!ELSE
+- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS)
+- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
++ set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"\")
++ set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+
+ foreach(_dir ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
+--
+1.7.1
+
diff --git a/dev-qt/qtcore/qtcore-5.2.0_beta1-r1.ebuild b/dev-qt/qtcore/qtcore-5.2.0_beta1-r1.ebuild
new file mode 100644
index 0000000..48f1a41
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.2.0_beta1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+QT5_MODULE="qtbase"
+
+inherit qt5-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+
+IUSE="+glib icu"
+
+DEPEND="
+ >=dev-libs/libpcre-8.30[pcre16]
+ sys-libs/zlib
+ virtual/libiconv
+ glib? ( dev-libs/glib:2 )
+ icu? ( dev-libs/icu:= )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/tools/bootstrap
+ src/tools/moc
+ src/tools/rcc
+ src/corelib
+)
+QCONFIG_DEFINE=( QT_ZLIB )
+
+PATCHES=( "${FILESDIR}/${P}-cmake-regression.patch" )
+
+pkg_setup() {
+ QCONFIG_REMOVE=(
+ $(usev !glib)
+ $(usev !icu)
+ )
+
+ qt5-build_pkg_setup
+}
+
+src_configure() {
+ local myconf=(
+ $(qt_use glib)
+ -iconv
+ $(qt_use icu)
+ )
+ qt5-build_src_configure
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
@ 2014-05-12 16:32 Davide Pesavento
0 siblings, 0 replies; 9+ messages in thread
From: Davide Pesavento @ 2014-05-12 16:32 UTC (permalink / raw
To: gentoo-commits
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 <oswald.buddenhagen@digia.com>
+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 <joerg.bornemann@digia.com>
+---
+ 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 <oswald.buddenhagen@digia.com>
+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 <joerg.bornemann@digia.com>
+---
+ 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 <oswald.buddenhagen@digia.com>
+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 <joerg.bornemann@digia.com>
+---
+ 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 <oswald.buddenhagen@digia.com>
+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 <joerg.bornemann@digia.com>
+---
+ 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 <oswald.buddenhagen@digia.com>
+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 <joerg.bornemann@digia.com>
+---
+ 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 <oswald.buddenhagen@digia.com>
+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 <joerg.bornemann@digia.com>
+Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
+---
+ 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 <oswald.buddenhagen@digia.com>
+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 <joerg.bornemann@digia.com>
+Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
+---
+ 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)
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
@ 2014-07-07 20:46 Davide Pesavento
0 siblings, 0 replies; 9+ messages in thread
From: Davide Pesavento @ 2014-07-07 20:46 UTC (permalink / raw
To: gentoo-commits
commit: 1cc27193d3c0f467f208f0b876b3894ab3c7d9bc
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 7 20:46:38 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jul 7 20:46:38 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1cc27193
[dev-qt/qtcore:4] Sync with portage.
Package-Manager: portage-2.2.10
---
...ExcludeSocketNotifiers-in-glib-event-loop.patch | 81 +++++++++++++++++++
...h => qtcore-4.8.5-moc-boost-lexical-cast.patch} | 0
.../qtcore-4.8.5-qeventdispatcher-recursive.patch | 94 ++++++++++++++++++++++
dev-qt/qtcore/qtcore-4.8.6.ebuild | 4 +-
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 4 +-
5 files changed, 181 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch b/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch
new file mode 100644
index 0000000..0fcc1fa
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch
@@ -0,0 +1,81 @@
+From 267feb2de49eed0823ca0c29f1cd5238537c7116 Mon Sep 17 00:00:00 2001
+From: Jan-Marek Glogowski <glogow@fbihome.de>
+Date: Thu, 6 Mar 2014 18:44:43 +0100
+Subject: Honor ExcludeSocketNotifiers in glib event loop
+
+Implements QEventLoop::ExcludeSocketNotifiers in the same way
+QEventLoop::X11ExcludeTimers is already implemented for the glib
+event loop.
+
+This prevents crashes when QClipboard checks for clipboard events
+and
+ qApp->clipboard()->setProperty( "useEventLoopWhenWaiting", true );
+is set.
+
+Task-number: QTBUG-34614
+Task-number: QTBUG-37380
+
+Change-Id: Id4e2a74c6bdf8c3b439a4e3813d24d11368b607d
+---
+ src/corelib/kernel/qeventdispatcher_glib.cpp | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp
+index 0b0e308..ba522fa 100644
+--- a/src/corelib/kernel/qeventdispatcher_glib.cpp
++++ b/src/corelib/kernel/qeventdispatcher_glib.cpp
+@@ -65,6 +65,7 @@ struct GPollFDWithQSocketNotifier
+ struct GSocketNotifierSource
+ {
+ GSource source;
++ QEventLoop::ProcessEventsFlags processEventsFlags;
+ QList<GPollFDWithQSocketNotifier *> pollfds;
+ };
+
+@@ -80,6 +81,9 @@ static gboolean socketNotifierSourceCheck(GSource *source)
+ GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);
+
+ bool pending = false;
++ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
++ return pending;
++
+ for (int i = 0; !pending && i < src->pollfds.count(); ++i) {
+ GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
+
+@@ -103,6 +107,9 @@ static gboolean socketNotifierSourceDispatch(GSource *source, GSourceFunc, gpoin
+ QEvent event(QEvent::SockAct);
+
+ GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);
++ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
++ return true;
++
+ for (int i = 0; i < src->pollfds.count(); ++i) {
+ GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
+
+@@ -331,6 +338,7 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context)
+ reinterpret_cast<GSocketNotifierSource *>(g_source_new(&socketNotifierSourceFuncs,
+ sizeof(GSocketNotifierSource)));
+ (void) new (&socketNotifierSource->pollfds) QList<GPollFDWithQSocketNotifier *>();
++ socketNotifierSource->processEventsFlags = QEventLoop::AllEvents;
+ g_source_set_can_recurse(&socketNotifierSource->source, true);
+ g_source_attach(&socketNotifierSource->source, mainContext);
+
+@@ -416,6 +424,7 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
+ // tell postEventSourcePrepare() and timerSource about any new flags
+ QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
+ d->timerSource->processEventsFlags = flags;
++ d->socketNotifierSource->processEventsFlags = flags;
+
+ if (!(flags & QEventLoop::EventLoopExec)) {
+ // force timers to be sent at normal priority
+@@ -427,6 +436,7 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
+ result = g_main_context_iteration(d->mainContext, canWait);
+
+ d->timerSource->processEventsFlags = savedFlags;
++ d->socketNotifierSource->processEventsFlags = savedFlags;
+
+ if (canWait)
+ emit awake();
+--
+2.0.0
+
diff --git a/dev-qt/qtcore/files/moc-boost-lexical-cast.patch b/dev-qt/qtcore/files/qtcore-4.8.5-moc-boost-lexical-cast.patch
similarity index 100%
rename from dev-qt/qtcore/files/moc-boost-lexical-cast.patch
rename to dev-qt/qtcore/files/qtcore-4.8.5-moc-boost-lexical-cast.patch
diff --git a/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch b/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch
new file mode 100644
index 0000000..6d3bf2f
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch
@@ -0,0 +1,94 @@
+--- src/corelib/kernel/qeventdispatcher_glib.cpp.sav 2014-03-28 15:26:37.000000000 +0100
++++ src/corelib/kernel/qeventdispatcher_glib.cpp 2014-04-24 09:44:09.358659204 +0200
+@@ -255,22 +255,30 @@ struct GPostEventSource
+ GSource source;
+ QAtomicInt serialNumber;
+ int lastSerialNumber;
++ QEventLoop::ProcessEventsFlags processEventsFlags;
+ QEventDispatcherGlibPrivate *d;
+ };
+
+ static gboolean postEventSourcePrepare(GSource *s, gint *timeout)
+ {
++ GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
+ QThreadData *data = QThreadData::current();
+ if (!data)
+ return false;
+
++ QEventLoop::ProcessEventsFlags excludeAllFlags
++ = QEventLoop::ExcludeUserInputEvents
++ | QEventLoop::ExcludeSocketNotifiers
++ | QEventLoop::X11ExcludeTimers;
++ if ((source->processEventsFlags & excludeAllFlags) == excludeAllFlags)
++ return false;
++
+ gint dummy;
+ if (!timeout)
+ timeout = &dummy;
+ const bool canWait = data->canWaitLocked();
+ *timeout = canWait ? -1 : 0;
+
+- GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
+ return (!canWait
+ || (source->serialNumber != source->lastSerialNumber));
+ }
+@@ -284,8 +292,14 @@ static gboolean postEventSourceDispatch(
+ {
+ GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
+ source->lastSerialNumber = source->serialNumber;
+- QCoreApplication::sendPostedEvents();
+- source->d->runTimersOnceWithNormalPriority();
++ QEventLoop::ProcessEventsFlags excludeAllFlags
++ = QEventLoop::ExcludeUserInputEvents
++ | QEventLoop::ExcludeSocketNotifiers
++ | QEventLoop::X11ExcludeTimers;
++ if ((source->processEventsFlags & excludeAllFlags) != excludeAllFlags) {
++ QCoreApplication::sendPostedEvents();
++ source->d->runTimersOnceWithNormalPriority();
++ }
+ return true; // i dunno, george...
+ }
+
+@@ -329,6 +343,7 @@ QEventDispatcherGlibPrivate::QEventDispa
+ postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs,
+ sizeof(GPostEventSource)));
+ postEventSource->serialNumber = 1;
++ postEventSource->processEventsFlags = QEventLoop::AllEvents;
+ postEventSource->d = this;
+ g_source_set_can_recurse(&postEventSource->source, true);
+ g_source_attach(&postEventSource->source, mainContext);
+@@ -423,6 +438,7 @@ bool QEventDispatcherGlib::processEvents
+
+ // tell postEventSourcePrepare() and timerSource about any new flags
+ QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
++ d->postEventSource->processEventsFlags = flags;
+ d->timerSource->processEventsFlags = flags;
+ d->socketNotifierSource->processEventsFlags = flags;
+
+@@ -435,6 +451,7 @@ bool QEventDispatcherGlib::processEvents
+ while (!result && canWait)
+ result = g_main_context_iteration(d->mainContext, canWait);
+
++ d->postEventSource->processEventsFlags = savedFlags;
+ d->timerSource->processEventsFlags = savedFlags;
+ d->socketNotifierSource->processEventsFlags = savedFlags;
+
+--- src/corelib/kernel/qeventdispatcher_unix.cpp.sav 2013-06-07 07:16:52.000000000 +0200
++++ src/corelib/kernel/qeventdispatcher_unix.cpp 2014-04-24 09:43:06.927589535 +0200
+@@ -905,7 +905,15 @@ bool QEventDispatcherUNIX::processEvents
+
+ // we are awake, broadcast it
+ emit awake();
+- QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
++
++ QEventLoop::ProcessEventsFlags excludeAllFlags
++ = QEventLoop::ExcludeUserInputEvents
++ | QEventLoop::ExcludeSocketNotifiers
++ | QEventLoop::X11ExcludeTimers;
++ if ((flags & excludeAllFlags) == excludeAllFlags)
++ return false;
++ if(( flags & excludeAllFlags ) != excludeAllFlags )
++ QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
+
+ int nevents = 0;
+ const bool canWait = (d->threadData->canWaitLocked()
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index c446934..b7e20b6 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -29,7 +29,9 @@ PDEPEND="
"
PATCHES=(
- "${FILESDIR}/moc-boost-lexical-cast.patch"
+ "${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch"
+ "${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968
+ "${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
)
QT4_TARGET_DIRECTORIES="
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index c446934..b7e20b6 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -29,7 +29,9 @@ PDEPEND="
"
PATCHES=(
- "${FILESDIR}/moc-boost-lexical-cast.patch"
+ "${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch"
+ "${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968
+ "${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
)
QT4_TARGET_DIRECTORIES="
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
@ 2016-04-10 13:21 Davide Pesavento
0 siblings, 0 replies; 9+ messages in thread
From: Davide Pesavento @ 2016-04-10 13:21 UTC (permalink / raw
To: gentoo-commits
commit: 1e739fcf981d6299b73cf6c5611fbbbca611bc66
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 13:21:04 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 13:21:04 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=1e739fcf
dev-qt/qtcore: backport upstream patch fixing build against >=systemd-229-r100
Gentoo-Bug: 578316
Package-Manager: portage-2.2.28
dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch | 56 +++++++++++++++++++++++
dev-qt/qtcore/qtcore-5.6.0.ebuild | 4 ++
2 files changed, 60 insertions(+)
diff --git a/dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch b/dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch
new file mode 100644
index 0000000..edb58d1
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch
@@ -0,0 +1,56 @@
+From c689bcafd3196aad22372e8056fe0ccb13c15f35 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Fri, 12 Feb 2016 12:37:15 +0100
+Subject: Search for libsystemd first, fall back to libsystemd-journal
+
+systemd >= 209 merged the individual libraries libsystemd-journal,
+libsystemd-login, libsystemd-id128 and libsystemd-daemon into
+a single library, libsystemd. To ease the transition one could pass
+an option to its build to generate stub libraries and matching
+pkg-config files. With systemd >= 229 this option has now been
+removed, causing the build to fail when the journald option is
+enabled.
+
+Change-Id: I26670f207f1a9e79c16be5ce8c8a49353143c5ba
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
+Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
+---
+ config.tests/unix/journald/journald.pro | 6 +++++-
+ src/corelib/global/global.pri | 5 ++++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/config.tests/unix/journald/journald.pro b/config.tests/unix/journald/journald.pro
+index 2bb50ce..ea76564 100644
+--- a/config.tests/unix/journald/journald.pro
++++ b/config.tests/unix/journald/journald.pro
+@@ -1,6 +1,10 @@
+ SOURCES = journald.c
+
+ CONFIG += link_pkgconfig
+-PKGCONFIG_PRIVATE += libsystemd-journal
++
++packagesExist(libsystemd): \
++ PKGCONFIG_PRIVATE += libsystemd
++else: \
++ PKGCONFIG_PRIVATE += libsystemd-journal
+
+ CONFIG -= qt
+diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
+index aa4945f..dd84695 100644
+--- a/src/corelib/global/global.pri
++++ b/src/corelib/global/global.pri
+@@ -53,7 +53,10 @@ slog2 {
+
+ journald {
+ CONFIG += link_pkgconfig
+- PKGCONFIG_PRIVATE += libsystemd-journal
++ packagesExist(libsystemd): \
++ PKGCONFIG_PRIVATE += libsystemd
++ else: \
++ PKGCONFIG_PRIVATE += libsystemd-journal
+ DEFINES += QT_USE_JOURNALD
+ }
+
+--
+2.8.1
+
diff --git a/dev-qt/qtcore/qtcore-5.6.0.ebuild b/dev-qt/qtcore/qtcore-5.6.0.ebuild
index 8bff4ba..ef6a230 100644
--- a/dev-qt/qtcore/qtcore-5.6.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.6.0.ebuild
@@ -24,6 +24,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.5.1-libsystemd.patch" # bug 578316
+)
+
QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
src/tools/moc
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
@ 2018-06-14 22:14 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2018-06-14 22:14 UTC (permalink / raw
To: gentoo-commits
commit: 866a5388ddf06ec36a8ea8e36677fc4ef105c1fb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 14 19:45:13 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 14 19:45:13 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=866a5388
dev-qt/qtcore: Restore qt5_use_modules macro
See also: https://codereview.qt-project.org/#/c/232367/
Bug: https://bugs.gentoo.org/653646
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../qtcore-5.11.0-restore-qt5_use_modules.patch | 224 +++++++++++++++++++++
dev-qt/qtcore/qtcore-5.11.0.ebuild | 2 +
2 files changed, 226 insertions(+)
diff --git a/dev-qt/qtcore/files/qtcore-5.11.0-restore-qt5_use_modules.patch b/dev-qt/qtcore/files/qtcore-5.11.0-restore-qt5_use_modules.patch
new file mode 100644
index 00000000..3b1818d2
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.11.0-restore-qt5_use_modules.patch
@@ -0,0 +1,224 @@
+From d1bbe4acbd8ce09f8f4263bca1aa5682c6559c23 Mon Sep 17 00:00:00 2001
+From: Kevin Funk <kevin.funk@kdab.com>
+Date: Thu, 14 Jun 2018 14:50:39 +0200
+Subject: [PATCH] CMake: Restore qt5_use_modules() function
+
+It appears that in the 5 years since we deprecated this function, people
+have not stopped using it. The removal of qt5_use_modules() caused lots of
+troubles in packages still using it when they were compiled against Qt 5.11.0.
+
+Instead, let's revive this function and keep it for the Qt5 life time.
+
+See discussion on qt-development mailing list:
+ http://lists.qt-project.org/pipermail/development/2018-June/032837.html
+
+Change-Id: Ic263e3bb6706268cb9ea38a0711665f166a3aa9e
+---
+ src/corelib/Qt5CoreMacros.cmake | 51 ++++++++++++++++++++++
+ tests/auto/cmake/CMakeLists.txt | 1 +
+ .../cmake/test_use_modules_function/CMakeLists.txt | 18 ++++++++
+ .../auto/cmake/test_use_modules_function/three.cpp | 45 +++++++++++++++++++
+ tests/auto/cmake/test_use_modules_function/two.cpp | 43 ++++++++++++++++++
+ 5 files changed, 158 insertions(+)
+ create mode 100644 tests/auto/cmake/test_use_modules_function/CMakeLists.txt
+ create mode 100644 tests/auto/cmake/test_use_modules_function/three.cpp
+ create mode 100644 tests/auto/cmake/test_use_modules_function/two.cpp
+
+diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
+index 1627de40029..819b48f9734 100644
+--- a/src/corelib/Qt5CoreMacros.cmake
++++ b/src/corelib/Qt5CoreMacros.cmake
+@@ -294,3 +294,54 @@ function(QT5_ADD_RESOURCES outfiles )
+ endfunction()
+
+ set(_Qt5_COMPONENT_PATH "${CMAKE_CURRENT_LIST_DIR}/..")
++
++if (NOT CMAKE_VERSION VERSION_LESS 2.8.9)
++ macro(qt5_use_modules _target _link_type)
++ if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11)
++ if(CMAKE_WARN_DEPRECATED)
++ set(messageType WARNING)
++ endif()
++ if(CMAKE_ERROR_DEPRECATED)
++ set(messageType FATAL_ERROR)
++ endif()
++ if(messageType)
++ message(${messageType} "The qt5_use_modules macro is obsolete. Use target_link_libraries with IMPORTED targets instead.")
++ endif()
++ endif()
++
++ if (NOT TARGET ${_target})
++ message(FATAL_ERROR "The first argument to qt5_use_modules must be an existing target.")
++ endif()
++ if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" )
++ set(_qt5_modules ${ARGN})
++ set(_qt5_link_type ${_link_type})
++ else()
++ set(_qt5_modules ${_link_type} ${ARGN})
++ endif()
++
++ if ("${_qt5_modules}" STREQUAL "")
++ message(FATAL_ERROR "qt5_use_modules requires at least one Qt module to use.")
++ endif()
++
++ foreach(_module ${_qt5_modules})
++ if (NOT Qt5${_module}_FOUND)
++ find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH)
++ if (NOT Qt5${_module}_FOUND)
++ message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
++ endif()
++ endif()
++ target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES})
++ set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS})
++ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS})
++ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE QT_NO_DEBUG)
++ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO QT_NO_DEBUG)
++ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL QT_NO_DEBUG)
++ if (Qt5_POSITION_INDEPENDENT_CODE
++ AND (CMAKE_VERSION VERSION_LESS 2.8.12
++ AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
++ OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)))
++ set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE})
++ endif()
++ endforeach()
++ endmacro()
++endif()
+diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
+index f1d86570919..ec75ec7caf7 100644
+--- a/tests/auto/cmake/CMakeLists.txt
++++ b/tests/auto/cmake/CMakeLists.txt
+@@ -47,6 +47,7 @@ find_package(Qt5Core REQUIRED)
+
+ include("${_Qt5CTestMacros}")
+
++expect_pass(test_use_modules_function)
+ expect_pass(test_umbrella_config)
+ expect_pass(test_wrap_cpp_and_resources)
+ if (NOT NO_WIDGETS)
+diff --git a/tests/auto/cmake/test_use_modules_function/CMakeLists.txt b/tests/auto/cmake/test_use_modules_function/CMakeLists.txt
+new file mode 100644
+index 00000000000..be05c75054c
+--- /dev/null
++++ b/tests/auto/cmake/test_use_modules_function/CMakeLists.txt
+@@ -0,0 +1,18 @@
++
++cmake_minimum_required(VERSION 2.8)
++
++project(test_use_modules_function)
++
++set(CMAKE_AUTOMOC ON)
++
++set(CMAKE_INCLUDE_CURRENT_DIR ON)
++
++add_executable(two two.cpp)
++add_executable(three three.cpp)
++
++find_package(Qt5Core)
++
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
++
++qt5_use_modules(two Test)
++qt5_use_modules(three Gui Test)
+diff --git a/tests/auto/cmake/test_use_modules_function/three.cpp b/tests/auto/cmake/test_use_modules_function/three.cpp
+new file mode 100644
+index 00000000000..507cc8479d0
+--- /dev/null
++++ b/tests/auto/cmake/test_use_modules_function/three.cpp
+@@ -0,0 +1,45 @@
++/****************************************************************************
++**
++** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
++** Contact: https://www.qt.io/licensing/
++**
++** This file is part of the test suite of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:GPL-EXCEPT$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and The Qt Company. For licensing terms
++** and conditions see https://www.qt.io/terms-conditions. For further
++** information use the contact form at https://www.qt.io/contact-us.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3 as published by the Free Software
++** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
++** included in the packaging of this file. Please review the following
++** information to ensure the GNU General Public License requirements will
++** be met: https://www.gnu.org/licenses/gpl-3.0.html.
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include <QtTest>
++#include <QWindow>
++
++class Three : public QObject
++{
++ Q_OBJECT
++public:
++ Three(QObject *parent = 0)
++ {
++ QWindow *w = new QWindow;
++ w->show();
++ }
++};
++
++QTEST_MAIN(Three)
++
++#include "three.moc"
+diff --git a/tests/auto/cmake/test_use_modules_function/two.cpp b/tests/auto/cmake/test_use_modules_function/two.cpp
+new file mode 100644
+index 00000000000..44eb7fe96e3
+--- /dev/null
++++ b/tests/auto/cmake/test_use_modules_function/two.cpp
+@@ -0,0 +1,43 @@
++/****************************************************************************
++**
++** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
++** Contact: https://www.qt.io/licensing/
++**
++** This file is part of the test suite of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:GPL-EXCEPT$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and The Qt Company. For licensing terms
++** and conditions see https://www.qt.io/terms-conditions. For further
++** information use the contact form at https://www.qt.io/contact-us.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3 as published by the Free Software
++** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
++** included in the packaging of this file. Please review the following
++** information to ensure the GNU General Public License requirements will
++** be met: https://www.gnu.org/licenses/gpl-3.0.html.
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include <QtTest>
++
++class Two : public QObject
++{
++ Q_OBJECT
++public:
++ Two(QObject *parent = 0)
++ {
++
++ }
++};
++
++QTEST_MAIN(Two)
++
++#include "two.moc"
+--
+2.16.3
+
diff --git a/dev-qt/qtcore/qtcore-5.11.0.ebuild b/dev-qt/qtcore/qtcore-5.11.0.ebuild
index 48916104..8fa648a0 100644
--- a/dev-qt/qtcore/qtcore-5.11.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.11.0.ebuild
@@ -43,6 +43,8 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
)
+PATCHES=( "${FILESDIR}/${P}-restore-qt5_use_modules.patch" )
+
src_configure() {
local myconf=(
$(qt_use icu)
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
@ 2019-09-23 18:36 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2019-09-23 18:36 UTC (permalink / raw
To: gentoo-commits
commit: afbfb79dbd88738e4299f3a20e1622b886dcd9da
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 23 18:27:06 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 23 18:27:06 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=afbfb79d
dev-qt/qtcore: Fix hardcoded libdir path in some *.cmake configs
Thanks-to: Manuel Nickschas <sputnick <AT> quassel-irc.org>
Closes: https://bugs.gentoo.org/691462
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qtcore-5.13.1-Qt5BasicConfig-fix-libdir.patch | 38 ++++++++++++++++++++++
dev-qt/qtcore/qtcore-5.13.1.ebuild | 4 +++
2 files changed, 42 insertions(+)
diff --git a/dev-qt/qtcore/files/qtcore-5.13.1-Qt5BasicConfig-fix-libdir.patch b/dev-qt/qtcore/files/qtcore-5.13.1-Qt5BasicConfig-fix-libdir.patch
new file mode 100644
index 00000000..49b936f5
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.13.1-Qt5BasicConfig-fix-libdir.patch
@@ -0,0 +1,38 @@
+From cc32a691936f37eaaec618a71edd62f896009c9d Mon Sep 17 00:00:00 2001
+From: Joerg Bornemann <joerg.bornemann@qt.io>
+Date: Fri, 6 Sep 2019 10:54:44 +0200
+Subject: [PATCH] Fix CMake config files for -libdir different from "lib"
+
+When Qt was configured with -libdir different from "lib", one could not
+build with CMake whenever a static lib was pulled in (e.g. uitools).
+
+Do not hard-code "/lib" but use the correct variable also for static
+libraries.
+
+Fixes: QTBUG-76255
+Change-Id: I28c6861752e29e461247628d2b1f8a9ec32f0790
+Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
+Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de>
+---
+ mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+index d4fd057682d..f4a34d6e481 100644
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -53,7 +53,11 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
+ set(_lib_deps)
+ set(_link_flags)
+
+- get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE)
++!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
++ set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
++!!ELSE
++ set(_qt5_install_libs \"$${CMAKE_LIB_DIR}\")
++!!ENDIF
+
+ if(EXISTS \"${prl_file_location}\")
+ file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\")
+--
+2.16.3
diff --git a/dev-qt/qtcore/qtcore-5.13.1.ebuild b/dev-qt/qtcore/qtcore-5.13.1.ebuild
index d881786f..28ff5c1c 100644
--- a/dev-qt/qtcore/qtcore-5.13.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.13.1.ebuild
@@ -43,6 +43,10 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
)
+PATCHES=(
+ "${FILESDIR}/${P}-Qt5BasicConfig-fix-libdir.patch" # QTBUG-76255, bug #691462
+)
+
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-09-23 18:36 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-12 16:32 [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/ Davide Pesavento
-- strict thread matches above, loose matches on Subject: below --
2019-09-23 18:36 Andreas Sturmlechner
2018-06-14 22:14 Andreas Sturmlechner
2016-04-10 13:21 Davide Pesavento
2014-07-07 20:46 Davide Pesavento
2013-11-13 19:47 Johannes Huber
2013-07-10 9:05 Davide Pesavento
2013-03-08 18:39 Markos Chandras
2013-03-07 21:13 Markos Chandras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox