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

Add missing MODGNOME_CPPFLAGS.

Browse Source 
Regen WANTLIB.
Fix build with glib2>=2.36.0.
This commit is contained in:
ajacoutot 2013-03-27 17:57:11 +00:00
parent 762acae293
commit eb923cf959
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
www/gtkhtml3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.55 2013/03/11 11:44:42 espie Exp $
# $OpenBSD: Makefile,v 1.56 2013/03/27 17:57:11 ajacoutot Exp $
# XXX fix building with glib2 >= 2.29 (G_CONST_RETURN is deprecated)
CFLAGS += "-DG_CONST_RETURN=const"
@ -10,10 +10,11 @@ COMMENT= lightweight HTML rendering/printing/editing engine
GNOME_PROJECT= gtkhtml
GNOME_VERSION= 3.32.2
API_VERSION= 3.14
EXTRACT_SUFX= .tar.bz2
PKGNAME= gtkhtml3-${VERSION}
REVISION= 3
REVISION= 4
HOMEPAGE= http://www.gnome.org/
@ -28,17 +29,15 @@ MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
# GPLv2/LGPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo
WANTLIB += dbus-1 dbus-glib-1 drm enchant expat ffi fontconfig
WANTLIB += freetype gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 c cairo dbus-1 dbus-glib-1 enchant
WANTLIB += expat ffi fontconfig freetype gailutil gconf-2 gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz icudata
WANTLIB += icule icuuc m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread pthread-stubs stdc++ xcb
WANTLIB += xcb-render xcb-shm z
EXTRACT_SUFX= .tar.bz2
MODULES= devel/gettext \
x11/gnome
@ -56,6 +55,8 @@ RUN_DEPENDS= devel/iso-codes \
CONFIGURE_STYLE= gnu
MODGNOME_CPPFLAGS= -I${X11BASE}/include
SUBST_VARS= API_VERSION
# Resolve conflict with gtkhtml4.

18
www/gtkhtml3/patches/patch-components_editor_main_c Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-components_editor_main_c,v 1.1 2013/03/27 17:57:11 ajacoutot Exp $
From 4537a45bd19ae01510a445707aeb357739befa16 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 26 Oct 2011 19:25:40 +0000
Subject: Remove g_thread_init() calls.
--- components/editor/main.c.orig Mon Sep 13 14:16:10 2010
+++ components/editor/main.c Wed Mar 27 09:15:35 2013
@@ -373,8 +373,6 @@ main (gint argc, gchar **argv)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
- g_thread_init (NULL);
-
gtk_init (&argc, &argv);
editor = gtkhtml_editor_new ();