From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 30 22:50:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D9DDEB51 for ; Sun, 30 Jun 2013 22:50:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id BAD0F1E8A for ; Sun, 30 Jun 2013 22:50:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r5UMo0Ev008098 for ; Sun, 30 Jun 2013 22:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r5UMo0i9008085; Sun, 30 Jun 2013 22:50:00 GMT (envelope-from gnats) Resent-Date: Sun, 30 Jun 2013 22:50:00 GMT Resent-Message-Id: <201306302250.r5UMo0i9008085@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, nemysis Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 6EC58B3C for ; Sun, 30 Jun 2013 22:48:30 +0000 (UTC) (envelope-from nemysis@gmx.ch) Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by mx1.freebsd.org (Postfix) with ESMTP id 1C2EE1E80 for ; Sun, 30 Jun 2013 22:48:29 +0000 (UTC) Received: from mailout-de.gmx.net ([10.1.76.1]) by mrigmx.server.lan (mrigmx002) with ESMTP (Nemesis) id 0MJ0dz-1UvuK53qgb-002Vy8 for ; Mon, 01 Jul 2013 00:48:28 +0200 Received: (qmail invoked by alias); 30 Jun 2013 22:48:27 -0000 Received: from 5-80.77-83.cust.bluewin.ch (EHLO something.email.com) [83.77.80.5] by mail.gmx.net (mp001) with SMTP; 01 Jul 2013 00:48:27 +0200 Received: by something.email.com (sSMTP sendmail emulation); Mon, 01 Jul 2013 00:48:27 +0200 Message-Id: <20130630224830.6EC58B3C@hub.freebsd.org> Date: Mon, 01 Jul 2013 00:48:27 +0200 From: nemysis To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/180132: [MAINTAINER] x11/menu-cache: Change dependency, fix 3 seconds LXDE menu bug Cc: jpaetzel@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jun 2013 22:50:00 -0000 >Number: 180132 >Category: ports >Synopsis: [MAINTAINER] x11/menu-cache: Change dependency, fix 3 seconds LXDE menu bug >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jun 30 22:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: nemysis >Release: FreeBSD 9.1-RELEASE-p8 amd64 >Organization: >Environment: System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p8 FreeBSD 9.1-RELEASE-p8 #0: Tue Jun 18 15:25:28 UTC 2013 >Description: - Bump portrevision - Change dependency gtk20 --> glib20 - Add files/patch-menu-cache-daemon-menu-cached.c Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports) >How-To-Repeat: Dependency is changed because LXDE Upstream have told this. Patch is needed that LXDE menu not reload each 3 seconds, because not existing /etc/xdg. Needed for all systems which use /usr/local/etc/xdg. Fixed in Git and in next version is this patch not more needed. Build log https://redports.org/buildarchive/20130630221100-30140/ >Fix: --- menu-cache-0.4.1_1.patch begins here --- diff -ruN /usr/ports/x11/menu-cache/Makefile ./Makefile --- /usr/ports/x11/menu-cache/Makefile 2013-06-20 21:56:58.000000000 +0200 +++ ./Makefile 2013-07-01 00:08:24.000000000 +0200 @@ -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 @@ 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 diff -ruN /usr/ports/x11/menu-cache/files/patch-menu-cache-daemon-menu-cached.c ./files/patch-menu-cache-daemon-menu-cached.c --- /usr/ports/x11/menu-cache/files/patch-menu-cache-daemon-menu-cached.c 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-menu-cache-daemon-menu-cached.c 2013-07-01 00:02:35.000000000 +0200 @@ -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; + } --- menu-cache-0.4.1_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: