cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix update to evolution-data-server-3.6.1.

Browse Source
This commit is contained in:
ajacoutot 2012-10-14 08:04:11 +00:00
parent dc751ca217
commit 2e72e5f949
4 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
databases/evolution-data-server/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.120 2012/10/03 15:56:21 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.121 2012/10/14 08:04:11 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= unified backend for PIM programs
GNOME_PROJECT= evolution-data-server
GNOME_VERSION= 3.6.0
REVISION= 3
GNOME_VERSION= 3.6.1
# Only get the first x.y which is needed in the PLIST.
R= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}

4
databases/evolution-data-server/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (evolution-data-server-3.6.0.tar.xz) = UKfdGoEJrvp0jmuntkabtb+HObMKGXxJXbUWcD86q6g=
SIZE (evolution-data-server-3.6.0.tar.xz) = 4238696
SHA256 (evolution-data-server-3.6.1.tar.xz) = Y3/LaoNgGvKWjKC2AJWNqLDyVEQiTtxfrkHeqZWSQVA=
SIZE (evolution-data-server-3.6.1.tar.xz) = 3943136

16
databases/evolution-data-server/patches/patch-configure_ac
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-configure_ac,v 1.10 2012/10/01 15:00:18 ajacoutot Exp $
$OpenBSD: patch-configure_ac,v 1.11 2012/10/14 08:04:11 ajacoutot Exp $
From af70f1bec73b2c2ff72300cce93ffbd9c4b9d6ad Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@gnome.org>
Date: Mon, 16 Jul 2012 13:01:24 +0000
Subject: Bug 679914 - Replace libgnomekeyring with libsecret
--- configure.ac.orig Mon Oct 1 14:51:14 2012
+++ configure.ac Mon Oct 1 14:52:23 2012
--- configure.ac.orig Sat Oct 13 21:49:10 2012
+++ configure.ac Sun Oct 14 09:31:56 2012
@@ -36,7 +36,7 @@ dnl Required Package Versions
m4_define([glib_minimum_version], [2.32])
m4_define([gtk_minimum_version], [3.2])
@ -16,7 +16,7 @@ Subject: Bug 679914 - Replace libgnomekeyring with libsecret
m4_define([libxml_minimum_version], [2.0.0]) dnl XXX Just a Guess
m4_define([libsoup_minimum_version], [2.38.1])
m4_define([libgdata_minimum_version], [0.10])
@@ -385,11 +385,11 @@ dnl ***********************************
@@ -386,11 +386,11 @@ dnl ***********************************
dnl Check for GNOME Keyring.
dnl ***********************************
if test x$os_win32 = xno; then
@ -32,7 +32,7 @@ Subject: Bug 679914 - Replace libgnomekeyring with libsecret
dnl **********************************************************
dnl gcr-base is needed for secure password exchange over D-Bus
@@ -1285,7 +1285,7 @@ PKG_CHECK_MODULES(SQLITE3, [sqlite3 >= sqlite_minimum_
@@ -1286,7 +1286,7 @@ PKG_CHECK_MODULES(SQLITE3, [sqlite3 >= sqlite_minimum_
dnl ******************************
dnl libedataserver flags
dnl ******************************
@ -41,7 +41,7 @@ Subject: Bug 679914 - Replace libgnomekeyring with libsecret
EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, $E_DATA_SERVER_DEPS, $MANUAL_NSPR_CFLAGS, $MANUAL_NSPR_LIBS)
AC_SUBST(E_DATA_SERVER_CFLAGS)
@@ -1307,7 +1307,7 @@ if test "x$enable_maintainer_mode" = "xyes" ; then
@@ -1308,7 +1308,7 @@ if test "x$enable_maintainer_mode" = "xyes" ; then
AC_SUBST(FACTORY_GTK_LIBS)
fi
@ -50,7 +50,7 @@ Subject: Bug 679914 - Replace libgnomekeyring with libsecret
dnl ******************************
dnl libebackend flags
@@ -1319,7 +1319,7 @@ AC_SUBST(E_BACKEND_LIBS)
@@ -1320,7 +1320,7 @@ AC_SUBST(E_BACKEND_LIBS)
dnl ******************************
dnl evolution-addressbook flags
dnl ******************************
@ -59,7 +59,7 @@ Subject: Bug 679914 - Replace libgnomekeyring with libsecret
EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -1328,7 +1328,7 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
@@ -1329,7 +1329,7 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
dnl ******************************
dnl evolution-calendar flags
dnl ******************************

18
databases/evolution-data-server/patches/patch-tests_libedata-cal_Makefile_am
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-tests_libedata-cal_Makefile_am,v 1.1 2012/10/01 15:00:19 ajacoutot Exp $
From e7d2d2268ceb0bc194a1ac0dbd399a2c5780a82e Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Sun, 30 Sep 2012 09:10:13 +0000
Subject: do not hardcode -lgcov
--- tests/libedata-cal/Makefile.am.orig Mon Oct 1 15:23:54 2012
+++ tests/libedata-cal/Makefile.am Mon Oct 1 15:24:03 2012
@@ -57,7 +57,7 @@ test_intervaltree_coverage_LDADD = \
$(top_builddir)/libedataserver/libedataserver-1.2.la \
$(EVOLUTION_CALENDAR_LIBS) \
$(CAMEL_LIBS) \
- -lgcov
+ $(CODE_COVERAGE_LDFLAGS)
.PHONY: coverage
coverage: