[Midnightbsd-cvs] mports [21784] trunk/x11-toolkits/gtk30: gtk 3.18.8
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Aug 20 16:38:24 EDT 2016
Revision: 21784
http://svnweb.midnightbsd.org/mports/?rev=21784
Author: laffer1
Date: 2016-08-20 16:38:24 -0400 (Sat, 20 Aug 2016)
Log Message:
-----------
gtk 3.18.8
Modified Paths:
--------------
trunk/x11-toolkits/gtk30/Makefile
trunk/x11-toolkits/gtk30/distinfo
trunk/x11-toolkits/gtk30/files/patch-gtk_gtkbuilderparser.c
trunk/x11-toolkits/gtk30/pkg-plist
Removed Paths:
-------------
trunk/x11-toolkits/gtk30/files/extra-gtk_gtkfilechooserwidget.c
trunk/x11-toolkits/gtk30/files/extra-gtk_ui_gtkfilechooserwidget.ui
trunk/x11-toolkits/gtk30/files/patch-721398
trunk/x11-toolkits/gtk30/files/patch-gtk_gtkentrycompletion.c
Modified: trunk/x11-toolkits/gtk30/Makefile
===================================================================
--- trunk/x11-toolkits/gtk30/Makefile 2016-08-20 20:31:51 UTC (rev 21783)
+++ trunk/x11-toolkits/gtk30/Makefile 2016-08-20 20:38:24 UTC (rev 21784)
@@ -1,8 +1,8 @@
# $MidnightBSD$
PORTNAME= gtk
-PORTVERSION= 3.16.7
-PORTREVISION?= 1
+PORTVERSION= 3.18.8
+PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMESUFFIX= 3
@@ -44,7 +44,7 @@
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
-LIBVERSION= 0.1600.7
+LIBVERSION= 0.1800.8
PLIST_SUB+= LIBVERSION=${LIBVERSION}
GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \
@@ -52,8 +52,8 @@
org.gtk.Settings.Debug.gschema.xml \
org.gtk.Settings.FileChooser.gschema.xml
-OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY TYPEAHEAD
-OPTIONS_DEFAULT=CUPS COLORD BROADWAY
+OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY
+OPTIONS_DEFAULT=CUPS COLORD
OPTIONS_SUB= yes
BROADWAY_DESC= Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets.
@@ -73,23 +73,17 @@
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 <bsd.mport.options.mk>
-
-.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() evaluates too early before cairo has a chance to be installed
+ @if ! pkg-config --exists cairo-xlib; then \
+ ${ECHO_MSG} "${PKGNAME}: Needs cairo with X11 support enabled."; \
+ ${FALSE}; \
+ fi
+
pre-build:
@${RM} -rf ${WRKSRC}/docs/gtk.info*
Modified: trunk/x11-toolkits/gtk30/distinfo
===================================================================
--- trunk/x11-toolkits/gtk30/distinfo 2016-08-20 20:31:51 UTC (rev 21783)
+++ trunk/x11-toolkits/gtk30/distinfo 2016-08-20 20:38:24 UTC (rev 21784)
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtk+-3.16.7.tar.xz) = 19689d14de54d182fad538153dbff6d41f53841f940aa871585fdea0306c7fba
-SIZE (gnome3/gtk+-3.16.7.tar.xz) = 18294656
+SHA256 (gnome3/gtk+-3.18.8.tar.xz) = 1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8
+SIZE (gnome3/gtk+-3.18.8.tar.xz) = 16806532
Deleted: trunk/x11-toolkits/gtk30/files/extra-gtk_gtkfilechooserwidget.c
===================================================================
--- trunk/x11-toolkits/gtk30/files/extra-gtk_gtkfilechooserwidget.c 2016-08-20 20:31:51 UTC (rev 21783)
+++ trunk/x11-toolkits/gtk30/files/extra-gtk_gtkfilechooserwidget.c 2016-08-20 20:38:24 UTC (rev 21784)
@@ -1,18 +0,0 @@
---- 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);
Deleted: trunk/x11-toolkits/gtk30/files/extra-gtk_ui_gtkfilechooserwidget.ui
===================================================================
--- trunk/x11-toolkits/gtk30/files/extra-gtk_ui_gtkfilechooserwidget.ui 2016-08-20 20:31:51 UTC (rev 21783)
+++ trunk/x11-toolkits/gtk30/files/extra-gtk_ui_gtkfilechooserwidget.ui 2016-08-20 20:38:24 UTC (rev 21784)
@@ -1,11 +0,0 @@
---- 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 @@
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
-- <property name="enable-search">False</property>
-+ <property name="enable-search">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="browse_files_tree_view-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Files</property>
Deleted: trunk/x11-toolkits/gtk30/files/patch-721398
===================================================================
--- trunk/x11-toolkits/gtk30/files/patch-721398 2016-08-20 20:31:51 UTC (rev 21783)
+++ trunk/x11-toolkits/gtk30/files/patch-721398 2016-08-20 20:38:24 UTC (rev 21784)
@@ -1,81 +0,0 @@
-From 55edc81c10742bf3e410168f6dc317f8aca05938 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen at redhat.com>
-Date: Mon, 27 Jul 2015 23:18:27 -0400
-Subject: x11: Make selection handling work across screens
-
-When dealing with selection events, we might see windows from
-other screens in the requestor field. The current x11 backend
-code fails to wrap these in a foreign GdkWindow, since we
-don't have the corresponding GdkScreen anymore. Work around
-this by creating such 'foreign screens' on demand. We still
-maintain the 1:1 relation between the display and the screen
-returned by gdk_display_get_default_screen().
-
-https://bugzilla.gnome.org/show_bug.cgi?id=721398
-
-diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
-index f2824b6..9bb27ee 100644
---- gdk/x11/gdkdisplay-x11.c
-+++ gdk/x11/gdkdisplay-x11.c
-@@ -1959,6 +1959,7 @@ gdk_x11_display_finalize (GObject *object)
-
- /* Free all GdkScreens */
- g_object_unref (display_x11->screen);
-+ g_list_free_full (display_x11->screens, g_object_unref);
-
- g_free (display_x11->startup_notification_id);
-
-@@ -2035,12 +2036,36 @@ GdkScreen *
- _gdk_x11_display_screen_for_xrootwin (GdkDisplay *display,
- Window xrootwin)
- {
-- GdkScreen *screen = gdk_display_get_default_screen (display);
-+ GdkScreen *screen;
-+ XWindowAttributes attrs;
-+ gboolean result;
-+ GdkX11Display *display_x11;
-+ GList *l;
-+
-+ screen = gdk_display_get_default_screen (display);
-
- if (GDK_SCREEN_XROOTWIN (screen) == xrootwin)
- return screen;
-
-- return NULL;
-+ display_x11 = GDK_X11_DISPLAY (display);
-+
-+ for (l = display_x11->screens; l; l = l->next)
-+ {
-+ screen = l->data;
-+ if (GDK_SCREEN_XROOTWIN (screen) == xrootwin)
-+ return screen;
-+ }
-+
-+ gdk_x11_display_error_trap_push (display);
-+ result = XGetWindowAttributes (display_x11->xdisplay, xrootwin, &attrs);
-+ if (gdk_x11_display_error_trap_pop (display) || !result)
-+ return NULL;
-+
-+ screen = _gdk_x11_screen_new (display, XScreenNumberOfScreen (attrs.screen));
-+
-+ display_x11->screens = g_list_prepend (display_x11->screens, screen);
-+
-+ return screen;
- }
-
- /**
-diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
-index aadf255..9b78f61 100644
---- gdk/x11/gdkdisplay-x11.h
-+++ gdk/x11/gdkdisplay-x11.h
-@@ -39,6 +39,7 @@ struct _GdkX11Display
- GdkDisplay parent_instance;
- Display *xdisplay;
- GdkScreen *screen;
-+ GList *screens;
-
- GSource *event_source;
-
---
-cgit v0.10.2
-
Modified: trunk/x11-toolkits/gtk30/files/patch-gtk_gtkbuilderparser.c
===================================================================
--- trunk/x11-toolkits/gtk30/files/patch-gtk_gtkbuilderparser.c 2016-08-20 20:31:51 UTC (rev 21783)
+++ trunk/x11-toolkits/gtk30/files/patch-gtk_gtkbuilderparser.c 2016-08-20 20:38:24 UTC (rev 21784)
@@ -1,15 +1,15 @@
---- gtk/gtkbuilderparser.c.dist 2010-06-08 14:11:06.000000000 -0500
-+++ gtk/gtkbuilderparser.c 2010-06-08 14:11:33.000000000 -0500
-@@ -1051,7 +1051,7 @@
+--- gtk/gtkbuilderparser.c.orig 2015-11-12 16:34:36.000000000 +0100
++++ gtk/gtkbuilderparser.c 2015-11-12 23:17:26.500037000 +0100
+@@ -1146,7 +1146,7 @@
/* Called for character data */
/* text is not nul-terminated */
static void
--text (GMarkupParseContext *context,
-+XXXtext (GMarkupParseContext *context,
- const gchar *text,
- gsize text_len,
- gpointer user_data,
-@@ -1106,7 +1106,7 @@
+-text (GMarkupParseContext *context,
++XXXtext (GMarkupParseContext *context,
+ const gchar *text,
+ gsize text_len,
+ gpointer user_data,
+@@ -1204,7 +1204,7 @@
static const GMarkupParser parser = {
start_element,
end_element,
@@ -16,5 +16,5 @@
- text,
+ XXXtext,
NULL,
- NULL
};
+
Deleted: trunk/x11-toolkits/gtk30/files/patch-gtk_gtkentrycompletion.c
===================================================================
--- trunk/x11-toolkits/gtk30/files/patch-gtk_gtkentrycompletion.c 2016-08-20 20:31:51 UTC (rev 21783)
+++ trunk/x11-toolkits/gtk30/files/patch-gtk_gtkentrycompletion.c 2016-08-20 20:38:24 UTC (rev 21784)
@@ -1,50 +0,0 @@
-
-https://git.gnome.org/browse/gtk+/commit/?id=0731c502626d2b739281f7bb87f5cfd9d8a61ade
-
-From 0731c502626d2b739281f7bb87f5cfd9d8a61ade Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen at redhat.com>
-Date: Thu, 15 Oct 2015 20:16:54 -0400
-Subject: entry completion: Only grab the device if we have one
-
-When the entry completion is popped up from a timeout, we may
-not have a device. In that case, don't call gdk_device_grab,
-do avoid criticals.
----
- gtk/gtkentrycompletion.c | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
-index cee8f25..9acae9d 100644
---- gtk/gtkentrycompletion.c
-+++ gtk/gtkentrycompletion.c
-@@ -1654,15 +1654,18 @@ gtk_entry_completion_popup (GtkEntryCompletion *completion)
-
- gtk_widget_show (completion->priv->popup_window);
-
-- gtk_device_grab_add (completion->priv->popup_window, completion->priv->device, TRUE);
-- gdk_device_grab (completion->priv->device, gtk_widget_get_window (completion->priv->popup_window),
-- GDK_OWNERSHIP_WINDOW, TRUE,
-- GDK_BUTTON_PRESS_MASK |
-- GDK_BUTTON_RELEASE_MASK |
-- GDK_POINTER_MOTION_MASK,
-- NULL, GDK_CURRENT_TIME);
--
-- completion->priv->has_grab = TRUE;
-+ if (completion->priv->device)
-+ {
-+ gtk_device_grab_add (completion->priv->popup_window, completion->priv->device, TRUE);
-+ gdk_device_grab (completion->priv->device, gtk_widget_get_window (completion->priv->popup_window),
-+ GDK_OWNERSHIP_WINDOW, TRUE,
-+ GDK_BUTTON_PRESS_MASK |
-+ GDK_BUTTON_RELEASE_MASK |
-+ GDK_POINTER_MOTION_MASK,
-+ NULL, GDK_CURRENT_TIME);
-+
-+ completion->priv->has_grab = TRUE;
-+ }
- }
-
- void
---
-cgit v0.11.2
-
Modified: trunk/x11-toolkits/gtk30/pkg-plist
===================================================================
--- trunk/x11-toolkits/gtk30/pkg-plist 2016-08-20 20:31:51 UTC (rev 21783)
+++ trunk/x11-toolkits/gtk30/pkg-plist 2016-08-20 20:38:24 UTC (rev 21784)
@@ -1,3 +1,4 @@
+bin/gtk-builder-tool
%%BROADWAY%%bin/broadwayd
bin/gtk-encode-symbolic-svg
bin/gtk-launch
@@ -682,7 +683,7 @@
share/locale/zh_TW/LC_MESSAGES/gtk30.mo
share/themes/Default/gtk-3.0/gtk-keys.css
share/themes/Emacs/gtk-3.0/gtk-keys.css
- at exec %D/bin/gtk-query-immodules-3.0 --update-cache > /dev/null 2>&1 || /usr/bin/true
+ at postexec %D/bin/gtk-query-immodules-3.0 --update-cache > /dev/null 2>&1 || /usr/bin/true
@rmtry lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
@exec /bin/mkdir -p %D/lib/gtk-3.0/modules
@exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/engines
More information about the Midnightbsd-cvs
mailing list