Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/
Date: Wed, 17 Aug 2022 16:21:32
Message-Id: 1660753267.1e1ae215ec653d12554c7a5031255390b3f6ce40.mattst88@gentoo
1 commit: 1e1ae215ec653d12554c7a5031255390b3f6ce40
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 17 13:52:14 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 17 16:21:07 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1ae215
7
8 media-libs/freetype: Drop old versions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 media-libs/freetype/Manifest | 3 -
13 .../freetype-2.12.0-cffgload_segfault_fix.patch | 31 ---
14 .../files/freetype-2.12.0-librsvg_automagic.patch | 56 -----
15 media-libs/freetype/freetype-2.12.0-r1.ebuild | 261 ---------------------
16 4 files changed, 351 deletions(-)
17
18 diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
19 index 8cc5622db110..d11d53a8501b 100644
20 --- a/media-libs/freetype/Manifest
21 +++ b/media-libs/freetype/Manifest
22 @@ -1,6 +1,3 @@
23 -DIST freetype-2.12.0.tar.xz 2340352 BLAKE2B 09227c883e52b4e4aefd68d8e4bfaf36eed0c4d92d22d6f5f88e2a69a94be6040ecff7285ca92f30cd9ce71a4af0ffa74141f3263f7a75e29d87b8a4fe27bf08 SHA512 d2426b46ef56268f5030951840a73be9a626129c6fc6ad2ab06e572c9325d0192f47b007798c2ffa3608fe50e296ad129ac41312b1fd3f8864d7e55e8c237c54
24 DIST freetype-2.12.1.tar.xz 2471916 BLAKE2B c4737dc0c6e44e0a911545d604fdb2e8e8b3f5185d3f5dfe4e4561ee2d75b3e5a31afcbb2089306fec4b31ba10324a6ec6499c3735b2b7591c71e96fee4ed278 SHA512 6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f
25 -DIST freetype-doc-2.12.0.tar.xz 2038684 BLAKE2B ac5197f1a31a4c29a218c0a35af4658a289afbea9ad6b5a200dd0518d63a1b647467b3c460b72863a4048269c249ca2fbc83146ba3de6594e00bfa88a701d979 SHA512 49d2ab0f39bafefe18da5bdc28aa11103caa2c130767179945e10183b7efe79b1ee6319e101dd86b7aacd2975d4b206edaf42129dd2516c2424a1d9954c946c6
26 DIST freetype-doc-2.12.1.tar.xz 2038632 BLAKE2B 81225caf1a2c586a8a282a22eaaf23412270d19002bc5b07e94d946d41d089f798724982e354d1701488de37c35bf68f36de88796565f0ebaa3f9fb35c51f532 SHA512 276b91b93e375096bc0f9fa76408a6ea9fa89d4d06e9c9179f88d27d41df3f3bc0ce6939ea7a3fd7c93cb694e78fd6bfb154e969188279e2bca82dcc3afd108d
27 -DIST ft2demos-2.12.0.tar.xz 263612 BLAKE2B d0cc154084a28a965798ba34c00368d70163d748f52fe360a6bd920bc9b6b962492efe05b7206b9bc4c4fd4770aa7db4279a287d6ba65a81daf7fc2b7a679a96 SHA512 70176ad89eab0121e9f5610f777da7e2f8478e24fbe9aded7f7fc3d7685019d40a0d0d6b586f3499f8589a2923082e3a9bc8ddc66482b8898642230bff5eaae2
28 DIST ft2demos-2.12.1.tar.xz 263656 BLAKE2B fd48dc68bd832e7532e9fae869a19699ab3337e599118bb9f1b76c3bcdcecec3cd3f55f7387508d29baf85b8de4a549aaa0e8af34d988743b1737458e255bdcf SHA512 cd9356152a64d807c75b797d005ca1dd0bde69cc2fadedec101d125cb54b2aaff1f7afa2f20839caba7db66325df7c11ed4883b7e906110356b28d9900caaae7
29
30 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
31 deleted file mode 100644
32 index 6578475f4d7f..000000000000
33 --- a/media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch
34 +++ /dev/null
35 @@ -1,31 +0,0 @@
36 -From 978eefee5401abee6bf702c6bcde9afb47893145 Mon Sep 17 00:00:00 2001
37 -From: Georg Brandl <georg@××××××.org>
38 -Date: Tue, 12 Apr 2022 11:43:37 +0000
39 -Subject: [PATCH] * src/cff/cffgload.c (cff_slot_load) [FT_CONFIG_OPTION_SVG]:
40 - Fix segfault.
41 -
42 -This can happen if the function is called with `size` being `NULL`.
43 -
44 -Fixes #1147.
45 ----
46 - src/cff/cffgload.c | 4 ++--
47 - 1 file changed, 2 insertions(+), 2 deletions(-)
48 -
49 -diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
50 -index 5c15c804b..7586b886f 100644
51 ---- a/src/cff/cffgload.c
52 -+++ b/src/cff/cffgload.c
53 -@@ -370,8 +370,8 @@
54 - SFNT_Service sfnt;
55 -
56 -
57 -- if ( size->root.metrics.x_ppem < 1 ||
58 -- size->root.metrics.y_ppem < 1 )
59 -+ if ( size && (size->root.metrics.x_ppem < 1 ||
60 -+ size->root.metrics.y_ppem < 1 ) )
61 - {
62 - error = FT_THROW( Invalid_Size_Handle );
63 - return error;
64 ---
65 -GitLab
66 -
67
68 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
69 deleted file mode 100644
70 index bb6854e9ecb5..000000000000
71 --- a/media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch
72 +++ /dev/null
73 @@ -1,56 +0,0 @@
74 -https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/156
75 -
76 ---- freetype-2.12.0/builds/unix/configure.ac
77 -+++ freetype-2.12.0/builds/unix/configure.ac
78 -@@ -530,13 +530,20 @@
79 - [test "$ac_cv_search_clock_gettime" = "none required" \
80 - || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
81 -
82 --# 'librsvg' is needed to demonstrate SVG support.
83 --PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
84 -- [have_librsvg="yes (pkg-config)"], [have_librsvg=no])
85 --
86 - FT_DEMO_CFLAGS=""
87 - FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME"
88 -
89 -+# 'librsvg' is needed to demonstrate SVG support.
90 -+AC_ARG_WITH([librsvg],
91 -+ [AS_HELP_STRING([--with-librsvg=@<:@yes|no|auto@:>@],
92 -+ [librsvg is needed to demonstrate SVG support in demos @<:@default=auto@:>@])],
93 -+ [], [with_librsvg=auto])
94 -+
95 -+have_librsvg=no
96 -+AS_IF([test x"$with_librsvg" != xno], [
97 -+ PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
98 -+ [have_librsvg="yes (pkg-config)"])
99 -+])
100 - if test "$have_librsvg" != no; then
101 - FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
102 - FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
103 ---- freetype-2.12.0/builds/unix/configure.raw
104 -+++ freetype-2.12.0/builds/unix/configure.raw
105 -@@ -530,13 +530,20 @@
106 - [test "$ac_cv_search_clock_gettime" = "none required" \
107 - || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
108 -
109 --# 'librsvg' is needed to demonstrate SVG support.
110 --PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
111 -- [have_librsvg="yes (pkg-config)"], [have_librsvg=no])
112 --
113 - FT_DEMO_CFLAGS=""
114 - FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME"
115 -
116 -+# 'librsvg' is needed to demonstrate SVG support.
117 -+AC_ARG_WITH([librsvg],
118 -+ [AS_HELP_STRING([--with-librsvg=@<:@yes|no|auto@:>@],
119 -+ [librsvg is needed to demonstrate SVG support in demos @<:@default=auto@:>@])],
120 -+ [], [with_librsvg=auto])
121 -+
122 -+have_librsvg=no
123 -+AS_IF([test x"$with_librsvg" != xno], [
124 -+ PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
125 -+ [have_librsvg="yes (pkg-config)"])
126 -+])
127 - if test "$have_librsvg" != no; then
128 - FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
129 - FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
130
131 diff --git a/media-libs/freetype/freetype-2.12.0-r1.ebuild b/media-libs/freetype/freetype-2.12.0-r1.ebuild
132 deleted file mode 100644
133 index 51df8e5fb2dd..000000000000
134 --- a/media-libs/freetype/freetype-2.12.0-r1.ebuild
135 +++ /dev/null
136 @@ -1,261 +0,0 @@
137 -# Copyright 1999-2022 Gentoo Authors
138 -# Distributed under the terms of the GNU General Public License v2
139 -
140 -EAPI=8
141 -
142 -inherit autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
143 -
144 -DESCRIPTION="High-quality and portable font engine"
145 -HOMEPAGE="https://www.freetype.org/"
146 -IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils"
147 -
148 -if [[ "${PV}" != 9999 ]] ; then
149 - SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
150 - mirror://nongnu/freetype/${P/_/}.tar.xz
151 - utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz
152 - mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
153 - doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
154 - mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
155 - 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"
156 - IUSE+=" doc"
157 -else
158 - inherit git-r3
159 -fi
160 -
161 -LICENSE="|| ( FTL GPL-2+ )"
162 -SLOT="2"
163 -
164 -RDEPEND="
165 - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
166 - brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
167 - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
168 - harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
169 - png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
170 - utils? (
171 - svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] )
172 - X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
173 - )
174 -"
175 -DEPEND="${RDEPEND}"
176 -BDEPEND="
177 - virtual/pkgconfig
178 -"
179 -
180 -PATCHES=(
181 - "${FILESDIR}/${PN}-2.12.0-librsvg_automagic.patch"
182 -
183 - # https://bugs.gentoo.org/836898
184 - "${FILESDIR}/${P}-cffgload_segfault_fix.patch"
185 -)
186 -
187 -_egit_repo_handler() {
188 - if [[ "${PV}" == 9999 ]] ; then
189 - local phase="${1}"
190 - case ${phase} in
191 - fetch|unpack)
192 - :;
193 - ;;
194 - *)
195 - die "Please use this function with either \"fetch\" or \"unpack\""
196 - ;;
197 - esac
198 -
199 - local EGIT_REPO_URI
200 - EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git"
201 - git-r3_src_${phase}
202 - if use utils ; then
203 - EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git"
204 - local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
205 - git-r3_src_${phase}
206 - fi
207 - else
208 - default
209 - fi
210 -}
211 -
212 -pkg_pretend() {
213 - if use svg && ! use utils ; then
214 - einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled."
215 - fi
216 -}
217 -
218 -src_fetch() {
219 - _egit_repo_handler ${EBUILD_PHASE}
220 -}
221 -
222 -src_unpack() {
223 - _egit_repo_handler ${EBUILD_PHASE}
224 -
225 - if [[ "${PV}" == 9999 ]] ; then
226 - # Need to copy stuff from dlg subproject (#758902)
227 - local dlg_inc_dir="${S}/subprojects/dlg/include/dlg"
228 - local dlg_src_dir="${S}/subprojects/dlg/src/dlg"
229 - local dlg_dest_dir="${S}/include"
230 - mkdir -p "${dlg_dest_dir}/dlg" || die
231 - cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die
232 - cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die
233 - fi
234 -}
235 -
236 -src_prepare() {
237 - if [[ "${PV}" == 9999 ]] ; then
238 - # Do NOT automagically mess with submodules!!!
239 - sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die
240 - # inspired by shipped autogen.sh script
241 - eval $(sed -n \
242 - -e 's/^#define *\(FREETYPE_MAJOR\) *\([0-9][0-9]*\).*/\1=\2/p' \
243 - -e 's/^#define *\(FREETYPE_MINOR\) *\([0-9][0-9]*\).*/\1=\2/p' \
244 - -e 's/^#define *\(FREETYPE_PATCH\) *\([0-9][0-9]*\).*/\1=\2/p' \
245 - include/freetype/freetype.h || die)
246 - FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}"
247 - [[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}"
248 - pushd builds/unix &>/dev/null || die
249 - sed -e "s;@VERSION@;${FREETYPE};" \
250 - < configure.raw > configure.ac || die
251 - # eautoheader produces broken ftconfig.in
252 - AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
253 - unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE
254 - popd &>/dev/null || die
255 - fi
256 -
257 - default
258 -
259 - pushd builds/unix &>/dev/null || die
260 - # eautoheader produces broken ftconfig.in
261 - AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
262 - popd &>/dev/null || die
263 -
264 - # This is the same as the 01 patch from infinality
265 - sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
266 -
267 - enable_option() {
268 - sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
269 - include/${PN}/config/ftoption.h \
270 - || die "unable to enable option $1"
271 - }
272 -
273 - disable_option() {
274 - sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
275 - include/${PN}/config/ftoption.h \
276 - || die "unable to disable option $1"
277 - }
278 -
279 - # Will be the new default for >=freetype-2.7.0
280 - disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2"
281 -
282 - if use infinality && use cleartype-hinting ; then
283 - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )"
284 - elif use infinality ; then
285 - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1"
286 - elif use cleartype-hinting ; then
287 - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2"
288 - fi
289 -
290 - # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
291 - # via environment (new since v2.8)
292 - enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
293 -
294 - # See https://freetype.org/patents.html (expired!)
295 - enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
296 -
297 - if ! use adobe-cff ; then
298 - enable_option CFF_CONFIG_OPTION_OLD_ENGINE
299 - fi
300 -
301 - if use debug ; then
302 - enable_option FT_DEBUG_LEVEL_TRACE
303 - enable_option FT_DEBUG_MEMORY
304 - fi
305 -
306 - if use utils ; then
307 - cd "${WORKDIR}/ft2demos-${PV}" || die
308 - # Disable tests needing X11 when USE="-X". (bug #177597)
309 - if ! use X ; then
310 - sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
311 - fi
312 - cd "${S}" || die
313 - fi
314 -
315 - # we need non-/bin/sh to run configure
316 - if [[ -n ${CONFIG_SHELL} ]] ; then
317 - sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
318 - "${S}"/builds/unix/configure || die
319 - fi
320 -
321 - elibtoolize --patch-only
322 -}
323 -
324 -multilib_src_configure() {
325 - append-flags -fno-strict-aliasing
326 - type -P gmake &> /dev/null && export GNUMAKE=gmake
327 -
328 - local myeconfargs=(
329 - --disable-freetype-config
330 - --enable-shared
331 - --with-zlib
332 - $(use_with brotli)
333 - $(use_with bzip2)
334 - $(use_with harfbuzz)
335 - $(use_with png)
336 - $(use_enable static-libs static)
337 - $(usex utils $(use_with svg librsvg) --without-librsvg)
338 -
339 - # avoid using libpng-config
340 - LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
341 - LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
342 - )
343 -
344 - case ${CHOST} in
345 - mingw*|*-mingw*) ;;
346 - # Workaround windows mis-detection: bug #654712
347 - # Have to do it for both ${CHOST}-windres and windres
348 - *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
349 - esac
350 -
351 - export CC_BUILD="$(tc-getBUILD_CC)"
352 -
353 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
354 -}
355 -
356 -multilib_src_compile() {
357 - default
358 -
359 - if multilib_is_native_abi && use utils ; then
360 - einfo "Building utils"
361 - # fix for Prefix, bug #339334
362 - emake \
363 - X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
364 - FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
365 - fi
366 -}
367 -
368 -multilib_src_install() {
369 - default
370 -
371 - if multilib_is_native_abi && use utils ; then
372 - einfo "Installing utils"
373 - emake DESTDIR="${D}" FT2DEMOS=1 \
374 - TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install
375 - fi
376 -}
377 -
378 -multilib_src_install_all() {
379 - if use fontforge ; then
380 - # Probably fontforge needs less but this way makes things simplier...
381 - einfo "Installing internal headers required for fontforge"
382 - local header
383 - find src/truetype include/freetype/internal -name '*.h' | \
384 - while read header ; do
385 - mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
386 - cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
387 - done
388 - fi
389 -
390 - dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
391 - if [[ "${PV}" != 9999 ]] && use doc ; then
392 - docinto html
393 - dodoc -r docs/*
394 - fi
395 -
396 - find "${ED}" -type f -name '*.la' -delete || die
397 -}