[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmstickynotes/, x11-plugins/wmstickynotes/files/

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmstickynotes/, x11-plugins/wmstickynotes/files/

[Sam James]

commit:     a086f57b80195647a75121161ccf75a36f1611cf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 19:16:01 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 19:17:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a086f57b

x11-plugins/wmstickynotes: drop 0.2-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-plugins/wmstickynotes/Manifest                 |  1 -
 .../files/wmstickynotes-0.2-gold.patch             | 28 ----------------------
 .../wmstickynotes/wmstickynotes-0.2-r1.ebuild      | 17 -------------
 3 files changed, 46 deletions(-)

diff --git a/x11-plugins/wmstickynotes/Manifest b/x11-plugins/wmstickynotes/Manifest
index 6d43755b495d..cce8505c6f7a 100644
--- a/x11-plugins/wmstickynotes/Manifest
+++ b/x11-plugins/wmstickynotes/Manifest
@@ -1,2 +1 @@
-DIST wmstickynotes-0.2.tar.gz 107432 BLAKE2B 2164c351adc723caa22689cbec277554b4adc1d73dce67b52f3ba30ce14a6cc70c39762ae6eb00f2d51b4c365738edfe5713580aa1c30d9256cf112efe579a4b SHA512 59e54e64157a04296f12c1c8c224c5c4b05685f2f0e05abe2a23a1c2137c0656c30e7befc4e5a39b4cb97f99e2ff68f53173cf6456b95f3fef80441661d19b63
 DIST wmstickynotes-0.7.tar.gz 121562 BLAKE2B b589f157d53791e3edbf409932616bcdc9d8915d6c2cce1d5901c04e73d76cffa5eb321c2f9b0a0ceecb8aeef3985637195d8a027687f0a94e6bd5544d56335c SHA512 986ca0bbd726488795559be9ca65390eb0d091834335d89f590cc67c40aeb14f2b48b7a61cf3170c4287a98ecf44f1a55d85b6b5d03d2d7df1cb6fe5b7ac3d0d

diff --git a/x11-plugins/wmstickynotes/files/wmstickynotes-0.2-gold.patch b/x11-plugins/wmstickynotes/files/wmstickynotes-0.2-gold.patch
deleted file mode 100644
index 360140a85ed6..000000000000
--- a/x11-plugins/wmstickynotes/files/wmstickynotes-0.2-gold.patch
+++ /dev/null
@@ -1,28 +0,0 @@
- Makefile.am |    2 +-
- Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 7c69428..bccf1d4 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -10,5 +10,5 @@ AUTOMAKE_OPTIONS = gnu
- bin_PROGRAMS = wmstickynotes
- wmstickynotes_SOURCES = wmstickynotes.c wmstickynotes.h wmstickynotes.xpm delete_button.xpm resize_button.xpm
- 
--wmstickynotes_LDADD = @GTK_LIBS@
-+wmstickynotes_LDADD = @GTK_LIBS@ -lX11
- EXTRA_DIST = THANKS
-diff --git a/Makefile.in b/Makefile.in
-index 91b19bd..fd883f2 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -182,7 +182,7 @@ top_srcdir = @top_srcdir@
- AM_CFLAGS = @GTK_CFLAGS@
- AUTOMAKE_OPTIONS = gnu
- wmstickynotes_SOURCES = wmstickynotes.c wmstickynotes.h wmstickynotes.xpm delete_button.xpm resize_button.xpm
--wmstickynotes_LDADD = @GTK_LIBS@
-+wmstickynotes_LDADD = @GTK_LIBS@ -lX11
- EXTRA_DIST = THANKS
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-am

diff --git a/x11-plugins/wmstickynotes/wmstickynotes-0.2-r1.ebuild b/x11-plugins/wmstickynotes/wmstickynotes-0.2-r1.ebuild
deleted file mode 100644
index 61bae078ca75..000000000000
--- a/x11-plugins/wmstickynotes/wmstickynotes-0.2-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A dockapp for keeping small notes around on the desktop"
-HOMEPAGE="https://sourceforge.net/projects/wmstickynotes/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="x11-libs/gtk+:2"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-gold.patch )

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmstickynotes/, x11-plugins/wmstickynotes/files/

[Ionen Wolkens]

commit:     c33f16b0f0cb13ea27db76be99d779af4431a89d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 00:35:14 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 00:37:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c33f16b0

x11-plugins/wmstickynotes: fix build w/ upcoming clang16

Also set bit more explicit deps while revbumping.

Closes: https://bugs.gentoo.org/874927
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../files/wmstickynotes-0.7-clang16.patch           |  8 ++++++++
 ...notes-0.7.ebuild => wmstickynotes-0.7-r1.ebuild} | 21 +++++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/wmstickynotes/files/wmstickynotes-0.7-clang16.patch b/x11-plugins/wmstickynotes/files/wmstickynotes-0.7-clang16.patch
new file mode 100644
index 000000000000..7674dcfd4984
--- /dev/null
+++ b/x11-plugins/wmstickynotes/files/wmstickynotes-0.7-clang16.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/874927
+--- a/wmstickynotes.h
++++ b/wmstickynotes.h
+@@ -34,3 +34,3 @@
+ 
+-const num_color_schemes = 8;
++const int num_color_schemes = 8;
+ ColorScheme color_schemes[] = {

diff --git a/x11-plugins/wmstickynotes/wmstickynotes-0.7.ebuild b/x11-plugins/wmstickynotes/wmstickynotes-0.7-r1.ebuild
similarity index 58%
rename from x11-plugins/wmstickynotes/wmstickynotes-0.7.ebuild
rename to x11-plugins/wmstickynotes/wmstickynotes-0.7-r1.ebuild
index 8b8830387ff3..3058805ac1e9 100644
--- a/x11-plugins/wmstickynotes/wmstickynotes-0.7.ebuild
+++ b/x11-plugins/wmstickynotes/wmstickynotes-0.7-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit flag-o-matic
+
 DESCRIPTION="A dockapp for keeping small notes around on the desktop"
 HOMEPAGE="https://sourceforge.net/projects/wmstickynotes/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -11,5 +13,20 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND="x11-libs/gtk+:2"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang16.patch
+)
+
+src_configure() {
+	append-cppflags -D_GNU_SOURCE #874927
+
+	default
+}