| 1 |
commit: 7ef265166468e2bdffbfc5d22b22e43f32af93d2 |
| 2 |
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 7 22:44:17 2012 +0000 |
| 4 |
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 7 22:44:17 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7ef26516 |
| 7 |
|
| 8 |
x11-libs/qt-core: qurl patch applied upstream. Remove it |
| 9 |
|
| 10 |
--- |
| 11 |
.../files/qt-core-4.8.0-qurl-regression-fix.patch | 18 ------------------ |
| 12 |
x11-libs/qt-core/qt-core-4.8.9999.ebuild | 4 ---- |
| 13 |
x11-libs/qt-core/qt-core-4.9999.ebuild | 4 ---- |
| 14 |
3 files changed, 0 insertions(+), 26 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
deleted file mode 100644 |
| 18 |
index 7999a0c..0000000 |
| 19 |
--- a/x11-libs/qt-core/files/qt-core-4.8.0-qurl-regression-fix.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,18 +0,0 @@ |
| 22 |
-QUrl.toLocalfile regression fix (incompatible change from Qt 4.7) |
| 23 |
- |
| 24 |
-http://mail.kde.org/pipermail/release-team/2011-December/005415.html |
| 25 |
-https://bugzilla.redhat.com/show_bug.cgi?id=749213 |
| 26 |
-https://bugreports.qt.nokia.com/browse/QTBUG-22382 |
| 27 |
- |
| 28 |
---- qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile |
| 29 |
-+++ qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp |
| 30 |
-@@ -6158,7 +6158,8 @@ QUrl QUrl::fromLocalFile(const QString & |
| 31 |
- QString QUrl::toLocalFile() const |
| 32 |
- { |
| 33 |
- // the call to isLocalFile() also ensures that we're parsed |
| 34 |
-- if (!isLocalFile()) |
| 35 |
-+ // Treat URLs with no scheme as local for backward compatibility |
| 36 |
-+ if (!isLocalFile() && (!d || !d->scheme.isEmpty())) |
| 37 |
- return QString(); |
| 38 |
- |
| 39 |
- QString tmp; |
| 40 |
|
| 41 |
diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild |
| 42 |
index 0c59c82..71e7b4d 100644 |
| 43 |
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild |
| 44 |
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild |
| 45 |
@@ -25,10 +25,6 @@ DEPEND="sys-libs/zlib |
| 46 |
RDEPEND="${DEPEND}" |
| 47 |
PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support] )" |
| 48 |
|
| 49 |
-PATCHES=( |
| 50 |
- "${FILESDIR}/${PN}-4.8.0-qurl-regression-fix.patch" |
| 51 |
-) |
| 52 |
- |
| 53 |
pkg_setup() { |
| 54 |
QT4_TARGET_DIRECTORIES=" |
| 55 |
src/tools/bootstrap |
| 56 |
|
| 57 |
diff --git a/x11-libs/qt-core/qt-core-4.9999.ebuild b/x11-libs/qt-core/qt-core-4.9999.ebuild |
| 58 |
index 0c59c82..71e7b4d 100644 |
| 59 |
--- a/x11-libs/qt-core/qt-core-4.9999.ebuild |
| 60 |
+++ b/x11-libs/qt-core/qt-core-4.9999.ebuild |
| 61 |
@@ -25,10 +25,6 @@ DEPEND="sys-libs/zlib |
| 62 |
RDEPEND="${DEPEND}" |
| 63 |
PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support] )" |
| 64 |
|
| 65 |
-PATCHES=( |
| 66 |
- "${FILESDIR}/${PN}-4.8.0-qurl-regression-fix.patch" |
| 67 |
-) |
| 68 |
- |
| 69 |
pkg_setup() { |
| 70 |
QT4_TARGET_DIRECTORIES=" |
| 71 |
src/tools/bootstrap |
Archives