[gentoo-commits] repo/gentoo:master commit in: x11-misc/qt5ct/files/, x11-misc/qt5ct/
commit: c1059795480f9f07cc1c1479bce6df4abda63004 Author: Michał Górny gentoo org> AuthorDate: Mon Sep 27 08:38:20 2021 + Commit: Michał Górny gentoo org> CommitDate: Mon Sep 27 09:15:51 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1059795 x11-misc/qt5ct: Remove old Signed-off-by: Michał Górny gentoo.org> x11-misc/qt5ct/Manifest| 1 - x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch | 22 - x11-misc/qt5ct/qt5ct-1.2-r1.ebuild | 53 -- 3 files changed, 76 deletions(-) diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest index d048b195789..7f4077da5a1 100644 --- a/x11-misc/qt5ct/Manifest +++ b/x11-misc/qt5ct/Manifest @@ -1,2 +1 @@ -DIST qt5ct-1.2.tar.bz2 76052 BLAKE2B bff9dcd6176f856f262f908101f51be5bc5fa56cbf221fb6e1b66cf49867d721f4c1d5707bcd71cb20b1d27d53f5352bcaaa32ed7298f9fe349ac8a90b4a4e23 SHA512 044582440fc3ed8424970a30d7e1562396f9a1651f2c50adbdcb6ec73b35fb8dd23de419df29b92d21a45fea9af4e562b1294f5bfc329419f831775954f8ed6f DIST qt5ct-1.3.tar.bz2 80506 BLAKE2B eda2d69fcddf80553358d3c9e9bd0ef33355919c5b62912d8e79a84a36ee5a25d1dab553b6413d78e16ce69435861a01b298ae97202a77f1f50ed805f14445dd SHA512 9f4397d5cfc3dec14330759f213ae99b02ae36d3ea48dfdb3015c3b7d3fe12cde619af855d7320566ca32120e8689e4b39f78e4fdf9886e2472aef570beb75bd diff --git a/x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch b/x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch deleted file mode 100644 index 67313d824fa..000 --- a/x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch +++ /dev/null @@ -1,22 +0,0 @@ a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,7 +39,7 @@ - set(QT_QTPATHS_EXECUTABLE ${QT_QTPATHS_EXECUTABLE}/qtpaths) - - if(EXISTS ${QT_QTPATHS_EXECUTABLE}) --message(STATUS "Found qtpaths executable: " ${QT_QTPATHS_EXECUTABLE}) -+message(STATUS "Found qtpaths executable: " ${QT_QTPATHS_EXECUTABLE}) - else() - message(FATAL_ERROR "Could NOT find qtpaths executable") - endif() -@@ -54,8 +54,8 @@ - add_subdirectory(src/qt5ct-qtplugin) - add_subdirectory(src/qt5ct-style) - --install(DIRECTORY qss DESTINATION ${CMAKE_INSTALL_DATADIR}) --install(DIRECTORY colors DESTINATION ${CMAKE_INSTALL_DATADIR}) -+install(DIRECTORY qss DESTINATION ${CMAKE_INSTALL_DATADIR}/qt5ct) -+install(DIRECTORY colors DESTINATION ${CMAKE_INSTALL_DATADIR}/qt5ct) - - if(UNIX) - add_custom_target(distclean @echo cleaning for source distribution) diff --git a/x11-misc/qt5ct/qt5ct-1.2-r1.ebuild b/x11-misc/qt5ct/qt5ct-1.2-r1.ebuild deleted file mode 100644 index 782e8c46093..000 --- a/x11-misc/qt5ct/qt5ct-1.2-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4" -HOMEPAGE="https://sourceforge.net/projects/qt5ct/; -SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2; - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="+dbus" - -RDEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5= - dev-qt/qtwidgets:5 - dbus? ( - dev-qt/qtdbus:5 - dev-qt/qtgui:5[dbus] - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - dev-qt/qtpaths:5 -" - -PATCHES=( - "${FILESDIR}"/${P}-cmake.patch -) - -src_install() { - cmake_src_install - - newenvd - 98qt5ct <<< 'QT_QPA_PLATFORMTHEME=qt5ct' -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - ewarn "qt5ct configuration won't be applied to the currently running sessions." - ewarn "Please relogin." - fi - if ! has_version 'dev-qt/qtsvg:5'; then - elog - elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'." - elog - fi -}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/qt5ct/files/, x11-misc/qt5ct/
commit: e96543dff22927a309f4bc9018e88ffd1eafd825 Author: Michał Górny gentoo org> AuthorDate: Wed Apr 21 10:11:28 2021 + Commit: Michał Górny gentoo org> CommitDate: Wed Apr 21 10:12:03 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e96543df x11-misc/qt5ct: Fix install paths Signed-off-by: Michał Górny gentoo.org> x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch | 22 ++ .../{qt5ct-1.2.ebuild => qt5ct-1.2-r1.ebuild} | 7 ++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch b/x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch new file mode 100644 index 000..67313d824fa --- /dev/null +++ b/x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch @@ -0,0 +1,22 @@ +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -39,7 +39,7 @@ + set(QT_QTPATHS_EXECUTABLE ${QT_QTPATHS_EXECUTABLE}/qtpaths) + + if(EXISTS ${QT_QTPATHS_EXECUTABLE}) +-message(STATUS "Found qtpaths executable: " ${QT_QTPATHS_EXECUTABLE}) ++message(STATUS "Found qtpaths executable: " ${QT_QTPATHS_EXECUTABLE}) + else() + message(FATAL_ERROR "Could NOT find qtpaths executable") + endif() +@@ -54,8 +54,8 @@ + add_subdirectory(src/qt5ct-qtplugin) + add_subdirectory(src/qt5ct-style) + +-install(DIRECTORY qss DESTINATION ${CMAKE_INSTALL_DATADIR}) +-install(DIRECTORY colors DESTINATION ${CMAKE_INSTALL_DATADIR}) ++install(DIRECTORY qss DESTINATION ${CMAKE_INSTALL_DATADIR}/qt5ct) ++install(DIRECTORY colors DESTINATION ${CMAKE_INSTALL_DATADIR}/qt5ct) + + if(UNIX) + add_custom_target(distclean @echo cleaning for source distribution) diff --git a/x11-misc/qt5ct/qt5ct-1.2.ebuild b/x11-misc/qt5ct/qt5ct-1.2-r1.ebuild similarity index 92% rename from x11-misc/qt5ct/qt5ct-1.2.ebuild rename to x11-misc/qt5ct/qt5ct-1.2-r1.ebuild index cadb81998d1..419efe47f94 100644 --- a/x11-misc/qt5ct/qt5ct-1.2.ebuild +++ b/x11-misc/qt5ct/qt5ct-1.2-r1.ebuild @@ -24,11 +24,16 @@ RDEPEND=" dev-qt/qtgui:5[dbus] ) " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-qt/linguist-tools:5 dev-qt/qtpaths:5 " +PATCHES=( + "${FILESDIR}"/${P}-cmake.patch +) + src_install() { cmake_src_install
[gentoo-commits] repo/gentoo:master commit in: x11-misc/qt5ct/files/, x11-misc/qt5ct/
commit: 7f63d37441b153484c68648d17af8170c4dfafa0 Author: Michał Górny gentoo org> AuthorDate: Fri Jan 3 08:44:56 2020 + Commit: Michał Górny gentoo org> CommitDate: Fri Jan 3 08:48:02 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f63d374 x11-misc/qt5ct: Remove old Signed-off-by: Michał Górny gentoo.org> x11-misc/qt5ct/Manifest| 1 - .../files/qt5ct-0.35-fix-qtdbus-automagic.patch| 39 x11-misc/qt5ct/qt5ct-0.35.ebuild | 54 -- 3 files changed, 94 deletions(-) diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest index a9504943ff9..3d94c4a497a 100644 --- a/x11-misc/qt5ct/Manifest +++ b/x11-misc/qt5ct/Manifest @@ -1,2 +1 @@ -DIST qt5ct-0.35.tar.bz2 62547 BLAKE2B dd61f151e1c6c58095889b90cb30bb2baaf21fd8f181af37ee43c1d00404655d57c941cee905e737aff29122ae3f588d5c7ba46dc80ca76d749cc2dd66f35d57 SHA512 2bd24221d391c420e73488738ff10762d27eb21fb28dc69da27dcbfface0cd0f16049768b55867a059c93da07eddb76da1bc63aefd516e07e5049c847da3970a DIST qt5ct-0.41.tar.bz2 73009 BLAKE2B de6360feb16a82b262c13e6a3cbe226b7be7c3e95b1f1262b3802de59fc3bb8820c935b170a15a88e80164e6167f6259777c65fda6a3f8fbf1d115a63ddcc1f2 SHA512 a94f9996dc2198d3c8c9af8610912d12b915b8c547a49c36f7bc083b6f237b318d7903e91fb6fcfe06996a319c361104c1923e6d0c49446b6fb66a1e44fae009 diff --git a/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch b/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch deleted file mode 100644 index 2363e559370..000 --- a/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: src/qt5ct/qt5ct.pro -=== -diff --git a/src/qt5ct/qt5ct.pro b/src/qt5ct/qt5ct.pro a/src/qt5ct/qt5ct.pro (revision 485) -+++ b/src/qt5ct/qt5ct.pro (revision 486) -@@ -5,7 +5,7 @@ - QT += widgets - - greaterThan(QT_MINOR_VERSION, 8) { -- QT += gui-private theme_support-private -+ QT += gui-private - } - - SOURCES += \ -Index: src/qt5ct-qtplugin/qt5ct-qtplugin.pro -=== -diff --git a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro(revision 485) -+++ b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro(revision 486) -@@ -4,13 +4,14 @@ - TARGET = qt5ct - CONFIG += plugin - --greaterThan(QT_MINOR_VERSION, 7) { -- QT += gui-private theme_support-private --} else { -- QT += gui-private platformsupport-private --} -+QT += gui-private - - !equals(DISABLE_DBUS, 1):qtHaveModule(dbus):greaterThan(QT_MINOR_VERSION, 5) { -+greaterThan(QT_MINOR_VERSION, 7) { -+QT += theme_support-private -+} else { -+QT += platformsupport-private -+} - QT += dbus - message(D-Bus support: Enabled) - } else { diff --git a/x11-misc/qt5ct/qt5ct-0.35.ebuild b/x11-misc/qt5ct/qt5ct-0.35.ebuild deleted file mode 100644 index 267aa5d9890..000 --- a/x11-misc/qt5ct/qt5ct-0.35.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit qmake-utils - -DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4" -HOMEPAGE="https://sourceforge.net/projects/qt5ct/; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="+dbus" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5= - dev-qt/qtwidgets:5 - dbus? ( - dev-qt/qtdbus:5 - dev-qt/qtgui:5[dbus] - ) -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 -" - -PATCHES=( "${FILESDIR}/${P}-fix-qtdbus-automagic.patch" ) - -src_configure() { - eqmake5 DISABLE_DBUS=$(usex !dbus 1 0) -} - -src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs - - echo 'QT_QPA_PLATFORMTHEME=qt5ct' > "${T}"/98${PN} || die - doenvd "${T}"/98${PN} -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - ewarn "qt5ct configuration won't be applied to the currently running sessions." - ewarn "Please relogin." - fi - if ! has_version 'dev-qt/qtsvg:5'; then - elog - elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'." - elog - fi -}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/qt5ct/files/, x11-misc/qt5ct/
commit: 91bee87446cbd124cea14e0b6dca87e5726ea017 Author: Ilya Tumaykin gmail com> AuthorDate: Sun Mar 11 11:57:19 2018 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Mar 11 12:49:25 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91bee874 x11-misc/qt5ct: verbump to 0.35 Closes: https://bugs.gentoo.org/641964 Closes: https://github.com/gentoo/gentoo/pull/7420 Package-Manager: Portage-2.3.24, Repoman-2.3.6 x11-misc/qt5ct/Manifest| 1 + .../files/qt5ct-0.35-fix-qtdbus-automagic.patch| 39 x11-misc/qt5ct/qt5ct-0.35.ebuild | 54 ++ 3 files changed, 94 insertions(+) diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest index 84f3db10c48..17e90f132be 100644 --- a/x11-misc/qt5ct/Manifest +++ b/x11-misc/qt5ct/Manifest @@ -1,2 +1,3 @@ DIST qt5ct-0.31.tar.bz2 55724 BLAKE2B 54602ee9ed46f790f3a8bc15fa66467382b5830b9a218739bb24483f1f18fe8be8c6a375d83e0b6c02b14bec002aa1e7bf757d6608eb908da0dcf7ced2f6b59d SHA512 9162106febf93b94b8ba847157d20386568bc898d15c6123636ef9d9c50bce3ca4706fbfbfd82053dccf545f91ca40d387d1e9a5bbb6773810a1d931417eaa4e DIST qt5ct-0.33.tar.bz2 56448 BLAKE2B d8a94ee847e553a209d4729cbe355a6b9eecd9527774b92cae71011b120d09590601b3d74f883eb1528255a585927f92d7be0da433346cfd44c88a2a01bba50f SHA512 670ec099978b569b7607d6a0af0c7e7b66b4b4a374041893c85a8749992ae6a931fa9678fa122baede8a672c0c9798fad8c30c60205c3f9d0ad3dd867e0753ba +DIST qt5ct-0.35.tar.bz2 62547 BLAKE2B dd61f151e1c6c58095889b90cb30bb2baaf21fd8f181af37ee43c1d00404655d57c941cee905e737aff29122ae3f588d5c7ba46dc80ca76d749cc2dd66f35d57 SHA512 2bd24221d391c420e73488738ff10762d27eb21fb28dc69da27dcbfface0cd0f16049768b55867a059c93da07eddb76da1bc63aefd516e07e5049c847da3970a diff --git a/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch b/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch new file mode 100644 index 000..2363e559370 --- /dev/null +++ b/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch @@ -0,0 +1,39 @@ +Index: src/qt5ct/qt5ct.pro +=== +diff --git a/src/qt5ct/qt5ct.pro b/src/qt5ct/qt5ct.pro +--- a/src/qt5ct/qt5ct.pro (revision 485) b/src/qt5ct/qt5ct.pro (revision 486) +@@ -5,7 +5,7 @@ + QT += widgets + + greaterThan(QT_MINOR_VERSION, 8) { +- QT += gui-private theme_support-private ++ QT += gui-private + } + + SOURCES += \ +Index: src/qt5ct-qtplugin/qt5ct-qtplugin.pro +=== +diff --git a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro +--- a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro(revision 485) b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro(revision 486) +@@ -4,13 +4,14 @@ + TARGET = qt5ct + CONFIG += plugin + +-greaterThan(QT_MINOR_VERSION, 7) { +- QT += gui-private theme_support-private +-} else { +- QT += gui-private platformsupport-private +-} ++QT += gui-private + + !equals(DISABLE_DBUS, 1):qtHaveModule(dbus):greaterThan(QT_MINOR_VERSION, 5) { ++greaterThan(QT_MINOR_VERSION, 7) { ++QT += theme_support-private ++} else { ++QT += platformsupport-private ++} + QT += dbus + message(D-Bus support: Enabled) + } else { diff --git a/x11-misc/qt5ct/qt5ct-0.35.ebuild b/x11-misc/qt5ct/qt5ct-0.35.ebuild new file mode 100644 index 000..5c14b1e6072 --- /dev/null +++ b/x11-misc/qt5ct/qt5ct-0.35.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit qmake-utils + +DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4" +HOMEPAGE="https://sourceforge.net/projects/qt5ct/; +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+dbus" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5= + dev-qt/qtwidgets:5 + dbus? ( + dev-qt/qtdbus:5 + dev-qt/qtgui:5[dbus] + ) +" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 +" + +PATCHES=( "${FILESDIR}/${P}-fix-qtdbus-automagic.patch" ) + +src_configure() { + eqmake5 DISABLE_DBUS=$(usex !dbus 1 0) +} + +src_install() { + emake INSTALL_ROOT="${D}" install + einstalldocs + + echo 'QT_QPA_PLATFORMTHEME=qt5ct' > "${T}"/98${PN} || die + doenvd "${T}"/98${PN} +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + ewarn "qt5ct configuration won't be applied to the currently running sessions." + ewarn "Please relogin." + fi + if ! has_version 'dev-qt/qtsvg:5'; then + elog + elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'." + elog + fi +}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/qt5ct/files/, x11-misc/qt5ct/
commit: fa579ab1d2e4c4bc6de91e7451cbbd5ad849ed3e Author: Ilya Tumaykin gmail com> AuthorDate: Tue May 30 12:13:59 2017 + Commit: Patrice Clement gentoo org> CommitDate: Tue May 30 21:36:03 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa579ab1 x11-misc/qt5ct: remove old Closes: https://github.com/gentoo/gentoo/pull/4808 Package-Manager: Portage-2.3.6, Repoman-2.3.2 x11-misc/qt5ct/Manifest| 1 - .../files/qt5ct-0.32-fix-build-without-dbus.patch | 16 --- x11-misc/qt5ct/qt5ct-0.32.ebuild | 54 -- 3 files changed, 71 deletions(-) diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest index ca75a9de8b8..6de4e88dde8 100644 --- a/x11-misc/qt5ct/Manifest +++ b/x11-misc/qt5ct/Manifest @@ -1,3 +1,2 @@ DIST qt5ct-0.31.tar.bz2 55724 SHA256 d5357768832a81e39aa9cd0a45d8144de9bd59302d8d122d8c2d1a231be2aba9 SHA512 9162106febf93b94b8ba847157d20386568bc898d15c6123636ef9d9c50bce3ca4706fbfbfd82053dccf545f91ca40d387d1e9a5bbb6773810a1d931417eaa4e WHIRLPOOL e63d91ea06956859abebef8990c3b697fddbda9656dcb092231fece95ed9f5ce8fe1597ca6b28468e63b76adcd311637b3591e7650ad0a1adb8a0f1958eafef4 -DIST qt5ct-0.32.tar.bz2 56146 SHA256 d501975f876aeb7a4c9814c9b9a46eb20804c3e0ee2b5d5e7b1b3d244dc7f53f SHA512 9d4ccbb808ce5c394b041f1c387502a373998930aa9141e151a8c854b79b978945ad77bfb2383c1a3e0b5f082bc8c260d01f30d137fa764f926405bbddad212c WHIRLPOOL 77fb3c34636331fda89814f4e6e9eef55e0aebf1c3d71e912d11566d97241c645ece974e31260c53d96d27e42e44ce51abbef271671d63899f77cdef1cdf9e40 DIST qt5ct-0.33.tar.bz2 56448 SHA256 2e55484bdae7988ec8ce2629cfc252b226df8b07b2a0b6f8ee2fd10cc8e7c02f SHA512 670ec099978b569b7607d6a0af0c7e7b66b4b4a374041893c85a8749992ae6a931fa9678fa122baede8a672c0c9798fad8c30c60205c3f9d0ad3dd867e0753ba WHIRLPOOL f8ecb21aaa3aef538860fdd43095dc0b6b7aff72bb5ff6601f15783e5eb9bd398c4031e05139fda90800c0436606d8ac9f3fe66e09bb29f6ae8c704000d8b2b8 diff --git a/x11-misc/qt5ct/files/qt5ct-0.32-fix-build-without-dbus.patch b/x11-misc/qt5ct/files/qt5ct-0.32-fix-build-without-dbus.patch deleted file mode 100644 index 532413b954c..000 --- a/x11-misc/qt5ct/files/qt5ct-0.32-fix-build-without-dbus.patch +++ /dev/null @@ -1,16 +0,0 @@ -See https://sourceforge.net/p/qt5ct/tickets/36/ - -diff --git a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro(revision 408) -+++ b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro(working copy) -@@ -10,7 +10,9 @@ - QT += gui-private platformsupport-private - } - --greaterThan(QT_MINOR_VERSION, 5): QT += dbus -+!contains(DEFINES, QT_NO_DBUS):greaterThan(QT_MINOR_VERSION, 5) { -+QT += dbus -+} - - SOURCES += \ - main.cpp \ diff --git a/x11-misc/qt5ct/qt5ct-0.32.ebuild b/x11-misc/qt5ct/qt5ct-0.32.ebuild deleted file mode 100644 index 6fc2aca5493..000 --- a/x11-misc/qt5ct/qt5ct-0.32.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit qmake-utils - -DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4" -HOMEPAGE="https://sourceforge.net/projects/qt5ct/; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+dbus" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5= - dev-qt/qtwidgets:5 - dbus? ( - dev-qt/qtdbus:5 - >=dev-qt/qtgui-5.7:5[dbus] - ) -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 -" - -PATCHES=( "${FILESDIR}/${P}-fix-build-without-dbus.patch" ) - -src_configure() { - eqmake5 DEFINES="$(usex dbus '' QT_NO_DBUS)" ${PN}.pro -} - -src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs - - echo 'QT_QPA_PLATFORMTHEME=qt5ct' > "${T}"/98${PN} || die - doenvd "${T}"/98${PN} -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - ewarn "qt5ct configuration won't be applied to the currently running sessions." - ewarn "Please relogin." - fi - if ! has_version 'dev-qt/qtsvg:5'; then - elog - elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'." - elog - fi -}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/qt5ct/files/, x11-misc/qt5ct/
commit: c05131646070c21a91a2a572f5e33a1cf358bacf Author: Ilya Tumaykin gmail com> AuthorDate: Tue May 16 20:09:50 2017 + Commit: Michał Górny gentoo org> CommitDate: Sun May 21 21:03:41 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0513164 x11-misc/qt5ct: version bump to 0.32 Global menu support was added. It pulls the same deps as the system tray support, thus group them together under dbus USE (renamed from systray). Closes: https://github.com/gentoo/gentoo/pull/4650 Package-Manager: Portage-2.3.5, Repoman-2.3.2 x11-misc/qt5ct/Manifest| 1 + .../files/qt5ct-0.32-fix-build-without-dbus.patch | 16 +++ x11-misc/qt5ct/metadata.xml| 1 + x11-misc/qt5ct/qt5ct-0.32.ebuild | 54 ++ 4 files changed, 72 insertions(+) diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest index dba1022fc3e..eb2bc3f33f2 100644 --- a/x11-misc/qt5ct/Manifest +++ b/x11-misc/qt5ct/Manifest @@ -1 +1,2 @@ DIST qt5ct-0.31.tar.bz2 55724 SHA256 d5357768832a81e39aa9cd0a45d8144de9bd59302d8d122d8c2d1a231be2aba9 SHA512 9162106febf93b94b8ba847157d20386568bc898d15c6123636ef9d9c50bce3ca4706fbfbfd82053dccf545f91ca40d387d1e9a5bbb6773810a1d931417eaa4e WHIRLPOOL e63d91ea06956859abebef8990c3b697fddbda9656dcb092231fece95ed9f5ce8fe1597ca6b28468e63b76adcd311637b3591e7650ad0a1adb8a0f1958eafef4 +DIST qt5ct-0.32.tar.bz2 56146 SHA256 d501975f876aeb7a4c9814c9b9a46eb20804c3e0ee2b5d5e7b1b3d244dc7f53f SHA512 9d4ccbb808ce5c394b041f1c387502a373998930aa9141e151a8c854b79b978945ad77bfb2383c1a3e0b5f082bc8c260d01f30d137fa764f926405bbddad212c WHIRLPOOL 77fb3c34636331fda89814f4e6e9eef55e0aebf1c3d71e912d11566d97241c645ece974e31260c53d96d27e42e44ce51abbef271671d63899f77cdef1cdf9e40 diff --git a/x11-misc/qt5ct/files/qt5ct-0.32-fix-build-without-dbus.patch b/x11-misc/qt5ct/files/qt5ct-0.32-fix-build-without-dbus.patch new file mode 100644 index 000..532413b954c --- /dev/null +++ b/x11-misc/qt5ct/files/qt5ct-0.32-fix-build-without-dbus.patch @@ -0,0 +1,16 @@ +See https://sourceforge.net/p/qt5ct/tickets/36/ + +diff --git a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro +--- a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro(revision 408) b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro(working copy) +@@ -10,7 +10,9 @@ + QT += gui-private platformsupport-private + } + +-greaterThan(QT_MINOR_VERSION, 5): QT += dbus ++!contains(DEFINES, QT_NO_DBUS):greaterThan(QT_MINOR_VERSION, 5) { ++QT += dbus ++} + + SOURCES += \ + main.cpp \ diff --git a/x11-misc/qt5ct/metadata.xml b/x11-misc/qt5ct/metadata.xml index 2e9a3414145..a5fe4940379 100644 --- a/x11-misc/qt5ct/metadata.xml +++ b/x11-misc/qt5ct/metadata.xml @@ -14,6 +14,7 @@ icons, etc.) under DE/WM without Qt5 integration. + Enable system tray and global menu support Enable system tray support diff --git a/x11-misc/qt5ct/qt5ct-0.32.ebuild b/x11-misc/qt5ct/qt5ct-0.32.ebuild new file mode 100644 index 000..947237d1e28 --- /dev/null +++ b/x11-misc/qt5ct/qt5ct-0.32.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit qmake-utils + +DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4" +HOMEPAGE="https://sourceforge.net/projects/qt5ct/; +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+dbus" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5= + dev-qt/qtwidgets:5 + dbus? ( + dev-qt/qtdbus:5 + dev-qt/qtgui:5[dbus] + ) +" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 +" + +PATCHES=( "${FILESDIR}/${P}-fix-build-without-dbus.patch" ) + +src_configure() { + eqmake5 DEFINES="$(usex dbus '' QT_NO_DBUS)" ${PN}.pro +} + +src_install() { + emake INSTALL_ROOT="${D}" install + einstalldocs + + echo 'QT_QPA_PLATFORMTHEME=qt5ct' > "${T}"/98${PN} || die + doenvd "${T}"/98${PN} +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + ewarn "qt5ct configuration won't be applied to the currently running sessions." + ewarn "Please relogin." + fi + if ! has_version 'dev-qt/qtsvg:5'; then + elog + elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'." + elog + fi +}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/qt5ct/files/, x11-misc/qt5ct/
commit: 8033d2b3e284d62eed973121d245211b415aa5e8 Author: Ilya Tumaykin gmail com> AuthorDate: Sat Feb 4 13:43:24 2017 + Commit: David Seifert gentoo org> CommitDate: Sat Feb 4 21:24:35 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8033d2b3 x11-misc/qt5ct: remove old Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3799 x11-misc/qt5ct/Manifest| 1 - .../qt5ct/files/qt5ct-0.29-fix-kde-styles.patch| 20 - x11-misc/qt5ct/qt5ct-0.29-r1.ebuild| 52 -- 3 files changed, 73 deletions(-) diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest index d2a3870..8a0c3f1 100644 --- a/x11-misc/qt5ct/Manifest +++ b/x11-misc/qt5ct/Manifest @@ -1,2 +1 @@ -DIST qt5ct-0.29.tar.bz2 49482 SHA256 a016142a04a5edfbdda627fc203622f512fae9e84bcf89ce63a7107f01721adc SHA512 b0417a5c7d736957194d96a44156f2eab2d9eedf7a8fa6a0aeb65ad3d50f0466b31329ef5ae414d036a34a4d675278e737cef3ecefdec61e106e1ff7503dd434 WHIRLPOOL 456414d9d2516b7de2098dda3479d6c0fd686d7f83e7af9261c18b51e82f61b66f77d496d82e25654cbe066221707552e2053d7618676ba7b11e54c22bf16ff1 DIST qt5ct-0.30.tar.bz2 49665 SHA256 e6d94d756ea928f330376a30660a75b3213bad234b360519416e634048e31ecc SHA512 3ea7ce731fcef2c665c9b92c5afe505bad9a119957c268a9705bb1c9ea8534547281133d51932d68933de93c78c7fd3be5a5511cf748644047acb8f716605a18 WHIRLPOOL 1af094cdd839cb46c44f051eb37b9403dad6fb60d757fddd69c98e3d9f8def65b9f7a9899ad278a6bcef6a7bdd1009ea16c24dfca28f639f7c2befea981236c9 diff --git a/x11-misc/qt5ct/files/qt5ct-0.29-fix-kde-styles.patch b/x11-misc/qt5ct/files/qt5ct-0.29-fix-kde-styles.patch deleted file mode 100644 index d15609d.. --- a/x11-misc/qt5ct/files/qt5ct-0.29-fix-kde-styles.patch +++ /dev/null @@ -1,20 +0,0 @@ -Correctly apply selected theme to KDE apps. - -https://sourceforge.net/p/qt5ct/tickets/32/ - -Index: src/qt5ct-qtplugin/qt5ctplatformtheme.cpp -=== a/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp(revision 368) -+++ b/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp(revision 369) -@@ -101,9 +101,8 @@ - - const QPalette *Qt5CTPlatformTheme::palette(QPlatformTheme::Palette type) const - { --if(m_customPalette && m_usePalette) --return m_customPalette; --return QPlatformTheme::palette(type); -+Q_UNUSED(type); -+return (m_usePalette ? m_customPalette : 0); - } - - const QFont *Qt5CTPlatformTheme::font(QPlatformTheme::Font type) const diff --git a/x11-misc/qt5ct/qt5ct-0.29-r1.ebuild b/x11-misc/qt5ct/qt5ct-0.29-r1.ebuild deleted file mode 100644 index 2563ebe.. --- a/x11-misc/qt5ct/qt5ct-0.29-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit qmake-utils - -DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4" -HOMEPAGE="https://sourceforge.net/projects/qt5ct/; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+systray" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5= - dev-qt/qtwidgets:5 - systray? ( dev-qt/qtgui:5[dbus] ) -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 -" - -PATCHES=( "${FILESDIR}/${P}-fix-kde-styles.patch" ) - -src_configure() { - eqmake5 DEFINES="$(usex systray '' QT_NO_SYSTEMTRAYICON)" ${PN}.pro -} - -src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs - - echo 'QT_QPA_PLATFORMTHEME=qt5ct' > "${T}"/98${PN} || die - doenvd "${T}"/98${PN} -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - ewarn "qt5ct configuration won't be applied to the currently running sessions." - ewarn "Please relogin." - fi - if ! has_version 'dev-qt/qtsvg:5'; then - elog - elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'." - elog - fi -}