Index: head/x11-toolkits/gtk30/Makefile =================================================================== --- head/x11-toolkits/gtk30/Makefile (revision 393091) +++ head/x11-toolkits/gtk30/Makefile (revision 393092) @@ -1,102 +1,103 @@ # Created by: Vanilla I. Shu # $FreeBSD$ -# $MCom: ports/trunk/x11-toolkits/gtk30/Makefile 20051 2014-11-10 09:39:43Z gusi $ # Please keep gtk30 and x11-themes/gnome-themes-standard minor version in sync PORTNAME= gtk -PORTVERSION= 3.14.12 +PORTVERSION= 3.14.15 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 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 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-gtk2-dependency --disable-packagekit \ +CONFIGURE_ARGS= --enable-gtk2-dependency \ + --disable-wayland-backend \ + --enable-x11-backend \ --enable-introspection CPPFLAGS+= -I${LOCALBASE}/include -fno-omit-frame-pointer LIBS+= -L${LOCALBASE}/lib INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -LIBVERSION= 0.1400.12 +LIBVERSION= 0.1400.15 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 \ org.gtk.exampleapp.gschema.xml OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG OPTIONS_DEFAULT=CUPS COLORD OPTIONS_SUB= yes 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 # needed for the exists() check, booo .include 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|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in @${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \ ${WRKSRC}/gtk/Makefile.in @${REINPLACE_CMD} -e 's|-DG_DISABLE_CHECKS||' \ ${WRKSRC}/configure 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/distinfo =================================================================== --- head/x11-toolkits/gtk30/distinfo (revision 393091) +++ head/x11-toolkits/gtk30/distinfo (revision 393092) @@ -1,2 +1,2 @@ -SHA256 (gnome3/gtk+-3.14.12.tar.xz) = 3aaf1f04b6393695a726b4bbe09ed9c9ddb0f779edc8238f803d5a4f10a2f549 -SIZE (gnome3/gtk+-3.14.12.tar.xz) = 15784084 +SHA256 (gnome3/gtk+-3.14.15.tar.xz) = 3ac87659112ced9e5ee5bd55d055faa881aafd040f26ca40b0d8ba0fa6509c83 +SIZE (gnome3/gtk+-3.14.15.tar.xz) = 15896532 Index: head/x11-toolkits/gtk30/files/patch-721398 =================================================================== --- head/x11-toolkits/gtk30/files/patch-721398 (nonexistent) +++ head/x11-toolkits/gtk30/files/patch-721398 (revision 393092) @@ -0,0 +1,81 @@ +From 55edc81c10742bf3e410168f6dc317f8aca05938 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +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 + Property changes on: head/x11-toolkits/gtk30/files/patch-721398 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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