diff options
author | Ilya Tumaykin <itumaykin@gmail.com> | 2018-03-11 14:57:19 +0300 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2018-03-11 23:49:25 +1100 |
commit | 91bee87446cbd124cea14e0b6dca87e5726ea017 (patch) | |
tree | 83e434b412d1684327d55e592f9959f558661dad /x11-misc | |
parent | app-admin/conky: Fix bug #648090. (diff) | |
download | gentoo-91bee87446cbd124cea14e0b6dca87e5726ea017.tar.gz gentoo-91bee87446cbd124cea14e0b6dca87e5726ea017.tar.bz2 gentoo-91bee87446cbd124cea14e0b6dca87e5726ea017.zip |
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
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/qt5ct/Manifest | 1 | ||||
-rw-r--r-- | x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch | 39 | ||||
-rw-r--r-- | x11-misc/qt5ct/qt5ct-0.35.ebuild | 54 |
3 files changed, 94 insertions, 0 deletions
diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest index 84f3db10c488..17e90f132be3 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 000000000000..2363e559370a --- /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 000000000000..5c14b1e6072f --- /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 +} |