Accepting request 48422 from home:vuntz:branches:GNOME:Factory
ok OBS-URL: https://build.opensuse.org/request/show/48422 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=24
This commit is contained in:
Vincent Untz
Git OBS Bridge
parent
1fb16da09b
commit
007dd214cd
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:662bdd2bf70239fa579777f58bfd0bbb08c6f9b6313020a9b672505d7e3c1c1d
|
||||
size 780411
|
||||
3
gobject-introspection-0.9.6.tar.bz2
Normal file
3
gobject-introspection-0.9.6.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e653258394b44a7fc4cdac604c72948c3eff7f1b882f094cfea21ed19acb9ee6
|
||||
size 585940
|
||||
30
gobject-introspection-keyring-workaround.patch
Normal file
30
gobject-introspection-keyring-workaround.patch
Normal file
@ -0,0 +1,30 @@
|
||||
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)
|
||||
|
||||
@ -1,3 +1,54 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 17 16:43:37 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
- Drop gir-repository Recommends from libgirepository-1_0-1: there
|
||||
is no real interesting file there anymore.
|
||||
- Temporarily remove --enable-gtk-doc option from configure: the
|
||||
0.9.6 tarball is missing all the files needed for this. See
|
||||
bgo#629871.
|
||||
- Move all gir files to the main package (as well as the m4 file
|
||||
and the Makefile), but still keep the /usr/share/gir-1.0
|
||||
directory in libgirepository-1_0-1, to not force everybody to own
|
||||
it. The reason for the move is that the gobject-introspection
|
||||
package is more or less like a compiler, while the devel package
|
||||
is really the devel package for the libgirepository-1.0 library.
|
||||
- However, we need to keep the pkg-config file in the devel
|
||||
subpackage at the moment, since they cover both the library and
|
||||
the gobject-introspection tools. We'll be able to change this
|
||||
when bgo#629930 gets fixed.
|
||||
- Move the AUTHORS, NEWS and similar files to the main package.
|
||||
- Add gobject-introspection-keyring-workaround.patch: this is a
|
||||
workaround needed when generating the gir file for
|
||||
libgnome-keyring. See bgo#629426.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 16 21:28:42 CEST 2010 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 0.9.6:
|
||||
+ Fix regressions in the scanner rewrite from 0.9.5, especially
|
||||
issues that stopped other modules from building correctly.
|
||||
+ Various other small improvements and code cleanups in the
|
||||
scanner.
|
||||
+ Add missing annotations to GLib and Gio.
|
||||
+ Various bug fixes.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 11 20:42:17 CEST 2010 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 0.9.5:
|
||||
+ Major rewrite, that leads to a bump in the gir format (version
|
||||
1.2).
|
||||
+ Rename Everything to Regress, and do no longer install it by
|
||||
default; instead, ship the C files in
|
||||
$(datadir)/gobject-introspection/tests/
|
||||
+ Fix giscanner crash with no cache directory.
|
||||
+ Make the scanner parse C++ files too.
|
||||
+ If GI_SCANNER_DEBUG is set, drop into a debugger on error in
|
||||
the scanner.
|
||||
+ Import DBus, DBusGLib gir from gir-repository.
|
||||
+ Update some gir files shipped with gobject-introspection.
|
||||
+ Various bug fixes.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 6 22:24:00 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package gobject-introspection (Version 0.9.3)
|
||||
# spec file for package gobject-introspection (Version 0.9.6)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -18,6 +18,17 @@
|
||||
|
||||
|
||||
Name: gobject-introspection
|
||||
Version: 0.9.6
|
||||
# FIXME: next tarball should have gtk-doc again, so pass --enable-gtk-doc to configure. See bgo#629871
|
||||
# FIXME: when bgo#629930 gets fixed, move the appropriate pkg-config files to the main package and rename the devel package to libgirepository-devel
|
||||
Release: 1
|
||||
License: LGPLv2.1+
|
||||
Summary: GObject Introspection Tools
|
||||
Url: http://live.gnome.org/GObjectIntrospection
|
||||
Group: Development/Libraries/GNOME
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
# PATCH-FIX-UPSTREAM gobject-introspection-keyring-workaround.patch bgo#629426 vuntz@opensuse.org -- Workaround for libgnome-keyring
|
||||
Patch0: gobject-introspection-keyring-workaround.patch
|
||||
BuildRequires: bison
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: flex
|
||||
@ -27,13 +38,6 @@ BuildRequires: python-devel
|
||||
BuildRequires: python-xml
|
||||
BuildRequires: pkgconfig(cairo)
|
||||
BuildRequires: pkgconfig(gobject-2.0)
|
||||
Version: 0.9.3
|
||||
Release: 1
|
||||
License: LGPLv2.1+
|
||||
Summary: GObject Introspection Tools
|
||||
Url: http://live.gnome.org/GObjectIntrospection
|
||||
Group: Development/Libraries/GNOME
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Requires: libgirepository-1_0-1 = %{version}
|
||||
Requires: python-xml
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -46,7 +50,6 @@ a uniform, machine readable format.
|
||||
License: LGPLv2.1+
|
||||
Summary: GObject Introspection Library
|
||||
Group: Development/Libraries/GNOME
|
||||
Recommends: gir-repository
|
||||
|
||||
%description -n libgirepository-1_0-1
|
||||
The goal of the project is to describe the APIs and collect them in
|
||||
@ -66,11 +69,12 @@ a uniform, machine readable format.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--disable-static \
|
||||
--enable-gtk-doc
|
||||
--disable-static
|
||||
# --enable-gtk-doc
|
||||
%__make %{?jobs:-j%jobs}
|
||||
|
||||
%install
|
||||
@ -87,31 +91,42 @@ rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING COPYING.GPL
|
||||
%{_bindir}/*
|
||||
%doc AUTHORS CONTRIBUTORS COPYING COPYING.GPL NEWS README TODO
|
||||
%{_bindir}/g-ir-compiler
|
||||
%{_bindir}/g-ir-generate
|
||||
%{_bindir}/g-ir-scanner
|
||||
%doc %{_mandir}/man1/g-ir-compiler.1*
|
||||
%doc %{_mandir}/man1/g-ir-generate.1*
|
||||
%doc %{_mandir}/man1/g-ir-scanner.1*
|
||||
%{_datadir}/aclocal/introspection.m4
|
||||
%{_datadir}/gir-1.0/*.gir
|
||||
# We don't include directly %{_libdir}/gobject-introspection since there might
|
||||
# be files there in the future that belong to the library package
|
||||
%dir %{_libdir}/gobject-introspection
|
||||
%{_libdir}/gobject-introspection/giscanner
|
||||
%doc %{_mandir}/man?/*.*
|
||||
%{_libdir}/gobject-introspection/giscanner/
|
||||
# We explicitly list the content of the directory that is of interest to us,
|
||||
# since there might be files there in the future that belong to the library
|
||||
# package
|
||||
%dir %{_datadir}/gobject-introspection-1.0
|
||||
%{_datadir}/gobject-introspection-1.0/Makefile.introspection
|
||||
%{_datadir}/gobject-introspection-1.0/tests/
|
||||
|
||||
%files -n libgirepository-1_0-1
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS CONTRIBUTORS COPYING.LGPL NEWS README TODO
|
||||
%{_datadir}/gir-1.0/
|
||||
%{_libdir}/*.so.*
|
||||
%doc COPYING.LGPL
|
||||
# We own this directory here instead of devel to make sure other packages do
|
||||
# not have to own it
|
||||
%dir %{_datadir}/gir-1.0
|
||||
%{_libdir}/libgirepository-1.0.so.*
|
||||
%{_libdir}/girepository-1.0/
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%doc %{_datadir}/gtk-doc/html/gi/
|
||||
#%doc %{_datadir}/gtk-doc/html/gi/
|
||||
%{_includedir}/gobject-introspection-1.0/
|
||||
%{_datadir}/aclocal/*.m4
|
||||
# We explicitly list the content of the directory that is of interest to us,
|
||||
# since not everything might go into the devel package in the future
|
||||
%dir %{_datadir}/gobject-introspection-1.0
|
||||
%{_datadir}/gobject-introspection-1.0/Makefile.introspection
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_libdir}/libgirepository-1.0.so
|
||||
# FIXME: those two files should be moved to the main package when bgo#629930 gets fixed
|
||||
%{_libdir}/pkgconfig/gobject-introspection-1.0.pc
|
||||
%{_libdir}/pkgconfig/gobject-introspection-no-export-1.0.pc
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user