From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/ming/files/
Date: Tue, 10 Jul 2018 16:00:19 +0000 (UTC) [thread overview]
Message-ID: <1531238413.c7698aa3c33d5b3523e11f783e3ef63850b1c8c1.polynomial-c@gentoo> (raw)
commit: c7698aa3c33d5b3523e11f783e3ef63850b1c8c1
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 10 15:59:07 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 16:00:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7698aa3
Revert "media-libs/ming: Sync freetype patch with upstream version."
This reverts commit ee3fb1f4c337ca7ef8a39c53beed512144619c44.
Closes: https://bugs.gentoo.org/660856
.../ming/files/ming-0.4.8-freetype_pkgconfig.patch | 38 +++++-----------------
1 file changed, 8 insertions(+), 30 deletions(-)
diff --git a/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch b/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch
index 43905fc0ed0..5bddf052122 100644
--- a/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch
+++ b/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch
@@ -1,4 +1,4 @@
-From 3d3060a744500702e43c7deaec25c69cbf1ef532 Mon Sep 17 00:00:00 2001
+From 0d5b3bc1cc492c10072def017fe704782bc4b274 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Fri, 4 May 2018 17:40:04 +0200
Subject: [PATCH] Use pkg-config to find freetype
@@ -6,22 +6,13 @@ Subject: [PATCH] Use pkg-config to find freetype
As of freetype-2.9.1 the freetype-config script has been deprecated and
is no longer shipped by default.
---
- configure.ac | 36 ++++++++++--------------------------
- 1 file changed, 10 insertions(+), 26 deletions(-)
+ configure.in | 30 +++++++-----------------------
+ 1 file changed, 7 insertions(+), 23 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index 95943a0b..3d9f1874 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -247,7 +247,7 @@ AC_CHECK_LIB(X11, XGetImage, XLIB="-lX11", XLIB="")
-
- AC_ARG_ENABLE(
- [freetype],
--[ --enable-freetype Enable freetype support (default: enabled)],
-+[ --disable-freetype Disable freetype support (default: enabled)],
- [case "${enableval}" in
- yes) freetype_support=yes ;;
- no) freetype_support=no ;;
+diff --git a/configure.in b/configure.in
+index 361db86c..cb9423f5 100644
+--- a/configure.in
++++ b/configure.in
@@ -257,26 +257,10 @@ freetype_support=yes)
if test "$freetype_support" = "yes"; then
@@ -66,19 +57,6 @@ index 95943a0b..3d9f1874 100644
fi
AM_CONDITIONAL(GIFLIB_GIFERRORSTRING, test x"$ac_cv_lib_gif_GifErrorString" = xyes)
-@@ -504,10 +488,10 @@ else
- echo " ZLIB enabled ($ZLIB)"
- fi
-
--if test x"$ft_config" = "x"; then
-+if test x"$HAS_FREETYPE" = "x"; then
- echo " Freetype library disabled"
- else
-- echo " Freetype library enabled ($ft_config)"
-+ echo " Freetype library enabled ($FREETYPE_LIBS)"
- fi
-
- if test x"$GIFLIB" = "x" -o x"$GIFINC" = "x"; then
--
-2.18.0
+2.17.0
next reply other threads:[~2018-07-10 16:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-10 16:00 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-04-23 9:55 [gentoo-commits] repo/gentoo:master commit in: media-libs/ming/files/ David Seifert
2018-07-10 6:12 Lars Wendler
2018-05-23 12:46 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1531238413.c7698aa3c33d5b3523e11f783e3ef63850b1c8c1.polynomial-c@gentoo \
--to=polynomial-c@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox