From 2210b8330fa95dc720696f95b5613f7e2c1fb878 Mon Sep 17 00:00:00 2001 From: kwm Date: Fri, 4 Mar 2011 14:34:04 +0000 Subject: Rip out gtk-update-icon-cache from gtk20. Currently based on gtk 2.24.1. This makes it that gtk30 doesn't depend on gtk20 anymore. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15347 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-toolkits/gtk20/Makefile | 9 +++++---- .../gtk20/files/patch-docs_reference_gtk_Makefile.in | 11 +++++++++++ x11-toolkits/gtk20/files/patch-gtk_Makefile.in | 20 +++++++++++++++----- x11-toolkits/gtk20/pkg-plist | 9 ++++----- x11-toolkits/gtk30/Makefile | 6 +++--- x11-toolkits/gtk30/pkg-plist | 6 ++++-- 6 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 x11-toolkits/gtk20/files/patch-docs_reference_gtk_Makefile.in (limited to 'x11-toolkits') diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index df27c4504..4c5aee34d 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,12 +3,13 @@ # Whom: Vanilla I. Shu # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.218 2011/02/21 20:17:35 kwm Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.219 2011/03/04 09:46:52 kwm Exp $ # +# Remember to update graphics/gtk-update-icon-cache too. PORTNAME= gtk PORTVERSION= 2.24.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ @@ -40,7 +41,7 @@ USE_PERL5_BUILD=yes MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack +USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache USE_GETTEXT= yes USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite @@ -49,7 +50,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -MAN1= gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 +MAN1= gtk-query-immodules-2.0.1 .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug=yes diff --git a/x11-toolkits/gtk20/files/patch-docs_reference_gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-docs_reference_gtk_Makefile.in new file mode 100644 index 000000000..b1a3d8374 --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-docs_reference_gtk_Makefile.in @@ -0,0 +1,11 @@ +--- docs/reference/gtk/Makefile.in.orig 2011-03-04 12:25:26.000000000 +0100 ++++ docs/reference/gtk/Makefile.in 2011-03-04 12:25:42.000000000 +0100 +@@ -748,7 +748,7 @@ + @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + + ######################################################################## +-@ENABLE_MAN_TRUE@man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1 ++@ENABLE_MAN_TRUE@man_MANS = gtk-query-immodules-2.0.1 gtk-builder-convert.1 + @ENABLE_MAN_TRUE@BUILT_EXTRA_DIST = $(man_MANS) + all: all-am + diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in index 82740da0a..0672550a9 100644 --- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in +++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in @@ -2,9 +2,19 @@ Stock icons. This was removed in 2.21.x, however it is used by atleast firefox. https://bugzilla.gnome.org/show_bug.cgi?id=629878 ---- gtk/Makefile.in.orig 2010-11-21 16:06:15.000000000 +0100 -+++ gtk/Makefile.in 2010-11-21 16:36:39.000000000 +0100 -@@ -1352,9 +1352,9 @@ +--- gtk/Makefile.in.orig 2011-03-04 12:02:32.000000000 +0100 ++++ gtk/Makefile.in 2011-03-04 12:03:28.000000000 +0100 +@@ -71,8 +71,7 @@ + @HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@am__append_15 = --add-include-path=$(top_builddir)/gdk/x11 + @HAVE_INTROSPECTION_TRUE@am__append_16 = Gtk-2.0.gir + @HAVE_INTROSPECTION_TRUE@am__append_17 = $(gir_DATA) $(typelibs_DATA) +-bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT) \ +- gtk-update-icon-cache$(EXEEXT) ++bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT) + @OS_WIN32_TRUE@am__append_18 = \ + @OS_WIN32_TRUE@ $(GTK_UPDATE_ICON_CACHE_MANIFEST) + +@@ -1358,9 +1357,9 @@ # gtk-update-icon-cache.exe doesn't require any special privileges. @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) @@ -16,7 +26,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=629878 gtk_update_icon_cache_SOURCES = updateiconcache.c STOCK_ICONS = \ stock-icons/16/document-open-recent.png \ -@@ -1595,7 +1595,171 @@ +@@ -1601,7 +1600,171 @@ stock-icons/24/folder-remote.png \ stock-icons/24/user-home.png \ stock-icons/24/user-desktop.png \ @@ -189,7 +199,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=629878 @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache -@@ -2866,6 +3030,88 @@ +@@ -2873,6 +3036,88 @@ && $(LN_S) folder.png user-desktop.png \ && $(RM) text-x-generic.png \ && $(LN_S) document-x-generic.png text-x-generic.png \ diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 9c3501696..a4ac7f4e6 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -1,7 +1,6 @@ bin/gtk-builder-convert bin/gtk-demo bin/gtk-query-immodules-2.0 -bin/gtk-update-icon-cache etc/gtk-2.0/gtk.immodules etc/gtk-2.0/im-multipress.conf include/gail-1.0/gail/gailwidget.h @@ -608,10 +607,12 @@ share/themes/Raleigh/gtk-2.0/gtkrc @exec /usr/bin/find %%LOCALBASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true @unexec /usr/bin/find %%LOCALBASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true @dirrm share/themes/Raleigh/gtk-2.0 -@dirrm share/themes/Raleigh +@dirrmtry share/themes/Raleigh @dirrm share/themes/Emacs/gtk-2.0-key -@dirrm share/themes/Emacs +@dirrmtry share/themes/Emacs @dirrm share/themes/Default/gtk-2.0-key +@dirrmtry share/themes/Default +@dirrmtry share/themes @dirrm share/gtk-2.0/demo @dirrm share/gtk-2.0 @dirrm include/gtk-unix-print-2.0/gtk @@ -626,8 +627,6 @@ share/themes/Raleigh/gtk-2.0/gtkrc @exec /bin/mkdir -p %D/lib/gtk-2.0/modules @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/engines @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/loaders -@dirrmtry share/themes/Default -@dirrmtry share/themes @dirrmtry lib/gtk-2.0/modules @dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/printbackends @dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/modules diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index ac33876ab..b80fd25e7 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -3,12 +3,12 @@ # Whom: Vanilla I. Shu # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.23 2011/02/14 17:14:28 kwm Exp $ +# $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.24 2011/02/22 04:27:11 avl Exp $ # PORTNAME= gtk PORTVERSION= 3.0.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ @@ -40,7 +40,7 @@ USE_PERL5_BUILD=yes MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack gtk20 +USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache USE_GETTEXT= yes USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 396308987..5d6fdaa46 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -619,8 +619,12 @@ share/themes/Raleigh/gtk-3.0/gtk.css @exec /usr/bin/find %%LOCALBASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true @unexec /usr/bin/find %%LOCALBASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true @dirrm share/themes/Raleigh/gtk-3.0 +@dirrmtry share/themes/Raleigh @dirrm share/themes/Emacs/gtk-3.0 +@dirrmtry share/themes/Emacs @dirrm share/themes/Default/gtk-3.0 +@dirrmtry share/themes/Default +@dirrmtry share/themes @dirrm share/gtk-3.0/demo @dirrm share/gtk-3.0 @dirrm include/gtk-3.0/unix-print/gtk @@ -636,8 +640,6 @@ share/themes/Raleigh/gtk-3.0/gtk.css @exec /bin/mkdir -p %D/lib/gtk-3.0/modules @exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/engines @exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/loaders -@dirrmtry share/themes/Default -@dirrmtry share/themes @dirrmtry lib/gtk-3.0/modules @dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/printbackends @dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/modules -- cgit v1.2.3