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

- update to gobject-introspection 1.36.0

Browse Source 
ok aja@
This commit is contained in:
jasper 2013-03-28 19:32:11 +00:00
parent abc01fb8c7
commit 2b7aa6788d
8 changed files with 102 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devel/gobject-introspection/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.69 2013/03/21 08:45:15 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.70 2013/03/28 19:32:11 jasper Exp $
COMMENT= GObject Introspection
GNOME_VERSION= 1.34.2
GNOME_VERSION= 1.36.0
GNOME_PROJECT= gobject-introspection
CATEGORIES= devel
@ -22,8 +22,7 @@ MODULES= devel/gettext \
lang/python \
x11/gnome
WANTLIB += c ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += m pcre pthread z
WANTLIB += c ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 m pcre pthread z
LIB_DEPENDS= devel/glib2>=2.34.1
BUILD_DEPENDS= devel/bison \

4
devel/gobject-introspection/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gobject-introspection-1.34.2.tar.xz) = vHlIo1ziIYki37CAZnnK0hBgcVzAw0DPeCPrYzzANCk=
SIZE (gobject-introspection-1.34.2.tar.xz) = 1088768
SHA256 (gobject-introspection-1.36.0.tar.xz) = 4+dtnUKOdTR2G/jN91M4hlpLCHLoBSvvUXknRGCLY4M=
SIZE (gobject-introspection-1.36.0.tar.xz) = 1201108

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

@ -1,7 +1,7 @@
$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):
$OpenBSD: patch-giscanner_dumper_py,v 1.6 2013/03/28 19:32:11 jasper Exp $
--- giscanner/dumper.py.orig Sat Feb 23 11:40:08 2013
+++ giscanner/dumper.py Tue Mar 26 17:12:03 2013
@@ -82,7 +82,7 @@ class DumpCompiler(object):
self._get_type_functions = get_type_functions
self._error_quark_functions = error_quark_functions
@ -9,13 +9,13 @@ $OpenBSD: patch-giscanner_dumper_py,v 1.5 2012/03/29 06:29:08 ajacoutot Exp $
+ self._compiler_cmd = os.environ.get('CC', '${CC}')
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):
self._pkgconfig_msvc_flags = ''
@@ -204,7 +204,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)
# The Microsoft compiler uses different option flags for
# silencing warnings on deprecated function usage

8
devel/gobject-introspection/patches/patch-giscanner_scannermain_py
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-giscanner_scannermain_py,v 1.3 2012/03/29 06:29:08 ajacoutot Exp $
$OpenBSD: patch-giscanner_scannermain_py,v 1.4 2013/03/28 19:32:11 jasper Exp $
Prime the scanner with two common directories for includes.
--- 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):
--- giscanner/scannermain.py.orig Wed Mar 6 23:53:19 2013
+++ giscanner/scannermain.py Tue Mar 26 17:12:03 2013
@@ -245,6 +245,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)

15
devel/gobject-introspection/patches/patch-giscanner_shlibs_py Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-giscanner_shlibs_py,v 1.5 2013/03/28 19:32:11 jasper Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=696765
--- giscanner/shlibs.py.orig Tue Dec 18 17:27:16 2012
+++ giscanner/shlibs.py Thu Mar 28 11:45:22 2013
@@ -68,7 +68,7 @@ def _resolve_non_libtool(options, binary, libraries):
if not libraries:
return []
- if os.name == 'OpenBSD':
+ if platform.platform().startswith('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/'.

18
devel/gobject-introspection/patches/patch-giscanner_sourcescanner_py
View File

@ -1,12 +1,12 @@
$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):
$OpenBSD: patch-giscanner_sourcescanner_py,v 1.5 2013/03/28 19:32:11 jasper Exp $
--- giscanner/sourcescanner.py.orig Tue Mar 26 17:11:31 2013
+++ giscanner/sourcescanner.py Tue Mar 26 17:11:49 2013
@@ -275,7 +275,7 @@ class SourceScanner(object):
defines = ['__GI_SCANNER__']
undefs = []
- 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
- cpp_exec = os.environ.get('CC', 'cc').split()
+ cpp_exec = os.environ.get('CC', '${CC}').split()
# The Microsoft compiler/preprocessor (cl) does not accept
# source input from stdin (the '-' flag), so we need
# some help from gcc from MinGW/Cygwin or so.

