From 04fc7f10cec12efb1240344a0090b539e24ad0f3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 15 Apr 2023 11:48:08 +0100 Subject: gentoo auto-resync : 15:04:2023 - 11:48:08 --- app-text/Manifest.gz | Bin 48584 -> 48580 bytes app-text/ttf2pt1/Manifest | 3 +- app-text/ttf2pt1/files/ttf2pt1-3.4.4-clang16.patch | 61 +++++++++++++++++++++ app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild | 51 ----------------- app-text/ttf2pt1/ttf2pt1-3.4.4-r2.ebuild | 52 ++++++++++++++++++ app-text/zathura-cb/Manifest | 2 +- app-text/zathura-cb/zathura-cb-0.1.10.ebuild | 2 +- 7 files changed, 117 insertions(+), 54 deletions(-) create mode 100644 app-text/ttf2pt1/files/ttf2pt1-3.4.4-clang16.patch delete mode 100644 app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild create mode 100644 app-text/ttf2pt1/ttf2pt1-3.4.4-r2.ebuild (limited to 'app-text') diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz index 60e732d8e767..9f6d32df5824 100644 Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ diff --git a/app-text/ttf2pt1/Manifest b/app-text/ttf2pt1/Manifest index 2b4b847b0fc4..7e8dfa1322f4 100644 --- a/app-text/ttf2pt1/Manifest +++ b/app-text/ttf2pt1/Manifest @@ -1,7 +1,8 @@ AUX ttf2pt1-3.4.0-man-pages.diff 926 BLAKE2B 9fd3872f9c28d03ba2412fe27ed65277dfd34b3923d1e6fb2af9cac3c990446048e64ea5583386d8c34184d7c61507e2c0341c0a6f3bda56455204e9b51d4ccd SHA512 629b307fc210fff774e4675f6a819fff2f8336c6cf3f6ce1ee6c32e05503c86f80d03e978bbeabd862091b6bbcec80207c2e149d1b2a2b34a9b54c30a338240c AUX ttf2pt1-3.4.4-LDFLAGS.patch 870 BLAKE2B 74ab6326c92b2f9639765e6d1849f253357a15ad25d4234cc516021fc78168b5fb12a76e68c48b4755723a12300bc2f1d5031318e02bfc3c2057397699b67c5d SHA512 63e16aa71f2ae1fb1de0d97e1d76e7f075a8035cb77dbac8a55affc3784d52de350ec764113b0967e7792a45bfa9f338112022223ab50eedaef793f7b8add4dc AUX ttf2pt1-3.4.4-Makefile.patch 2748 BLAKE2B 131e2bfb4898bce7d98dda58255627b804d1386799af5aefd33efee9475a959954533cbae5374b34d945b8f3da6e3918463f4c1b4a9a9f083accb53344b95e91 SHA512 97d14aee0dc7196659aa2db9ece18fe8ebb6e5fc75e4c064dd1942702325ecad70b9ea66bd241932a0479cd97435953f5c5380de17177916e2d15389830a706e +AUX ttf2pt1-3.4.4-clang16.patch 1034 BLAKE2B f6656668ca76cc2a818ca870c6948757fd0e86b0c4eee0ff90177e57c8cdbd101758719add2a0db5bbb0568d6b70c9adc203f53a08d6aeb44da0677c84d574fe SHA512 43ed0226e844a23c6f0ff342313eefd1041bb397c27a68f1e41c7adf0ee9617f7c3314d9f662b798d7a999c06c26d9a5a846cb6fc4c53d9ee6a4e1eee4c5c5b2 AUX ttf2pt1-3.4.4-freetype.patch 223 BLAKE2B 4f2e5a1a505329d505c705fce85d2a3729737d7c90cdf24ed318cc745edcf3279b204be0f395eadb3e95a66a89316c9d84a850510b95abc33bb50451a54b0a62 SHA512 4f5368c52fb4139995fad7cf881c2f3f722269818d045dac132856fc765e7c6e0dd21d6a74ffdbb93bdfe66924824f3bd8ef3779a020b1f22edec9e4d90b5a17 DIST ttf2pt1-3.4.4.tgz 230547 BLAKE2B 58904765afad396692263d9f50017d299828ae847a254bf6a580a0a259dcd03da3d9a97fe370a53a936e70188dab3c96cf0f0ab9069474eef92b9fd31862e455 SHA512 ff2b41b0d54c2feb8565c4bcf9fbc2ce799aa6228815c2787e26127f6c0ca380114b3ab7a12fa50a52279a3452bcb91dbad5c661e83078f25036f69a4d1cf014 -EBUILD ttf2pt1-3.4.4-r1.ebuild 1297 BLAKE2B 509af7610cb0ad513623af2dad822a318016b72a38b0d55a7412d21a2ba68da71a02c6518373992892c94038e462583ac7494bacf8ee2747583e62d5d28dfb37 SHA512 edeaeef8c6907c773fa9fb0b2d994203327323c73fe814a5a2031320eb71ad50425b0aece193c79272cf1b140438ddd0a666499d720721157cf7b1a0aa07757c +EBUILD ttf2pt1-3.4.4-r2.ebuild 1331 BLAKE2B 7cedf7d93728efe59f6c4ae0f685a2a81f6d35efe7c2ae4260d96fbde414061f2ed250d1d4e9bc12b495ea8e68db165b46d9999b5a9aa8fbac72fc7c1fbd75dc SHA512 f20119d61ab6f675695d760a5dd818ec807dc5fb71cfde30ab4ce8bd58d5d2c9753449c0cf843906f6dead1443c316f7b74a82b6ec981fe16d2d14fdf5af4c5f MISC metadata.xml 316 BLAKE2B 4bcf9738a3ef368bec08524701269bc4d3e33cb825347a5878367b0b100e78973e62fcc6be259f12937b18b3cd3be517dceead7985b44d42d68b248d6de64aa3 SHA512 6f27eed6e85bfda4b64b86e7cb0e3add2181da57dddb353dc6ff4e639c5b0c5af4c17b4536e8f778f23658cf11c5863333af6aff1148312fb1f9db8f0dea02aa diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-clang16.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-clang16.patch new file mode 100644 index 000000000000..cb54195872e9 --- /dev/null +++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-clang16.patch @@ -0,0 +1,61 @@ +https://sourceforge.net/p/ttf2pt1/mailman/message/37804025/ +https://bugs.gentoo.org/881321 + +Avoid implicit ints and implicit function declarations, and build +failures with future compilers which do not support this pre-C99 +features by default. + +--- a/other/bmpfont.h ++++ b/other/bmpfont.h +@@ -2,7 +2,9 @@ + * see COPYRIGHT + */ + ++#include + ++void + fchkneg(file, line, rc, cmd) + char *file; + int line; +@@ -17,6 +19,7 @@ fchkneg(file, line, rc, cmd) + } + } + ++void + fchknull(file, line, rc, cmd) + char *file; + int line; +--- a/other/cmpf.c ++++ b/other/cmpf.c +@@ -14,7 +14,7 @@ + + #include "bmpfont.h" + +- ++int + main(ac, av) + int ac; + char **av; +--- a/other/dmpf.c ++++ b/other/dmpf.c +@@ -14,7 +14,7 @@ + + #include "bmpfont.h" + +- ++int + main(ac, av) + int ac; + char **av; +--- a/t1asm.c ++++ b/t1asm.c +@@ -59,6 +59,8 @@ static char portnotice[] = + # define WINDOWS_FUNCTIONS + # include "windows.h" + # endif ++#else ++# include + #endif + + /* int32 must be at least 32-bit and uint16 must be at least 16-bit */ + diff --git a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild deleted file mode 100644 index fcc8361c32a0..000000000000 --- a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="True Type Font to Postscript Type 1 Converter" -HOMEPAGE="http://ttf2pt1.sourceforge.net/" -SRC_URI="mirror://sourceforge/ttf2pt1/${P}.tgz" - -LICENSE="ttf2pt1" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" - -DEPEND=">=media-libs/freetype-2.5.1:2" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-Makefile.patch - "${FILESDIR}"/${P}-LDFLAGS.patch - "${FILESDIR}"/${PN}-3.4.0-man-pages.diff - "${FILESDIR}"/${P}-freetype.patch -) - -src_prepare() { - default - - sed -i \ - -e "/^CC=/ { s:gcc:$(tc-getCC): }" \ - -e "/^CFLAGS_SYS=/ { s:-O.*$:${CFLAGS}: }" \ - -e "/^LIBS_FT=/ { s:-L/usr/lib:-L${ESYSROOT}/usr/$(get_libdir): }" \ - -e "s:-I/usr/include/freetype2 -I/usr/include:$($(tc-getPKG_CONFIG) --cflags freetype2):" \ - -e "s:-L/usr/lib -lfreetype:$($(tc-getPKG_CONFIG) --libs freetype2):" \ - -e "/^LIBXDIR =/ { s:libexec:$(get_libdir): }" \ - -e "/chown/d" \ - -e "/chgrp/d" \ - -e "/chmod/d" \ - Makefile || die -} - -src_install() { - emake INSTDIR="${ED}"/usr install - dodir /usr/share/doc/${PF} - - pushd "${ED}"/usr/share/ttf2pt1 > /dev/null || die - rm -r app other || die - mv [A-Z]* ../doc/${PF} || die - popd > /dev/null || die -} diff --git a/app-text/ttf2pt1/ttf2pt1-3.4.4-r2.ebuild b/app-text/ttf2pt1/ttf2pt1-3.4.4-r2.ebuild new file mode 100644 index 000000000000..f108cacf8cc0 --- /dev/null +++ b/app-text/ttf2pt1/ttf2pt1-3.4.4-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="True Type Font to Postscript Type 1 Converter" +HOMEPAGE="http://ttf2pt1.sourceforge.net/" +SRC_URI="mirror://sourceforge/ttf2pt1/${P}.tgz" + +LICENSE="ttf2pt1" +SLOT="0" +KEYWORDS="amd64 ppc sparc x86" + +DEPEND=">=media-libs/freetype-2.5.1:2" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-Makefile.patch + "${FILESDIR}"/${P}-LDFLAGS.patch + "${FILESDIR}"/${PN}-3.4.0-man-pages.diff + "${FILESDIR}"/${P}-freetype.patch + "${FILESDIR}"/${P}-clang16.patch +) + +src_prepare() { + default + + sed -i \ + -e "/^CC=/ { s:gcc:$(tc-getCC): }" \ + -e "/^CFLAGS_SYS=/ { s:-O.*$:${CFLAGS}: }" \ + -e "/^LIBS_FT=/ { s:-L/usr/lib:-L${ESYSROOT}/usr/$(get_libdir): }" \ + -e "s:-I/usr/include/freetype2 -I/usr/include:$($(tc-getPKG_CONFIG) --cflags freetype2):" \ + -e "s:-L/usr/lib -lfreetype:$($(tc-getPKG_CONFIG) --libs freetype2):" \ + -e "/^LIBXDIR =/ { s:libexec:$(get_libdir): }" \ + -e "/chown/d" \ + -e "/chgrp/d" \ + -e "/chmod/d" \ + Makefile || die +} + +src_install() { + emake INSTDIR="${ED}"/usr install + dodir /usr/share/doc/${PF} + + pushd "${ED}"/usr/share/ttf2pt1 > /dev/null || die + rm -r app other || die + mv [A-Z]* ../doc/${PF} || die + popd > /dev/null || die +} diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest index d4cd2aa60686..15f1a78273ea 100644 --- a/app-text/zathura-cb/Manifest +++ b/app-text/zathura-cb/Manifest @@ -1,6 +1,6 @@ DIST zathura-cb-0.1.10.tar.xz 6300 BLAKE2B d541fb78f5ee52a22e58bb885103560bd544a9725cfe210f6b343e97429163a90dd0e9533e6c807134386e6f347bdd17cfc506ffe16642819eae4d1fd27c3b6e SHA512 b85894d052fda45933582299e8c3406413bcb47ed451d81f5906d7bfef94b169c59a57db8b37273c838381ffc7ba55205d714d2e2ec3b597371578a77e131029 DIST zathura-cb-0.1.9.tar.xz 5848 BLAKE2B 665efbc8dc83585dc3a55a31d92b8ebdb92eba955aa8f5f74b7e055c096046ce4b1f02e2d2b06e73fe3351c1c113bfae298eade9a6ee34beec68c4d39b335da5 SHA512 5c45f112a077af53caec6fbdfc46ffdf20e9f923d97b69395e327cf05e131b3cd2db617d5650bc0cace0935719d8e68645230d7de9ddc1a8d4fbc01ede0f72cc -EBUILD zathura-cb-0.1.10.ebuild 754 BLAKE2B 9ec95c5954bfccafdbcd282ef8532734b5c7617a079f5fb857e7ec6c2e6dd60c9fa94e4ebb13be203362d0113d52c1e5ae36644853b8a0eb63351b10d0263d70 SHA512 c3efb1e47eee5d760a14a229c781b5c149249129cdaae5da9fda28919c509f7cebf7995abfd76081ae632a275d080d0e8d740106421a83de7ce491133b6a0a5a +EBUILD zathura-cb-0.1.10.ebuild 751 BLAKE2B 1a75b8ea62d2a133dc55649f24ba4f3e7b28bd9567dd6bcbdc284ec69281ec8dec2c13f7e7299481514c28bd7895cf60580cc50f61f7f586f8a779838dcc3f24 SHA512 e149f16a06605d328fe1bf072fb47c571a55d280da1877128c80a88ede1e203c1a168581c462189963ac1af2a0a3040f4aa4a6022b45ac96b62842f3b1e317ce EBUILD zathura-cb-0.1.9.ebuild 890 BLAKE2B deb04a042f3a225e5dd84d88268b71eb3ea6d379371dfcec2a710613112d93db5008f1af033a5c921cf39b90c3eab0cad618507355fbe8d87e9c6500feb0d7ef SHA512 c05e31dadcdbf15021e44cd2d6cf03321679e9f91f0a74940d5b98ca5e0529201ab2004f26f2a7a6c0b1ea13a821a5f97b4dbc165437261ad5996d360a86da14 EBUILD zathura-cb-9999.ebuild 754 BLAKE2B 9ec95c5954bfccafdbcd282ef8532734b5c7617a079f5fb857e7ec6c2e6dd60c9fa94e4ebb13be203362d0113d52c1e5ae36644853b8a0eb63351b10d0263d70 SHA512 c3efb1e47eee5d760a14a229c781b5c149249129cdaae5da9fda28919c509f7cebf7995abfd76081ae632a275d080d0e8d740106421a83de7ce491133b6a0a5a MISC metadata.xml 778 BLAKE2B 79a2c9cd2014b9e945d25384ef6faf7fa5a6685a15dc08874bb454add7cb515d6e0efc13ddb801698151c97f8fde3f8ff787b7230871ef3ffc4a138facccb666 SHA512 5461b530d3b11ad32cd25234bcbe5a352d45b7856c75949f8e3fd16981ee5dfd194eaed09e0af7e0d97ae6f0164bbdc7b1582f395aa0f95ec08012a202ab9ac0 diff --git a/app-text/zathura-cb/zathura-cb-0.1.10.ebuild b/app-text/zathura-cb/zathura-cb-0.1.10.ebuild index fa6f6f40d74b..c38af1169e7e 100644 --- a/app-text/zathura-cb/zathura-cb-0.1.10.ebuild +++ b/app-text/zathura-cb/zathura-cb-0.1.10.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git" EGIT_BRANCH="develop" else - KEYWORDS="~amd64 ~arm ~riscv ~x86" + KEYWORDS="amd64 arm ~riscv x86" SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz" fi -- cgit v1.2.3