commit: 906bde8bb4072b5634c0f0759a4662b00eb09b6c Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Fri Dec 3 10:19:36 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri Dec 3 10:21:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=906bde8b
media-libs/freetype: Removed old Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> media-libs/freetype/Manifest | 3 - .../freetype-2.10.4-dont_hardcode_libtool.patch | 42 ---- .../files/freetype-2.10.4-slibtool_build_fix.patch | 40 ---- .../files/ft2demos-2.10.4-install_target.patch | 58 ----- media-libs/freetype/freetype-2.10.4.ebuild | 237 --------------------- 5 files changed, 380 deletions(-) diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest index 709c6b5ef4ba..6f1f0ea25bee 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -1,10 +1,7 @@ -DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f DIST freetype-2.11.0-COLR_v1_clipbox.patch.xz 3940 BLAKE2B 45b84b1070a9a9e1e13058ce7200555f4f9e26df4fe25eab4a644869df86f267cc91bfcf2ab10a9f0673be51504f05eec730300dee13ca34bb6f8afdc32ee354 SHA512 bf0cc00b3f27cb3408881cec46654be57b96b099cfd3df06e33b94aa47f35a7c9499a9935837be0f652d4f17ab2b6c78bc1fcef328754cde64f0b139d00ceb29 DIST freetype-2.11.0.tar.xz 2256640 BLAKE2B ed14b566b8ac31a85dde4c8d26dd8b001f6a2cb506cfafd550b31bb90a3f592376d6f9f6bbe1b6c21e27e4ad23d0eafa7ea886211174b978e101fb6a77261324 SHA512 bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d DIST freetype-2.11.1.tar.xz 2270728 BLAKE2B 15cc03e7b8ba93b2f240b0eee3f1cc07bca77d9ef67a1971d44d6c061a0dff2b13737fa417f7f2dc4e7e6df660223325931f69a107a6b2eaf14425fc71b7ca7b SHA512 0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08 -DIST freetype-doc-2.10.4.tar.xz 2079084 BLAKE2B a051c425250f8af1cd0e83b15d6e5692b1ee5ff00317467cef648dcc7ea1f88ad6cde0fe2d53e5c45220723bb935e6527dbba124ef8739e6ebe372bc06ec78b7 SHA512 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8 DIST freetype-doc-2.11.0.tar.xz 2070604 BLAKE2B a45fa2e97574868fc4f08c646cb815152dde462538a32fddfc5ddccb32343286765f3952b9fc8b66204dfeb62470d4fada1a2338c377efa1c716ab9c5885fd60 SHA512 5bddaec4f237a9f6e63dbed5f65d0b5ffe0a414ea2d6e1c3bb1142baf5535cee7e7c282b6af8c630e772ffc196b8c4bf8e18bc21a72749a09b6af388287c7301 DIST freetype-doc-2.11.1.tar.xz 2038348 BLAKE2B 2248d16bb12b29294226a67a10328c61b064c8e0ad7fb5f004c2e6da1237175f03d51a48d5df03a3de3bbe935307e573014c079c31468c9f59416bc4e9057a9c SHA512 c5e19d98425491682edc58230c48390925cc4b466169f655cf3b8575ba787a70feecdeb7a16224b132dcc32f17b041483d84056cda8e3132d98b531e46a26c36 -DIST ft2demos-2.10.4.tar.xz 236712 BLAKE2B 76883bfc09c42b6092b0b512aff66b4585ac83793da787e688ad8446fceac1ce315014bde03d4271fc5a1b7bd1d3250255f5faced92beade6e4ed78c896db80d SHA512 d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8 DIST ft2demos-2.11.0.tar.xz 257316 BLAKE2B fa59eeeba502733db940965a1affe8fc9ecefd68d3d31dd8c8a94b769310d53975403f7a7c4c6ca6f381b10f9b3057698bd09fff9adafa26981192478d3ca602 SHA512 9c5727bf479afafc1c765a131875b88b0e656d1db986f95c021b0386f5c4cc6135db7584a5d553363dcf52dfc9c9199cd1f3da2cc6644f58de85848b058fd531 DIST ft2demos-2.11.1.tar.xz 257240 BLAKE2B 1d620af52e76d1152a0a6aeeb0036d2423e498e371b75c01c408cc0974845abfe2f3f562ad638ca5640ec1b24023d7a47e1688743ca738c2bb1ceea6ee05cfcf SHA512 93d68daefa8a49b4fc987a7356133299fe2a8e012415ea09ad7616ececcfd978fdf9fc7a2d855f7488f51a497d019acb89ef5774484babae66357b3083a883c5 diff --git a/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch b/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch deleted file mode 100644 index 310b5aaca935..000000000000 --- a/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 597566b2301deeff4e9832aebdab1bf659a2accf Mon Sep 17 00:00:00 2001 -From: orbea <[email protected]> -Date: Mon, 22 Mar 2021 16:15:37 -0700 -Subject: [PATCH] * Makefile, mac/Makefile (LINK_CMD): Don't hard-code - `libtool`. - ---- - Makefile | 3 +-- - mac/Makefile | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 810142f..949402f 100644 ---- a/Makefile -+++ b/Makefile -@@ -165,8 +165,7 @@ else - - ifeq ($(PLATFORM),unix) - override CC = $(CCraw) -- LINK_CMD = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \ -- --mode=link $(CC) \ -+ LINK_CMD = $(LIBTOOL) --mode=link $(CC) \ - $(subst /,$(COMPILER_SEP),$(LDFLAGS)) - LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(LIB_CLOCK_GETTIME) - else -diff --git a/mac/Makefile b/mac/Makefile -index 73ae99c..52038a4 100644 ---- a/mac/Makefile -+++ b/mac/Makefile -@@ -68,8 +68,7 @@ else - LINK_ITEMS = $T$(subst /,$(COMPILER_SEP),$@ $<) - - CC = $(CCraw) -- LINK_CMD = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \ -- --mode=link $(CC) \ -+ LINK_CMD = $(LIBTOOL) --mode=link $(CC) \ - $(subst /,$(COMPILER_SEP),$(LDFLAGS)) - ifeq ($(findstring CoreServices,$(LDFLAGS)),) - LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(MATH) \ --- -GitLab - diff --git a/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch b/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch deleted file mode 100644 index 895a86c444d6..000000000000 --- a/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8e9447b32dae7e6c95bee3f878ee1877f9b628a4 Mon Sep 17 00:00:00 2001 -From: orbea <[email protected]> -Date: Mon, 22 Mar 2021 16:15:09 -0700 -Subject: [PATCH] [graph] Fix build with `slibtool`. - -* graph/rules.mk (GRAPH_LIB): Handle the case specially where -`LIBTOOL` is defined. -(COMPILE_GRAPH_LIB) <LIBTOOL>: Enable use of `dlopen`. ---- - rules.mk | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/graph/rules.mk b/graph/rules.mk -index 4903a38..a3f0de1 100644 ---- a/graph/rules.mk -+++ b/graph/rules.mk -@@ -12,7 +12,6 @@ - - - GRAPH_INCLUDES := $(subst /,$(COMPILER_SEP),$(TOP_DIR_2)/graph) --GRAPH_LIB := $(OBJ_DIR_2)/graph.$(SA) - - GRAPH := $(TOP_DIR_2)/graph - -@@ -46,9 +45,11 @@ GRAPH_OBJS := $(OBJ_DIR_2)/gblblit.$(O) \ - # this value can be modified by the system-specific graphics drivers. - # - ifneq ($(LIBTOOL),) -- COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -static \ -+ GRAPH_LIB := $(OBJ_DIR_2)/graph.$(A) -+ COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -module -static \ - -o $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS)) - else -+ GRAPH_LIB := $(OBJ_DIR_2)/graph.$(SA) - COMPILE_GRAPH_LIB = ar -r $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS)) - endif - --- -GitLab - diff --git a/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch b/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch deleted file mode 100644 index f3d7f8de43e4..000000000000 --- a/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch +++ /dev/null @@ -1,58 +0,0 @@ -From b88cd2f027e77bd26d1334fc13c4eda796423d19 Mon Sep 17 00:00:00 2001 -From: orbea <[email protected]> -Date: Wed, 24 Mar 2021 09:04:41 -0700 -Subject: [PATCH] [build] Add an `install` target for binaries and man pages. - -* Makefile (MANPAGES): New variable. -(install) <unix>: New target. ---- - Makefile | 19 ++++++++++++++++++- - 1 file changed, 18 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 949402f..8352f61 100644 ---- a/Makefile -+++ b/Makefile -@@ -194,7 +194,7 @@ else - $(LINK_LIBS) $(subst /,$(COMPILER_SEP),$(GRAPH_LIB)) \ - $(GRAPH_LINK) $(MATH) - -- .PHONY: exes clean distclean -+ .PHONY: exes clean distclean install - - - ################################################################### -@@ -317,6 +317,11 @@ else - # EXES += fttimer - # EXES += testname - -+ # Not all demo programs have a man page; we thus check for existence in a -+ # loop. -+ # -+ MANPAGES := $(foreach man,$(EXES),$(wildcard $(TOP_DIR_2)/man/$(man).1)) -+ - exes: $(EXES:%=$(BIN_DIR_2)/%$E) - - -@@ -567,6 +572,18 @@ else - $(GRAPH_LIB) $(COMMON_OBJ) $(FTCOMMON_OBJ) - $(LINK_NEW) - -+ ifeq ($(PLATFORM),unix) -+ install: exes -+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir) \ -+ $(DESTDIR)$(mandir)/man1 -+ $(foreach bin,$(EXES), \ -+ $(LIBTOOL) --mode=install \ -+ $(INSTALL) $(BIN_DIR_2)/$(bin) \ -+ $(DESTDIR)$(bindir)/$(bin);) -+ $(foreach man,$(MANPAGES), \ -+ $(INSTALL) $(man) \ -+ $(DESTDIR)$(mandir)/man1/$(notdir $(man));) -+ endif - endif - - --- -GitLab - diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild deleted file mode 100644 index 4bec88e1dd43..000000000000 --- a/media-libs/freetype/freetype-2.10.4.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs - -DESCRIPTION="A high-quality and portable font engine" -HOMEPAGE="https://www.freetype.org/"; -IUSE="X +adobe-cff bindist brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality +png static-libs 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 autotools git-r3 -fi - -LICENSE="|| ( FTL GPL-2+ )" -SLOT="2" -RESTRICT="!bindist? ( bindist )" # bug 541408 - -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? ( - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] - ) - )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966 -) - -_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://git.sv.nongnu.org/r/freetype/freetype2.git"; - git-r3_src_${phase} - if use utils ; then - EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"; - local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" - git-r3_src_${phase} - fi - else - default - fi -} - -src_fetch() { - _egit_repo_handler ${EBUILD_PHASE} -} - -src_unpack() { - _egit_repo_handler ${EBUILD_PHASE} -} - -src_prepare() { - if [[ "${PV}" == 9999 ]] ; then - # inspired by shipped autogen.sh script - eval $(sed -nf version.sed include/freetype/freetype.h) - pushd builds/unix &>/dev/null || die - sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \ - < configure.raw > configure.ac || die - # eautoheader produces broken ftconfig.in - AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf - unset freetype_major freetype_minor freetype_patch - popd &>/dev/null || die - fi - - default - - # 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 - - if ! use bindist; then - # See http://freetype.org/patents.html - # ClearType is covered by several Microsoft patents in the US - enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING - fi - - 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 - - # Taken from upstream (https://bugs.gentoo.org/775881) - eapply "${FILESDIR}/${P}-slibtool_build_fix.patch" - eapply "${FILESDIR}/${P}-dont_hardcode_libtool.patch" - eapply "${FILESDIR}/ft2demos-2.10.4-install_target.patch" - 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-biarch-config - --enable-shared - $(use_with brotli) - $(use_with bzip2) - $(use_with harfbuzz) - $(use_with png) - $(use_enable static-libs static) - - # 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 - - 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}" -name '*.la' -delete || die -}
