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

- update to 1.30.0

Browse Source 
there is some known fallout, which we're working on.
This commit is contained in:
jasper 2011-09-21 13:59:21 +00:00
parent 6ff0930c20
commit 0009ad6c2b
8 changed files with 65 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devel/gobject-introspection/Makefile
View File

@ -1,14 +1,12 @@
# $OpenBSD: Makefile,v 1.48 2011/09/20 21:04:24 jasper Exp $
# $OpenBSD: Makefile,v 1.49 2011/09/21 13:59:21 jasper Exp $
COMMENT= GObject Introspection
GNOME_VERSION= 0.10.8
GNOME_VERSION= 1.30.0
GNOME_PROJECT= gobject-introspection
CATEGORIES= devel
REVISION= 9
SHARED_LIBS += girepository-1.0 1.0 # 1.0
SHARED_LIBS += girepository-1.0 2.0 # 1.0
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
Antoine Jacoutot <ajacoutot@openbsd.org>
@ -22,8 +20,6 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
EXTRACT_SUFX= .tar.bz2
MODULES= devel/gettext \
lang/python \
x11/gnome
@ -31,7 +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.28.8p0 \
LIB_DEPENDS= devel/glib2>=2.29.7 \
devel/libffi
BUILD_DEPENDS= devel/bison \
graphics/cairo

10
devel/gobject-introspection/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gobject-introspection-0.10.8.tar.bz2) = tdpYpTJ9E7TR4IuOQrJFbQ==
RMD160 (gobject-introspection-0.10.8.tar.bz2) = 9UL3WSDulcBnVj8UIVEnw/+V8wQ=
SHA1 (gobject-introspection-0.10.8.tar.bz2) = QQJo9f0Wzw4hkDjH3+OTJJFhtEY=
SHA256 (gobject-introspection-0.10.8.tar.bz2) = WxOH/zfwPbiAorHL1sa237kjopRo1Ng2fEWKv3cExh4=
SIZE (gobject-introspection-0.10.8.tar.bz2) = 1024874
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

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

@ -0,0 +1,15 @@
$OpenBSD: patch-Makefile_in,v 1.13 2011/09/21 13:59:21 jasper Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=659649
--- Makefile.in.orig Tue Sep 20 23:14:47 2011
+++ Makefile.in Wed Sep 21 00:24:45 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) sed -e s,@libdir\@,$(libdir), -e s,@PYTHON\@,$(PYTHON), -e s,@datarootdir\@,$(datarootdir), $< > $@.tmp && mv $@.tmp $@
@chmod a+x $@
check-local:

47
devel/gobject-introspection/patches/patch-configure
View File

@ -1,36 +1,23 @@
$OpenBSD: patch-configure,v 1.1 2011/06/06 18:15:53 ajacoutot Exp $
--- configure.orig Mon Jun 6 20:09:02 2011
+++ configure Mon Jun 6 20:11:20 2011
@@ -12663,10 +12663,30 @@ fi
fi
if test x$have_cairo_gobject = xyes; then
- CAIRO_SHARED_LIBRARY="libcairo-gobject.so.2"
+ case "$host" in
+ *-*-darwin*)
+ CAIRO_SHARED_LIBRARY="libcairo-gobject.2.dylib"
+ ;;
$OpenBSD: patch-configure,v 1.2 2011/09/21 13:59:21 jasper Exp $
--- 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"
+ ;;
+esac
CAIRO_GIR_PACKAGE="cairo-gobject"
elif test x$have_cairo = xyes; then
- CAIRO_SHARED_LIBRARY="libcairo.so.2"
+ case "$host" in
+ *-*-darwin*)
+ CAIRO_SHARED_LIBRARY="libcairo.2.dylib"
*)
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.2.so"
+ ;;
+ *)
+ CAIRO_SHARED_LIBRARY="libcairo.so.2"
+ ;;
+ esac
CAIRO_GIR_PACKAGE="cairo"
fi
;;
*)
CAIRO_SHARED_LIBRARY="libcairo.so.2"

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

@ -1,9 +1,9 @@
$OpenBSD: patch-giscanner_dumper_py,v 1.3 2011/04/07 09:57:18 jasper Exp $
--- giscanner/dumper.py.orig Thu Apr 7 11:48:35 2011
+++ giscanner/dumper.py Thu Apr 7 11:51:54 2011
@@ -80,7 +80,7 @@ class DumpCompiler(object):
self._options = options
$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):
self._get_type_functions = get_type_functions
self._error_quark_functions = error_quark_functions
- self._compiler_cmd = os.environ.get('CC', 'gcc')
+ self._compiler_cmd = os.environ.get('CC', '${CC}')

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

@ -1,10 +1,10 @@
$OpenBSD: patch-giscanner_scannermain_py,v 1.1 2011/04/07 09:38:12 jasper Exp $
$OpenBSD: patch-giscanner_scannermain_py,v 1.2 2011/09/21 13:59:21 jasper Exp $
Prime the scanner with two common directories for includes.
--- giscanner/scannermain.py.orig Wed Nov 17 22:32:04 2010
+++ giscanner/scannermain.py Thu Apr 7 11:25:35 2011
@@ -216,6 +216,8 @@ def process_packages(options, packages):
--- 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):
parser = _get_option_parser()
pkg_options, unused = parser.parse_args(filtered_output)
options.cpp_includes.extend(pkg_options.cpp_includes)

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

@ -1,12 +0,0 @@
$OpenBSD: patch-giscanner_sourcescanner_py,v 1.1 2011/05/14 20:24:02 ajacoutot Exp $
--- giscanner/sourcescanner.py.orig Sat May 14 22:10:11 2011
+++ giscanner/sourcescanner.py Sat May 14 22:10:23 2011
@@ -274,7 +274,7 @@ class SourceScanner(object):
defines = ['__GI_SCANNER__']
undefs = []
- cpp_args = ['cc', '-E', '-C', '-I.', '-']
+ cpp_args = ['${CC}', '-E', '-C', '-I.', '-']
cpp_args += self._cpp_options
proc = subprocess.Popen(cpp_args,

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

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.8 2011/05/14 11:22:12 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.9 2011/09/21 13:59:21 jasper 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/
@ -9,7 +10,6 @@ include/gobject-introspection-1.0/gibaseinfo.h
include/gobject-introspection-1.0/gicallableinfo.h
include/gobject-introspection-1.0/giconstantinfo.h
include/gobject-introspection-1.0/gienuminfo.h
include/gobject-introspection-1.0/gierrordomaininfo.h
include/gobject-introspection-1.0/gifieldinfo.h
include/gobject-introspection-1.0/gifunctioninfo.h
include/gobject-introspection-1.0/giinterfaceinfo.h
@ -65,9 +65,15 @@ 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/config.py
lib/gobject-introspection/giscanner/config.pyc
lib/gobject-introspection/giscanner/config.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
lib/gobject-introspection/giscanner/dumper.py
lib/gobject-introspection/giscanner/dumper.pyc
lib/gobject-introspection/giscanner/dumper.pyo
@ -89,6 +95,9 @@ 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/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
@ -159,7 +168,6 @@ 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-GIErrorDomainInfo.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
@ -172,6 +180,7 @@ 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
@ -182,7 +191,6 @@ 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.devhelp
share/gtk-doc/html/gi/gi.devhelp2
share/gtk-doc/html/gi/girepository.html
share/gtk-doc/html/gi/glib.html