From 21dbcce41990b13f301240313be05c8d013a9258 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Jan 2023 08:51:03 +0000 Subject: gentoo auto-resync : 28:01:2023 - 08:51:03 --- app-text/Manifest.gz | Bin 49084 -> 49072 bytes app-text/msort/Manifest | 3 +- .../msort/files/msort-8.53-configure-clang16.patch | 18 ++++++++ app-text/msort/msort-8.53-r1.ebuild | 46 -------------------- app-text/msort/msort-8.53-r2.ebuild | 47 +++++++++++++++++++++ app-text/poppler/Manifest | 4 +- app-text/poppler/poppler-23.01.0.ebuild | 4 +- app-text/poppler/poppler-9999.ebuild | 4 +- 8 files changed, 73 insertions(+), 53 deletions(-) create mode 100644 app-text/msort/files/msort-8.53-configure-clang16.patch delete mode 100644 app-text/msort/msort-8.53-r1.ebuild create mode 100644 app-text/msort/msort-8.53-r2.ebuild (limited to 'app-text') diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz index 5e8d888e91b2..b29e1ffd0677 100644 Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ diff --git a/app-text/msort/Manifest b/app-text/msort/Manifest index 64bc1e9f0d64..9ae60c68a6ab 100644 --- a/app-text/msort/Manifest +++ b/app-text/msort/Manifest @@ -1,7 +1,8 @@ +AUX msort-8.53-configure-clang16.patch 738 BLAKE2B acf265459c2d943f955034eb675fe9661d5edc4fec07693db886a8b02af667133a6e3c501bced2b3a8cc7875f85d64cb7cce0c15cd1d7876568e0f7510daed9e SHA512 0ec6c8f499c7357ea3566fea5fe2561f315dbb844c5b8d9b5b921949e9782c68b27da8beb011da14bbb34b511f629d4d920081180ed2c8f113b12b1d88306323 AUX msort-8.53-fix-icu-build.patch 239 BLAKE2B ff53316fd6b1f531b432655d1fac1c3b24c114ea35ae63f4f4bb65f4598db2039dae80103bf942ba2ecd269ae3fb8ea9735bee71907876a6494181db052941ee SHA512 86f7c131166a568dd3b9534662c02681396686d9642d6cbdb6b4128d0c6c8eeec9660c8e5f9c8156e78e096a668ec67eba52e9c368455f40002e18de4dddf269 AUX msort-8.53-fix-missing-limits-header.patch 559 BLAKE2B cb158b619540aa9679d845c1c94986f3bbe9f75aab0069d7a12133043ba547d13d26727251cf2524e4e285d0f1207ea43353972eea782198dda34456b984707a SHA512 9e779627e2f92955dc66b03fb64fce767e2cbf2dcdd8a42c9e10f06b512625be10434a47c26a9b7c46e1a15c226d4f66eeda21194f9a0d3eb6deb801b83633eb AUX msort-8.53-fix-segfault-on-certain-input.patch 384 BLAKE2B bec03b23365bfe010b04a8fbb24c2043f5436dc866c2dc5b76de4c2639103ecf75bd12ec6d63fa9e2922ac79c8e97a6939c74fe5f37d026af8325c1b161b0f42 SHA512 6d7e1ddf68240f27055a43cddf9e99594ca2ff20c0d666b8e3e09f74c319b38432d15c0b608f76aa5732b6145f1d3120f618cca398c8a68bef4a394949df55dc AUX msort-8.53-respect-users-cflags.patch 238 BLAKE2B 50efa37a87f42112524bd8e281c634b0e2527dc4d63597433616a9f220a3cf935138a32eab9a11f5acedf37bc1c6b25efe1e862b81c0b3ba930c6545fce05cff SHA512 c157bf5babc42db689cf9e0b9ee8c9f372c065570b2728833036658215ae508565db2ec4f00688766ce5a18ea3589747c7cce7172232fe0493a8037689f8152e DIST msort-8.53.tar.bz2 440307 BLAKE2B 024fa62c9424dd7f994fd9aabdb2414116ba78c2f6bbbfd88c11cde4ed1688260d7bb7f7a18dd36822f4725817df93d218c4382e8b15232fc6d3583098d44db0 SHA512 9afba189d8b703cd6668065ace86733b52a39f6783272849b3582308da5a33db8ae6747501846523ba3671c9fb38a7584fe0db2462cff446b15d79200055a573 -EBUILD msort-8.53-r1.ebuild 977 BLAKE2B dd7a2d2220d626de9e1319769465e66e51e3007766494fc728732476ce5af14d48bcaa1a4503e56709ed504fb0b76d3eb8edd745e6e124f028ee400c8118d3f4 SHA512 50910b18d2462593b4bf4ab8ae0169a0de1069e70c348f49465a6698e003ea795067a676b6e22c217648be3ee58836f5b3609e5636cd3b708318025097d14d76 +EBUILD msort-8.53-r2.ebuild 1020 BLAKE2B b22562cf05a6958035c94c6db93db165fa27233227971589a38a025a1972101121b8250edabb241ed3eec5c21fdf339a02a245fa89c7904e0900087f81643a50 SHA512 5bd0c94ccfdf4f43aad1e7fbdc1d06070cb83d1e820aff183179f982d415594721a49e2d920f2944d84f81fe0b604fc9a2bf0ef1f4758a52cc66ea658bd78eb9 MISC metadata.xml 1001 BLAKE2B 85c37e686432dc1f791c14ad0d07ece535b835c0fe7b2f220f682abfb494411849a69fb0c197981d1cf97b3f2d3bb7e7d0d621179cec0a1980218dc72115b0ff SHA512 63558ec0d6109f89d80700048f62df5fb57245ba7ba5aed4467f63041777c8cb9d6fa9d0a2c75fd64bdc5f72b23ba8d2c61746e34a4d8a20b18831900fd880f2 diff --git a/app-text/msort/files/msort-8.53-configure-clang16.patch b/app-text/msort/files/msort-8.53-configure-clang16.patch new file mode 100644 index 000000000000..de19a029caa4 --- /dev/null +++ b/app-text/msort/files/msort-8.53-configure-clang16.patch @@ -0,0 +1,18 @@ +https://src.fedoraproject.org/rpms/msort/blob/addd4dfbb265c79e76f3329c691639d3cf837cb4/f/msort-configure-c99.patch + +Include for the printf function. This avoids a check +failure with future compilers which do not support implicit function +declarations. + +--- a/configure.ac ++++ b/configure.ac +@@ -18,7 +18,7 @@ AC_DEFUN([AC_C_LONG_LONG], + ]) + + AC_DEFUN([AC_C_PRINTF_THSEP], +-[AC_TRY_COMPILE(,[printf("%'2d",101);],ac_cv_c_printf_thsep=yes,ac_cv_c_printf_thsep=no) ++[AC_TRY_COMPILE([#include ],[printf("%'2d",101);],ac_cv_c_printf_thsep=yes,ac_cv_c_printf_thsep=no) + if test $ac_cv_c_printf_thsep = yes; then + AC_DEFINE(HAVE_PRINTF_THSEP, 1, [compiler understands printf flag for thousands separation in ints]) + fi + diff --git a/app-text/msort/msort-8.53-r1.ebuild b/app-text/msort/msort-8.53-r1.ebuild deleted file mode 100644 index 7165b1210a09..000000000000 --- a/app-text/msort/msort-8.53-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="A program for sorting files in sophisticated ways" -HOMEPAGE="https://billposer.org/Software/msort.html" -SRC_URI="https://billposer.org/Software/Downloads/${P}.tar.bz2" - -KEYWORDS="amd64 x86" -LICENSE="GPL-3 LGPL-3" -SLOT="0" -IUSE="heap +icu +libuninum" - -RDEPEND="dev-libs/tre - icu? ( dev-libs/icu:= ) - !icu? ( dev-libs/libutf8proc:= ) - libuninum? ( dev-libs/libuninum:= )" - -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-fix-icu-build.patch" - "${FILESDIR}/${P}-fix-missing-limits-header.patch" - "${FILESDIR}/${P}-fix-segfault-on-certain-input.patch" - "${FILESDIR}/${P}-respect-users-cflags.patch" - ) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_enable !heap allocaok) - $(use_enable !icu utf8proc) - $(use_enable libuninum uninum) - --disable-debugbuild - ) - - econf "${myeconfargs[@]}" -} diff --git a/app-text/msort/msort-8.53-r2.ebuild b/app-text/msort/msort-8.53-r2.ebuild new file mode 100644 index 000000000000..39dfa9ff4a68 --- /dev/null +++ b/app-text/msort/msort-8.53-r2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A program for sorting files in sophisticated ways" +HOMEPAGE="https://billposer.org/Software/msort.html" +SRC_URI="https://billposer.org/Software/Downloads/${P}.tar.bz2" + +KEYWORDS="amd64 x86" +LICENSE="GPL-3 LGPL-3" +SLOT="0" +IUSE="heap +icu +libuninum" + +RDEPEND="dev-libs/tre + icu? ( dev-libs/icu:= ) + !icu? ( dev-libs/libutf8proc:= ) + libuninum? ( dev-libs/libuninum:= )" + +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-fix-icu-build.patch" + "${FILESDIR}/${P}-fix-missing-limits-header.patch" + "${FILESDIR}/${P}-fix-segfault-on-certain-input.patch" + "${FILESDIR}/${P}-respect-users-cflags.patch" + "${FILESDIR}/${P}-configure-clang16.patch" +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable !heap allocaok) + $(use_enable !icu utf8proc) + $(use_enable libuninum uninum) + --disable-debugbuild + ) + + econf "${myeconfargs[@]}" +} diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 1924d09fce36..0295c8021a14 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -3,6 +3,6 @@ AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78 AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956 DIST poppler-23.01.0.tar.xz 1847492 BLAKE2B 8dd85767a0c101b3d7166719374658a233aff491b0990917aacaa6fb3c5d8e51104b3ac45c78dcfb380286ea48067d1db57c2794d99a93cae9f4d64e9ca3dd07 SHA512 a44fd59cdb4dc1c04765990d9666f27538895883fe98a64e7bea30caebeab10875615282307fbd6eacecf83b7a7c8daa81afa1b13ae6c09b80673e3fb8563053 DIST poppler-23.01.0.tar.xz.sig 833 BLAKE2B 46c3910627fd69930fd428397e739e3fe41c9b835379dfe7abbdf421049a77b33ce1cf6a44bd386278d3610ae2547d119ac6da4c3bfa7f348c51fbce7319a878 SHA512 0cebaac1846e6b3944175bcb28b49592d562738c009a97e048abe9f6677718c97bea2b470ea503b8dd083fc5f154e71d539cf1e3bce08363c6979d268dcdfd3b -EBUILD poppler-23.01.0.ebuild 3691 BLAKE2B b1b52a48b8ca405bf01df7579a4f9414df1cb2115199cb71f290a194ce3598cfbdda71d003afa529c34824876d8619b89c073a34c2f1e8d1feb919cc475f1a06 SHA512 0ea18092d7d254fea35e88cba2e384cbaa45aaa03fe9fa8f9b9d67c3cd70c03b9b72b2e4df7611cdf55c0bb6e938329eb38760dc81447458fadc632db96fa44f -EBUILD poppler-9999.ebuild 3699 BLAKE2B e56b5203b0b6c8b2a4b48e12d2c8037a965778922f1824e9fe58424746347e1750ecccba016ef5aca025d901d970bae659da15897cc7693a42f4d0c4d9b217a7 SHA512 c5ea1bf14bbcae2ec36ade3fdd47e8fdd3e945149f7786110bb2f148b258965632171f1f245b1f93e788e66bbc5194197bc8954aeb512d4d53790048b77029b2 +EBUILD poppler-23.01.0.ebuild 3697 BLAKE2B cb47f67742bd07faa89a68d0128295bc1b5a21a1b2716c2af58cf88393da79ce5eb60f1cc327a15daa0a18193150d67615ae18d94637eeade2d3ec5456cb1cbf SHA512 00699421e072ce5bcdda3ab9b4c6725c72cefcc211a00a3dfdb17362bb1a1af541c356b3afaa6781ab53db4d210698c12be793202f1d2fc8d6682042d372c3a6 +EBUILD poppler-9999.ebuild 3705 BLAKE2B 42f662364ef1bad66807f095c898799aef5b5e013bb9b0e289fa439c4f61de05ff16b4acbaf6d822dbc5da9c0bbbaf61a943d0ab77143fbf63469e5854e14ba7 SHA512 36aca9e21798fdf3bef1e2b1ef0568a1e767747c83781e49b9283b8ba8b6bf8cbe364c28f93f3b1e112e3b8438deac44b00416d8aed5064a636e3c341c54569b MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6 diff --git a/app-text/poppler/poppler-23.01.0.ebuild b/app-text/poppler/poppler-23.01.0.ebuild index b335955fa02d..4ebe3939c5c1 100644 --- a/app-text/poppler/poppler-23.01.0.ebuild +++ b/app-text/poppler/poppler-23.01.0.ebuild @@ -38,10 +38,10 @@ COMMON_DEPEND=" introspection? ( >=dev-libs/gobject-introspection-1.64:= ) ) curl? ( net-misc/curl ) - jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) - nss? ( >=dev-libs/nss-3.19:0 ) + nss? ( >=dev-libs/nss-3.49 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild index eafad6c41cf7..750ab1f52a57 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -38,10 +38,10 @@ COMMON_DEPEND=" introspection? ( >=dev-libs/gobject-introspection-1.64:= ) ) curl? ( net-misc/curl ) - jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) - nss? ( >=dev-libs/nss-3.19:0 ) + nss? ( >=dev-libs/nss-3.49 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 -- cgit v1.2.3