rpms/libXp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix printproto patch

Browse Source
This commit is contained in:
Adam Jackson 2018-07-05 12:11:53 -04:00
parent 7bac1ade0d
commit 5b215b3a7e
2 changed files with 40 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
add-proto-files.patch
View File

@ -1,56 +1,13 @@
From bbf6d3783ba9f5cd1489dd6bb042915c685b41b0 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 1 Jul 2013 15:04:04 +1000
Subject: [PATCH] Patch printproto into libXp
---
Makefile.am | 9 +-
configure.ac | 3 +-
include/X11/extensions/Print.h | 552 +++++++++++++++++++++++++++
include/X11/extensions/Printstr.h | 783 ++++++++++++++++++++++++++++++++++++++
printproto.pc.in | 10 +
src/Makefile.am | 2 +-
6 files changed, 1355 insertions(+), 4 deletions(-)
create mode 100644 include/X11/extensions/Print.h
create mode 100644 include/X11/extensions/Printstr.h
create mode 100644 printproto.pc.in
diff --git a/Makefile.am b/Makefile.am
index 90655d5..2525cc1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,10 +23,15 @@ AM_CFLAGS = $(XPRINT_CFLAGS)
SUBDIRS = src man
+printdir = $(includedir)/X11/extensions
+print_HEADERS = \
+ $(top_srcdir)/include/X11/extensions/Print.h \
+ $(top_srcdir)/include/X11/extensions/Printstr.h
+
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xp.pc
+pkgconfig_DATA = xp.pc printproto.pc
-EXTRA_DIST = xp.pc.in ChangeLog
+EXTRA_DIST = xp.pc.in printproto.pc.in ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
diff --git a/configure.ac b/configure.ac
index c721461..b1e00b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ XORG_DEFAULT_OPTIONS
diff -up libXp-1.0.3/configure.ac.jx libXp-1.0.3/configure.ac
--- libXp-1.0.3/configure.ac.jx 2015-02-21 17:04:36.000000000 -0500
+++ libXp-1.0.3/configure.ac 2018-07-05 12:11:30.955684590 -0400
@@ -42,11 +42,12 @@ XORG_DEFAULT_OPTIONS
AC_PROG_LIBTOOL
# Check for X and print proto
-PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau printproto)
+PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau)
-PKG_CHECK_MODULES(XPRINT, [x11 >= 1.6] xext xextproto xau printproto)
+PKG_CHECK_MODULES(XPRINT, [x11 >= 1.6] xext xextproto xau)
# Check for _XEatDataWords function that may be patched into older Xlib release
SAVE_LIBS="$LIBS"
@@ -54,6 +54,7 @@ LIBS="$SAVE_LIBS"
AC_CONFIG_FILES([Makefile
src/Makefile
man/Makefile
@ -58,11 +15,9 @@ index c721461..b1e00b1 100644
xp.pc])
AC_OUTPUT
diff --git a/include/X11/extensions/Print.h b/include/X11/extensions/Print.h
new file mode 100644
index 0000000..4c1b387
--- /dev/null
+++ b/include/X11/extensions/Print.h
diff -up libXp-1.0.3/include/X11/extensions/Print.h.jx libXp-1.0.3/include/X11/extensions/Print.h
--- libXp-1.0.3/include/X11/extensions/Print.h.jx 2018-07-05 12:11:12.281385412 -0400
+++ libXp-1.0.3/include/X11/extensions/Print.h 2018-07-05 12:11:12.281385412 -0400
@@ -0,0 +1,552 @@
+/* $Xorg: Print.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
+/******************************************************************************
@ -616,11 +571,9 @@ index 0000000..4c1b387
+_XFUNCPROTOEND
+
+#endif /* _XpPrint_H_ */
diff --git a/include/X11/extensions/Printstr.h b/include/X11/extensions/Printstr.h
new file mode 100644
index 0000000..8fc9958
--- /dev/null
+++ b/include/X11/extensions/Printstr.h
diff -up libXp-1.0.3/include/X11/extensions/Printstr.h.jx libXp-1.0.3/include/X11/extensions/Printstr.h
--- libXp-1.0.3/include/X11/extensions/Printstr.h.jx 2018-07-05 12:11:12.282385427 -0400
+++ libXp-1.0.3/include/X11/extensions/Printstr.h 2018-07-05 12:11:12.282385427 -0400
@@ -0,0 +1,783 @@
+/* $Xorg: Printstr.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
+/******************************************************************************
@ -1405,11 +1358,30 @@ index 0000000..8fc9958
+_XFUNCPROTOEND
+
+#endif /* _XpPrintstr_H_ */
diff --git a/printproto.pc.in b/printproto.pc.in
new file mode 100644
index 0000000..bbc6ec8
--- /dev/null
+++ b/printproto.pc.in
diff -up libXp-1.0.3/Makefile.am.jx libXp-1.0.3/Makefile.am
--- libXp-1.0.3/Makefile.am.jx 2015-02-21 17:02:53.000000000 -0500
+++ libXp-1.0.3/Makefile.am 2018-07-05 12:11:12.279385380 -0400
@@ -23,10 +23,15 @@ AM_CFLAGS = $(XPRINT_CFLAGS)
SUBDIRS = src man
+printdir = $(includedir)/X11/extensions
+print_HEADERS = \
+ $(top_srcdir)/include/X11/extensions/Print.h \
+ $(top_srcdir)/include/X11/extensions/Printstr.h
+
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xp.pc
+pkgconfig_DATA = xp.pc printproto.pc
-EXTRA_DIST = xp.pc.in ChangeLog
+EXTRA_DIST = xp.pc.in printproto.pc.in ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
diff -up libXp-1.0.3/printproto.pc.in.jx libXp-1.0.3/printproto.pc.in
--- libXp-1.0.3/printproto.pc.in.jx 2018-07-05 12:11:12.283385443 -0400
+++ libXp-1.0.3/printproto.pc.in 2018-07-05 12:11:12.282385427 -0400
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
@ -1421,10 +1393,9 @@ index 0000000..bbc6ec8
+Version: @PACKAGE_VERSION@
+Requires: xau
+Cflags: -I${includedir}
diff --git a/src/Makefile.am b/src/Makefile.am
index f42b633..56121da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
diff -up libXp-1.0.3/src/Makefile.am.jx libXp-1.0.3/src/Makefile.am
--- libXp-1.0.3/src/Makefile.am.jx 2015-02-21 17:02:53.000000000 -0500
+++ libXp-1.0.3/src/Makefile.am 2018-07-05 12:11:12.283385443 -0400
@@ -24,7 +24,7 @@ libXp_la_LIBADD = $(XPRINT_LIBS)
AM_CFLAGS = $(CWARNFLAGS) $(XPRINT_CFLAGS) $(MALLOC_ZERO_CFLAGS)
@ -1434,6 +1405,3 @@ index f42b633..56121da 100644
#
# Library version number. This must match old versions on
--
1.8.2.1

2
libXp.spec
View File

@ -43,7 +43,7 @@ X.Org X11 libXp development package
%prep
%setup -q
exit
%patch0 -p1 -b .add-proto-files
%build