[Midnightbsd-cvs] mports: x11-toolkits/gtk20: gtk 2.10.14 (big jump)
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Aug 28 17:46:04 EDT 2007
Log Message:
-----------
gtk 2.10.14 (big jump)
Modified Files:
--------------
mports/x11-toolkits/gtk20:
Makefile (r1.7 -> r1.8)
distinfo (r1.1 -> r1.2)
pkg-plist (r1.2 -> r1.3)
mports/x11-toolkits/gtk20/files:
patch-ak (r1.1 -> r1.2)
patch-gtk_Makefile.in (r1.1 -> r1.2)
patch-gtk_xdgmime_xdgmime.c (r1.1 -> r1.2)
Added Files:
-----------
mports/x11-toolkits/gtk20/files:
patch-gtk_xdgmime_xdgmime.h (r1.1)
Removed Files:
-------------
mports/x11-toolkits/gtk20/files:
patch-gtk_gtkcalendar.c
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lx11-toolkits/gtk20/pkg-plist -Lx11-toolkits/gtk20/pkg-plist -u -r1.2 -r1.3
--- x11-toolkits/gtk20/pkg-plist
+++ x11-toolkits/gtk20/pkg-plist
@@ -49,6 +49,9 @@
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
@@ -244,9 +247,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-thai-broken.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.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
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.a
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.so
@@ -472,8 +475,6 @@
share/locale/nl/LC_MESSAGES/gtk20.mo
share/locale/nn/LC_MESSAGES/gtk20-properties.mo
share/locale/nn/LC_MESSAGES/gtk20.mo
-share/locale/no/LC_MESSAGES/gtk20-properties.mo
-share/locale/no/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
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lx11-toolkits/gtk20/Makefile -Lx11-toolkits/gtk20/Makefile -u -r1.7 -r1.8
--- x11-toolkits/gtk20/Makefile
+++ x11-toolkits/gtk20/Makefile
@@ -8,11 +8,10 @@
#
PORTNAME= gtk
-PORTVERSION= 2.8.20
-PORTREVISION= 1
+PORTVERSION= 2.10.14
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \
- ftp://ftp.gtk.org/pub/gtk/v2.8/ \
+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.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -37,6 +36,7 @@
RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+USE_GMAKE= yes
USE_XPM= yes
USE_PERL5= yes
USE_LDCONFIG= yes
@@ -44,12 +44,12 @@
USE_GNOME= gnomehack atk pango ltverhack
USE_GETTEXT= yes
USE_XLIB= yes
-CONFIGURE_ARGS= --enable-static --with-xinput=yes \
- --build=${MACHINE_ARCH}-portbld-freebsd6.0
+CONFIGURE_ARGS= --enable-static --with-xinput=yes
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd6.0
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-GTK_VERSION= 2.4.0
+GTK_VERSION= 2.10.0
PLIST_SUB= GTK_VERSION="${GTK_VERSION}"
gdk_pixbuf_MAN= gdk-pixbuf-query-loaders.1
@@ -59,45 +59,17 @@
SUB_FILES= pkg-install
-# Setting WITH_DEBUG=yes effectively adds -g to $CFLAGS
-# unless doing so would clobber a preexisting $CFLAGS.
-# Setting to yes also causes debugging into to be spat out
-# on the command-line.
-# Set to minimum if you want to send in a backtrace; set
-# to yes if you want to know what gtk thinks it's doing.
-.if defined(WITH_DEBUG) || defined(WITHOUT_DEBUG)
-.if defined(WITHOUT_DEBUG) || ${WITH_DEBUG:L} == "no"
-CONFIGURE_ARGS+= --enable-debug=no
-.else
-.if ${WITH_DEBUG:L} == "yes"
+.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-debug=yes
-STRIP=
-.else
-CONFIGURE_ARGS+= --enable-debug=minimum
-CFLAGS+= -g
-.endif
-STRIP=
-.endif
.endif
.include <bsd.port.pre.mk>
-# There is a SSE2 bug in either GCC or in our libc, when use p4, p-m or else
-# is being use in CPUTYPE that enable SSE2 will causing Java with GTK2 and
-# Mono/gtk-sharp crash. Disable SSE2 to solve the crash
-.if ( ${ARCH} == "i386" || ${ARCH} == "amd64" ) \
- && ${CC} != "icc"
-CFLAGS+= -mno-sse2
-.endif
-
-pre-everything::
-.if !defined(WITH_DEBUG)
- @${ECHO_MSG}
- @${ECHO_MSG} "Enable or disable debugging with the following knob"
- @${ECHO_MSG} "WITH_DEBUG=[no|minimum|yes] or WITHOUT_DEBUG=yes"
- @${ECHO_MSG}
- @${ECHO_MSG} "Default is minimum"
- @${ECHO_MSG}
+.if defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)
+LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base
+PLIST_SUB+= CUPS:=""
+.else
+PLIST_SUB+= CUPS:="@comment "
.endif
post-patch:
@@ -112,6 +84,9 @@
@${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \
s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \
${WRKSRC}/demos/gtk-demo/Makefile.in
+ @${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in
+ @${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \
+ ${WRKSRC}/gtk/Makefile.in
pre-build:
@${RM} -rf ${WRKSRC}/docs/gtk.info*
@@ -124,7 +99,6 @@
${INSTALL_MAN} ${gtk_MAN:S|^|${WRKSRC}/docs/reference/gtk/|} \
${PREFIX}/man/man1
-
.include <bsd.port.post.mk>
.endif
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lx11-toolkits/gtk20/distinfo -Lx11-toolkits/gtk20/distinfo -u -r1.1 -r1.2
--- x11-toolkits/gtk20/distinfo
+++ x11-toolkits/gtk20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.8.20.tar.bz2) = 74e7ca98194f1fadfe906e66d763d05d
-SHA256 (gnome2/gtk+-2.8.20.tar.bz2) = 69a9b6c1e78da7e71416f20fab0c4972503139406e89ce7fbdbac0e213b16b79
-SIZE (gnome2/gtk+-2.8.20.tar.bz2) = 12247295
+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
--- x11-toolkits/gtk20/files/patch-gtk_gtkcalendar.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk/gtkcalendar.c.orig Mon Oct 3 22:01:14 2005
-+++ gtk/gtkcalendar.c Mon Oct 3 22:02:36 2005
-@@ -566,6 +566,7 @@ gtk_calendar_init (GtkCalendar *calendar
- GtkCalendarPrivate *priv;
- gchar *year_before;
- gchar *langinfo;
-+ gchar *week_start;
- gint week_1stday = 0;
- gint first_weekday = 1;
- guint week_origin;
Index: patch-ak
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/files/patch-ak,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lx11-toolkits/gtk20/files/patch-ak -Lx11-toolkits/gtk20/files/patch-ak -u -r1.1 -r1.2
--- 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.9 2006/03/15 05:50:51 marcus Exp $
- $MCom: ports-stable/x11-toolkits/gtk20/files/patch-ak,v 1.6 2006/03/08 20:28:38 mezz Exp $
+$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 $
--- gdk/Makefile.in.orig Thu Feb 14 12:38:26 2002
+++ gdk/Makefile.in Thu Feb 14 12:45:37 2002
--- /dev/null
+++ x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h
@@ -0,0 +1,17 @@
+--- gtk/xdgmime/xdgmime.h.orig Sat Oct 7 10:42:32 2006
++++ gtk/xdgmime/xdgmime.h Sat Oct 7 11:01:57 2006
+@@ -52,11 +52,14 @@ typedef void (*XdgMimeDestroy) (void *u
+ #define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name)
+ #define xdg_mime_is_valid_mime_type XDG_ENTRY(is_valid_mime_type)
+ #define xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal)
++#define _xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal_p)
+ #define xdg_mime_media_type_equal XDG_ENTRY(media_type_equal)
+ #define xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass)
++#define _xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass_p)
+ #define xdg_mime_get_mime_parents XDG_ENTRY(get_mime_parents)
+ #define xdg_mime_list_mime_parents XDG_ENTRY(list_mime_parents)
+ #define xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type)
++#define _xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type_p)
+ #define xdg_mime_get_max_buffer_extents XDG_ENTRY(get_max_buffer_extents)
+ #define xdg_mime_shutdown XDG_ENTRY(shutdown)
+ #define xdg_mime_dump XDG_ENTRY(dump)
Index: patch-gtk_Makefile.in
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/files/patch-gtk_Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lx11-toolkits/gtk20/files/patch-gtk_Makefile.in -Lx11-toolkits/gtk20/files/patch-gtk_Makefile.in -u -r1.1 -r1.2
--- x11-toolkits/gtk20/files/patch-gtk_Makefile.in
+++ x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -1,6 +1,6 @@
---- gtk/Makefile.in.orig Wed Mar 2 15:57:44 2005
-+++ gtk/Makefile.in Wed Mar 2 15:58:22 2005
-@@ -887,12 +887,12 @@
+--- gtk/Makefile.in.orig Sat May 6 04:47:11 2006
++++ gtk/Makefile.in Sat May 6 04:48:06 2006
+@@ -1009,11 +1009,11 @@ LDADDS = \
bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache
gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
@@ -9,9 +9,8 @@
gtk_query_immodules_2_0_SOURCES = queryimmodules.c
- gtk_update_icon_cache_DEPENDENCIES = $(DEPS)
--gtk_update_icon_cache_LDADD = $(LDADDS)
-+gtk_update_icon_cache_LDADD = $(LDADDS) $(GLIB_LIBS)
+-gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
++gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
gtk_update_icon_cache_SOURCES = updateiconcache.c
- subdir = gtk
+
Index: patch-gtk_xdgmime_xdgmime.c
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lx11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c -Lx11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c -u -r1.1 -r1.2
--- 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 = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
++ xdg_data_dirs = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/";
ptr = xdg_data_dirs;
More information about the Midnightbsd-cvs
mailing list