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

Update to folks-0.6.8.

Browse Source
This commit is contained in:
ajacoutot 2012-03-29 07:12:00 +00:00
parent c3f60e9fd1
commit 3ccf582bc5
11 changed files with 30 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
net/telepathy/folks/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.33 2012/03/08 14:18:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.34 2012/03/29 07:12:00 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,18 +6,16 @@ COMMENT-main= people aggregation library
COMMENT-tracker= (meta-)tracker backend for folks
GNOME_PROJECT= folks
GNOME_VERSION= 0.6.7
API_V= 31
GNOME_VERSION= 0.6.8
API_V= 32
PKGNAME-main= ${DISTNAME}
PKGNAME-tracker= ${GNOME_PROJECT}-meta-tracker-${GNOME_VERSION}
REVISION-main= 1
REVISION-tracker= 1
SHARED_LIBS += folks-telepathy 5.0 # 29.0
SHARED_LIBS += folks 5.0 # 29.0
SHARED_LIBS += folks-eds 0.1 # 29.0
SHARED_LIBS += folks-libsocialweb 0.0 # 32.0
SHARED_LIBS += folks-tracker 0.0 # 30.0
TRACKER_VERSION= 0.14
@ -35,14 +33,15 @@ MULTI_PACKAGES= -main -tracker
WANTLIB-main += ${WANTLIB}
WANTLIB-main += asn1 c camel-1.2 com_err crypto ebook-1.2 edataserver-1.2
WANTLIB-main += gssapi krb5 ncurses nspr4 nss3 nssutil3 plc4 plds4
WANTLIB-main += gssapi krb5 ncurses nspr4 nss3 socialweb-client plc4 plds4
WANTLIB-main += pthread readline smime3 softokn3 soup-2.4 ssl3 telepathy-glib
WANTLIB-main += xml2 z
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
databases/evolution-data-server>=3.2.0p2 \
devel/libgee \
net/telepathy/telepathy-glib>=0.14.3
databases/evolution-data-server \
devel/libgee06 \
net/telepathy/telepathy-glib>=0.14.3 \
net/libsocialweb
RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS} \
net/telepathy/telepathy-mission-control
@ -65,26 +64,8 @@ MODGNOME_LDFLAGS= -Wl,-rpath,${LOCALBASE}/lib/tracker-${TRACKER_VERSION}
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-import-tool \
--enable-inspect-tool \
--enable-tracker-backend
# Don't enable this yet untill it's stable enough.
CONFIGURE_ARGS+= --enable-libsocialweb-backend=no
# Experimental bindings, but hey, without testing they'll never mature.
CONFIGURE_ARGS+= --enable-eds-backend
# libtoolize
AUTOCONF_VERSION= 2.68
AUTOMAKE_VERSION= 1.11
BUILD_ENV= AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION}
MAKE_ENV += ${BUILD_ENV}
BUILD_DEPENDS += devel/libtool \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
pre-configure:
cd ${WRKSRC} && \
env ${CONFIGURE_ENV} \
${BUILD_ENV} \
./autogen.sh --no-configure
--enable-tracker-backend \
--enable-libsocialweb-backend \
--enable-eds-backend
.include <bsd.port.mk>

10
net/telepathy/folks/distinfo
View File

@ -1,5 +1,5 @@
MD5 (telepathy/folks-0.6.7.tar.xz) = gf8goyHZdaJsWKjsi68LsA==
RMD160 (telepathy/folks-0.6.7.tar.xz) = duSCijRLE0kKQBUbM3iSRLCTvII=
SHA1 (telepathy/folks-0.6.7.tar.xz) = Vek5FffbnoAG0EQUxZV4Mx8xEw0=
SHA256 (telepathy/folks-0.6.7.tar.xz) = 2c4/0fDqPgyzeAUhz9oWEGLPftGgFiYejSRP5By66PM=
SIZE (telepathy/folks-0.6.7.tar.xz) = 1403828
MD5 (telepathy/folks-0.6.8.tar.xz) = 11UgJsR2Oj1ukVot4PvsPw==
RMD160 (telepathy/folks-0.6.8.tar.xz) = aMcWYZoFg0AbRzzfpa11CSVrZgg=
SHA1 (telepathy/folks-0.6.8.tar.xz) = zqgGsOyhdvSXCXvHJckOle1FzUc=
SHA256 (telepathy/folks-0.6.8.tar.xz) = TuGM6AgxXyera/n30rQ43UwQQqiraDa7UFi23OFn4LE=
SIZE (telepathy/folks-0.6.8.tar.xz) = 1420560

