update to gobject-introspection-1.40.0
ok aja@
This commit is contained in:
jasper
parent
dbf1636642
commit
60e731d1fb
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.77 2014/03/17 12:23:24 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.78 2014/03/26 08:29:11 jasper Exp $
|
||||
|
||||
COMMENT= GObject Introspection
|
||||
|
||||
GNOME_VERSION= 1.38.0
|
||||
GNOME_VERSION= 1.40.0
|
||||
GNOME_PROJECT= gobject-introspection
|
||||
REVISION= 4
|
||||
|
||||
CATEGORIES= devel
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (gobject-introspection-1.38.0.tar.xz) = NXXl01PBelZ/33/6qnrr6TR7Ww7ujmnWErpWqd72fXM=
|
||||
SIZE (gobject-introspection-1.38.0.tar.xz) = 1226324
|
||||
SHA256 (gobject-introspection-1.40.0.tar.xz) = lup16WeQg+f+OaEF6BDi6tLXCKvxiaW6Qgv8z/+iTpg=
|
||||
SIZE (gobject-introspection-1.40.0.tar.xz) = 1286424
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-giscanner_dumper_py,v 1.8 2013/12/14 09:16:49 ajacoutot Exp $
|
||||
|
||||
From d355a386f8f03bdfacf6b48a8fccb0a4218cc4fa Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Lortie <desrt@desrt.ca>
|
||||
Date: Sun, 08 Dec 2013 17:01:43 +0000
|
||||
Subject: dumper: use 'cc' as the default C compiler
|
||||
|
||||
--- giscanner/dumper.py.orig Tue Sep 24 15:41:09 2013
|
||||
+++ giscanner/dumper.py Sat Dec 14 09:28:37 2013
|
||||
@@ -82,7 +82,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')
|
||||
self._linker_cmd = os.environ.get('CC', self._compiler_cmd)
|
||||
self._pkgconfig_cmd = os.environ.get('PKG_CONFIG', 'pkg-config')
|
||||
self._pkgconfig_msvc_flags = ''
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-giscanner_sourcescanner_py,v 1.7 2013/12/14 09:16:49 ajacoutot Exp $
|
||||
|
||||
From cbafcdb323307fd6bb5e48b44167fd995dc933a1 Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Lortie <desrt@desrt.ca>
|
||||
Date: Sun, 08 Dec 2013 16:48:08 +0000
|
||||
Subject: scanner: make sure we pass CFLAGS to cpp
|
||||
|
||||
--- giscanner/sourcescanner.py.orig Wed Jul 10 18:13:23 2013
|
||||
+++ giscanner/sourcescanner.py Sat Dec 14 09:28:34 2013
|
||||
@@ -284,6 +284,7 @@ class SourceScanner(object):
|
||||
# Note that the generated dumper program is
|
||||
# still built and linked by Visual C++.
|
||||
cpp_args = ['gcc']
|
||||
+ cpp_args += os.environ.get('CFLAGS', '').split()
|
||||
cpp_args += ['-E', '-C', '-I.', '-']
|
||||
cpp_args += self._cpp_options
|
||||
|
||||
@ -1,23 +1,10 @@
|
||||
$OpenBSD: patch-giscanner_utils_py,v 1.10 2014/03/17 12:23:24 ajacoutot Exp $
|
||||
$OpenBSD: patch-giscanner_utils_py,v 1.11 2014/03/26 08:29:11 jasper Exp $
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=726518
|
||||
|
||||
From 513dfb969c2317377eb0f0ec150767a8d95c6d2e Mon Sep 17 00:00:00 2001
|
||||
From: Clemens Lang <cal@macports.org>
|
||||
Date: Mon, 10 Feb 2014 23:44:06 +0000
|
||||
Subject: scanner: Improve compatibility with OS X
|
||||
|
||||
--- giscanner/utils.py.orig Wed Jul 10 18:13:23 2013
|
||||
+++ giscanner/utils.py Mon Mar 17 12:21:29 2014
|
||||
@@ -21,6 +21,7 @@
|
||||
import re
|
||||
import os
|
||||
import subprocess
|
||||
+import platform
|
||||
|
||||
|
||||
_debugflags = None
|
||||
@@ -120,6 +121,12 @@ def get_libtool_command(options):
|
||||
--- giscanner/utils.py.orig Tue Mar 25 10:09:29 2014
|
||||
+++ giscanner/utils.py Tue Mar 25 10:09:32 2014
|
||||
@@ -143,6 +143,12 @@ def get_libtool_command(options):
|
||||
return None
|
||||
|
||||
libtool_path = options.libtool_path
|
||||
@ -30,24 +17,3 @@ Subject: scanner: Improve compatibility with OS X
|
||||
if libtool_path:
|
||||
# Automake by default sets:
|
||||
# LIBTOOL = $(SHELL) $(top_builddir)/libtool
|
||||
@@ -127,14 +134,18 @@ def get_libtool_command(options):
|
||||
# we simply split().
|
||||
return libtool_path.split(' ')
|
||||
|
||||
+ libtool_cmd = 'libtool'
|
||||
+ if platform.system() == 'Darwin':
|
||||
+ # libtool on OS X is a completely different program written by Apple
|
||||
+ libtool_cmd = 'glibtool'
|
||||
try:
|
||||
- subprocess.check_call(['libtool', '--version'],
|
||||
+ subprocess.check_call([libtool_cmd, '--version'],
|
||||
stdout=open(os.devnull))
|
||||
except (subprocess.CalledProcessError, OSError):
|
||||
# If libtool's not installed, assume we don't need it
|
||||
return None
|
||||
|
||||
- return ['libtool']
|
||||
+ return [libtool_cmd]
|
||||
|
||||
|
||||
def files_are_identical(path1, path2):
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.15 2014/03/09 22:11:44 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.16 2014/03/26 08:29:11 jasper Exp $
|
||||
bin/g-ir-annotation-tool
|
||||
@bin bin/g-ir-compiler
|
||||
bin/g-ir-doc-tool
|
||||
@ -68,6 +68,9 @@ lib/gobject-introspection/giscanner/collections/
|
||||
lib/gobject-introspection/giscanner/collections/__init__.py
|
||||
lib/gobject-introspection/giscanner/collections/__init__.pyc
|
||||
lib/gobject-introspection/giscanner/collections/__init__.pyo
|
||||
lib/gobject-introspection/giscanner/collections/counter.py
|
||||
lib/gobject-introspection/giscanner/collections/counter.pyc
|
||||
lib/gobject-introspection/giscanner/collections/counter.pyo
|
||||
lib/gobject-introspection/giscanner/collections/ordereddict.py
|
||||
lib/gobject-introspection/giscanner/collections/ordereddict.pyc
|
||||
lib/gobject-introspection/giscanner/collections/ordereddict.pyo
|
||||
@ -76,11 +79,14 @@ 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/callback.tmpl
|
||||
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/field.tmpl
|
||||
lib/gobject-introspection/giscanner/doctemplates/C/function.tmpl
|
||||
lib/gobject-introspection/giscanner/doctemplates/C/interface.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
|
||||
@ -88,11 +94,14 @@ 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/callback.tmpl
|
||||
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/field.tmpl
|
||||
lib/gobject-introspection/giscanner/doctemplates/Gjs/function.tmpl
|
||||
lib/gobject-introspection/giscanner/doctemplates/Gjs/interface.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
|
||||
@ -100,11 +109,14 @@ 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/callback.tmpl
|
||||
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/field.tmpl
|
||||
lib/gobject-introspection/giscanner/doctemplates/Python/function.tmpl
|
||||
lib/gobject-introspection/giscanner/doctemplates/Python/interface.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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user