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

Fix a possible crash during the build with introspection enabled (upstream).

Browse Source
This commit is contained in:
ajacoutot 2014-03-30 13:37:34 +00:00
parent 996976632d
commit c3aa4f62e3
2 changed files with 65 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
graphics/evince/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.104 2014/03/27 12:14:31 jasper Exp $
# $OpenBSD: Makefile,v 1.105 2014/03/30 13:37:34 ajacoutot Exp $
SHARED_ONLY= Yes
@ -9,15 +9,17 @@ COMMENT-nautilus= evince plugin for nautilus
GNOME_PROJECT= evince
GNOME_VERSION= 3.12.0
PKGNAME-main= ${DISTNAME}
PKGNAME-dvi= evince-dvi-${GNOME_VERSION}
PKGNAME-nautilus= nautilus-evince-${GNOME_VERSION}
REVISION-main= 0
MAJ_V= 3.0
SUBST_VARS= MAJ_V
CATEGORIES= graphics print
PKGNAME-main= ${DISTNAME}
PKGNAME-dvi= evince-dvi-${GNOME_VERSION}
PKGNAME-nautilus= nautilus-evince-${GNOME_VERSION}
SHARED_LIBS += evdocument3 0.2 # 4.0
SHARED_LIBS += evview3 0.0 # 3.0

58
graphics/evince/patches/patch-libview_ev-view-presentation_c Normal file
View File

@ -0,0 +1,58 @@
$OpenBSD: patch-libview_ev-view-presentation_c,v 1.1 2014/03/30 13:37:34 ajacoutot Exp $
From a203fc1bf0b6f4f4c920c3144ebae77e41686751 Mon Sep 17 00:00:00 2001
From: Gustau Perez <gustau.perez@gmail.com>
Date: Fri, 28 Mar 2014 19:31:08 +0000
Subject: Fix a crash during the build with introspection enabled
--- libview/ev-view-presentation.c.orig Tue Mar 25 12:16:13 2014
+++ libview/ev-view-presentation.c Sun Mar 30 15:00:09 2014
@@ -1428,7 +1428,6 @@ ev_view_presentation_class_init (EvViewPresentationCla
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GtkBindingSet *binding_set;
- GtkCssProvider *provider;
klass->change_page = ev_view_presentation_change_page;
@@ -1542,23 +1541,30 @@ ev_view_presentation_class_init (EvViewPresentationCla
gtk_binding_entry_add_signal (binding_set, GDK_KEY_K, 0,
"change_page", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD);
-
- provider = gtk_css_provider_new ();
- gtk_css_provider_load_from_data (provider,
- "EvViewPresentation {\n"
- " background-color: black; }",
- -1, NULL);
- gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
- GTK_STYLE_PROVIDER (provider),
- GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
- g_object_unref (provider);
}
static void
ev_view_presentation_init (EvViewPresentation *pview)
{
+ static gsize initialization_value = 0;
+
gtk_widget_set_can_focus (GTK_WIDGET (pview), TRUE);
pview->is_constructing = TRUE;
+
+ if (g_once_init_enter (&initialization_value)) {
+ GtkCssProvider *provider;
+
+ provider = gtk_css_provider_new ();
+ gtk_css_provider_load_from_data (provider,
+ "EvViewPresentation {\n"
+ " background-color: black; }",
+ -1, NULL);
+ gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
+ GTK_STYLE_PROVIDER (provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ g_object_unref (provider);
+ g_once_init_leave (&initialization_value, 1);
+ }
}
GtkWidget *