Author: ranger
Date: Sat Feb 10 23:48:03 2007
New Revision: 648
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=648&repname=user%3a+ranger>
Log:
fix statvfs for 10.3
Modified:
trunk/experimental/common/main/finkinfo/libs/libgpod1.info
trunk/experimental/common/main/finkinfo/libs/libgpod1.patch
Modified: trunk/experimental/common/main/finkinfo/libs/libgpod1.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/libgpod1.info&rev=648&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/libgpod1.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/libgpod1.info Sat Feb 10
23:48:03 2007
@@ -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
Modified: trunk/experimental/common/main/finkinfo/libs/libgpod1.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/libgpod1.patch&rev=648&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/libgpod1.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/libgpod1.patch Sat Feb 10
23:48:03 2007
@@ -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-new/src/db-parse-context.c 2007-02-10 17:50:32.000000000
-0500
@@ -23,9 +23,9 @@
*/
@@ -14,8 +14,20 @@
#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-new/src/itdb_itunesdb.c 2007-02-10 17:51:43.000000000
-0500
+@@ -132,6 +132,11 @@
+
+ #define ITUNESDB_COPYBLK (1024*1024*4) /* blocksize for cp () */
+
++#ifdef NO_STATVFS
++# include <sys/mount.h>
++# define statvfs statfs
++# define f_frsize f_bsize
++#endif
+
+ /* NOTE for developers:
+
+@@ -4638,6 +4643,18 @@
}
@@ -34,7 +46,7 @@
/**
* itdb_shuffle_write_file:
* @itdb: the #Itdb_iTunesDB to write to disk
-@@ -4652,18 +4664,6 @@
+@@ -4652,18 +4669,6 @@
gboolean itdb_shuffle_write_file (Itdb_iTunesDB *itdb,
const gchar *filename, GError **error)
{
@@ -55,7 +67,7 @@
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-new/src/itdb_track.c 2007-02-10 17:50:32.000000000 -0500
@@ -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
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits