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

Update to gobject-introspection-0.6.7.

Browse Source 
ok jasper@
This commit is contained in:
ajacoutot 2009-12-22 15:19:52 +00:00
parent 04052a6f9c
commit df1c0ad448
13 changed files with 119 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
devel/gobject-introspection/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2009/11/12 21:48:18 jasper Exp $
# $OpenBSD: Makefile,v 1.3 2009/12/22 15:19:52 ajacoutot Exp $
COMMENT= GObject Introspection
GNOME_VERSION= 0.6.5
GNOME_VERSION= 0.6.7
GNOME_PROJECT= gobject-introspection
PKGNAME= ${DISTNAME}p0
CATEGORIES= devel
SHARED_LIBS += girepository-1.0 0.0 # .0.0
@ -23,7 +22,7 @@ MODULES= devel/gettext \
lang/python \
x11/gnome
WANTLIB += c pcre
WANTLIB += c pcre pthread
LIB_DEPENDS= gio-2.0,glib-2.0,gmodule-2.0,gobject-2.0::devel/glib2 \
ffi::devel/libffi
@ -39,12 +38,24 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
SUBST_VARS+= MODPY_SITEPKG
CFLAGS+= -pthread
SUBST_VARS+= MODPY_SITEPKG LIBTOOL
SUBST_SO= gir/GLib-2.0.gir gir/GObject-2.0.gir gir/GModule-2.0 \
gir/Gio-2.0.gir
# Ugly hack to fix build. See upstream Bugzilla #596224.
pre-configure:
${SUBST_CMD} ${WRKSRC}/gir/Makefile.in \
${WRKSRC}/giscanner/Makefile.in \
${WRKSRC}/tools/g-ir-scanner.in
${SUBST_CMD} ${WRKSRC}/Makefile.introspection \
${WRKSRC}/gir/Makefile.in \
${WRKSRC}/tests/scanner/Makefile.in \
${WRKSRC}/tests/offsets/Makefile.in \
${WRKSRC}/tools/g-ir-scanner.in \
${WRKSRC}/gir/GIRepository-2.0.gir \
${WRKSRC}/gir/Everything-1.0.gir \
${WRKSRC}/gir/Everything-1.0-expected.gir
.for i in ${SUBST_SO}
perl -pi -e 's,\.so\.[0-9],\.so,g' ${WRKSRC}/${i}
.endfor
.include <bsd.port.mk>

10
devel/gobject-introspection/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gobject-introspection-0.6.5.tar.bz2) = yUbN3xDwKjrqSDlnq23mBQ==
RMD160 (gobject-introspection-0.6.5.tar.bz2) = KOYIDmKf8EuBdEKXRgzfDWHbeJ8=
SHA1 (gobject-introspection-0.6.5.tar.bz2) = /6ZnKWMAGGN+W5H4gxbTxTZnKEA=
SHA256 (gobject-introspection-0.6.5.tar.bz2) = /hcCIA1FlYzf43B5UtZMOlQWKLEgOpsmRNsO4sbV33k=
SIZE (gobject-introspection-0.6.5.tar.bz2) = 608305
MD5 (gobject-introspection-0.6.7.tar.bz2) = QSBcFMvYZjKAZXhEjim9MA==
RMD160 (gobject-introspection-0.6.7.tar.bz2) = e8GQveuPpVU7NMGA1m52UrdXHRY=
SHA1 (gobject-introspection-0.6.7.tar.bz2) = O88faU5mA8JkXFebfTWP6xDs4Uw=
SHA256 (gobject-introspection-0.6.7.tar.bz2) = yXyk6XiwWDmZd1ZA6en5e2SliArSpq3DzpAyB7YW8ko=
SIZE (gobject-introspection-0.6.7.tar.bz2) = 579956

12
devel/gobject-introspection/patches/patch-gir_Everything-1_0-expected_gir Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-gir_Everything-1_0-expected_gir,v 1.1 2009/12/22 15:19:52 ajacoutot Exp $
--- gir/Everything-1.0-expected.gir.orig Thu Dec 17 11:30:40 2009
+++ gir/Everything-1.0-expected.gir Thu Dec 17 11:30:59 2009
@@ -11,7 +11,7 @@ and/or use gtk-doc annotations. -->
<package name="gobject-2.0"/>
<namespace name="Everything"
version="1.0"
- shared-library="libgirepository-everything-1.0.so.1"
+ shared-library="libgirepository-everything-1.0.so.${LIBgirepository-everything-1.0_VERSION}"
c:prefix="Everything">
<record name="TestBoxed"
c:type="TestBoxed"

12
devel/gobject-introspection/patches/patch-gir_Everything-1_0_gir Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-gir_Everything-1_0_gir,v 1.1 2009/12/22 15:19:52 ajacoutot Exp $
--- gir/Everything-1.0.gir.orig Thu Dec 17 11:30:09 2009
+++ gir/Everything-1.0.gir Thu Dec 17 11:30:27 2009
@@ -11,7 +11,7 @@ and/or use gtk-doc annotations. -->
<package name="gobject-2.0"/>
<namespace name="Everything"
version="1.0"
- shared-library="libgirepository-everything-1.0.so.1"
+ shared-library="libgirepository-everything-1.0.so.${LIBgirepository-everything-1.0_VERSION}"
c:prefix="Everything">
<record name="TestBoxed"
c:type="TestBoxed"

12
devel/gobject-introspection/patches/patch-gir_GIRepository-2_0_gir Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-gir_GIRepository-2_0_gir,v 1.1 2009/12/22 15:19:52 ajacoutot Exp $
--- gir/GIRepository-2.0.gir.orig Thu Dec 17 11:29:23 2009
+++ gir/GIRepository-2.0.gir Thu Dec 17 11:29:49 2009
@@ -12,7 +12,7 @@ and/or use gtk-doc annotations. -->
<c:include name="girepository.h"/>
<namespace name="GIRepository"
version="2.0"
- shared-library="libgirepository-1.0.so.0"
+ shared-library="libgirepository-1.0.so.${LIBgirepository-1.0_VERSION}"
c:prefix="g">
<union name="Argument" c:type="GArgument">
<field name="v_boolean" writable="1">

73
devel/gobject-introspection/patches/patch-gir_Makefile_in
View File

@ -1,61 +1,12 @@
$OpenBSD: patch-gir_Makefile_in,v 1.1.1.1 2009/09/24 20:08:09 jasper Exp $
Ugly hack to fix build.
See upstream Bugzilla #596224 .
--- gir/Makefile.in.orig Fri Sep 4 23:03:46 2009
+++ gir/Makefile.in Thu Sep 24 20:53:58 2009
@@ -731,7 +731,7 @@ GLib-2.0.gir: $(SCANNER_BIN) $(SCANNER_LIBS) Makefile
--noclosure \
--output $@ \
--strip-prefix=g \
- --libtool="$(LIBTOOL)" \
+ --libtool="${LOCALBASE}/bin/libtool" \
--c-include="glib.h" \
--library=$(GLIB_LIBRARY) \
--pkg glib-2.0 \
@@ -753,7 +753,7 @@ GObject-2.0.gir: GLib-2.0.gir $(SCANNER_BIN) $(SCANNER
--noclosure \
--output $@ \
--strip-prefix=g \
- --libtool="$(LIBTOOL)" \
+ --libtool="${LOCALBASE}/bin/libtool" \
--c-include="glib-object.h" \
--include=GLib-2.0 \
--library=$(GOBJECT_LIBRARY) \
@@ -773,7 +773,7 @@ GModule-2.0.gir: GLib-2.0.gir $(SCANNER_BIN) $(SCANNER
--noclosure \
--output $@ \
--strip-prefix=g \
- --libtool="$(LIBTOOL)" \
+ --libtool="${LOCALBASE}/bin/libtool" \
--c-include="gmodule.h" \
--include=GLib-2.0 \
--library=$(GMODULE_LIBRARY) \
@@ -789,7 +789,7 @@ Gio-2.0.gir: GObject-2.0.gir $(SCANNER_BIN) $(SCANNER_
--noclosure \
--output $@ \
--strip-prefix=g \
- --libtool="$(LIBTOOL)" \
+ --libtool="${LOCALBASE}/bin/libtool" \
--c-include="gio/gio.h" \
--include=GObject-2.0 \
--library=$(GIO_LIBRARY) \
@@ -807,7 +807,7 @@ GIRepository-2.0.gir: GObject-2.0.gir $(SCANNER_BIN) $
--noclosure \
--output $@ \
--strip-prefix=g \
- --libtool="$(LIBTOOL)" \
+ --libtool="${LOCALBASE}/bin/libtool" \
--c-include="girepository.h" \
--include=GObject-2.0 \
--library=girepository-1.0 \
@@ -819,7 +819,7 @@ GIRepository-2.0.gir: GObject-2.0.gir $(SCANNER_BIN) $
Everything-$(TYPELIB_VERSION).gir: GObject-2.0.gir libgirepository-everything-1.0.la everything.c everything.h $(SCANNER_BIN) $(SCANNER_LIBS) Makefile
$(SCANNER) \
--include=GObject-2.0 \
- --libtool="$(LIBTOOL)" \
+ --libtool="${LOCALBASE}/bin/libtool" \
--library=girepository-everything-1.0 \
--namespace=Everything --nsversion=$(TYPELIB_VERSION) \
--pkg gobject-2.0 \
$OpenBSD: patch-gir_Makefile_in,v 1.2 2009/12/22 15:19:52 ajacoutot Exp $
--- gir/Makefile.in.orig Thu Dec 17 10:48:39 2009
+++ gir/Makefile.in Thu Dec 17 10:48:47 2009
@@ -325,7 +325,7 @@ _gir_packages = $(foreach pkg,$($(_gir_name)_PACKAGES)
_gir_includes = $(foreach include,$($(_gir_name)_INCLUDES),--include=$(include))
# Reuse the LIBTOOL variable from by automake if it's set
-_gir_libtool = $(if $(LIBTOOL),--libtool="$(LIBTOOL)")
+_gir_libtool = $(if $(LIBTOOL),--libtool="${LIBTOOL}")
EXPECTEDGIRS = Everything-$(TYPELIB_VERSION)-expected.gir
BUILT_GIRSOURCES =

21
devel/gobject-introspection/patches/patch-girepository_girffi_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-girepository_girffi_c,v 1.1.1.1 2009/09/24 20:08:09 jasper Exp $
Fix build due to missing header.
--- girepository/girffi.c.orig Sat Sep 19 15:27:34 2009
+++ girepository/girffi.c Sat Sep 19 15:27:47 2009
@@ -18,10 +18,13 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
+#include <sys/types.h>
+#include <sys/mman.h>
+
#include <config.h>
#include <errno.h>
#include <string.h>
-#include <sys/mman.h>
#include <unistd.h>
#include "girffi.h"
#include "girepository.h"

14
devel/gobject-introspection/patches/patch-girepository_giroffsets_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-girepository_giroffsets_c,v 1.1 2009/11/12 21:48:18 jasper Exp $
$OpenBSD: patch-girepository_giroffsets_c,v 1.2 2009/12/22 15:19:52 ajacoutot Exp $
Prevent redefinition of ALIGN in giroffsets.c with /usr/include/machine/param.h
--- girepository/giroffsets.c.orig Thu Nov 12 21:33:35 2009
+++ girepository/giroffsets.c Thu Nov 12 21:34:37 2009
@@ -309,7 +309,7 @@ get_field_size_alignment (GIrNodeField *field,
--- girepository/giroffsets.c.orig Mon Nov 23 18:27:56 2009
+++ girepository/giroffsets.c Thu Dec 17 10:14:17 2009
@@ -316,7 +316,7 @@ get_field_size_alignment (GIrNodeField *field,
return success;
}
@ -13,7 +13,7 @@ Prevent redefinition of ALIGN in giroffsets.c with /usr/include/machine/param.h
static gboolean
compute_struct_field_offsets (GIrNode *node,
@@ -343,7 +343,7 @@ compute_struct_field_offsets (GIrNode *node,
@@ -350,7 +350,7 @@ compute_struct_field_offsets (GIrNode *node,
module, modules,
&member_size, &member_alignment))
{
@ -22,7 +22,7 @@ Prevent redefinition of ALIGN in giroffsets.c with /usr/include/machine/param.h
alignment = MAX (alignment, member_alignment);
field->offset = size;
size += member_size;
@@ -357,14 +357,14 @@ compute_struct_field_offsets (GIrNode *node,
@@ -364,14 +364,14 @@ compute_struct_field_offsets (GIrNode *node,
}
else if (member->type == G_IR_NODE_CALLBACK)
{
@ -39,7 +39,7 @@ Prevent redefinition of ALIGN in giroffsets.c with /usr/include/machine/param.h
if (!have_error)
{
@@ -422,7 +422,7 @@ compute_union_field_offsets (GIrNode *node,
@@ -429,7 +429,7 @@ compute_union_field_offsets (GIrNode *node,
}
/* Unions are tail-padded out to a multiple of their alignment */

27
devel/gobject-introspection/patches/patch-giscanner_Makefile_in
View File

@ -1,15 +1,12 @@
$OpenBSD: patch-giscanner_Makefile_in,v 1.1.1.1 2009/09/24 20:08:09 jasper Exp $
Install Python files into the correct directory.
--- giscanner/Makefile.in.orig Thu Sep 24 21:43:04 2009
+++ giscanner/Makefile.in Thu Sep 24 21:44:10 2009
@@ -18,7 +18,7 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = ${MODPY_SITEPKG}/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
$OpenBSD: patch-giscanner_Makefile_in,v 1.2 2009/12/22 15:19:52 ajacoutot Exp $
--- giscanner/Makefile.in.orig Thu Dec 17 11:14:28 2009
+++ giscanner/Makefile.in Thu Dec 17 11:14:50 2009
@@ -254,7 +254,7 @@ oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
# Python module
-pkgpyexecdir = $(pkglibdir)/giscanner
+pkgpyexecdir = @pkgpythondir@/giscanner
pkgpythondir = @pkgpythondir@
prefix = @prefix@
program_transform_name = @program_transform_name@

30
devel/gobject-introspection/patches/patch-giscanner_dumper_py
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-giscanner_dumper_py,v 1.1.1.1 2009/09/24 20:08:09 jasper Exp $
Make g-ir-scanner 64-bit enable.
GNOME Bugzilla #593639.
--- giscanner/dumper.py.orig Thu Sep 24 20:01:20 2009
+++ giscanner/dumper.py Thu Sep 24 20:03:12 2009
@@ -155,6 +155,10 @@ class DumpCompiler(object):
args.append('-I' + os.path.join(self._uninst_srcdir,
'girepository'))
args.extend(pkgconfig_flags)
+ cflags = os.environ.get('CFLAGS')
+ if (cflags):
+ for iflag in cflags.split():
+ args.append(iflag)
for include in self._options.cpp_includes:
args.append('-I' + include)
args.extend(['-c', '-o', output])
@@ -175,6 +179,11 @@ class DumpCompiler(object):
args.append('--silent')
args.extend([self._linker_cmd, '-o', output])
+
+ cflags = os.environ.get('CFLAGS')
+ if (cflags):
+ for iflag in cflags.split():
+ args.append(iflag)
# Make sure to list the library to be introspected first since it's
# likely to be uninstalled yet and we want the uninstalled RPATHs have

12
devel/gobject-introspection/patches/patch-tests_offsets_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-tests_offsets_Makefile_in,v 1.1 2009/12/22 15:19:52 ajacoutot Exp $
--- tests/offsets/Makefile.in.orig Thu Dec 17 10:49:06 2009
+++ tests/offsets/Makefile.in Thu Dec 17 10:49:17 2009
@@ -310,7 +310,7 @@ _gir_packages = $(foreach pkg,$($(_gir_name)_PACKAGES)
_gir_includes = $(foreach include,$($(_gir_name)_INCLUDES),--include=$(include))
# Reuse the LIBTOOL variable from by automake if it's set
-_gir_libtool = $(if $(LIBTOOL),--libtool="$(LIBTOOL)")
+_gir_libtool = $(if $(LIBTOOL),--libtool="${LIBTOOL}")
BUILT_SOURCES = gitestoffsets.c
CLEANFILES = offsets-1.0.gir offsets-1.0.typelib gitestoffsets.c \
offsets.compiled offsets.introspected

73
devel/gobject-introspection/patches/patch-tests_scanner_Makefile_in
View File

@ -1,61 +1,12 @@
$OpenBSD: patch-tests_scanner_Makefile_in,v 1.1.1.1 2009/09/24 20:08:09 jasper Exp $
Ugly hack to fix build.
See upstream Bugzilla #596224 .
--- tests/scanner/Makefile.in.orig Thu Sep 24 20:43:31 2009
+++ tests/scanner/Makefile.in Thu Sep 24 20:43:35 2009
@@ -729,7 +729,7 @@ annotation-1.0.gir: libannotation.la annotation.c anno
$(CHECK_DEBUG) $(SCANNER) \
--include=GObject-2.0 \
--include=utility-1.0 \
- --libtool="$(LIBTOOL)" \
+ --libtool="${LOCALBASE}/bin/libtool" \
--library=libannotation.la \
--namespace=annotation \
--nsversion=1.0 \
@@ -741,7 +741,7 @@ drawable-1.0.gir: libdrawable.la drawable.c drawable.h
$(CHECK_DEBUG) $(SCANNER) \
--include=GObject-2.0 \
--include=utility-1.0 \
- --libtool="$(LIBTOOL)" \
+ --libtool="${LOCALBASE}/bin/libtool" \
--library=libdrawable.la \
--namespace=drawable \
--nsversion=1.0 \
@@ -754,7 +754,7 @@ foo-1.0.gir: libfoo.la foo.c foo.h utility-1.0.gir $(S
--include=GObject-2.0 \
--include=utility-1.0 \
--c-include="foo.h" \
- --libtool="$(LIBTOOL)" \
+ --libtool="${LOCALBASE}/bin/libtool" \
--library=libfoo.la \
--namespace=foo \
--nsversion=1.0 \
@@ -765,7 +765,7 @@ foo-1.0.gir: libfoo.la foo.c foo.h utility-1.0.gir $(S
utility-1.0.gir: libutility.la utility.h $(SCANNER_BIN) $(SCANNER_LIBS) Makefile
$(CHECK_DEBUG) $(SCANNER) \
--include=GObject-2.0 \
- --libtool="$(LIBTOOL)" \
+ --libtool="${LOCALBASE}/bin/libtool" \
--library=libutility.la \
--namespace=utility \
--nsversion=1.0 \
@@ -777,7 +777,7 @@ utility-1.0.gir: libutility.la utility.h $(SCANNER_BIN
GtkFrob-1.0.gir: libgtkfrob.la gtkfrob.h $(SCANNER_BIN) $(SCANNER_LIBS) Makefile
$(CHECK_DEBUG) $(SCANNER) \
--include=GObject-2.0 \
- --libtool="$(LIBTOOL)" \
+ --libtool="${LOCALBASE}/bin/libtool" \
--library=libgtkfrob.la \
--namespace=GtkFrob \
--strip-prefix=Gtk \
@@ -788,7 +788,7 @@ GtkFrob-1.0.gir: libgtkfrob.la gtkfrob.h $(SCANNER_BIN
BarApp-1.0.gir: barapp $(SCANNER_BIN) $(SCANNER_LIBS) Makefile
$(SCANNER) \
--include=GObject-2.0 \
- --libtool="$(LIBTOOL)" \
+ --libtool="${LOCALBASE}/bin/libtool" \
--program=./barapp \
--namespace=BarApp \
--strip-prefix=Bar \
$OpenBSD: patch-tests_scanner_Makefile_in,v 1.2 2009/12/22 15:19:52 ajacoutot Exp $
--- tests/scanner/Makefile.in.orig Thu Dec 17 10:48:52 2009
+++ tests/scanner/Makefile.in Thu Dec 17 10:49:02 2009
@@ -337,7 +337,7 @@ _gir_packages = $(foreach pkg,$($(_gir_name)_PACKAGES)
_gir_includes = $(foreach include,$($(_gir_name)_INCLUDES),--include=$(include))
# Reuse the LIBTOOL variable from by automake if it's set
-_gir_libtool = $(if $(LIBTOOL),--libtool="$(LIBTOOL)")
+_gir_libtool = $(if $(LIBTOOL),--libtool="${LIBTOOL}")
# We need to build a shared library, which can be dlopened
# it does not work with noinst_LTLIBRARIES

4
devel/gobject-introspection/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/09/24 20:08:09 jasper Exp $
@comment $OpenBSD: PLIST,v 1.2 2009/12/22 15:19:52 ajacoutot Exp $
@bin bin/g-ir-compiler
@bin bin/g-ir-generate
bin/g-ir-scanner
@ -109,3 +109,5 @@ share/gir-1.0/libxml2-2.0.gir
share/gir-1.0/xfixes-4.0.gir
share/gir-1.0/xft-2.0.gir
share/gir-1.0/xlib-2.0.gir
share/gobject-introspection-1.0/
share/gobject-introspection-1.0/Makefile.introspection