From af3811313c14afb06fe2d1f6158e3e431bbfc2b6 Mon Sep 17 00:00:00 2001 From: Koop Mast 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 --- audio/libcanberra-gtk3/Makefile | 26 +++++++++++++++----------- audio/libcanberra-gtk3/pkg-plist | 2 +- 2 files changed, 16 insertions(+), 12 deletions(-) (limited to 'audio/libcanberra-gtk3') diff --git a/audio/libcanberra-gtk3/Makefile b/audio/libcanberra-gtk3/Makefile index 28f4a804b592..ad0bf16b165f 100644 --- a/audio/libcanberra-gtk3/Makefile +++ b/audio/libcanberra-gtk3/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/audio/libcanberra-gtk3/Makefile,v 1.8 2011/03/16 10:24:48 kwm Exp $ +# $MCom: ports/trunk/audio/libcanberra-gtk3/Makefile 19814 2014-08-15 20:17:00Z gusi $ CATEGORIES= audio devel PKGNAMESUFFIX= -gtk3 @@ -12,22 +12,26 @@ MASTERDIR= ${.CURDIR}/../../audio/libcanberra SLAVEPORT= gtk3 PLIST= ${.CURDIR}/pkg-plist -BUILD_WRKSRC= ${WRKSRC}/src -ALL_TARGET= libcanberra-gtk3.la libcanberra-gtk3-module.la - -pre-build: - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} libcanberra-gtk3.pc +do-build: + cd ${WRKSRC} && ${GMAKE} libcanberra-gtk3.pc + cd ${WRKSRC}/src && ${GMAKE} libcanberra-gtk3.la + cd ${WRKSRC}/src && ${GMAKE} libcanberra-gtk3-module.la +# fix the .la file so it doesn't point to the build dir anymore. + @${REINPLACE_CMD} -e '/^relink_command/ d' \ + -e 's|${WRKSRC}/src/libcanberra.la|${LOCALBASE}/lib/libcanberra.la|g' \ + ${WRKSRC}/src/.libs/libcanberra-gtk3.la do-install: ${INSTALL_DATA} ${WRKSRC}/libcanberra-gtk3.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ -.for i in .so .so.0 .so.0.1.8 +.for i in .so .so.0 .so.0.1.9 ${INSTALL_LIB} ${WRKSRC}/src/.libs/libcanberra-gtk3${i} \ ${STAGEDIR}${PREFIX}/lib/ .endfor - cd ${WRKSRC}/src && ${SETENV} DESTDIR=${STAGEDIR} \ - ${MAKE_CMD} install-gtk3moduleLTLIBRARIES - cd ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules && \ - ${LN} -sf libcanberra-gtk3-module.so libcanberra-gtk-module.so + ${INSTALL_DATA} ${WRKSRC}/src/.libs/libcanberra-gtk3.la \ + ${STAGEDIR}${PREFIX}/lib/ + cd ${WRKSRC}/src && env DESTDIR=${STAGEDIR} ${GMAKE} install-gtk3moduleLTLIBRARIES + ${LN} -sf libcanberra-gtk3-module.so \ + ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules/libcanberra-gtk-module.so .include "${MASTERDIR}/Makefile" diff --git a/audio/libcanberra-gtk3/pkg-plist b/audio/libcanberra-gtk3/pkg-plist index 1d82f2d632a8..d11f10495e16 100644 --- a/audio/libcanberra-gtk3/pkg-plist +++ b/audio/libcanberra-gtk3/pkg-plist @@ -2,5 +2,5 @@ lib/gtk-3.0/modules/libcanberra-gtk-module.so lib/gtk-3.0/modules/libcanberra-gtk3-module.so lib/libcanberra-gtk3.so lib/libcanberra-gtk3.so.0 -lib/libcanberra-gtk3.so.0.1.8 +lib/libcanberra-gtk3.so.0.1.9 libdata/pkgconfig/libcanberra-gtk3.pc -- cgit v1.2.3