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

Fix build with glib2>=2.36.0.

Browse Source 
Remove USE_GROFF.
This commit is contained in:
ajacoutot 2013-03-27 18:00:36 +00:00
parent 30f296cdbe
commit 1762b0732d
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
x11/gnome/libbonobo/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.57 2013/03/11 11:46:11 espie Exp $
# $OpenBSD: Makefile,v 1.58 2013/03/27 18:00:36 ajacoutot Exp $
COMMENT= GNOME component and compound document system
GNOME_PROJECT= libbonobo
GNOME_VERSION= 2.32.1
REVISION= 4
EXTRACT_SUFX= .tar.bz2
REVISION= 5
SHARED_LIBS += bonobo-activation 6.0 # .4.0
SHARED_LIBS += bonobo-2 2.0 # .0.0
@ -14,10 +15,8 @@ CATEGORIES= devel
# GPLv2/LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
EXTRACT_SUFX= .tar.bz2
WANTLIB += c m pcre pthread z ORBit-2 ORBitCosNaming-2 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 xml2 gio-2.0 ffi
WANTLIB += ORBit-2 ORBitCosNaming-2 c ffi gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gthread-2.0 m pcre pthread xml2 z
MODULES= devel/gettext \
x11/gnome
@ -27,8 +26,6 @@ LIB_DEPENDS= devel/ORBit2 \
devel/glib2 \
textproc/libxml
USE_GROFF = Yes
# popt usage is deprecated in gnome, but the header file is still included
# from some libbonobo header and might still be used inside libbonobo
RUN_DEPENDS= devel/popt

14
x11/gnome/libbonobo/patches/patch-activation-server_Makefile_in Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-activation-server_Makefile_in,v 1.6 2013/03/27 18:00:36 ajacoutot Exp $
Fix build with glib2>=2.36.0
--- activation-server/Makefile.in.orig Wed Mar 27 11:15:13 2013
+++ activation-server/Makefile.in Wed Mar 27 11:15:17 2013
@@ -341,7 +341,6 @@ INCLUDES = \
$(SERVER_CFLAGS) \
$(WARN_CFLAGS) \
-DSERVER_CONFDIR=\"$(sysconfdir)\" \
- -DG_DISABLE_DEPRECATED \
-DG_LOG_DOMAIN=\"Bonobo-Activation-Server\" \
$(NULL)

4
x11/gnome/libbonobo/pkg/PFRAG.shared
View File

@ -1,5 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2006/01/08 13:25:22 steven Exp $
@comment $OpenBSD: PFRAG.shared,v 1.6 2013/03/27 18:00:36 ajacoutot Exp $
lib/bonobo/monikers/libmoniker_std_2.so
@lib lib/libbonobo-2.so.${LIBbonobo-2_VERSION}
@lib lib/libbonobo-activation.so.${LIBbonobo-activation_VERSION}
lib/orbit-2.0/Bonobo_module.so

9
x11/gnome/libbonobo/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.27 2012/09/29 10:52:28 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.28 2013/03/27 18:00:36 ajacoutot Exp $
%%SHARED%%
@bin bin/activation-client
@bin bin/bonobo-activation-run-query
@ -66,10 +66,11 @@ lib/bonobo/servers/Bonobo_Moniker_std.server
lib/bonobo/servers/Bonobo_Sample_Echo.server
lib/libbonobo-2.a
lib/libbonobo-2.la
@lib lib/libbonobo-2.so.${LIBbonobo-2_VERSION}
lib/libbonobo-activation.a
lib/libbonobo-activation.la
@lib lib/libbonobo-activation.so.${LIBbonobo-activation_VERSION}
lib/orbit-2.0/
lib/pkgconfig/
lib/pkgconfig/bonobo-activation-2.0.pc
lib/pkgconfig/libbonobo-2.0.pc
@bin libexec/bonobo-activation-server
@ -332,8 +333,6 @@ share/locale/oc/LC_MESSAGES/libbonobo-2.0.mo
share/locale/or/
share/locale/or/LC_MESSAGES/
share/locale/or/LC_MESSAGES/libbonobo-2.0.mo
share/locale/pa/
share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/libbonobo-2.0.mo
share/locale/pl/LC_MESSAGES/libbonobo-2.0.mo
share/locale/pt/LC_MESSAGES/libbonobo-2.0.mo
@ -359,8 +358,6 @@ share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo
share/locale/te/
share/locale/te/LC_MESSAGES/
share/locale/te/LC_MESSAGES/libbonobo-2.0.mo
share/locale/th/
share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/libbonobo-2.0.mo
share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ug/