* [gentoo-commits] repo/gentoo:master commit in: x11-misc/qlipper/files/, x11-misc/qlipper/
@ 2016-11-17 15:05 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2016-11-17 15:05 UTC (permalink / raw
To: gentoo-commits
commit: d6f48839ef09fb0656512d323681705465d676c0
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 15:05:15 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 15:05:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f48839
x11-misc/qlipper: add patch to resolve build failure
Gentoo-bug: 599164
Package-Manager: portage-2.3.2
x11-misc/qlipper/files/qlipper-5.0.0-build.patch | 54 ++++++++++++++++++++++++
x11-misc/qlipper/qlipper-5.0.0.ebuild | 2 +
2 files changed, 56 insertions(+)
diff --git a/x11-misc/qlipper/files/qlipper-5.0.0-build.patch b/x11-misc/qlipper/files/qlipper-5.0.0-build.patch
new file mode 100644
index 00000000..20f6b35
--- /dev/null
+++ b/x11-misc/qlipper/files/qlipper-5.0.0-build.patch
@@ -0,0 +1,54 @@
+From b3cb6a08c82deacb905459b66f16eda35f0c3779 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Wed, 9 Nov 2016 21:42:08 +1100
+Subject: [PATCH] Fix build with ENABLE_NETWORK_CLIPBOARD_SHARING enabled.
+
+qlippernetwork.cpp expects network-related variables to be available if
+ENABLE_NETWORK_CLIPBOARD_SHARING is defined, but qlippernetwork.h defined those
+variables if ENABLE_NETWORK_CLIPBOARD_SHARING was *un*defined.
+
+This also adds a missing include that is no longer available transitively via
+QtNetwork/QUdpSocket.
+---
+ src/qlippernetwork.h | 4 ++--
+ src/qlippertypes.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/qlippernetwork.h b/src/qlippernetwork.h
+index 9163cf8..ce1ac9a 100644
+--- a/src/qlippernetwork.h
++++ b/src/qlippernetwork.h
+@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
+ #define QLIPPERNETWORK_H
+
+ #include <QtCore/QObject>
+-#ifndef ENABLE_NETWORK_CLIPBOARD_SHARING
++#ifdef ENABLE_NETWORK_CLIPBOARD_SHARING
+ #include <QtNetwork/QUdpSocket>
+ #endif
+ #include "qlippertypes.h"
+@@ -38,7 +38,7 @@ public slots:
+ void sendData(const ClipboardContent &value);
+
+ private:
+-#ifndef ENABLE_NETWORK_CLIPBOARD_SHARING
++#ifdef ENABLE_NETWORK_CLIPBOARD_SHARING
+ QUdpSocket *m_socket;
+ QString m_id;
+ #endif
+diff --git a/src/qlippertypes.h b/src/qlippertypes.h
+index b55f0e1..c97c311 100644
+--- a/src/qlippertypes.h
++++ b/src/qlippertypes.h
+@@ -2,7 +2,7 @@
+ #define QLIPPERTYPES_H
+
+ #include <QMetaType>
+-
++#include <QHashIterator>
+
+ typedef QHash<QString,QByteArray> ClipboardContent;
+ typedef QHashIterator<QString,QByteArray> ClipboardContentIterator;
+--
+2.7.3
+
diff --git a/x11-misc/qlipper/qlipper-5.0.0.ebuild b/x11-misc/qlipper/qlipper-5.0.0.ebuild
index 8b231bb..542f3b5 100644
--- a/x11-misc/qlipper/qlipper-5.0.0.ebuild
+++ b/x11-misc/qlipper/qlipper-5.0.0.ebuild
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
"
+PATCHES=( "${FILESDIR}/${P}-build.patch" )
+
pkg_preinst() {
gnome2_icon_savelist
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/qlipper/files/, x11-misc/qlipper/
@ 2021-02-14 19:04 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-02-14 19:04 UTC (permalink / raw
To: gentoo-commits
commit: 7b36c103944def7f1d26083a9bb36377e7421c9a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 18:11:21 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 19:04:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b36c103
x11-misc/qlipper: Drop 5.0.0
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-misc/qlipper/Manifest | 1 -
x11-misc/qlipper/files/qlipper-5.0.0-build.patch | 54 ------------------------
x11-misc/qlipper/qlipper-5.0.0.ebuild | 40 ------------------
3 files changed, 95 deletions(-)
diff --git a/x11-misc/qlipper/Manifest b/x11-misc/qlipper/Manifest
index b79245def69..1b92b1d7fd0 100644
--- a/x11-misc/qlipper/Manifest
+++ b/x11-misc/qlipper/Manifest
@@ -1,2 +1 @@
-DIST qlipper-5.0.0.tar.gz 94281 BLAKE2B 04834165a70d71fad2ee945c0b8389ffefef110554d234e0b1f25f02f7b33a0c8cf809cafd7f7a74a2845f949d35a6ad8045d23981efdd9e6c091c5e61ac9367 SHA512 d2bd834f33531a175201244bdd6e9436da16c6f77e1fdc79616c8c3faef531ae50d4cc3b072074fd5efa494cc7be30ffe617912cf54494a66a72420095b0c642
DIST qlipper-5.1.2.tar.gz 104652 BLAKE2B 841b984d4720dfe7d69424a79beee8d84f5d66109ac1afb75c39cf16ff27da309d929f91eab2222e43a547d4d010809f31d59adb321c9f9f0ae19fb580cff0a2 SHA512 1ad49424855abf5f446026856178291b6ed8c1152338013f2228bbe5a923bc2e989754fe41e8b03f069f815c3850073eb1063842b5f40462005693a9029b187b
diff --git a/x11-misc/qlipper/files/qlipper-5.0.0-build.patch b/x11-misc/qlipper/files/qlipper-5.0.0-build.patch
deleted file mode 100644
index 20f6b35c56a..00000000000
--- a/x11-misc/qlipper/files/qlipper-5.0.0-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From b3cb6a08c82deacb905459b66f16eda35f0c3779 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Wed, 9 Nov 2016 21:42:08 +1100
-Subject: [PATCH] Fix build with ENABLE_NETWORK_CLIPBOARD_SHARING enabled.
-
-qlippernetwork.cpp expects network-related variables to be available if
-ENABLE_NETWORK_CLIPBOARD_SHARING is defined, but qlippernetwork.h defined those
-variables if ENABLE_NETWORK_CLIPBOARD_SHARING was *un*defined.
-
-This also adds a missing include that is no longer available transitively via
-QtNetwork/QUdpSocket.
----
- src/qlippernetwork.h | 4 ++--
- src/qlippertypes.h | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/qlippernetwork.h b/src/qlippernetwork.h
-index 9163cf8..ce1ac9a 100644
---- a/src/qlippernetwork.h
-+++ b/src/qlippernetwork.h
-@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
- #define QLIPPERNETWORK_H
-
- #include <QtCore/QObject>
--#ifndef ENABLE_NETWORK_CLIPBOARD_SHARING
-+#ifdef ENABLE_NETWORK_CLIPBOARD_SHARING
- #include <QtNetwork/QUdpSocket>
- #endif
- #include "qlippertypes.h"
-@@ -38,7 +38,7 @@ public slots:
- void sendData(const ClipboardContent &value);
-
- private:
--#ifndef ENABLE_NETWORK_CLIPBOARD_SHARING
-+#ifdef ENABLE_NETWORK_CLIPBOARD_SHARING
- QUdpSocket *m_socket;
- QString m_id;
- #endif
-diff --git a/src/qlippertypes.h b/src/qlippertypes.h
-index b55f0e1..c97c311 100644
---- a/src/qlippertypes.h
-+++ b/src/qlippertypes.h
-@@ -2,7 +2,7 @@
- #define QLIPPERTYPES_H
-
- #include <QMetaType>
--
-+#include <QHashIterator>
-
- typedef QHash<QString,QByteArray> ClipboardContent;
- typedef QHashIterator<QString,QByteArray> ClipboardContentIterator;
---
-2.7.3
-
diff --git a/x11-misc/qlipper/qlipper-5.0.0.ebuild b/x11-misc/qlipper/qlipper-5.0.0.ebuild
deleted file mode 100644
index ac11c2bd92c..00000000000
--- a/x11-misc/qlipper/qlipper-5.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Lightweight and cross-platform clipboard history applet"
-HOMEPAGE="https://github.com/pvanek/qlipper"
-SRC_URI="https://github.com/pvanek/qlipper/archive/5.0.0.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# bundles x11-libs/libqxt but no qt5 system version is available yet
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- x11-libs/libX11
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-build.patch" )
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/qlipper/files/, x11-misc/qlipper/
@ 2025-05-01 16:57 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-05-01 16:57 UTC (permalink / raw
To: gentoo-commits
commit: b2e7834a5d0f144caa058ea93e5247633ce6cb21
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 1 16:54:55 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 1 16:57:24 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e7834a
x11-misc/qlipper: add Qt6-based 5.1.2_p20241029, fix build w/ cmake-4
See also: https://github.com/pvanek/qlipper/issues/157
Bug: https://bugs.gentoo.org/953259
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-misc/qlipper/Manifest | 1 +
.../files/qlipper-5.1.2_p20241029-cmake4.patch | 11 +++++++++
x11-misc/qlipper/qlipper-5.1.2_p20241029.ebuild | 27 ++++++++++++++++++++++
3 files changed, 39 insertions(+)
diff --git a/x11-misc/qlipper/Manifest b/x11-misc/qlipper/Manifest
index 1b92b1d7fd0b..1948d435c6fa 100644
--- a/x11-misc/qlipper/Manifest
+++ b/x11-misc/qlipper/Manifest
@@ -1 +1,2 @@
DIST qlipper-5.1.2.tar.gz 104652 BLAKE2B 841b984d4720dfe7d69424a79beee8d84f5d66109ac1afb75c39cf16ff27da309d929f91eab2222e43a547d4d010809f31d59adb321c9f9f0ae19fb580cff0a2 SHA512 1ad49424855abf5f446026856178291b6ed8c1152338013f2228bbe5a923bc2e989754fe41e8b03f069f815c3850073eb1063842b5f40462005693a9029b187b
+DIST qlipper-5.1.2_p20241029-4f89ae6e.tar.gz 130470 BLAKE2B a3979be18d49dc9ad11fa6cb13c16cbf03690d7ca225301e2a90774ff768f19f43a3f2121d29cdcfa1957e06f623fde32efc0edfaebce48b19f8d4363f8312cb SHA512 5043bbbc9bdaf518605bd06d03082c6f7819f6536873294d7898eeac69fe5d0b934b384e5639daf64fbd32c5808bc809e42e068de5e5b57bd3122114b5195e6b
diff --git a/x11-misc/qlipper/files/qlipper-5.1.2_p20241029-cmake4.patch b/x11-misc/qlipper/files/qlipper-5.1.2_p20241029-cmake4.patch
new file mode 100644
index 000000000000..3252bdb123b8
--- /dev/null
+++ b/x11-misc/qlipper/files/qlipper-5.1.2_p20241029-cmake4.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt 2024-10-29 21:41:08.000000000 +0100
++++ b/CMakeLists.txt 2025-05-01 18:51:18.770578621 +0200
+@@ -40,7 +40,7 @@
+ # It will copy all dependecies (libs/resources) into bundle tree
+ # -------------------------------------------------------
+
+-CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.16.0)
+
+ project(qlipper)
+
diff --git a/x11-misc/qlipper/qlipper-5.1.2_p20241029.ebuild b/x11-misc/qlipper/qlipper-5.1.2_p20241029.ebuild
new file mode 100644
index 000000000000..0c0733c49bd1
--- /dev/null
+++ b/x11-misc/qlipper/qlipper-5.1.2_p20241029.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT=4f89ae6e90e3c9bbcc785981e4f522ef87842dfb
+inherit cmake xdg
+
+DESCRIPTION="Lightweight and cross-platform clipboard history applet"
+HOMEPAGE="https://github.com/pvanek/qlipper"
+SRC_URI="https://github.com/pvanek/${PN}/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT:0:8}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# TODO: still accurate? bundles x11-libs/libqxt but no qt6 system version is available yet
+RDEPEND="
+ dev-qt/qtbase:6[gui,widgets]
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+PATCHES=( "${FILESDIR}/${P}-cmake4.patch" )
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-05-01 16:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-14 19:04 [gentoo-commits] repo/gentoo:master commit in: x11-misc/qlipper/files/, x11-misc/qlipper/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-05-01 16:57 Andreas Sturmlechner
2016-11-17 15:05 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox