commit: 789292b21b56c2492279595820abdd67b6c69a57
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 26 02:55:11 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jan 26 02:55:11 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=789292b2
[dev-qt/qthelp:4] Sync.
Package-Manager: portage-2.2.15
---
dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch | 21 ------------
dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch | 40 +++++++++++++++++++++++
dev-qt/qthelp/qthelp-4.8.9999.ebuild | 4 +--
3 files changed, 42 insertions(+), 23 deletions(-)
diff --git a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch
b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch
deleted file mode 100644
index cc76219..0000000
--- a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tools/assistant/compat/compat.pro 2010-10-08 16:54:09.804000000 +0300
-+++ tools/assistant/compat/compat.pro 2010-10-08 16:54:37.884000000 +0300
-@@ -14,6 +14,8 @@
-
- PROJECTNAME = Assistant
-
-+DESTDIR = ../../../bin
-+
- FORMS += helpdialog.ui \
- mainwindow.ui \
- tabbedbrowser.ui \
-@@ -59,6 +61,9 @@
- TARGET = Assistant_adp
- }
-
-+target.path=$$[QT_INSTALL_BINS]
-+INSTALLS += target
-+
- TRANSLATIONS = translations/assistant_adp_de.ts \
- translations/assistant_adp_ja.ts \
- translations/assistant_adp_pl.ts \
diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch
b/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch
new file mode 100644
index 0000000..bdebfd5
--- /dev/null
+++ b/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch
@@ -0,0 +1,40 @@
+ tools/assistant/compat/compat.pro | 5 +++++
+ tools/assistant/compat/lib/lib.pro | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tools/assistant/compat/compat.pro
b/tools/assistant/compat/compat.pro
+index 171106a..51b8d5b 100755
+--- a/tools/assistant/compat/compat.pro
++++ b/tools/assistant/compat/compat.pro
+@@ -14,6 +14,8 @@ QT += xml network
+
+ PROJECTNAME = Assistant
+
++DESTDIR = ../../../bin
++
+ FORMS += helpdialog.ui \
+ mainwindow.ui \
+ tabbedbrowser.ui \
+@@ -59,6 +61,9 @@ mac {
+ TARGET = Assistant_adp
+ }
+
++target.path=$$[QT_INSTALL_BINS]
++INSTALLS += target
++
+ TRANSLATIONS = translations/assistant_adp_de.ts \
+ translations/assistant_adp_ja.ts \
+ translations/assistant_adp_pl.ts \
+diff --git a/tools/assistant/compat/lib/lib.pro
b/tools/assistant/compat/lib/lib.pro
+index e50d470..8973d43 100755
+--- a/tools/assistant/compat/lib/lib.pro
++++ b/tools/assistant/compat/lib/lib.pro
+@@ -31,7 +31,7 @@ contains(CONFIG, static) {
+
+ #load up the headers info
+ CONFIG += qt_install_headers
+-HEADERS_PRI = $$QT_BUILD_TREE/include/QtAssistant/headers.pri
++HEADERS_PRI = $$QT_SOURCE_TREE/include/QtAssistant/headers.pri
+ include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
+
+ #mac frameworks
diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 55ad8ad..edb13ad 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -58,7 +58,7 @@ src_unpack() {
}
src_prepare() {
- use compat && PATCHES+=("${FILESDIR}/${PN}-4.8.5-fix-compat.patch")
+ use compat && PATCHES+=("${FILESDIR}/${PN}-4.8.6-fix-compat.patch")
qt4-build-multilib_src_prepare
