[packages/xcb-proto] - adjust for automake 1.16.4 changes https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_re

hawk hawk at pld-linux.org
Tue Apr 5 18:03:13 CEST 2022


commit 7e890e5fea799181d9a26c92bd2efd28422b5e3f
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Tue Apr 5 16:01:12 2022 +0000

    - adjust for automake 1.16.4 changes
      https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests/25

 xcb-proto-automake.patch | 14 ++++++++++++++
 xcb-proto.spec           |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/xcb-proto.spec b/xcb-proto.spec
index 8b4c7c4..a9feccc 100644
--- a/xcb-proto.spec
+++ b/xcb-proto.spec
@@ -9,12 +9,13 @@ Summary:	XML-XCB protocol description files
 Summary(pl.UTF-8):	Pliki opisu protokołu XML-XCB
 Name:		xcb-proto
 Version:	1.14.1
-Release:	4
+Release:	5
 License:	MIT
 Group:		Development/Libraries
 #Source0:	https://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
 Source0:	https://xorg.freedesktop.org/releases/individual/proto/%{name}-%{version}.tar.xz
 # Source0-md5:	ecd6955dab1a7b9ba9756a11b8bdb48f
+Patch0:		%{name}-automake.patch
 URL:		https://xcb.freedesktop.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1:1.12.6
@@ -76,6 +77,7 @@ Moduł xcbgen dla Pythona 3.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # rebuild ac/am to use python3 sitescriptdir (apply automake/revert-debian-python-hacks.patch)
diff --git a/xcb-proto-automake.patch b/xcb-proto-automake.patch
new file mode 100644
index 0000000..a6cceac
--- /dev/null
+++ b/xcb-proto-automake.patch
@@ -0,0 +1,14 @@
+Common subdirectories: xcb-proto-1.14.1.orig/doc and xcb-proto-1.14.1/doc
+Common subdirectories: xcb-proto-1.14.1.orig/src and xcb-proto-1.14.1/src
+diff -u xcb-proto-1.14.1.orig/xcb-proto.pc.in xcb-proto-1.14.1/xcb-proto.pc.in
+--- xcb-proto-1.14.1.orig/xcb-proto.pc.in	2020-10-08 22:31:54.000000000 +0000
++++ xcb-proto-1.14.1/xcb-proto.pc.in	2022-04-05 15:59:21.958915952 +0000
+@@ -4,6 +4,7 @@
+ datadir=@datadir@
+ libdir=@libdir@
+ xcbincludedir=${pc_sysrootdir}@xcbincludedir@
++PYTHON_PREFIX=@PYTHON_PREFIX@
+ pythondir=${pc_sysrootdir}@pythondir@
+ 
+ Name: XCB Proto
+Common subdirectories: xcb-proto-1.14.1.orig/xcbgen and xcb-proto-1.14.1/xcbgen
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xcb-proto.git/commitdiff/7e890e5fea799181d9a26c92bd2efd28422b5e3f



More information about the pld-cvs-commit mailing list