* [gentoo-commits] repo/gentoo:master commit in: media-libs/ming/files/
@ 2018-05-23 12:46 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2018-05-23 12:46 UTC (permalink / raw
To: gentoo-commits
commit: 4fde525de771a9a8f3460bb1d76d9b2b9c1976a0
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 12:46:12 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed May 23 12:46:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fde525d
media-libs/ming: Use better patch to find freetype.
Package-Manager: Portage-2.3.38, Repoman-2.3.9
.../ming/files/ming-0.4.8-freetype_pkgconfig.patch | 27 +++++++++++++++++-----
1 file changed, 21 insertions(+), 6 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 5c2de7554d4..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 ef3719d39e8bb7e96c6ec57d60261f1516353460 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,14 +6,14 @@ 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.in | 22 ++--------------------
- 1 file changed, 2 insertions(+), 20 deletions(-)
+ configure.in | 30 +++++++-----------------------
+ 1 file changed, 7 insertions(+), 23 deletions(-)
diff --git a/configure.in b/configure.in
-index 95943a0b..f1685c26 100644
+index 361db86c..cb9423f5 100644
--- a/configure.in
+++ b/configure.in
-@@ -257,26 +257,8 @@ freetype_support=yes)
+@@ -257,26 +257,10 @@ freetype_support=yes)
if test "$freetype_support" = "yes"; then
dnl Check for the freetype library
@@ -38,10 +38,25 @@ index 95943a0b..f1685c26 100644
- AC_SUBST(FREETYPE_LIBS)
- AC_SUBST(FREETYPE_CFLAGS)
+ PKG_PROG_PKG_CONFIG
-+ PKG_CHECK_MODULES(FREETYPE, freetype2,, AC_MSG_ERROR([Could not find freetype]))
++ PKG_CHECK_MODULES(FREETYPE, freetype2, HAS_FREETYPE=true,
++ AC_MSG_ERROR([Could not find freetype])
++ )
fi
dnl Check for the ungif or gif (new or old) libraries
+@@ -334,9 +318,9 @@ if test -n "${ZLIB}" -a -n "${ZLIB_INC}"; then
+ AC_DEFINE([USE_ZLIB], [1], [Use zlib])
+ fi
+
+-AM_CONDITIONAL(USE_FREETYPE, test x${ft_config} != x)
+-if test -n "${ft_config}"; then
+- AC_DEFINE(USE_FREETYPE, [1], [Use freetype library])
++AM_CONDITIONAL(USE_FREETYPE, test x${HAS_FREETYPE} != x)
++if test x${HAS_FREETYPE} = xtrue ; then
++ AC_DEFINE(USE_FREETYPE, [1], [Use freetype library])
+ fi
+
+ AM_CONDITIONAL(GIFLIB_GIFERRORSTRING, test x"$ac_cv_lib_gif_GifErrorString" = xyes)
--
2.17.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/ming/files/
@ 2018-07-10 6:12 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2018-07-10 6:12 UTC (permalink / raw
To: gentoo-commits
commit: ee3fb1f4c337ca7ef8a39c53beed512144619c44
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 10 06:12:01 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 06:12:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee3fb1f4
media-libs/ming: Sync freetype patch with upstream version.
Package-Manager: Portage-2.3.41, Repoman-2.3.9
.../ming/files/ming-0.4.8-freetype_pkgconfig.patch | 38 +++++++++++++++++-----
1 file changed, 30 insertions(+), 8 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 5bddf052122..43905fc0ed0 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 0d5b3bc1cc492c10072def017fe704782bc4b274 Mon Sep 17 00:00:00 2001
+From 3d3060a744500702e43c7deaec25c69cbf1ef532 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,13 +6,22 @@ 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.in | 30 +++++++-----------------------
- 1 file changed, 7 insertions(+), 23 deletions(-)
+ configure.ac | 36 ++++++++++--------------------------
+ 1 file changed, 10 insertions(+), 26 deletions(-)
-diff --git a/configure.in b/configure.in
-index 361db86c..cb9423f5 100644
---- a/configure.in
-+++ b/configure.in
+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 ;;
@@ -257,26 +257,10 @@ freetype_support=yes)
if test "$freetype_support" = "yes"; then
@@ -57,6 +66,19 @@ index 361db86c..cb9423f5 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.17.0
+2.18.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/ming/files/
@ 2018-07-10 16:00 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2018-07-10 16:00 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/ming/files/
@ 2019-04-23 9:55 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2019-04-23 9:55 UTC (permalink / raw
To: gentoo-commits
commit: bfd0ea58a60ecefa2e8d9641ef80a716f7072be6
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Apr 22 07:48:42 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Apr 23 09:54:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfd0ea58
media-libs/ming: remove unused patch(es)
Closes: https://github.com/gentoo/gentoo/pull/11775
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../ming/files/ming-0.4.8-CVE-2017-8782.patch | 28 ----------
.../ming/files/ming-0.4.8-freetype_pkgconfig.patch | 62 ----------------------
2 files changed, 90 deletions(-)
diff --git a/media-libs/ming/files/ming-0.4.8-CVE-2017-8782.patch b/media-libs/ming/files/ming-0.4.8-CVE-2017-8782.patch
deleted file mode 100644
index 223d363ae0b..00000000000
--- a/media-libs/ming/files/ming-0.4.8-CVE-2017-8782.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/libming/libming/commit/6eca133ee9985c298186cbe05f888082c30bf2d9
-
---- a/util/read.c
-+++ b/util/read.c
-@@ -247,6 +247,11 @@ char *readString(FILE *f)
- if(len >= buflen-2)
- {
- buf = (char *)realloc(buf, sizeof(char)*(buflen+256));
-+ if ( ! buf )
-+ {
-+ fprintf(stderr, "failed reallocating %d bytes\n", buflen+256);
-+ exit(-1);
-+ }
- buflen += 256;
- p = buf+len;
- }
-@@ -350,6 +355,11 @@ char *readSizedString(FILE *f,int size)
- if(len >= buflen-2)
- {
- buf = (char *)realloc(buf, sizeof(char)*(buflen+256));
-+ if ( ! buf )
-+ {
-+ fprintf(stderr, "failed reallocating %d bytes\n", buflen+256);
-+ exit(-1);
-+ }
- buflen += 256;
- p = buf+len;
- }
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
deleted file mode 100644
index 5bddf052122..00000000000
--- a/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-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
-
-As of freetype-2.9.1 the freetype-config script has been deprecated and
-is no longer shipped by default.
----
- configure.in | 30 +++++++-----------------------
- 1 file changed, 7 insertions(+), 23 deletions(-)
-
-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
- dnl Check for the freetype library
-- AC_ARG_WITH(freetype-config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes)
-- if test "$freetype_config" = "yes"; then
-- AC_PATH_PROG(ft_config,freetype-config,no)
-- if test "$ft_config" = "no"; then
-- echo "To compile ming please install freetype:"
-- echo " as .deb user: sudo apt-get install libfreetype6 libfreetype6-dev"
-- echo ""
-- echo "or disable the freetype configuration option:"
-- echo " --disable-freetype"
-- AC_MSG_ERROR([Could not detect freetype-config!])
-- fi
-- else
-- ft_config="$freetype_config"
-- fi
--
-- FREETYPE_CFLAGS="`$ft_config --cflags`"
-- FREETYPE_LIBS="`$ft_config --libs`"
--
-- AC_SUBST(FREETYPE_LIBS)
-- AC_SUBST(FREETYPE_CFLAGS)
-+ PKG_PROG_PKG_CONFIG
-+ PKG_CHECK_MODULES(FREETYPE, freetype2, HAS_FREETYPE=true,
-+ AC_MSG_ERROR([Could not find freetype])
-+ )
- fi
-
- dnl Check for the ungif or gif (new or old) libraries
-@@ -334,9 +318,9 @@ if test -n "${ZLIB}" -a -n "${ZLIB_INC}"; then
- AC_DEFINE([USE_ZLIB], [1], [Use zlib])
- fi
-
--AM_CONDITIONAL(USE_FREETYPE, test x${ft_config} != x)
--if test -n "${ft_config}"; then
-- AC_DEFINE(USE_FREETYPE, [1], [Use freetype library])
-+AM_CONDITIONAL(USE_FREETYPE, test x${HAS_FREETYPE} != x)
-+if test x${HAS_FREETYPE} = xtrue ; then
-+ AC_DEFINE(USE_FREETYPE, [1], [Use freetype library])
- fi
-
- AM_CONDITIONAL(GIFLIB_GIFERRORSTRING, test x"$ac_cv_lib_gif_GifErrorString" = xyes)
---
-2.17.0
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-04-23 9:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-23 12:46 [gentoo-commits] repo/gentoo:master commit in: media-libs/ming/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2018-07-10 6:12 Lars Wendler
2018-07-10 16:00 Lars Wendler
2019-04-23 9:55 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox