[packages/xmms] Rel 10

[arekm]

commit e7cc96ebc25262eeda68345d2457352d6b120be4
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Mar 15 14:49:26 2026 +0100

    Rel 10

 xmms-gettext-external.patch       | 33 +++++++++++++++++++++++++++++++++
 xmms-warn_about_unplayables.patch |  2 +-
 xmms.spec                         | 24 ++++++++++++++----------
 3 files changed, 48 insertions(+), 11 deletions(-)
---
diff --git a/xmms.spec b/xmms.spec
index 01a0152..ed3b479 100644
--- a/xmms.spec
+++ b/xmms.spec
@@ -9,7 +9,7 @@ Summary(uk.UTF-8):	Програвач музики з WinAmp GUI
 Summary(zh_CN.UTF-8):	XMMS - X 端多媒体播放器
 Name:		xmms
 Version:	1.2.11
-Release:	9
+Release:	10
 Epoch:		2
 License:	GPL v2+
 Group:		X11/Applications/Sound
@@ -26,6 +26,7 @@ Source6:	%{name}.png
 Patch0:		%{name}-warn_about_unplayables.patch
 Patch1:		%{name}-gcc4.patch
 Patch2:		%{name}-no-esd.patch
+Patch3:		%{name}-gettext-external.patch
 #Patch1:		%{name}-gtk2.patch
 URL:		http://www.xmms.org/
 BuildRequires:	OpenGL-devel
@@ -382,6 +383,7 @@ OpenGL.
 %patch -P0 -p1
 %patch -P1 -p1
 %patch -P2 -p1
+%patch -P3 -p1
 
 mv -f po/{no,nb}.po
 %{__perl} -pi -e 's/ no / nb /' po/LINGUAS
@@ -393,33 +395,35 @@ install -d m4
 head -n60 libxmms/acinclude.m4 > m4/xmms-macros.m4
 
 %build
-# kill old libtool.m4 copy
-rm -f acinclude.m4
+# Rebuild the generated files because xmms-no-esd.patch and
+# xmms-gettext-external.patch both touch autotools inputs.
+rm -f acinclude.m4 aclocal.m4
 %{__gettextize}
 %{__libtoolize}
-%{__aclocal} -I m4
+%{__aclocal} -I m4 -I %{_datadir}/gettext/m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 
 cd libxmms
-# kill old libtool.m4 copy
-rm -f acinclude.m4
-%{__aclocal} -I ../m4
+rm -f acinclude.m4 aclocal.m4
+%{__libtoolize}
+%{__aclocal} -I ../m4 -I %{_datadir}/gettext/m4
 %{__autoconf}
 %{__autoheader}
-# don't use --force here
-automake -a -c --foreign
+%{__automake}
 cd ..
 
 %configure \
+	--disable-libmikmodtest \
 	--disable-vorbistest \
 %ifarch %{ix86}
 	--enable-simd
 %endif
 
 %{__make} \
-	AS="%{__cc}"
+	AS="%{__cc}" \
+	CFLAGS="%{rpmcflags} -std=gnu89"
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/xmms-gettext-external.patch b/xmms-gettext-external.patch
new file mode 100644
index 0000000..6050ebf
--- /dev/null
+++ b/xmms-gettext-external.patch
@@ -0,0 +1,33 @@
+Switch XMMS to external gettext for modern autotools regeneration.
+The bundled intl/ and old gettext templates do not regenerate cleanly
+with current gettext/automake, so stop recursing into intl and let
+gettextize refresh po infrastructure.
+
+--- xmms-1.2.11/configure.in.orig	2026-03-15 14:39:41.606562175 +0100
++++ xmms-1.2.11/configure.in	2026-03-15 14:39:41.623984242 +0100
+@@ -298,7 +298,7 @@
+ dnl ***
+ ALL_LINGUAS="af az be bg bs ca cs cy da de el en en_GB eo es et eu fi fr ga gl hr hu id it ja ka ko lt lv mk ms nn nl no pl pt pt_BR ro ru sk sl sq sr sr at Latn sv tg th tr uk uz vi wa zh_CN zh_TW"
+ 
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
+ 
+ localedir=${datadir}/locale
+ AC_SUBST([localedir])
+@@ -659,7 +659,7 @@
+ Visualization/opengl_spectrum/Makefile
+ wmxmms/Makefile
+ po/Makefile.in
+-intl/Makefile],
++],
+ [chmod +x xmms-config])
+ 
+ echo ""
+--- xmms-1.2.11/Makefile.am.orig	2026-03-15 14:39:41.616562175 +0100
++++ xmms-1.2.11/Makefile.am	2026-03-15 14:39:41.626806160 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms po
++SUBDIRS = libxmms xmms Output Input Effect General Visualization wmxmms po
+ 
+ bin_SCRIPTS = xmms-config
+ 
diff --git a/xmms-warn_about_unplayables.patch b/xmms-warn_about_unplayables.patch
index dc39789..cc1fea2 100644
--- a/xmms-warn_about_unplayables.patch
+++ b/xmms-warn_about_unplayables.patch
@@ -138,7 +138,7 @@ diff -Nuard xmms-1.2.8.orig/xmms/main.h xmms-1.2.8/xmms/main.h
 +	gboolean warn_about_unplayables;
  	gboolean use_backslash_as_dir_delimiter;
  	gboolean random_skin_on_play, use_fontsets;
- 	gboolean mainwin_use_xfont;
+ 	gboolean mainwin_use_xfont, timer_minutes_only;
 diff -Nuard xmms-1.2.8.orig/xmms/prefswin.c xmms-1.2.8/xmms/prefswin.c
 --- xmms-1.2.8.orig/xmms/prefswin.c	2003-07-16 15:17:47.000000000 +0200
 +++ xmms-1.2.8/xmms/prefswin.c	2003-09-08 01:18:14.000000000 +0200
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xmms.git/commitdiff/e7cc96ebc25262eeda68345d2457352d6b120be4