* [gentoo-commits] repo/gentoo:master commit in: x11-libs/gtk+/files/
@ 2017-10-30 21:31 Patrice Clement
0 siblings, 0 replies; 2+ messages in thread
From: Patrice Clement @ 2017-10-30 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 4588a9b756645daac4bcb633014da3ea85e13961
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Oct 1 13:38:12 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 21:26:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4588a9b7
x11-libs/gtk+: remove unused patch.
Closes: https://github.com/gentoo/gentoo/pull/5828
.../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
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/gtk+/files/
@ 2017-10-30 22:34 Mart Raudsepp
0 siblings, 0 replies; 2+ messages in thread
From: Mart Raudsepp @ 2017-10-30 22:34 UTC (permalink / raw
To: gentoo-commits
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
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-10-30 22:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-30 21:31 [gentoo-commits] repo/gentoo:master commit in: x11-libs/gtk+/files/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2017-10-30 22:34 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox