Index: head/x11-toolkits/gtk20/Makefile =================================================================== --- head/x11-toolkits/gtk20/Makefile (revision 116217) +++ head/x11-toolkits/gtk20/Makefile (revision 116218) @@ -1,77 +1,76 @@ # New ports collection makefile for: gtk13 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu # # $FreeBSD$ # PORTNAME= gtk -PORTVERSION= 2.4.6 -PORTREVISION= 1 +PORTVERSION= 2.4.7 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \ ftp://ftp.gtk.org/pub/gtk/v2.3/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R} DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome2 .if defined(WITH_DROPSHADOW) PATCH_SITES= ${MASTER_SITE_SOURCEFORGE} PATCH_SITE_SUBDIR= xfce PATCHFILES= gtk+-2.4.0-menushadow.patch PATCH_DIST_STRIP= -p1 .endif MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (current stable version) LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme USE_BZIP2= yes LATEST_LINK= gtk20 USE_X_PREFIX= yes USE_XPM= yes USE_REINPLACE= yes USE_PERL5= yes INSTALLS_SHLIB= yes USE_LIBTOOL_VER=15 USE_GNOME= gnomehack atk pango CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" PLIST_SUB= GTK_VERSION="2.4.0" pre-everything:: .if !defined(WITH_DROPSHADOW) @${ECHO_MSG} @${ECHO_MSG} "If you want to compile with experimental menu dropshadow patch," @${ECHO_MSG} "hit Ctrl-C right now and use make \"WITH_DROPSHADOW=yes\"" @${ECHO_MSG} "NOTE: This option is not supported by the FreeBSD GNOME Team." @${ECHO_MSG} "If the patch does not work or causes the build to fail, just" @${ECHO_MSG} "stop using the patch; we will not further debug it." @${ECHO_MSG} .endif post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \ ${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' \ ${WRKSRC}/gtk/xdgmime/xdgmime.c pre-build: @${RM} -rf ${WRKSRC}/docs/gtk.info* .include Property changes on: head/x11-toolkits/gtk20/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.134 \ No newline at end of property +1.135 \ No newline at end of property Index: head/x11-toolkits/gtk20/distinfo =================================================================== --- head/x11-toolkits/gtk20/distinfo (revision 116217) +++ head/x11-toolkits/gtk20/distinfo (revision 116218) @@ -1,4 +1,4 @@ -MD5 (gnome2/gtk+-2.4.6.tar.bz2) = d3da9aecbb760d276353b3392f338cee -SIZE (gnome2/gtk+-2.4.6.tar.bz2) = 9525829 +MD5 (gnome2/gtk+-2.4.7.tar.bz2) = 2cd21398a463ef205e6e7b28e54b936d +SIZE (gnome2/gtk+-2.4.7.tar.bz2) = 8920441 MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603 Property changes on: head/x11-toolkits/gtk20/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.69 \ No newline at end of property +1.70 \ No newline at end of property Index: head/x11-toolkits/gtk20/files/patch-al =================================================================== --- head/x11-toolkits/gtk20/files/patch-al (revision 116217) +++ head/x11-toolkits/gtk20/files/patch-al (nonexistent) @@ -1,69 +0,0 @@ ---- gtk/gtkfilechooserdefault.c.orig 2004-08-13 21:01:49.000000000 +0300 -+++ gtk/gtkfilechooserdefault.c 2004-08-14 20:11:58.000000000 +0300 -@@ -1832,7 +1832,6 @@ - - struct selection_check_closure { - GtkFileChooserDefault *impl; -- gboolean empty; - gboolean all_files; - gboolean all_folders; - }; -@@ -1850,7 +1849,6 @@ - gboolean is_folder; - - closure = data; -- closure->empty = FALSE; - - gtk_tree_model_sort_convert_iter_to_child_iter (closure->impl->sort_model, &child_iter, iter); - -@@ -1864,23 +1862,23 @@ - /* Checks whether the selected items in the file list are all files or all folders */ - static void - selection_check (GtkFileChooserDefault *impl, -- gboolean *empty, -+ int *num_selected, - gboolean *all_files, - gboolean *all_folders) - { - struct selection_check_closure closure; - GtkTreeSelection *selection; -+ int selected_rows; - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view)); - -+ selected_rows = gtk_tree_selection_count_selected_rows (selection); -+ - if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER - || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER) - { -- if (gtk_tree_selection_count_selected_rows (selection) == 0) -- closure.empty = TRUE; -- else -+ if (selected_rows > 0) - { -- closure.empty = FALSE; - closure.all_files = FALSE; - closure.all_folders = TRUE; - } -@@ -1891,7 +1889,6 @@ - || impl->action == GTK_FILE_CHOOSER_ACTION_SAVE); - - closure.impl = impl; -- closure.empty = TRUE; - closure.all_files = TRUE; - closure.all_folders = TRUE; - -@@ -1900,10 +1897,10 @@ - &closure); - } - -- g_assert (closure.empty || !(closure.all_files && closure.all_folders)); -+ g_assert (selected_rows == 0 || !(closure.all_files && closure.all_folders)); - -- if (empty) -- *empty = closure.empty; -+ if (num_selected) -+ *num_selected = selected_rows; - - if (all_files) - *all_files = closure.all_files; Property changes on: head/x11-toolkits/gtk20/files/patch-al ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/x11-toolkits/gtk30/Makefile =================================================================== --- head/x11-toolkits/gtk30/Makefile (revision 116217) +++ head/x11-toolkits/gtk30/Makefile (revision 116218) @@ -1,77 +1,76 @@ # New ports collection makefile for: gtk13 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu # # $FreeBSD$ # PORTNAME= gtk -PORTVERSION= 2.4.6 -PORTREVISION= 1 +PORTVERSION= 2.4.7 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \ ftp://ftp.gtk.org/pub/gtk/v2.3/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R} DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome2 .if defined(WITH_DROPSHADOW) PATCH_SITES= ${MASTER_SITE_SOURCEFORGE} PATCH_SITE_SUBDIR= xfce PATCHFILES= gtk+-2.4.0-menushadow.patch PATCH_DIST_STRIP= -p1 .endif MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (current stable version) LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme USE_BZIP2= yes LATEST_LINK= gtk20 USE_X_PREFIX= yes USE_XPM= yes USE_REINPLACE= yes USE_PERL5= yes INSTALLS_SHLIB= yes USE_LIBTOOL_VER=15 USE_GNOME= gnomehack atk pango CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" PLIST_SUB= GTK_VERSION="2.4.0" pre-everything:: .if !defined(WITH_DROPSHADOW) @${ECHO_MSG} @${ECHO_MSG} "If you want to compile with experimental menu dropshadow patch," @${ECHO_MSG} "hit Ctrl-C right now and use make \"WITH_DROPSHADOW=yes\"" @${ECHO_MSG} "NOTE: This option is not supported by the FreeBSD GNOME Team." @${ECHO_MSG} "If the patch does not work or causes the build to fail, just" @${ECHO_MSG} "stop using the patch; we will not further debug it." @${ECHO_MSG} .endif post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \ ${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' \ ${WRKSRC}/gtk/xdgmime/xdgmime.c pre-build: @${RM} -rf ${WRKSRC}/docs/gtk.info* .include Property changes on: head/x11-toolkits/gtk30/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.134 \ No newline at end of property +1.135 \ No newline at end of property Index: head/x11-toolkits/gtk30/distinfo =================================================================== --- head/x11-toolkits/gtk30/distinfo (revision 116217) +++ head/x11-toolkits/gtk30/distinfo (revision 116218) @@ -1,4 +1,4 @@ -MD5 (gnome2/gtk+-2.4.6.tar.bz2) = d3da9aecbb760d276353b3392f338cee -SIZE (gnome2/gtk+-2.4.6.tar.bz2) = 9525829 +MD5 (gnome2/gtk+-2.4.7.tar.bz2) = 2cd21398a463ef205e6e7b28e54b936d +SIZE (gnome2/gtk+-2.4.7.tar.bz2) = 8920441 MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603 Property changes on: head/x11-toolkits/gtk30/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.69 \ No newline at end of property +1.70 \ No newline at end of property Index: head/x11-toolkits/gtk30/files/patch-al =================================================================== --- head/x11-toolkits/gtk30/files/patch-al (revision 116217) +++ head/x11-toolkits/gtk30/files/patch-al (nonexistent) @@ -1,69 +0,0 @@ ---- gtk/gtkfilechooserdefault.c.orig 2004-08-13 21:01:49.000000000 +0300 -+++ gtk/gtkfilechooserdefault.c 2004-08-14 20:11:58.000000000 +0300 -@@ -1832,7 +1832,6 @@ - - struct selection_check_closure { - GtkFileChooserDefault *impl; -- gboolean empty; - gboolean all_files; - gboolean all_folders; - }; -@@ -1850,7 +1849,6 @@ - gboolean is_folder; - - closure = data; -- closure->empty = FALSE; - - gtk_tree_model_sort_convert_iter_to_child_iter (closure->impl->sort_model, &child_iter, iter); - -@@ -1864,23 +1862,23 @@ - /* Checks whether the selected items in the file list are all files or all folders */ - static void - selection_check (GtkFileChooserDefault *impl, -- gboolean *empty, -+ int *num_selected, - gboolean *all_files, - gboolean *all_folders) - { - struct selection_check_closure closure; - GtkTreeSelection *selection; -+ int selected_rows; - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view)); - -+ selected_rows = gtk_tree_selection_count_selected_rows (selection); -+ - if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER - || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER) - { -- if (gtk_tree_selection_count_selected_rows (selection) == 0) -- closure.empty = TRUE; -- else -+ if (selected_rows > 0) - { -- closure.empty = FALSE; - closure.all_files = FALSE; - closure.all_folders = TRUE; - } -@@ -1891,7 +1889,6 @@ - || impl->action == GTK_FILE_CHOOSER_ACTION_SAVE); - - closure.impl = impl; -- closure.empty = TRUE; - closure.all_files = TRUE; - closure.all_folders = TRUE; - -@@ -1900,10 +1897,10 @@ - &closure); - } - -- g_assert (closure.empty || !(closure.all_files && closure.all_folders)); -+ g_assert (selected_rows == 0 || !(closure.all_files && closure.all_folders)); - -- if (empty) -- *empty = closure.empty; -+ if (num_selected) -+ *num_selected = selected_rows; - - if (all_files) - *all_files = closure.all_files; Property changes on: head/x11-toolkits/gtk30/files/patch-al ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property