Update to gobject-introspection-1.31.22.
This commit is contained in:
ajacoutot
parent
6758d901d3
commit
c1c0a95f0a
@ -1,13 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.55 2011/11/18 11:11:33 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.56 2012/03/29 06:29:08 ajacoutot Exp $
|
||||
|
||||
COMMENT= GObject Introspection
|
||||
|
||||
GNOME_VERSION= 1.30.0
|
||||
GNOME_VERSION= 1.31.22
|
||||
GNOME_PROJECT= gobject-introspection
|
||||
REVISION= 4
|
||||
CATEGORIES= devel
|
||||
|
||||
SHARED_LIBS += girepository-1.0 2.0 # 1.0
|
||||
SHARED_LIBS += girepository-1.0 3.0 # 1.0
|
||||
|
||||
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
|
||||
Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
@ -28,8 +27,7 @@ MODULES= devel/gettext \
|
||||
WANTLIB += c ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
|
||||
WANTLIB += m pcre pthread z
|
||||
|
||||
LIB_DEPENDS= devel/glib2>=2.29.7 \
|
||||
devel/libffi
|
||||
LIB_DEPENDS= devel/glib2>=2.32.0
|
||||
BUILD_DEPENDS= devel/bison \
|
||||
graphics/cairo
|
||||
RUN_DEPENDS= graphics/cairo
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (gobject-introspection-1.30.0.tar.xz) = Tl+NAokKofJFm5iQ4KRUhg==
|
||||
RMD160 (gobject-introspection-1.30.0.tar.xz) = xeZvLoGODNvji0JRbqOjbn+7CeY=
|
||||
SHA1 (gobject-introspection-1.30.0.tar.xz) = EHQl9J4DZXyTHuGA/6RU3OwgG3E=
|
||||
SHA256 (gobject-introspection-1.30.0.tar.xz) = jkJ0V5CW6YP60xSM2rUClaRwHkXNmk4C9yQvwKBMR7I=
|
||||
SIZE (gobject-introspection-1.30.0.tar.xz) = 1063720
|
||||
MD5 (gobject-introspection-1.31.22.tar.xz) = Rom7F+4BxldTCrHtmYhS5w==
|
||||
RMD160 (gobject-introspection-1.31.22.tar.xz) = luJpXXmnMMnqxZCjNf0XzzAM0VE=
|
||||
SHA1 (gobject-introspection-1.31.22.tar.xz) = cAS6KbA3qib40Zy7L+L0PvGg8pY=
|
||||
SHA256 (gobject-introspection-1.31.22.tar.xz) = DUjWDAKp+97bfOvG4+Q8aXbKY4vPErqgPCfchLr5Kvg=
|
||||
SIZE (gobject-introspection-1.31.22.tar.xz) = 1120592
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.14 2011/12/05 10:27:15 jasper Exp $
|
||||
|
||||
From acc84ac7ed78255c261c6d1d1eb3c916173ba681 Mon Sep 17 00:00:00 2001
|
||||
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
|
||||
Date: Mon, 05 Dec 2011 10:20:57 +0000
|
||||
Subject: - Fix a substitution:
|
||||
|
||||
use TOOL_SUBSTITUTIONS like the others, to fix an unsubstitued @datarootdir@ in g-ir-doc-tool
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=659649
|
||||
|
||||
--- Makefile.in.orig Tue Sep 20 23:14:47 2011
|
||||
+++ Makefile.in Mon Dec 5 11:24:02 2011
|
||||
@@ -2869,7 +2869,7 @@ g-ir-annotation-tool: tools/g-ir-annotation-tool.in _g
|
||||
@chmod a+x $@
|
||||
|
||||
g-ir-doc-tool: tools/g-ir-doc-tool.in _giscanner.la Makefile
|
||||
- $(AM_V_GEN) sed -e s,@libdir\@,$(libdir), -e s,@PYTHON\@,$(PYTHON), $< > $@.tmp && mv $@.tmp $@
|
||||
+ $(AM_V_GEN) $(TOOL_SUBSTITUTIONS) $< > $@.tmp && mv $@.tmp $@
|
||||
@chmod a+x $@
|
||||
|
||||
check-local:
|
||||
@ -1,29 +0,0 @@
|
||||
$OpenBSD: patch-configure,v 1.4 2011/09/30 18:12:27 jasper Exp $
|
||||
|
||||
From 25a19e13af0c716fde6d35fb0531aeceedb9a9f8 Mon Sep 17 00:00:00 2001
|
||||
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
|
||||
Date: Fri, 30 Sep 2011 06:59:12 +0000
|
||||
Subject: Adjust dlopened library name on OpenBSD so we always pick the right one.
|
||||
|
||||
--- configure.orig Tue Sep 20 23:52:38 2011
|
||||
+++ configure Tue Sep 20 23:53:26 2011
|
||||
@@ -12940,6 +12940,9 @@ if test x$have_cairo_gobject = xyes; then
|
||||
*-*-mingw*)
|
||||
CAIRO_SHARED_LIBRARY="libcairo-gobject-2.dll"
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ CAIRO_SHARED_LIBRARY="libcairo-gobject.so"
|
||||
+ ;;
|
||||
*)
|
||||
CAIRO_SHARED_LIBRARY="libcairo-gobject.so.2"
|
||||
;;
|
||||
@@ -12952,6 +12955,9 @@ elif test x$have_cairo = xyes; then
|
||||
;;
|
||||
*-*-mingw*)
|
||||
CAIRO_SHARED_LIBRARY="libcairo-2.dll"
|
||||
+ ;;
|
||||
+ *-*-openbsd*)
|
||||
+ CAIRO_SHARED_LIBRARY="libcairo.so"
|
||||
;;
|
||||
*)
|
||||
CAIRO_SHARED_LIBRARY="libcairo.so.2"
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-giscanner_dumper_py,v 1.4 2011/09/21 13:59:21 jasper Exp $
|
||||
--- giscanner/dumper.py.orig Tue Sep 20 21:31:44 2011
|
||||
+++ giscanner/dumper.py Tue Sep 20 23:53:34 2011
|
||||
@@ -81,7 +81,7 @@ class DumpCompiler(object):
|
||||
$OpenBSD: patch-giscanner_dumper_py,v 1.5 2012/03/29 06:29:08 ajacoutot Exp $
|
||||
--- giscanner/dumper.py.orig Tue Nov 29 19:57:22 2011
|
||||
+++ giscanner/dumper.py Mon Mar 26 12:06:27 2012
|
||||
@@ -80,7 +80,7 @@ class DumpCompiler(object):
|
||||
self._get_type_functions = get_type_functions
|
||||
self._error_quark_functions = error_quark_functions
|
||||
|
||||
@ -10,3 +10,12 @@ $OpenBSD: patch-giscanner_dumper_py,v 1.4 2011/09/21 13:59:21 jasper Exp $
|
||||
self._linker_cmd = os.environ.get('CC', self._compiler_cmd)
|
||||
self._pkgconfig_cmd = os.environ.get('PKG_CONFIG', 'pkg-config')
|
||||
|
||||
@@ -186,7 +186,7 @@ class DumpCompiler(object):
|
||||
args = self._compiler_cmd.split()
|
||||
# Do not add -Wall when using init code as we do not include any
|
||||
# header of the library being introspected
|
||||
- if self._compiler_cmd == 'gcc' and not self._options.init_sections:
|
||||
+ if self._compiler_cmd == 'cc' and not self._options.init_sections:
|
||||
args.append('-Wall')
|
||||
pkgconfig_flags = self._run_pkgconfig('--cflags')
|
||||
args.extend(pkgconfig_flags)
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-giscanner_scannermain_py,v 1.2 2011/09/21 13:59:21 jasper Exp $
|
||||
$OpenBSD: patch-giscanner_scannermain_py,v 1.3 2012/03/29 06:29:08 ajacoutot Exp $
|
||||
|
||||
Prime the scanner with two common directories for includes.
|
||||
|
||||
--- giscanner/scannermain.py.orig Fri Sep 9 22:48:44 2011
|
||||
+++ giscanner/scannermain.py Tue Sep 20 23:53:34 2011
|
||||
@@ -228,6 +228,8 @@ def process_packages(options, packages):
|
||||
--- giscanner/scannermain.py.orig Wed Oct 19 20:38:53 2011
|
||||
+++ giscanner/scannermain.py Fri Mar 23 15:34:07 2012
|
||||
@@ -231,6 +231,8 @@ def process_packages(options, packages):
|
||||
parser = _get_option_parser()
|
||||
pkg_options, unused = parser.parse_args(filtered_output)
|
||||
options.cpp_includes.extend(pkg_options.cpp_includes)
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
$OpenBSD: patch-giscanner_shlibs_py,v 1.3 2011/11/18 11:11:33 jasper Exp $
|
||||
|
||||
commit d4c5a6482b0c2cc8b6f55ca9dce62d7652451942
|
||||
Author: Jasper Lievisse Adriaanse <jasper@humppa.nl>
|
||||
Date: Fri Nov 18 12:01:22 2011 +0100
|
||||
|
||||
OpenBSD uses it's own libtool implementation which breaks giscanner in certain
|
||||
situations. So adjust resolve_non_libtool() in this case.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=664282
|
||||
|
||||
--- giscanner/shlibs.py.orig Fri Jun 10 17:36:50 2011
|
||||
+++ giscanner/shlibs.py Fri Nov 18 11:59:34 2011
|
||||
@@ -22,6 +22,7 @@
|
||||
import re
|
||||
import platform
|
||||
import subprocess
|
||||
+import os
|
||||
|
||||
from .utils import get_libtool_command, extract_libtool_shlib
|
||||
|
||||
@@ -66,6 +67,19 @@ def _ldd_library_pattern(library_name):
|
||||
def _resolve_non_libtool(options, binary, libraries):
|
||||
if not libraries:
|
||||
return []
|
||||
+
|
||||
+ if os.uname()[0] == 'OpenBSD':
|
||||
+ # Hack for OpenBSD when using the ports' libtool which uses slightly
|
||||
+ # different directories to store the libraries in. So rewite binary.args[0]
|
||||
+ # by inserting '.libs/'.
|
||||
+ old_argdir = binary.args[0]
|
||||
+ new_libsdir = os.path.join(os.path.dirname(binary.args[0]), '.libs/')
|
||||
+ new_lib = new_libsdir + os.path.basename(binary.args[0])
|
||||
+ if os.path.exists(new_lib):
|
||||
+ binary.args[0] = new_lib
|
||||
+ os.putenv('LD_LIBRARY_PATH', new_libsdir)
|
||||
+ else:
|
||||
+ binary.args[0] = old_argdir
|
||||
|
||||
args = []
|
||||
libtool = get_libtool_command(options)
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-giscanner_sourcescanner_py,v 1.3 2011/09/21 14:03:50 jasper Exp $
|
||||
--- giscanner/sourcescanner.py.orig Wed Sep 21 11:45:05 2011
|
||||
+++ giscanner/sourcescanner.py Wed Sep 21 11:45:33 2011
|
||||
$OpenBSD: patch-giscanner_sourcescanner_py,v 1.4 2012/03/29 06:29:08 ajacoutot Exp $
|
||||
--- giscanner/sourcescanner.py.orig Mon Mar 26 11:59:56 2012
|
||||
+++ giscanner/sourcescanner.py Mon Mar 26 12:00:18 2012
|
||||
@@ -274,7 +274,7 @@ class SourceScanner(object):
|
||||
|
||||
defines = ['__GI_SCANNER__']
|
||||
undefs = []
|
||||
- cpp_args = [os.environ.get('CC', 'cc'), '-E', '-C', '-I.', '-']
|
||||
+ cpp_args = ['${CC}', '-E', '-C', '-I.', '-']
|
||||
- cpp_args = os.environ.get('CC', 'cc').split()
|
||||
+ cpp_args = os.environ.get('CC', '${CC}').split()
|
||||
cpp_args += ['-E', '-C', '-I.', '-']
|
||||
|
||||
cpp_args += self._cpp_options
|
||||
proc = subprocess.Popen(cpp_args,
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
@comment $OpenBSD: PLIST,v 1.9 2011/09/21 13:59:21 jasper Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.10 2012/03/29 06:29:08 ajacoutot Exp $
|
||||
bin/g-ir-annotation-tool
|
||||
@bin bin/g-ir-compiler
|
||||
bin/g-ir-doc-tool
|
||||
@bin bin/g-ir-generate
|
||||
bin/g-ir-scanner
|
||||
include/gobject-introspection-1.0/
|
||||
@ -65,12 +64,6 @@ lib/gobject-introspection/giscanner/cachestore.pyo
|
||||
lib/gobject-introspection/giscanner/codegen.py
|
||||
lib/gobject-introspection/giscanner/codegen.pyc
|
||||
lib/gobject-introspection/giscanner/codegen.pyo
|
||||
lib/gobject-introspection/giscanner/docbookdescription.py
|
||||
lib/gobject-introspection/giscanner/docbookdescription.pyc
|
||||
lib/gobject-introspection/giscanner/docbookdescription.pyo
|
||||
lib/gobject-introspection/giscanner/docbookwriter.py
|
||||
lib/gobject-introspection/giscanner/docbookwriter.pyc
|
||||
lib/gobject-introspection/giscanner/docbookwriter.pyo
|
||||
lib/gobject-introspection/giscanner/docmain.py
|
||||
lib/gobject-introspection/giscanner/docmain.pyc
|
||||
lib/gobject-introspection/giscanner/docmain.pyo
|
||||
@ -95,6 +88,24 @@ lib/gobject-introspection/giscanner/libtoolimporter.pyo
|
||||
lib/gobject-introspection/giscanner/maintransformer.py
|
||||
lib/gobject-introspection/giscanner/maintransformer.pyc
|
||||
lib/gobject-introspection/giscanner/maintransformer.pyo
|
||||
lib/gobject-introspection/giscanner/mallard-C-class.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-C-default.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-C-enum.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-C-function.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-C-namespace.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-C-property.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-C-record.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-C-signal.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-C-vfunc.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-Python-class.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-Python-default.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-Python-enum.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-Python-function.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-Python-namespace.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-Python-property.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-Python-record.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-Python-signal.tmpl
|
||||
lib/gobject-introspection/giscanner/mallard-Python-vfunc.tmpl
|
||||
lib/gobject-introspection/giscanner/mallardwriter.py
|
||||
lib/gobject-introspection/giscanner/mallardwriter.pyc
|
||||
lib/gobject-introspection/giscanner/mallardwriter.pyo
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user