From c035b2b83f0e94c4b2e82184f00bcef874e6276b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 11 May 2024 00:01:23 +0100 Subject: gentoo auto-resync : 11:05:2024 - 00:01:22 --- media-libs/imlib/Manifest | 3 +- .../imlib/files/imlib-1.9.15-c99-configure.patch | 20 ++++++ media-libs/imlib/imlib-1.9.15-r8.ebuild | 75 --------------------- media-libs/imlib/imlib-1.9.15-r9.ebuild | 76 ++++++++++++++++++++++ 4 files changed, 98 insertions(+), 76 deletions(-) create mode 100644 media-libs/imlib/files/imlib-1.9.15-c99-configure.patch delete mode 100644 media-libs/imlib/imlib-1.9.15-r8.ebuild create mode 100644 media-libs/imlib/imlib-1.9.15-r9.ebuild (limited to 'media-libs/imlib') diff --git a/media-libs/imlib/Manifest b/media-libs/imlib/Manifest index 22fa15da30b8..f26c5e9ed309 100644 --- a/media-libs/imlib/Manifest +++ b/media-libs/imlib/Manifest @@ -1,5 +1,6 @@ AUX imlib-1.9.15-asneeded.patch 1124 BLAKE2B 19ffffd4a5f0b9e708bb7ae18697d765cf28a8839eb7e0ad4e56f0a5ea5517671b11367b0c9b1ae17622edc7185a377b5b65c29b2efadffbdff8f0bc2c3550c6 SHA512 ed12ad7420622dcde29d287f258e6d7257d126c9f227d9ea0f1e6d00f83ffa0c5ff25912d7eb94352a3b92cefe79c0317d2bed3179ae74348b91e9f3293bd557 AUX imlib-1.9.15-bpp16-CVE-2007-3568.patch 461 BLAKE2B 32b0b83ffdc65496857ea99fecdcd676298597977e4e057e45c4c33857a7ddcd7496c9b01e2afb9a167f0d2e09b7170953f29ff1cd7cb440fa68cc3782d120c5 SHA512 9a60cf535bb58240de01c73afe43c4c24c0c15fab3f8d48d4571795ff717c4670d1465ffc0c8f9db5144ef241fccb7477fdf43240d18e53384c0888a2b24e7c2 +AUX imlib-1.9.15-c99-configure.patch 501 BLAKE2B 3f1c97e6536d4dac18aed9862c5d0026db5e6a13d5c15fe8be955009ad735e49076203ad58e849c613b7e9e4e5c5e7e2fd9c8946bb4a8c2c6448a58a3ac44c60 SHA512 0a1a1f59a517d34d69354fbeaef50b86a0da4e88085f02d1ca0a5eeec99c3fa5b14bfd28f54c08f4ae95ec01615d87574dcbd5534d9e91fed943d74e3ef8b9d7 AUX imlib-1.9.15-fix-rendering.patch 3263 BLAKE2B b45fb30178937daf25257b1a6270838116e8e16d470958ea6b09f40fb323ff99c9f39f17bcc17574a53831e8d1d1ae263c9ae03cb5087050361fcf766cd0ee3f SHA512 4e94da8de3f18b711bdfcf4184dbc2220ef566aa61b72c6139e490e55051b3090dc5330929b218f6fab1764c8c2ee8acdd630a0c64010b56b4b4f1b8c55c3f89 AUX imlib-1.9.15-giflib51-1.patch 3284 BLAKE2B 58bc6e9b674896a8716f0833a719ae13c8d007c6aca854cf1bc856c328c9fd45b3f4809ccc2225c669b8d2aed8b26f50d0d1157686db2995b1ecf2bc008d350c SHA512 ceb74e811300d7233019bcd9f20baf711c5f778e59cc72f56b954845594841b42ee8958eec77ee9ffe6f2a6002a6726c96d5a93463cdc18f5b593ce5333798a0 AUX imlib-1.9.15-giflib51-2.patch 2847 BLAKE2B 8a191b656fdc7279c6f44e1733d311a50ca050ceaa77ee6d0ac5111f0257b6c4481e71d44e41758d52ca40df9c78dc3054696b23d459ecbd9e5b5a35a7d48fc3 SHA512 e7c56f6f30594f35dc240bbdb57965f9036e688bede544a937f536de10f598eb881be315d2cebf3a7c27ae5ab6c5a4627d16c948c93a04bc56f6bb1f6b31bb34 @@ -11,5 +12,5 @@ AUX imlib-security.patch 13040 BLAKE2B 65eb4e5435dea0bba755ae21548fd7c25cc65a0f5 DIST gtk-1-for-imlib.m4.bz2 2742 BLAKE2B af16f586cbfb53522bb53b55d551d21ddf765e06694bebe93637b24c31bfdfff95f7ef250e66b784d7371bb309e4939c7db40c0ba1f1b1d73526e16cf745a93f SHA512 83708af1c7d7cf10960463b785bad096d77e985be5907dd59c73c2cb86c4b89fb5453a02ffddca1519185b91d205dbd96c4c4c1df4da4b67e64bad413cd8a40e DIST imlib-1.9.15.tar.bz2 683242 BLAKE2B 16cc11d2ddc69af7201215454c465d104354b63b4e0b1d8aadd07daf889368478dce28ea8ecf6b16daef3019891fcf7a794abccf02b236d1a6c737b0e9db08d3 SHA512 f50d9141b3c54b44921aa09c0a5ea848aefaa904efdd6da132dace42604671f8dbd3e4b71a596f054f0db4525ba2002864b5e5b21f8805cf1b5514b661ac254a EBUILD imlib-1.9.15-r7.ebuild 2157 BLAKE2B f3536ee499f91172c312d0237ad609f940f3cae1d4c1588f46c7676b1261f1780badc426afa7d9c3f0a5c4bcf4ca67030bfa40ab522d8d578af6d28140e14dff SHA512 4b0fad53f7879f91f2214f4bbbc73665f3c4b98dab3b938f28d502a490023f2c0c60c9739ef7ede5965325d92fa355ab219e9b2771871fa4982bb78b578cc7d3 -EBUILD imlib-1.9.15-r8.ebuild 2141 BLAKE2B 0af4e4c50093fa87dd0fd8d0eda32ede46fd20701aad19e5711c4aca9359ecb5a5e691832a6545de0fd9aa06f1786dd04155b2f060f4c4c35ec45658c7fd5561 SHA512 88a18205d4b188289e73d7c538d20d348527a16aad746163a8e562322110ec6e55dca0760a33e341c90831e151aed3de1d8c0d893db7c6bcc6682ac8b22a0243 +EBUILD imlib-1.9.15-r9.ebuild 2189 BLAKE2B b7f2227bbb615dbbf7b359ca0ac4dc98811e2cb76e3589c6b3ade02ce4abe24fa306b22a959c431e750c7c2cf234ae08125ddb7dc52986f8b8907754179968ba SHA512 cc52b0a35d341b42de5d0d2870b832001cd5596d5c3f1be26ac1064f053e9484c5586c6a99502ea6696a64265b8984a5480e4bcd7cb57c440160ff1b3d602de3 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/media-libs/imlib/files/imlib-1.9.15-c99-configure.patch b/media-libs/imlib/files/imlib-1.9.15-c99-configure.patch new file mode 100644 index 000000000000..a22514d2dea1 --- /dev/null +++ b/media-libs/imlib/files/imlib-1.9.15-c99-configure.patch @@ -0,0 +1,20 @@ +https://bugs.gentoo.org/898234 +--- a/configure.ac ++++ b/configure.ac +@@ -62,7 +62,7 @@ if test "x$GDK_IMLIB" != x; then + #include + #include + #include +-main () ++int main () + { + if (g_module_supported ()) + exit (0); +@@ -166,6 +166,7 @@ if test "x$enable_shm" = "xyes"; then + #include + #include + #include ++ #include + int main() + { + int id; diff --git a/media-libs/imlib/imlib-1.9.15-r8.ebuild b/media-libs/imlib/imlib-1.9.15-r8.ebuild deleted file mode 100644 index 494be1fba26d..000000000000 --- a/media-libs/imlib/imlib-1.9.15-r8.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools multilib-minimal - -DESCRIPTION="Image loading and rendering library" -HOMEPAGE="https://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/" -SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.bz2 - mirror://gentoo/gtk-1-for-imlib.m4.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="static-libs" - -RDEPEND=" - >=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}] - >=media-libs/giflib-5.1:0=[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] - >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] - >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] - >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" - -PATCHES=( - # Fix aclocal underquoted definition warnings. - # Conditionalize gdk functions for bug 40453. - # Fix imlib-config for bug 3425. - "${FILESDIR}"/${P}.patch - "${FILESDIR}"/${PN}-security.patch #security #72681 - "${FILESDIR}"/${P}-bpp16-CVE-2007-3568.patch # security #201887 - "${FILESDIR}"/${P}-fix-rendering.patch #197489 - "${FILESDIR}"/${P}-asneeded.patch #207638 - "${FILESDIR}"/${P}-libpng15.patch #357167 - "${FILESDIR}"/${P}-underlinking-test.patch #367645 - "${FILESDIR}"/${P}-no-LDFLAGS-in-pc.patch - "${FILESDIR}"/${P}-giflib51-{1,2}.patch #538976 -) - -src_prepare() { - default - - mkdir m4 && cp "${WORKDIR}"/gtk-1-for-imlib.m4 m4 || die - AT_M4DIR="m4" eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --sysconfdir=/etc/imlib - $(use_enable static-libs static) - --disable-gdk - --disable-gtktest - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - # fix target=@gdk-target@ in pkgconfig, bug #499268 - sed -e '/^target=/d' \ - -i "${ED}"/usr/$(get_libdir)/pkgconfig/imlib.pc || die -} - -multilib_src_install_all() { - local HTML_DOCS=( doc/*.gif doc/*.html ) - einstalldocs - - # Punt unused files - rm -f "${D}"/usr/lib*/pkgconfig/imlibgdk.pc || die - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/imlib/imlib-1.9.15-r9.ebuild b/media-libs/imlib/imlib-1.9.15-r9.ebuild new file mode 100644 index 000000000000..5120f9d71d84 --- /dev/null +++ b/media-libs/imlib/imlib-1.9.15-r9.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools multilib-minimal + +DESCRIPTION="Image loading and rendering library" +HOMEPAGE="https://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/" +SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.bz2 + mirror://gentoo/gtk-1-for-imlib.m4.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="static-libs" + +RDEPEND=" + >=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}] + >=media-libs/giflib-5.1:0=[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] + >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] + >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] + >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND}" + +PATCHES=( + # Fix aclocal underquoted definition warnings. + # Conditionalize gdk functions for bug 40453. + # Fix imlib-config for bug 3425. + "${FILESDIR}"/${P}.patch + "${FILESDIR}"/${PN}-security.patch #security #72681 + "${FILESDIR}"/${P}-bpp16-CVE-2007-3568.patch # security #201887 + "${FILESDIR}"/${P}-fix-rendering.patch #197489 + "${FILESDIR}"/${P}-asneeded.patch #207638 + "${FILESDIR}"/${P}-libpng15.patch #357167 + "${FILESDIR}"/${P}-underlinking-test.patch #367645 + "${FILESDIR}"/${P}-no-LDFLAGS-in-pc.patch + "${FILESDIR}"/${P}-giflib51-{1,2}.patch #538976 + "${FILESDIR}"/${P}-c99-configure.patch #898234 +) + +src_prepare() { + default + + mkdir m4 && cp "${WORKDIR}"/gtk-1-for-imlib.m4 m4 || die + AT_M4DIR="m4" eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + --sysconfdir=/etc/imlib + $(use_enable static-libs static) + --disable-gdk + --disable-gtktest + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + # fix target=@gdk-target@ in pkgconfig, bug #499268 + sed -e '/^target=/d' \ + -i "${ED}"/usr/$(get_libdir)/pkgconfig/imlib.pc || die +} + +multilib_src_install_all() { + local HTML_DOCS=( doc/*.gif doc/*.html ) + einstalldocs + + # Punt unused files + rm -f "${D}"/usr/lib*/pkgconfig/imlibgdk.pc || die + find "${D}" -name '*.la' -delete || die +} -- cgit v1.2.3