8
devel/gobject-introspection/patches/patch-giscanner_utils_py
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-giscanner_utils_py,v 1.4 2012/09/21 13:19:40 jasper Exp $
$OpenBSD: patch-giscanner_utils_py,v 1.5 2013/03/28 19:32:11 jasper Exp $
Make sure try to compile/link with the right libtool,
this overrides the --libtool option to girscanner.
--- giscanner/utils.py.orig Fri Jul 20 15:37:12 2012
+++ giscanner/utils.py Thu Sep 20 13:02:31 2012
--- giscanner/utils.py.orig Tue Mar 26 17:10:17 2013
+++ giscanner/utils.py Tue Mar 26 17:11:12 2013
@@ -110,22 +110,8 @@ def get_libtool_command(options):
if not libtool_infection:
return None
@ -20,7 +20,7 @@ this overrides the --libtool option to girscanner.
- try:
- subprocess.check_call(['libtool', '--version'],
- stdout=open(os.devnull))
- except (subprocess.CalledProcessError, OSError), e:
- except (subprocess.CalledProcessError, OSError):
- # If libtool's not installed, assume we don't need it
- return None
-

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.12 2012/09/29 13:14:05 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.13 2013/03/28 19:32:11 jasper Exp $
bin/g-ir-annotation-tool
@bin bin/g-ir-compiler
@bin bin/g-ir-generate
@ -53,9 +53,6 @@ lib/gobject-introspection/giscanner/annotationmain.pyo
lib/gobject-introspection/giscanner/annotationparser.py
lib/gobject-introspection/giscanner/annotationparser.pyc
lib/gobject-introspection/giscanner/annotationparser.pyo
lib/gobject-introspection/giscanner/annotationpatterns.py
lib/gobject-introspection/giscanner/annotationpatterns.pyc
lib/gobject-introspection/giscanner/annotationpatterns.pyo
lib/gobject-introspection/giscanner/ast.py
lib/gobject-introspection/giscanner/ast.pyc
lib/gobject-introspection/giscanner/ast.pyo
@ -68,6 +65,49 @@ lib/gobject-introspection/giscanner/codegen.pyo
lib/gobject-introspection/giscanner/docmain.py
lib/gobject-introspection/giscanner/docmain.pyc
lib/gobject-introspection/giscanner/docmain.pyo
lib/gobject-introspection/giscanner/doctemplates/
lib/gobject-introspection/giscanner/doctemplates/C/
lib/gobject-introspection/giscanner/doctemplates/C/class.tmpl
lib/gobject-introspection/giscanner/doctemplates/C/constructor.tmpl
lib/gobject-introspection/giscanner/doctemplates/C/default.tmpl
lib/gobject-introspection/giscanner/doctemplates/C/enum.tmpl
lib/gobject-introspection/giscanner/doctemplates/C/function.tmpl
lib/gobject-introspection/giscanner/doctemplates/C/method.tmpl
lib/gobject-introspection/giscanner/doctemplates/C/namespace.tmpl
lib/gobject-introspection/giscanner/doctemplates/C/property.tmpl
lib/gobject-introspection/giscanner/doctemplates/C/record.tmpl
lib/gobject-introspection/giscanner/doctemplates/C/signal.tmpl
lib/gobject-introspection/giscanner/doctemplates/C/vfunc.tmpl
lib/gobject-introspection/giscanner/doctemplates/Gjs/
lib/gobject-introspection/giscanner/doctemplates/Gjs/class.tmpl
lib/gobject-introspection/giscanner/doctemplates/Gjs/constructor.tmpl
lib/gobject-introspection/giscanner/doctemplates/Gjs/default.tmpl
lib/gobject-introspection/giscanner/doctemplates/Gjs/enum.tmpl
lib/gobject-introspection/giscanner/doctemplates/Gjs/function.tmpl
lib/gobject-introspection/giscanner/doctemplates/Gjs/method.tmpl
lib/gobject-introspection/giscanner/doctemplates/Gjs/namespace.tmpl
lib/gobject-introspection/giscanner/doctemplates/Gjs/property.tmpl
lib/gobject-introspection/giscanner/doctemplates/Gjs/record.tmpl
lib/gobject-introspection/giscanner/doctemplates/Gjs/signal.tmpl
lib/gobject-introspection/giscanner/doctemplates/Gjs/vfunc.tmpl
lib/gobject-introspection/giscanner/doctemplates/Python/
lib/gobject-introspection/giscanner/doctemplates/Python/class.tmpl
lib/gobject-introspection/giscanner/doctemplates/Python/constructor.tmpl
lib/gobject-introspection/giscanner/doctemplates/Python/default.tmpl
lib/gobject-introspection/giscanner/doctemplates/Python/enum.tmpl
lib/gobject-introspection/giscanner/doctemplates/Python/function.tmpl
lib/gobject-introspection/giscanner/doctemplates/Python/method.tmpl
lib/gobject-introspection/giscanner/doctemplates/Python/namespace.tmpl
lib/gobject-introspection/giscanner/doctemplates/Python/property.tmpl
lib/gobject-introspection/giscanner/doctemplates/Python/record.tmpl
lib/gobject-introspection/giscanner/doctemplates/Python/signal.tmpl
lib/gobject-introspection/giscanner/doctemplates/Python/vfunc.tmpl
lib/gobject-introspection/giscanner/doctemplates/base.tmpl
lib/gobject-introspection/giscanner/doctemplates/class.tmpl
lib/gobject-introspection/giscanner/doctemplates/namespace.tmpl
lib/gobject-introspection/giscanner/docwriter.py
lib/gobject-introspection/giscanner/docwriter.pyc
lib/gobject-introspection/giscanner/docwriter.pyo
lib/gobject-introspection/giscanner/dumper.py
lib/gobject-introspection/giscanner/dumper.pyc
lib/gobject-introspection/giscanner/dumper.pyo
@ -89,27 +129,6 @@ 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
lib/gobject-introspection/giscanner/message.py
lib/gobject-introspection/giscanner/message.pyc
lib/gobject-introspection/giscanner/message.pyo
@ -119,6 +138,9 @@ lib/gobject-introspection/giscanner/odict.pyo
lib/gobject-introspection/giscanner/scannermain.py
lib/gobject-introspection/giscanner/scannermain.pyc
lib/gobject-introspection/giscanner/scannermain.pyo
lib/gobject-introspection/giscanner/sectionparser.py
lib/gobject-introspection/giscanner/sectionparser.pyc
lib/gobject-introspection/giscanner/sectionparser.pyo
lib/gobject-introspection/giscanner/shlibs.py
lib/gobject-introspection/giscanner/shlibs.pyc
lib/gobject-introspection/giscanner/shlibs.pyo
@ -167,50 +189,19 @@ share/gobject-introspection-1.0/
share/gobject-introspection-1.0/Makefile.introspection
share/gobject-introspection-1.0/gdump.c
share/gobject-introspection-1.0/tests/
share/gobject-introspection-1.0/tests/annotation.c
share/gobject-introspection-1.0/tests/annotation.h
share/gobject-introspection-1.0/tests/drawable.c
share/gobject-introspection-1.0/tests/drawable.h
share/gobject-introspection-1.0/tests/everything.c
share/gobject-introspection-1.0/tests/everything.h
share/gobject-introspection-1.0/tests/foo.c
share/gobject-introspection-1.0/tests/foo.h
share/gobject-introspection-1.0/tests/gimarshallingtests.c
share/gobject-introspection-1.0/tests/gimarshallingtests.h
share/gobject-introspection-1.0/tests/regress.c
share/gobject-introspection-1.0/tests/regress.h
share/gtk-doc/html/gi/
share/gtk-doc/html/gi/annotation-glossary.html
share/gtk-doc/html/gi/gi-GIArgInfo.html
share/gtk-doc/html/gi/gi-GIBaseInfo.html
share/gtk-doc/html/gi/gi-GICallableInfo.html
share/gtk-doc/html/gi/gi-GIConstantInfo.html
share/gtk-doc/html/gi/gi-GIEnumInfo.html
share/gtk-doc/html/gi/gi-GIFieldInfo.html
share/gtk-doc/html/gi/gi-GIFunctionInfo.html
share/gtk-doc/html/gi/gi-GIInterfaceInfo.html
share/gtk-doc/html/gi/gi-GIObjectInfo.html
share/gtk-doc/html/gi/gi-GIPropertyInfo.html
share/gtk-doc/html/gi/gi-GIRegisteredTypeInfo.html
share/gtk-doc/html/gi/gi-GISignalInfo.html
share/gtk-doc/html/gi/gi-GIStructInfo.html
share/gtk-doc/html/gi/gi-GITypeInfo.html
share/gtk-doc/html/gi/gi-GIUnionInfo.html
share/gtk-doc/html/gi/gi-GIVFuncInfo.html
share/gtk-doc/html/gi/gi-ffi.html
share/gtk-doc/html/gi/gi-gierrordomaininfo.html
share/gtk-doc/html/gi/gi-gir-reference.html
share/gtk-doc/html/gi/gi-gir.html
share/gtk-doc/html/gi/gi-girepository.html
share/gtk-doc/html/gi/gi-girffi.html
share/gtk-doc/html/gi/gi-gtypelib.html
share/gtk-doc/html/gi/gi-libgirepository.html
share/gtk-doc/html/gi/gi-overview.html
share/gtk-doc/html/gi/gi-repository-structs.html
share/gtk-doc/html/gi/gi-struct-hierarchy.html
share/gtk-doc/html/gi/gi-typelib.html
share/gtk-doc/html/gi/gi.devhelp2
share/gtk-doc/html/gi/girepository.html
share/gtk-doc/html/gi/glib.html
share/gtk-doc/html/gi/home.png
share/gtk-doc/html/gi/index.html
share/gtk-doc/html/gi/index.sgml
share/gtk-doc/html/gi/left.png
share/gtk-doc/html/gi/overview.png
share/gtk-doc/html/gi/right.png
share/gtk-doc/html/gi/style.css
share/gtk-doc/html/gi/up.png
share/gobject-introspection-1.0/tests/utility.c
share/gobject-introspection-1.0/tests/utility.h
share/gobject-introspection-1.0/tests/warnlib.c
share/gobject-introspection-1.0/tests/warnlib.h