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

Update to gtk+2-2.24.25.

Browse Source
This commit is contained in:
ajacoutot 2014-10-10 17:03:52 +00:00
parent 89f5ab69f7
commit 42b937be01
5 changed files with 8 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/gtk+2/Makefile
View File

@ -1,16 +1,14 @@
# $OpenBSD: Makefile,v 1.200 2014/10/10 08:59:25 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.201 2014/10/10 17:03:52 ajacoutot Exp $
COMMENT-main= multi-platform graphical toolkit
COMMENT-guic= gtk+ icon theme caching utility
GNOME_VERSION= 2.24.24
GNOME_VERSION= 2.24.25
GNOME_PROJECT= gtk+
PKGNAME-main= gtk+2-${GNOME_VERSION}
PKGNAME-guic= gtk-update-icon-cache-${GNOME_VERSION}
REVISION-main= 4
CATEGORIES= x11 devel
SHARED_LIBS += gdk-x11-2.0 2400.0 # 2400.23

4
x11/gtk+2/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gtk+-2.24.24.tar.xz) = Es6y4ZjIK/uT6zY0i26Sk8j9zWB4Z2PQTP7H6+ftPW0=
SIZE (gtk+-2.24.24.tar.xz) = 13324064
SHA256 (gtk+-2.24.25.tar.xz) = OK8QIMuP89EN2iyIB/Eekq+dL6QEXeYcYu7bf7x+pbM=
SIZE (gtk+-2.24.25.tar.xz) = 13327832

40
x11/gtk+2/patches/patch-gdk_gdk_c
View File

@ -1,40 +0,0 @@
$OpenBSD: patch-gdk_gdk_c,v 1.1 2014/10/02 20:02:20 ajacoutot Exp $
From fbf38d16bcc26630f0f721d266509f5bc292f606 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue, 26 Aug 2014 12:07:34 +0100
Subject: threads: Do not release the GDK lock if it hasn't been acquired yet
--- gdk/gdk.c.orig Thu Mar 6 05:56:42 2014
+++ gdk/gdk.c Thu Oct 2 21:37:39 2014
@@ -434,7 +434,29 @@ static void
gdk_threads_impl_unlock (void)
{
if (gdk_threads_mutex)
- g_mutex_unlock (gdk_threads_mutex);
+ {
+ /* we need a trylock() here because trying to unlock a mutex
+ * that hasn't been locked yet is:
+ *
+ * a) not portable
+ * b) fail on GLib ≥ 2.41
+ *
+ * trylock() will either succeed because nothing is holding the
+ * GDK mutex, and will be unlocked right afterwards; or it's
+ * going to fail because the mutex is locked already, in which
+ * case we unlock it as expected.
+ *
+ * this is needed in the case somebody called gdk_threads_init()
+ * without calling gdk_threads_enter() before calling gtk_main().
+ * in theory, we could just say that this is undefined behaviour,
+ * but our documentation has always been *less* than explicit as
+ * to what the behaviour should actually be.
+ *
+ * see bug: https://bugzilla.gnome.org/show_bug.cgi?id=735428
+ */
+ g_mutex_trylock (gdk_threads_mutex);
+ g_mutex_unlock (gdk_threads_mutex);
+ }
}
/**

8
x11/gtk+2/patches/patch-gtk_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gtk_Makefile_in,v 1.43 2014/03/18 08:08:00 ajacoutot Exp $
--- gtk/Makefile.in.orig Tue Mar 18 02:34:58 2014
+++ gtk/Makefile.in Tue Mar 18 08:54:54 2014
@@ -1501,7 +1501,7 @@ SUBDIRS = theme-bits . tests
$OpenBSD: patch-gtk_Makefile_in,v 1.44 2014/10/10 17:03:52 ajacoutot Exp $
--- gtk/Makefile.in.orig Fri Oct 10 17:46:43 2014
+++ gtk/Makefile.in Fri Oct 10 18:47:25 2014
@@ -1497,7 +1497,7 @@ SUBDIRS = theme-bits . tests
DIST_SUBDIRS = theme-bits tests
@HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_FALSE@GTK_PRINT_BACKENDS = file,lpr
@HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE@GTK_PRINT_BACKENDS = file,papi

18
x11/gtk+2/patches/patch-modules_engines_pixbuf_pixbuf-draw_c
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-modules_engines_pixbuf_pixbuf-draw_c,v 1.1 2014/10/02 20:02:20 ajacoutot Exp $
From 1d0e2d58385bd01fdb753bf40ba2f4c32ccd0cc8 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 29 Sep 2014 16:05:57 -0400
Subject: pixbuf engine: Avoid a crash if widget is NULL
--- modules/engines/pixbuf/pixbuf-draw.c.orig Thu Mar 6 05:56:42 2014
+++ modules/engines/pixbuf/pixbuf-draw.c Thu Oct 2 21:37:23 2014
@@ -131,7 +131,7 @@ draw_simple_image(GtkStyle *style,
match_data->orientation = GTK_ORIENTATION_HORIZONTAL;
}
- if (!(match_data->flags & THEME_MATCH_DIRECTION))
+ if (widget && !(match_data->flags & THEME_MATCH_DIRECTION))
{
match_data->flags |= THEME_MATCH_DIRECTION;
match_data->direction = gtk_widget_get_direction (widget);