18
net/telepathy/folks/patches/patch-backends_tracker_Makefile_am
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-backends_tracker_Makefile_am,v 1.1 2012/03/08 14:18:27 ajacoutot Exp $
From 5f26596731a40c8103fe403d5aaa7049e3eae496 Mon Sep 17 00:00:00 2001
From: Travis Reitter <travis.reitter@collabora.co.uk>
Date: Mon, 05 Mar 2012 23:30:10 +0000
Subject: Factor out the tracker-sparql major number.
--- backends/tracker/Makefile.am.orig Thu Jan 12 18:25:24 2012
+++ backends/tracker/Makefile.am Thu Mar 8 14:08:34 2012
@@ -26,7 +26,7 @@ tracker_deps = \
gee-1.0 \
gio-2.0 \
gobject-2.0 \
- tracker-sparql-0.12 \
+ tracker-sparql-$(TRACKER_SPARQL_MAJOR) \
$(NULL)
tracker_la_CPPFLAGS = \

27
net/telepathy/folks/patches/patch-backends_tracker_lib_Makefile_am
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-backends_tracker_lib_Makefile_am,v 1.1 2012/03/08 14:18:27 ajacoutot Exp $
From 5f26596731a40c8103fe403d5aaa7049e3eae496 Mon Sep 17 00:00:00 2001
From: Travis Reitter <travis.reitter@collabora.co.uk>
Date: Mon, 05 Mar 2012 23:30:10 +0000
Subject: Factor out the tracker-sparql major number.
--- backends/tracker/lib/Makefile.am.orig Thu Jan 12 18:25:24 2012
+++ backends/tracker/lib/Makefile.am Thu Mar 8 14:08:34 2012
@@ -28,7 +28,7 @@ libfolks_tracker_la_VALAFLAGS = \
--pkg gobject-2.0 \
--pkg gio-2.0 \
--pkg gee-1.0 \
- --pkg tracker-sparql-0.12 \
+ --pkg tracker-sparql-$(TRACKER_SPARQL_MAJOR) \
--includedir folks \
--vapi folks-tracker.vapi \
-H folks/folks-tracker.h \
@@ -39,7 +39,7 @@ folks_backend_tracker_deps = \
gee-1.0 \
gio-2.0 \
gobject-2.0 \
- tracker-sparql-0.12 \
+ tracker-sparql-$(TRACKER_SPARQL_MAJOR) \
$(NULL)
libfolks_tracker_la_CPPFLAGS = \

17
net/telepathy/folks/patches/patch-backends_tracker_lib_folks-tracker-uninstalled_pc_in
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-backends_tracker_lib_folks-tracker-uninstalled_pc_in,v 1.1 2012/03/08 14:18:27 ajacoutot Exp $
From 5f26596731a40c8103fe403d5aaa7049e3eae496 Mon Sep 17 00:00:00 2001
From: Travis Reitter <travis.reitter@collabora.co.uk>
Date: Mon, 05 Mar 2012 23:30:10 +0000
Subject: Factor out the tracker-sparql major number.
--- backends/tracker/lib/folks-tracker-uninstalled.pc.in.orig Thu Nov 10 23:36:54 2011
+++ backends/tracker/lib/folks-tracker-uninstalled.pc.in Thu Mar 8 14:08:34 2012
@@ -7,6 +7,6 @@ vapidir=@abs_top_srcdir@/folks
Name: Folks Tracker support library (uninstalled copy)
Description: Tracker support library for the Folks meta-contacts library
Version: @VERSION@
-Requires: folks glib-2.0 gobject-2.0 gee-1.0 tracker-sparql-0.12
+Requires: folks glib-2.0 gobject-2.0 gee-1.0 tracker-sparql-@TRACKER_SPARQL_MAJOR@
Libs: ${abs_top_builddir}/backends/telepathy/libfolks-tracker.la
Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/backends/tracker -I${abs_top_builddir}

14
net/telepathy/folks/patches/patch-backends_tracker_lib_folks-tracker_deps_in
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-backends_tracker_lib_folks-tracker_deps_in,v 1.1 2012/03/08 14:18:27 ajacoutot Exp $
From 5f26596731a40c8103fe403d5aaa7049e3eae496 Mon Sep 17 00:00:00 2001
From: Travis Reitter <travis.reitter@collabora.co.uk>
Date: Mon, 05 Mar 2012 23:30:10 +0000
Subject: Factor out the tracker-sparql major number.
--- /dev/null Thu Mar 8 14:13:10 2012
+++ backends/tracker/lib/folks-tracker.deps.in Thu Mar 8 14:12:53 2012
@@ -0,0 +1,4 @@
+glib-2.0
+gobject-2.0
+folks
+tracker-sparql-@TRACKER_SPARQL_MAJOR@

