mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00
Code Issues Releases Activity

x11/menu-cache: fix LXDE menu bug

Browse Source 
- Fix LXDE menu bug (from upstream)
- Change depenency to glib20

PR:		ports/180132
Submitted by:	nemysis <nemysis@gmx.ch> (maintainer)
This commit is contained in:
William Grzybowski 2013-07-03 12:38:31 +00:00
parent 29011d038d
commit 0c312a1b6a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=322225
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/menu-cache/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= menu-cache
PORTVERSION= 0.4.1
PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= SF/lxde/menu-cache/menu-cache%20${PORTVERSION}/
@ -10,7 +11,7 @@ MAINTAINER= nemysis@gmx.ch
COMMENT= The menu-cache portion of LXDE
USES= pkgconfig
USE_GNOME= gnomehack gtk20
USE_GNOME= gnomehack glib20
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes

46
x11/menu-cache/files/patch-menu-cache-daemon-menu-cached.c Normal file
View File

@ -0,0 +1,46 @@
--- 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;
}