Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6660
Modified Files:
libgpod1.info libgpod1.patch
Log Message:
fix build with no statvfs
Index: libgpod1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/libgpod1.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libgpod1.info 6 Feb 2007 15:25:07 -0000 1.2
+++ libgpod1.info 13 Feb 2007 03:20:10 -0000 1.3
@@ -1,6 +1,6 @@
Package: libgpod1
Version: 0.4.2
-Revision: 2
+Revision: 3
Depends: %N-shlibs (>= %v-%r)
BuildDepends: atk1 (>= 1.6.0-1), glib2-dev (>= 2.6.6-1), gtk+2-dev, intltool
(>= 0.33-1), libgettext3-dev, libiconv, pango1-xft2-dev (>= 1.8.0-1), pkgconfig
@@ -11,6 +11,17 @@
Patch: %n.patch
PatchScript: perl -pi -e
's,GETTEXT_PACKAGE=libgpod,GETTEXT_PACKAGE=libgpod-1.0,' configure
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
+CompileScript: <<
+#!/bin/sh -ev
+
+ case `uname -r` in
+ 7*)
+ export CPPFLAGS="$CPPFLAGS -DNO_STATVFS"
+ ;;
+ esac
+ ./configure %c
+ make
+<<
InstallScript: make -j1 install DESTDIR=%d
SplitOff: <<
Package: %N-shlibs
Index: libgpod1.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/libgpod1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libgpod1.patch 6 Feb 2007 14:31:09 -0000 1.1
+++ libgpod1.patch 13 Feb 2007 03:20:10 -0000 1.2
@@ -1,6 +1,6 @@
diff -uNr libgpod-0.4.2/src/db-parse-context.c
libgpod-0.4.2-new/src/db-parse-context.c
---- libgpod-0.4.2/src/db-parse-context.c 2006-10-02 09:52:47.000000000
-0400
-+++ libgpod-0.4.2-new/src/db-parse-context.c 2007-02-05 22:15:47.000000000
-0500
+--- libgpod-0.4.2/src/db-parse-context.c Mon Oct 2 09:52:47 2006
++++ libgpod-0.4.2-new/src/db-parse-context.c Sun Feb 11 19:52:19 2007
@@ -23,9 +23,9 @@
*/
@@ -13,9 +13,35 @@
#include <fcntl.h>
#include <string.h>
diff -uNr libgpod-0.4.2/src/itdb_itunesdb.c
libgpod-0.4.2-new/src/itdb_itunesdb.c
---- libgpod-0.4.2/src/itdb_itunesdb.c 2007-01-14 09:28:37.000000000 -0500
-+++ libgpod-0.4.2-new/src/itdb_itunesdb.c 2007-02-05 22:18:28.000000000
-0500
-@@ -4638,6 +4638,18 @@
+--- libgpod-0.4.2/src/itdb_itunesdb.c Sun Jan 14 09:28:37 2007
++++ libgpod-0.4.2-new/src/itdb_itunesdb.c Sun Feb 11 19:52:31 2007
+@@ -122,8 +122,16 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/stat.h>
+-#include <sys/statvfs.h>
+ #include <sys/types.h>
++
++#ifdef NO_STATVFS
++# include <sys/mount.h>
++# define statvfs statfs
++# define f_frsize f_bsize
++#else
++# include <sys/statvfs.h>
++#endif
++
+ #include <time.h>
+ #include <unistd.h>
+
+@@ -132,7 +140,6 @@
+
+ #define ITUNESDB_COPYBLK (1024*1024*4) /* blocksize for cp () */
+
+-
+ /* NOTE for developers:
+
+ Sometimes new MHOD string fields are added by Apple in the
+@@ -4638,6 +4645,18 @@
}
@@ -34,7 +60,7 @@
/**
* itdb_shuffle_write_file:
* @itdb: the #Itdb_iTunesDB to write to disk
-@@ -4652,18 +4664,6 @@
+@@ -4652,18 +4671,6 @@
gboolean itdb_shuffle_write_file (Itdb_iTunesDB *itdb,
const gchar *filename, GError **error)
{
@@ -54,8 +80,8 @@
GList *gl;
WContents *cts;
diff -uNr libgpod-0.4.2/src/itdb_track.c libgpod-0.4.2-new/src/itdb_track.c
---- libgpod-0.4.2/src/itdb_track.c 2007-01-14 10:15:50.000000000 -0500
-+++ libgpod-0.4.2-new/src/itdb_track.c 2007-02-05 22:15:47.000000000 -0500
+--- libgpod-0.4.2/src/itdb_track.c Sun Jan 14 10:15:50 2007
++++ libgpod-0.4.2-new/src/itdb_track.c Sun Feb 11 19:52:19 2007
@@ -69,20 +69,11 @@
return track;
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
