From: "Mart Raudsepp" <leio@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/gtk+/files/
Date: Mon, 30 Oct 2017 22:34:47 +0000 (UTC) [thread overview]
Message-ID: <1509402860.be53a87b3187123e00bfa703015d5a251a21d0f2.leio@gentoo> (raw)
commit: be53a87b3187123e00bfa703015d5a251a21d0f2
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Oct 1 13:38:12 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 22:34:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be53a87b
x11-libs/gtk+: remove unused patch
.../files/gtk+-2.24.27-update-icon-cache.patch | 64 ----------------------
1 file changed, 64 deletions(-)
diff --git a/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch
deleted file mode 100644
index f88e02e5350..00000000000
--- a/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 2537d97e4685767ce22834c0dd24d37ba715fb52 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 9 May 2015 23:30:58 +0200
-Subject: [PATCH] Always use external gtk-update-icon-cache
-
----
- configure.ac | 8 +++-----
- gtk/Makefile.am | 13 ++-----------
- 2 files changed, 5 insertions(+), 16 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2671a3d..fa46004 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -913,11 +913,9 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
-
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
-
--if test $cross_compiling = yes; then
-- AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
-- if test x$GTK_UPDATE_ICON_CACHE = xno; then
-- REBUILD_PNGS=#
-- fi
-+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
-+if test x$GTK_UPDATE_ICON_CACHE = xno; then
-+ REBUILD_PNGS=#
- fi
-
- AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 248220d..42e4c23 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1039,8 +1039,7 @@ endif
- # Installed tools
- #
- bin_PROGRAMS = \
-- gtk-query-immodules-2.0 \
-- gtk-update-icon-cache
-+ gtk-query-immodules-2.0
-
- bin_SCRIPTS = gtk-builder-convert
-
-@@ -1390,16 +1389,8 @@ stamp-icons: $(STOCK_ICONS)
- ) done \
- && touch stamp-icons
-
--if CROSS_COMPILING
--gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
--else
--gtk_update_icon_cache_program = \
-- ./gtk-update-icon-cache
--endif
--
- gtkbuiltincache.h: @REBUILD@ stamp-icons
-- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
-- $(gtk_update_icon_cache_program) --force --ignore-theme-index \
-+ $(GTK_UPDATE_ICON_CACHE) --force --ignore-theme-index \
- --include-image-data \
- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
- mv gtkbuiltincache.h.tmp gtkbuiltincache.h
---
-2.3.6
-
next reply other threads:[~2017-10-30 22:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-30 22:34 Mart Raudsepp [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-10-30 21:31 [gentoo-commits] repo/gentoo:master commit in: x11-libs/gtk+/files/ Patrice Clement
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=1509402860.be53a87b3187123e00bfa703015d5a251a21d0f2.leio@gentoo \
--to=leio@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