[Midnightbsd-cvs] mports: x11-toolkits/gtk20:
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Feb 17 02:22:24 EST 2008
Log Message:
-----------
Modified Files:
--------------
mports/x11-toolkits/gtk20:
Makefile (r1.10 -> r1.11)
distinfo (r1.2 -> r1.3)
pkg-plist (r1.4 -> r1.5)
mports/x11-toolkits/gtk20/files:
patch-ak (r1.2 -> r1.3)
patch-gtk_xdgmime_xdgmime.c (r1.2 -> r1.3)
patch-gtk_xdgmime_xdgmimecache.h (r1.1 -> r1.2)
Removed Files:
-------------
mports/x11-toolkits/gtk20/files:
patch-gtk_gtkiconcache.c
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/pkg-plist,v
retrieving revision 1.4
retrieving revision 1.5
diff -L x11-toolkits/gtk20/pkg-plist -L x11-toolkits/gtk20/pkg-plist -u -r1.4 -r1.5
--- x11-toolkits/gtk20/pkg-plist
+++ x11-toolkits/gtk20/pkg-plist
@@ -1,9 +1,12 @@
- at comment $MidnightBSD$
bin/gdk-pixbuf-csource
bin/gdk-pixbuf-query-loaders
+bin/gtk-builder-convert
bin/gtk-demo
bin/gtk-query-immodules-2.0
bin/gtk-update-icon-cache
+ at comment etc/gtk-2.0/gdk-pixbuf.loaders
+ at comment etc/gtk-2.0/gtk.immodules
+etc/gtk-2.0/im-multipress.conf
include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -50,9 +53,6 @@
include/gtk-2.0/gdk/gdkwindow.h
include/gtk-2.0/gdk/gdkx.h
include/gtk-2.0/gdkconfig.h
-include/gtk-2.0/gtk/gtkassistant.h
-include/gtk-2.0/gtk/gtkcellrendereraccel.h
-include/gtk-2.0/gtk/gtkcellrendererspin.h
include/gtk-2.0/gtk/gtk.h
include/gtk-2.0/gtk/gtkaboutdialog.h
include/gtk-2.0/gtk/gtkaccelgroup.h
@@ -65,19 +65,23 @@
include/gtk-2.0/gtk/gtkalignment.h
include/gtk-2.0/gtk/gtkarrow.h
include/gtk-2.0/gtk/gtkaspectframe.h
+include/gtk-2.0/gtk/gtkassistant.h
include/gtk-2.0/gtk/gtkbbox.h
include/gtk-2.0/gtk/gtkbin.h
include/gtk-2.0/gtk/gtkbindings.h
include/gtk-2.0/gtk/gtkbox.h
+include/gtk-2.0/gtk/gtkbuildable.h
+include/gtk-2.0/gtk/gtkbuilder.h
include/gtk-2.0/gtk/gtkbutton.h
include/gtk-2.0/gtk/gtkcalendar.h
include/gtk-2.0/gtk/gtkcelleditable.h
include/gtk-2.0/gtk/gtkcelllayout.h
-include/gtk-2.0/gtk/gtklinkbutton.h
include/gtk-2.0/gtk/gtkcellrenderer.h
+include/gtk-2.0/gtk/gtkcellrendereraccel.h
include/gtk-2.0/gtk/gtkcellrenderercombo.h
include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
include/gtk-2.0/gtk/gtkcellrendererprogress.h
+include/gtk-2.0/gtk/gtkcellrendererspin.h
include/gtk-2.0/gtk/gtkcellrenderertext.h
include/gtk-2.0/gtk/gtkcellrenderertoggle.h
include/gtk-2.0/gtk/gtkcellview.h
@@ -140,6 +144,7 @@
include/gtk-2.0/gtk/gtkitemfactory.h
include/gtk-2.0/gtk/gtklabel.h
include/gtk-2.0/gtk/gtklayout.h
+include/gtk-2.0/gtk/gtklinkbutton.h
include/gtk-2.0/gtk/gtklist.h
include/gtk-2.0/gtk/gtklistitem.h
include/gtk-2.0/gtk/gtkliststore.h
@@ -176,6 +181,7 @@
include/gtk-2.0/gtk/gtkradiotoolbutton.h
include/gtk-2.0/gtk/gtkrange.h
include/gtk-2.0/gtk/gtkrc.h
+include/gtk-2.0/gtk/gtkrecentaction.h
include/gtk-2.0/gtk/gtkrecentchooser.h
include/gtk-2.0/gtk/gtkrecentchooserdialog.h
include/gtk-2.0/gtk/gtkrecentchoosermenu.h
@@ -184,6 +190,7 @@
include/gtk-2.0/gtk/gtkrecentmanager.h
include/gtk-2.0/gtk/gtkruler.h
include/gtk-2.0/gtk/gtkscale.h
+include/gtk-2.0/gtk/gtkscalebutton.h
include/gtk-2.0/gtk/gtkscrollbar.h
include/gtk-2.0/gtk/gtkscrolledwindow.h
include/gtk-2.0/gtk/gtkselection.h
@@ -219,6 +226,7 @@
include/gtk-2.0/gtk/gtktoolbar.h
include/gtk-2.0/gtk/gtktoolbutton.h
include/gtk-2.0/gtk/gtktoolitem.h
+include/gtk-2.0/gtk/gtktooltip.h
include/gtk-2.0/gtk/gtktooltips.h
include/gtk-2.0/gtk/gtktree.h
include/gtk-2.0/gtk/gtktreednd.h
@@ -238,6 +246,7 @@
include/gtk-2.0/gtk/gtkvbox.h
include/gtk-2.0/gtk/gtkversion.h
include/gtk-2.0/gtk/gtkviewport.h
+include/gtk-2.0/gtk/gtkvolumebutton.h
include/gtk-2.0/gtk/gtkvpaned.h
include/gtk-2.0/gtk/gtkvruler.h
include/gtk-2.0/gtk/gtkvscale.h
@@ -267,6 +276,9 @@
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.la
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.a
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.so
@@ -362,11 +374,13 @@
share/gtk-2.0/demo/appwindow.c
share/gtk-2.0/demo/assistant.c
share/gtk-2.0/demo/background.jpg
+share/gtk-2.0/demo/builder.c
share/gtk-2.0/demo/button_box.c
share/gtk-2.0/demo/changedisplay.c
share/gtk-2.0/demo/clipboard.c
share/gtk-2.0/demo/colorsel.c
share/gtk-2.0/demo/combobox.c
+share/gtk-2.0/demo/demo.ui
share/gtk-2.0/demo/dialog.c
share/gtk-2.0/demo/drawingarea.c
share/gtk-2.0/demo/editable_cells.c
@@ -480,6 +494,8 @@
share/locale/ia/LC_MESSAGES/gtk20.mo
share/locale/id/LC_MESSAGES/gtk20-properties.mo
share/locale/id/LC_MESSAGES/gtk20.mo
+share/locale/io/LC_MESSAGES/gtk20-properties.mo
+share/locale/io/LC_MESSAGES/gtk20.mo
share/locale/is/LC_MESSAGES/gtk20-properties.mo
share/locale/is/LC_MESSAGES/gtk20.mo
share/locale/it/LC_MESSAGES/gtk20-properties.mo
@@ -488,6 +504,8 @@
share/locale/ja/LC_MESSAGES/gtk20.mo
share/locale/ka/LC_MESSAGES/gtk20-properties.mo
share/locale/ka/LC_MESSAGES/gtk20.mo
+share/locale/kn/LC_MESSAGES/gtk20-properties.mo
+share/locale/kn/LC_MESSAGES/gtk20.mo
share/locale/ko/LC_MESSAGES/gtk20-properties.mo
share/locale/ko/LC_MESSAGES/gtk20.mo
share/locale/ku/LC_MESSAGES/gtk20-properties.mo
@@ -520,8 +538,10 @@
share/locale/nn/LC_MESSAGES/gtk20.mo
share/locale/nso/LC_MESSAGES/gtk20-properties.mo
share/locale/nso/LC_MESSAGES/gtk20.mo
-share/locale/or/LC_MESSAGES/gtk20.mo
+share/locale/oc/LC_MESSAGES/gtk20-properties.mo
+share/locale/oc/LC_MESSAGES/gtk20.mo
share/locale/or/LC_MESSAGES/gtk20-properties.mo
+share/locale/or/LC_MESSAGES/gtk20.mo
share/locale/pa/LC_MESSAGES/gtk20-properties.mo
share/locale/pa/LC_MESSAGES/gtk20.mo
share/locale/pl/LC_MESSAGES/gtk20-properties.mo
@@ -570,8 +590,8 @@
share/locale/ur/LC_MESSAGES/gtk20.mo
share/locale/uz/LC_MESSAGES/gtk20-properties.mo
share/locale/uz/LC_MESSAGES/gtk20.mo
-share/locale/uz at Latn/LC_MESSAGES/gtk20-properties.mo
-share/locale/uz at Latn/LC_MESSAGES/gtk20.mo
+share/locale/uz at cyrillic/LC_MESSAGES/gtk20-properties.mo
+share/locale/uz at cyrillic/LC_MESSAGES/gtk20.mo
share/locale/vi/LC_MESSAGES/gtk20-properties.mo
share/locale/vi/LC_MESSAGES/gtk20.mo
share/locale/wa/LC_MESSAGES/gtk20-properties.mo
@@ -605,6 +625,11 @@
@dirrm include/gtk-2.0/gdk-pixbuf
@dirrm include/gtk-2.0/gdk
@dirrm include/gtk-2.0
+ at dirrm etc/gtk-2.0
+ at exec /bin/mkdir -p %D/lib/gtk-2.0/modules
+ at exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines
+ at dirrmtry share/themes/Default
+ at dirrmtry share/themes
@dirrmtry lib/gtk-2.0/modules
@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/printbackends
@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/loaders
@@ -612,20 +637,14 @@
@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/engines
@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%
@dirrmtry lib/gtk-2.0
- at exec /bin/mkdir -p %D/etc/gtk-2.0/
- at unexec rm %D/etc/gtk-2.0/gtk.immodules
- at unexec rm %D/etc/gtk-2.0/gdk-pixbuf.loaders
- at dirrm etc/gtk-2.0
- at dirrmtry share/themes/Default
- at dirrmtry share/themes
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/yi/LC_MESSAGES
@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
- at dirrmtry share/locale/uz at Latn/LC_MESSAGES
- at dirrmtry share/locale/uz at Latn
+ at dirrmtry share/locale/uz at cyrillic/LC_MESSAGES
+ at dirrmtry share/locale/uz at cyrillic
@dirrmtry share/locale/ur/LC_MESSAGES
@dirrmtry share/locale/ur
@dirrmtry share/locale/tt/LC_MESSAGES
@@ -638,6 +657,8 @@
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+ at dirrmtry share/locale/oc/LC_MESSAGES
+ at dirrmtry share/locale/oc
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
@dirrmtry share/locale/mr/LC_MESSAGES
@@ -646,6 +667,8 @@
@dirrmtry share/locale/mi
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+ at dirrmtry share/locale/io/LC_MESSAGES
+ at dirrmtry share/locale/io
@dirrmtry share/locale/ia/LC_MESSAGES
@dirrmtry share/locale/ia
@dirrmtry share/locale/hy/LC_MESSAGES
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -L x11-toolkits/gtk20/Makefile -L x11-toolkits/gtk20/Makefile -u -r1.10 -r1.11
--- x11-toolkits/gtk20/Makefile
+++ x11-toolkits/gtk20/Makefile
@@ -8,11 +8,10 @@
#
PORTNAME= gtk
-PORTVERSION= 2.10.14
-PORTREVISION= 1
+PORTVERSION= 2.12.7
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/v2.10/ \
+ ftp://ftp.gtk.org/pub/gtk/v2.12/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -83,8 +82,7 @@
${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
- s|%%X11BASE%%|${X11BASE}|g' \
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/gtk/xdgmime/xdgmime.c
# GnomeVFS needs pthread; gtk-demo may use GnomeVFS (via GtkFileChooser)
@${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11-toolkits/gtk20/distinfo -L x11-toolkits/gtk20/distinfo -u -r1.2 -r1.3
--- x11-toolkits/gtk20/distinfo
+++ x11-toolkits/gtk20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.10.14.tar.bz2) = 018d7dd0fa7de01cfdb77c7c55e7ba26
-SHA256 (gnome2/gtk+-2.10.14.tar.bz2) = d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2
-SIZE (gnome2/gtk+-2.10.14.tar.bz2) = 15172170
+MD5 (gnome2/gtk+-2.12.7.tar.bz2) = 57132c4a921ef00e241a0fc991787556
+SHA256 (gnome2/gtk+-2.12.7.tar.bz2) = ef1be6d109b8a4a05c604944616043a4647510f5c1ff5eb84a1eaecc3d5425d3
+SIZE (gnome2/gtk+-2.12.7.tar.bz2) = 16111869
--- x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- gtk/gtkiconcache.c.orig Mon Aug 29 07:05:13 2005
-+++ gtk/gtkiconcache.c Sat Nov 19 19:14:10 2005
-@@ -75,6 +75,37 @@
- }
- }
-
-+static gboolean
-+is_uptodate (const char *dirname, time_t cache_mtime)
-+{
-+ GDir *dir;
-+ const char *filename;
-+ gboolean uptodate = TRUE;
-+
-+ dir = g_dir_open (dirname, 0, NULL);
-+ if (! dir)
-+ return TRUE;
-+
-+ while (uptodate && (filename = g_dir_read_name (dir)))
-+ if (filename[0] != '.')
-+ {
-+ char *pathname;
-+ struct stat st;
-+
-+ pathname = g_build_filename (dirname, filename, NULL);
-+ if (g_stat (pathname, &st) >= 0
-+ && (cache_mtime < st.st_mtime
-+ || (S_ISDIR (st.st_mode)
-+ && ! is_uptodate (pathname, cache_mtime))))
-+ uptodate = FALSE;
-+ g_free(pathname);
-+ }
-+
-+ g_dir_close(dir);
-+
-+ return uptodate;
-+}
-+
- GtkIconCache *
- _gtk_icon_cache_new_for_path (const gchar *path)
- {
-@@ -106,7 +137,7 @@
- goto done;
-
- /* Verify cache is uptodate */
-- if (st.st_mtime < path_st.st_mtime)
-+ if (st.st_mtime < path_st.st_mtime || ! is_uptodate(path, st.st_mtime))
- {
- GTK_NOTE (ICONTHEME,
- g_print ("cache outdated\n"));
Index: patch-gtk_xdgmime_xdgmimecache.h
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h -L x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h -u -r1.1 -r1.2
--- x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
+++ x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
@@ -1,25 +1,12 @@
---- gtk/xdgmime/xdgmimecache.h.orig Mon May 29 20:04:24 2006
-+++ gtk/xdgmime/xdgmimecache.h Mon May 29 20:11:42 2006
-@@ -32,9 +32,19 @@
- typedef struct _XdgMimeCache XdgMimeCache;
+--- gtk/xdgmime/xdgmimecache.h.orig 2007-09-13 16:35:37.000000000 -0400
++++ gtk/xdgmime/xdgmimecache.h 2007-09-14 00:59:43.000000000 -0400
+@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach
+ #define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents)
+ #define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass)
+ #define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type)
++#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type)
++#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal)
++#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal)
- #ifdef XDG_PREFIX
--#define _xdg_mime_cache_new_from_file XDG_ENTRY(cache_new_from_file)
--#define _xdg_mime_cache_ref XDG_ENTRY(cache_ref)
--#define _xdg_mime_cache_unref XDG_ENTRY(cache_unref)
-+#define _xdg_mime_cache_new_from_file XDG_ENTRY(cache_new_from_file)
-+#define _xdg_mime_cache_ref XDG_ENTRY(cache_ref)
-+#define _xdg_mime_cache_unref XDG_ENTRY(cache_unref)
-+#define _xdg_mime_cache_get_mime_type_for_data XDG_ENTRY(cache_get_mime_type_for_data)
-+#define _xdg_mime_cache_get_mime_type_for_file XDG_ENTRY(cache_get_mime_type_for_file)
-+#define _xdg_mime_cache_get_mime_type_from_file_name XDG_ENTRY(cache_get_mime_type_from_file_name)
-+#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type)
-+#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal)
-+#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal)
-+#define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass)
-+#define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents)
-+#define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type)
-+#define _xdg_mime_cache_get_max_buffer_extents XDG_ENTRY(cache_get_max_buffer_extents)
#endif
- extern XdgMimeCache **_caches;
Index: patch-ak
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/files/patch-ak,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11-toolkits/gtk20/files/patch-ak -L x11-toolkits/gtk20/files/patch-ak -u -r1.2 -r1.3
--- x11-toolkits/gtk20/files/patch-ak
+++ x11-toolkits/gtk20/files/patch-ak
@@ -1,6 +1,6 @@
-$FreeBSD: ports/x11-toolkits/gtk20/files/patch-ak,v 1.10 2006/10/14 08:35:01 marcus Exp $
- $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.19 2006/10/10 20:22:27 mezz Exp $
+$FreeBSD: ports/x11-toolkits/gtk20/files/patch-ak,v 1.12 2007/12/12 04:29:04 mezz Exp $
+ $MCom: ports-stable/x11-toolkits/gtk20/files/patch-ak,v 1.8 2007/12/01 05:56:33 marcus Exp $
--- gdk/Makefile.in.orig Thu Feb 14 12:38:26 2002
+++ gdk/Makefile.in Thu Feb 14 12:45:37 2002
Index: patch-gtk_xdgmime_xdgmime.c
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c -L x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c -u -r1.2 -r1.3
--- x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
+++ x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
@@ -5,7 +5,7 @@
xdg_data_dirs = getenv ("XDG_DATA_DIRS");
if (xdg_data_dirs == NULL)
- xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+ xdg_data_dirs = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/";
++ xdg_data_dirs = "/usr/local/share/";
ptr = xdg_data_dirs;
More information about the Midnightbsd-cvs
mailing list