Accepting request 56670 from home:dimstar:branches:GNOME:Factory

thanks

OBS-URL: https://build.opensuse.org/request/show/56670
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=35
This commit is contained in:
Vincent Untz 2011-01-06 01:32:55 +00:00 committed by Git OBS Bridge
parent 61a778a26f
commit 73a5c6abc9
6 changed files with 25 additions and 68 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8af5a4ff16df4b7f08db2eabc09396e15a19dde85a7d288fa26b9cdca280b9fa
size 1085036

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9c0060d66d14a060057a1fc005be73675a1b8a00d4968ce8e78ff2d6b9f84e81
size 1050788

View File

@ -1,30 +0,0 @@
commit 41d11cd82ddfc38d4d347cb039919f11536d12d3
Author: Vincent Untz <vuntz@gnome.org>
Date: Sat Sep 18 11:34:47 2010 +0200
scanner: Add workaround for libgnome-keyring
https://bugzilla.gnome.org/show_bug.cgi?id=629426
diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py
index b7d64a6..2cb878c 100644
--- a/giscanner/maintransformer.py
+++ b/giscanner/maintransformer.py
@@ -57,6 +57,17 @@ class MainTransformer(object):
alias = ast.Alias('AttributeSet', target=ast.TYPE_ANY)
self._namespace.append(alias, replace=True)
+ ## WORKAROUND ##
+ # Same hack as Atk hack.
+ # https://bugzilla.gnome.org/show_bug.cgi?id=629426
+ # https://bugzilla.gnome.org/show_bug.cgi?id=629682
+ if self._namespace.name == 'GnomeKeyring':
+ attribute = self._namespace.get('Attribute')
+ attributelist = self._namespace.get('AttributeList')
+ if attribute and attributelist:
+ alias = ast.Alias('AttributeList', target=ast.TYPE_ANY)
+ self._namespace.append(alias, replace=True)
+
# Some initial namespace surgery
self._namespace.walk(self._pass_fixup_hidden_fields)

View File

@ -1,26 +0,0 @@
Index: gobject-introspection-0.9.6/giscanner/maintransformer.py
===================================================================
--- gobject-introspection-0.9.6.orig/giscanner/maintransformer.py
+++ gobject-introspection-0.9.6/giscanner/maintransformer.py
@@ -68,6 +68,21 @@ class MainTransformer(object):
alias = ast.Alias('AttributeList', target=ast.TYPE_ANY)
self._namespace.append(alias, replace=True)
+ ## WORKAROUND ##
+ # Same hack as Atk hack.
+ # https://bugzilla.gnome.org/show_bug.cgi?id=629779
+ # https://bugzilla.gnome.org/show_bug.cgi?id=629682
+ if self._namespace.name == 'Gda':
+ valuecompare = self._namespace.get('value_compare')
+ slist = self._namespace.get('SList')
+ valuelist = self._namespace.get('ValueList')
+ if valuecompare and valuelist:
+ alias = ast.Alias('ValueList', target=ast.TYPE_ANY)
+ self._namespace.append(alias, replace=True)
+ if slist and valuelist:
+ alias = ast.Alias('SList', target=ast.TYPE_ANY)
+ self._namespace.append(alias, replace=True)
+
# Some initial namespace surgery
self._namespace.walk(self._pass_fixup_hidden_fields)

View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Wed Dec 22 23:37:53 CET 2010 - dimstar@opensuse.org
- Update to version 0.10.0:
+ An hash-table index has been added to the typelib format.
Using a perfect hash generated with the CMPH library allows
for much more efficient lookups in cases where symbols
need to be looked up repeatedly.
+ GIO annotations are now extracted from the GLib sources
(as a manual step; the extracted annotations are shipped
with gobject-introspection.) This will be extended in
the future to cover the reset of GLib.
+ UTF-8 string constants are now supported.
+ The cairo typelib now integrates properly with the
cairo-gobject library.
- Drop patches that were fixed upstream:
+ gobject-introspection-keyring-workaround.patch
+ gobject-introspection-libgda-workaround.patch
-------------------------------------------------------------------
Wed Oct 27 09:23:15 EDT 2010 - vuntz@opensuse.org

View File

@ -1,5 +1,5 @@
#
# spec file for package gobject-introspection (Version 0.9.12)
# spec file for package gobject-introspection (Version 0.10.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -18,8 +18,8 @@
Name: gobject-introspection
Version: 0.9.12
Release: 2
Version: 0.10.0
Release: 1
# FIXME: when bgo#629930 gets fixed, move the appropriate pkg-config files to the main package and rename the devel package to libgirepository-devel
License: LGPLv2.1+
Summary: GObject Introspection Tools
@ -27,10 +27,6 @@ Url: http://live.gnome.org/GObjectIntrospection
Group: Development/Libraries/GNOME
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM gobject-introspection-keyring-workaround.patch bgo#629426 vuntz@opensuse.org -- Workaround for libgnome-keyring
Patch0: gobject-introspection-keyring-workaround.patch
# PATCH-FIX-UPSTREAM gobject-introspection-libgda-workaround.patch bgo#629779 vuntz@opensuse.org -- Workaround for libgda
Patch1: gobject-introspection-libgda-workaround.patch
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flex
@ -70,8 +66,6 @@ a uniform, machine readable format.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%configure \