From 8937d4a98299c81b67a8f4aeeacb6cef92c2f4f0 Mon Sep 17 00:00:00 2001 From: gusi Date: Mon, 12 May 2014 05:56:00 +0000 Subject: Try to fix x11-fm/nemo and sysutils/cinnamon-control-center. Commit r19612 removed both ports .so.X major shared libraries. That is obviously bad. The problem seems to be USES=libtool[:keepla] related. The only way I managed to put back those libraries is by completely removing the libtool from USES. Because of this, c-c-c keep its .so.1 there, but x11-fm/nemo bumped the lib to .5. To track that I updated the nemo users (x11/cinnamon and deskutils/nemo-extensions). This commit shoulds make cinnamon stable enough until we figure out why libtool is breaking the major shared object installation. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19618 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-fm/nemo/Makefile | 4 ++-- x11-fm/nemo/pkg-plist | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'x11-fm/nemo') diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile index 7baf407f1..a4d60faa8 100644 --- a/x11-fm/nemo/Makefile +++ b/x11-fm/nemo/Makefile @@ -4,7 +4,7 @@ PORTNAME= nemo PORTVERSION= 2.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fm gnome MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/ DIST_SUBDIR= gnome3 @@ -24,7 +24,7 @@ LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \ RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas -USES= desktop-file-utils gettext gmake libtool:keepla pathfix \ +USES= desktop-file-utils gettext gmake pathfix \ pkgconfig shared-mime-info USE_GNOME= gnomedesktop3 gnomeprefix intlhack introspection:build \ libxml2 pygobject3 diff --git a/x11-fm/nemo/pkg-plist b/x11-fm/nemo/pkg-plist index 03f7946a1..52ca8d215 100644 --- a/x11-fm/nemo/pkg-plist +++ b/x11-fm/nemo/pkg-plist @@ -16,7 +16,7 @@ lib/girepository-1.0/Nemo-3.0.typelib lib/libnemo-extension.a lib/libnemo-extension.la lib/libnemo-extension.so -lib/libnemo-extension.so.1.4.0 +lib/libnemo-extension.so.5 libdata/pkgconfig/libnemo-extension.pc libexec/nemo-convert-metadata man/man1/nemo-connect-server.1.gz -- cgit v1.2.3