diff options
Diffstat (limited to 'media-libs/t1lib')
| -rw-r--r-- | media-libs/t1lib/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/t1lib/files/t1lib-5.1.2-c99-configure.patch | 10 | ||||
| -rw-r--r-- | media-libs/t1lib/files/t1lib-5.1.2-c99.patch | 15 | ||||
| -rw-r--r-- | media-libs/t1lib/t1lib-5.1.2-r5.ebuild (renamed from media-libs/t1lib/t1lib-5.1.2-r4.ebuild) | 23 |
4 files changed, 45 insertions, 7 deletions
diff --git a/media-libs/t1lib/Manifest b/media-libs/t1lib/Manifest index 0eecbfaeac71..d61bd8030d86 100644 --- a/media-libs/t1lib/Manifest +++ b/media-libs/t1lib/Manifest @@ -2,9 +2,11 @@ AUX t1lib-5.1.1-parallel.patch 472 BLAKE2B 2dbf441a8361424467f3a866b412e89ade2fe AUX t1lib-5.1.2-CVE-2010-2642_2011-0433_2011-5244.patch 1527 BLAKE2B d8531359459e02ae91c63a524e93c342f167db8dbaa0cae3f05d72ca79b8d0ce8d932e22c00a8a7b604a203faf44d2516701479bb53c6c37cddcc1b3ca85e19b SHA512 2b61e471b3672731dcc7607ea3087899a0ab9ed663d21ac3db44602f334384d9c625468cfaa4a7bd29115f689aa0eae68f7e88cd663e91cfe68cb07996a3fcaf AUX t1lib-5.1.2-CVE-2011-0764.patch 1224 BLAKE2B fcdf9669e28210d465143ea4a6fbe3f13e6f5fda65d20d8bb4158212a38411a653ebacaddac8348bb3d5416960f793f0cc7e1619dc4faa16d32f0837c689f008 SHA512 a830f39c59af69f9b7d6646fab28108121832e93ec5fcbc323d665ac6457979b333e3797065f3e41f101e75ef82635e4c85c0abd2fd480effda95a0ce6b84dc4 AUX t1lib-5.1.2-CVE-2011-1552_1553_1554.patch 5085 BLAKE2B aa10c8ceaffe6d827c38d3e6a98d8478ef6e6753150e556142eb07ea44275307e5974416c81fc02ee4d24906e19ad6813a76c4c93a0dabaae7c04a5e845c771f SHA512 c7438ca5bc3778a21e2f522870b4af43fb69b04ebe4b0912addebc070fd5bde075f96bb4f6584072aa0a2da2e9d66f56bfa625424f409392eda1fb027298c198 +AUX t1lib-5.1.2-c99-configure.patch 289 BLAKE2B 608424295ffc7be3753bc1a9399fbf152fb9eafb9bf901d0a387afec9b50e87ac3a7677739774af4cf90e788773048dcb6efb9764dc30fa926f3608d2eba19d0 SHA512 6610e86ab53851ec7ebbdecdf4affdc85f23b7bab971e29a1c9ec040651875030faeaffe5419a29b7fbe3d9dd78bfe4494b1c42229d6fd281c0a98597a111939 +AUX t1lib-5.1.2-c99.patch 673 BLAKE2B ef8805e261f44ca2dd68bf5776e3e8f8ffaac7413f7d6f81f03efdc3231c97621ec2de208ac05690ef477e995df6a0d72c1572f2869e2e2d7d8c4f0f222dfcfb SHA512 663b2835c9f92b26bc17324b78448b307d87d5bd89b43c363d5f3a36f8123ddee548d9368a9b21e687331ecbe59ba6167becf740bbb95363465eb61f9b7eacea AUX t1lib-5.1.2-format-security.patch 1357 BLAKE2B ba340f40284dd24b5e49ef9aca1a8fa3773d547e382cf5abd5e600ee696e615d050f69d1b974a7e442f70cc3cf80fedce6d55c6e40d12170a60376a3ebdb0a47 SHA512 7c7ecc3851c675780b15b185db1b6c0b412fc1eef7505c822b75163ebdf14762ba999486db3238adbefe1571b762e9014669a585a886e537068b8a38bdb85ec1 AUX t1lib-do-not-install-t1lib_doc-r1.patch 522 BLAKE2B 37989b16132d84d67b5692fc7c15654f28156fb3162ba4c545ab01e238e95c60e422aa1b86d34d2c160600f0f55728ed637094a2b8fc951b7d338594510c104a SHA512 d77beebb581739f5646137d5c1aa5cf3d9906a010f07e3822040812822782db7712d4d18d6235dc22da6e4531daf81fa891db4c1047ad95ee702da88cb01688b DIST t1lib-5.1.2.tar.gz 1872534 BLAKE2B b6f2c17b8009feef3c0ab3a8314e89e421d90349c4465885c3478a9493b30ada9ad0a2f58e70ba863d91e305fbb52f90e6a42b492a0239e5245ff9132c2ba92d SHA512 9f424b19c6f35cc4f194ff7351a4c2352216462c7d1b1d9650ad3a05cf48c6e90c89ccbcda5ecc47a4169a39a850cf84a1fcbf88b3b15614860c27364b631ae3 EBUILD t1lib-5.1.2-r3.ebuild 1807 BLAKE2B 9fea0c6d8596e8aa51d9cbe48349f4159317436764741083a1199d993c05345e01177a3e19e7fe89e49bc840ccdbbec49ea76bc2662f0991f77d683ef9b597ab SHA512 c8fa6c8ff3b8e5b4680b66a6803c2e5611c1af526e80a69e4658da6f667477ad7a4ddf22d1cca222799b66c1726999c8e3d2b48c1cc6e31da60f5273c1d5f1b2 -EBUILD t1lib-5.1.2-r4.ebuild 1810 BLAKE2B 097f8937aabb25e025d00b5e2f42bdf492160b539dca74e46bd2377f615229706cbe076aa5a833f92e9228ae0b90943d19653f167f1340d51a8bc994e6ae74e7 SHA512 577a327d014c2e9f86a133d06c6c07f7a08d130a2c1c4f845dee054b56caeb74f24c0e47ac06fc0580e89acb02bbcb085b4bd9e91373cebb99fd39e738876f64 +EBUILD t1lib-5.1.2-r5.ebuild 1955 BLAKE2B 31d98d9662725909509a755370525ad1054fd446276bd57c7241ddf7746ff3f8fddc5e710e5b1ee6aef0155670df10673b5b0bfa0a0c5472ad9b79290edd4363 SHA512 d811167c4e12c802113cb754e096d3f1bc7643cdc391873d7fcc21cdab719776e96f8ee99051a0dc85e5ea6c0237b26a60d7111c3a388868ae254448dbf66643 MISC metadata.xml 235 BLAKE2B f469fc8727ef3de05c8a1d43d640dd5bc6aee0158f82ba12c1024613b9c4c0a681f91528205ecd30d47cb9aca08ab788f7f595168bf0ceba25d8a2baf34b4cba SHA512 3229f3ecdc21ea952f5d40215f5a75129d165b9e34f80f7194842fe6362ed4f585470c7f6e9751825313345cade1f153d122d59f67016c26b5d21eeef64dfd22 diff --git a/media-libs/t1lib/files/t1lib-5.1.2-c99-configure.patch b/media-libs/t1lib/files/t1lib-5.1.2-c99-configure.patch new file mode 100644 index 000000000000..62a4df22a537 --- /dev/null +++ b/media-libs/t1lib/files/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 <stdlib.h> + int main(void) { + static int Array[[3]]; + unsigned int B = 3; diff --git a/media-libs/t1lib/files/t1lib-5.1.2-c99.patch b/media-libs/t1lib/files/t1lib-5.1.2-c99.patch new file mode 100644 index 000000000000..d1d3301fcc62 --- /dev/null +++ b/media-libs/t1lib/files/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/media-libs/t1lib/t1lib-5.1.2-r4.ebuild b/media-libs/t1lib/t1lib-5.1.2-r5.ebuild index c9f251b91a39..2ccee89b20ac 100644 --- a/media-libs/t1lib/t1lib-5.1.2-r4.ebuild +++ b/media-libs/t1lib/t1lib-5.1.2-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic libtool toolchain-funcs +inherit autotools flag-o-matic libtool toolchain-funcs DESCRIPTION="Type 1 Font Rasterizer Library for UNIX/X11" HOMEPAGE="https://www.t1lib.org/" @@ -14,14 +14,18 @@ SLOT="5" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="X doc static-libs" -RDEPEND="X? ( +RDEPEND=" + X? ( x11-libs/libXaw x11-libs/libX11 x11-libs/libXt - )" -DEPEND="${RDEPEND} + ) +" +DEPEND=" + ${RDEPEND} doc? ( virtual/latex-base ) - X? ( x11-base/xorg-proto )" + X? ( x11-base/xorg-proto ) +" PATCHES=( "${FILESDIR}"/${PN}-5.1.1-parallel.patch @@ -30,6 +34,8 @@ PATCHES=( "${FILESDIR}"/${PN}-5.1.2-CVE-2010-2642_2011-0433_2011-5244.patch "${FILESDIR}"/${PN}-5.1.2-CVE-2011-0764.patch "${FILESDIR}"/${PN}-5.1.2-CVE-2011-1552_1553_1554.patch + "${FILESDIR}"/${PN}-5.1.2-c99.patch + "${FILESDIR}"/${PN}-5.1.2-c99-configure.patch ) src_prepare() { @@ -37,11 +43,16 @@ src_prepare() { sed -i -e "s:dvips:#dvips:" "${S}"/doc/Makefile.in || die sed -i -e "s:\./\(t1lib\.config\):/etc/t1lib/\1:" "${S}"/xglyph/xglyph.c || die - # Needed for sane .so versionning on fbsd. Please don't drop. + + eautoconf + # Needed for sane .so versioning on fbsd. Please don't drop. elibtoolize } src_configure() { + # lto-type-mismatch + filter-lto + econf \ --datadir="${EPREFIX}/etc" \ $(use_enable static-libs static) \ |