Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome
In directory vz-cvs-3.sog:/tmp/cvs-serv23985
Modified Files:
desktop-file-utils.info desktop-file-utils.patch
gnome-doc-utils.info shared-mime-info.info
Log Message:
new versions (sync from 10.6)
Index: desktop-file-utils.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome/desktop-file-utils.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- desktop-file-utils.info 6 Nov 2011 06:24:38 -0000 1.2
+++ desktop-file-utils.info 2 Apr 2012 15:51:55 -0000 1.3
@@ -1,5 +1,5 @@
Package: desktop-file-utils
-Version: 0.18
+Version: 0.20
Revision: 1
Depends: <<
dpkg-base-files,
@@ -8,15 +8,15 @@
xdg-base
<<
BuildDepends: <<
- fink (>= 0.24.12),
+ fink (>= 0.32),
glib2-dev (>= 2.22.0-1),
libgettext8-dev,
pkgconfig (>= 0.23)
<<
-Source:
http://freedesktop.org/software/desktop-file-utils/releases/%n-%v.tar.bz2
-Source-MD5: d966b743eb394650f98d5dd56b9aece1
+Source:
http://freedesktop.org/software/desktop-file-utils/releases/%n-%v.tar.xz
+Source-MD5: 8c85cbc13632ba69077c6bc41ce4d0ac
PatchFile: %n.patch
-PatchFile-MD5: 6dd926cf03fd9160bee811f0e55abe25
+PatchFile-MD5: 81dc9feaceeb30bc686fd89bc2eac2a2
ConfigureParams: --disable-dependency-tracking
--with-lispdir=%p/share/emacs/site-lisp/%n
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PAT"
CompileScript: <<
EMACS=no ./configure %c
@@ -62,6 +62,10 @@
to access user-specific data if sudo'ed)
Must have applications dir, otherwise update-desktop-database crashes
+
+ Copy g_slist_free_full from glib-2.32.0/glib/gslice.c into
+ install.c so don't need to require glib2>2.28. See:
+ https://bugs.freedesktop.org/show_bug.cgi?id=48133
<<
License: GPL
Maintainer: The Gnome Core Team <[email protected]>
Index: gnome-doc-utils.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome/gnome-doc-utils.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gnome-doc-utils.info 21 Jul 2011 20:51:00 -0000 1.1
+++ gnome-doc-utils.info 2 Apr 2012 15:51:55 -0000 1.2
@@ -1,5 +1,5 @@
Package: gnome-doc-utils
-Version: 0.20.4
+Version: 0.20.6
Revision: 1
Depends: <<
dpkg-base-files,
@@ -21,7 +21,7 @@
<<
Replaces: yelp (<< 2.10.0-1)
Source: mirror:gnome:sources/%n/0.20/%n-%v.tar.bz2
-Source-MD5: 6872b68dd081fc033e07d5877b4c0645
+Source-MD5: 8f6e05071599bc073007830ea0a68391
ConfigureParams: --mandir=%p/share/man --disable-scrollkeeper
--disable-dependency-tracking
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
Index: desktop-file-utils.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome/desktop-file-utils.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- desktop-file-utils.patch 6 Nov 2011 06:24:38 -0000 1.2
+++ desktop-file-utils.patch 2 Apr 2012 15:51:55 -0000 1.3
@@ -1,7 +1,7 @@
-diff -Nurd -x'*~' desktop-file-utils-0.18.orig/src/Makefile.in
desktop-file-utils-0.18/src/Makefile.in
---- desktop-file-utils-0.18.orig/src/Makefile.in 2011-01-13
05:03:40.000000000 -0500
-+++ desktop-file-utils-0.18/src/Makefile.in 2011-08-04 09:26:17.000000000
-0400
-@@ -251,9 +251,9 @@
+diff -Nurd -x'*~' desktop-file-utils-0.20.orig/src/Makefile.in
desktop-file-utils-0.20/src/Makefile.in
+--- desktop-file-utils-0.20.orig/src/Makefile.in 2012-03-05
04:56:36.000000000 -0500
++++ desktop-file-utils-0.20/src/Makefile.in 2012-04-01 12:37:30.000000000
-0400
+@@ -211,9 +211,9 @@
mimeutils.h \
update-desktop-database.c
@@ -14,3 +14,31 @@
all: all-am
.SUFFIXES:
+diff -Nurd -x'*~' desktop-file-utils-0.20.orig/src/install.c
desktop-file-utils-0.20/src/install.c
+--- desktop-file-utils-0.20.orig/src/install.c 2011-12-14 11:27:30.000000000
-0500
++++ desktop-file-utils-0.20/src/install.c 2012-04-01 12:38:05.000000000
-0400
+@@ -65,6 +65,15 @@
+ char *action_value;
+ } DfuEditAction;
+
++/* g_slist_free_full from glib-2.32.0/glib/gslice.c (modulo "static") */
++static void
++_g_slist_free_full (GSList *list,
++ GDestroyNotify free_func)
++{
++ g_slist_foreach (list, (GFunc) free_func, NULL);
++ g_slist_free (list);
++}
++
+ static DfuEditAction *
+ dfu_edit_action_new (DfuEditActionType type,
+ const char *key,
+@@ -940,7 +949,7 @@
+ }
+ }
+
+- g_slist_free_full (edit_actions, (GDestroyNotify) dfu_edit_action_free);
++ _g_slist_free_full (edit_actions, (GDestroyNotify) dfu_edit_action_free);
+
+ g_option_context_free (context);
+
Index: shared-mime-info.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome/shared-mime-info.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- shared-mime-info.info 21 Nov 2011 19:31:33 -0000 1.2
+++ shared-mime-info.info 2 Apr 2012 15:51:55 -0000 1.3
@@ -1,5 +1,5 @@
Package: shared-mime-info
-Version: 0.90
+Version: 1.0
Revision: 1
Depends: <<
base-files,
@@ -10,6 +10,7 @@
xdg-base
<<
BuildDepends: <<
+ fink (>= 0.32),
gettext-bin,
gettext-tools (>= 0.17-1),
glib2-dev (>= 2.22.0-1),
@@ -19,8 +20,8 @@
libxml2-bin (>= 2.7.8-1),
pkgconfig (>= 0.23)
<<
-Source: http://freedesktop.org/~hadess/%n-%v.tar.bz2
-Source-MD5: 967d68d3890ba3994cfce3adf5b8f15b
+Source: http://freedesktop.org/~hadess/%n-%v.tar.xz
+Source-MD5: 901b7977dbb2b71d12d30d4d8fb97028
ConfigureParams: --disable-update-mimedb --mandir=%p/share/man
--disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
InstallScript: <<
make -j1 install DESTDIR=%d
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
