diff options
Diffstat (limited to 'x11-fm')
| -rw-r--r-- | x11-fm/nemo/Makefile | 18 | ||||
| -rw-r--r-- | x11-fm/nemo/distinfo | 4 | ||||
| -rw-r--r-- | x11-fm/nemo/files/patch-autogen.sh | 10 | ||||
| -rw-r--r-- | x11-fm/nemo/files/patch-src_nemo-icon-view.c | 2 | ||||
| -rw-r--r-- | x11-fm/nemo/files/patch-src_nemo-list-view.c | 2 | ||||
| -rw-r--r-- | x11-fm/nemo/files/patch-src_nemo-view.c | 2 | ||||
| -rw-r--r-- | x11-fm/nemo/pkg-plist | 9 |
7 files changed, 29 insertions, 18 deletions
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile index 0286b06d7..f872eaeaf 100644 --- a/x11-fm/nemo/Makefile +++ b/x11-fm/nemo/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nemo -PORTVERSION= 1.7.1 +PORTVERSION= 1.8.5 CATEGORIES= x11-fm gnome DIST_SUBDIR= gnome3 @@ -19,15 +19,18 @@ 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 +WRKSRC= ${WRKDIR}/linuxmint-nemo-63f7b44 + USE_GITHUB= yes GH_ACCOUNT= linuxmint -GH_TAGNAME= 1.7.1 -GH_COMMIT= 63f7b44 +GH_TAGNAME= 1.8.5 +GH_COMMIT= 40f84d6 -NO_STAGE= yes INSTALLS_ICONS= yes -USES= desktop-file-utils gettext gmake pathfix -USE_GNOME= gnomeprefix intlhack gnomedesktop3 libxml2 introspection:build +USES= desktop-file-utils gettext gmake pathfix \ + pkgconfig shared-mime-info +USE_GNOME= gnomeprefix intlhack gnomedesktop3 libxml2 \ + introspection:build USE_LDCONFIG= yes USE_AUTOTOOLS= libtool autoconf automake CPPFLAGS+= -I${LOCALBASE}/include @@ -37,9 +40,6 @@ MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" GLIB_SCHEMAS= org.nemo.gschema.xml -MAN1= nemo-connect-server.1 \ - nemo.1 - post-patch: @${MKDIR} ${WRKSRC}/files${PREFIX} diff --git a/x11-fm/nemo/distinfo b/x11-fm/nemo/distinfo index 01d9ae6a0..9eb88fdf1 100644 --- a/x11-fm/nemo/distinfo +++ b/x11-fm/nemo/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/nemo-1.7.1.tar.gz) = 5574915a9440086887ed234e51524c8b55d66f933f6e2ca71b2859c00bd4bcb5 -SIZE (gnome3/nemo-1.7.1.tar.gz) = 6571229 +SHA256 (gnome3/nemo-1.8.5.tar.gz) = 5574915a9440086887ed234e51524c8b55d66f933f6e2ca71b2859c00bd4bcb5 +SIZE (gnome3/nemo-1.8.5.tar.gz) = 6571229 diff --git a/x11-fm/nemo/files/patch-autogen.sh b/x11-fm/nemo/files/patch-autogen.sh new file mode 100644 index 000000000..245362b24 --- /dev/null +++ b/x11-fm/nemo/files/patch-autogen.sh @@ -0,0 +1,10 @@ +--- autogen.sh.orig 2013-07-20 21:14:17.454775429 +0000 ++++ autogen.sh 2013-07-20 21:14:26.096159846 +0000 +@@ -4,6 +4,7 @@ + test -z "$srcdir" && srcdir=. + + PKG_NAME="nemo" ++REQUIRED_AUTOMAKE_VERSION=1.14 + + which gnome-autogen.sh || { + echo "You need to install gnome-common from GNOME Git (or from" diff --git a/x11-fm/nemo/files/patch-src_nemo-icon-view.c b/x11-fm/nemo/files/patch-src_nemo-icon-view.c index 6f91b72a4..53f37fd24 100644 --- a/x11-fm/nemo/files/patch-src_nemo-icon-view.c +++ b/x11-fm/nemo/files/patch-src_nemo-icon-view.c @@ -5,7 +5,7 @@ nemo_icon_view_get_default_zoom_level (NemoView *view) { - g_return_if_fail (NEMO_IS_ICON_VIEW (view)); -+ g_return_val_if_fail (NEMO_IS_ICON_VIEW (view), NULL); ++ g_return_val_if_fail (NEMO_IS_ICON_VIEW (view), NEMO_ZOOM_LEVEL_STANDARD); return get_default_zoom_level(NEMO_ICON_VIEW (view)); } diff --git a/x11-fm/nemo/files/patch-src_nemo-list-view.c b/x11-fm/nemo/files/patch-src_nemo-list-view.c index 68b75b839..40fac57d5 100644 --- a/x11-fm/nemo/files/patch-src_nemo-list-view.c +++ b/x11-fm/nemo/files/patch-src_nemo-list-view.c @@ -5,7 +5,7 @@ nemo_list_view_get_default_zoom_level (NemoView *view) { - g_return_if_fail (NEMO_IS_LIST_VIEW (view)); -+ g_return_val_if_fail (NEMO_IS_LIST_VIEW (view), NULL); ++ g_return_val_if_fail (NEMO_IS_LIST_VIEW (view), NEMO_ZOOM_LEVEL_STANDARD); return get_default_zoom_level(); } diff --git a/x11-fm/nemo/files/patch-src_nemo-view.c b/x11-fm/nemo/files/patch-src_nemo-view.c index 41b53e6dc..b50b32d24 100644 --- a/x11-fm/nemo/files/patch-src_nemo-view.c +++ b/x11-fm/nemo/files/patch-src_nemo-view.c @@ -5,7 +5,7 @@ nemo_view_get_default_zoom_level (NemoView *view) { - g_return_if_fail (NEMO_IS_VIEW (view)); -+ g_return_val_if_fail (NEMO_IS_VIEW (view), NULL); ++ g_return_val_if_fail (NEMO_IS_VIEW (view), NEMO_ZOOM_LEVEL_STANDARD); if (!nemo_view_supports_zooming (view)) { return -1; diff --git a/x11-fm/nemo/pkg-plist b/x11-fm/nemo/pkg-plist index 5077ce2bd..79d5dcb97 100644 --- a/x11-fm/nemo/pkg-plist +++ b/x11-fm/nemo/pkg-plist @@ -20,6 +20,8 @@ lib/libnemo-extension.so lib/libnemo-extension.so.5 libdata/pkgconfig/libnemo-extension.pc libexec/nemo-convert-metadata +man/man1/nemo-connect-server.1.gz +man/man1/nemo.1.gz share/GConf/gsettings/nemo.convert share/applications/nemo-autorun-software.desktop share/applications/nemo.desktop @@ -33,7 +35,6 @@ share/icons/hicolor/16x16/apps/nemo.png share/icons/hicolor/22x22/apps/nemo.png share/icons/hicolor/24x24/apps/nemo.png share/icons/hicolor/32x32/apps/nemo.png -share/icons/hicolor/icon-theme.cache share/icons/hicolor/scalable/actions/location-symbolic.svg share/icons/hicolor/scalable/actions/sidebar-hide-symbolic.svg share/icons/hicolor/scalable/actions/sidebar-places-symbolic.svg @@ -160,11 +161,11 @@ share/mime/packages/nemo.xml %%DATADIR%%/actions/sample.nemo_action %%DATADIR%%/icons/hicolor/16x16/emblems/emblem-note.png %%DATADIR%%/icons/hicolor/24x24/emblems/emblem-note.png -%%DATADIR%%/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/emblems/emblem-note.png +%%DATADIR%%/icons/hicolor/48x48/emblems/emblem-note.png %%DATADIR%%/nemo-extras.placeholder %%DATADIR%%/nemo-suggested.placeholder -@dirrm %%DATADIR%%/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/emblems -@dirrm %%DATADIR%%/icons/hicolor/4%%XAWVER%%x4%%XAWVER%% +@dirrm %%DATADIR%%/icons/hicolor/48x48/emblems +@dirrm %%DATADIR%%/icons/hicolor/48x48 @dirrm %%DATADIR%%/icons/hicolor/24x24/emblems @dirrm %%DATADIR%%/icons/hicolor/24x24 @dirrm %%DATADIR%%/icons/hicolor/16x16/emblems |