commit:     d28a10a1f8b19df19f6f3e43493ce1b3dcf3f358
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 10:19:16 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 10:53:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d28a10a1

media-sound/xmms2: add 0.9.5, drop 0.9.4 (straight-to-stable)

0.9.5 is entirely identical to 0.9.4+c23.patch save for the version
number, so not going to bother keeping old + re-stabilizing.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-sound/xmms2/Manifest                         |  2 +-
 media-sound/xmms2/files/xmms2-0.9.4-c23.patch      | 33 ----------------------
 .../{xmms2-0.9.4.ebuild => xmms2-0.9.5.ebuild}     |  1 -
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 98ceb9dd6979..6bf176002272 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1 +1 @@
-DIST xmms2-0.9.4.tar.xz 1741996 BLAKE2B 
edb8dfb78d9a4cba19a209f9f5740fcf43c2b295ff3907ad8fa36689f19142e3b86e57ea9bd3ce97a04bd2284c4dd7be45c94510f3004f5ee655f6c5b88a898f
 SHA512 
71075d41a49983624b87d5c80b0d58283fe53146ecad9b8d37d96545881bfec4e6de30eb1463fad37a8f8a3f3ebb58c12e10eecd998d9aaff7f3c1bdaef83bc9
+DIST xmms2-0.9.5.tar.xz 1741972 BLAKE2B 
f9737b8f98e34145cfff8f06eb4d3b0cb080b5bbb5e807a544516e8827f83f5e15447aa0d2aba4aeaf79af3483703309570d7358543f3607099985bdc0b34df2
 SHA512 
284c3c29e8231a540ccfaf608e147b058c1dc683bec86a96c8383508cc8f49f76b734fd4da69f25ecf628f91c39157801b37db342b1bc5644ed2f7175841a882

diff --git a/media-sound/xmms2/files/xmms2-0.9.4-c23.patch 
b/media-sound/xmms2/files/xmms2-0.9.4-c23.patch
deleted file mode 100644
index 1f74cb4c4a0b..000000000000
--- a/media-sound/xmms2/files/xmms2-0.9.4-c23.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/943862
-https://github.com/xmms2/xmms2-devel/commit/b6a6e8c20b
-https://github.com/xmms2/xmms2-devel/commit/fdf542b408
-https://github.com/xmms2/xmms2-devel/commit/5bd52ac2e5
---- a/src/clients/lib/xmmsclient/service/client.c
-+++ b/src/clients/lib/xmmsclient/service/client.c
-@@ -348,6 +348,6 @@
-       xmmsc_sc_interface_entity_t *ifent;
- 
--      x_api_error_if (!name, "with NULL name.", false);
--      x_api_error_if (!validate_entity_name (name), "with invalid name", 
false);
-+      x_api_error_if (!name, "with NULL name.", NULL);
-+      x_api_error_if (!validate_entity_name (name), "with invalid name", 
NULL);
- 
-       x_return_null_if_fail (parent);
---- a/src/clients/lib/xmmsclient/visualization/unixshm.c
-+++ b/src/clients/lib/xmmsclient/visualization/unixshm.c
-@@ -29,5 +29,5 @@
-       if (t->shmid == -1) {
-               c->error = strdup ("Couldn't create the shared memory!");
--              return false;
-+              return NULL;
-       }
-       /* attach early, so that the server doesn't think we aren't there */
---- a/src/clients/lib/xmmsclient/xmmsclient.c
-+++ b/src/clients/lib/xmmsclient/xmmsclient.c
-@@ -223,5 +223,5 @@
- xmmsc_get_last_error (xmmsc_connection_t *c)
- {
--      x_api_error_if (!c, "with a NULL connection", false);
-+      x_api_error_if (!c, "with a NULL connection", NULL);
-       return c->error;
- }

diff --git a/media-sound/xmms2/xmms2-0.9.4.ebuild 
b/media-sound/xmms2/xmms2-0.9.5.ebuild
similarity index 99%
rename from media-sound/xmms2/xmms2-0.9.4.ebuild
rename to media-sound/xmms2/xmms2-0.9.5.ebuild
index a4011e18d871..870046b6842d 100644
--- a/media-sound/xmms2/xmms2-0.9.4.ebuild
+++ b/media-sound/xmms2/xmms2-0.9.5.ebuild
@@ -133,7 +133,6 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 PATCHES=(
        "${FILESDIR}"/${PN}-0.9.1-cpp-client.patch
        "${FILESDIR}"/${PN}-0.9.1-faad.patch
-       "${FILESDIR}"/${P}-c23.patch
 )
 
 src_prepare() {

Reply via email to