[packages/hotkeys] - add old libxml2.m4 macro to fix build with libxml2 2.14

qboosh qboosh at pld-linux.org
Tue Sep 2 20:03:47 CEST 2025


commit 7e98d5390d10ad6a02a78ed43e04ee2dc2ba80cb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Sep 2 20:06:30 2025 +0200

    - add old libxml2.m4 macro to fix build with libxml2 2.14

 hotkeys.spec | 14 +++++++++-----
 libxml.m4    | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)
---
diff --git a/hotkeys.spec b/hotkeys.spec
index b9a5559..bfa146d 100644
--- a/hotkeys.spec
+++ b/hotkeys.spec
@@ -3,10 +3,12 @@ Summary(pl.UTF-8):	Obsługa klawiszy specjalnych na internetowych/multimedialnyc
 Name:		hotkeys
 Version:	0.5.7.1
 Release:	7
-License:	GPL
+License:	GPL v2+
 Group:		X11/Applications/Multimedia
 Source0:	http://ypwong.org/hotkeys/%{version}/%{name}_%{version}.tar.gz
 # Source0-md5:	68e2aea6b4444f943b5f85ac00542a1c
+# from libxml2 < 2.14
+Source1:	libxml.m4
 Patch0:		%{name}-db41.patch
 Patch1:		%{name}-libxml2.patch
 Patch2:		%{name}-ac_am.patch
@@ -46,14 +48,16 @@ plik formacie XML.
 %patch -P2 -p1
 %patch -P3 -p1
 
+cat %{SOURCE1} >> acinclude.m4
+
 %build
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure \
-	--with-xosd \
 	--with-gtk \
-	--with-x
+	--with-x \
+	--with-xosd
 
 %{__make}
 
@@ -70,6 +74,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS TODO debian/changelog def/sample.xml
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hotkeys.conf
-%attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/hotkeys
 %{_datadir}/%{name}
-%{_mandir}/man1/*
+%{_mandir}/man1/hotkeys.1*
diff --git a/libxml.m4 b/libxml.m4
new file mode 100644
index 0000000..27ad84d
--- /dev/null
+++ b/libxml.m4
@@ -0,0 +1,14 @@
+dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for XML, and define XML_CPPFLAGS and XML_LIBS
+dnl
+AC_DEFUN([AM_PATH_XML2],[
+  m4_warn([obsolete], [AM_PATH_XML2 is deprecated, use PKG_CHECK_MODULES instead])
+  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+
+  verdep=ifelse([$1], [], [], [">= $1"])
+  PKG_CHECK_MODULES(XML, [libxml-2.0 $verdep], [$2], [$3])
+
+  XML_CPPFLAGS=$XML_CFLAGS
+  AC_SUBST(XML_CPPFLAGS)
+  AC_SUBST(XML_LIBS)
+])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hotkeys.git/commitdiff/7e98d5390d10ad6a02a78ed43e04ee2dc2ba80cb



More information about the pld-cvs-commit mailing list