Index: head/x11-toolkits/gtk30/Makefile =================================================================== --- head/x11-toolkits/gtk30/Makefile (revision 393874) +++ head/x11-toolkits/gtk30/Makefile (revision 393875) @@ -1,106 +1,114 @@ # Created by: Vanilla I. Shu # $FreeBSD$ # Please keep gtk30 in sync with the following x11-themes ports: # adwaita-icon-theme, gnome-themes-standard and mate-themes PORTNAME= gtk PORTVERSION= 3.16.6 PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMESUFFIX= 3 DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (current stable version) LICENSE= LGPL20 USES= tar:xz .if defined(REFERENCE_PORT) PORTSCOUT= ignore:1 .else PORTSCOUT= limit:1,even BUILD_DEPENDS+= at-spi2-atk>=0:${PORTSDIR}/accessibility/at-spi2-atk LIB_DEPENDS= libepoxy.so:${PORTSDIR}/graphics/libepoxy RUN_DEPENDS+= hicolor-icon-theme>=0:${PORTSDIR}/misc/hicolor-icon-theme \ adwaita-icon-theme>=0:${PORTSDIR}/x11-themes/adwaita-icon-theme \ at-spi2-atk>=0:${PORTSDIR}/accessibility/at-spi2-atk USE_PERL5= build USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME= atk gdkpixbuf2 introspection:build pango #gtk-update-icon-cache \ # introspection:build pango USES+= gettext gmake libtool pathfix perl5 pkgconfig USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite CONFIGURE_ARGS= --enable-x11-backend \ --disable-wayland-backend \ --enable-introspection CPPFLAGS+= -I${LOCALBASE}/include -fno-omit-frame-pointer LIBS+= -L${LOCALBASE}/lib INSTALLS_ICONS= yes INSTALL_TARGET= install-strip LIBVERSION= 0.1600.6 PLIST_SUB+= LIBVERSION=${LIBVERSION} GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ org.gtk.Settings.ColorChooser.gschema.xml \ org.gtk.Settings.Debug.gschema.xml \ org.gtk.Settings.FileChooser.gschema.xml -OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY +OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY TYPEAHEAD OPTIONS_DEFAULT=CUPS COLORD BROADWAY OPTIONS_SUB= yes BROADWAY_DESC= Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets. BROADWAY_CONFIGURE_ENABLE= broadway-backend COLORD_DESC= Color profile support COLORD_LIB_DEPENDS= libcolord.so:${PORTSDIR}/graphics/colord COLORD_CONFIGURE_ENABLE=colord CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client CUPS_CONFIGURE_ENABLE= cups CLOUDPRINT_DESC= Cloud printing support CLOUDPRINT_CONFIGURE_ENABLE= cloudprint CLOUDPRINT_LIB_DEPENDS= librest-0.7.so:${PORTSDIR}/devel/librest \ libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib DEBUG_CONFIGURE_ENABLE=debug +# GTK+ 3.17 has a beter way +TYPEAHEAD_DESC= Re-enable type-a-head functionality in file chooser + # needed for the exists() check, booo .include + +.if ${PORT_OPTIONS:MTYPEAHEAD} +EXTRA_PATCHES+= ${FILESDIR}/extra-gtk_gtkfilechooserwidget.c \ + ${FILESDIR}/extra-gtk_ui_gtkfilechooserwidget.ui +.endif post-patch: @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \ ${WRKSRC}/gtk/Makefile.in pre-configure: .if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc) @${ECHO_CMD} "${PKGNAME}: Needs cairo with X11 support enabled." @${FALSE} .endif pre-build: @${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/engines @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/loaders ${INSTALL_MAN} ${WRKSRC}/docs/reference/gtk/gtk-query-immodules-3.0.1 \ ${STAGEDIR}${PREFIX}/man/man1 .include .endif Index: head/x11-toolkits/gtk30/files/extra-gtk_gtkfilechooserwidget.c =================================================================== --- head/x11-toolkits/gtk30/files/extra-gtk_gtkfilechooserwidget.c (nonexistent) +++ head/x11-toolkits/gtk30/files/extra-gtk_gtkfilechooserwidget.c (revision 393875) @@ -0,0 +1,18 @@ +--- gtk/gtkfilechooserwidget.c.orig 2015-08-10 13:02:47.225114000 +0200 ++++ gtk/gtkfilechooserwidget.c 2015-08-10 13:03:58.007015000 +0200 +@@ -1895,7 +1895,6 @@ file_list_set_sort_column_ids (GtkFileCh + { + GtkFileChooserWidgetPrivate *priv = impl->priv; + +- gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), -1); + + gtk_tree_view_column_set_sort_column_id (priv->list_name_column, MODEL_COL_NAME); + gtk_tree_view_column_set_sort_column_id (priv->list_mtime_column, MODEL_COL_MTIME); +@@ -3468,6 +3467,7 @@ load_set_model (GtkFileChooserWidget *im + gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view), + GTK_TREE_MODEL (priv->browse_files_model)); + gtk_tree_view_columns_autosize (GTK_TREE_VIEW (priv->browse_files_tree_view)); ++ gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), MODEL_COL_NAME); + file_list_set_sort_column_ids (impl); + set_sort_column (impl); + profile_msg (" gtk_tree_view_set_model end", NULL); Property changes on: head/x11-toolkits/gtk30/files/extra-gtk_gtkfilechooserwidget.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/gtk30/files/extra-gtk_ui_gtkfilechooserwidget.ui =================================================================== --- head/x11-toolkits/gtk30/files/extra-gtk_ui_gtkfilechooserwidget.ui (nonexistent) +++ head/x11-toolkits/gtk30/files/extra-gtk_ui_gtkfilechooserwidget.ui (revision 393875) @@ -0,0 +1,11 @@ +--- gtk/ui/gtkfilechooserwidget.ui.orig 2015-07-21 14:07:11.000000000 +0200 ++++ gtk/ui/gtkfilechooserwidget.ui 2015-08-10 13:01:52.186654000 +0200 +@@ -193,7 +193,7 @@ + True + True + True +- False ++ True + + + Files Property changes on: head/x11-toolkits/gtk30/files/extra-gtk_ui_gtkfilechooserwidget.ui ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property