cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gdl-3.22.0.

Browse Source
This commit is contained in:
ajacoutot 2016-10-31 14:14:35 +00:00
parent 1f9b02ee15
commit 978f3ba7a2
4 changed files with 8 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
x11/gnome/gdl/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.56 2016/04/28 07:33:23 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.57 2016/10/31 14:14:35 ajacoutot Exp $
COMMENT= GNOME Docking Library
GNOME_PROJECT= gdl
GNOME_VERSION= 3.20.0
REVISION= 0
GNOME_VERSION= 3.22.0
SHARED_LIBS += gdl-3 3.1 # 5.9
@ -15,10 +14,10 @@ WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
WANTLIB += cairo cairo-gobject dbus-1 epoxy expat ffi fontconfig
WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 harfbuzz lzma
WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png pthread pthread-stubs xcb xcb-render xcb-shm xml2
WANTLIB += z iconv intl
WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 harfbuzz iconv
WANTLIB += intl lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 png pthread pthread-stubs xcb xcb-render xcb-shm
WANTLIB += xml2 z
MODULES= x11/gnome

4
x11/gnome/gdl/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnome/gdl-3.20.0.tar.xz) = U9Oju5ub4ls6QMZE/bu1elpj7h9fg5wiZtHNl3k2Dos=
SIZE (gnome/gdl-3.20.0.tar.xz) = 527736
SHA256 (gnome/gdl-3.22.0.tar.xz) = zFs2DhOSKSGGkk8Pmo78D0235uVtxwQgN0ZrXMg5Zgw=
SIZE (gnome/gdl-3.22.0.tar.xz) = 529072

50
x11/gnome/gdl/patches/patch-gdl_gdl-dock-item_c
View File

@ -1,50 +0,0 @@
$OpenBSD: patch-gdl_gdl-dock-item_c,v 1.3 2016/03/19 12:55:13 ajacoutot Exp $
From 77bf6735c39ae66726ada29cb107020a57e0410e Mon Sep 17 00:00:00 2001
From: Lukas K <lu@0x83.eu>
Date: Fri, 26 Feb 2016 17:49:06 +0100
Subject: really enforce GDL_DOCK_ITEM_BEH_CANT_CLOSE
--- gdl/gdl-dock-item.c.orig Sat Mar 19 10:31:21 2016
+++ gdl/gdl-dock-item.c Sat Mar 19 13:51:38 2016
@@ -204,6 +204,7 @@ struct _GdlDockItemPrivate {
gint dragoff_x, dragoff_y;
GtkWidget *menu;
+ GtkWidget *menu_item_hide;
gboolean grip_shown;
GtkWidget *grip;
@@ -627,6 +628,7 @@ gdl_dock_item_init (GdlDockItem *item)
item->priv->in_predrag = item->priv->in_drag = FALSE;
item->priv->menu = NULL;
+ item->priv->menu_item_hide = NULL;
item->priv->preferred_width = item->priv->preferred_height = -1;
item->priv->tab_label = NULL;
@@ -862,6 +864,7 @@ gdl_dock_item_dispose (GObject *object)
if (priv->menu) {
gtk_menu_detach (GTK_MENU (priv->menu));
priv->menu = NULL;
+ priv->menu_item_hide = NULL;
}
if (priv->grip) {
@@ -1751,6 +1754,7 @@ gdl_dock_item_popup_menu (GdlDockItem *item,
gtk_menu_shell_append (GTK_MENU_SHELL (item->priv->menu), mitem);
g_signal_connect (mitem, "activate",
G_CALLBACK (gdl_dock_item_hide_cb), item);
+ item->priv->menu_item_hide = mitem;
/* Lock menuitem */
mitem = gtk_menu_item_new_with_label (_("Lock"));
gtk_menu_shell_append (GTK_MENU_SHELL (item->priv->menu), mitem);
@@ -1761,6 +1765,8 @@ gdl_dock_item_popup_menu (GdlDockItem *item,
/* Show popup menu. */
gtk_widget_show_all (item->priv->menu);
+ if (item->priv->menu_item_hide != NULL)
+ gtk_widget_set_visible(item->priv->menu_item_hide, !GDL_DOCK_ITEM_CANT_CLOSE(item));
gtk_menu_popup (GTK_MENU (item->priv->menu), NULL, NULL, NULL, NULL,
button, time);
}

20
x11/gnome/gdl/patches/patch-gdl_gdl-dock_c
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-gdl_gdl-dock_c,v 1.1 2016/03/19 12:55:13 ajacoutot Exp $
From 77bf6735c39ae66726ada29cb107020a57e0410e Mon Sep 17 00:00:00 2001
From: Lukas K <lu@0x83.eu>
Date: Fri, 26 Feb 2016 17:49:06 +0100
Subject: really enforce GDL_DOCK_ITEM_BEH_CANT_CLOSE
--- gdl/gdl-dock.c.orig Sat Mar 19 10:31:21 2016
+++ gdl/gdl-dock.c Sat Mar 19 13:51:38 2016
@@ -1014,7 +1014,9 @@ gdl_dock_floating_window_delete_event_cb (GtkWidget *w
dock = GDL_DOCK (g_object_get_data (G_OBJECT (widget), "dock"));
if (dock->priv->root) {
/* this will call reduce on ourselves, hiding the window if appropiate */
- gdl_dock_item_hide_item (GDL_DOCK_ITEM (dock->priv->root));
+ if(!GDL_DOCK_ITEM_CANT_CLOSE (GDL_DOCK_ITEM (dock->priv->root))) {
+ gdl_dock_item_hide_item (GDL_DOCK_ITEM (dock->priv->root));
+ }
}
return TRUE;