From 28e3d252dc8ac8a5635206dfefe1cfe05058d1db Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Aug 2018 06:32:46 +0100 Subject: gentoo resync : 12.08.2018 --- lxqt-base/lxqt-config/Manifest | 5 +- ...-0.13.0-remove-dependency-on-QtConcurrent.patch | 34 +++++++++++ lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild | 67 ++++++++++++++++++++++ lxqt-base/lxqt-config/metadata.xml | 14 +++-- 4 files changed, 115 insertions(+), 5 deletions(-) create mode 100644 lxqt-base/lxqt-config/files/lxqt-config-0.13.0-remove-dependency-on-QtConcurrent.patch create mode 100644 lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild (limited to 'lxqt-base/lxqt-config') diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest index 6519b6b27199..b5520a4e623b 100644 --- a/lxqt-base/lxqt-config/Manifest +++ b/lxqt-base/lxqt-config/Manifest @@ -1,4 +1,7 @@ AUX lxqt-config-0.11.0-cmake-3.8.patch 8137 BLAKE2B 1864b7f2dfe50ff2d9bd0fbcf7b17b11fa997f45843510f5bed8b942e1121cecb4abbf7cf18bb6f986825cdf527d3cad8407df7237621e54e57adddd48496a99 SHA512 4283f50dec924245329a47800987e355d5df8ee17db0f2394ca313faed4bb5e45e6c891619b9d81b55a2d0b083119d49dc4d06cbfe5bab17821a9702fa0d438f +AUX lxqt-config-0.13.0-remove-dependency-on-QtConcurrent.patch 1122 BLAKE2B cca7503b2c68300ad1232b7688ceb367801e9454c80d5c2af4a9385d4807b0beedb6ef0b8aa57768d928d420b0d668c22a661971115c93fccf7bb72e4d563407 SHA512 4cdd61471c47e79794054ee58573dd7346e5f88fb869458f8e828d7c1f01af4d73a5d0648b6ad79382bba140ed731c7604f86851f85afa614a1c19cf5a366792 DIST lxqt-config-0.11.0.tar.xz 197112 BLAKE2B 2b7da999a61922b4a54e7dd6481c54e4e98262340d596f334058ea8e2d235baff96b39a27ddacadf6678a6f283a7ac63d7160747c31e2bb395036a3657b71030 SHA512 20a573ba6cb83ef19b58a31180924e527496f4eb5d5f9bcf1eb37e3883b8b46ea02f08be9fe42a06f12508ffa2a9af5225d3fe00856ee7807704a99adf654795 +DIST lxqt-config-0.13.0.tar.xz 201112 BLAKE2B 6a79c1f07e1cf055da09bb7dd8f7da2426891770b0e757ba3c4e5ef137f715ba3a579b2c05a4f1938c9d76b6dda0643119888be7dace2083a57a7dfe0df93aa5 SHA512 a5102794c4cf18a18e633cbc7d0b89653abf2612bc61e506ec169f4898903092f5201a09a2610642c641a17b59a992a6d6f59366ec61d54763e8b911d5220ca9 EBUILD lxqt-config-0.11.0.ebuild 1217 BLAKE2B 522f4d4fa54edfb5a4f722efde8b16ba8241070d0725470258410b3b4a086e9de959e67510edff9b192a95428bad3787352e17f22a453ff47d21ef39ae92a83c SHA512 7eed21696eac43fe63c66cba409bcafbdc33117d940dc6200b976013eb9b51c7022ad45259b75a5ffefa3ba2301950d797d35f202f9c1db35c27cf453063c45d -MISC metadata.xml 240 BLAKE2B 8dd1dd10c1b3297bf08ebf11d2e047de07700e5233e26788943af60613a3faa71ff392f77a33f0065917eedc487b2f9be91bdc58635c3c51957e5be2738282c0 SHA512 84f77a0e7d17d09eea1157217fcd22ae5fc98e1569879f85b5fc950d2b2ad00168b1ec9d5d8c1f964673c55bc91d509adb2d39b5983de21d83200ef6c58b9652 +EBUILD lxqt-config-0.13.0.ebuild 1410 BLAKE2B 91c909bd782e4c191ac1b923e29229371eb74c7420a4dacad36554328948a03bd91421785fa98e3a3e0ca2bd1582d2fa8c7f61b3e5b6e7603ec8544012e3e57d SHA512 1859e1ab9e1e08d70a5592681a431b7e2134801368734c88eb44ea85bc212678e0df4eb51dc9de68baa345260a3cd2b6ec48a9aaa88ebfd4797b4f3496326ad1 +MISC metadata.xml 435 BLAKE2B f2ac19945e50b82b13706f0fc3790e547243f4a30b2abde7f2b333fd29590dee96d3dc2680380d3db905cc26d93273d36529310c4e68a892163b9a5fc1c87e72 SHA512 2d345ec5a53c4293f632ac65ce0f45f4604914a019f31536de00039dd523f95b23ba830b3c783ef1cfff3f7343e7eb343b4501d001fb3322a50f998394556222 diff --git a/lxqt-base/lxqt-config/files/lxqt-config-0.13.0-remove-dependency-on-QtConcurrent.patch b/lxqt-base/lxqt-config/files/lxqt-config-0.13.0-remove-dependency-on-QtConcurrent.patch new file mode 100644 index 000000000000..39bf078ae13f --- /dev/null +++ b/lxqt-base/lxqt-config/files/lxqt-config-0.13.0-remove-dependency-on-QtConcurrent.patch @@ -0,0 +1,34 @@ +From e49e5ebabbf8bbe30d4955bc6cb785303f94c6f6 Mon Sep 17 00:00:00 2001 +From: Alec Moskvin +Date: Sun, 15 Jul 2018 11:26:16 -0400 +Subject: [PATCH] Remove dependency on QtConcurrent + +--- + CMakeLists.txt | 1 - + lxqt-config-file-associations/CMakeLists.txt | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9c42ddc..5fb2548 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,7 +22,6 @@ set(CMAKE_AUTORCC ON) + find_package(Qt5Widgets REQUIRED) + find_package(Qt5DBus REQUIRED) + find_package(Qt5Xml REQUIRED) +-find_package(Qt5Concurrent REQUIRED) + find_package(Qt5X11Extras REQUIRED) + find_package(Qt5LinguistTools REQUIRED) + find_package(lxqt REQUIRED) +diff --git a/lxqt-config-file-associations/CMakeLists.txt b/lxqt-config-file-associations/CMakeLists.txt +index 0506723..2500cf3 100644 +--- a/lxqt-config-file-associations/CMakeLists.txt ++++ b/lxqt-config-file-associations/CMakeLists.txt +@@ -61,7 +61,6 @@ target_link_libraries(${PROJECT_NAME} + Qt5::Xml + Qt5::DBus + Qt5::Widgets +- Qt5::Concurrent + ${LIBRARIES} + ) + diff --git a/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild new file mode 100644 index 000000000000..d3af64823fcc --- /dev/null +++ b/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils gnome2-utils eapi7-ver + +DESCRIPTION="LXQt system configuration control center" +HOMEPAGE="https://lxqt.org/" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" +else + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2" +SLOT="0" +IUSE="+monitor" + +RDEPEND=" + >=dev-libs/libqtxdg-3.0.0 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + kde-frameworks/kwindowsystem:5 + =lxqt-base/liblxqt-$(ver_cut 1-2)* + sys-libs/zlib:= + x11-apps/setxkbmap + x11-libs/libxcb:= + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXfixes + monitor? ( kde-plasma/libkscreen:5= ) +" +DEPEND="${DEPEND} + dev-qt/linguist-tools:5 + >=dev-util/lxqt-build-tools-0.5.0 +" + +PATCHES=( "${FILESDIR}/${P}-remove-dependency-on-QtConcurrent.patch" ) + +src_configure() { + local mycmakeargs=( + -DPULL_TRANSLATIONS=OFF + -DWITH_MONITOR="$(usex monitor)" + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + doman man/*.1 liblxqt-config-cursor/man/*.1 lxqt-config-appearance/man/*.1 +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/lxqt-base/lxqt-config/metadata.xml b/lxqt-base/lxqt-config/metadata.xml index a40a83a9c6a9..d6f2207daed6 100644 --- a/lxqt-base/lxqt-config/metadata.xml +++ b/lxqt-base/lxqt-config/metadata.xml @@ -1,8 +1,14 @@ - - lxqt@gentoo.org - LXQt - + + lxqt@gentoo.org + LXQt + + + lxqt/lxqt-config + + + Build monitor settings tool + -- cgit v1.2.3