17
net/telepathy/folks/patches/patch-backends_tracker_lib_folks-tracker_pc_in
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-backends_tracker_lib_folks-tracker_pc_in,v 1.1 2012/03/08 14:18:27 ajacoutot Exp $
From 5f26596731a40c8103fe403d5aaa7049e3eae496 Mon Sep 17 00:00:00 2001
From: Travis Reitter <travis.reitter@collabora.co.uk>
Date: Mon, 05 Mar 2012 23:30:10 +0000
Subject: Factor out the tracker-sparql major number.
--- backends/tracker/lib/folks-tracker.pc.in.orig Thu Nov 10 23:36:54 2011
+++ backends/tracker/lib/folks-tracker.pc.in Thu Mar 8 14:08:34 2012
@@ -10,6 +10,6 @@ vapidir=@datadir@/vala/vapi
Name: Folks tracker support library
Description: Tracker support library for the Folks meta-contacts library
Version: @VERSION@
-Requires: folks glib-2.0 gobject-2.0 gee-1.0 tracker-sparql-0.12
+Requires: folks glib-2.0 gobject-2.0 gee-1.0 tracker-sparql-@TRACKER_SPARQL_MAJOR@
Libs: -L${libdir} -lfolks-tracker
Cflags: -I${includedir}

39
net/telepathy/folks/patches/patch-configure_ac
View File

