From be884cd42990f2e755c2c06bc38c8042cb8b0325 Mon Sep 17 00:00:00 2001 From: kwm Date: Wed, 19 Nov 2014 11:49:04 +0000 Subject: The FreeBSD GNOME team proudly presents GNOME 3.14 and Cinnamon 2.2. Gnome 3.14.1 and Cinnamon 2.2.16 are supported on FreeBSD 9.3-RELEASE and up. This commit removes the old GNOME 2 desktop, bindings and some ports that can't be compiled. A few ports where updated to more recent versions to allow them to compile with this update. Apart from updating ports to newer versions GDM is more integrated with gnome-shell now, and handles several things for the GNOME desktop such as screen locking. If you want to use GNOME 3 via startx, you will have to add your own lock screen/screensaver. For example xscreensaver can be used for sessions started without GDM. Shell Extensions can be installed via https://extensions.gnome.org/ , we have ported a few that can't be installed via this way. The old gnome-utils and gnome-games ports where split up into single ports and where converted to meta-ports. gnome-terminal requires a UTF-8 locale to run, gdm handles this already, but if you use startx you need to do this yourself. Upgrade instructions: Delete the old and conflicting packages: # pkg delete clutter gnome-utils gnome-panel gnome-keyring vala-vapigen \ guile gcalctool gnome-media libgnomekbd # pkg delete gnome-screensaver gnome-applets bug-buddy evolution-exchange \ evolution-webcal gnome-system-tools seahorse-plugins gnome-control-center For package users the following lines will be enough: # pkg upgrade # pkg install gnome3 For ports users should do the following: # portmaster -a # portmaster x11/gnome3 We are currently aware of two issues. The first issue is a bug in the file monitoring code in the glib20 port. This bug causes glib programs to crash when files in a monitored directory are added or removed. Upstream is aware of the problem, but since the problem is quite complex there is no solution yet. This problem isn't restricted to BSD. The second issue is that on certain video cards totem will display a purple/pink overlay on the video. It not clear yet where the issues comes from. Major thanks goes to Gustau Perez for being a driving force behind getting GNOME 3 up to speed again. Also thanks to Antoine Brodin for running the exp-runs. This update was also made possible by: Joe Maloney Kris Moore Beeblebrox Ryan Lortie Antoine Jacoutot and everyone I missed --- net-im/folks/Makefile | 51 ++++++------ net-im/folks/distinfo | 4 +- .../patch-backends_eds_lib_edsf-persona-store.c | 27 +++++++ net-im/folks/pkg-plist | 93 +++++++++++++++++++--- 4 files changed, 137 insertions(+), 38 deletions(-) create mode 100644 net-im/folks/files/patch-backends_eds_lib_edsf-persona-store.c (limited to 'net-im/folks') diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile index ed5644900ccf..9ab0392074fc 100644 --- a/net-im/folks/Makefile +++ b/net-im/folks/Makefile @@ -1,46 +1,51 @@ # Created by: Koop Mast # $FreeBSD$ -# $MCom: ports/net-im/folks/Makefile,v 1.29 2012/08/17 19:06:45 kwm Exp $ +# $MCom: ports/trunk/net-im/folks/Makefile 20031 2014-11-02 21:47:55Z kwm $ PORTNAME= folks -PORTVERSION= 0.7.0 +PORTVERSION= 0.10.0 CATEGORIES= net-im MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= library to aggregates people from multiple sources -BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen \ - g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= libgee.so:${PORTSDIR}/devel/libgee06 \ +BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala +LIB_DEPENDS= libgee-0.8.so:${PORTSDIR}/devel/libgee \ + libgcr-3.so:${PORTSDIR}/security/gcr \ + libzeitgeist-1.0.so:${PORTSDIR}/sysutils/libzeitgeist \ libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib -IGNORE= Doesn't build currently, missing components CONFLICTS= folks-0.4.[0-9]* -USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USE_GNOME= gnomehier gnomehack intlhack ltverhack evolutiondataserver3 -USES= gettext gmake tar:xz +USES= gettext libtool gmake pathfix pkgconfig tar:xz +USE_GNOME= evolutiondataserver3 intlhack \ + introspection:build GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ARGS= --disable-bluez-backend +CPPFLAGS+= -I${LOCALBASE}/include -Wno-error=deprecated-declarations +LIBS+= -L${LOCALBASE}/lib +INSTALL_TARGET= install-strip -PLIST_SUB= LIBVER=25 VERSION=33 +GLIB_SCHEMAS= org.freedesktop.folks.gschema.xml -#OPTIONS= SOCIALWEB "Enable social web backend" on +PLIST_SUB= LIBVER=25 VERSION=42 LIBVERLONG=25.17.2 -#.include - -#.if defined(WITH_SOCIALWEB) -#LIB_DEPENDS+= socialweb.0:${PORTSDIR}/www/libsocialweb -#CONFIGURE_ARGS+=--enable-libsocialweb-backend=yes -#.else -CONFIGURE_ARGS+=--enable-libsocialweb-backend=no -#.endif +OPTIONS_SUB= yes +OPTIONS_DEFINE= SOCIALWEB TRACKER +OPTIONS_DEFAULT=SOCIALWEB TRACKER +SOCIALWEB_DESC= Social web backend +TRACKER_DESC= Tracker backend +SOCIALWEB_CONFIGURE_ENABLE= libsocialweb-backend +SOCIALWEB_LIB_DEPENDS= libsocialweb.so:${PORTSDIR}/www/libsocialweb +TRACKER_CONFIGURE_ENABLE= tracker-backend +TRACKER_LIB_DEPENDS= libtracker-control-1.0.so:${PORTSDIR}/sysutils/tracker post-patch: - @${REINPLACE_CMD} -e 's|^build_old_libs=yes|build_old_libs=no|g' \ - ${WRKDIR}/gnome-libtool +# @${REINPLACE_CMD} -e 's|TRACKER_SPARQL_MAJOR=0.16|TRACKER_SPARQL_MAJOR=1.0|g' \ +# ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|--fatal-warnings||g' \ + ${WRKSRC}/configure .include diff --git a/net-im/folks/distinfo b/net-im/folks/distinfo index 65e986124ef7..d3dd7620cecc 100644 --- a/net-im/folks/distinfo +++ b/net-im/folks/distinfo @@ -1,2 +1,2 @@ -SHA256 (folks-0.7.0.tar.xz) = 861da1007e859e6bad43388a3bee56c31b3e9d003329086a5038fa6b19c6abf7 -SIZE (folks-0.7.0.tar.xz) = 1415856 +SHA256 (folks-0.10.0.tar.xz) = 66e76bb9d095b6c0ba41e37e791e11762c67fd36498511a65085d7a39b771cc2 +SIZE (folks-0.10.0.tar.xz) = 1868128 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 000000000000..0e7c00c084c7 --- /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/pkg-plist b/net-im/folks/pkg-plist index 09989046be10..de92dbdae02a 100644 --- a/net-im/folks/pkg-plist +++ b/net-im/folks/pkg-plist @@ -1,51 +1,118 @@ bin/folks-import +bin/folks-inspect +%%SOCIALWEB%%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/eds/eds.la +lib/folks/%%VERSION%%/backends/dummy/dummy.so lib/folks/%%VERSION%%/backends/eds/eds.so -lib/folks/%%VERSION%%/backends/key-file/key-file.la lib/folks/%%VERSION%%/backends/key-file/key-file.so -lib/folks/%%VERSION%%/backends/telepathy/telepathy.la +%%SOCIALWEB%%lib/folks/%%VERSION%%/backends/libsocialweb/libsocialweb.so +lib/folks/%%VERSION%%/backends/ofono/ofono.so lib/folks/%%VERSION%%/backends/telepathy/telepathy.so +%%TRACKER%%lib/folks/%%VERSION%%/backends/tracker/tracker.so lib/girepository-1.0/Folks-0.6.typelib -lib/libfolks-eds.la +lib/girepository-1.0/FolksDummy-0.6.typelib +lib/girepository-1.0/FolksEds-0.6.typelib +%%SOCIALWEB%%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.so +lib/libfolks-dummy.so.%%LIBVER%% +lib/libfolks-dummy.so.%%LIBVERLONG%% lib/libfolks-eds.so lib/libfolks-eds.so.%%LIBVER%% -lib/libfolks-telepathy.la +lib/libfolks-eds.so.%%LIBVERLONG%% +%%SOCIALWEB%%lib/libfolks-libsocialweb.so +%%SOCIALWEB%%lib/libfolks-libsocialweb.so.%%LIBVER%% +%%SOCIALWEB%%lib/libfolks-libsocialweb.so.%%LIBVERLONG%% lib/libfolks-telepathy.so lib/libfolks-telepathy.so.%%LIBVER%% -lib/libfolks.la +lib/libfolks-telepathy.so.%%LIBVERLONG%% +%%TRACKER%%lib/libfolks-tracker.so +%%TRACKER%%lib/libfolks-tracker.so.%%LIBVER%% +%%TRACKER%%lib/libfolks-tracker.so.%%LIBVERLONG%% lib/libfolks.so lib/libfolks.so.%%LIBVER%% +lib/libfolks.so.%%LIBVERLONG%% +libdata/pkgconfig/folks-dummy.pc libdata/pkgconfig/folks-eds.pc +%%SOCIALWEB%%libdata/pkgconfig/folks-libsocialweb.pc libdata/pkgconfig/folks-telepathy.pc +%%TRACKER%%libdata/pkgconfig/folks-tracker.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 +%%SOCIALWEB%%share/gir-1.0/FolksLibsocialweb-0.6.gir +share/gir-1.0/FolksTelepathy-0.6.gir +share/locale/ar/LC_MESSAGES/folks.mo +share/locale/as/LC_MESSAGES/folks.mo +share/locale/be/LC_MESSAGES/folks.mo +share/locale/bg/LC_MESSAGES/folks.mo +share/locale/bn_IN/LC_MESSAGES/folks.mo +share/locale/ca/LC_MESSAGES/folks.mo +share/locale/ca@valencia/LC_MESSAGES/folks.mo share/locale/cs/LC_MESSAGES/folks.mo +share/locale/da/LC_MESSAGES/folks.mo share/locale/de/LC_MESSAGES/folks.mo +share/locale/el/LC_MESSAGES/folks.mo share/locale/en_GB/LC_MESSAGES/folks.mo share/locale/eo/LC_MESSAGES/folks.mo share/locale/es/LC_MESSAGES/folks.mo +share/locale/eu/LC_MESSAGES/folks.mo +share/locale/fa/LC_MESSAGES/folks.mo +share/locale/fi/LC_MESSAGES/folks.mo +share/locale/fr/LC_MESSAGES/folks.mo share/locale/gl/LC_MESSAGES/folks.mo +share/locale/gu/LC_MESSAGES/folks.mo +share/locale/he/LC_MESSAGES/folks.mo +share/locale/hi/LC_MESSAGES/folks.mo +share/locale/hu/LC_MESSAGES/folks.mo +share/locale/id/LC_MESSAGES/folks.mo share/locale/it/LC_MESSAGES/folks.mo +share/locale/ja/LC_MESSAGES/folks.mo +share/locale/kn/LC_MESSAGES/folks.mo +share/locale/ko/LC_MESSAGES/folks.mo +share/locale/lt/LC_MESSAGES/folks.mo +share/locale/lv/LC_MESSAGES/folks.mo +share/locale/ml/LC_MESSAGES/folks.mo +share/locale/mr/LC_MESSAGES/folks.mo share/locale/nb/LC_MESSAGES/folks.mo +share/locale/or/LC_MESSAGES/folks.mo +share/locale/pa/LC_MESSAGES/folks.mo share/locale/pl/LC_MESSAGES/folks.mo +share/locale/pt/LC_MESSAGES/folks.mo share/locale/pt_BR/LC_MESSAGES/folks.mo +share/locale/ru/LC_MESSAGES/folks.mo +share/locale/sk/LC_MESSAGES/folks.mo share/locale/sl/LC_MESSAGES/folks.mo +share/locale/sr/LC_MESSAGES/folks.mo +share/locale/sr@latin/LC_MESSAGES/folks.mo share/locale/sv/LC_MESSAGES/folks.mo +share/locale/ta/LC_MESSAGES/folks.mo +share/locale/te/LC_MESSAGES/folks.mo +share/locale/tg/LC_MESSAGES/folks.mo +share/locale/tr/LC_MESSAGES/folks.mo +share/locale/ug/LC_MESSAGES/folks.mo share/locale/uk/LC_MESSAGES/folks.mo +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 +%%SOCIALWEB%%share/vala/vapi/folks-libsocialweb.deps +%%SOCIALWEB%%share/vala/vapi/folks-libsocialweb.vapi share/vala/vapi/folks-telepathy.deps share/vala/vapi/folks-telepathy.vapi +%%TRACKER%%share/vala/vapi/folks-tracker.deps +%%TRACKER%%share/vala/vapi/folks-tracker.vapi share/vala/vapi/folks.deps share/vala/vapi/folks.vapi -@dirrm lib/folks/%%VERSION%%/backends/telepathy -@dirrm lib/folks/%%VERSION%%/backends/key-file -@dirrm lib/folks/%%VERSION%%/backends/eds -@dirrm lib/folks/%%VERSION%%/backends -@dirrm lib/folks/%%VERSION%% -@dirrm lib/folks -@dirrm include/folks -- cgit