Date: Thursday, November 17, 2022 @ 17:18:56
Author: heftig
Revision: 462096
1.0.4-2: enable debug; move printproto into shared pkgconfig dir
Modified:
libxp/trunk/PKGBUILD
libxp/trunk/add-proto-files.patch
libxp/trunk/keys/pgp/4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E.asc
-----------------------+
PKGBUILD | 7 +++---
add-proto-files.patch | 51 +++++++++++++++++++++++++-----------------------
2 files changed, 31 insertions(+), 27 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-17 17:18:00 UTC (rev 462095)
+++ PKGBUILD 2022-11-17 17:18:56 UTC (rev 462096)
@@ -3,7 +3,7 @@
pkgname=libxp
pkgver=1.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="X11 X Print Library"
arch=('x86_64')
license=('custom')
@@ -10,12 +10,13 @@
url="https://xorg.freedesktop.org/";
depends=('libxext')
makedepends=('xorg-util-macros' 'xorgproto')
+provides=('libXp.so')
+options=('debug')
source=(${url}/releases/individual/lib/libXp-${pkgver}.tar.xz{,.sig}
add-proto-files.patch)
-license=('custom')
sha512sums=('50e82e7ee7222db13a04f6223ae8653eb783593c3b28825d7fc233af188960bec53d2b11ced281e01140d283d840d0e3822d71f95f5045d594fb704485fd0f89'
'SKIP'
-
'bd9c667cb51bb50b0ca4a50c85f32fcf2d26b642a15cfa1980cca49decf236ebc37fcca45fa4c979d02bb5ece4c43eee78cd952cc90c5419331f69b94e590737')
+
'4347b6928d9cffa610e8dec7524d3897d2bbcdb6ee24a1e801bb28a5c5dc0a7a692cb1d0d5dddca2cbf6484c3604bbb3b3b4b62cd566d807167c3636b2247004')
#validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # "Matt Turner
<[email protected]>"
validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith
<[email protected]>
Modified: add-proto-files.patch
===================================================================
--- add-proto-files.patch 2022-11-17 17:18:00 UTC (rev 462095)
+++ add-proto-files.patch 2022-11-17 17:18:56 UTC (rev 462096)
@@ -1,6 +1,6 @@
-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
+diff -Nurp libXp-1.0.4/configure.ac libXp-1.0.4-printproto/configure.ac
+--- libXp-1.0.4/configure.ac 2022-09-12 20:50:17.000000000 +0000
++++ libXp-1.0.4-printproto/configure.ac 2022-11-17 17:08:39.670149026
+0000
@@ -42,11 +42,12 @@ XORG_DEFAULT_OPTIONS
AC_PROG_LIBTOOL
@@ -11,13 +11,13 @@
AC_CONFIG_FILES([Makefile
src/Makefile
man/Makefile
-+ printproto.pc
++ printproto.pc
xp.pc])
AC_OUTPUT
-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
+diff -Nurp libXp-1.0.4/include/X11/extensions/Print.h
libXp-1.0.4-printproto/include/X11/extensions/Print.h
+--- libXp-1.0.4/include/X11/extensions/Print.h 1970-01-01 00:00:00.000000000
+0000
++++ libXp-1.0.4-printproto/include/X11/extensions/Print.h 2022-11-17
17:08:24.769225832 +0000
@@ -0,0 +1,552 @@
+/* $Xorg: Print.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
+/******************************************************************************
@@ -571,9 +571,9 @@
+_XFUNCPROTOEND
+
+#endif /* _XpPrint_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
+diff -Nurp libXp-1.0.4/include/X11/extensions/Printstr.h
libXp-1.0.4-printproto/include/X11/extensions/Printstr.h
+--- libXp-1.0.4/include/X11/extensions/Printstr.h 1970-01-01
00:00:00.000000000 +0000
++++ libXp-1.0.4-printproto/include/X11/extensions/Printstr.h 2022-11-17
17:08:24.769225832 +0000
@@ -0,0 +1,783 @@
+/* $Xorg: Printstr.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
+/******************************************************************************
@@ -1358,30 +1358,32 @@
+_XFUNCPROTOEND
+
+#endif /* _XpPrintstr_H_ */
-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)
+diff -Nurp libXp-1.0.4/Makefile.am libXp-1.0.4-printproto/Makefile.am
+--- libXp-1.0.4/Makefile.am 2022-09-12 20:50:17.000000000 +0000
++++ libXp-1.0.4-printproto/Makefile.am 2022-11-17 17:10:05.105444432 +0000
+@@ -23,10 +23,18 @@ 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
++ $(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
+ pkgconfig_DATA = xp.pc
-EXTRA_DIST = xp.pc.in ChangeLog README.md
++sharedpkgconfigdir = $(datarootdir)/pkgconfig
++sharedpkgconfig_DATA = printproto.pc
++
+EXTRA_DIST = xp.pc.in printproto.pc.in ChangeLog README.md
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
+diff -Nurp libXp-1.0.4/printproto.pc.in libXp-1.0.4-printproto/printproto.pc.in
+--- libXp-1.0.4/printproto.pc.in 1970-01-01 00:00:00.000000000 +0000
++++ libXp-1.0.4-printproto/printproto.pc.in 2022-11-17 17:08:24.769225832
+0000
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
@@ -1393,9 +1395,10 @@
+Version: @PACKAGE_VERSION@
+Requires: xau
+Cflags: -I${includedir}
---- libXp-1.0.4/src/Makefile.am 2022-09-12 22:50:17.000000000 +0200
-+++ libXp-1.0.4/src/Makefile.am.new 2022-09-13 17:31:11.267238501 +0200
-@@ -24,7 +24,7 @@
+diff -Nurp libXp-1.0.4/src/Makefile.am libXp-1.0.4-printproto/src/Makefile.am
+--- libXp-1.0.4/src/Makefile.am 2022-09-12 20:50:17.000000000 +0000
++++ libXp-1.0.4-printproto/src/Makefile.am 2022-11-17 17:08:24.769225832
+0000
+@@ -24,7 +24,7 @@ libXp_la_LIBADD = $(XPRINT_LIBS)
AM_CFLAGS = $(CWARNFLAGS) $(XPRINT_CFLAGS) $(MALLOC_ZERO_CFLAGS)
Modified: keys/pgp/4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E.asc
===================================================================
(Binary files differ)
