diff --git a/t1lib/.SRCINFO b/t1lib/.SRCINFO new file mode 100644 index 0000000000..e9cac6d993 --- /dev/null +++ b/t1lib/.SRCINFO @@ -0,0 +1,34 @@ +pkgbase = t1lib + pkgdesc = Library for generating character- and string-glyphs from Adobe Type 1 fonts + pkgver = 5.1.2 + pkgrel = 8.1 + url = https://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html + arch = x86_64 + arch = powerpc64le + arch = powerpc64 + arch = powerpc + arch = riscv64 + license = GPL + depends = libxaw + source = https://www.ibiblio.org/pub/Linux/libs/graphics/t1lib-5.1.2.tar.gz + source = lib-cleanup.diff + source = format-security.diff + source = CVE-2011-0764.diff + source = CVE-2011-1552_1553_1554.patch + source = CVE-2010-2642.patch + source = t1lib-5.1.2-c99-configure.patch + source = t1lib-5.1.2-c99.patch + source = t1lib-do-not-install-t1lib_doc-r1.patch + source = t1lib-5.1.1-parallel.patch + sha256sums = 821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59 + sha256sums = 5b161f4e0f4ad297ad8eea70ea99620f5db6f7e487bbd63a819b6a9958540961 + sha256sums = 89b0aa7ca57fd8e9753336033c1d3e3e58c6c79e943144430e8af9a4626fdd25 + sha256sums = a763650bdcffd33a61cd2cecef766b8d6baa9999561463ae9dfdc20d55caef04 + sha256sums = 4bc34e092fdec37e06b38b5b7a3b02194732dbe6a39edbd174b36c2db1f113ac + sha256sums = dcd9064f368e0fc1f3ede0a45e61b364f6b5d3607dccae78ac07e74ca315a27d + sha256sums = a62afa9abd631d9f834175d53eef0c07b12a13e82f580c94615e83a9c8ee59b0 + sha256sums = a7c32eba21f10a8a46a8b7b94e6f25ac6ed76ce56afadaaf58b6eb06b17e2087 + sha256sums = 20e4af9c6b3e74eda4d6905d0c7556ebe03bd5c32211b33f7fedc77e3fb40498 + sha256sums = ce21f6c0a24e7d59de2d41a517a0c5410b35e42d9677c494fc70701a3c3e8a24 + +pkgname = t1lib diff --git a/t1lib/PKGBUILD b/t1lib/PKGBUILD index f6a2a5c513..b6fd723cc6 100644 --- a/t1lib/PKGBUILD +++ b/t1lib/PKGBUILD @@ -4,7 +4,7 @@ pkgname=t1lib pkgver=5.1.2 -pkgrel=8 +pkgrel=8.1 pkgdesc="Library for generating character- and string-glyphs from Adobe Type 1 fonts" arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) url="https://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html" @@ -15,13 +15,21 @@ source=(https://www.ibiblio.org/pub/Linux/libs/graphics/${pkgname}-${pkgver}.tar format-security.diff CVE-2011-0764.diff CVE-2011-1552_1553_1554.patch - CVE-2010-2642.patch) + CVE-2010-2642.patch + t1lib-5.1.2-c99-configure.patch + t1lib-5.1.2-c99.patch + t1lib-do-not-install-t1lib_doc-r1.patch + t1lib-5.1.1-parallel.patch) sha256sums=('821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59' '5b161f4e0f4ad297ad8eea70ea99620f5db6f7e487bbd63a819b6a9958540961' '89b0aa7ca57fd8e9753336033c1d3e3e58c6c79e943144430e8af9a4626fdd25' 'a763650bdcffd33a61cd2cecef766b8d6baa9999561463ae9dfdc20d55caef04' '4bc34e092fdec37e06b38b5b7a3b02194732dbe6a39edbd174b36c2db1f113ac' - 'dcd9064f368e0fc1f3ede0a45e61b364f6b5d3607dccae78ac07e74ca315a27d') + 'dcd9064f368e0fc1f3ede0a45e61b364f6b5d3607dccae78ac07e74ca315a27d' + 'a62afa9abd631d9f834175d53eef0c07b12a13e82f580c94615e83a9c8ee59b0' + 'a7c32eba21f10a8a46a8b7b94e6f25ac6ed76ce56afadaaf58b6eb06b17e2087' + '20e4af9c6b3e74eda4d6905d0c7556ebe03bd5c32211b33f7fedc77e3fb40498' + 'ce21f6c0a24e7d59de2d41a517a0c5410b35e42d9677c494fc70701a3c3e8a24') prepare() { cd $pkgname-$pkgver @@ -30,6 +38,12 @@ prepare() { patch -Np1 -i ../CVE-2011-0764.diff patch -Np1 -i ../CVE-2011-1552_1553_1554.patch patch -Np1 -i ../CVE-2010-2642.patch + patch -Np1 -i ../t1lib-5.1.2-c99-configure.patch + patch -Np1 -i ../t1lib-5.1.2-c99.patch + patch -Np1 -i ../t1lib-do-not-install-t1lib_doc-r1.patch + patch -Np1 -i ../t1lib-5.1.1-parallel.patch + + aclocal } build() { diff --git a/t1lib/t1lib-5.1.1-parallel.patch b/t1lib/t1lib-5.1.1-parallel.patch new file mode 100644 index 0000000000..d829c9ff17 --- /dev/null +++ b/t1lib/t1lib-5.1.1-parallel.patch @@ -0,0 +1,12 @@ +diff -Naur t1lib-5.1.1-orig/lib/Makefile.in t1lib-5.1.1/lib/Makefile.in +--- t1lib-5.1.1-orig/lib/Makefile.in 2006-11-05 17:06:05.000000000 -0600 ++++ t1lib-5.1.1/lib/Makefile.in 2007-10-04 21:21:20.000000000 -0600 +@@ -133,7 +133,7 @@ + cp t1lib/t1lib.h . + + +-libt1x.la: $(T1LIBX_OBJS) ++libt1x.la: $(T1LIBX_OBJS) libt1.la + $(LIBTOOL) --mode=link \ + $(CC) $(LDFLAGS) -o $@ $(T1LIBX_OBJS) \ + -version-info @T1LIB_LT_CURRENT@:@T1LIB_LT_REVISION@:@T1LIB_LT_AGE@ \ diff --git a/t1lib/t1lib-5.1.2-c99-configure.patch b/t1lib/t1lib-5.1.2-c99-configure.patch new file mode 100644 index 0000000000..62a4df22a5 --- /dev/null +++ b/t1lib/t1lib-5.1.2-c99-configure.patch @@ -0,0 +1,10 @@ +--- a/configure.in ++++ b/configure.in +@@ -144,6 +144,7 @@ dnl We don'use + CFLAGS="$CFLAGS" + AC_CACHE_CHECK( "for gcc strength-reduce bug", ac_cv_c_gcc_strength_bug, + AC_TRY_RUN([ ++#include + int main(void) { + static int Array[[3]]; + unsigned int B = 3; diff --git a/t1lib/t1lib-5.1.2-c99.patch b/t1lib/t1lib-5.1.2-c99.patch new file mode 100644 index 0000000000..d1d3301fcc --- /dev/null +++ b/t1lib/t1lib-5.1.2-c99.patch @@ -0,0 +1,15 @@ +https://src.fedoraproject.org/rpms/t1lib/blob/rawhide/f/t1lib-c99.patch + +Add missing parameter types for improved C99 compatibility: implicit +ints are not part of C99. + +--- a/lib/type1/regions.c ++++ b/lib/type1/regions.c +@@ -604,6 +604,7 @@ + register struct region *R; /* region in which we are changing direction */ + fractpel x,y; /* current beginning x,y */ + fractpel dy; /* direction and magnitude of change in y */ ++ int x2, y2; + { + register fractpel ymin,ymax; /* minimum and maximum Y since last call */ + register fractpel x_at_ymin,x_at_ymax; /* their respective X's */ diff --git a/t1lib/t1lib-do-not-install-t1lib_doc-r1.patch b/t1lib/t1lib-do-not-install-t1lib_doc-r1.patch new file mode 100644 index 0000000000..c4927730d0 --- /dev/null +++ b/t1lib/t1lib-do-not-install-t1lib_doc-r1.patch @@ -0,0 +1,19 @@ +--- old/doc/Makefile.in.orig 2008-05-04 17:55:52.000000000 +0400 ++++ new/doc/Makefile.in 2008-05-04 17:55:58.000000000 +0400 +@@ -89,16 +89,6 @@ + + + install: dummy +- if (test -f t1lib_doc.ps) \ +- then \ +- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ +- $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ +- fi; +- if (test -f t1lib_doc.pdf) \ +- then \ +- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ +- $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ +- fi; + + + uninstall: dummy