ports/179711: [PATCH] x11/menu-cache: update to 0.4.1, take maintainership
nemysis
nemysis at gmx.ch
Wed Jun 19 09:50:00 UTC 2013
>Number: 179711
>Category: ports
>Synopsis: [PATCH] x11/menu-cache: update to 0.4.1, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 19 09:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: nemysis
>Release: FreeBSD 9.1-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013
>Description:
- Update to 0.4.1
- Take maintainership
- Shorten header
- Remove not needed patches
- Trim pkg-plist
Removed file(s):
- files/patch-libmenu-cache__menu-cache.c
- files/patch-menu-cached.c
Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_7 (mode: update, diff: ports)
>How-To-Repeat:
Build log
https://redports.org/buildarchive/20130619082200-19741/
>Fix:
--- menu-cache-0.4.1.patch begins here ---
diff -ruN /usr/ports/x11/menu-cache/Makefile ./Makefile
--- /usr/ports/x11/menu-cache/Makefile 2013-06-18 18:26:39.000000000 +0200
+++ ./Makefile 2013-06-19 10:19:08.000000000 +0200
@@ -1,23 +1,21 @@
-# New ports collection makefile for: x11/menu-cache
-# Date created: 23 Sept 2010
-# Whom: Kris Moore <kmoore at freebsd.org>
-#
+# Created by: Kris Moore <kmoore at freebsd.org>
# $FreeBSD: head/x11/menu-cache/Makefile 321199 2013-06-18 15:55:34Z kmoore $
-#
PORTNAME= menu-cache
-PORTVERSION= 0.3.3
+PORTVERSION= 0.4.1
CATEGORIES= x11
MASTER_SITES= SF/lxde/menu-cache/menu-cache%20${PORTVERSION}/
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= nemysis at gmx.ch
COMMENT= The menu-cache portion of LXDE
-USE_GNOME= gnomehack gtk20 pkgconfig
+USES= pkgconfig
+USE_GNOME= gnomehack gtk20
USE_AUTOTOOLS= libtool
-USE_LDCONFIG= yes
USE_GMAKE= yes
+USE_LDCONFIG= yes
USE_FAM= yes
+
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff -ruN /usr/ports/x11/menu-cache/distinfo ./distinfo
--- /usr/ports/x11/menu-cache/distinfo 2013-06-02 18:57:13.000000000 +0200
+++ ./distinfo 2013-06-19 10:12:37.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (menu-cache-0.3.3.tar.gz) = 07241c1f5f371b426d3b0a6e571a86184ec6256bdd7ead7a4da866cd10f25955
-SIZE (menu-cache-0.3.3.tar.gz) = 392291
+SHA256 (menu-cache-0.4.1.tar.gz) = 4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e
+SIZE (menu-cache-0.4.1.tar.gz) = 412859
diff -ruN /usr/ports/x11/menu-cache/files/patch-libmenu-cache__menu-cache.c ./files/patch-libmenu-cache__menu-cache.c
--- /usr/ports/x11/menu-cache/files/patch-libmenu-cache__menu-cache.c 2013-06-02 18:57:13.000000000 +0200
+++ ./files/patch-libmenu-cache__menu-cache.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
---- ./libmenu-cache/menu-cache.c.orig 2012-03-18 14:12:13.000000000 +1030
-+++ ./libmenu-cache/menu-cache.c 2012-03-18 14:13:02.000000000 +1030
-@@ -226,7 +226,7 @@
-
- /* file name */
- if( G_UNLIKELY( ! fgets( line, G_N_ELEMENTS(line) - 1, f ) ))
-- return;
-+ return NULL;
- len = strlen( line );
- if( G_LIKELY(len > 1) )
- item->file_name = g_strndup( line, len - 1 );
-@@ -240,7 +240,7 @@
-
- /* desktop file dir */
- if( G_UNLIKELY( ! fgets( line, G_N_ELEMENTS(line) - 1, f ) ))
-- return;
-+ return NULL;
- idx = atoi( line );
- if( G_LIKELY( idx >=0 && idx < cache->n_all_used_files ) )
- item->file_dir = cache->all_used_files[ idx ] + 1;
diff -ruN /usr/ports/x11/menu-cache/files/patch-menu-cached.c ./files/patch-menu-cached.c
--- /usr/ports/x11/menu-cache/files/patch-menu-cached.c 2013-06-02 18:57:13.000000000 +0200
+++ ./files/patch-menu-cached.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
---- menu-cache-daemon/menu-cached.c.o 2011-03-17 10:58:03.876822788 -0400
-+++ menu-cache-daemon/menu-cached.c 2011-03-17 10:58:49.355824755 -0400
-@@ -341,6 +341,29 @@
- GFileMonitorEvent evt, Cache* cache )
- {
- /* DEBUG("file %s is changed (%d).", g_file_get_path(gf), evt); */
-+
-+ if ( evt == G_FILE_MONITOR_EVENT_DELETED )
-+ {
-+ int idx;
-+ /* dirty hack: get index of the monitor in array */
-+ for(idx = 0; idx < cache->n_files; ++idx)
-+ {
-+ if(mon == cache->mons[idx])
-+ break;
-+ }
-+
-+ /* Check if this file or directory was already removed from the cache */
-+ char* changed_file = g_file_get_path(gf);
-+ char* dir_path = cache->files[idx]+1;
-+ int len = strlen(dir_path);
-+ char* base_name = changed_file + len + 1;
-+ gboolean in_cache = is_desktop_file_in_cache(cache, idx, g_file_get_path(gf));
-+ if( ! in_cache ) { /* Means this file was already deleted, no need to refresh cache */
-+ DEBUG("files are changed, but no re-generation is needed.");
-+ return;
-+ }
-+ }
-+
- /* if( mon != cache->cache_mon ) */
- {
- /* Optimization: Some files in the dir are changed, but it
diff -ruN /usr/ports/x11/menu-cache/pkg-plist ./pkg-plist
--- /usr/ports/x11/menu-cache/pkg-plist 2013-06-02 18:57:13.000000000 +0200
+++ ./pkg-plist 2013-06-19 10:15:56.000000000 +0200
@@ -1,10 +1,9 @@
-lib/libmenu-cache.so
-lib/libmenu-cache.so.1
-lib/libmenu-cache.la
+include/menu-cache/menu-cache.h
lib/libmenu-cache.a
+lib/libmenu-cache.la
+lib/libmenu-cache.so
+lib/libmenu-cache.so.2
libdata/pkgconfig/libmenu-cache.pc
-libexec/menu-cached
libexec/menu-cache-gen
-include/menu-cache/menu-cache.h
+libexec/menu-cached
@dirrm include/menu-cache
- at dirrmtry libdata/pkgconfig
--- menu-cache-0.4.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list