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 
Regen WANTLIB.
Merge PLISTs.
This commit is contained in:
ajacoutot 2013-03-27 18:01:16 +00:00
parent 1762b0732d
commit 4c7b60cdc9
8 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
japanese/gwaei/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.6 2013/03/11 11:12:33 espie Exp $
# $OpenBSD: Makefile,v 1.7 2013/03/27 18:02:51 ajacoutot Exp $
COMMENT = japanese-english dictionary program
V = 3.2.0
DISTNAME = gwaei-${V}
REVISION = 3
REVISION = 4
SHARED_LIBS = waei 0.0
@ -22,7 +22,7 @@ WANTLIB = ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi \
gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 harfbuzz \
icudata icule icuuc idn m pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs \
ssl xcb xcb-render xcb-shm z
ssl xcb xcb-render xcb-shm z graphite2
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gwaei/${V}/}
@ -41,7 +41,7 @@ MODGNOME_TOOLS = yelp
MODGNOME_DESKTOP_FILE = Yes
MODGNOME_ICON_CACHE = Yes
post-patch:
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/gwaei/help/C/*.{in,xml}
.include <bsd.port.mk>

11
japanese/gwaei/patches/patch-src_gwaei_Makefile_in
View File

@ -1,12 +1,15 @@
$OpenBSD: patch-src_gwaei_Makefile_in,v 1.1.1.1 2012/03/13 01:08:42 fgsch Exp $
--- src/gwaei/Makefile.in.orig Sun Mar 11 02:15:13 2012
+++ src/gwaei/Makefile.in Sun Mar 11 02:15:30 2012
$OpenBSD: patch-src_gwaei_Makefile_in,v 1.2 2013/03/27 18:02:51 ajacoutot Exp $
Remove -DGTK_DISABLE_DEPRECATED: fix build with gtk+3>=3.8.0 (XXX check on next update)
--- src/gwaei/Makefile.in.orig Mon Dec 19 22:49:58 2011
+++ src/gwaei/Makefile.in Wed Mar 27 17:50:23 2013
@@ -321,7 +321,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = include/gwaei help
ACLOCAL_AMFLAGS = -I m4
-DEFINITIONS = -DDATADIR2=\"$(datadir)\" -DLIBDIR=\"$(libdir)\" -DENCHANT=\"$(ENCHANT)\" -DGWAEI_LOCALEDIR=\"$(GWAEI_LOCALEDIR)\" -DGTK_DISABLE_DEPRECATED -DG_SEAL_ENABLE -Wall
+DEFINITIONS = -DDATADIR2=\"$(datadir)\" -DLIBDIR=\"$(libexecdir)\" -DENCHANT=\"$(ENCHANT)\" -DGWAEI_LOCALEDIR=\"$(GWAEI_LOCALEDIR)\" -DGTK_DISABLE_DEPRECATED -DG_SEAL_ENABLE -Wall
+DEFINITIONS = -DDATADIR2=\"$(datadir)\" -DLIBDIR=\"$(libexecdir)\" -DENCHANT=\"$(ENCHANT)\" -DGWAEI_LOCALEDIR=\"$(GWAEI_LOCALEDIR)\" -DG_SEAL_ENABLE -Wall
gwaei_SOURCES = gwaei.c application.c application-callbacks.c window.c dictinfolist.c dictinfolist-callbacks.c searchwindow.c searchwindow-callbacks.c searchwindow-output.c search-data.c spellcheck.c spellcheck-callbacks.c printing.c radicalswindow.c radicalswindow-callbacks.c kanjipadwindow-callbacks.c kanjipad-drawingarea.c kanjipad-candidatearea.c kanjipadwindow.c settingswindow.c settingswindow-callbacks.c dictionaryinstallwindow.c dictionaryinstallwindow-callbacks.c installprogresswindow.c installprogresswindow-callbacks.c
gwaei_LDADD = $(GWAEI_LIBS) ../libwaei/libwaei.la $(am__append_1)
gwaei_CPPFLAGS = $(DEFINITIONS) $(GWAEI_CFLAGS) $(GWAEI_DEFS) \

2
japanese/gwaei/pkg/PFRAG.shared
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2012/03/13 01:08:42 fgsch Exp $
@lib lib/libwaei.so.${LIBwaei_VERSION}

4
japanese/gwaei/pkg/PLIST
View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2012/06/15 08:32:16 ajacoutot Exp $
%%SHARED%%
@comment $OpenBSD: PLIST,v 1.4 2013/03/27 18:02:51 ajacoutot Exp $
@bin bin/gwaei
@bin bin/waei
include/libwaei/
@ -21,6 +20,7 @@ include/libwaei/searchitem.h
include/libwaei/utilities.h
lib/libwaei.a
lib/libwaei.la
@lib lib/libwaei.so.${LIBwaei_VERSION}
libexec/gwaei/
@bin libexec/gwaei/kpengine
@man man/man1/gwaei.1

27
x11/gtkglextmm/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2013/03/21 08:48:56 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.7 2013/03/27 18:01:16 ajacoutot Exp $
COMMENT = C++ bindings for gtkglext
DISTNAME = gtkglextmm-1.2.0
REVISION = 2
REVISION = 3
SHARED_LIBS += gdkglextmm-x11-1.2 0.0 # 0.0
SHARED_LIBS += gtkglextmm-x11-1.2 0.0 # 0.0
@ -15,19 +15,20 @@ HOMEPAGE = http://projects.gnome.org/gtkglext/
# LGPLv2.1+
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += GL GLU ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm atk-1.0 atkmm-1.6
WANTLIB += cairo cairomm-1.0 drm expat ffi fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gdkglext-x11-1.0 gdkmm-2.4
WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0
WANTLIB += graphite2 gthread-2.0 gtk-x11-2.0 gtkglext-x11-1.0
WANTLIB += gtkmm-2.4 harfbuzz icudata icule icuuc m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pangox-1.0
WANTLIB += pcre pixman-1 png pthread pthread-stubs sigc-2.0 stdc++
WANTLIB += xcb xcb-render xcb-shm z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gtkglext/}
MODULES = devel/gettext
WANTLIB += GL GLU ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm
WANTLIB += atk-1.0 atkmm-1.6 cairo cairomm-1.0 drm expat ffi fontconfig
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gdkglext-x11-1.0
WANTLIB += gdkmm-2.4 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0
WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 gtkglext-x11-1.0
WANTLIB += gtkmm-2.4 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pangomm-1.4 pangox-1.0 pcre pixman-1 png pthread-stubs
WANTLIB += sigc-2.0 stdc++ xcb xcb-render xcb-shm z
MODULES = devel/gettext
LIB_DEPENDS = x11/gtk2mm \
x11/gtkglext

14
x11/gtkglextmm/patches/patch-gdkglext_gdkmm_gl_Makefile_in Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-gdkglext_gdkmm_gl_Makefile_in,v 1.1 2013/03/27 18:01:16 ajacoutot Exp $
Fix build with glib2>=2.36.0
--- gdkglext/gdkmm/gl/Makefile.in.orig Wed Mar 27 11:31:45 2013
+++ gdkglext/gdkmm/gl/Makefile.in Wed Mar 27 11:31:52 2013
@@ -210,7 +210,6 @@ sublib_topdir = gdkglext
sublib_cflags = \
$(GDKGLEXTMM_DEP_CFLAGS) \
-DGDKMM_GL_COMPILATION \
- -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED

3
x11/gtkglextmm/pkg/PFRAG.shared
View File

@ -1,3 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2012/05/28 09:13:23 bentley Exp $
@lib lib/libgdkglextmm-x11-1.2.so.${LIBgdkglextmm-x11-1.2_VERSION}
@lib lib/libgtkglextmm-x11-1.2.so.${LIBgtkglextmm-x11-1.2_VERSION}

5
x11/gtkglextmm/pkg/PLIST
View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/05/28 09:13:23 bentley Exp $
%%SHARED%%
@comment $OpenBSD: PLIST,v 1.2 2013/03/27 18:01:16 ajacoutot Exp $
include/gtkglextmm-1.2/
include/gtkglextmm-1.2/gdkglmm.h
include/gtkglextmm-1.2/gdkmm/
@ -43,8 +42,10 @@ lib/gtkglextmm-1.2/proc/m4/convert_gdkglext.m4
lib/gtkglextmm-1.2/proc/m4/convert_gtkglext.m4
lib/libgdkglextmm-x11-1.2.a
lib/libgdkglextmm-x11-1.2.la
@lib lib/libgdkglextmm-x11-1.2.so.${LIBgdkglextmm-x11-1.2_VERSION}
lib/libgtkglextmm-x11-1.2.a
lib/libgtkglextmm-x11-1.2.la
@lib lib/libgtkglextmm-x11-1.2.so.${LIBgtkglextmm-x11-1.2_VERSION}
lib/pkgconfig/
lib/pkgconfig/gdkglextmm-1.2.pc
lib/pkgconfig/gdkglextmm-x11-1.2.pc