* [gentoo-proxy-maint] [PATCH 1/2] x11-misc/copyq: add 6.4.0
@ 2023-01-27 19:20 Anna Vyalkova
2023-01-27 19:20 ` [gentoo-proxy-maint] [PATCH 2/2] x11-misc/copyq: drop 3.13.0 Anna Vyalkova
0 siblings, 1 reply; 2+ messages in thread
From: Anna Vyalkova @ 2023-01-27 19:20 UTC (permalink / raw
To: gentoo-proxy-maint
* New: Qt6 support
* Make KNotifications support optional
* xdg-utils -> xdg
* EAPI 7 -> 8
* USE-flag to build with debug definitions
* Sort out depends
Signed-off-by: Anna Vyalkova <cyber+gentoo@sysrq.in>
---
Tests are such a PITA. Failures need to be reported upstream...
x11-misc/copyq/Manifest | 1 +
x11-misc/copyq/copyq-6.4.0.ebuild | 120 ++++++++++++++++++++++++++++++
2 files changed, 121 insertions(+)
create mode 100644 x11-misc/copyq/copyq-6.4.0.ebuild
diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest
index db723c3427..f5f5ea2b57 100644
--- a/x11-misc/copyq/Manifest
+++ b/x11-misc/copyq/Manifest
@@ -1,3 +1,4 @@
DIST copyq-3.13.0.tar.gz 2917941 BLAKE2B e8fc963e6a773ae70ca5a39f9ea55a98de5c5d129b845d0da9ed08ffec65d88ed8b5dd138dea11a33d563b899f0497929ed3c40d418574e50c2a1fbbd7b1a9f6 SHA512 898d4501002202849f0b5302d7315e8c539f8b0f8d5198641b3d3a647839581841e2ef1e2519c690d3cc95f85fdc921c979f2879348184de42767d31e081c307
DIST copyq-4.1.0.tar.gz 2999036 BLAKE2B 1252a66a3bbde3d4435ced9934792ed97066229b23cd5ec21a6187d4f36718d46ac5e16ff19c45afee8715a32686bfe8e47af1bbb37d61a1cacb4e9395dc7bc9 SHA512 538be8b5b60dc054cb8220174461516a4d1e9d6f7c1a03406770f143b83f9a23875b0cf663406e16d83a762b6170587f0e44c386a7d9d552ec6f914b3673206d
DIST copyq-5.0.0.tar.gz 3019807 BLAKE2B d39c02867ed4a23eeeec7283f0cbf02a77a3c3fc3ece0a7323d67de9d2b8f03749318d066c23221ccd393923217c7cf357657bdf70802087edae7f4128a63529 SHA512 b6ff28bd7529bf371c7f9d10372eeafd5f291fd1f6bbed5416938973db43e43f0113a8f6ba4619840a7edd95d26ccb9369f8a58d30b740944d3f8510482b1405
+DIST copyq-6.4.0.tar.gz 3316278 BLAKE2B 348fdc23a6d0d53ddcc8e2c32b194cfbf6c4d4d2374b972cb81d945e284c42d1e8f6b9ed30e657e43e69ed0f35661adc7875392b5daf653ce895d76afed7c09c SHA512 a97b4ac541ff73129a6283266fb8857d89d571d042829de5793b94e6423a2978f632b22728ca663bccd540bb90fed51c755b432d1d2545f75c227ea2cb0d9581
diff --git a/x11-misc/copyq/copyq-6.4.0.ebuild b/x11-misc/copyq/copyq-6.4.0.ebuild
new file mode 100644
index 0000000000..2103adde05
--- /dev/null
+++ b/x11-misc/copyq/copyq-6.4.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake edo optfeature virtualx xdg
+
+DESCRIPTION="Clipboard manager with advanced features"
+HOMEPAGE="https://github.com/hluk/CopyQ"
+SRC_URI="https://github.com/hluk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CopyQ-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug kde qt6 test"
+
+# Qt6 tests fail with "Failed to stop server" error
+RESTRICT="
+ qt6? ( test )
+ !test? ( test )
+"
+
+RDEPEND="
+ dev-libs/wayland
+ x11-libs/libX11
+ x11-libs/libXfixes
+ x11-libs/libXtst
+ !qt6? (
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwayland:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtxml:5
+ kde? ( kde-frameworks/knotifications:5 )
+ test? ( dev-qt/qttest:5 )
+ )
+ qt6? (
+ dev-qt/qtbase:6=[X,gui,network,test?,widgets,xml(+)]
+ dev-qt/qtdeclarative:6
+ dev-qt/qtsvg:6
+ dev-qt/qtwayland:6
+ )
+"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ kde-frameworks/extra-cmake-modules:5
+ !qt6? (
+ dev-qt/linguist-tools:5
+ dev-qt/qtwaylandscanner:5
+ )
+ qt6? (
+ dev-qt/qttools:6[linguist]
+ dev-qt/qtwayland:6
+ dev-util/wayland-scanner
+ )
+ test? (
+ app-crypt/gnupg
+ x11-wm/icewm
+ )
+"
+
+src_configure() {
+ if use debug; then
+ # Add debug definitions
+ CMAKE_BUILD_TYPE="Debug"
+ fi
+
+ local mycmakeargs=(
+ -DPLUGIN_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins"
+ -DWITH_NATIVE_NOTIFICATIONS=$(usex kde)
+ -DWITH_QT6=$(usex qt6)
+ -DWITH_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+my_src_test() {
+ local -x COPYQ_TESTS_RERUN_FAILED=0
+ local -x COPYQ_TESTS_NO_NETWORK=1
+
+ local plug
+ local plugins=(
+ itemencrypted
+ itemfakevim
+ itempinned
+ #itemsync -- failure in avoidDuplicateItemsAddedFromClipboard()
+ itemtags
+ )
+
+ ebegin "Starting IceWM"
+ icewm &
+ sleep 5
+ eend 0
+
+ cd "${BUILD_DIR}" || die
+ mkdir -p "${HOME}"/.gnupg || die
+ for plug in "${plugins[@]}"; do
+ edo ./copyq tests PLUGINS:"${plug}"
+ done
+
+ # ScriptError: Failed to send key presses
+ #edo ./copyq tests
+}
+
+src_test() {
+ virtx my_src_test
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ optfeature "encryption support" app-crypt/gnupg
+}
--
2.39.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-proxy-maint] [PATCH 2/2] x11-misc/copyq: drop 3.13.0
2023-01-27 19:20 [gentoo-proxy-maint] [PATCH 1/2] x11-misc/copyq: add 6.4.0 Anna Vyalkova
@ 2023-01-27 19:20 ` Anna Vyalkova
0 siblings, 0 replies; 2+ messages in thread
From: Anna Vyalkova @ 2023-01-27 19:20 UTC (permalink / raw
To: gentoo-proxy-maint
Signed-off-by: Anna Vyalkova <cyber+gentoo@sysrq.in>
---
x11-misc/copyq/Manifest | 1 -
x11-misc/copyq/copyq-3.13.0.ebuild | 56 ------------------------------
2 files changed, 57 deletions(-)
delete mode 100644 x11-misc/copyq/copyq-3.13.0.ebuild
diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest
index f5f5ea2b57..71832cea34 100644
--- a/x11-misc/copyq/Manifest
+++ b/x11-misc/copyq/Manifest
@@ -1,4 +1,3 @@
-DIST copyq-3.13.0.tar.gz 2917941 BLAKE2B e8fc963e6a773ae70ca5a39f9ea55a98de5c5d129b845d0da9ed08ffec65d88ed8b5dd138dea11a33d563b899f0497929ed3c40d418574e50c2a1fbbd7b1a9f6 SHA512 898d4501002202849f0b5302d7315e8c539f8b0f8d5198641b3d3a647839581841e2ef1e2519c690d3cc95f85fdc921c979f2879348184de42767d31e081c307
DIST copyq-4.1.0.tar.gz 2999036 BLAKE2B 1252a66a3bbde3d4435ced9934792ed97066229b23cd5ec21a6187d4f36718d46ac5e16ff19c45afee8715a32686bfe8e47af1bbb37d61a1cacb4e9395dc7bc9 SHA512 538be8b5b60dc054cb8220174461516a4d1e9d6f7c1a03406770f143b83f9a23875b0cf663406e16d83a762b6170587f0e44c386a7d9d552ec6f914b3673206d
DIST copyq-5.0.0.tar.gz 3019807 BLAKE2B d39c02867ed4a23eeeec7283f0cbf02a77a3c3fc3ece0a7323d67de9d2b8f03749318d066c23221ccd393923217c7cf357657bdf70802087edae7f4128a63529 SHA512 b6ff28bd7529bf371c7f9d10372eeafd5f291fd1f6bbed5416938973db43e43f0113a8f6ba4619840a7edd95d26ccb9369f8a58d30b740944d3f8510482b1405
DIST copyq-6.4.0.tar.gz 3316278 BLAKE2B 348fdc23a6d0d53ddcc8e2c32b194cfbf6c4d4d2374b972cb81d945e284c42d1e8f6b9ed30e657e43e69ed0f35661adc7875392b5daf653ce895d76afed7c09c SHA512 a97b4ac541ff73129a6283266fb8857d89d571d042829de5793b94e6423a2978f632b22728ca663bccd540bb90fed51c755b432d1d2545f75c227ea2cb0d9581
diff --git a/x11-misc/copyq/copyq-3.13.0.ebuild b/x11-misc/copyq/copyq-3.13.0.ebuild
deleted file mode 100644
index 2f1b7720f7..0000000000
--- a/x11-misc/copyq/copyq-3.13.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Clipboard manager with advanced features"
-HOMEPAGE="https://github.com/hluk/CopyQ"
-SRC_URI="https://github.com/hluk/CopyQ/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtscript:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libXtst
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )"
-BDEPEND="
- dev-qt/linguist-tools:5
-"
-
-S="${WORKDIR}/CopyQ-${PV}"
-
-src_configure() {
- local mycmakeargs=(
- -DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins"
- -DWITH_TESTS=$(usex test)
- -DWITH_WEBKIT=OFF
- )
- cmake_src_configure
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
--
2.39.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-27 19:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-27 19:20 [gentoo-proxy-maint] [PATCH 1/2] x11-misc/copyq: add 6.4.0 Anna Vyalkova
2023-01-27 19:20 ` [gentoo-proxy-maint] [PATCH 2/2] x11-misc/copyq: drop 3.13.0 Anna Vyalkova
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox