pesa 15/05/06 21:48:06
Added: qthelp-4.8.6-compat-install.patch
qthelp-4.8.6-compat-syncqt.patch
Removed: qthelp-4.8.6-fix-compat.patch
Log:
Properly fix building with USE=compat by teaching syncqt how to generate
QtAssistant forwarding headers. Finally solves bug 529398.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
0xDADED6B2671CB57D!)
Revision Changes Path
1.1 dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch?rev=1.1&content-type=text/plain
Index: qthelp-4.8.6-compat-install.patch
===================================================================
>From 89f99089abe0c1369a78a3bb8e2a576c513ec809 Mon Sep 17 00:00:00 2001
From: Davide Pesavento <[email protected]>
Date: Wed, 6 May 2015 23:21:54 +0200
Subject: [PATCH] Install assistant_adp binary.
---
tools/assistant/compat/compat.pro | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/assistant/compat/compat.pro
b/tools/assistant/compat/compat.pro
index 171106a..a14e3f8 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 \
--
2.4.0
1.1 dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch?rev=1.1&content-type=text/plain
Index: qthelp-4.8.6-compat-syncqt.patch
===================================================================
>From 37725ccec4d26148dde377d78c71046e8b6a6de9 Mon Sep 17 00:00:00 2001
From: Davide Pesavento <[email protected]>
Date: Wed, 6 May 2015 22:44:57 +0200
Subject: [PATCH] Teach syncqt how to handle the QtAssistant compat headers.
See https://bugs.gentoo.org/show_bug.cgi?id=529398#c47
---
bin/syncqt | 1 +
1 file changed, 1 insertion(+)
diff --git a/bin/syncqt b/bin/syncqt
index dd94d4d..cc5a7bf 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -81,6 +81,7 @@ my %modules = ( # path to module name map
"ActiveQt" => "$basedir/src/activeqt",
"QtTest" => "$basedir/src/testlib",
"QtHelp" => "$basedir/tools/assistant/lib",
+ "QtAssistant" => "$basedir/tools/assistant/compat/lib",
"QtDesigner" => "$basedir/tools/designer/src/lib",
"QtUiTools" => "$basedir/tools/designer/src/uitools",
"QtDBus" => "$basedir/src/dbus",
--
2.4.0
