rpm/evolution-data-server
SHA256
1
0
Fork 0
forked from pool/evolution-data-server
Code Pull Requests Activity

Accepting request 97480 from home:vuntz:branches:GNOME:Factory

Browse Source 
Fix introspection

OBS-URL: https://build.opensuse.org/request/show/97480
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=114
This commit is contained in:
Vincent Untz 2011-12-21 09:07:02 +00:00 committed by Git OBS Bridge
parent bf5849b81b
commit edffc1c77e
3 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
evolution-data-server-fix-introspection-build.patch Normal file
View File

@ -0,0 +1,35 @@
From c92f1c0f25d8bb590c0ea9439a4b179df9159b7b Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 20 Dec 2011 13:27:54 -0500
Subject: [PATCH] build: Use --include-uninstalled for internal .gir files
Otherwise we end up with a dependency on an installed pkg-config file.
https://bugzilla.gnome.org/show_bug.cgi?id=662888
---
addressbook/libebook/Makefile.am | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index fce463e..602fbe0 100644
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -85,7 +85,7 @@ if HAVE_INTROSPECTION
introspection_sources = $(libebook_1_2_la_SOURCES)
EBook-1.2.gir: libebook-1.2.la
-EBook_1_2_gir_INCLUDES = GObject-2.0 EDataServer-1.2 GLib-2.0 libxml2-2.0 \
+EBook_1_2_gir_INCLUDES = GObject-2.0 GLib-2.0 libxml2-2.0 \
Gio-2.0 \
$(NULL)
libxml_include = `$(PKG_CONFIG) --cflags libxml-2.0`
@@ -100,6 +100,7 @@ EBook_1_2_gir_CFLAGS = $(INCLUDES) \
-I$(top_srcdir)/addressbook/libebook \
-I$(top_builddir)/addressbook/libebook \
$(NULL)
+EBook_1_2_gir_SCANNERFLAGS = --include-uninstalled=$(top_builddir)/libedataserver/EDataServer-1.2.gir
EBook_1_2_gir_LIBS = \
libebook-1.2.la $(top_builddir)/libedataserver/libedataserver-1.2.la
EBook_1_2_gir_FILES = $(libebook_1_2_la_SOURCES) $(libebookinclude_HEADERS)
--
1.7.6.4

8
evolution-data-server.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Dec 21 08:45:04 UTC 2011 - vuntz@opensuse.org
- Add evolution-data-server-fix-introspection-build.patch: fix
build of introspection support.
- Set %with_introspection macro to 1 now that we can build
introspection support again.
-------------------------------------------------------------------
Tue Dec 20 13:26:28 UTC 2011 - vuntz@opensuse.org

7
evolution-data-server.spec
View File

@ -15,8 +15,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define USE_EVOLDAP 0
%define with_introspection 0
%define with_introspection 1
# Shared Library soNUMs, to make it easier for updates
# When updating the sonums, do not forget to also update baselibs.conf
@ -33,13 +34,14 @@ Name: evolution-data-server
%define _evo_version 3.4
Version: 3.3.3
Release: 0
# FIXME: Verify if introspection can be enabled again. See bgo#662888
Summary: Evolution Data Server
License: LGPL-2.1+
Group: Development/Libraries/GNOME
Url: http://www.gnome.org
Source0: http://download.gnome.org/sources/evolution-data-server/3.3/%{name}-%{version}.tar.xz
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM evolution-data-server-fix-introspection-build.patch bgo#662888 vuntz@opensuse.org -- Fix build of introspection data
Patch0: evolution-data-server-fix-introspection-build.patch
BuildRequires: bison
BuildRequires: db-devel
%if %USE_EVOLDAP
@ -254,6 +256,7 @@ This package contains developer documentation.
%prep
%setup -q
translation-update-upstream
%patch0 -p1
%build
%{configure} \