Add introspection support (needed for on-going GNOME 3 work).

This commit is contained in:
ajacoutot 2011-04-07 07:45:02 +00:00
parent e7240972b9
commit f554f5a6ee
14 changed files with 106 additions and 36 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.50 2011/04/04 13:14:45 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.51 2011/04/07 07:51:54 ajacoutot Exp $
COMMENT-main= configuration database system for GNOME
COMMENT-polkit= PolicyKit integration for GConf2
@ -9,6 +9,8 @@ GNOME_VERSION= 2.32.2
PKGNAME-main= gconf2-${GNOME_VERSION}
PKGNAME-polkit= gconf2-polkit-${GNOME_VERSION}
REVISION-main= 0
SHARED_LIBS += gconf-2 6.2 # 5.5
CATEGORIES= devel
@ -45,6 +47,8 @@ MODULES= devel/gettext \
MULTI_PACKAGES= -main -polkit
BUILD_DEPENDS= devel/gobject-introspection
LIB_DEPENDS-main= ${LIB_DEPENDS} \
x11/gtk+2 \
devel/ORBit2 \
@ -60,9 +64,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-gtk-doc \
--disable-introspection \
--with-gtk=2.0 \
--without-openldap \
--enable-introspection \
--enable-defaults-service
USE_GROFF = Yes

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.4 2011/04/04 13:14:45 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2011/04/07 07:51:54 ajacoutot Exp $
@pkgpath devel/gconf2
%%SHARED%%
@unexec-delete rm -fr /var/db/gconf/gconf.xml.defaults/*
@ -30,6 +30,8 @@ lib/gio/
lib/gio/modules/
@comment lib/gio/modules/libgsettingsgconfbackend.a
@comment lib/gio/modules/libgsettingsgconfbackend.la
lib/girepository-1.0/
lib/girepository-1.0/GConf-2.0.typelib
lib/libgconf-2.a
lib/libgconf-2.la
lib/pkgconfig/
@ -61,6 +63,8 @@ share/examples/gconf2/xdg/autostart/
@sample ${SYSCONFDIR}/xdg/autostart/
share/examples/gconf2/xdg/autostart/gsettings-data-convert.desktop
@sample ${SYSCONFDIR}/xdg/autostart/gsettings-data-convert.desktop
share/gir-1.0/
share/gir-1.0/GConf-2.0.gir
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/gconf/

View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.9 2011/03/07 19:22:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.10 2011/04/07 07:56:35 ajacoutot Exp $
COMMENT= GObject based collection library
GNOME_PROJECT= libgee
GNOME_VERSION= 0.6.1
REVISION= 0
SHARED_LIBS += gee 1.0 # .2.0
CATEGORIES= devel
@ -22,7 +24,9 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB += pcre glib-2.0 gobject-2.0 gthread-2.0
BUILD_DEPENDS= lang/vala
BUILD_DEPENDS= lang/vala \
devel/gobject-introspection
LIB_DEPENDS= devel/glib2
MODULES= devel/gettext \
@ -31,7 +35,7 @@ MODULES= devel/gettext \
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-introspection \
--enable-introspection \
--disable-doc
.include <bsd.port.mk>

View File

@ -1,11 +1,15 @@
@comment $OpenBSD: PLIST,v 1.2 2010/08/21 19:11:23 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.3 2011/04/07 07:56:35 ajacoutot Exp $
%%SHARED%%
include/gee-1.0/
include/gee-1.0/gee.h
lib/girepository-1.0/
lib/girepository-1.0/Gee-1.0.typelib
lib/libgee.a
lib/libgee.la
lib/pkgconfig/
lib/pkgconfig/gee-1.0.pc
share/gir-1.0/
share/gir-1.0/Gee-1.0.gir
share/vala/
share/vala/vapi/
share/vala/vapi/gee-1.0.vapi

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.67 2010/11/15 19:46:10 espie Exp $
# $OpenBSD: Makefile,v 1.68 2011/04/07 07:50:02 ajacoutot Exp $
COMMENT-main= terminal emulation library
COMMENT-python= python bindings for vte
@ -8,6 +8,8 @@ GNOME_VERSION= 0.26.2
PKGNAME-main= ${DISTNAME}
PKGNAME-python= py-${DISTNAME}
REVISION-main= 0
CATEGORIES= devel
SHARED_LIBS+= vte 14.1 # 2609.0
@ -43,7 +45,8 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
WANTLIB-python= ${WANTLIB} ffi vte>=14 gtk-x11-2.0
BUILD_DEPENDS= ${RUN_DEPENDS-python}
BUILD_DEPENDS= devel/gobject-introspection
LIB_DEPENDS-python= ${LIB_DEPENDS-main} \
${BASE_PKGPATH} \
devel/libffi
@ -53,8 +56,8 @@ RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS} \
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-python \
--disable-Bsymbolic \
--enable-introspection=no
--enable-introspection \
--disable-Bsymbolic
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.11 2010/10/13 16:20:23 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.12 2011/04/07 07:50:02 ajacoutot Exp $
@pkgpath devel/vte
@bin bin/vte
include/vte-0.0/
@ -11,6 +11,7 @@ include/vte-0.0/vte/vtedeprecated.h
include/vte-0.0/vte/vtepty.h
include/vte-0.0/vte/vtetypebuiltins.h
include/vte-0.0/vte/vteversion.h
lib/girepository-1.0/Vte-0.0.typelib
lib/libvte.a
lib/libvte.la
@lib lib/libvte.so.${LIBvte_VERSION}
@ -26,6 +27,7 @@ lib/vte-0.0/window
@bin libexec/gnome-pty-helper
@mode
@group
share/gir-1.0/Vte-0.0.gir
share/gtk-doc/html/vte-0.0/
share/gtk-doc/html/vte-0.0/VteReaper.html
share/gtk-doc/html/vte-0.0/VteTerminal.html

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.30 2011/03/21 15:02:39 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.31 2011/04/07 07:56:25 ajacoutot Exp $
SHARED_ONLY= Yes
@ -7,6 +7,8 @@ COMMENT= GObject-based parsing library
GNOME_PROJECT= totem-pl-parser
GNOME_VERSION= 2.32.4
REVISION= 0
SHARED_LIBS += totem-plparser 3.0 # .17.0
SHARED_LIBS += totem-plparser-mini 3.0 # .17.0
@ -28,6 +30,7 @@ WANTLIB += soup-gnome-2.4 sqlite3 tasn1
MODULES= devel/gettext \
x11/gnome
BUILD_DEPENDS= devel/gobject-introspection
LIB_DEPENDS= gmime->=2.4,<2.6:mail/gmime24 \
textproc/libxml \
@ -37,8 +40,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-gtk-doc \
--disable-introspection \
--disable-quvi
--disable-quvi \
--enable-introspection
FAKE_FLAGS= itlocaledir=${PREFIX}/share/locale/

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2010/10/18 16:42:06 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.11 2011/04/07 07:56:25 ajacoutot Exp $
include/totem-pl-parser/
include/totem-pl-parser/1/
include/totem-pl-parser/1/plparser/
@ -8,6 +8,7 @@ include/totem-pl-parser/1/plparser/totem-pl-parser-features.h
include/totem-pl-parser/1/plparser/totem-pl-parser-mini.h
include/totem-pl-parser/1/plparser/totem-pl-parser.h
include/totem-pl-parser/1/plparser/totem-pl-playlist.h
lib/girepository-1.0/TotemPlParser-1.0.typelib
lib/libtotem-plparser-mini.a
lib/libtotem-plparser-mini.la
@lib lib/libtotem-plparser-mini.so.${LIBtotem-plparser-mini_VERSION}
@ -16,6 +17,7 @@ lib/libtotem-plparser.la
@lib lib/libtotem-plparser.so.${LIBtotem-plparser_VERSION}
lib/pkgconfig/totem-plparser-mini.pc
lib/pkgconfig/totem-plparser.pc
share/gir-1.0/TotemPlParser-1.0.gir
share/gtk-doc/html/totem-pl-parser/
share/gtk-doc/html/totem-pl-parser/TotemPlParser.html
share/gtk-doc/html/totem-pl-parser/TotemPlPlaylist.html

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.127 2011/04/06 07:47:28 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.128 2011/04/07 07:45:32 ajacoutot Exp $
SHARED_ONLY= Yes
@ -13,7 +13,7 @@ PKGNAME-main= gtk+2-${V}
PKGNAME-docs= gtk+2-docs-${V}
PKGNAME-cups= gtk+2-cups-${V}
REVISION-main= 0
REVISION-main= 1
CATEGORIES= x11 devel
@ -50,9 +50,9 @@ RUN_DEPENDS-main= ${RUN_DEPENDS} \
LIB_DEPENDS-main= ${LIB_DEPENDS} \
devel/glib2>=2.26.0 \
devel/pango \
devel/atk \
graphics/gdk-pixbuf2
devel/pango>=1.28.4p0 \
devel/atk>=2.0.0p0 \
graphics/gdk-pixbuf2>=2.22.1p0
WANTLIB-main += ${WANTLIB} c pthread glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB-main += gio-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 atk-1.0
@ -61,6 +61,8 @@ WANTLIB-main += png
MODPY_BUILDDEP= No
MODPY_RUNDEP= No
BUILD_DEPENDS= devel/gobject-introspection
LIB_DEPENDS-docs= # empty
RUN_DEPENDS-docs= # empty
WANTLIB-docs += # empty
@ -86,7 +88,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/freetype2/ \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-gtk-doc \
--disable-introspection \
--enable-introspection \
--enable-man=no \
--with-xinput=yes \
--disable-papi \

View File

@ -1,9 +1,23 @@
$OpenBSD: patch-configure,v 1.28 2011/03/07 19:19:27 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.29 2011/04/07 07:45:32 ajacoutot Exp $
./configure[23737]: ${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}: bad substitution
Do not force enable_man to yes.
--- configure.orig Sun Jan 30 05:39:23 2011
+++ configure Mon Jan 31 09:33:16 2011
--- configure.orig Thu Apr 7 08:47:54 2011
+++ configure Thu Apr 7 08:48:15 2011
@@ -24725,9 +24725,9 @@ $as_echo "$found_introspection" >&6; }
INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
+ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"`
INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
+ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"`
INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
@@ -25033,7 +25033,7 @@ fi
# Check whether --enable-man was given.

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.22 2011/04/06 07:47:28 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.23 2011/04/07 07:45:32 ajacoutot Exp $
@conflict gail-*
@pkgpath x11/gtk+2
bin/gtk-builder-convert
@ -271,6 +271,9 @@ include/gtk-unix-print-2.0/gtk/gtkprinter.h
include/gtk-unix-print-2.0/gtk/gtkprintjob.h
include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
include/gtk-unix-print-2.0/gtk/gtkunixprint.h
lib/girepository-1.0/Gdk-2.0.typelib
lib/girepository-1.0/GdkX11-2.0.typelib
lib/girepository-1.0/Gtk-2.0.typelib
lib/gtk-2.0/
lib/gtk-2.0/2.10.0/
lib/gtk-2.0/2.10.0/engines/
@ -346,6 +349,9 @@ share/aclocal/gtk-2.0.m4
share/examples/gtk+2/
share/examples/gtk+2/gtk-2.0/
share/examples/gtk+2/gtk-2.0/im-multipress.conf
share/gir-1.0/Gdk-2.0.gir
share/gir-1.0/GdkX11-2.0.gir
share/gir-1.0/Gtk-2.0.gir
share/gtk-2.0/
share/gtk-2.0/demo/
share/gtk-2.0/demo/alphatest.png

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2011/04/06 07:49:31 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.9 2011/04/07 07:45:02 ajacoutot Exp $
SHARED_ONLY= Yes
@ -13,7 +13,7 @@ PKGNAME-main= gtk+3-${V}
PKGNAME-docs= gtk+3-docs-${V}
PKGNAME-cups= gtk+3-cups-${V}
REVISION-main= 0
REVISION-main= 1
CATEGORIES= x11 devel
@ -46,14 +46,16 @@ MULTI_PACKAGES= -main -docs -cups
MODULES= devel/gettext \
devel/dconf
BUILD_DEPENDS= devel/gobject-introspection
RUN_DEPENDS-main= ${RUN_DEPENDS} \
x11/hicolor-icon-theme \
misc/shared-mime-info
LIB_DEPENDS-main= ${LIB_DEPENDS} \
devel/glib2>=2.28.0 \
devel/pango \
devel/atk \
devel/pango>=1.28.4p0 \
devel/atk>=2.0.0p0 \
graphics/gdk-pixbuf2
WANTLIB-main += ${WANTLIB}
@ -83,16 +85,16 @@ CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/freetype2/ \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-gtk-doc \
--disable-introspection \
--disable-silent-rules \
--disable-man \
--disable-papi \
--disable-packagekit \
--enable-introspection \
--without-xml-catalog
# Do not build gtk-update-icon-cache and other shared tools.
CONFIGURE_ARGS += --enable-gtk2-dependency
BUILD_DEPENDS = ${RUN_DEPENDS}
BUILD_DEPENDS += ${RUN_DEPENDS}
RUN_DEPENDS += x11/gtk+2
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/gtk+3

View File

@ -1,9 +1,23 @@
$OpenBSD: patch-configure,v 1.2 2011/03/21 18:41:00 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.3 2011/04/07 07:45:02 ajacoutot Exp $
./configure[23737]: ${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}: bad substitution
Do not force enable_man to yes.
--- configure.orig Mon Mar 21 16:14:52 2011
+++ configure Mon Mar 21 19:15:55 2011
--- configure.orig Thu Apr 7 08:24:13 2011
+++ configure Thu Apr 7 08:24:21 2011
@@ -23728,9 +23728,9 @@ $as_echo "$found_introspection" >&6; }
INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
+ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"`
INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
+ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"`
INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
@@ -24065,7 +24065,7 @@ fi
# Check whether --enable-man was given.

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.2 2011/04/06 07:49:31 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2011/04/07 07:45:02 ajacoutot Exp $
@bin bin/gtk-query-immodules-3.0
@bin bin/gtk3-demo
include/gail-3.0/
@ -276,6 +276,9 @@ include/gtk-3.0/unix-print/gtk/gtkprinter.h
include/gtk-3.0/unix-print/gtk/gtkprintjob.h
include/gtk-3.0/unix-print/gtk/gtkprintunixdialog.h
include/gtk-3.0/unix-print/gtk/gtkunixprint.h
lib/girepository-1.0/Gdk-3.0.typelib
lib/girepository-1.0/GdkX11-3.0.typelib
lib/girepository-1.0/Gtk-3.0.typelib
lib/gtk-3.0/
lib/gtk-3.0/3.0.0/
lib/gtk-3.0/3.0.0/immodules/
@ -347,6 +350,9 @@ share/aclocal/gtk-3.0.m4
share/examples/gtk+3/
share/examples/gtk+3/gtk-3.0/
share/examples/gtk+3/gtk-3.0/im-multipress.conf
share/gir-1.0/Gdk-3.0.gir
share/gir-1.0/GdkX11-3.0.gir
share/gir-1.0/Gtk-3.0.gir
share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
share/gtk-3.0/
share/gtk-3.0/demo/