diff options
Diffstat (limited to 'dev-qt')
82 files changed, 16 insertions, 2180 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 65afafb9d59c..053bbf6b8566 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest index 1a42123fce2f..081410bd1e47 100644 --- a/dev-qt/assistant/Manifest +++ b/dev-qt/assistant/Manifest @@ -1,11 +1,7 @@ -AUX assistant-4.8.2+gcc-4.7.patch 500 BLAKE2B 359cb062c9406b9afd8e4a427c5da36952ab7a1d821e127e74667d7752d3393cfce95fe9cd7a7134533eb4a1d6916b8b0f96da7fa0fd3efdee63f98ceaa18c4a SHA512 1948a7b47e5e15da47408af18c518762818542b42f2768a73acba698f23fca837a690be9821974be01662b45b7b3823b314577fa79472cf3f96620c0a1155a18 -AUX disable-webkit.patch 872 BLAKE2B 3856945120fbc7c27a32acc0663e74ec8302012c2c646cadb3467505797ee0a2233d3556646d532cfe1a2d3cb1b8b1fda53ff7a94ad302fba952202baa7927ca SHA512 9c05843197aab2a5e49aefb4aaa8e1ee73b4c410ec54ede9ca958672962713b1949493447a06bf7aaa1733bf22b3a67a77f94e4063b47bb30bade1522d29830b -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8 -EBUILD assistant-4.8.7.ebuild 1477 BLAKE2B c722e0a293112ba58f292566de3d3730e5a12430e107f9fe95ed45841e55731340a298b23dda9bbdbfcd29e3b51342077e7fc3f632755ee54fefab72f72dcb05 SHA512 2f01f97502f9990a048b3dc974e6295cdb8f97f2804f0a20a9f515e7a8a04611718d680778ce35ddac45b6406dfb4fcf05a60a7f24acdcbfd3787c3e2961eb6b EBUILD assistant-5.11.1.ebuild 1198 BLAKE2B f2b40ee9a585e0a0fcb98b6999728b633a3c9cf3c9bfc767ba2f5d6948156684596bf02aa9e006008f50474def97051562faa6baad271662c33c78095e1c7f39 SHA512 cca326bf91461ef72f110f6c0c23ef13c65eb0fa51eebdce468797e89f5969846dff93ce75a93ed1d1f699044e7dc3a32b0659e922f26531b71702390f6f318c EBUILD assistant-5.9.4.ebuild 1195 BLAKE2B 9fd15cfd04a7544046cccdc503169417f53ee3a808aeb58a745063e62acb3deed5d761275c1c9a812c92a38427c447f542a77feb312517556c15b4da7681a2b3 SHA512 9139269fee4450c028b112203655a5917beefe83ef07544c8c129c4efee9815448af5cb59312b53821d0c2fa53214e439f02343b84952207a1f8cb57c3e09ee6 EBUILD assistant-5.9.6.ebuild 1196 BLAKE2B 277fdd312eeadf0ec2b9a80344a27c02e3afda54c98e461980336548a27754031de6cefd1cd6b68b982e01b1328c59709c76f644a55097388873503159ef444d SHA512 593c31f11c78108adec6a63d1e47369746b48a4a15f4ad8a18930004f4c5f188b314f069fc43431f51415416109b84ce2994b0a4b59cdef710fcd1f1cb69eeec -MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360 +MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f diff --git a/dev-qt/assistant/assistant-4.8.7.ebuild b/dev-qt/assistant/assistant-4.8.7.ebuild deleted file mode 100644 index 41eb312612bc..000000000000 --- a/dev-qt/assistant/assistant-4.8.7.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils qt4-build-multilib - -DESCRIPTION="Tool for viewing on-line documentation in Qt help file format" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" -fi - -IUSE="webkit" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}] - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch" -) - -QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant" - -src_prepare() { - # bug 401173 - use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch") - - qt4-build-multilib_src_prepare -} - -multilib_src_configure() { - local myconf=( - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns - $(qt_use webkit) - ) - qt4_multilib_src_configure -} - -multilib_src_install_all() { - qt4_multilib_src_install_all - - doicon tools/assistant/tools/assistant/images/assistant.png - make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation' -} diff --git a/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch b/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch deleted file mode 100644 index 1cf70275f634..000000000000 --- a/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- tools/assistant/tools/assistant/mainwindow.cpp 2012-06-27 03:02:37.539564947 +0200 -+++ tools/assistant/tools/assistant/mainwindow.cpp 2012-06-27 03:03:18.843561620 +0200 -@@ -944,8 +944,7 @@ void MainWindow::updateApplicationFont() - if (helpEngine.usesAppFont()) - font = helpEngine.appFont(); - -- const QWidgetList &widgets = qApp->allWidgets(); -- foreach (QWidget* widget, widgets) -+ foreach (QWidget* widget, QApplication::allWidgets()) - widget->setFont(font); - } - diff --git a/dev-qt/assistant/files/disable-webkit.patch b/dev-qt/assistant/files/disable-webkit.patch deleted file mode 100644 index 61bca05148e5..000000000000 --- a/dev-qt/assistant/files/disable-webkit.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro -=================================================================== ---- qt-everywhere-opensource-src-4.8.9999.orig/tools/assistant/tools/assistant/assistant.pro -+++ qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro -@@ -2,7 +2,6 @@ include(../../../shared/fontpanel/fontpa - TEMPLATE = app - LANGUAGE = C++ - TARGET = assistant --contains(QT_CONFIG, webkit):QT += webkit - CONFIG += qt \ - warn_on \ - help -@@ -81,11 +80,8 @@ SOURCES += aboutdialog.cpp \ - openpageswidget.cpp \ - openpagesmanager.cpp \ - openpagesswitcher.cpp --contains(QT_CONFIG, webkit) { -- SOURCES += helpviewer_qwv.cpp --} else { -- SOURCES += helpviewer_qtb.cpp --} -+ -+SOURCES += helpviewer_qtb.cpp - - FORMS += bookmarkdialog.ui \ - bookmarkmanagerwidget.ui \
\ No newline at end of file diff --git a/dev-qt/assistant/metadata.xml b/dev-qt/assistant/metadata.xml index 22d751f51bd7..32568f62fb8e 100644 --- a/dev-qt/assistant/metadata.xml +++ b/dev-qt/assistant/metadata.xml @@ -5,10 +5,6 @@ <email>qt@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest index ececb5f8c0e6..117349d7c708 100644 --- a/dev-qt/designer/Manifest +++ b/dev-qt/designer/Manifest @@ -1,9 +1,7 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8 -EBUILD designer-4.8.7.ebuild 1746 BLAKE2B a6d8990f6498a02e3bc67d420ea5bdf2c942b20167e9ab9856ded2c48c115773464e4f932c7fd4fe5ec39b84055310b2758c4cd8df29f8bf55a75b1f5f4d2eb9 SHA512 69c7c89fde7f2bfb98ee87f0fa3af6bff2a815c0bf71436fc32a5d1d2e8dfa0184f2383b341be942c6581c0c218ad7d2ccef2ca2406da9b046180a7e79aba191 EBUILD designer-5.11.1.ebuild 1244 BLAKE2B ad0534b8270814a5be1fd476da3a03c9eaaacca6c9188a3fe01237e7fa78dccf2734b5fab06e2a7aa40590229ed7cf18df208dbbf3c9a7bcce1ee5bf0cb34e99 SHA512 892e94e9ed8c3d90462f8141a18ae68304b8d096383a6d5d1dbf09ca439480ca6f289f0b59e16734477a845ae1a742235decdcb3b5f6224e2b2d8f65e7cafffc EBUILD designer-5.9.4.ebuild 1240 BLAKE2B 4e9a38c065ef1952e11e1aecb64641713a60158fb871366148b2a14e38f37f3bba3dd851af6785c60c4abb724a3f665a4420b04f6b4b94b0d95d0b2de3f57a6c SHA512 ce7311a632c53fac6ef6203136ca190518e5463f47536aa6bf32cfe9f06b8f2984889c23a0452c5f7c95d1f1e70df5ff20f133b9555c4546faf21b3c68be9a23 EBUILD designer-5.9.6.ebuild 1242 BLAKE2B 4a1b3272132dd6eaf3e6c1392351a01d36dc56ae284c285f3d928c5e656350132fc960de0952bf4f852e4e7091b02d47d56983081ef4649a02fca13225af668b SHA512 988ade14b503688b4b9e8ed6c06a6022475cf3a4d0cf49cb7dfefb96616443e89cd7d75ee1777bff7ef3e56b96b609b37e44ffdccf1e138f22e86b706e22a617 -MISC metadata.xml 879 BLAKE2B 4d8a4c31c5cb415d18d59f54243bdb9b49bdbd6c374576d7294d2db2ce6505e31fa8da57966b04d9223e9a474d06f7078bab7432051629fa0a5dafdb9ca59152 SHA512 fba36502504141e09462fb211dacbfe43db6cb6e750f699058c757c1fc24072eb5ed50bbbb20e2bbacb831f165a58c20cb9c012ccbe96665969e1fc8fc153489 +MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9 diff --git a/dev-qt/designer/designer-4.8.7.ebuild b/dev-qt/designer/designer-4.8.7.ebuild deleted file mode 100644 index 7fbb1e9854ca..000000000000 --- a/dev-qt/designer/designer-4.8.7.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils qt4-build-multilib - -DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -DESIGNER_PLUGINS="declarative phonon qt3support webkit" -IUSE="${DESIGNER_PLUGINS}" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" -PDEPEND="phonon? ( media-libs/phonon[designer,qt4] )" - -QT4_TARGET_DIRECTORIES="tools/designer" - -src_prepare() { - qt4-build-multilib_src_prepare - - local plugin - for plugin in ${DESIGNER_PLUGINS}; do - if ! use ${plugin} || [[ ${plugin} == phonon ]]; then - sed -i -e "/\<${plugin}\>/d" \ - tools/designer/src/plugins/plugins.pro || die - fi - done -} - -multilib_src_configure() { - local myconf=( - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl - ) - qt4_multilib_src_configure -} - -multilib_src_install_all() { - qt4_multilib_src_install_all - - doicon tools/designer/src/designer/images/designer.png - make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner' -} diff --git a/dev-qt/designer/metadata.xml b/dev-qt/designer/metadata.xml index e72a70897a4f..7f1774a4eb6a 100644 --- a/dev-qt/designer/metadata.xml +++ b/dev-qt/designer/metadata.xml @@ -7,10 +7,6 @@ </maintainer> <use> <flag name="declarative">Build the qdeclarativeview plugin</flag> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - <flag name="phonon">Build the phononwidgets plugin</flag> - <flag name="qt3support">Build the qt3supportwidgets plugin</flag> <flag name="webkit">Build the qwebview plugin</flag> </use> <upstream> diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest index 4370b529f61a..b36fd27b065d 100644 --- a/dev-qt/linguist/Manifest +++ b/dev-qt/linguist/Manifest @@ -1,9 +1,7 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8 -EBUILD linguist-4.8.7.ebuild 1156 BLAKE2B 69663d5d63aeb2c60a97fb6fb16124d16683350dec8da4bfd6303d85e4afe0f1c63202fa9ad61c04cb7e18ae2a95ca665f1641124893cd93ccd297ba3af71e84 SHA512 c8468dc810ce46dcc6adbfb0d178b173299ec0bbc19936f6ff85df59759b4e710b6afe270d345653ca209e5c4d541ba03a20fafb596d3c1c83e74f46d152d9f6 EBUILD linguist-5.11.1.ebuild 992 BLAKE2B 5db73329127034e7a71336bb845b7fe68ed45becabbe1206f24972ac1b4302923c504953198389da8d8021d415498460054c8d1191b1f13bf0c9f8685f3feab5 SHA512 25cac8c8a214be7467b58c73543693cd2165e6055516f74ac64fe6e33263da564b64957fa7c801be7d1ccb70c2673752ca4653c12821247dec56d8e7ffa4551d EBUILD linguist-5.9.4.ebuild 989 BLAKE2B d3766d1ec8f65abc86909647bab3e4d28666f8ee11d27aa52138844d0b738bd522154e5f461f6540c856bce00377515caf9cb62035ac67d34e6600f053669be3 SHA512 11a3cad892735e439d1f2851c320bd54e3a2fa89f1b9c4901b0bd445e54709342d4bcb7792e7a14c332326e6e2a6bc1eaf93534298029972e59316735f836a85 EBUILD linguist-5.9.6.ebuild 990 BLAKE2B e7a79d2026c2f05657d9493fcd20a8450578cfa6a9f3ca82553c627cee26ed9d2f20a98d0b75fd4e99f647b98f607ce709984b582a2c3f0844fbfb1b8b3014f9 SHA512 5680bb60a6226db5cd776044b50796d1d377065868fbbabcd719508afb8c89371d0fa5c789444d86fe084c564946afe827f91679bc4ce87dee56f0c83d2cb9bc -MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360 +MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f diff --git a/dev-qt/linguist/linguist-4.8.7.ebuild b/dev-qt/linguist/linguist-4.8.7.ebuild deleted file mode 100644 index 0c0cce6d0fb6..000000000000 --- a/dev-qt/linguist/linguist-4.8.7.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils qt4-build-multilib - -DESCRIPTION="Graphical tool for translating Qt applications" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="tools/linguist/linguist" - -multilib_src_configure() { - local myconf=( - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl - ) - qt4_multilib_src_configure -} - -multilib_src_install_all() { - qt4_multilib_src_install_all - - newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png - make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation' -} diff --git a/dev-qt/linguist/metadata.xml b/dev-qt/linguist/metadata.xml index 22d751f51bd7..32568f62fb8e 100644 --- a/dev-qt/linguist/metadata.xml +++ b/dev-qt/linguist/metadata.xml @@ -5,10 +5,6 @@ <email>qt@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest index 72110d38be78..3f0be65109c7 100644 --- a/dev-qt/pixeltool/Manifest +++ b/dev-qt/pixeltool/Manifest @@ -1,9 +1,7 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8 -EBUILD pixeltool-4.8.7.ebuild 836 BLAKE2B c2dadbdf93032d63466f13462c3610a2401effb5884353cce3b53148407a52fa2757d5396a1ee5d8aed80ddbf8aa1e8bf845d82a04234c618f89550c64e96042 SHA512 2ea3e1e6dc5a40b63108785c6e08e59f395194fcf247f8ed77ce8ab874eef04a76384444093a3878ea0d41949344a212a4fa25e84c4dde8e5a26b96a64b94fa8 EBUILD pixeltool-5.11.1.ebuild 427 BLAKE2B bffe3b0f18b8c401f3a8daeae201c9f43187b515ed2691c938beeb45276bc27b5d24db459f6ae83336775a50733fe41d4166963cda41ec30e9ad451e5728a0d1 SHA512 4efa3fb21649069309421a5fb10f21b474404d02d2a095bd5a978c26d357c62bd45cd8944ddb126a307f849ba5b3490685aa24a88e88b9744b739d35d7491eef EBUILD pixeltool-5.9.4.ebuild 424 BLAKE2B f70a57ed314ef84a525eeadef282b1f8b526ece30980904fe79c5bb5a1b80d9cc0fabb79847e1eef9d70d419076c19ebad0a5d23ecd2b9d1b5832df5ed824721 SHA512 420f8831d949332c2f2f4625019476853f3073228fcd5a6e4173240647f340b80bf845dd0526ee5d0be466352d6faed48df3b18c67f59441cca06b81ed3411af EBUILD pixeltool-5.9.6.ebuild 425 BLAKE2B e14389e4c4ba0a4ffac6ec27f5e66e2d2eb4d2d89bf8b82daf0f103d8e51fe19f28a414cfff56875a113ea416e24fed8dcd643acc196fe8af15aa1fc688c66f1 SHA512 5316652541f4351407dc7f0fa6b63210fdca0379468be93e8f479b2bda4279ddbdd524fa8e48891441443e21ed216263178baf88cbc5b914bcb7bb35121f7b13 -MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360 +MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f diff --git a/dev-qt/pixeltool/metadata.xml b/dev-qt/pixeltool/metadata.xml index 22d751f51bd7..32568f62fb8e 100644 --- a/dev-qt/pixeltool/metadata.xml +++ b/dev-qt/pixeltool/metadata.xml @@ -5,10 +5,6 @@ <email>qt@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/pixeltool/pixeltool-4.8.7.ebuild b/dev-qt/pixeltool/pixeltool-4.8.7.ebuild deleted file mode 100644 index 9cf60ffbfbaa..000000000000 --- a/dev-qt/pixeltool/pixeltool-4.8.7.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="Qt screen magnifier" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - !<dev-qt/qthelp-4.8.5:4 -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="tools/pixeltool" - -multilib_src_configure() { - local myconf=( - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest index 3b2310b0c463..0a3e7f2ede52 100644 --- a/dev-qt/qdbusviewer/Manifest +++ b/dev-qt/qdbusviewer/Manifest @@ -1,9 +1,7 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8 -EBUILD qdbusviewer-4.8.7.ebuild 1174 BLAKE2B dda9669b7d58f473f583f5141f79df3175dd4830622761345809f2bfe6177528ac2b33958618ab9c7562a7df76384631a45e27e4cd1e5178c906c2d7d90a1630 SHA512 6f08b895885d8216d15a6ac7d35e8b4dccb504a7b2d9740ada1a48b2672eba530345e2af4bf7cdd4e27d01991d16c84177506f370bbf989680b62f711af828cc EBUILD qdbusviewer-5.11.1.ebuild 973 BLAKE2B d05999d018332cf922bb8ef1454b27a7c52b404f50ed2b6e1a3d4d4bc0a55d2ce4965a4c07cf22bcdf2e64a4305c0500dbb54e287bc39a0ecb718e32efd6659e SHA512 e2f468485c030cbbac2cd5532088588eb59ef8a89acea68274317d8f55e84f3aaadc0e80694dd45a202605f40880bd266c885a6527dc296400d12ad8f2d81859 EBUILD qdbusviewer-5.9.4.ebuild 970 BLAKE2B ef175f6e87bcee9a13ff081c8501ce41317fe0e2a45cc8489593cf79a3298480a1f0e70cf95b507fa56739f364ba53ccfcb5ab215cce8625d4c2a01b7f3c7648 SHA512 5fecd7efe36d0dd9cf956ffe573b2a395d32323c0096996e0afd153af7224094cc74926c3473ead047ccf3a2ab079e0a9c78c82427ddebfe567ae90e1c79040a EBUILD qdbusviewer-5.9.6.ebuild 971 BLAKE2B 17ccca76c24fd320f456af7b69d9d97d1ed932e356fbc41e9b0eed2d564c6eb48e2d1d4daa43aaa45d9eaf0e99483cf84938c3a76b160dc1d6d3c0fae8b97c9c SHA512 7cb96d07851f499aa141717338b819573f4bd9bb878a75a3546ca115b02f22e92deb976301417215e3ea095ed323ae727003a84d28c0dd5fa9f46df65f14fca8 -MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360 +MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f diff --git a/dev-qt/qdbusviewer/metadata.xml b/dev-qt/qdbusviewer/metadata.xml index 22d751f51bd7..32568f62fb8e 100644 --- a/dev-qt/qdbusviewer/metadata.xml +++ b/dev-qt/qdbusviewer/metadata.xml @@ -5,10 +5,6 @@ <email>qt@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild deleted file mode 100644 index bf0dafdd0b9f..000000000000 --- a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils qt4-build-multilib - -DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer" - -multilib_src_configure() { - local myconf=( - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl - ) - qt4_multilib_src_configure -} - -multilib_src_install_all() { - qt4_multilib_src_install_all - - newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png - make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development' -} diff --git a/dev-qt/qt-meta/Manifest b/dev-qt/qt-meta/Manifest deleted file mode 100644 index effdec0486fc..000000000000 --- a/dev-qt/qt-meta/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -EBUILD qt-meta-4.8.6-r1.ebuild 1024 BLAKE2B 7e815d073a1bb1a9a441ade5cd3733103f03e15bf75991c5e0bc4b655e1850407f4e59d58d3fd5211d425bd10f0f4d0dede2225ba39c21394b79574354adfec6 SHA512 d76df60ec4cb5332bdd61508443cba42885629c57762ae588f166f553e0b69682d9c54b98b475712ed5639abe88e06ac6557a1c3e7d590d395a4716dc7b40c56 -MISC metadata.xml 333 BLAKE2B 1b83cc14bc1e211df620ca5780d454e579529097e0deb62fa79fbab896b1db670a2d7d75b2629e42b85878e1779aad7d65c8aae95a4791899244bbe2964ef5a6 SHA512 83cc5fe637917ffcd5563c225f9fadb82e0a5bb7e105f83d7357f915fcc128a6d9b4c9bf80f65fb3cc7d69da3071cc13ec9ad48ee3d303bc1f06340a5fdf4d3d diff --git a/dev-qt/qt-meta/metadata.xml b/dev-qt/qt-meta/metadata.xml deleted file mode 100644 index 202b54f3e094..000000000000 --- a/dev-qt/qt-meta/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <use> - <flag name="qt3support">Enable the Qt3Support library for Qt4</flag> - </use> -</pkgmetadata> diff --git a/dev-qt/qt-meta/qt-meta-4.8.6-r1.ebuild b/dev-qt/qt-meta/qt-meta-4.8.6-r1.ebuild deleted file mode 100644 index f3d4853b85fd..000000000000 --- a/dev-qt/qt-meta/qt-meta-4.8.6-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Cross-platform application development framework (metapackage)" -HOMEPAGE="https://www.qt.io/" - -LICENSE="metapackage" -SLOT="4" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="+dbus examples +qt3support +webkit" - -DEPEND="" -RDEPEND=" - >=dev-qt/assistant-${PV}:4 - >=dev-qt/designer-${PV}:4 - >=dev-qt/linguist-${PV}:4 - >=dev-qt/pixeltool-${PV}:4 - dbus? ( >=dev-qt/qdbusviewer-${PV}:4 ) - qt3support? ( >=dev-qt/qt3support-${PV}:4 ) - >=dev-qt/qtbearer-${PV}:4 - >=dev-qt/qtcore-${PV}:4 - dbus? ( >=dev-qt/qtdbus-${PV}:4 ) - >=dev-qt/qtdeclarative-${PV}:4 - examples? ( >=dev-qt/qtdemo-${PV}:4 ) - >=dev-qt/qtgui-${PV}:4 - >=dev-qt/qthelp-${PV}:4 - >=dev-qt/qtmultimedia-${PV}:4 - >=dev-qt/qtopengl-${PV}:4 - >=dev-qt/qtscript-${PV}:4 - >=dev-qt/qtsql-${PV}:4 - >=dev-qt/qtsvg-${PV}:4 - >=dev-qt/qttest-${PV}:4 - webkit? ( >=dev-qt/qtwebkit-${PV}:4 ) - >=dev-qt/qtxmlpatterns-${PV}:4 -" diff --git a/dev-qt/qt3support/Manifest b/dev-qt/qt3support/Manifest deleted file mode 100644 index e09a523abc9f..000000000000 --- a/dev-qt/qt3support/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 -EBUILD qt3support-4.8.7.ebuild 797 BLAKE2B 415d8a4b36620949187ecc95fd17b96df2e0da02cad849c6428cd7292ad52ae56862807d208e94e27886fa2ba55c4e4fa2ec7ea5a480037e8c7432008932b96c SHA512 a30f2183dd78987115510229dda4b66c746645de0406c2c93e15e164029467f8728d8646d88a298bea1ece27876258547693ee3bfec518b2f79a5062f53d5ec2 -MISC metadata.xml 498 BLAKE2B 6247db9a5f5ba507a0c361a8e6782e51b20e08de265797c2f77d5193aeb0e6a526d2fc9cd74dfb2edc866fede297ba78d30c3143567408e9072ee8de6b1bd9c8 SHA512 c3a9a09447e5cce7d251073785f0692096497a10ba01ae6ba8769d0ac07b829ed6d5dc97daf83da128569346fd1bd679031aafe0f4644d33361e22403f47310a diff --git a/dev-qt/qt3support/metadata.xml b/dev-qt/qt3support/metadata.xml deleted file mode 100644 index b92d7448ee41..000000000000 --- a/dev-qt/qt3support/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> - <upstream> - <bugs-to>https://bugreports.qt.io/</bugs-to> - <doc>https://doc.qt.io/</doc> - </upstream> -</pkgmetadata> diff --git a/dev-qt/qt3support/qt3support-4.8.7.ebuild b/dev-qt/qt3support/qt3support-4.8.7.ebuild deleted file mode 100644 index d6794af6893d..000000000000 --- a/dev-qt/qt3support/qt3support-4.8.7.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The Qt3Support module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+accessibility" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support,${MULTILIB_USEDEP}] - ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" - src/qt3support - src/tools/uic3 - tools/porting" - -multilib_src_configure() { - local myconf=( - -qt3support - $(qt_use accessibility) - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtbearer/Manifest b/dev-qt/qtbearer/Manifest deleted file mode 100644 index 2fc107f7f40f..000000000000 --- a/dev-qt/qtbearer/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 -EBUILD qtbearer-4.8.7.ebuild 1448 BLAKE2B 44d810019a05f0cf6fb7cb1162df74863dd80a33d72715022b15e08c66a72c524db7c12dfb2367930d983a12546606502b549e8f315a7533519579dac5a618ad SHA512 c3fb35eee3f74574bda39a17cc7c69b628e07c5893e7ea2890dabfeca2ba067a14fd45949018bb8b6ce4c7306318ff3010aac4d6dde246b404e6390d6a614bc3 -MISC metadata.xml 498 BLAKE2B 6247db9a5f5ba507a0c361a8e6782e51b20e08de265797c2f77d5193aeb0e6a526d2fc9cd74dfb2edc866fede297ba78d30c3143567408e9072ee8de6b1bd9c8 SHA512 c3a9a09447e5cce7d251073785f0692096497a10ba01ae6ba8769d0ac07b829ed6d5dc97daf83da128569346fd1bd679031aafe0f4644d33361e22403f47310a diff --git a/dev-qt/qtbearer/metadata.xml b/dev-qt/qtbearer/metadata.xml deleted file mode 100644 index b92d7448ee41..000000000000 --- a/dev-qt/qtbearer/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> - <upstream> - <bugs-to>https://bugreports.qt.io/</bugs-to> - <doc>https://doc.qt.io/</doc> - </upstream> -</pkgmetadata> diff --git a/dev-qt/qtbearer/qtbearer-4.8.7.ebuild b/dev-qt/qtbearer/qtbearer-4.8.7.ebuild deleted file mode 100644 index 515b3ccc88ca..000000000000 --- a/dev-qt/qtbearer/qtbearer-4.8.7.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The network bearer plugins for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="connman networkmanager" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND} - connman? ( net-misc/connman ) - networkmanager? ( net-misc/networkmanager ) -" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/plugins/bearer/generic - $(use connman && echo src/plugins/bearer/connman) - $(use networkmanager && echo src/plugins/bearer/networkmanager)" -} - -multilib_src_configure() { - local myconf=( - $(use connman || use networkmanager || echo -no-dbus) - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-gtkstyle -no-nas-sound -no-opengl - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index 3dbef05a1e2e..e55468f96346 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,13 +1,7 @@ -AUX qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch 3410 BLAKE2B 1a067cc908c762d4e3c8af2367c0c57e6a3150a9372da27540ea5c4cffe64c87f2f2d1440a4001fe5c1c3ef5dc07b7733d6507086bcab36801f6b3510a673525 SHA512 6770959ba01756d6a3fa9e03edd5f6c1df0d8625f4add65f7fef55a93b7b52c555a0ce749984938fb7ab905c2e0875cec0cb5d07f45c1b447fbc9e2d0ec678bb -AUX qtcore-4.8.5-qeventdispatcher-recursive.patch 4017 BLAKE2B 13b105b166613516a1f86a5eb50317f0c674d2612f0c39c3e46b4f24fe924f953491f1cd56991fcbd693761075500d7c86b45c70ba213e7bd5856f1833bd1fc9 SHA512 bd63961bcb695beebe8686142b84bff7702db4d85d737f5c2da927252b931700d03602f80048223cbbb05d85a5ddb9cb818321d756577f84843690b318f0c413 -AUX qtcore-4.8.7-libressl.patch 2161 BLAKE2B e6c5c494fe76840c0c3d1c7e91c72a825dd595194368af35ed824552e6e851b961a4f7242acc7982cc7b80331e4190d0544052a5aad29c3beea726306ee19c38 SHA512 c84b827fd5f0c504c9ab95352677dc2cfe926c81aa012b454d8260385215b510835ba693830b3a3a6fa374b299995ec14cbb07711f41031788fc6c3bec396021 -AUX qtcore-4.8.7-moc.patch 926 BLAKE2B 1fd7a9b6d7d69aa110761a587bbe1d13910f4537c0dd60e6f681c8242b150fc23a476d2011211565412f855bc1fb90a58e363d349bb18b40e6e299261e0a5a7a SHA512 cb64e3e2271d3031c11d2c8afe1bcfd5263bcf8b8c787d03059b4bca25f3dd2d8a092c80cb396a1a466d2ef667697c31856c7c675aa7c48b5680f5e91db95f86 -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb -EBUILD qtcore-4.8.7-r4.ebuild 2866 BLAKE2B 323682baab556e3eca23f3c31d872fdb0b7d06d95be41b132b76793d4b3c99b983fba67861629a2cbef3f997b6d46c22816a43c30031f3f9fd1a399c72e9cfc0 SHA512 fe03ae3835572bf39090010e9740e3174c0b5eb2d1ea92b5fadc7d498c29c8ebfe21d86bc9b2783ab2c6957a28f0e65f1a57c36b903ce16bdb9e2cb0328e1875 EBUILD qtcore-5.11.1.ebuild 1505 BLAKE2B ae9f8ad65f4b8eeb433cd2b544f7a69c5aee9beac809f00bf4c3241a37a411deff93f5ce6a5e7ad5dd04cc3ca570529923d5217304c268756f991d3a3a1a6952 SHA512 796e3958162b2805adbc0c227699b423a7ceaad4883b89439ff24468434195053bf3d486c1ae50dbbbf4dc485f2a9fdc4c74a3b36985c9d96dfec08e02789b2f EBUILD qtcore-5.9.4-r2.ebuild 1501 BLAKE2B dce6d23557075493060d6899b641e01a30423bc8bf6144c036399c41b2decba8accf17a5e7b0af61f4f85be28c7eda77093fd6b3b770cd097c0c1ecba5130563 SHA512 21d2daaae4b90d677e568e8d7ad9c43582f22fdd2589d45685426b779c5ae8b01aac06996071c317cc5c37601c9a51cb042973f6189a34b23b1af947eed3ca4e EBUILD qtcore-5.9.6.ebuild 1503 BLAKE2B 6948e1c6731b5f8a1befdce7cc689eb3e8c8a5fedf563177793ce9fe46545477f93dcbad879991a75c145c7ac61983f28e092c2599cf9e04e2bd5cd8d08798e1 SHA512 e93bb3dcd158eb10b3372f9357a7cc20b3aa95dbdd4536bd313cd303a328960b30b9b4e7ee0b4d14534a7fe1b23909b9be072864f57308430a670f4044c5012a -MISC metadata.xml 924 BLAKE2B 6be074e378d4e63efe0c6ff55cb99c3ab1318c1d05d8208f4deb8a54a3cc9ded99b63e788336d83633b03eb5d857394e189472a374184d852d3c5851e27555b6 SHA512 c9786a997109a6156ed4879cd94e3e368b7ce095fc43fced168bdc5fbc846411c145318020d0eab7024aa64003403435a6cad222ab3569d838b9450c526c8ddb +MISC metadata.xml 565 BLAKE2B 3f18dd1accf6b8a781b5d2cc5c59440e31e8e7cd9210b53f19ea7c0f867be0ac3f109e823724e92be4a6b0a9a765869520e417f321a5ec53f6ee136a0b68592e SHA512 7d13e8697d2bca8b220e322b0c961d32e34d5e8fac70027c2eb8bdf2b4cd168f1d86f56e375d9bb78d3f06d1f489f66bcaa35a2074302a849a3af6e93fdfb666 diff --git a/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch b/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch deleted file mode 100644 index 0fcc1fa6561d..000000000000 --- a/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 267feb2de49eed0823ca0c29f1cd5238537c7116 Mon Sep 17 00:00:00 2001 -From: Jan-Marek Glogowski <glogow@fbihome.de> -Date: Thu, 6 Mar 2014 18:44:43 +0100 -Subject: Honor ExcludeSocketNotifiers in glib event loop - -Implements QEventLoop::ExcludeSocketNotifiers in the same way -QEventLoop::X11ExcludeTimers is already implemented for the glib -event loop. - -This prevents crashes when QClipboard checks for clipboard events -and - qApp->clipboard()->setProperty( "useEventLoopWhenWaiting", true ); -is set. - -Task-number: QTBUG-34614 -Task-number: QTBUG-37380 - -Change-Id: Id4e2a74c6bdf8c3b439a4e3813d24d11368b607d ---- - src/corelib/kernel/qeventdispatcher_glib.cpp | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp -index 0b0e308..ba522fa 100644 ---- a/src/corelib/kernel/qeventdispatcher_glib.cpp -+++ b/src/corelib/kernel/qeventdispatcher_glib.cpp -@@ -65,6 +65,7 @@ struct GPollFDWithQSocketNotifier - struct GSocketNotifierSource - { - GSource source; -+ QEventLoop::ProcessEventsFlags processEventsFlags; - QList<GPollFDWithQSocketNotifier *> pollfds; - }; - -@@ -80,6 +81,9 @@ static gboolean socketNotifierSourceCheck(GSource *source) - GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source); - - bool pending = false; -+ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers) -+ return pending; -+ - for (int i = 0; !pending && i < src->pollfds.count(); ++i) { - GPollFDWithQSocketNotifier *p = src->pollfds.at(i); - -@@ -103,6 +107,9 @@ static gboolean socketNotifierSourceDispatch(GSource *source, GSourceFunc, gpoin - QEvent event(QEvent::SockAct); - - GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source); -+ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers) -+ return true; -+ - for (int i = 0; i < src->pollfds.count(); ++i) { - GPollFDWithQSocketNotifier *p = src->pollfds.at(i); - -@@ -331,6 +338,7 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context) - reinterpret_cast<GSocketNotifierSource *>(g_source_new(&socketNotifierSourceFuncs, - sizeof(GSocketNotifierSource))); - (void) new (&socketNotifierSource->pollfds) QList<GPollFDWithQSocketNotifier *>(); -+ socketNotifierSource->processEventsFlags = QEventLoop::AllEvents; - g_source_set_can_recurse(&socketNotifierSource->source, true); - g_source_attach(&socketNotifierSource->source, mainContext); - -@@ -416,6 +424,7 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags) - // tell postEventSourcePrepare() and timerSource about any new flags - QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags; - d->timerSource->processEventsFlags = flags; -+ d->socketNotifierSource->processEventsFlags = flags; - - if (!(flags & QEventLoop::EventLoopExec)) { - // force timers to be sent at normal priority -@@ -427,6 +436,7 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags) - result = g_main_context_iteration(d->mainContext, canWait); - - d->timerSource->processEventsFlags = savedFlags; -+ d->socketNotifierSource->processEventsFlags = savedFlags; - - if (canWait) - emit awake(); --- -2.0.0 - diff --git a/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch b/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch deleted file mode 100644 index 6d3bf2f2cde2..000000000000 --- a/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- src/corelib/kernel/qeventdispatcher_glib.cpp.sav 2014-03-28 15:26:37.000000000 +0100 -+++ src/corelib/kernel/qeventdispatcher_glib.cpp 2014-04-24 09:44:09.358659204 +0200 -@@ -255,22 +255,30 @@ struct GPostEventSource - GSource source; - QAtomicInt serialNumber; - int lastSerialNumber; -+ QEventLoop::ProcessEventsFlags processEventsFlags; - QEventDispatcherGlibPrivate *d; - }; - - static gboolean postEventSourcePrepare(GSource *s, gint *timeout) - { -+ GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s); - QThreadData *data = QThreadData::current(); - if (!data) - return false; - -+ QEventLoop::ProcessEventsFlags excludeAllFlags -+ = QEventLoop::ExcludeUserInputEvents -+ | QEventLoop::ExcludeSocketNotifiers -+ | QEventLoop::X11ExcludeTimers; -+ if ((source->processEventsFlags & excludeAllFlags) == excludeAllFlags) -+ return false; -+ - gint dummy; - if (!timeout) - timeout = &dummy; - const bool canWait = data->canWaitLocked(); - *timeout = canWait ? -1 : 0; - -- GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s); - return (!canWait - || (source->serialNumber != source->lastSerialNumber)); - } -@@ -284,8 +292,14 @@ static gboolean postEventSourceDispatch( - { - GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s); - source->lastSerialNumber = source->serialNumber; -- QCoreApplication::sendPostedEvents(); -- source->d->runTimersOnceWithNormalPriority(); -+ QEventLoop::ProcessEventsFlags excludeAllFlags -+ = QEventLoop::ExcludeUserInputEvents -+ | QEventLoop::ExcludeSocketNotifiers -+ | QEventLoop::X11ExcludeTimers; -+ if ((source->processEventsFlags & excludeAllFlags) != excludeAllFlags) { -+ QCoreApplication::sendPostedEvents(); -+ source->d->runTimersOnceWithNormalPriority(); -+ } - return true; // i dunno, george... - } - -@@ -329,6 +343,7 @@ QEventDispatcherGlibPrivate::QEventDispa - postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs, - sizeof(GPostEventSource))); - postEventSource->serialNumber = 1; -+ postEventSource->processEventsFlags = QEventLoop::AllEvents; - postEventSource->d = this; - g_source_set_can_recurse(&postEventSource->source, true); - g_source_attach(&postEventSource->source, mainContext); -@@ -423,6 +438,7 @@ bool QEventDispatcherGlib::processEvents - - // tell postEventSourcePrepare() and timerSource about any new flags - QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags; -+ d->postEventSource->processEventsFlags = flags; - d->timerSource->processEventsFlags = flags; - d->socketNotifierSource->processEventsFlags = flags; - -@@ -435,6 +451,7 @@ bool QEventDispatcherGlib::processEvents - while (!result && canWait) - result = g_main_context_iteration(d->mainContext, canWait); - -+ d->postEventSource->processEventsFlags = savedFlags; - d->timerSource->processEventsFlags = savedFlags; - d->socketNotifierSource->processEventsFlags = savedFlags; - ---- src/corelib/kernel/qeventdispatcher_unix.cpp.sav 2013-06-07 07:16:52.000000000 +0200 -+++ src/corelib/kernel/qeventdispatcher_unix.cpp 2014-04-24 09:43:06.927589535 +0200 -@@ -905,7 +905,15 @@ bool QEventDispatcherUNIX::processEvents - - // we are awake, broadcast it - emit awake(); -- QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData); -+ -+ QEventLoop::ProcessEventsFlags excludeAllFlags -+ = QEventLoop::ExcludeUserInputEvents -+ | QEventLoop::ExcludeSocketNotifiers -+ | QEventLoop::X11ExcludeTimers; -+ if ((flags & excludeAllFlags) == excludeAllFlags) -+ return false; -+ if(( flags & excludeAllFlags ) != excludeAllFlags ) -+ QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData); - - int nevents = 0; - const bool canWait = (d->threadData->canWaitLocked() diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch b/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch deleted file mode 100644 index b838c7a687b6..000000000000 --- a/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2015-11-25 01:38:42.103898399 -0500 -+++ src/network/ssl/qsslsocket_openssl_symbols.cpp 2015-11-25 01:40:50.146247648 -0500 -@@ -224,13 +224,17 @@ - #ifndef OPENSSL_NO_SSL2 - DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) - #endif -+#ifndef OPENSSL_NO_SSL3 - DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif - DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) - #ifndef OPENSSL_NO_SSL2 - DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) - #endif -+#ifndef OPENSSL_NO_SSL3 - DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif - DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) - #else -@@ -818,13 +822,17 @@ - #ifndef OPENSSL_NO_SSL2 - RESOLVEFUNC(SSLv2_client_method) - #endif -+#ifndef OPENSSL_NO_SSL3 - RESOLVEFUNC(SSLv3_client_method) -+#endif - RESOLVEFUNC(SSLv23_client_method) - RESOLVEFUNC(TLSv1_client_method) - #ifndef OPENSSL_NO_SSL2 - RESOLVEFUNC(SSLv2_server_method) - #endif -+#ifndef OPENSSL_NO_SSL3 - RESOLVEFUNC(SSLv3_server_method) -+#endif - RESOLVEFUNC(SSLv23_server_method) - RESOLVEFUNC(TLSv1_server_method) - RESOLVEFUNC(X509_NAME_entry_count) ---- src/network/ssl/qsslsocket_openssl.cpp.orig 2015-11-25 01:44:55.235087906 -0500 -+++ src/network/ssl/qsslsocket_openssl.cpp 2015-11-25 01:45:45.194443818 -0500 -@@ -263,7 +263,11 @@ - #endif - break; - case QSsl::SslV3: -+#ifndef OPENSSL_NO_SSL3 - ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); -+#else -+ ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error -+#endif - break; - case QSsl::SecureProtocols: // SslV2 will be disabled below - case QSsl::TlsV1SslV3: // SslV2 will be disabled below diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch b/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch deleted file mode 100644 index 7660dedc1630..000000000000 --- a/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp ---- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 2015-05-07 09:14:44.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp 2016-03-16 13:20:43.145899869 -0500 -@@ -188,8 +188,12 @@ int runMoc(int _argc, char **_argv) - pp.macros["Q_MOC_RUN"]; - pp.macros["__cplusplus"]; - -- // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829 -+ // Workaround a bug while parsing some boost headers. See QTBUG-22829 - pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; -+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; -+ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"]; -+ pp.macros["BOOST_TYPE_TRAITS_HPP"]; -+ pp.macros["_SYS_SYSMACROS_H_OUTER"]; - - QByteArray filename; - QByteArray output; diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml index 668f6ab4564e..c612265c6f79 100644 --- a/dev-qt/qtcore/metadata.xml +++ b/dev-qt/qtcore/metadata.xml @@ -6,11 +6,6 @@ <name>Gentoo Qt Project</name> </maintainer> <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - <flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag> - <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that - this does not mean you can compile pure Qt3 programs with Qt4.</flag> <flag name="systemd">Enable native journald logging support</flag> </use> <upstream> diff --git a/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild deleted file mode 100644 index 86ae786cc2ce..000000000000 --- a/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="Cross-platform application development framework" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+glib iconv icu libressl qt3support ssl" - -DEPEND=" - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) - iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] ) - icu? ( <dev-libs/icu-59:=[${MULTILIB_USEDEP}] ) - ssl? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) - ) -" -RDEPEND="${DEPEND}" -PDEPEND=" - ~dev-qt/qttranslations-${PV} - qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/qt4/Qt/qconfig.h - /usr/include/qt4/QtCore/qconfig.h -) - -PATCHES=( - "${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968 - "${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968 - "${FILESDIR}/${PN}-4.8.7-libressl.patch" # bug 584796 - "${FILESDIR}/${PN}-4.8.7-moc.patch" # bug 556104, 635394 -) - -QT4_TARGET_DIRECTORIES=" - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/tools/uic - src/corelib - src/network - src/xml - src/plugins/codecs/cn - src/plugins/codecs/jp - src/plugins/codecs/kr - src/plugins/codecs/tw - tools/linguist/lconvert - tools/linguist/lrelease - tools/linguist/lupdate" - -QCONFIG_DEFINE="QT_ZLIB" - -src_prepare() { - qt4-build-multilib_src_prepare - - # bug 172219 - sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ - -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ - qmake/Makefile.unix || die "sed qmake/Makefile.unix failed" - - # bug 427782 - sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \ - qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix failed" - sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/' \ - -e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/' \ - configure || die "sed configure setBootstrapVariable failed" -} - -multilib_src_configure() { - local myconf=( - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - $(qt_use glib) - $(qt_use iconv) - $(qt_use icu) - $(use ssl && echo -openssl-linked || echo -no-openssl) - $(qt_use qt3support) - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest index 09d6dd41e9bf..9db50469778f 100644 --- a/dev-qt/qtdbus/Manifest +++ b/dev-qt/qtdbus/Manifest @@ -1,11 +1,7 @@ -AUX qtdbus-4.7-qdbusintegrator-no-const.patch 543 BLAKE2B c5db96f9b2b84e8da8ce82646ea8759f8bf39d0c73e92839b9a2bc5465a6e43ecf2a3dc7c7db5c56e3a7b4925368201c214bbc9b8155b37532d7dccfc2a4703a SHA512 1967f1b3f1a834eecf140df39c6e4826acf80fc2f8de85770252949910de357a4303d1c1b3202e2df164e8b1cd74b0ab4928a3b333df0a222bdf21e71696824f -AUX qtdbus-4.8.4-qdbusconnection-silence-warning.patch 997 BLAKE2B 079b0ce31ab06ab26ac14d94a88ee524ee9459d62e25b5d4e5f16d95a2ded69a1d257de4af8d2f304fbb3eaf5a0aa194aaef7322cb4f65debd283865c5b2475c SHA512 b3135450bcd7ab50e5b559b0e8619606053845852159853498756e50777cfbe8b5871bd7b0c178b3de038dc9229f3564c4827b35fcb67b354f0814ca1b2c58e3 -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb -EBUILD qtdbus-4.8.7.ebuild 856 BLAKE2B 45206407be68ca357eeaab6a5d6cf5e6f614c333bf7f094e54d32468d6dba97cf86042ca2230ad98d71382e35ede4609f1e2fdb2d64a0b4f1c2fec998727d594 SHA512 5e1a3bfa62a290548f111fa9ad6bcda6faf67a718cb689a8420bebc4154d8d7d194ba5de5485219f77e7e844ccce897b5f34fe3bca3d9b0ce8ab87f336ed2a4f EBUILD qtdbus-5.11.1.ebuild 695 BLAKE2B b349a7e84ad49448470ca329d51f76268885d26c729193dac37934e37042a28aca54858e14126c7a511d7977fc16f5abcc85c05691004e3c240ec73d1cfe0fbf SHA512 855287b2a6860add78f0c88d8da4f65861d50486c6690a709b04afb8347c5413b88f21a8d2df995d56d31be1749d4fc319a1ac4588fe2e3e3a9046aa268c2f2e EBUILD qtdbus-5.9.4.ebuild 691 BLAKE2B 64f68d852a92951dacbb397743fc5f6df49e11a49fd58ee8c9665f571be28133bdde594afe0c874eb80b1dafd65ad926adca7e88845b621d62426645f364baf9 SHA512 f25adcbd53b903dfdeff2fde800419c11b8b42df29d44f40b7b5b4cfad08233ef64f6e467ab65b2610e2415b44d0994f549355d13df306d90cfee6f0bb1766ad EBUILD qtdbus-5.9.6.ebuild 693 BLAKE2B 7ab8f11a97ade375cfe86f867cb5df2c724c3d06dabdd76895bd6c723cfb774faeeb8d38f592b477682e383afd9047ae084264246d133c490a746413df9bcc04 SHA512 779021f3d5d1f3bb612b683230bfc9ef8a0c4e7a7e7d4100d2b96afae3548885b94198076c3d2f69e11d0a7917a08b1e4f8578fea8993211ef9c8fd09d919b49 -MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360 +MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f diff --git a/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch b/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch deleted file mode 100644 index 086eb47a071c..000000000000 --- a/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dbus/qdbusintegrator.cpp.orig 2011-03-12 02:11:32.313467991 +0100 -+++ src/dbus/qdbusintegrator.cpp 2011-03-12 02:11:03.795809176 +0100 -@@ -71,7 +71,7 @@ - static bool isDebugging; - #define qDBusDebug if (!::isDebugging); else qDebug - --Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) -+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) - - static inline QString dbusServiceString() - { return *orgFreedesktopDBusString(); } diff --git a/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch b/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch deleted file mode 100644 index dd3a5a02298e..000000000000 --- a/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp ---- qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch 2012-09-06 02:33:44.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp 2012-09-11 08:55:29.854026815 -0500 -@@ -1109,8 +1109,10 @@ public: - // make sure this connection is running on the main thread - QCoreApplication *instance = QCoreApplication::instance(); - if (!instance) { -+#ifndef QT_NO_DEBUG - qWarning("QDBusConnection: %s D-Bus connection created before QCoreApplication. Application may misbehave.", - type == SessionBus ? "session" : type == SystemBus ? "system" : "generic"); -+#endif - } else if (QDBusConnectionPrivate::d(*this)) { - QDBusConnectionPrivate::d(*this)->moveToThread(instance->thread()); - } diff --git a/dev-qt/qtdbus/metadata.xml b/dev-qt/qtdbus/metadata.xml index 22d751f51bd7..32568f62fb8e 100644 --- a/dev-qt/qtdbus/metadata.xml +++ b/dev-qt/qtdbus/metadata.xml @@ -5,10 +5,6 @@ <email>qt@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild b/dev-qt/qtdbus/qtdbus-4.8.7.ebuild deleted file mode 100644 index 144c5dd6cad8..000000000000 --- a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The DBus module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - sys-apps/dbus[${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch" - "${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch" -) - -QT4_TARGET_DIRECTORIES=" - src/dbus - tools/qdbus/qdbus - tools/qdbus/qdbusxml2cpp - tools/qdbus/qdbuscpp2xml" - -QCONFIG_ADD="dbus dbus-linked" -QCONFIG_DEFINE="QT_DBUS" - -multilib_src_configure() { - local myconf=( - -dbus-linked - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 257728c805c1..c4e43dacd66d 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,11 +1,9 @@ AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d AUX qtdeclarative-5.9.5-texture-memleak.patch 2199 BLAKE2B 7b0f531e095fd80731983faf106811ef32d38ce83c2bb595683203d81d671d105720c6ee840740c4c30b0027c52825844bd1fe60a7ab52499feb2699ada92729 SHA512 20c83cd85120475fcec31c6394c149ab6d271f8f4856cd9da60346faebb67e3b119001fc3b0cbfd3f198f5237c4330e878d68d530f859192b6dd9560d7a949e5 -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtdeclarative-everywhere-src-5.11.1.tar.xz 22203488 BLAKE2B 3304d5f1982380da6a82db9dee9782c7214fd307059055c9f42754b70cc760f9931357f5b9b4fc28bf5f6c799659d927f270ad154d43e91b28592465d7eac386 SHA512 d4252f58fcc811273b1a51f80167bca19f744d70c47362b631bbb7875473a808402d64b26475e2f5ff1813d8b8cc66b81cac1b8a4b5e36f7ca1fdbb15666f053 DIST qtdeclarative-opensource-src-5.9.4.tar.xz 21454140 BLAKE2B a7e792406c2eb42422aba1b779e2249f081840c8237a119cf4d9a001fa34d1f5e48e30216c08be431a89bca52dd56d4241d92cdfdb8b684b0912449bd0c9301e SHA512 e9e425665df42826c2525566e08b3588aa73b0efea295eed301ba5caeea7208b90c5a91a55cc16986ea9e0ceb9c6658bd59f56a3a276601ad5780f2c67f5ad5c DIST qtdeclarative-opensource-src-5.9.6.tar.xz 21417200 BLAKE2B 25d62058d85f845eb8a61ed949f7f3b2af972c0d3e97e4fe24b309fcc9570b5a00716bad012fca4cb8f65858b4aa7afb735181270be32e6a7bbe126d6a5931e4 SHA512 1fc7a542c60e8c13ba9b791d7b83a916fc1ffb1d3ab505405055a13d597a2c406f29bbd9309603af5bf56492874efeee33ab0128af1fa44866d66d689147ac39 -EBUILD qtdeclarative-4.8.7.ebuild 1493 BLAKE2B 1fc9ba56b9dd67fb840611e38e19a5bbc4b5f50d16cf7afbf9f384367ea03728f2d44aa1d14adf11ab44f8fba5532ce5f742803a5139f3ed25cf4f404e117d51 SHA512 b01c643b5d27f41e862260743be6701464ed145063ebb6642f5887b648b2f6e8c92c960d81e221a46c8aa7abc9461588953756390f080a7c6a02c53011338ca1 EBUILD qtdeclarative-5.11.1.ebuild 1415 BLAKE2B e7d19fe7f65ae602510a2bdf1c3a76ceb0081caedf59f5a9f0bf9ed416c02ac4289c1bf079b84074ee377b6b8dbf8a18389c551710b55845692d4ec7978a08bc SHA512 b627a0c784670d6a4d660160b131b42ad7fb11874965535cd631836e0cc8bdba0ac46d9c790ec3d58e9bd6eb1af27c02d1ec7a2c7991bd8005cd75175befe603 EBUILD qtdeclarative-5.9.4.ebuild 1323 BLAKE2B ca629dea8c113c90fc4e6da40be37bcc43d89fa240cd836eb162e70268f329c6050eabbacc00575ba22084639bcf9a577648c46f5dffe6be740806dd965f19a3 SHA512 a6ecf2a3c673529b97c08fe45596dc84b5378797c14c8afc8eb7ed48bf6013c8f70aee4948a6d7b7c16cfaf070d147f70473c7dd03f1fe4de9a2006977b1c175 EBUILD qtdeclarative-5.9.6.ebuild 1386 BLAKE2B 978372fcd02c20695e14d74a6c44cf0d52c22810207327b3807ad236ce857634508039c855504a3fc75c29ec2d8baffb76f3e4c6a54aacea75a690fffee45fd6 SHA512 347b767c5e7bf85e15dcfc811db7128b364bf2a7352373b87f8297ed1e5efb3e00e624d2a96a131c5a9a9437830819d55578d6834b967437a0e8c2c265de8f4c -MISC metadata.xml 1154 BLAKE2B 838bd6238e0b647adb40c4e0d73221104b2f26f160039a014c4576fbbbf51648ec1497e1833987ff298c4d42159c8ad2b2264b8f8a1a5c1d509e321e543709fc SHA512 fe0fdc462c9337726df24de8b8a13660da81a2cbd7cd3d122fadb3a6926e2cd6213d8eedc12185bf4dd1012ab1062ac59fa3cad3055b32e71012072aa31ef415 +MISC metadata.xml 811 BLAKE2B aca4ded12a2034fb5964d6c38806edeb1b2b984c182fe6ae5cf26f28db3ffa8cc942e8354971e46d7bd6f8eef600fe52ef3e0cdb5cb2aef7c7fe616fbc81d712 SHA512 0e278f92094bfc3d7a295cf559178ff093f5ff6776f03037cc9cb4e8574c9298c76f6210f84e611c8cf1c6c063cfd78f8d0c478f30798fc775d7bedcc409c711 diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index 9afadffbfb11..6333b5897c56 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -6,13 +6,8 @@ <name>Gentoo Qt Project</name> </maintainer> <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag> <flag name="localstorage">Build the LocalStorage import for QtQuick (requires QtSql)</flag> - <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that - this does not mean you can compile pure Qt3 programs with Qt4.</flag> - <flag name="webkit">Build the WebView QML component</flag> <flag name="widgets">Enable QtWidgets support</flag> <flag name="xml">Build the XmlListModel import for QtQuick (requires QtXmlPatterns)</flag> </use> diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild deleted file mode 100644 index 267b79b445b8..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The Declarative module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+accessibility qt3support webkit" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] - ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] - ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] - ~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}] ) - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" - src/declarative - src/imports - src/plugins/qmltooling - tools/qml - tools/qmlplugindump" - -QCONFIG_ADD="declarative" -QCONFIG_DEFINE="QT_DECLARATIVE" - -pkg_setup() { - use webkit && QT4_TARGET_DIRECTORIES+=" - src/3rdparty/webkit/Source/WebKit/qt/declarative" -} - -multilib_src_configure() { - local myconf=( - -declarative -no-gtkstyle - $(qt_use accessibility) - $(qt_use qt3support) - $(qt_use webkit) - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest deleted file mode 100644 index 37c83857041b..000000000000 --- a/dev-qt/qtdemo/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX qtdemo-4.6-plugandpaint.patch 609 BLAKE2B 0ac1483945e52ce7d2019a33133fedef7e18756b017bfe54960e338771d7190a8d6616ae645bece5c095c846862b27c6046c502744cb06143b82859cd53c8163 SHA512 e547e34d501bf29e0c5f17765f7355b330ab7533fef25ae97e55469d700ee929b36f885e5596b34e2406e63d7fb9fa200e509d4e517473597d3ceffccb7b94b2 -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 -EBUILD qtdemo-4.8.7.ebuild 2539 BLAKE2B 86fc59dd509a41109256c86fe586eebcaf9074dd0d6217d447001d4c876a27daef183c5f8b18057a286c91eb8bde4c4a3070fa9d17bb8b9ca86f77b81a5d10be SHA512 cd0c4c7a142189168a21a475d2333d4c95e5ef9e94777380a413d9dc289fbe0808d216307cca689653aaf95be4a4fdd3f5bc5dbdf4e1afc5fe08f7ef186bb2bb -MISC metadata.xml 961 BLAKE2B e06d3c13099a8ede112b65295260a234f682b2c4426c16420a1fa0f44f36a82185b842cdc02228214bf4eb99de29bb8167282ac84c2067db288aa6b1dab9b3b5 SHA512 f84f3400e4b556cc7eef2c1f21c3b443fd4e7eebe2c7733cb2bdede1d4ce5bc025c9a7bc8087ee731daa02a96c5cd4e96deb9e108962b4c731338db80891210e diff --git a/dev-qt/qtdemo/files/qtdemo-4.6-plugandpaint.patch b/dev-qt/qtdemo/files/qtdemo-4.6-plugandpaint.patch deleted file mode 100644 index 262996aa1068..000000000000 --- a/dev-qt/qtdemo/files/qtdemo-4.6-plugandpaint.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/examples/tools/plugandpaint/plugandpaint.pro b/examples/tools/plugandpaint/plugandpaint.pro -index 9616eb8..e188bc1 100644 ---- a/examples/tools/plugandpaint/plugandpaint.pro -+++ b/examples/tools/plugandpaint/plugandpaint.pro -@@ -10,7 +10,7 @@ SOURCES = main.cpp \ - symbian { - LIBS = -lpnp_basictools.lib - } else { -- LIBS = -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools -+ LIBS += -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools - } - - if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml deleted file mode 100644 index 288f9a8bd336..000000000000 --- a/dev-qt/qtdemo/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <use> - <flag name="dbus">Build QtDBus examples and demos</flag> - <flag name="declarative">Build QtDeclarative examples and demos</flag> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - <flag name="multimedia">Build QtMultimedia examples and demos</flag> - <flag name="opengl">Build QtOpenGL examples and demos</flag> - <flag name="phonon">Build Phonon examples and demos</flag> - <flag name="webkit">Build QtWebKit examples and demos</flag> - <flag name="xmlpatterns">Build QtXmlPatterns examples and demos</flag> - </use> - <upstream> - <bugs-to>https://bugreports.qt.io/</bugs-to> - <doc>https://doc.qt.io/</doc> - </upstream> -</pkgmetadata> diff --git a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild deleted file mode 100644 index e8c4d393d6e1..000000000000 --- a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="Demonstration module and examples for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm ppc ppc64 x86" -fi - -IUSE="dbus declarative multimedia opengl phonon webkit xmlpatterns" - -DEPEND=" - ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtsql-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtsvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qttest-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] ) - multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - phonon? ( >=media-libs/phonon-4.8.3-r1[qt4,${MULTILIB_USEDEP}] ) - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.6-plugandpaint.patch" -) - -QT4_TARGET_DIRECTORIES=" - demos - examples" - -src_prepare() { - qt4-build-multilib_src_prepare - - # Array mapping USE flags to subdirs - local flags_subdirs_map=( - 'dbus' - 'declarative:declarative' - 'multimedia:spectrum' - 'opengl:boxes|glhypnotizer' - 'phonon:mediaplayer' - 'webkit:browser' - 'xmlpatterns' - ) - - # Disable unwanted examples/demos - for flag in "${flags_subdirs_map[@]}"; do - if ! use ${flag%:*}; then - einfo "Disabling ${flag%:*} examples" - sed -i -e "/SUBDIRS += ${flag%:*}/d" \ - examples/examples.pro || die - - if [[ ${flag} == *:* ]]; then - einfo "Disabling ${flag%:*} demos" - sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \ - demos/demos.pro || die - fi - fi - done - - # Remove bogus dependency on qt3support (bug 510042) - sed -i -e 's/contains(QT_CONFIG, qt3support)://' \ - examples/graphicsview/graphicsview.pro || die -} - -multilib_src_configure() { - local myconf=( - $(qt_use dbus) - $(qt_use declarative) - $(qt_use multimedia) -no-audio-backend - $(qt_use opengl) - -no-openvg - $(qt_use phonon) -no-phonon-backend - $(qt_use webkit) - $(qt_use xmlpatterns) - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 7b501186e9f9..f4f63c3a81f7 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,16 +1,10 @@ -AUX qtgui-4.7.3-cups.patch 3297 BLAKE2B 45c8668ffca24a7cfe9e02ec3fb3839f436470d55fb6f03a6a5890c7598bd3ec62c0bc62ecfd87ec530c210ef1c8e4d684c72109897ffe82456aa4225ce2b6ed SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee -AUX qtgui-4.8.5-disable-gtk-theme-check.patch 1166 BLAKE2B 638fa282166a5ede48ff2b91532decab28969b392ae75c49860329e30018283f5206a367216027880e914e9a7ff4e16275fd364e8e99e52bacf460ecf6a637bb SHA512 c0f8b0c5bfb83552edc92af94669b15c85171aef72418dfa37a237f34b49e3999c939afed8b6c90391104c9ea305152ea85b0b0ad0e2400f5c64d6301a2c8d14 -AUX qtgui-4.8.5-qclipboard-delay.patch 1135 BLAKE2B 5972ab258ba5c60346f83a0c402edd39ea3c1fa777c59c6691e793d300956f1d966f37f6f35c187c95074872f8ccfb4b4cac8b255da462ddd3744cc67bc21108 SHA512 00c901fc9b9bd5b8ce45e8bb4dd4eda8832df7eda104ae1614d7cdac681d23f0daad543d0480f1d9366e2644833db680e0526660472a6cf1a907b803acf76517 AUX qtgui-5.9.4-libinput-pixeldelta.patch 3597 BLAKE2B 88f54e4c832f132472aea296e8bcc4cf318456af48db3e260eed30b620acf98af0cfa2abd6d396a1396be678e133f5721cccbc79877d4f8934606aba6a0d6d39 SHA512 47aa0fb3971cd956d08fac4ace0b98b4034178d00c89db3fe31060d548acb8a075621dc2fb43ef0357dee79a927f82a7626e6cdf784b009028ae1435f68176d4 AUX qtgui-5.9.4-opengl.patch 3586 BLAKE2B 56e5192b0455c8d6ccd307466fe9583c7ac8f3a6114bc3bfed62dad36aa7f72eb505452da4fd2af1ea3b2bb24241ac1716332064e5a97d0c97951ea92ddd55a6 SHA512 d77fbd4e44d32f70b9047f7ae4531684e7d142b659be03ead0bce0252635a6bd35eaa8cd5d0cbcca59a19ee740f809ca6ad950dd199805fa6a379e41fbb68582 AUX qtgui-5.9.4-qsimpledrag.patch 6887 BLAKE2B 9da87acfe69c1cb8b1dd92b05a7b919d01227d0aa1316adfe97261bd59a7e0eb3b1e6d9b0896cc2f6a6a64eac3f31f72039a3acc2767998a668656acc8d8ffc2 SHA512 8229b87a40287c3c6e74d5aec9bfc346a1e0f7002687ba661573566ff5f700c99819850fc97f07d3a36d63ba83348f2ab315f835e44abce22242b4d1f29e7c7b -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb -DIST qtgui-systemtrayicon-plugin-system.patch 51377 BLAKE2B 2b57d485c9ceb2b7e23cd6f8aa3be955e70d779ab0ca849148435e2a212a2db48948dc689c06eb8aea484513081df56d86584cb98ad4d64fb86ceb15eb802f38 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 -EBUILD qtgui-4.8.7.ebuild 5502 BLAKE2B 13e6c5954107a56b929e32402307c352d417b6a41b71d1265fd35fec5534050637ed76707e33d040d26e6d66e863337802a9b3c4b5dc82ac11f78123b561bb8a SHA512 ebb51a68680d6c89ce16aa31378c59c9c66283cac71ecd970ba3998437303a936b601bef3292dc58c24dd63e0ca6a3e1a2945175901d3757a58f05f16edfc697 EBUILD qtgui-5.11.1.ebuild 3575 BLAKE2B 1f2d3da7a365d1e07421c53bdcbc4d6d88c663ff006a159c4b919a9a169469c142c69bb9c9d6fe9493d283d4d27a8ab855332fa6f41e0de83c66497963b16c8c SHA512 50de3da979c4679dda40e83369c967db1faf0dfba8cd386d2286d13e01745cad0b0f201d487a1c3da26dad4421f54455d2ea815134eadbef3183579a37a6aa79 EBUILD qtgui-5.9.4-r3.ebuild 3725 BLAKE2B d83d8e0c8407a8d4e9c0b7ab22f9c5bea55d4ebccba03b17ea70d22d00bff15ffe9bf8bedc1c8ce860d3f80ccbe38bfbef60ba656c0524d6a4dddac95c0f7488 SHA512 9d1e09c76bc4581c54a17b635de66a478a95dbc23072c27e593f4fad0b207b4825ccd2ccac83c873f68cc4ecbd97cfe10cec40c07f784e2420c0d245656e877b EBUILD qtgui-5.9.6.ebuild 3555 BLAKE2B 87d08c435eaa541cb24cc3826c7a7e66c5adad06a4272ab01fd09969ba207e87b6c771b45858714b3888bcccaf2630cd43ea2d0897bc4183f869a4b5277690b3 SHA512 5547121278fb441a33ef6be80a16c346beaba15bbfd38a5a52b199ff94d8fd225929bb0b476d0ec1e017d5a18cae82733cff43f93be631284f260b16b8c44767 -MISC metadata.xml 1862 BLAKE2B 062b123eab07ca09b1b6d63a9ce814a921b523c1861552a4f12903ccc8f627cf78e240d322c52b3a404ff154822a9cb42f894da5bc74a924d89dd51a42576115 SHA512 cba45629873eba71f152885640e51ad324b0dbb702c45811b4a1785a0af3baa7ce39923dfd0dbf7748d604e9a053d6580defdad75ad5ae228d37424d9b54e530 +MISC metadata.xml 1200 BLAKE2B 272e152cc1a9d596407c3d687fbb7b9f7b1b553cbf07e78e649031a427782f3377d3ee71d40e472b6f5978a8c1e9c2bfb9c0669edebcfcd1605d27973ba0ba1b SHA512 5ed40f7fdc6e289bd23bc5d4ce54794e58acf8c14863c45fe228d29c555e3afff84ee5b73f6f9e6be8b43e2ca28a96e4a73c22129ed2099262b5f682bf8b3aa6 diff --git a/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch b/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch deleted file mode 100644 index e0305e11b89a..000000000000 --- a/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp ---- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-11 16:55:22.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-28 04:34:16.000000000 +0100 -@@ -569,6 +569,32 @@ - void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups) - { - options.duplex->setEnabled(cups && cups->ppdOption("Duplex")); -+ -+ if (cups) { -+ const ppd_option_t* duplex = cups->ppdOption("Duplex"); -+ if (duplex) { -+ // copy default ppd duplex to qt dialog -+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) -+ options.duplexShort->setChecked(true); -+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) -+ options.duplexLong->setChecked(true); -+ else -+ options.noDuplex->setChecked(true); -+ } -+ -+ if (cups->currentPPD()) { -+ // set default color -+ if (cups->currentPPD()->color_device) -+ options.color->setChecked(true); -+ else -+ options.grayscale->setChecked(true); -+ } -+ -+ // set collation -+ const ppd_option_t *collate = cups->ppdOption("Collate"); -+ if (collate) -+ options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0); -+ } - } - #endif - -diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp ---- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp 2010-02-11 16:55:22.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp 2010-02-28 04:55:15.000000000 +0100 -@@ -627,6 +627,44 @@ - && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) { - setOutputFormat(QPrinter::PdfFormat); - } -+ -+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) -+ // fill in defaults from ppd file -+ QCUPSSupport cups; -+ -+ int printernum = -1; -+ for (int i = 0; i < cups.availablePrintersCount(); i++) { -+ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name) -+ printernum = i; -+ } -+ if (printernum >= 0) { -+ cups.setCurrentPrinter(printernum); -+ -+ const ppd_option_t* duplex = cups.ppdOption("Duplex"); -+ if (duplex) { -+ // copy default ppd duplex to qt dialog -+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) -+ setDuplex(DuplexShortSide); -+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) -+ setDuplex(DuplexLongSide); -+ else -+ setDuplex(DuplexNone); -+ } -+ -+ if (cups.currentPPD()) { -+ // set default color -+ if (cups.currentPPD()->color_device) -+ setColorMode(Color); -+ else -+ setColorMode(GrayScale); -+ } -+ -+ // set collation -+ const ppd_option_t *collate = cups.ppdOption("Collate"); -+ if (collate) -+ setCollateCopies(qstrcmp(collate->defchoice, "True")==0); -+ } -+#endif - } - - /*! diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch b/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch deleted file mode 100644 index 9a9f773537e4..000000000000 --- a/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp ---- qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check 2013-06-09 16:28:22.938840346 -0500 -+++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp 2013-06-09 17:03:01.781125479 -0500 -@@ -503,18 +503,6 @@ void QGtkStylePrivate::initGtkWidgets() - return; - } - -- static QString themeName; -- if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) { -- themeName = getThemeName(); -- -- if (themeName == QLS("Qt") || themeName == QLS("Qt4")) { -- // Due to namespace conflicts with Qt3 and obvious recursion with Qt4, -- // we cannot support the GTK_Qt Gtk engine -- qWarning("QGtkStyle cannot be used together with the GTK_Qt engine."); -- return; -- } -- } -- - if (QGtkStylePrivate::gtk_init) { - // Gtk will set the Qt error handler so we have to reset it afterwards - x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0); diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch b/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch deleted file mode 100644 index d46f8c541872..000000000000 --- a/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a83ddc5212736f89a0b94667c495494fe6861d63 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <kensington@gentoo.org> -Date: Mon, 16 Jun 2014 23:52:24 +1000 -Subject: Fix delay with QClipboard and useEventLoop. - -This manifests when using LibreOffice with KDE integration. When KFileDialog is -open, the clipboard is repeatedly polled causing a visible delay since using -QClipboard in "useEventLoop" mode adds 50ms delay to every single clipboard -fetch. - -Change-Id: Id30cda7b983ae7c949fa270d04f772fa44fc21cd -Task-number: QTBUG-38585 ---- - src/gui/kernel/qclipboard_x11.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/kernel/qclipboard_x11.cpp -index 14bf088..5f442b9 100644 ---- a/src/gui/kernel/qclipboard_x11.cpp -+++ b/src/gui/kernel/qclipboard_x11.cpp -@@ -548,7 +548,8 @@ bool QX11Data::clipboardWaitForEvent(Window win, int type, XEvent *event, int ti - return false; - - XSync(X11->display, false); -- usleep(50000); -+ if (!XPending(X11->display)) -+ usleep(5000); - - now.start(); - --- -2.0.0 - diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml index ef12478e668a..bb8d780f9c2d 100644 --- a/dev-qt/qtgui/metadata.xml +++ b/dev-qt/qtgui/metadata.xml @@ -9,18 +9,9 @@ <flag name="egl">Enable EGL integration</flag> <flag name="eglfs">Build the EGL Full Screen/Single Surface platform plugin</flag> <flag name="evdev">Enable support for input devices via evdev</flag> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag> - <flag name="glib">Enable integration with the <pkg>dev-libs/glib</pkg> event loop</flag> - <flag name="gtkstyle">Build a widgets style that mimics the active GTK+ theme</flag> <flag name="ibus">Build the IBus input method plugin</flag> <flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag> - <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that - this does not mean you can compile pure Qt3 programs with Qt4.</flag> - <flag name="trace">Build the 'trace' graphicssystem engine which allows to record - all drawing operations into a trace buffer. The trace can be replayed - later with the qttracereplay tool.</flag> <flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag> <flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag> <flag name="xcb">Build the XCB platform plugin and enable X11 integration</flag> diff --git a/dev-qt/qtgui/qtgui-4.8.7.ebuild b/dev-qt/qtgui/qtgui-4.8.7.ebuild deleted file mode 100644 index 79f95bf77ea1..000000000000 --- a/dev-qt/qtgui/qtgui-4.8.7.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils qt4-build-multilib - -DESCRIPTION="The GUI module for the Qt toolkit" -SRC_URI+=" https://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv" - -REQUIRED_USE=" - gtkstyle? ( glib ) -" - -# cairo[-qt4] is needed because of bug 454066 -RDEPEND=" - app-eselect/eselect-qtgraphicssystem - ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}] - ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - >=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}] - >=media-libs/freetype-2.4.11-r1:2[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - virtual/jpeg:0[${MULTILIB_USEDEP}] - !aqua? ( - >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] - >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.13-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.1-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.6.2-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] - xinerama? ( >=x11-libs/libXinerama-1.1.2-r1[${MULTILIB_USEDEP}] ) - xv? ( >=x11-libs/libXv-1.0.7-r1[${MULTILIB_USEDEP}] ) - ) - cups? ( net-print/cups[${MULTILIB_USEDEP}] ) - egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] ) - glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) - gtkstyle? ( - >=x11-libs/cairo-1.12[-qt4(-),${MULTILIB_USEDEP}] - >=x11-libs/gtk+-2.24.23-r1:2[aqua=,${MULTILIB_USEDEP}] - ) - mng? ( >=media-libs/libmng-1.0.10-r2:=[${MULTILIB_USEDEP}] ) - nas? ( >=media-libs/nas-1.9.3-r1[${MULTILIB_USEDEP}] ) - nis? ( elibc_glibc? ( net-libs/libnsl:=[${MULTILIB_USEDEP}] ) ) - tiff? ( >=media-libs/tiff-4.0.3-r2:0[${MULTILIB_USEDEP}] ) - !<dev-qt/qthelp-4.8.5:4 -" -DEPEND="${RDEPEND} - !aqua? ( x11-base/xorg-proto ) -" -PDEPEND=" - qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) -" - -PATCHES=( - "${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880 - "${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257 - "${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226 - "${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968 -) - -QT4_TARGET_DIRECTORIES=" - src/gui - src/scripttools - src/plugins/imageformats/gif - src/plugins/imageformats/ico - src/plugins/imageformats/jpeg - src/plugins/imageformats/tga - src/plugins/inputmethods" - -pkg_setup() { - use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets" - use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng" - use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff" - use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay" - - [[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig" - - QCONFIG_ADD=" - mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync - fontconfig system-freetype gif png system-png jpeg system-jpeg - $(usev accessibility) - $(usev cups) - $(use mng && echo system-mng) - $(usev nas) - $(usev nis) - $(use tiff && echo system-tiff) - $(usev xinerama) - $(use xv && echo xvideo)" - QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui" - QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) - $(use cups && echo QT_CUPS) - $(use egl && echo QT_EGL) - QT_FONTCONFIG QT_FREETYPE - $(use gtkstyle && echo QT_STYLE_GTK) - QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG - $(use mng && echo QT_IMAGEFORMAT_MNG) - $(use nas && echo QT_NAS) - $(use nis && echo QT_NIS) - $(use tiff && echo QT_IMAGEFORMAT_TIFF) - QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES - $(use xinerama && echo QT_XINERAMA) - QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC - $(use xv && echo QT_XVIDEO)" -} - -src_prepare() { - qt4-build-multilib_src_prepare - - # Add -xvideo to the list of accepted configure options - sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die -} - -multilib_src_configure() { - local myconf=( - $(qt_use accessibility) - $(qt_use cups) - $(qt_use glib) - $(qt_use mng libmng system) - $(qt_use nas nas-sound system) - $(qt_use nis) - $(qt_use tiff libtiff system) - $(qt_use egl) - $(qt_use qt3support) - $(qt_use gtkstyle) - $(qt_use xinerama) - $(qt_use xv xvideo) - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl - ) - qt4_multilib_src_configure -} - -multilib_src_install_all() { - qt4_multilib_src_install_all - - dodir /usr/share/qt4/graphicssystems - echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die - echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die - - if has tools/qtconfig ${QT4_TARGET_DIRECTORIES}; then - newicon tools/qtconfig/images/appicon.png qtconfig.png - make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings' - fi -} - -pkg_postinst() { - qt4-build-multilib_pkg_postinst - - # raster is the default graphicssystem, set it on first install - eselect qtgraphicssystem set raster --use-old -} diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest index cb3a52f35109..8f8684fbe29a 100644 --- a/dev-qt/qthelp/Manifest +++ b/dev-qt/qthelp/Manifest @@ -1,13 +1,7 @@ -AUX qthelp-4.8.6-compat-install.patch 899 BLAKE2B c79463971979a10c05e792593b66bab186c091ed9e983c982c389ce517cda973d49a8f3d7685dc3242a3ddbab00284c1c503cd3e65aeb7e1dac9dbe7dee191a9 SHA512 dc960f735a92a8bfa7a10e2c898eeb1dbdbf273cf342af3b0924240a1f3bc15694e86679b0f6cbd28f24246bfad3a5d799a6f383503deafa5b4adeb368a69158 -AUX qthelp-4.8.6-compat-syncqt.patch 884 BLAKE2B 25cb103e5c013c262d8c99cf21218083dbee6edd56203ee61a4acf637930c72d63b6428eac45ae6cf5e74ddee9a45c5d34e635712e97e7cb33260e8cc0295c54 SHA512 ee18303ca95569a66b1680f10a65766d67caca33928eb5d4f7ae2a4ffa883caa32dcb4adf7f48536e5bf78dcc26d30521c1309e9dfb0226284322220895ec20a -DIST qt-assistant-compat-headers-4.7.tar.gz 448 BLAKE2B ca3318ff64a4484faec0254d17f3831f75bc5d96ff6eef8dd57219076074c3b5cf23bdbc84266dc40c66231aba7342d9fb2cf9102c2bec05ce33d8854935a8e3 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb -DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 BLAKE2B b84c207a7633229a1b06aee1560f969bc5088ef65d1c6366ac817017a5713c6c50915df95109fa1a8fadef4bf8c2de22d16dc95e36325a92f419051c1dcfe5b3 SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106 -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8 -EBUILD qthelp-4.8.7.ebuild 3122 BLAKE2B 5c8e30e3826be0493b2304890022648b2073a2e30bcea15c620aef22763dd0f7bbb6805553f44b411482dbfdab8bd83ba7412a331a605c29bbbb845d0d88c46f SHA512 d06253208591e380d378db2e3496c42940581b781c1c4e82fdd3dba9d2bea6623161d4ada16b80bd6fcf503d78f0eb83972932e3ada501104539587857261d58 EBUILD qthelp-5.11.1.ebuild 652 BLAKE2B 7f6f32e0e641cb4fc3cb370b28ce1eb2cfef9a1179bf3201c29167928d8e46665ffbbc2699d54f61b31cbc8e10de6b2bc15665897dea40abbf6f2006c418b483 SHA512 430038abf54f5b7d4394fe6a02f488a59fb8cc2a09fd2431ca9b41f4a77456f6e7d56fa9ba6c1ae53b03c79f3cc0cf5af545959bbd3da3917fa179ad4404e99a EBUILD qthelp-5.9.4.ebuild 648 BLAKE2B 0d520f2d3f9d4670aebc9fe0f1d33298f90802818363f0314fbe0a8500be839adf3433ecdc436bae0944190b24de11a114fbd117f83a412b753c2dad0d517962 SHA512 cd10ec0a0413197b7558a0b3749ba70f8100316faae82df3b92c2bcc2389cf8e934623d06e905c04269211cbd563020e320e007e02ce45a24ff3dd3f087cb88b EBUILD qthelp-5.9.6.ebuild 650 BLAKE2B 610605567af82f99ffb564e8e0ff7f0d014c16136825d4b21cc7b6193fe56e9485313dbaed1a7ff529eeced64545e97703066773fd83572608d32393a2db8920 SHA512 8952ece9c3d67e621a7b2181fd7e649531b2ba60155f2adff05ce3c514e44aa506b65caa33bdf6bf1d35f6c5f42fd8c7d7a8e61c16895b970454a09b6c07c374 -MISC metadata.xml 825 BLAKE2B de978b130ccf71032fb98469ae3562a483b4fd791a13bab4f0d34990ad5638325c90b2ae057e870cc9d4af156114b90498d13828ea51dd2cbe9d3f1c3709b9a7 SHA512 54d474dfe7325966022026beab59b144932f523ced472f0d5d49f72727f6129923af821211fff3d42bc8dd02701e80f313e9e8c0f34e2cf18db1888ad8907026 +MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f 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 deleted file mode 100644 index e157381c8f05..000000000000 --- a/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 89f99089abe0c1369a78a3bb8e2a576c513ec809 Mon Sep 17 00:00:00 2001 -From: Davide Pesavento <pesa@gentoo.org> -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 deleted file mode 100644 index 4ba6b6ff7417..000000000000 --- a/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 37725ccec4d26148dde377d78c71046e8b6a6de9 Mon Sep 17 00:00:00 2001 -From: Davide Pesavento <pesa@gentoo.org> -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/metadata.xml b/dev-qt/qthelp/metadata.xml index a1b560594940..32568f62fb8e 100644 --- a/dev-qt/qthelp/metadata.xml +++ b/dev-qt/qthelp/metadata.xml @@ -5,12 +5,6 @@ <email>qt@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="compat">Build the extra compatibility layer required by a few packages, see - http://blog.qt.io/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</flag> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/qthelp/qthelp-4.8.7.ebuild b/dev-qt/qthelp/qthelp-4.8.7.ebuild deleted file mode 100644 index 0587f38e146e..000000000000 --- a/dev-qt/qthelp/qthelp-4.8.7.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The Help module for the Qt toolkit" -SRC_URI+=" - compat? ( - http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz - https://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz - )" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86" -fi - -IUSE="compat doc" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}] - compat? ( - ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - ) -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" - tools/assistant/lib/fulltextsearch - tools/assistant/lib - tools/assistant/tools/qhelpgenerator - tools/assistant/tools/qcollectiongenerator - tools/assistant/tools/qhelpconverter - tools/qdoc3" - -pkg_setup() { - use compat && QT4_TARGET_DIRECTORIES+=" - tools/assistant/compat - tools/assistant/compat/lib" -} - -src_unpack() { - qt4-build-multilib_src_unpack - - # compat version - # 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 - find "${S}"/tools/assistant/compat -type f -execdir chmod a-x '{}' + || die - fi -} - -src_prepare() { - use compat && PATCHES+=( - "${FILESDIR}/${PN}-4.8.6-compat-install.patch" - "${FILESDIR}/${PN}-4.8.6-compat-syncqt.patch" - ) - - qt4-build-multilib_src_prepare - - # prevent rebuild of QtCore and QtXml (bug 348034) - sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die -} - -multilib_src_configure() { - local myconf=( - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns - -no-nas-sound -no-cups -no-nis -fontconfig - ) - qt4_multilib_src_configure -} - -multilib_src_compile() { - qt4_multilib_src_compile - - # release tarballs are shipped with prebuilt docs - if [[ ${QT4_BUILD_TYPE} == live ]] && multilib_is_native_abi; then - # qhelpgenerator needs libQtHelp.so.4 - export LD_LIBRARY_PATH=${BUILD_DIR}/lib - export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework - emake docs - fi -} - -multilib_src_install() { - qt4_multilib_src_install - - if multilib_is_native_abi; then - emake INSTALL_ROOT="${D}" install_qchdocs - use doc && emake INSTALL_ROOT="${D}" install_htmldocs - - # do not compress .qch files - docompress -x "${QT4_DOCDIR#${EPREFIX}}"/qch - fi -} - -multilib_src_install_all() { - qt4_multilib_src_install_all - - if use compat; then - insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features - doins tools/assistant/compat/features/assistant.prf - fi -} diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index ab8b9b2459ba..9d26578e55f1 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -1,11 +1,7 @@ -AUX qtmultimedia-4.8.0-alsa.patch 2155 BLAKE2B 23b713531f7e4c63f568fd284d74586506acee583afe897bb40b53f2eb5e2a0178b353107e64f8d85d1fdd2c2f04a7eb0dbdcdfa648bfa6d2d4769c05275c36d SHA512 725dc78b861c82393ecd97ce293f9c165067ca940332fab22ecc252880e1c08aae301d54ddcdf38df9d32907c57bc70d772891a6dc9fdacf740de32b363f4aa4 -AUX qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch 6852 BLAKE2B fb9507a5ee7793c20e435896e553df808860f0ba1a1a9495325b8ecd06b06b0070f03bcec9313c509cad0cef8dc844ff48e00073d8c5b320b980ff8d9b694fef SHA512 ff513b5c68a02179e0a36803367b4dfe9f8c351fb76296570a2b382d2a1dd43fcb99033ab7844c52253c95124e2246cb81d68aa8e64e16c89d37bccaffcd9dea -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtmultimedia-everywhere-src-5.11.1.tar.xz 3711548 BLAKE2B 93d282725293c0750803e4cf00dfd4fdd2ceb23b5105eb339c60416cddcca2e39a51277ff60ad524b6225cfb6c2177fd52015bb7d10521a04973a4d24188fe0f SHA512 cfce510f5f5825ce12207070ce34bbc97e5433b5174bbdd562befcd383c74459436dfce23e5fd8ee5c5a4c28573b85374383d17ca3d0c61daa51b50c915b324c DIST qtmultimedia-opensource-src-5.9.4.tar.xz 3608792 BLAKE2B ac377b3cf33d727fa129fe623cc9ba9ea75555b2af7f70cf07524598d4044a94617b3627f7fd3a915596e51ac53040b9d72a5fcaa2faf316150a2c1ead220def SHA512 7a60434736f655900d00e70a68e5781f336446938f4f2b617e1d93205b7319bf01be987c001a9e6838ba5fd9e3afe3f20137597b6c27f6f77ee55486e283d425 DIST qtmultimedia-opensource-src-5.9.6.tar.xz 3585964 BLAKE2B fdd18b1abcfbc8a1f81c9a99e75748dd68112ae4fd534e038d73d1f8fa33b76119824ade231e7b1c283ff109ee2473774d08c67bffa04383e7328437539aadbf SHA512 2d5f1341ef1f2d7e99ced28945f70b283630ce4ed9ac968c34ffc7d215c59a9b895681ee519aca64fe8a41ae574577ce834e486281db7e1f337245f9b6506207 -EBUILD qtmultimedia-4.8.7.ebuild 1298 BLAKE2B 2e78e5f2f0dfbf43aaabd1abcf06fb05a3612029bb9ed2f1007cda90ed32665cea64b2f56e7b64b879400a3a66ba4907fbacefa5bd431fce1a08b0db3c61c8cc SHA512 d7a6fb8aa9927fadfd23e59a695818b8e066ccba71877848669358fa640064a6dee16c38ba988e2501e3350939fddc13c6ec90791c1b7c670f1e654b6a5fe6d0 EBUILD qtmultimedia-5.11.1.ebuild 1450 BLAKE2B c6a3a943732b92b0e8402d103747d948a71c1d9838e494f3d71443121793ca4784969bd5a230caeadb502ea48b516c81cbd5fc025a82d189ee19bf5663676e65 SHA512 31d84f0d939969958e588dde75ef6dd0fb4f3cc12178000bff34b0e3a33a33764725911239fe6f3c55665c8ccab4000eae90687f7b3aa74092b276684b506e61 EBUILD qtmultimedia-5.9.4-r1.ebuild 1460 BLAKE2B e845058b50a99d2744c32adc8044b0144988bfe898770e9f5f7a316eee2e5ed17974a36ad1e9ddef786ae8f789b16221534d56eea9d84ca713b7960e8810a764 SHA512 f5f1131f8915e62c8978663187f3a02b4f19fcb8285b4557f809fa1bef9c4277d7b2fe8b4c6fe92b3f55333bea1e4244f94e5af52539968aa15b98b810d55c5a EBUILD qtmultimedia-5.9.6.ebuild 1448 BLAKE2B 07aca93b6cb0cd416e0ea4547f1224c711b524d2cb2dbd08707d9317d9cdca6ed399c98a14f5e40b7eecf58f68ef34f091939abbb601e4799182b540082e1f1c SHA512 6905b4dc12b188cd382ee3ba7e9b83fd2bf7e4e43fb85cd5ed61b777d4ba79edf4137d4c23c5cce68841def78c42afc918ca21eb20f584f42dadfe1edeb5cfbc -MISC metadata.xml 937 BLAKE2B 804145c6bfe640955c5de227bdf2ba51570749541d5febec508b874fa823a2386da52648b2ba2bff959de2ef1371fa6384007591606410829d6fe4c12afd7ce4 SHA512 b5007c578748a64091105fd04aec3133587dcf0f8cf22b758520776e903699de80555fa2e69206edaf8415dad037018f8c169966fb48c1d402118a6e32509d31 +MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5 diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch b/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch deleted file mode 100644 index 8bd40edb1e80..000000000000 --- a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- qt-everywhere-opensource-src-4.8.0.orig/configure 2012-03-13 00:45:02.502205702 +0100 -+++ qt-everywhere-opensource-src-4.8.0/configure 2012-03-13 00:47:40.386231881 +0100 -@@ -1049,7 +1049,7 @@ - VAL=no - ;; - #Qt style yes options -- -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu) -+ -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu|-alsa) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - VAL=yes - ;; -@@ -2399,6 +2399,13 @@ - else - UNKNOWN_OPT=yes - fi -+ ;; -+ alsa) -+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then -+ CFG_ALSA="$VAL" -+ else -+ UNKNOWN_OPT=yes -+ fi - ;; - *) - UNKNOWN_OPT=yes diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch b/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch deleted file mode 100644 index 6a040b2d88a5..000000000000 --- a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 7737e5f851fdf33ea3e8e60cf7856f47565f09d3 Mon Sep 17 00:00:00 2001 -From: Davide Pesavento <pesa@gentoo.org> -Date: Fri, 22 Jan 2016 23:17:16 +0100 -Subject: [PATCH] Relax ALSA version checks for alsa-lib >= 1.1.0 - -Backport of qtmultimedia/3b322323d036ae2fc9f685bfc74d1ebcd5532159 ---- - config.tests/unix/alsa/alsatest.cpp | 2 +- - src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp | 16 ++++++++-------- - src/multimedia/audio/qaudiodeviceinfo_alsa_p.h | 2 +- - src/multimedia/audio/qaudioinput_alsa_p.cpp | 4 ++-- - src/multimedia/audio/qaudiooutput_alsa_p.cpp | 4 ++-- - 5 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp -index ac5f1e1..8d78f95 100644 ---- a/config.tests/unix/alsa/alsatest.cpp -+++ b/config.tests/unix/alsa/alsatest.cpp -@@ -40,7 +40,7 @@ - ****************************************************************************/ - - #include <alsa/asoundlib.h> --#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10)) -+#if (!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10))) - #error "Alsa version found too old, require >= 1.0.10" - #endif - -diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp -index 973cbab..a09dcf6 100644 ---- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp -+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp -@@ -63,7 +63,7 @@ QAudioDeviceInfoInternal::QAudioDeviceInfoInternal(QByteArray dev, QAudio::Mode - device = QLatin1String(dev); - this->mode = mode; - --#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - checkSurround(); - #endif - } -@@ -159,13 +159,13 @@ bool QAudioDeviceInfoInternal::open() - QList<QByteArray> devices = availableDevices(mode); - - if(dev.compare(QLatin1String("default")) == 0) { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(devices.first().constData()); - #else - dev = QLatin1String("hw:0,0"); - #endif - } else { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = device; - #else - int idx = 0; -@@ -212,13 +212,13 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const - QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput); - - if(dev.compare(QLatin1String("default")) == 0) { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(devices.first().constData()); - #else - dev = QLatin1String("hw:0,0"); - #endif - } else { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = device; - #else - int idx = 0; -@@ -396,7 +396,7 @@ void QAudioDeviceInfoInternal::updateLists() - } - channelz.append(1); - channelz.append(2); --#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - if (surround40) channelz.append(4); - if (surround51) channelz.append(6); - if (surround71) channelz.append(8); -@@ -419,7 +419,7 @@ QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode) - QList<QByteArray> devices; - QByteArray filter; - --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - // Create a list of all current audio devices that support mode - void **hints, **n; - char *name, *descr, *io; -@@ -498,7 +498,7 @@ QByteArray QAudioDeviceInfoInternal::defaultOutputDevice() - return devices.first(); - } - --#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - void QAudioDeviceInfoInternal::checkSurround() - { - QList<QByteArray> devices; -diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h -index 96febf4..714bf60 100644 ---- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h -+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h -@@ -98,7 +98,7 @@ private: - bool open(); - void close(); - --#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - void checkSurround(); - bool surround40; - bool surround51; -diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp -index 339fd9f..202a5b2 100644 ---- a/src/multimedia/audio/qaudioinput_alsa_p.cpp -+++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp -@@ -284,13 +284,13 @@ bool QAudioInputPrivate::open() - QString dev = QString(QLatin1String(m_device.constData())); - QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioInput); - if(dev.compare(QLatin1String("default")) == 0) { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(devices.first()); - #else - dev = QLatin1String("hw:0,0"); - #endif - } else { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(m_device); - #else - int idx = 0; -diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp -index bf85de5..fe4b010 100644 ---- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp -+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp -@@ -299,13 +299,13 @@ bool QAudioOutputPrivate::open() - QString dev = QString(QLatin1String(m_device.constData())); - QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput); - if(dev.compare(QLatin1String("default")) == 0) { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(devices.first()); - #else - dev = QLatin1String("hw:0,0"); - #endif - } else { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(m_device); - #else - int idx = 0; --- -2.7.0 - diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml index c6f5fc3b1269..833d7be66b31 100644 --- a/dev-qt/qtmultimedia/metadata.xml +++ b/dev-qt/qtmultimedia/metadata.xml @@ -6,8 +6,6 @@ <name>Gentoo Qt Project</name> </maintainer> <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag> <flag name="gstreamer">Enable audio support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag> <flag name="qml">Build QML/QtQuick bindings and imports</flag> diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild deleted file mode 100644 index eb03bb3922ac..000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The Multimedia module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86" -fi - -IUSE="alsa" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.0-alsa.patch" - "${FILESDIR}/${PN}-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch" # bug 572426 -) - -QT4_TARGET_DIRECTORIES="src/multimedia" - -QCONFIG_ADD="multimedia" -QCONFIG_DEFINE="QT_MULTIMEDIA" - -multilib_src_configure() { - local myconf=( - -multimedia -audio-backend - $(qt_use alsa) - -no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend - -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest index e939e6523186..7fc705d1e9f0 100644 --- a/dev-qt/qtopengl/Manifest +++ b/dev-qt/qtopengl/Manifest @@ -1,9 +1,7 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb -EBUILD qtopengl-4.8.7.ebuild 1100 BLAKE2B 38f986aed1ac6fc40b6037cb17fece5ab7d759a2f79d0d28ba18e3ac09691673ce0dab0942301d06bcb11675c96b48cde6435c80a9e22f865884f5b5559e1558 SHA512 d099ac28dc473121906eae72560d5a100a8a085a110d82ebeb87ca8e9109dcd62c5cb4dae107b0adf15d2ee34b0a13de095de00096a3dc0bfc7f535d97bbaf01 EBUILD qtopengl-5.11.1.ebuild 648 BLAKE2B 2ed179d870443194faebbfeb074111043d3a75da80c89a61f7b94c104b9a0fedd4fc5c1788b657ad76f6f76e4cbcf779b0983c3cc321965f2471d570e81a4be8 SHA512 459886ec36695f2d441a9b3b869366b2e84d97b99924c94af111fac822ef406c7b226c50de93afd844dc372e14073cba23ae976d068abffaebab5da0aae15e8a EBUILD qtopengl-5.9.4.ebuild 644 BLAKE2B 39c9006f5b9bf93fc18b0e78b18026d0bf15ded8281c3b5327fcd8030b3fcbfd05443d7e7e37a5b8eabf8ab7086cb98fe786fb5ca601621b51b6f6ca2a8c4ecc SHA512 e7e3b6b1a7c5e708b150387416ae0435f52833dc070a193ed232bb531a3cf6d69acc32f267dde7afe96dc0eeeca618f564ff7112b4b1ca96c189f055c46c189a EBUILD qtopengl-5.9.6.ebuild 646 BLAKE2B 78d42d9d7c225323fc3a598c9497e1bde3342d77665d4a7c63f369cce21339a0c3939b5d811490161f074ae032a3b25c706f0f93bc8cedde5c05cc5dfa6262f1 SHA512 84aec7b7db50938bd6099967a0a9b6dd657f6ca325cf275bea81cb06fad05bf29921eba26b17f3546198558344b4f1116da461be4ce88fd12c256ed8e41c70e1 -MISC metadata.xml 849 BLAKE2B 626ede10341fed23cd36a62710da3423c49fa4421d4f8dd883df3c1a0d157f4a4d343632763c542093566a8967050bb4a3cccac015f4aedba25471a4e03a591a SHA512 98644de5d50d3392db4099551755340012a29ef9ae129038eb64ff1aca49f2de34442d7fd8e4f6c457366148a7d9288843f7ea023d0759a71aadab3a419aad41 +MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192 diff --git a/dev-qt/qtopengl/metadata.xml b/dev-qt/qtopengl/metadata.xml index 3a2fbf1c8ab7..17b1d11ac715 100644 --- a/dev-qt/qtopengl/metadata.xml +++ b/dev-qt/qtopengl/metadata.xml @@ -6,11 +6,7 @@ <name>Gentoo Qt Project</name> </maintainer> <use> - <flag name="egl">Use EGL instead of GLX to manage OpenGL contexts</flag> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag> - <flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> diff --git a/dev-qt/qtopengl/qtopengl-4.8.7.ebuild b/dev-qt/qtopengl/qtopengl-4.8.7.ebuild deleted file mode 100644 index fb17633c545f..000000000000 --- a/dev-qt/qtopengl/qtopengl-4.8.7.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The OpenGL module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="egl qt3support" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=,${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" - src/opengl - src/plugins/graphicssystems/opengl" - -QCONFIG_ADD="opengl" -QCONFIG_DEFINE="QT_OPENGL" - -multilib_src_configure() { - local myconf=( - -opengl - $(qt_use qt3support) - $(qt_use egl) - ) - qt4_multilib_src_configure -} - -multilib_src_install_all() { - qt4_multilib_src_install_all - - dodir /usr/share/qt4/graphicssystems - echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die -} diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest index 4183ac5e099a..35755069f276 100644 --- a/dev-qt/qtscript/Manifest +++ b/dev-qt/qtscript/Manifest @@ -1,10 +1,7 @@ -AUX 4.8.6-javascriptcore-x32.patch 1826 BLAKE2B 2a695f9c563675e0d1a36c9edda8b01dd83db6b377a4e72dd3b6ced8d11d0c206aadf56c35423d11841407452ab3e8f4ff3509a803e757536ad76cb87eaea76a SHA512 9b93ebdb9c474ad4e4d09de9d99d97351022863ae3a58fb0b03d1cd103dd012d0a12643f6e00f60cf0a9a4ac24db98039e87d5dd9a1afcf8dc65696b4bcd4efb -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtscript-everywhere-src-5.11.1.tar.xz 2671428 BLAKE2B 8cc74db4f5b33e299964f81b00e634965f7471d191726521726a5f2556a8eccf344e7277071f817a9fa0c40856acdb955258e9491966b6f773701e809b73982d SHA512 609ac6675341fb2707ad3b91e955a430846253741931ada2343ab2d1ad27169a60548b1a2621369384043a4c5b983e392c3fafcffd50237563b9f4204123e411 DIST qtscript-opensource-src-5.9.4.tar.xz 2612372 BLAKE2B 8213e2b70e23dfa6e42ffd0aaa1818a4794670de24fa5b30cdf4c7bd17f1a438d9d6a8bf9c03f2995a60b6e3ad6d57bf0273c6e1027ed3d0b77fc2987d285603 SHA512 e0c49e1286c4b1de6d197c42d8e4bcd82a5ea07e8c89f6f222fa62579b5d466336a5baa50372e5a9b514bd8be098e80f3793123cae09d7a923c4d1466b0e13c9 DIST qtscript-opensource-src-5.9.6.tar.xz 2607812 BLAKE2B 3f11ae2270b1bdc6ac195a4a398754df16d4599211ba291fd0a5793cc7e586f0034f1f5d63a185541e35c744de1d3c8facf12bef2cbbf98abd94b3c27e40b6ba SHA512 2ddecda376b79edc8cfe9215a531a8f0b1892f3e6b39c298a679903c2600a1df43bb59baeed3392e92fefb476ec2ebdd2ffd351d14918fea00025d2cbd48da46 -EBUILD qtscript-4.8.7.ebuild 1072 BLAKE2B eb4d2995271b4c1b3b083df9b9b657b49a6aebc66bdceddf78269590db9ae47f99a72112f6d2c2de9cd737cabffa8679eaa6545af5c509a58b5c7a962d2a5adf SHA512 c3b6a2933cbf054228051ae4eddc50940915a269aa5130dccdb9bbfc895678632cbdb3935f061565eed532faa48aa661c194549b62fb1c83c11057512afad8e5 EBUILD qtscript-5.11.1.ebuild 686 BLAKE2B 2b5a8207e0fbb0f7f5222688b6f8e3c391a3684481e5fb9b71bd543d3111b3cf8d62a56d44ca030c0f2b1019585f740de542dbb78323e1389dd617d0c684d943 SHA512 8fecd4ac008262217070af2efb26729fd21c75818f0555697d6e04a3f6e3c536bf3efc14008a64cbffd7ca4c9092bd3b1746141a1648310133306a298b9df97a EBUILD qtscript-5.9.4.ebuild 682 BLAKE2B fc04d73b06779e8abfec714ae6b59e59a72237b56fbcf48eb24a5cceaf9860e5fc88ad36b68d9cacb6dc470a795c7d783908a55b638b1e884faf4bd3a143df05 SHA512 91eb46966db41a9718404c74cc2f18b723b9630fbd9b2a3fbbc42bc2eaf0edca796a0fcb72e32731880a3c13631eb7b92241180161b94f88a7f5cda949f6a75d EBUILD qtscript-5.9.6.ebuild 684 BLAKE2B 740c6ecefc6fd61279e55c7886f704341e26be6acfbbe79e7090352a2427d3d0084226cb5f43882313742a63544e6e9f9cbd3caf72f026837ce8b9f515af3cea SHA512 3976777f709fd60b925104058cada2a7525bb00078840a720585f2bebbeab2b8fa97dffc112397ee9aeee4c56f965b69b7f1c0996490f4856f1be9f2ba61b1cc -MISC metadata.xml 714 BLAKE2B ad5f2175907ab5167fa16d75c1c538e4e66fcfb96d4a2dd2d19d92ccc39fc3283dc7b67505636834ea772727e5e50aaefc8468b9ecdc448fff33e6806c93d805 SHA512 8324b4dc7a26ce06a5c8af58768e337f1e96a2077b65f5996a4af535a07ac3a13c05af2fb0c89796335ea106eb82d0857dc20cb9d4c8131907313557a0319b6e +MISC metadata.xml 582 BLAKE2B 770c02c672a84e600bbbf91aa73e72947ff1e6944e0aec830ac24bc4b648197e78994bc949feb80381dff2af2e96c9792fe696059060c8c7ad3127a8992161d6 SHA512 d6ceb5cac55d142912f967e1336233aafbce4ebd981ca276f3f9f13214e1ec3576b04e89105e2b2b45cf9621a194ed09de581dc44092ee453dafb12304af8652 diff --git a/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch b/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch deleted file mode 100644 index cde4cfb93f51..000000000000 --- a/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 4e7126ea1488f3e1df0b76cacf83cb73f9d4b54c Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@digia.com> -Date: Tue, 4 Mar 2014 10:46:18 +0100 -Subject: Fix build on x32 - -Recognize x32 and disable JIT in this configuration. - -Task-number: QTBUG-35463 -Change-Id: Ie5bf64f22f3e58a9b3f12190cf790ad6c39f415e ---- - src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -index 0b95639..85ed8a7 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -@@ -202,6 +202,11 @@ - #if defined(__x86_64__) \ - || defined(_M_X64) - #define WTF_CPU_X86_64 1 -+ -+#if defined(__ILP32__) -+#define WTF_CPU_X32 1 -+#endif -+ - #endif - - /* 64-bit mode on AIX */ -@@ -906,7 +911,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) --#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) -+#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) - #define WTF_USE_JSVALUE64 1 - #elif CPU(ARM) || CPU(PPC64) - #define WTF_USE_JSVALUE32 1 -@@ -923,6 +928,11 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ - #define ENABLE_REPAINT_THROTTLING 0 - #endif - -+/* Disable JIT on x32 */ -+#if CPU(X32) -+#define ENABLE_JIT 0 -+#endif -+ - #if !defined(ENABLE_JIT) - - /* The JIT is tested & working on x86_64 Mac */ --- -cgit v0.11.0 - diff --git a/dev-qt/qtscript/metadata.xml b/dev-qt/qtscript/metadata.xml index a559e6341854..da283d207fe3 100644 --- a/dev-qt/qtscript/metadata.xml +++ b/dev-qt/qtscript/metadata.xml @@ -6,8 +6,6 @@ <name>Gentoo Qt Project</name> </maintainer> <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> <flag name="scripttools">Build the QtScriptTools module (requires QtWidgets)</flag> </use> <upstream> diff --git a/dev-qt/qtscript/qtscript-4.8.7.ebuild b/dev-qt/qtscript/qtscript-4.8.7.ebuild deleted file mode 100644 index ce3c8d0893c2..000000000000 --- a/dev-qt/qtscript/qtscript-4.8.7.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The QtScript module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+jit" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="src/script" - -QCONFIG_ADD="script" -QCONFIG_DEFINE="QT_SCRIPT" - -PATCHES=( "${FILESDIR}/4.8.6-javascriptcore-x32.patch" ) - -multilib_src_configure() { - local myconf=( - $(qt_use jit javascript-jit) - -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama - -no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif - -no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff - -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg - -no-gtkstyle - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest index fa7c09677297..6084961dcc82 100644 --- a/dev-qt/qtsql/Manifest +++ b/dev-qt/qtsql/Manifest @@ -1,11 +1,9 @@ AUX qtsql-5.9.4-mariadb-10.2.patch 1187 BLAKE2B 1ee0a4ad020a1d0e5bcaa19ac987eb5b472f9701adf876024003e377ca40060a52323bdfd3ec8213e6e8e199336bbfd92c7aab716be38b46fd105628eea447f6 SHA512 3ad71a5c3a31bb60484de09bb6503fd1c35f6e55aa2116f5ea468314a3c72cc43ddcfde6da01f479f91c381fbf2f2e64024ab88cf0e8f2e0a3edbda45bd44609 AUX qtsql-5.9.5-mariadb-10.2.patch 1199 BLAKE2B cb5d5079aca9f9adb0343db8691418afc1e1b43c8a425f5c8f52ab24872047c9f9bdadfe48fee9e7c85b5cd1f886951aa3777f55ccada790113150c71a77ca42 SHA512 be4d8c3569ba3007a0b512184295f12043b79e09e948651fae3af5b4a6e7e0ebcf5c5f55c32c321c64a469eefeff16ee7169bbc03d7027ee04d62d384e04288d -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb -EBUILD qtsql-4.8.7-r1.ebuild 2261 BLAKE2B 24e39792f5fd56b5d61a7b61dee71f00cae4a45436e74137de29460d89c5c13235811142dfb8f5499eea483890c4c39ff2fd9d86f0ac9e52f05d08499b1ac8ce SHA512 a81056b36b8a081403824b1102883d7d35e181c05bc6b8e56e29c227ec832fe712a1dde8a4178a30bad5454798aa17eaf33890403c15b08b67cb221487b8e4ca EBUILD qtsql-5.11.1-r1.ebuild 1504 BLAKE2B 9370519007fd4316023f02b3c600b460d7f6700d5afd8a9021d44630b314c3e0ab80b17fc256f505a6569f76d71c66f7aef227f38e000432b4d54e3046aabbe8 SHA512 47784173975a4f6c0ab8d161c64ee7e511768f20b5179f6bb4e14196def668b89d7bd6edd969d97b68fc8e12b3df7229ebcae928c243c3584790a4accf374dbf EBUILD qtsql-5.9.4-r1.ebuild 1576 BLAKE2B e87c3461b70676298963c099fa518a622e05cf054f5dfebb707584ba6c629c37844b3d29c5dd846128f38295abdf26b016347a2b34ff9b1592dbcda74d89fdd6 SHA512 d33dca9366dc91e4410eed715aa3e31028dfc4be35f3cdc9dc266d3a83ba12c77e210362320a5e78ae9d9f8d3e77ea08cba9409b4a79e1317daa1aa7c7f8569a EBUILD qtsql-5.9.6-r1.ebuild 1620 BLAKE2B 90087b4ffcc3ae4e24679e4411cd0d2ba27c945f37904491b1cd394633afe4b06f7b85b002656f16523a7a72be55bd20db0e3e3614722b7b5a684f2b643e4ef1 SHA512 a60023e67e6a9e7f9287cd9874568eeac258e4c2709e075151df901f7f49b925e50ef9ffa55c1f3e7fdb6e376cda7dfa27f5526e0b1b7a840701cea45a2d6f39 -MISC metadata.xml 701 BLAKE2B b9f31dc4bdb158bda952ca941dc3a5f70004800c8874e310a2a9634223dde59e799df9b4f9d424d89870c191fe041ec29ecbab79c1f04be55c786170d921c10e SHA512 c807e5c85d7e4f23f15ef9f95f4bed3e303e25e355a096ee118e4846330948957dc44d16c97d3c687ee30a5895c511e9d1480a39ddf2360f8989d06daf0b91b8 +MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f diff --git a/dev-qt/qtsql/metadata.xml b/dev-qt/qtsql/metadata.xml index bea102dd5ae8..32568f62fb8e 100644 --- a/dev-qt/qtsql/metadata.xml +++ b/dev-qt/qtsql/metadata.xml @@ -5,11 +5,6 @@ <email>qt@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - <flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild deleted file mode 100644 index 089d7a76c79c..000000000000 --- a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit multilib qt4-build-multilib - -DESCRIPTION="The SQL module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite" - -REQUIRED_USE=" - || ( freetds mysql oci8 odbc postgres sqlite ) -" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] - freetds? ( dev-db/freetds ) - mysql? ( virtual/libmysqlclient:=[${MULTILIB_USEDEP}] ) - oci8? ( >=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] ) - odbc? ( || ( - >=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}] - >=dev-db/libiodbc-3.52.8-r2[${MULTILIB_USEDEP}] - ) ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" - src/sql - src/plugins/sqldrivers" - -multilib_src_configure() { - local myconf=( - $(qt_native_use freetds sql-tds plugin) - $(qt_use mysql sql-mysql plugin) $(use mysql && echo -mysql_config "${EPREFIX}/usr/bin/${CHOST}-mysql_config") - $(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)") - $(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc") - $(qt_native_use postgres sql-psql plugin) $(use postgres && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql") - $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite) - -no-sql-db2 - -no-sql-ibase - -no-sql-sqlite2 - -no-sql-symsql - $(qt_use qt3support) - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-nis -no-opengl - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - -no-glib - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest index 5460cfcbcac7..090b352cedb9 100644 --- a/dev-qt/qtsvg/Manifest +++ b/dev-qt/qtsvg/Manifest @@ -1,9 +1,7 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtsvg-everywhere-src-5.11.1.tar.xz 1843216 BLAKE2B 8e5e94e706872f65189a51f0ea19a69d409de4d60c8cedd376e8e5efe74513370cc0add47d7d158ee386ce96455af27bef6ac3e29efdfc392d00dc7f5e3e7221 SHA512 2e9b126e72335b4b39296d033c6ea8761739148b812841797e1678135eaad944a5e4073010b5dbfb17708bd8fc8de0dd6b2b092330176b3b29c7637357353e39 DIST qtsvg-opensource-src-5.9.4.tar.xz 1778072 BLAKE2B 077ca02c7a43cc5cc6170e0c24ee155e3d190033837494c58804934881361f738709f0aed9d876dada19c48b194624b90a759cf509c9e1fb9c566514a4f5c430 SHA512 242a471ba8b1b3fe45d53e0dbdd2bcba0ffe129f7658fa3608fb0f8ee72bf56244522861c12315eabc401f389031bea2027eb106eec67688f141ea8550b6b2b5 DIST qtsvg-opensource-src-5.9.6.tar.xz 1778688 BLAKE2B 30084cdeaefef6c15f07fbdb9373b9cecb87fdd9676c2d89061a371439ec0c02ace2fe65b0061e518de6a1b75df9edf314adcdb6ffdc03c7be29424c92784d25 SHA512 6e86f050c07621d628f6e9440541be1fd80b3e05b034ba17bb5068afd4775d9ee08d7bf11d2ffdf03da2cb8ca66bfaf2f59b7e5e76acdb1a1e2ec25af25c65b4 -EBUILD qtsvg-4.8.7.ebuild 1147 BLAKE2B 2c640fadf3d57b7c745be9dd822be6db9a070dd077026197df9eabb9c398ee66a22a9bd9e9223c1ab99e9da6985a33cfdf47cd68c5350abb3614711d48f04226 SHA512 68e74c1c97a630ad57c2e6aeaa7d5a73b90c13eb29e9bf513a7b19b26b990b234e16d77c04231b59f8aa53110551c7b9844aae1f60f0f0bc8b94322911a6f583 EBUILD qtsvg-5.11.1.ebuild 471 BLAKE2B 7d28048cbec0b1d0ebc7a155681f7636e1e7cbe08f7a9f6f8b00f8310696b8cbb6d786b217734d157987ddec8f124e402cdcd5fe134b89b11b36548bbbf96142 SHA512 2a140ea11d851126ce2242dccbb4475bcd662ef334df117a52c57bb7dfe26b29b2ffa54e281f6fc9c52b8ce1826c3ff02ebdeba3c419e470f11ab854c87bc66f EBUILD qtsvg-5.9.4-r2.ebuild 491 BLAKE2B 1f78d69d00c5ff09b09581769de621315a993c709ed19c09064fde88008c924d0ec59779946d3b3f6385787586a406e63cf91b1db33dc531fb02574f296565b4 SHA512 0eee956fca2fcbf1b2ec2c934e0c76a289941ca7112f37cc66f41807290a3e640299972e5239bc8682d87ebb639ce30db27d6b0c34184d5f4c21ad01d9eabcb1 EBUILD qtsvg-5.9.6.ebuild 469 BLAKE2B d62fbc4257dd403c001b88dd476882a8c2872053df5bdd01d5871f52ab5a6cb7fd68ba0ec1f564142a8e2f0207a617f1b1341b43198f5dd051123d7cd384133d SHA512 fbd0a8da764815bb277293837aa0ccad363f0ecc0f287b879994a0f4f245588d51ebb9a7406c337736f8023887088dde609095983a46ad27b91508eb24d8e8db -MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360 +MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f diff --git a/dev-qt/qtsvg/metadata.xml b/dev-qt/qtsvg/metadata.xml index 22d751f51bd7..32568f62fb8e 100644 --- a/dev-qt/qtsvg/metadata.xml +++ b/dev-qt/qtsvg/metadata.xml @@ -5,10 +5,6 @@ <email>qt@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/qtsvg/qtsvg-4.8.7.ebuild b/dev-qt/qtsvg/qtsvg-4.8.7.ebuild deleted file mode 100644 index e93289484ea4..000000000000 --- a/dev-qt/qtsvg/qtsvg-4.8.7.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The SVG module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+accessibility" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" - src/svg - src/plugins/imageformats/svg - src/plugins/iconengines/svgiconengine" - -QCONFIG_ADD="svg" -QCONFIG_DEFINE="QT_SVG" - -multilib_src_configure() { - local myconf=( - -svg - $(qt_use accessibility) - -no-xkb -no-xrender - -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm - -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng - -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff - -no-fontconfig -no-glib -no-gtkstyle - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest index fcb80275c91a..91dfd195ec03 100644 --- a/dev-qt/qttest/Manifest +++ b/dev-qt/qttest/Manifest @@ -1,9 +1,7 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb -EBUILD qttest-4.8.7.ebuild 933 BLAKE2B 234731d6bc636f8aafa311de9cfb8a89e3e6bdb5bab4b1fc2fd4b78bdead1eb3fa29df292e9bae5b73cad6b8c364984b6a16e76dff8b4e98621adf9e74333297 SHA512 7d2f377603287d0aff165aac7017622e0b8e4445103696911d6784c108cb4d9f1f04200c1baaf6aaaebb865c5038ce0d393240c91e6da06968c91171d93568e8 EBUILD qttest-5.11.1.ebuild 549 BLAKE2B 42c5c9b7054d7838c2ec9db74c44b4e6421e3146398ad9568461ed8163a0ad49594c7d3827a6519d044139d3b03fc3d32132cb759a257755c22c850c0bf124f9 SHA512 df67411113389754057bf2157ed1a6ebdd5078ac9d2beeeee87e828ba9eb58c904ccb220aa1c12b9186d06b8d38263ec03d9babdc97d00891c11bd12d60fda88 EBUILD qttest-5.9.4.ebuild 545 BLAKE2B 85bbb66b553452f36b6afbd85eeb571008e7b9e0b243307a1cca65068f8ae7e0f50d2d9c65b65d4b70af4966495e57a093382d05afa69b112b0974c1aa14a224 SHA512 50a40c8669a267cfaaed421d9e5d48b22ac6cfeb502bc63b49abba6062f022b52c8141868c388a1a3c1f9fcf819070f29796fd0d229090b9a3eac39b8a4dcbb6 EBUILD qttest-5.9.6.ebuild 547 BLAKE2B 2078ba25107eec129eb20e7c0d7516a1eee0fcbbd51c26ed79bf0f0a0b110603c65284df96ba0c9737a92df072aa43d18da5ccd10d0f3616ea4e1a83f5bf876a SHA512 8802b34cce520c47d20c3b9ade67bcdc0dee0d70e39094a75ba6d30d9aca93f7c3e147a5fcf6b99468299b3088e003597022a7d307c61f1ebbd6d7cb19e4c7b6 -MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360 +MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f diff --git a/dev-qt/qttest/metadata.xml b/dev-qt/qttest/metadata.xml index 22d751f51bd7..32568f62fb8e 100644 --- a/dev-qt/qttest/metadata.xml +++ b/dev-qt/qttest/metadata.xml @@ -5,10 +5,6 @@ <email>qt@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/qttest/qttest-4.8.7.ebuild b/dev-qt/qttest/qttest-4.8.7.ebuild deleted file mode 100644 index c9adac525eb4..000000000000 --- a/dev-qt/qttest/qttest-4.8.7.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The QtTest module for unit testing Qt applications and libraries" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="src/testlib" - -multilib_src_configure() { - local myconf=( - -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor - -no-xinerama -no-xshape -no-sm -no-opengl - -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng - -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff - -no-accessibility -no-fontconfig -no-glib -no-svg - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest index dffcc2542727..2e63fdcbbe17 100644 --- a/dev-qt/qttranslations/Manifest +++ b/dev-qt/qttranslations/Manifest @@ -1,8 +1,6 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qttranslations-everywhere-src-5.11.1.tar.xz 1428808 BLAKE2B 55a8813a471ab14f885f95df6a2205c50424c8892d060f3dfb4123d281e55a1a8f0829ad3b8f1b713bac11a1160fc22a977269bcaae877b80c985c4b2c9232ff SHA512 b817b7be585413e352271204e88730c873e0701f65dbba9f5b331f0c3e0ddc1bd2446f038991bf9eabdd79ba440ea0172d0342b5b0d8b1593d9f55ad2a0ebcc0 DIST qttranslations-opensource-src-5.9.4.tar.xz 1451972 BLAKE2B f859c764d63673866bc8be88d4e5f9e2956b3bd08a883268a0c9cbca45a7132578a87b98eadf592944864da2d70cbbff0b46a75665faaa72c4f6a723f203cdb6 SHA512 74375ee78e40e8de2349e575306c729d90d80de089f44d4ff57506085c748d5eb5d0699a769d4379f7dd23c48ab88b7e5a8227044ce07d6ae12b0d3ac19450f0 DIST qttranslations-opensource-src-5.9.6.tar.xz 1376088 BLAKE2B f85611a787fbbc5820bf0b68773ab9be1edc2f659c7861c6d8bc8158c0ca495f882dd2201406315a1f5c3caf7b4dd87b2178362e4ee9d5523112c55f590a6fd8 SHA512 caafa6fb865c73c1c43ca5d78aab21925d5cf836b3e9d8c10ac699a96e7b583e85f12101a79a55102f8d404305764acadac599cf84b97d03582684f3b9bc4ec7 -EBUILD qttranslations-4.8.7.ebuild 773 BLAKE2B cd0ea1b0a67d8d9d8ee6fd5d5bf4c2bd37aa42ab5e7250ade8f4fe689bed011caccecf51dce162b2c445eef3b725ca183a37831e03d5e11d88687e5071c9d597 SHA512 1f833bde8f1dcdbd7838cee55c193738203bf74d0ef55865bfe511e3f5749675d216669af2476530e3b27e3b12ef481e092e7866e6fffafe9d8bfba75d3a52ab EBUILD qttranslations-5.11.1.ebuild 379 BLAKE2B 983cfd8e6e4342992f7d945371452484b3208909b390595036f98cac87d1199f82ff53f12c449eabdfad1dc4f4f88538b2a77490c20dbe1ea7f85b85eb28fc06 SHA512 66c2e18d13961fcaae9ca45a04772f13e18a08f1097ae543a4b2828ad9d8d91526259fb978d2476b67804068c8f3b48466ab2f1fd840debeabf43174111201b1 EBUILD qttranslations-5.9.4.ebuild 375 BLAKE2B 1eb759e922cfdd8c16db5a2a275bd51b700369aaa0cc660cf80996506826f223dc1441c817bb5bc7ca2ab4d5eca57e71d2311821e257fd4371e254b3b30d6fba SHA512 6d72e2552b8fd5746029c4d76e43fa62162e520eed2a091d2ef605e9b6ffbede380dc9d6b6ac64774b309776346cbb6e71a889d1d647ef23d6700a28ae29e8b3 EBUILD qttranslations-5.9.6.ebuild 377 BLAKE2B fe293bf9dcd464ae793d3fe67d092b9d5aa658e00c57170ccd77e9d2ffb7cac710f99d177a7ef90ecfc6b527bd4f6b409c3b3b7312353764e78d1ce67864f9de SHA512 025182f1237a4339cf9877771ff1d6478388565c7d8415878c8b5f14dae85dab2a789173603b44a66d40bfbc8d965bf438f37ba76129d15933168b23533cac8b diff --git a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild b/dev-qt/qttranslations/qttranslations-4.8.7.ebuild deleted file mode 100644 index 11907196f693..000000000000 --- a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="Translation files for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV} -" -RDEPEND="" - -QT4_TARGET_DIRECTORIES="translations" - -multilib_src_configure() { - if multilib_is_native_abi; then - qt4_prepare_env - qt4_symlink_tools_to_build_dir - qt4_foreach_target_subdir qt4_qmake - fi -} - -multilib_src_compile() { - multilib_is_native_abi && qt4_multilib_src_compile -} - -multilib_src_test() { - : -} - -multilib_src_install() { - multilib_is_native_abi && qt4_multilib_src_install -} diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest index 7d6a1b742b92..3792212188af 100644 --- a/dev-qt/qtxmlpatterns/Manifest +++ b/dev-qt/qtxmlpatterns/Manifest @@ -1,8 +1,6 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtxmlpatterns-everywhere-src-5.11.1.tar.xz 1378340 BLAKE2B 53675d44da768d322bd6ba8de30d4ad00f370c79aa871e1a80184df4cc9ce8d45c13f6fb3a808660a42a44c034b14929fa7dbac52878642057a49a4a778d20c9 SHA512 207fda037fce412412909799ba7737764ebfa5d8cd4b0185f158791adbecd9a0e0db15bb7e40aaa5e664809b600e77a7a3398a35d2f4e087f1ab15a31e706066 DIST qtxmlpatterns-opensource-src-5.9.4.tar.xz 1361036 BLAKE2B 74fae07ff780bb44eaffc56822585c5dd2dc36c13237ae23666f8286488a837cafccf01c14d9efe4d151435235965b923bad1889ed604ebb2781237d8674db26 SHA512 c2789e7ca32f29f025b72704be49d9cfd3c02bfa61bf3df4145ea03b5df4fc60b2498bcf7e45090b36141aace91c645b0648b99c54e1b3fe6aec486e7fbe0dad DIST qtxmlpatterns-opensource-src-5.9.6.tar.xz 1344204 BLAKE2B 08478bdc81f49fb2e24a57a105f537000b945537b172392b56751614473bc63c8b2cc4d3c279a91b7ef0e68490d01655b6dac7f5771754baf73335fe3117a12a SHA512 c1b7983725cd208b207e366f3fcaedf073768cbe11d6c54c4569b8155e2c97e4af889792600d86769b7e6828409e0333ad7c66b8459d07c5c1a06268d28d6788 -EBUILD qtxmlpatterns-4.8.7.ebuild 679 BLAKE2B e26f0d2bb630e377f932c37e8e9399c40c722c2f4e7dcb68d42c3ee8c08bba1ef9263e6b704e33dc6ec402356e8829d004e007c20e91a49b93001c743f8182a5 SHA512 dde6d5ada8f3c9546bfed8a0b4f6c3f118794fa4fa382219a3f6b8ee75b8c5e8fc5913a2a0421a8904ba52dadbc707a3fd17c2ddbe4a1ec758b00d8fb0c2aecf EBUILD qtxmlpatterns-5.11.1.ebuild 427 BLAKE2B 9d56740f6f80e90e321b3af95d6dd3a2d4b9911714ff0d5ebc9dc5b164122f584c51a8e58a4c858ad58fa96a5d467b87af27c5fda6c8287e7f0bec35b011b7b4 SHA512 9d919140204f45dc74f792dbe00f49f057735a893bc691f4e21a32d3d0af9065014e543833a596f0e739264b589c0f7b1d4a32e4c1dcdcf5367344747ec57e53 EBUILD qtxmlpatterns-5.9.4.ebuild 423 BLAKE2B 29a95538e2450fd50671dd1dd93e8605ad958de12901c20469aa4a8ab632a80d7f3cdc5beb08c63fe2ff57ce1e6ed8b8958edf401b6401faf57ab17542c90722 SHA512 eb6cf00eca1dbbbb50542e9c5ac7a872bb9aa74f93104b9abc892f44378cbcf4130474da14d69b613e1eaad6b72e12f11ed9e01a4c7f12ca24119795f8abf17a EBUILD qtxmlpatterns-5.9.6.ebuild 425 BLAKE2B 5fd1c372dfabfdac0167fc7eaf516b46cec871b3f0ce3327c0e40ac08afdcce4d53f8d869c59e65a113bd82ad1f77717f672aca0d7612259a6f95030e114d739 SHA512 a7e1d2dacf255f87595db2874a9e36e336c68aded55773b56acaca77526c9353760ed4b8ff79d0519d8377246e8080c94478877ec76fb1395a4e53871394ad47 diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild deleted file mode 100644 index c5ab5f0e709d..000000000000 --- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The XmlPatterns module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" - src/xmlpatterns - tools/xmlpatterns - tools/xmlpatternsvalidator" - -QCONFIG_ADD="xmlpatterns" -QCONFIG_DEFINE="QT_XMLPATTERNS" - -multilib_src_configure() { - local myconf=( - -xmlpatterns - ) - qt4_multilib_src_configure -} |