diff --git a/libgda-5.1.1-introspection.patch b/libgda-5.1.1-introspection.patch new file mode 100644 index 0000000..2acbf77 --- /dev/null +++ b/libgda-5.1.1-introspection.patch @@ -0,0 +1,27 @@ +From 4dd8c531a7042a74e4fbd34c8614c72d67018024 Mon Sep 17 00:00:00 2001 +From: Vivien Malerba +Date: Sun, 23 Sep 2012 22:07:01 +0200 +Subject: [PATCH] Correction for bug #684141 + +Mark GDA_SERVER_PROVIDER_UNDEFINED_LIMITING_THREAD as not introspectable +--- + libgda/gda-server-provider.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libgda/gda-server-provider.h b/libgda/gda-server-provider.h +index c0397e5..c448f00 100644 +--- a/libgda/gda-server-provider.h ++++ b/libgda/gda-server-provider.h +@@ -303,6 +303,9 @@ typedef void (*GdaServerProviderAsyncCallback) (GdaServerProvider *provider, Gda + typedef void (*GdaServerProviderExecCallback) (GdaServerProvider *provider, GdaConnection *cnc, guint task_id, + GObject *result_obj, const GError *error, gpointer data); + ++/** ++ * GDA_SERVER_PROVIDER_UNDEFINED_LIMITING_THREAD: (skip) ++ */ + #define GDA_SERVER_PROVIDER_UNDEFINED_LIMITING_THREAD ((gpointer)0x1) + struct _GdaServerProviderClass { + GObjectClass parent_class; +-- +1.7.12.1 + diff --git a/libgda.spec b/libgda.spec index 1685983..6b9493f 100644 --- a/libgda.spec +++ b/libgda.spec @@ -11,13 +11,17 @@ Name: libgda Epoch: 1 Version: 5.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for writing gnome database programs License: LGPLv2+ URL: http://www.gnome-db.org/ Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/5.1/%{name}-%{version}.tar.xz +# Fix the build with introspection +# https://bugzilla.gnome.org/show_bug.cgi?id=684141 +Patch0: libgda-5.1.1-introspection.patch + BuildRequires: pkgconfig >= 0.8 BuildRequires: glib2-devel >= 2.28.0 BuildRequires: gtk3-devel >= 3.0.0 @@ -176,6 +180,9 @@ This %{name}-java includes the %{name} Java JDBC provider. %prep %setup -q + +%patch0 -p1 -b .introspection + # AUTHORS not in UTF-8 iconv --from=ISO-8859-1 --to=UTF-8 AUTHORS > AUTHORS.new && \ touch -r AUTHORS AUTHORS.new && mv AUTHORS.new AUTHORS @@ -198,6 +205,8 @@ export LD_LIBRARY_PATH=/usr/lib/jvm/java/jre/lib/%{archinstall}/server:$LD_LIBRA --with-libsoup --with-gnome-keyring \ --with-ui --with-gtksourceview \ --with-goocanvas --with-graphviz \ + --enable-gda-gi \ + --enable-gdaui-gi \ --enable-system-sqlite=yes \ %{?with_bdb:--with-bdb=yes --with-bdb-libdir-name=%{_lib}} \ %{!?with_ldap:--with-ldap=no} \ @@ -243,6 +252,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{_libdir}/%{name}-%{apiver}/ %dir %{_libdir}/%{name}-%{apiver}/plugins/ %dir %{_libdir}/%{name}-%{apiver}/providers/ +%{_libdir}/girepository-1.0/Gda-%{apiver}.typelib %{_mandir}/man1/* %dir %{_datadir}/%{name}-%{apiver}/ %dir %{_datadir}/%{name}-%{apiver}/dtd/ @@ -257,6 +267,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{_datadir}/gnome/ %dir %{_datadir}/gnome/help/ %doc %{_datadir}/gnome/help/gda-sql/ +%{_datadir}/gir-1.0/Gda-%{apiver}.gir %dir %{_includedir}/%{name}-%{apiver}/ %{_includedir}/%{name}-%{apiver}/%{name} %{_includedir}/%{name}-%{apiver}/%{name}-xslt @@ -271,6 +282,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files ui %{_libdir}/%{name}-ui-%{apiver}.so.* %{_libdir}/%{name}-%{apiver}/plugins/*.xml +%{_libdir}/girepository-1.0/Gdaui-%{apiver}.typelib %{_datadir}/%{name}-%{apiver}/pixmaps %{_datadir}/%{name}-%{apiver}/dtd/gdaui-layout.dtd %{_datadir}/%{name}-%{apiver}/ui/ @@ -284,6 +296,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/gdaui-demo-%{apiver} %{_libdir}/pkgconfig/%{name}-ui-%{apiver}.pc %{_datadir}/%{name}-%{apiver}/demo/ +%{_datadir}/gir-1.0/Gdaui-%{apiver}.gir %{_libdir}/%{name}-%{apiver}/plugins/%{name}-ui-plugins.so %files tools @@ -349,6 +362,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Wed Oct 24 2012 Kalev Lember - 1:5.1.1-3 +- Enable introspection (#869072) + * Mon Oct 22 2012 Kalev Lember - 1:5.1.1-2 - Add back the epoch - Build without scrollkeeper support