diff options
| author | Rusmir Dusko <nemysis@FreeBSD.org> | 2013-10-04 23:10:53 +0000 |
|---|---|---|
| committer | Rusmir Dusko <nemysis@FreeBSD.org> | 2013-10-04 23:10:53 +0000 |
| commit | 9dc40549710264894060714fbade3a4e27958865 (patch) | |
| tree | b433d9d5dbd88d12c6a27bc9c3d7ba8b753d5b13 /x11/menu-cache | |
| parent | 9888b66a3c47814a05e96913c5850c82828b983a (diff) | |
Notes
Diffstat (limited to 'x11/menu-cache')
| -rw-r--r-- | x11/menu-cache/Makefile | 8 | ||||
| -rw-r--r-- | x11/menu-cache/distinfo | 4 | ||||
| -rw-r--r-- | x11/menu-cache/files/patch-menu-cache-daemon-menu-cached.c | 46 | ||||
| -rw-r--r-- | x11/menu-cache/pkg-plist | 7 |
4 files changed, 9 insertions, 56 deletions
diff --git a/x11/menu-cache/Makefile b/x11/menu-cache/Makefile index b6d40bab1316..cccb90a00daf 100644 --- a/x11/menu-cache/Makefile +++ b/x11/menu-cache/Makefile @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= menu-cache -PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTVERSION= 0.5.0 CATEGORIES= x11 -MASTER_SITES= SF/lxde/menu-cache/menu-cache%20${PORTVERSION}/ +MASTER_SITES= SF/lxde/menu-cache/menu-cache%20${PORTVERSION:S/.0/.x/}/ -MAINTAINER= nemysis@gmx.ch +MAINTAINER= nemysis@FreeBSD.org COMMENT= The menu-cache portion of LXDE USES= pkgconfig @@ -20,5 +19,4 @@ USE_FAM= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/menu-cache/distinfo b/x11/menu-cache/distinfo index ba0e660a7bd0..506d69ec37b6 100644 --- a/x11/menu-cache/distinfo +++ b/x11/menu-cache/distinfo @@ -1,2 +1,2 @@ -SHA256 (menu-cache-0.4.1.tar.gz) = 4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e -SIZE (menu-cache-0.4.1.tar.gz) = 412859 +SHA256 (menu-cache-0.5.0.tar.gz) = 875a7441b34bb24debc1c8017d74d59987d7a704c4c023e81a0b4ebcc2d7904a +SIZE (menu-cache-0.5.0.tar.gz) = 406105 diff --git a/x11/menu-cache/files/patch-menu-cache-daemon-menu-cached.c b/x11/menu-cache/files/patch-menu-cache-daemon-menu-cached.c deleted file mode 100644 index d6ba4ccb0d51..000000000000 --- a/x11/menu-cache/files/patch-menu-cache-daemon-menu-cached.c +++ /dev/null @@ -1,46 +0,0 @@ ---- menu-cache-daemon/menu-cached.c.orig 2012-11-14 09:07:36.000000000 +0100 -+++ menu-cache-daemon/menu-cached.c 2013-07-01 00:02:26.000000000 +0200 -@@ -121,7 +121,7 @@ - static gboolean read_all_used_files( FILE* f, int* n_files, char*** used_files ) - { - char line[ 4096 ]; -- int i, n; -+ int i, n, x; - char** files; - int ver_maj, ver_min; - -@@ -141,20 +141,31 @@ - if( ! fgets( line, G_N_ELEMENTS(line), f ) ) - return FALSE; - -- *n_files = n = atoi( line ); -+ n = atoi( line ); - files = g_new0( char*, n + 1 ); - -- for( i = 0; i < n; ++i ) -+ for( i = 0, x = 0; i < n; ++i ) - { - int len; -+ GFile *gfile; - if( ! fgets( line, G_N_ELEMENTS(line), f ) ) - return FALSE; - - len = strlen( line ); - if( len <= 1 ) - return FALSE; -- files[ i ] = g_strndup( line, len - 1 ); /* don't include \n */ -+ files[ x ] = g_strndup( line, len - 1 ); /* don't include \n */ -+ gfile = g_file_new_for_path(files[x]+1); -+ if (g_file_query_exists(gfile, NULL)) -+ x++; -+ else -+ { -+ DEBUG("ignoring not existant file from menu-cache-gen: %s", files[x]); -+ g_free(files[x]); -+ } -+ g_object_unref(gfile); - } -+ *n_files = x; - *used_files = files; - return TRUE; - } diff --git a/x11/menu-cache/pkg-plist b/x11/menu-cache/pkg-plist index 876c8c45bdcf..263836931454 100644 --- a/x11/menu-cache/pkg-plist +++ b/x11/menu-cache/pkg-plist @@ -2,8 +2,9 @@ include/menu-cache/menu-cache.h lib/libmenu-cache.a lib/libmenu-cache.la lib/libmenu-cache.so -lib/libmenu-cache.so.2 +lib/libmenu-cache.so.3 libdata/pkgconfig/libmenu-cache.pc -libexec/menu-cache-gen -libexec/menu-cached +libexec/menu-cache/menu-cache-gen +libexec/menu-cache/menu-cached +@dirrm libexec/menu-cache @dirrm include/menu-cache |