From 04f684b5eefdeee286de5a4df14b9153ebe93a65 Mon Sep 17 00:00:00 2001 From: gusi Date: Sun, 22 Jun 2014 22:51:46 +0000 Subject: Update folks to 0.9.7. Fix the build with clang. Define folks_persona_store_set_is_user_set_default in backends/eds/lib/edsf-persona-store.c like it's done in folks/persona-store.c. Also remove patch-tests_lib_test-case-helper.c, which is unneeded (committed upstream) git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19746 df743ca5-7f9a-e211-a948-0013205c9059 --- net-im/folks/Makefile | 6 ++--- net-im/folks/distinfo | 4 ++-- .../patch-backends_eds_lib_edsf-persona-store.c | 27 ++++++++++++++++++++++ .../folks/files/patch-tests_lib_test-case-helper.c | 11 --------- net-im/folks/pkg-plist | 13 +++++++++++ 5 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 net-im/folks/files/patch-backends_eds_lib_edsf-persona-store.c delete mode 100644 net-im/folks/files/patch-tests_lib_test-case-helper.c (limited to 'net-im') diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile index 7501072ef..721f17d7f 100644 --- a/net-im/folks/Makefile +++ b/net-im/folks/Makefile @@ -1,9 +1,9 @@ # Created by: Koop Mast # $FreeBSD$ -# $MCom: ports-experimental/trunk/net-im/folks/Makefile 19178 2014-03-18 09:11:52Z gusi $ +# $MCom$ PORTNAME= folks -PORTVERSION= 0.9.6 +PORTVERSION= 0.9.7 CATEGORIES= net-im MASTER_SITES= GNOME @@ -30,7 +30,7 @@ INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.freedesktop.folks.gschema.xml -PLIST_SUB= LIBVER=25 VERSION=41 LIBVERLONG=25.16.1 +PLIST_SUB= LIBVER=25 VERSION=42 LIBVERLONG=25.17.0 OPTIONS_DEFINE= SOCIALWEB TRACKER OPTIONS_DEFAULT=SOCIALWEB TRACKER diff --git a/net-im/folks/distinfo b/net-im/folks/distinfo index 4da17da3b..cba11d0d6 100644 --- a/net-im/folks/distinfo +++ b/net-im/folks/distinfo @@ -1,2 +1,2 @@ -SHA256 (folks-0.9.6.tar.xz) = a67e055b5a2724a34a80946e2940c4c0ad708cb1f4e0a09407c6b69a5e40267f -SIZE (folks-0.9.6.tar.xz) = 1694012 +SHA256 (folks-0.9.7.tar.xz) = 26594be7d0889f3bd1f5141d5b950764fc4a2fabdb1812de7576e3aa72c3605a +SIZE (folks-0.9.7.tar.xz) = 1893820 diff --git a/net-im/folks/files/patch-backends_eds_lib_edsf-persona-store.c b/net-im/folks/files/patch-backends_eds_lib_edsf-persona-store.c new file mode 100644 index 000000000..0e7c00c08 --- /dev/null +++ b/net-im/folks/files/patch-backends_eds_lib_edsf-persona-store.c @@ -0,0 +1,27 @@ +--- backends/eds/lib/edsf-persona-store.c.orig 2014-06-22 23:29:00.567592303 +0000 ++++ backends/eds/lib/edsf-persona-store.c 2014-06-22 23:30:17.689586171 +0000 +@@ -10968,6 +10968,24 @@ + _edsf_persona_store_notify_if_default (self); + } + ++struct _FolksPersonaStorePrivate { ++ gchar* _display_name; ++ gchar* _id; ++ gboolean _is_writeable; ++ FolksPersonaStoreTrust _trust_level; ++ gboolean _is_primary_store; ++ gboolean _is_user_set_default; ++}; ++ ++void folks_persona_store_set_is_user_set_default (FolksPersonaStore* self, gboolean value); ++ ++void folks_persona_store_set_is_user_set_default (FolksPersonaStore* self, gboolean value) { ++ gboolean _tmp0_ = FALSE; ++ g_return_if_fail (self != NULL); ++ _tmp0_ = value; ++ self->priv->_is_user_set_default = _tmp0_; ++ g_object_notify ((GObject *) self, "is-user-set-default"); ++} + + static void _edsf_persona_store_notify_if_default (EdsfPersonaStore* self) { + gboolean is_default = FALSE; diff --git a/net-im/folks/files/patch-tests_lib_test-case-helper.c b/net-im/folks/files/patch-tests_lib_test-case-helper.c deleted file mode 100644 index d71dac3bb..000000000 --- a/net-im/folks/files/patch-tests_lib_test-case-helper.c +++ /dev/null @@ -1,11 +0,0 @@ ---- tests/lib/test-case-helper.c.orig 2014-03-17 11:18:49.378390131 +0000 -+++ tests/lib/test-case-helper.c 2014-03-17 11:19:02.351392648 +0000 -@@ -75,7 +75,7 @@ - { - FolksTestCaseWeakMethod *wm; - -- g_return_if_fail (self == (FolksTestCase *) test_target); -+ g_return_val_if_fail (self == (FolksTestCase *) test_target, NULL); - - /* This will never be freed, so make sure not to hold references. */ - wm = g_new0 (FolksTestCaseWeakMethod, 1); diff --git a/net-im/folks/pkg-plist b/net-im/folks/pkg-plist index 85a5d5bd7..4143752b5 100644 --- a/net-im/folks/pkg-plist +++ b/net-im/folks/pkg-plist @@ -1,10 +1,13 @@ bin/folks-import bin/folks-inspect %%SOCIAL%%include/folks/folks-libsocialweb.h +include/folks/folks-dummy.h include/folks/folks-eds.h include/folks/folks-telepathy.h %%TRACKER%%include/folks/folks-tracker.h include/folks/folks.h +lib/folks/%%VERSION%%/backends/dummy/dummy.la +lib/folks/%%VERSION%%/backends/dummy/dummy.so lib/folks/%%VERSION%%/backends/eds/eds.la lib/folks/%%VERSION%%/backends/eds/eds.so lib/folks/%%VERSION%%/backends/key-file/key-file.la @@ -18,10 +21,15 @@ lib/folks/%%VERSION%%/backends/telepathy/telepathy.so %%TRACKER%%lib/folks/%%VERSION%%/backends/tracker/tracker.la %%TRACKER%%lib/folks/%%VERSION%%/backends/tracker/tracker.so lib/girepository-1.0/Folks-0.6.typelib +lib/girepository-1.0/FolksDummy-0.6.typelib lib/girepository-1.0/FolksEds-0.6.typelib %%SOCIAL%%lib/girepository-1.0/FolksLibsocialweb-0.6.typelib lib/girepository-1.0/FolksTelepathy-0.6.typelib %%TRACKER%%lib/girepository-1.0/FolksTracker-0.6.typelib +lib/libfolks-dummy.la +lib/libfolks-dummy.so +lib/libfolks-dummy.so.25 +lib/libfolks-dummy.so.%%LIBVERLONG%% lib/libfolks-eds.la lib/libfolks-eds.so lib/libfolks-eds.so.%%LIBVER%% @@ -42,6 +50,7 @@ lib/libfolks.la lib/libfolks.so lib/libfolks.so.%%LIBVER%% lib/libfolks.so.%%LIBVERLONG%% +libdata/pkgconfig/folks-dummy.pc libdata/pkgconfig/folks-eds.pc %%SOCIAL%%libdata/pkgconfig/folks-libsocialweb.pc libdata/pkgconfig/folks-telepathy.pc @@ -49,6 +58,7 @@ libdata/pkgconfig/folks-telepathy.pc libdata/pkgconfig/folks.pc share/GConf/gsettings/folks.convert share/gir-1.0/Folks-0.6.gir +share/gir-1.0/FolksDummy-0.6.gir share/gir-1.0/FolksEds-0.6.gir %%TRACKER%%share/gir-1.0/FolksTracker-0.6.gir %%SOCIAL%%share/gir-1.0/FolksLibsocialweb-0.6.gir @@ -107,6 +117,8 @@ share/locale/vi/LC_MESSAGES/folks.mo share/locale/zh_CN/LC_MESSAGES/folks.mo share/locale/zh_HK/LC_MESSAGES/folks.mo share/locale/zh_TW/LC_MESSAGES/folks.mo +share/vala/vapi/folks-dummy.deps +share/vala/vapi/folks-dummy.vapi share/vala/vapi/folks-eds.deps share/vala/vapi/folks-eds.vapi %%SOCIAL%%share/vala/vapi/folks-libsocialweb.deps @@ -123,6 +135,7 @@ share/vala/vapi/folks.vapi %%SOCIAL%%@dirrm lib/folks/%%VERSION%%/backends/libsocialweb @dirrm lib/folks/%%VERSION%%/backends/key-file @dirrm lib/folks/%%VERSION%%/backends/eds +@dirrm lib/folks/%%VERSION%%/backends/dummy @dirrm lib/folks/%%VERSION%%/backends @dirrm lib/folks/%%VERSION%% @dirrm lib/folks -- cgit v1.2.3