From 8d94836bebfcb3e6613e650e94f287718037feae Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Wed, 6 May 2015 21:48:13 +0000 Subject: [PATCH] Properly fix building with USE=compat by teaching syncqt how to generate QtAssistant forwarding headers. Finally solves bug 529398. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xDADED6B2671CB57D! --- dev-qt/qthelp/ChangeLog | 11 ++++- dev-qt/qthelp/Manifest | 35 ++++++++-------- .../files/qthelp-4.8.6-compat-install.patch | 35 ++++++++++++++++ .../files/qthelp-4.8.6-compat-syncqt.patch | 25 ++++++++++++ .../files/qthelp-4.8.6-fix-compat.patch | 40 ------------------- ...4.8.6-r2.ebuild => qthelp-4.8.6-r3.ebuild} | 14 +++---- 6 files changed, 94 insertions(+), 66 deletions(-) create mode 100644 dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch create mode 100644 dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch delete mode 100644 dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch rename dev-qt/qthelp/{qthelp-4.8.6-r2.ebuild => qthelp-4.8.6-r3.ebuild} (86%) diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog index 61cd20c22592..d2d8bdac7670 100644 --- a/dev-qt/qthelp/ChangeLog +++ b/dev-qt/qthelp/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-qt/qthelp # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.37 2015/03/08 14:01:23 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.38 2015/05/06 21:48:06 pesa Exp $ + +*qthelp-4.8.6-r3 (06 May 2015) + + 06 May 2015; Davide Pesavento + +files/qthelp-4.8.6-compat-install.patch, + +files/qthelp-4.8.6-compat-syncqt.patch, +qthelp-4.8.6-r3.ebuild, + -files/qthelp-4.8.6-fix-compat.patch, -qthelp-4.8.6-r2.ebuild: + Properly fix building with USE=compat by teaching syncqt how to generate + QtAssistant forwarding headers. Finally solves bug 529398. 08 Mar 2015; Davide Pesavento qthelp-5.4.1.ebuild: Remove all keywords from "live" branch. diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest index 3b1e7e4e1edc..084ccce72bdb 100644 --- a/dev-qt/qthelp/Manifest +++ b/dev-qt/qthelp/Manifest @@ -2,33 +2,34 @@ Hash: SHA256 AUX qthelp-4.8.5-fix-compat.patch 537 SHA256 625a9f9e1a0dd4c9e44ec40c119a88922f387028c988dce5ecca6dca848799ac SHA512 2de58b8830d82ee35d2d74c2809930c0a5e2df8be14eee73464c875100b9106249cbaefc7f4218f46a298908755312d6a1fd58013f089bbf105c931f93728b39 WHIRLPOOL d27b279fcfefcdf75b863f1ecab68d051c626eb2ff0d994545ec596133ffd528fe5aa5e94442f699f5fb1bb438e46d7b1d06daf295a97e475eab12a315421340 -AUX qthelp-4.8.6-fix-compat.patch 1245 SHA256 832c5bf8d6102c68207be641026e31f54ee985969bc4f2c9fb1f9bd9a0487a18 SHA512 28b14bab741fa8d9a594aac745a28307624715f7c42bf1d857406f7b2ee8f50860be1b43e0cd5535c0631f9d546bbec147359d81f00cd0029fa45f5fab122d93 WHIRLPOOL 1f4129c9c5260265b8fd9ac94543d46ef0e16f447d5fb1dfe8632b692c525d6fde3245f05b3f1447d5639287931dc8c686053ad2fed0e2809a4ffcb737152bb7 +AUX qthelp-4.8.6-compat-install.patch 899 SHA256 23628bd66004fad412e60955fc68f23d2b7ee4e64653827e627c900a2a5c3fd9 SHA512 dc960f735a92a8bfa7a10e2c898eeb1dbdbf273cf342af3b0924240a1f3bc15694e86679b0f6cbd28f24246bfad3a5d799a6f383503deafa5b4adeb368a69158 WHIRLPOOL 5a08e3a6c47607de689d8ecc92fd202f4a02c2ac95171c12d2e52a489c8ee5ede9d2e6595ab7e77b7eb93c43150efca77dee974acc96b541f9cd9404ff141bf4 +AUX qthelp-4.8.6-compat-syncqt.patch 884 SHA256 bfdebf61b84520f38099f683023c315586f58398d95cbcf436ec0673c414d58d SHA512 ee18303ca95569a66b1680f10a65766d67caca33928eb5d4f7ae2a4ffa883caa32dcb4adf7f48536e5bf78dcc26d30521c1309e9dfb0226284322220895ec20a WHIRLPOOL 1c3342c741cd4731ed72aeaded1a48898dd0d1a13f1afc36a76a14744c96d703084a5ca507b6f6769795a59e339ebd7c312128e0246eb7f52aaf84b187c14838 DIST qt-assistant-compat-headers-4.7.tar.gz 448 SHA256 73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb WHIRLPOOL 26c42c101aab36a8d0355f1243226f6b8bd5a477c5aafece7e036f18a9fcfe98ae016042befe494fca0c42b825e29539825466c1ddb720102fa6c65e9cbaec61 DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106 WHIRLPOOL 9c2822ae2f1ee7c4f63236cc95eb0cb025f088e1f13e0a154fabdad5af6209b0e4cdda86d23061bf35fe5919a1909ed162bbc4835da79fdf1b187461aa948a1b DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84 DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286 EBUILD qthelp-4.8.5-r2.ebuild 3221 SHA256 557c2fb440f163e93fe5088223840c76d9b267fb0c1715e0584ed2ee3f668043 SHA512 84b2f11866c095d31c7833653ac7f65da0f8a821a5af213f4759df6d34baf749fce440004b22eabea79863b6bf204b8e0dc454be0365fdced036c8e6c5a49d21 WHIRLPOOL 2954c1bd8dc09abd85a56402854ff99477b2b434e74a70ffaa8c47c0e4ebdd5e007cc98f15c2ef69c7e1284700dc95d4423a6e785588c1316681bf9314f655ac -EBUILD qthelp-4.8.6-r2.ebuild 3311 SHA256 2a27ad09db5e4b4b96adffcab58b2b3edb61bdd78fec3cadce7fb86472ce4ace SHA512 cb8a5f7da3d6cfdc9bc69db694ac939d41e45c13af0dde76f9ec4cb4b99c72a7e512299a47a6cc99ff66c8163ad863cf63de21e065267cd671787bf9ba5417e8 WHIRLPOOL 506e4c70b515a855bca136360591be73c6295af62ffc16f049ccd66170f6d7d2bed84dcf57d56c0a210f8b443b8f7103a631a74334327ce96ad265ac3190d586 +EBUILD qthelp-4.8.6-r3.ebuild 3211 SHA256 bdb2bd86be65e7ccb4278ffa66bd8d1ca6976decffcc114bf2220b736704f0d0 SHA512 d3cc94f77a66a721cf41feb927ce5207791afc1f421e11beac023320be917b2d99b888404eefbcb35aed5be78e6bd66577f91488bb36c7004e3493219d7eb783 WHIRLPOOL e282965e0bc7bb122aef051331a03f6e6377428c36f48c7e3d7a7fbc9e93164be317ef0729562e934b4267ce7583f64cfe5bbdfc3113375347e67f554e34fd47 EBUILD qthelp-5.4.1.ebuild 793 SHA256 ab1e1d97790b7898b0aceeea5ed94e70b8c16b9a05cfa39ea323b60c51388282 SHA512 f95d08f5f88956536e0fb619a314b301ad8f17a4f8069323f94342c8cad05bdc8355a25302f92bcd5aee98ce57e48d6d414380f20932280795b27dd66ae2cd70 WHIRLPOOL 6d0fe821cc665fa888c4df68ddb97178650b934269fba073dc760cd8bbb36b1ebdfd3957c743dabda769858961ece751d98cdd8b9818a184b5a21d325212540a -MISC ChangeLog 26833 SHA256 fe6373e6c24d9cbe8b60cd1dd621e59ba1c8c64dad5e4b2e1c10fb250b228395 SHA512 d7440be5b9d4c119701e9a187a1eca16c6ba82c9ceecb44e766b45d256a3a0c37e9c9cef36735c2fc169c0f87bd30989a268f296a264016cd3d76941bf28837b WHIRLPOOL 7ed57cb94eb2d364449f7c28dc01538675bfbdabc41da4b1afbd0b37d8f0045a45423950a2a0f301139eaa5f2b73f3d143622374ba36241613eebeaf9148cae3 +MISC ChangeLog 27229 SHA256 b8c81f4e1e1f8b80d8923fc3bf1edf5c458893576ac7ff2e883631ec35d7796a SHA512 23aa3df4f7ffdef846afa038dc44fa37b8302655ca258a62eb6ad2fd8de58c9f67382b3a91175681278c1e4862ddb6ef9a68e04c51b9cade55858f1bfe5272fa WHIRLPOOL b6128c4081650351bacb7bdc1ab509ed9279a6b7ceeed09808936e7f4720e285bcfa1f45e0a106bcfa85a8216f5117b6877688d5252ccf25dd783a533b84a152 MISC metadata.xml 619 SHA256 a0279b54456f15f87f3ab0eab4f541e2273a76eeb25219e7810cc0a3a379953c SHA512 c5fbfbe51cc9ccc483f3472fa616ba62c50ab83d731e7f91917cef5fc56cd3d6afd13e250e8b4ecc3f2faff68053cbed79290363c5ac16c9a17caba1c98cad30 WHIRLPOOL 5d509445f34c0cef9ecc5ac0dc3b2f1e54c725682ab1bf0d465b988de71c6c52a30b561c0923f2885de375385b9be42e8c4288cdeb5f1bde088851d317768c03 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJU/FY0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVSowdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE -QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9RGsQAKAv+/jxe7IHTuZs3hUEoWEQ -eP7QXLwOrDnV/6JfhHyFkCO7QNR7F//JDNQTcvWKNGqRXFFF82boL6vzl2ErvZVX -pscOh8ImE4DQIBV1l4D5NVIyehPu9/w5EgV4IgrJPwxK2KNPrKr2Ii4YLSW93bWP -FugfnjuQMZ6qBMsSzQ3Z88VBIm1KBQ2Pck3KAkMT7VFGyld5f6ZIht4zyB9Q6GKn -z5yNUYL96T+1aymKnEflAT3ES04UqOJO6hoei0o8CmpHteItwTK97blc7jHtOCWH -3+1X/rY0pysssXDtLmSgUrDk8MOBNb5C/xbJNh+fmHJNA+DTdskMaa83R3TPbMpA -mbTJ0jwsHCWLeHZpZpKCPBpSNtXgccIOZjtzjMyMqU4uIfRybqV0dCrYve3Cfft5 -3Iabkn/GksdI4j6LXocYeJi8T+ZZDxYLMQxwqzFbUN2XcIiU3Yok1RkyeWZkDdjt -4X5fodDw+I+NZXe7kocexAqe4aDj5fIovCD3pb8ihv6HvmtXPWZSSyEEObzK3m2P -ncKPnrvtpHN29CIjVZqJPltZrYfqOG+nJT9yesqeSPzdKn6pTNDJl3PccZTRIxFj -hAThWtyn7Psj1RHIPn0B+DaecfRvFMBTRESh6ysp4qKqgMaetvWy5nR4jBxusqkx -dvm4Ly/0ApshKk62qArX -=PxoO +QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9MSQP/R4mUOx1k84aQzjjXB5D2fkO +YnVaWPNsqhCXcKx6lGUajXIpwLkXEZ5S8JmaEDCp0Pl6Iy5uEWMCyxackWpwUMix +ZzyWt4/DxitsI6mFXmWoSEs+j1QiDSyDw1qI1QjRhzgbPQDnuoq+ZotzjJy6Poiv +wIRjqYHBmreHljCVLGzeMZM6aV9Dv9yxeaxyobQLdMEKoVx36QL2CIoGKmGxLlM4 +diFYstXjJFiNn9c6hQjWPiiTzkvlZSLvgU9BZlLQO4IedD9aRmj1SplN80Tr+g9K +FcrJ85BzulTZYfJ4QhTGSHqO7l5vo/UgnwENP+agv1KhKy4oJWetvrGNjo3SN/bK +UzEGfF6KxDU3Ru4tdFXdFTT5YHONVwytsCnn7rZelnncXSBmY7lwr74o92bYKjM2 +OLu/L6CU+SuMxM5BxQWPzefy2JtqbIeArnCK6ZizoCSCXM0lKbjd0IEOipz1xNAa +YiLLbUTIlKKSGlfBH2xN68nBoX5sETueuATE8q4937VvOpNMNxbtuS5zgVbjEqgO +ph+PLqz265lBCAdIEIfJ1JDQpagLQIFc6+FvLNYC10bHLb8HTKtud5gtdGWyHFzo +R5ZsCFf71kezDRM/oyLEHX5eyqxggKmFldWyLXsD3hHHQ9Z6siy/Z9mC/f/uuBP7 +mzKtAktbKxifsMeOFgk2 +=dsel -----END PGP SIGNATURE----- diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch new file mode 100644 index 000000000000..e157381c8f05 --- /dev/null +++ b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch @@ -0,0 +1,35 @@ +From 89f99089abe0c1369a78a3bb8e2a576c513ec809 Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +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 + diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch new file mode 100644 index 000000000000..4ba6b6ff7417 --- /dev/null +++ b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch @@ -0,0 +1,25 @@ +From 37725ccec4d26148dde377d78c71046e8b6a6de9 Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +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 + 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 deleted file mode 100644 index bdebfd584317..000000000000 --- a/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch +++ /dev/null @@ -1,40 +0,0 @@ - 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.6-r2.ebuild b/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild similarity index 86% rename from dev-qt/qthelp/qthelp-4.8.6-r2.ebuild rename to dev-qt/qthelp/qthelp-4.8.6-r3.ebuild index cc857aaa17e3..8f88a8daa78e 100644 --- a/dev-qt/qthelp/qthelp-4.8.6-r2.ebuild +++ b/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r2.ebuild,v 1.2 2015/01/26 02:49:28 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild,v 1.1 2015/05/06 21:48:06 pesa Exp $ EAPI=5 @@ -50,7 +50,7 @@ src_unpack() { qt4-build-multilib_src_unpack # compat version - # http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ + # http://blog.qt.io/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ if use compat; then mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 "${S}"/tools/assistant/compat || die mv "${WORKDIR}"/QtAssistant "${S}"/include || die @@ -58,7 +58,10 @@ src_unpack() { } src_prepare() { - use compat && PATCHES+=("${FILESDIR}/${PN}-4.8.6-fix-compat.patch") + use compat && PATCHES+=( + "${FILESDIR}/${PN}-4.8.6-compat-install.patch" + "${FILESDIR}/${PN}-4.8.6-compat-syncqt.patch" + ) qt4-build-multilib_src_prepare @@ -75,11 +78,6 @@ multilib_src_configure() { -no-nas-sound -no-cups -no-nis -fontconfig ) qt4_multilib_src_configure - - if use compat; then - # syncqt knows nothing about these headers (bug 529398) - cp -pr "${S}"/include/QtAssistant "${BUILD_DIR}"/include || die - fi } multilib_src_compile() { -- 2.26.2