* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/, x11-libs/qt-core/files/
@ 2012-02-07 22:45 Markos Chandras
0 siblings, 0 replies; 5+ messages in thread
From: Markos Chandras @ 2012-02-07 22:45 UTC (permalink / raw
To: gentoo-commits
commit: 7ef265166468e2bdffbfc5d22b22e43f32af93d2
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 7 22:44:17 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Tue Feb 7 22:44:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7ef26516
x11-libs/qt-core: qurl patch applied upstream. Remove it
---
.../files/qt-core-4.8.0-qurl-regression-fix.patch | 18 ------------------
x11-libs/qt-core/qt-core-4.8.9999.ebuild | 4 ----
x11-libs/qt-core/qt-core-4.9999.ebuild | 4 ----
3 files changed, 0 insertions(+), 26 deletions(-)
diff --git a/x11-libs/qt-core/files/qt-core-4.8.0-qurl-regression-fix.patch b/x11-libs/qt-core/files/qt-core-4.8.0-qurl-regression-fix.patch
deleted file mode 100644
index 7999a0c..0000000
--- a/x11-libs/qt-core/files/qt-core-4.8.0-qurl-regression-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-QUrl.toLocalfile regression fix (incompatible change from Qt 4.7)
-
-http://mail.kde.org/pipermail/release-team/2011-December/005415.html
-https://bugzilla.redhat.com/show_bug.cgi?id=749213
-https://bugreports.qt.nokia.com/browse/QTBUG-22382
-
---- qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile
-+++ qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp
-@@ -6158,7 +6158,8 @@ QUrl QUrl::fromLocalFile(const QString &
- QString QUrl::toLocalFile() const
- {
- // the call to isLocalFile() also ensures that we're parsed
-- if (!isLocalFile())
-+ // Treat URLs with no scheme as local for backward compatibility
-+ if (!isLocalFile() && (!d || !d->scheme.isEmpty()))
- return QString();
-
- QString tmp;
diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index 0c59c82..71e7b4d 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -25,10 +25,6 @@ DEPEND="sys-libs/zlib
RDEPEND="${DEPEND}"
PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support] )"
-PATCHES=(
- "${FILESDIR}/${PN}-4.8.0-qurl-regression-fix.patch"
-)
-
pkg_setup() {
QT4_TARGET_DIRECTORIES="
src/tools/bootstrap
diff --git a/x11-libs/qt-core/qt-core-4.9999.ebuild b/x11-libs/qt-core/qt-core-4.9999.ebuild
index 0c59c82..71e7b4d 100644
--- a/x11-libs/qt-core/qt-core-4.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.9999.ebuild
@@ -25,10 +25,6 @@ DEPEND="sys-libs/zlib
RDEPEND="${DEPEND}"
PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support] )"
-PATCHES=(
- "${FILESDIR}/${PN}-4.8.0-qurl-regression-fix.patch"
-)
-
pkg_setup() {
QT4_TARGET_DIRECTORIES="
src/tools/bootstrap
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/, x11-libs/qt-core/files/
@ 2012-05-06 14:55 Davide Pesavento
0 siblings, 0 replies; 5+ messages in thread
From: Davide Pesavento @ 2012-05-06 14:55 UTC (permalink / raw
To: gentoo-commits
commit: 4ad28f59f3280c4a0589d436fda41923d354fb00
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun May 6 14:54:43 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 6 14:54:43 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4ad28f59
[x11-libs/qt-core] Sync with portage.
---
.../files/moc-workaround-for-boost-1.48.patch | 11 +++++++++++
x11-libs/qt-core/qt-core-4.8.9999.ebuild | 10 +++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/x11-libs/qt-core/files/moc-workaround-for-boost-1.48.patch b/x11-libs/qt-core/files/moc-workaround-for-boost-1.48.patch
new file mode 100644
index 0000000..8d92ca9
--- /dev/null
+++ b/x11-libs/qt-core/files/moc-workaround-for-boost-1.48.patch
@@ -0,0 +1,11 @@
+diff -urN qt-everywhere-opensource-src-4.8.1.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.1/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.1.orig/src/tools/moc/main.cpp 2012-05-04 18:45:34.122912347 +0200
++++ qt-everywhere-opensource-src-4.8.1/src/tools/moc/main.cpp 2012-05-04 18:51:28.267484929 +0200
+@@ -187,6 +187,7 @@
+ Moc moc;
+ pp.macros["Q_MOC_RUN"];
+ pp.macros["__cplusplus"];
++ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; // Gentoo bug #401551
+ QByteArray filename;
+ QByteArray output;
+ FILE *in = 0;
diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index 3a56e19..99288ce 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -8,11 +8,7 @@ inherit qt4-build
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
+KEYWORDS=""
IUSE="+glib iconv optimized-qmake qt3support ssl"
DEPEND="
@@ -27,6 +23,10 @@ PDEPEND="
qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,glib=,qpa=,qt3support] )
"
+PATCHES=(
+ "${FILESDIR}/moc-workaround-for-boost-1.48.patch"
+)
+
pkg_setup() {
QT4_TARGET_DIRECTORIES="
src/tools/bootstrap
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/, x11-libs/qt-core/files/
@ 2012-12-05 20:34 Markos Chandras
0 siblings, 0 replies; 5+ messages in thread
From: Markos Chandras @ 2012-12-05 20:34 UTC (permalink / raw
To: gentoo-commits
commit: 9b80cb0575119daa2190b964f00044f022fc1760
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 5 20:15:43 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Dec 5 20:15:43 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9b80cb05
x11-libs/qt-core-4.8.9999: Remove unneeded patch
---
.../files/moc-workaround-for-boost-1.48.patch | 11 -----------
x11-libs/qt-core/qt-core-4.8.9999.ebuild | 4 ----
2 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/x11-libs/qt-core/files/moc-workaround-for-boost-1.48.patch b/x11-libs/qt-core/files/moc-workaround-for-boost-1.48.patch
deleted file mode 100644
index 8d92ca9..0000000
--- a/x11-libs/qt-core/files/moc-workaround-for-boost-1.48.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN qt-everywhere-opensource-src-4.8.1.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.1/src/tools/moc/main.cpp
---- qt-everywhere-opensource-src-4.8.1.orig/src/tools/moc/main.cpp 2012-05-04 18:45:34.122912347 +0200
-+++ qt-everywhere-opensource-src-4.8.1/src/tools/moc/main.cpp 2012-05-04 18:51:28.267484929 +0200
-@@ -187,6 +187,7 @@
- Moc moc;
- pp.macros["Q_MOC_RUN"];
- pp.macros["__cplusplus"];
-+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; // Gentoo bug #401551
- QByteArray filename;
- QByteArray output;
- FILE *in = 0;
diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index a1e330d..0120ed7 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -28,10 +28,6 @@ PDEPEND="
qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support] )
"
-PATCHES=(
- "${FILESDIR}/moc-workaround-for-boost-1.48.patch"
-)
-
pkg_setup() {
QT4_TARGET_DIRECTORIES="
src/tools/bootstrap
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/, x11-libs/qt-core/files/
@ 2012-12-22 1:04 Davide Pesavento
0 siblings, 0 replies; 5+ messages in thread
From: Davide Pesavento @ 2012-12-22 1:04 UTC (permalink / raw
To: gentoo-commits
commit: 290bfc1f5f9d6d07c545e3e1381ae4911cb34e41
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Dec 22 01:04:07 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Dec 22 01:04:07 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=290bfc1f
[x11-libs/qt-core:5] Fix bug 448092.
Patch backported from upstream stable branch.
Package-Manager: portage-2.2.0_alpha149
---
| 59 ++++++++++++++++++++
...t-core-5.0.0.ebuild => qt-core-5.0.0-r1.ebuild} | 6 ++-
x11-libs/qt-core/qt-core-5.0.9999.ebuild | 2 +-
x11-libs/qt-core/qt-core-5.9999.ebuild | 2 +-
4 files changed, 66 insertions(+), 3 deletions(-)
--git a/x11-libs/qt-core/files/5.0.0-fix-installation-of-aux-headers.patch b/x11-libs/qt-core/files/5.0.0-fix-installation-of-aux-headers.patch
new file mode 100644
index 0000000..8e478e8
--- /dev/null
+++ b/x11-libs/qt-core/files/5.0.0-fix-installation-of-aux-headers.patch
@@ -0,0 +1,59 @@
+From cc90d4a563c070a58dadba7f0e98f252a080d225 Mon Sep 17 00:00:00 2001
+From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
+Date: Wed, 12 Dec 2012 12:16:09 +0100
+Subject: [PATCH] fix installation of aux headers
+
+the source paths need to be made relative to the main source dir
+
+Change-Id: I98d74eca7e54d1179ab602bb87b96b66f3193ce4
+Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
+---
+ bin/syncqt | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/bin/syncqt b/bin/syncqt
+index ff55a9a..ac81b0a 100755
+--- a/bin/syncqt
++++ b/bin/syncqt
+@@ -964,7 +964,7 @@ foreach my $lib (@modules_to_sync) {
+ if($public_header) {
+ #deal with the install directives
+ if($public_header) {
+- my $pri_install_iheader = fixPaths($iheader, $current_dir);
++ my $pri_install_iheader = fixPaths($iheader, $dir);
+ foreach my $class (@classes) {
+ # Strip namespaces:
+ $class =~ s/^.*:://;
+@@ -972,23 +972,24 @@ foreach my $lib (@modules_to_sync) {
+ # $class =~ s,::,/,g;
+ # }
+ my $class_header = fixPaths("$out_basedir/include/$lib/$class",
+- $current_dir) . " ";
++ $dir) . " ";
+ $pri_install_classes .= $class_header
+ unless($pri_install_classes =~ $class_header);
+ }
+ if ($explicitheaders{$lib}{basename($iheader)}) {
+- my $compat_header = fixPaths("$out_basedir/include/$lib/$explicitheaders{$lib}{basename($iheader)}", $current_dir) . " ";
++ my $compat_header = fixPaths("$out_basedir/include/$lib/$explicitheaders{$lib}{basename($iheader)}",
++ $dir) . " ";
+ $pri_install_files .= $compat_header unless($pri_install_files =~ $compat_header);
+ }
+ $pri_install_files.= "$pri_install_iheader ";;
+ }
+ }
+ elsif ($qpa_header) {
+- my $pri_install_iheader = fixPaths($iheader, $current_dir);
++ my $pri_install_iheader = fixPaths($iheader, $dir);
+ $pri_install_qpafiles.= "$pri_install_iheader ";;
+ }
+ else {
+- my $pri_install_iheader = fixPaths($iheader, $current_dir);
++ my $pri_install_iheader = fixPaths($iheader, $dir);
+ $pri_install_pfiles.= "$pri_install_iheader ";;
+ }
+ }
+--
+1.8.0.2
+
diff --git a/x11-libs/qt-core/qt-core-5.0.0.ebuild b/x11-libs/qt-core/qt-core-5.0.0-r1.ebuild
similarity index 89%
rename from x11-libs/qt-core/qt-core-5.0.0.ebuild
rename to x11-libs/qt-core/qt-core-5.0.0-r1.ebuild
index 3bcc375..9d689aa 100644
--- a/x11-libs/qt-core/qt-core-5.0.0.ebuild
+++ b/x11-libs/qt-core/qt-core-5.0.0-r1.ebuild
@@ -21,10 +21,14 @@ DEPEND="
sys-libs/zlib
virtual/libiconv
glib? ( dev-libs/glib:2 )
- icu? ( >=dev-libs/icu-49 )
+ icu? ( dev-libs/icu )
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PV}-fix-installation-of-aux-headers.patch"
+)
+
QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
src/tools/moc
diff --git a/x11-libs/qt-core/qt-core-5.0.9999.ebuild b/x11-libs/qt-core/qt-core-5.0.9999.ebuild
index 3bcc375..7a811a6 100644
--- a/x11-libs/qt-core/qt-core-5.0.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-5.0.9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="
sys-libs/zlib
virtual/libiconv
glib? ( dev-libs/glib:2 )
- icu? ( >=dev-libs/icu-49 )
+ icu? ( dev-libs/icu )
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-core/qt-core-5.9999.ebuild b/x11-libs/qt-core/qt-core-5.9999.ebuild
index 3bcc375..7a811a6 100644
--- a/x11-libs/qt-core/qt-core-5.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-5.9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="
sys-libs/zlib
virtual/libiconv
glib? ( dev-libs/glib:2 )
- icu? ( >=dev-libs/icu-49 )
+ icu? ( dev-libs/icu )
"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/, x11-libs/qt-core/files/
@ 2013-02-15 10:51 Davide Pesavento
0 siblings, 0 replies; 5+ messages in thread
From: Davide Pesavento @ 2013-02-15 10:51 UTC (permalink / raw
To: gentoo-commits
commit: e650c5e2993cca1a271626d6f4ea3291369dbeb7
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Feb 15 10:49:45 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Feb 15 10:49:45 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e650c5e2
[x11-libs/qt-core:4] Apply moc-workaround-for-BOOST_JOIN to live ebuild too.
---
.../files/moc-workaround-for-BOOST_JOIN.patch | 15 +++++++++++++++
x11-libs/qt-core/qt-core-4.8.9999.ebuild | 4 ++++
2 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/x11-libs/qt-core/files/moc-workaround-for-BOOST_JOIN.patch b/x11-libs/qt-core/files/moc-workaround-for-BOOST_JOIN.patch
new file mode 100644
index 0000000..fa82334
--- /dev/null
+++ b/x11-libs/qt-core/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/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index 37baee3..509b5da 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -28,6 +28,10 @@ PDEPEND="
qt3support? ( ~x11-libs/qt-gui-${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] 5+ messages in thread
end of thread, other threads:[~2013-02-15 10:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-06 14:55 [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/, x11-libs/qt-core/files/ Davide Pesavento
-- strict thread matches above, loose matches on Subject: below --
2013-02-15 10:51 Davide Pesavento
2012-12-22 1:04 Davide Pesavento
2012-12-05 20:34 Markos Chandras
2012-02-07 22:45 Markos Chandras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox