summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2022-08-17 09:52:14 -0400
committerMatt Turner <mattst88@gentoo.org>2022-08-17 12:21:07 -0400
commit1e1ae215ec653d12554c7a5031255390b3f6ce40 (patch)
tree0645d78a82f77bbc4fb2f66136938329b4086663
parentsys-libs/openipmi: Drop old versions (diff)
downloadgentoo-1e1ae215.tar.gz
gentoo-1e1ae215.tar.bz2
gentoo-1e1ae215.zip
media-libs/freetype: Drop old versions
Signed-off-by: Matt Turner <mattst88@gentoo.org>
-rw-r--r--media-libs/freetype/Manifest3
-rw-r--r--media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch31
-rw-r--r--media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch56
-rw-r--r--media-libs/freetype/freetype-2.12.0-r1.ebuild261
4 files changed, 0 insertions, 351 deletions
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 8cc5622db110..d11d53a8501b 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,6 +1,3 @@
-DIST freetype-2.12.0.tar.xz 2340352 BLAKE2B 09227c883e52b4e4aefd68d8e4bfaf36eed0c4d92d22d6f5f88e2a69a94be6040ecff7285ca92f30cd9ce71a4af0ffa74141f3263f7a75e29d87b8a4fe27bf08 SHA512 d2426b46ef56268f5030951840a73be9a626129c6fc6ad2ab06e572c9325d0192f47b007798c2ffa3608fe50e296ad129ac41312b1fd3f8864d7e55e8c237c54
DIST freetype-2.12.1.tar.xz 2471916 BLAKE2B c4737dc0c6e44e0a911545d604fdb2e8e8b3f5185d3f5dfe4e4561ee2d75b3e5a31afcbb2089306fec4b31ba10324a6ec6499c3735b2b7591c71e96fee4ed278 SHA512 6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f
-DIST freetype-doc-2.12.0.tar.xz 2038684 BLAKE2B ac5197f1a31a4c29a218c0a35af4658a289afbea9ad6b5a200dd0518d63a1b647467b3c460b72863a4048269c249ca2fbc83146ba3de6594e00bfa88a701d979 SHA512 49d2ab0f39bafefe18da5bdc28aa11103caa2c130767179945e10183b7efe79b1ee6319e101dd86b7aacd2975d4b206edaf42129dd2516c2424a1d9954c946c6
DIST freetype-doc-2.12.1.tar.xz 2038632 BLAKE2B 81225caf1a2c586a8a282a22eaaf23412270d19002bc5b07e94d946d41d089f798724982e354d1701488de37c35bf68f36de88796565f0ebaa3f9fb35c51f532 SHA512 276b91b93e375096bc0f9fa76408a6ea9fa89d4d06e9c9179f88d27d41df3f3bc0ce6939ea7a3fd7c93cb694e78fd6bfb154e969188279e2bca82dcc3afd108d
-DIST ft2demos-2.12.0.tar.xz 263612 BLAKE2B d0cc154084a28a965798ba34c00368d70163d748f52fe360a6bd920bc9b6b962492efe05b7206b9bc4c4fd4770aa7db4279a287d6ba65a81daf7fc2b7a679a96 SHA512 70176ad89eab0121e9f5610f777da7e2f8478e24fbe9aded7f7fc3d7685019d40a0d0d6b586f3499f8589a2923082e3a9bc8ddc66482b8898642230bff5eaae2
DIST ft2demos-2.12.1.tar.xz 263656 BLAKE2B fd48dc68bd832e7532e9fae869a19699ab3337e599118bb9f1b76c3bcdcecec3cd3f55f7387508d29baf85b8de4a549aaa0e8af34d988743b1737458e255bdcf SHA512 cd9356152a64d807c75b797d005ca1dd0bde69cc2fadedec101d125cb54b2aaff1f7afa2f20839caba7db66325df7c11ed4883b7e906110356b28d9900caaae7
diff --git a/media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch b/media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch
deleted file mode 100644
index 6578475f4d7f..000000000000
--- a/media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 978eefee5401abee6bf702c6bcde9afb47893145 Mon Sep 17 00:00:00 2001
-From: Georg Brandl <georg@python.org>
-Date: Tue, 12 Apr 2022 11:43:37 +0000
-Subject: [PATCH] * src/cff/cffgload.c (cff_slot_load) [FT_CONFIG_OPTION_SVG]:
- Fix segfault.
-
-This can happen if the function is called with `size` being `NULL`.
-
-Fixes #1147.
----
- src/cff/cffgload.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
-index 5c15c804b..7586b886f 100644
---- a/src/cff/cffgload.c
-+++ b/src/cff/cffgload.c
-@@ -370,8 +370,8 @@
- SFNT_Service sfnt;
-
-
-- if ( size->root.metrics.x_ppem < 1 ||
-- size->root.metrics.y_ppem < 1 )
-+ if ( size && (size->root.metrics.x_ppem < 1 ||
-+ size->root.metrics.y_ppem < 1 ) )
- {
- error = FT_THROW( Invalid_Size_Handle );
- return error;
---
-GitLab
-
diff --git a/media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch b/media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch
deleted file mode 100644
index bb6854e9ecb5..000000000000
--- a/media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/156
-
---- freetype-2.12.0/builds/unix/configure.ac
-+++ freetype-2.12.0/builds/unix/configure.ac
-@@ -530,13 +530,20 @@
- [test "$ac_cv_search_clock_gettime" = "none required" \
- || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
-
--# 'librsvg' is needed to demonstrate SVG support.
--PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
-- [have_librsvg="yes (pkg-config)"], [have_librsvg=no])
--
- FT_DEMO_CFLAGS=""
- FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME"
-
-+# 'librsvg' is needed to demonstrate SVG support.
-+AC_ARG_WITH([librsvg],
-+ [AS_HELP_STRING([--with-librsvg=@<:@yes|no|auto@:>@],
-+ [librsvg is needed to demonstrate SVG support in demos @<:@default=auto@:>@])],
-+ [], [with_librsvg=auto])
-+
-+have_librsvg=no
-+AS_IF([test x"$with_librsvg" != xno], [
-+ PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
-+ [have_librsvg="yes (pkg-config)"])
-+])
- if test "$have_librsvg" != no; then
- FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
- FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
---- freetype-2.12.0/builds/unix/configure.raw
-+++ freetype-2.12.0/builds/unix/configure.raw
-@@ -530,13 +530,20 @@
- [test "$ac_cv_search_clock_gettime" = "none required" \
- || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
-
--# 'librsvg' is needed to demonstrate SVG support.
--PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
-- [have_librsvg="yes (pkg-config)"], [have_librsvg=no])
--
- FT_DEMO_CFLAGS=""
- FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME"
-
-+# 'librsvg' is needed to demonstrate SVG support.
-+AC_ARG_WITH([librsvg],
-+ [AS_HELP_STRING([--with-librsvg=@<:@yes|no|auto@:>@],
-+ [librsvg is needed to demonstrate SVG support in demos @<:@default=auto@:>@])],
-+ [], [with_librsvg=auto])
-+
-+have_librsvg=no
-+AS_IF([test x"$with_librsvg" != xno], [
-+ PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
-+ [have_librsvg="yes (pkg-config)"])
-+])
- if test "$have_librsvg" != no; then
- FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
- FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
diff --git a/media-libs/freetype/freetype-2.12.0-r1.ebuild b/media-libs/freetype/freetype-2.12.0-r1.ebuild
deleted file mode 100644
index 51df8e5fb2dd..000000000000
--- a/media-libs/freetype/freetype-2.12.0-r1.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="High-quality and portable font engine"
-HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils"
-
-if [[ "${PV}" != 9999 ]] ; then
- SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
- mirror://nongnu/freetype/${P/_/}.tar.xz
- utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz
- mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
- doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
- mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
- IUSE+=" doc"
-else
- inherit git-r3
-fi
-
-LICENSE="|| ( FTL GPL-2+ )"
-SLOT="2"
-
-RDEPEND="
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
- bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
- harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
- utils? (
- svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] )
- X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.12.0-librsvg_automagic.patch"
-
- # https://bugs.gentoo.org/836898
- "${FILESDIR}/${P}-cffgload_segfault_fix.patch"
-)
-
-_egit_repo_handler() {
- if [[ "${PV}" == 9999 ]] ; then
- local phase="${1}"
- case ${phase} in
- fetch|unpack)
- :;
- ;;
- *)
- die "Please use this function with either \"fetch\" or \"unpack\""
- ;;
- esac
-
- local EGIT_REPO_URI
- EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git"
- git-r3_src_${phase}
- if use utils ; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git"
- local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
- git-r3_src_${phase}
- fi
- else
- default
- fi
-}
-
-pkg_pretend() {
- if use svg && ! use utils ; then
- einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled."
- fi
-}
-
-src_fetch() {
- _egit_repo_handler ${EBUILD_PHASE}
-}
-
-src_unpack() {
- _egit_repo_handler ${EBUILD_PHASE}
-
- if [[ "${PV}" == 9999 ]] ; then
- # Need to copy stuff from dlg subproject (#758902)
- local dlg_inc_dir="${S}/subprojects/dlg/include/dlg"
- local dlg_src_dir="${S}/subprojects/dlg/src/dlg"
- local dlg_dest_dir="${S}/include"
- mkdir -p "${dlg_dest_dir}/dlg" || die
- cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die
- cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die
- fi
-}
-
-src_prepare() {
- if [[ "${PV}" == 9999 ]] ; then
- # Do NOT automagically mess with submodules!!!
- sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die
- # inspired by shipped autogen.sh script
- eval $(sed -n \
- -e 's/^#define *\(FREETYPE_MAJOR\) *\([0-9][0-9]*\).*/\1=\2/p' \
- -e 's/^#define *\(FREETYPE_MINOR\) *\([0-9][0-9]*\).*/\1=\2/p' \
- -e 's/^#define *\(FREETYPE_PATCH\) *\([0-9][0-9]*\).*/\1=\2/p' \
- include/freetype/freetype.h || die)
- FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}"
- [[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}"
- pushd builds/unix &>/dev/null || die
- sed -e "s;@VERSION@;${FREETYPE};" \
- < configure.raw > configure.ac || die
- # eautoheader produces broken ftconfig.in
- AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
- unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE
- popd &>/dev/null || die
- fi
-
- default
-
- pushd builds/unix &>/dev/null || die
- # eautoheader produces broken ftconfig.in
- AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
- popd &>/dev/null || die
-
- # This is the same as the 01 patch from infinality
- sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
-
- enable_option() {
- sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
- include/${PN}/config/ftoption.h \
- || die "unable to enable option $1"
- }
-
- disable_option() {
- sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
- include/${PN}/config/ftoption.h \
- || die "unable to disable option $1"
- }
-
- # Will be the new default for >=freetype-2.7.0
- disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2"
-
- if use infinality && use cleartype-hinting ; then
- enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )"
- elif use infinality ; then
- enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1"
- elif use cleartype-hinting ; then
- enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2"
- fi
-
- # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
- # via environment (new since v2.8)
- enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
-
- # See https://freetype.org/patents.html (expired!)
- enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-
- if ! use adobe-cff ; then
- enable_option CFF_CONFIG_OPTION_OLD_ENGINE
- fi
-
- if use debug ; then
- enable_option FT_DEBUG_LEVEL_TRACE
- enable_option FT_DEBUG_MEMORY
- fi
-
- if use utils ; then
- cd "${WORKDIR}/ft2demos-${PV}" || die
- # Disable tests needing X11 when USE="-X". (bug #177597)
- if ! use X ; then
- sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
- fi
- cd "${S}" || die
- fi
-
- # we need non-/bin/sh to run configure
- if [[ -n ${CONFIG_SHELL} ]] ; then
- sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
- "${S}"/builds/unix/configure || die
- fi
-
- elibtoolize --patch-only
-}
-
-multilib_src_configure() {
- append-flags -fno-strict-aliasing
- type -P gmake &> /dev/null && export GNUMAKE=gmake
-
- local myeconfargs=(
- --disable-freetype-config
- --enable-shared
- --with-zlib
- $(use_with brotli)
- $(use_with bzip2)
- $(use_with harfbuzz)
- $(use_with png)
- $(use_enable static-libs static)
- $(usex utils $(use_with svg librsvg) --without-librsvg)
-
- # avoid using libpng-config
- LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
- LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
- )
-
- case ${CHOST} in
- mingw*|*-mingw*) ;;
- # Workaround windows mis-detection: bug #654712
- # Have to do it for both ${CHOST}-windres and windres
- *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
- esac
-
- export CC_BUILD="$(tc-getBUILD_CC)"
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- default
-
- if multilib_is_native_abi && use utils ; then
- einfo "Building utils"
- # fix for Prefix, bug #339334
- emake \
- X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
- FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
- fi
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi && use utils ; then
- einfo "Installing utils"
- emake DESTDIR="${D}" FT2DEMOS=1 \
- TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install
- fi
-}
-
-multilib_src_install_all() {
- if use fontforge ; then
- # Probably fontforge needs less but this way makes things simplier...
- einfo "Installing internal headers required for fontforge"
- local header
- find src/truetype include/freetype/internal -name '*.h' | \
- while read header ; do
- mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
- cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
- done
- fi
-
- dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
- if [[ "${PV}" != 9999 ]] && use doc ; then
- docinto html
- dodoc -r docs/*
- fi
-
- find "${ED}" -type f -name '*.la' -delete || die
-}