From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- .../tango-icon-theme-extras-0.1.0-MKDIR_P.patch | 14 ------- .../tango-icon-theme-extras-0.1.0-autotools.patch | 43 ++++++++++++++++++++++ ...go-icon-theme-extras-0.1.0-graphicsmagick.patch | 24 ------------ 3 files changed, 43 insertions(+), 38 deletions(-) delete mode 100644 x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-MKDIR_P.patch create mode 100644 x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-autotools.patch delete mode 100644 x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-graphicsmagick.patch (limited to 'x11-themes/tango-icon-theme-extras/files') diff --git a/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-MKDIR_P.patch b/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-MKDIR_P.patch deleted file mode 100644 index f757248c8f54..000000000000 --- a/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-MKDIR_P.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=486906 - -diff --git a/configure.ac b/configure.ac -index ce2bc5f..21cc450 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([svg2png.sh.in]) - - AM_INIT_AUTOMAKE([1.9 tar-ustar]) - -+AC_PROG_MKDIR_P - PKG_PROG_PKG_CONFIG([0.19]) - - # Workaround to make aclocal get the right flags diff --git a/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-autotools.patch b/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-autotools.patch new file mode 100644 index 000000000000..1bce972ea285 --- /dev/null +++ b/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-autotools.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/314423 +https://bugs.gentoo.org/413183 +https://bugs.gentoo.org/486906 + +--- a/configure.ac ++++ b/configure.ac +@@ -6,6 +6,7 @@ + + AM_INIT_AUTOMAKE([1.9 tar-ustar]) + ++AC_PROG_MKDIR_P + PKG_PROG_PKG_CONFIG([0.19]) + + # Workaround to make aclocal get the right flags +@@ -39,9 +40,6 @@ + AM_CONDITIONAL(ENABLE_ICON_FRAMING, test x$enable_framing = xyes) + + if test "x$enable_framing" = "xyes"; then +- PKG_CHECK_EXISTS([ImageMagick >= 5.5.7], +- [enable_framing=yes], [enable_framing=no]) +- if test "x$enable_framing" = "xyes"; then + AC_PATH_PROG(CONVERT, convert) + if test -z "$CONVERT"; then + AC_MSG_ERROR([ImageMagick is required to build tango-icon-theme]) +@@ -50,9 +48,6 @@ + # Add the command line options we need here + CONVERT="$CONVERT -bordercolor Transparent -border 1x1" + AC_SUBST(CONVERT) +- else +- AC_MSG_ERROR([ImageMagick is required to build tango-icon-theme]) +- fi + fi + + # Check for rsvg or ksvgtopng for creating large scale bitmaps from svg +@@ -68,7 +63,7 @@ + PKG_CHECK_EXISTS([librsvg-2.0 >= 2.12.3], + [enable_large_bitmaps=yes], [enable_large_bitmaps=no]) + if test "x$enable_large_bitmaps" = "xyes"; then +- svgconvert_prog="rsvg" ++ svgconvert_prog="rsvg-convert" + else + svgconvert_prog="ksvgtopng" + fi diff --git a/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-graphicsmagick.patch b/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-graphicsmagick.patch deleted file mode 100644 index 446d42c8f433..000000000000 --- a/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-graphicsmagick.patch +++ /dev/null @@ -1,24 +0,0 @@ -http://bugs.gentoo.org/314423 - ---- configure.ac -+++ configure.ac -@@ -39,9 +39,6 @@ - AM_CONDITIONAL(ENABLE_ICON_FRAMING, test x$enable_framing = xyes) - - if test "x$enable_framing" = "xyes"; then -- PKG_CHECK_EXISTS([ImageMagick >= 5.5.7], -- [enable_framing=yes], [enable_framing=no]) -- if test "x$enable_framing" = "xyes"; then - AC_PATH_PROG(CONVERT, convert) - if test -z "$CONVERT"; then - AC_MSG_ERROR([ImageMagick is required to build tango-icon-theme]) -@@ -50,9 +47,6 @@ - # Add the command line options we need here - CONVERT="$CONVERT -bordercolor Transparent -border 1x1" - AC_SUBST(CONVERT) -- else -- AC_MSG_ERROR([ImageMagick is required to build tango-icon-theme]) -- fi - fi - - # Check for rsvg or ksvgtopng for creating large scale bitmaps from svg -- cgit v1.2.3