@ -1,39 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.1 2012/03/08 14:18:27 ajacoutot Exp $
From f19d5ad0ab162b41747c0cd10a9c5ed30b23e187 Mon Sep 17 00:00:00 2001
From: Travis Reitter <travis.reitter@collabora.co.uk>
Date: Mon, 05 Mar 2012 22:22:13 +0000
Subject: Bump Tracker version requirements to match current Tracker
From 5f26596731a40c8103fe403d5aaa7049e3eae496 Mon Sep 17 00:00:00 2001
From: Travis Reitter <travis.reitter@collabora.co.uk>
Date: Mon, 05 Mar 2012 23:30:10 +0000
Subject: Factor out the tracker-sparql major number.
--- configure.ac.orig Thu Feb 23 01:01:16 2012
+++ configure.ac Thu Mar 8 14:09:40 2012
@@ -148,12 +148,14 @@ GLIB_REQUIRED=2.24.0
TP_GLIB_REQUIRED=0.13.1
VALA_REQUIRED=0.15.1
VALADOC_REQUIRED=0.3.1
-TRACKER_SPARQL_MAJOR=0.12
-TRACKER_SPARQL_REQUIRED=0.12.0
+TRACKER_SPARQL_MAJOR=0.14
+TRACKER_SPARQL_REQUIRED=0.13.1
GCONF2_REQUIRED=2.31
EBOOK_REQUIRED=3.1.5
EDATASERVER_REQUIRED=3.1.5
+AC_SUBST([TRACKER_SPARQL_MAJOR])
+
PKG_CHECK_MODULES([GLIB],
[glib-2.0 >= $GLIB_REQUIRED
gobject-2.0 >= $GLIB_REQUIRED])
@@ -504,6 +506,7 @@ AC_SUBST([ERROR_VALAFLAGS])
AC_CONFIG_FILES([
backends/telepathy/lib/folks-telepathy.pc
backends/telepathy/lib/folks-telepathy-uninstalled.pc
+ backends/tracker/lib/folks-tracker.deps
backends/tracker/lib/folks-tracker.pc
backends/tracker/lib/folks-tracker-uninstalled.pc
backends/eds/lib/folks-eds.pc

18
net/telepathy/folks/patches/patch-tests_lib_tracker_Makefile_am
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-tests_lib_tracker_Makefile_am,v 1.1 2012/03/08 14:18:27 ajacoutot Exp $
From 5f26596731a40c8103fe403d5aaa7049e3eae496 Mon Sep 17 00:00:00 2001
From: Travis Reitter <travis.reitter@collabora.co.uk>
Date: Mon, 05 Mar 2012 23:30:10 +0000
Subject: Factor out the tracker-sparql major number.
--- tests/lib/tracker/Makefile.am.orig Thu Nov 10 23:36:54 2011
+++ tests/lib/tracker/Makefile.am Thu Mar 8 14:08:34 2012
@@ -9,7 +9,7 @@ VALAFLAGS += \
--pkg gio-2.0 \
--pkg gee-1.0 \
--pkg folks \
- --pkg tracker-sparql-0.12 \
+ --pkg tracker-sparql-$(TRACKER_SPARQL_MAJOR) \
--pkg folks-tracker \
-g \
$(NULL)

18
net/telepathy/folks/patches/patch-tests_tracker_Makefile_am
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-tests_tracker_Makefile_am,v 1.1 2012/03/08 14:18:27 ajacoutot Exp $
From 5f26596731a40c8103fe403d5aaa7049e3eae496 Mon Sep 17 00:00:00 2001
From: Travis Reitter <travis.reitter@collabora.co.uk>
Date: Mon, 05 Mar 2012 23:30:10 +0000
Subject: Factor out the tracker-sparql major number.
--- tests/tracker/Makefile.am.orig Thu Nov 10 23:36:54 2011
+++ tests/tracker/Makefile.am Thu Mar 8 14:08:34 2012
@@ -36,7 +36,7 @@ AM_VALAFLAGS = \
--pkg folks \
--pkg folks-test \
--pkg folks-tracker \
- --pkg tracker-sparql-0.12 \
+ --pkg tracker-sparql-$(TRACKER_SPARQL_MAJOR) \
--pkg tracker-test \
-g \
$(NULL)

14
net/telepathy/folks/pkg/PLIST-main
View File

@ -1,9 +1,10 @@
@comment $OpenBSD: PLIST-main,v 1.2 2012/02/26 15:08:07 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2012/03/29 07:12:00 ajacoutot Exp $
@pkgpath ${BASE_PKGPATH}
@bin bin/folks-import
@bin bin/folks-inspect
include/folks/
include/folks/folks-eds.h
include/folks/folks-libsocialweb.h
include/folks/folks-telepathy.h
include/folks/folks.h
lib/folks/
@ -17,6 +18,10 @@ lib/folks/${API_V}/backends/key-file/
@comment lib/folks/${API_V}/backends/key-file/key-file.a
@comment lib/folks/${API_V}/backends/key-file/key-file.la
lib/folks/${API_V}/backends/key-file/key-file.so
lib/folks/${API_V}/backends/libsocialweb/
@comment lib/folks/${API_V}/backends/libsocialweb/libsocialweb.a
@comment lib/folks/${API_V}/backends/libsocialweb/libsocialweb.la
lib/folks/${API_V}/backends/libsocialweb/libsocialweb.so
lib/folks/${API_V}/backends/telepathy/
@comment lib/folks/${API_V}/backends/telepathy/telepathy.a
@comment lib/folks/${API_V}/backends/telepathy/telepathy.la
@ -25,6 +30,9 @@ lib/girepository-1.0/Folks-0.6.typelib
lib/libfolks-eds.a
lib/libfolks-eds.la
@lib lib/libfolks-eds.so.${LIBfolks-eds_VERSION}
lib/libfolks-libsocialweb.a
lib/libfolks-libsocialweb.la
@lib lib/libfolks-libsocialweb.so.${LIBfolks-libsocialweb_VERSION}
lib/libfolks-telepathy.a
lib/libfolks-telepathy.la
@lib lib/libfolks-telepathy.so.${LIBfolks-telepathy_VERSION}
@ -32,6 +40,7 @@ lib/libfolks.a
lib/libfolks.la
@lib lib/libfolks.so.${LIBfolks_VERSION}
lib/pkgconfig/folks-eds.pc
lib/pkgconfig/folks-libsocialweb.pc
lib/pkgconfig/folks-telepathy.pc
lib/pkgconfig/folks.pc
share/gir-1.0/Folks-0.6.gir
@ -46,9 +55,12 @@ share/locale/pl/LC_MESSAGES/folks.mo
share/locale/pt_BR/LC_MESSAGES/folks.mo
share/locale/sl/LC_MESSAGES/folks.mo
share/locale/sv/LC_MESSAGES/folks.mo
share/locale/uk/LC_MESSAGES/folks.mo
share/locale/zh_CN/LC_MESSAGES/folks.mo
share/vala/vapi/folks-eds.deps
share/vala/vapi/folks-eds.vapi
share/vala/vapi/folks-libsocialweb.deps
share/vala/vapi/folks-libsocialweb.vapi
share/vala/vapi/folks-telepathy.deps
share/vala/vapi/folks-telepathy.vapi
share/vala/vapi/folks.deps