Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15505
Modified Files:
fsv.info fsv.patch
Log Message:
new version (now with GTK2 goodness)
Index: fsv.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/fsv.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fsv.patch 20 Jan 2006 20:34:22 -0000 1.1
+++ fsv.patch 25 May 2010 17:10:24 -0000 1.2
@@ -1,37 +1,12 @@
-diff -Nurd -x'*~' fsv-0.9.orig/lib/Makefile.in fsv-0.9/lib/Makefile.in
---- fsv-0.9.orig/lib/Makefile.in 2000-01-15 19:44:24.000000000 -0500
-+++ fsv-0.9/lib/Makefile.in 2003-12-16 00:55:38.000000000 -0500
-@@ -99,10 +99,10 @@
-
- INCLUDES = @GTK_CFLAGS@
-
--noinst_HEADERS = gnome-i18nP.h gnome-color-picker.h
gnome-dateedit.h getopt.h nvstore.h
-+noinst_HEADERS = gnome-i18nP.h gnome-color-picker.h
gnome-dateedit.h nvstore.h
-
- libgnomeui_a_SOURCES = gnome-color-picker.c gnome-dateedit.c
--libmisc_a_SOURCES = getopt.c getopt1.c nvstore.c
-+libmisc_a_SOURCES = nvstore.c
- libmisc_a_LIBADD = @LIBOBJS@
-
- EXTRA_DIST = README.gnome
-@@ -119,7 +119,7 @@
- libgnomeui_a_LIBADD =
- libgnomeui_a_OBJECTS = gnome-color-picker.o gnome-dateedit.o
- libmisc_a_DEPENDENCIES = @LIBOBJS@
--libmisc_a_OBJECTS = getopt.o getopt1.o nvstore.o
-+libmisc_a_OBJECTS = nvstore.o
- AR = ar
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS)
-diff -Nurd -x'*~' fsv-0.9.orig/src/fsv.c fsv-0.9/src/fsv.c
---- fsv-0.9.orig/src/fsv.c 2000-01-26 21:49:55.000000000 -0500
-+++ fsv-0.9/src/fsv.c 2003-12-16 00:46:07.000000000 -0500
-@@ -28,7 +28,7 @@
+diff -Nurd -x'*~' fsv2-1.0.1.orig/src/Makefile.in fsv2-1.0.1/src/Makefile.in
+--- fsv2-1.0.1.orig/src/Makefile.in 2009-01-26 06:48:46.000000000 -0500
++++ fsv2-1.0.1/src/Makefile.in 2010-05-25 12:38:36.000000000 -0400
+@@ -241,7 +241,7 @@
+ @GTKGL_LIBS@ \
+ @GL_LIBS@ \
+ @GTK_LIBS@ \
+- @GNOMEUI_LIBS@
++ @GNOMEUI_LIBS@ $(INTLLIBS)
- #include <gtk/gtk.h>
- #include <gtkgl/gdkgl.h>
--#include "getopt.h"
-+#include <getopt.h>
- #include "about.h"
- #include "animation.h"
+ # $(top_builddir)/lib/libmisc.a \
Index: fsv.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/fsv.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fsv.info 19 Mar 2009 05:24:44 -0000 1.4
+++ fsv.info 25 May 2010 17:10:24 -0000 1.5
@@ -1,5 +1,5 @@
Package: fsv
-Version: 0.9
+Version: 1.0.1
Revision: 13
Description: 3D file system visualizer
DescDetail: <<
@@ -10,36 +10,101 @@
hard drive, or any arbitrarily large collection of files, limited only
by the host computer's memory and hardware constraints.
<<
-DescPort: <<
-Uses gtkglarea (not gtkglarea2) which is only availa as a .a.
+DescUsage: <<
+Note: there are some runtime memory-handling errors. Seem harmless for now.
+<<
+DescPackaging: <<
+ Old (gnome1) version called itself "fsv", so we keep that for
+ backward-compatibility/upgrade-sanity.
+
+ Don't appear to have glc available right now, so make sure not
+ to find it if it becomes available.
+
+ Hardcode system 'file' to avoid needing dep on fink's.
+
+ Using x11's OpenGL rather than pushing dep on fink's mesa pkg.
-Modify to use system GNU getopt instead of distribution lib/getopt.
<<
-Homepage: http://fsv.sourceforge.net/
+#Homepage: http://fsv.sourceforge.net/
+Homepage: http://fedorchenko.net/fsv2.php
License: LGPL
Maintainer: Daniel Macks <dma...@netspace.org>
BuildDepends: <<
- fink (>= 0.24.12-1),
- glib,
- gtk+,
- gtkglarea,
- libgettext3-dev,
+ atk1 (>= 1.28.0-1),
+ cairo (>= 1.8.8-3),
+ fink (>= 0.24.12),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
+ gconf2-dev (>= 2.28.0-1),
+ gettext-bin,
+ gettext-tools,
+ glib2-dev (>= 2.22.0-1),
+ glitz,
+ gnome-vfs2-unified-dev (>= 1:2.24.2-1),
+ gtk+2-dev (>= 2.18.0-1),
+ gtkglarea2,
+ libart2,
+ libbonobo2-dev (>= 2.24.2-1),
+ libbonoboui2-dev (>= 2.24.2-1),
+ libgettext8-dev,
+ libgnome2-dev (>= 2.28.0-1),
+ libgnomecanvas2-dev (>= 2.26.0-3),
+ libgnomeui2-dev (>= 2.24.2-3),
+ orbit2-dev (>= 2.14.17-2),
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
+ pkgconfig (>= 0.23),
+ pixman (>= 0.16.0-1),
+ popt,
x11-dev
<<
Depends: <<
- glib-shlibs,
- gtk+-shlibs,
- libgettext3-shlibs,
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ gconf2-shlibs (>= 2.28.0-1),
+ glib2-shlibs (>= 2.22.0-1),
+ gnome-vfs2-unified-shlibs (>= 1:2.24.2-1),
+ gtk+2-shlibs (>= 2.18.0-1),
+ gtkglarea2-shlibs,
+ libart2-shlibs,
+ libbonobo2-shlibs (>= 2.24.2-1),
+ libbonoboui2-shlibs (>= 2.24.2-1),
+ libgettext8-shlibs,
+ libgnome2-shlibs (>= 2.28.0-1),
+ libgnomecanvas2-shlibs (>= 2.26.0-3),
+ libgnomeui2-shlibs (>= 2.24.2-3),
+ orbit2-shlibs(>= 2.14.17-2),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
+ popt-shlibs,
x11
<<
-Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 0f68e27d638c45dbdf4f66fa19f811f0
+#Source: mirror:sourceforge:fsv/fsv-%v.tar.gz
+Source: http://fedorchenko.net/src/fsv2-%v.tar.bz2
+Source-MD5: d86da5bbb31bd7cace7a516284d5ecd8
PatchFile: %n.patch
-PatchFile-MD5: fa63b892244c1216c72274e50f8e065c
-SetLDFLAGS:
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
-PatchScript: <<
- %{default_script}
- rm lib/getopt*
+PatchFile-MD5: d974ab3681be4f6b450cdf9af3a0ea2f
+SetCPPFLAGS: -I%p/lib/fontconfig2/include
+SetLDFLAGS: -L%p/lib/fontconfig2/lib
+#PatchScript: <<
+# %{default_script}
+# rm lib/getopt*
+#<<
+ConfigureParams: <<
+ --with-doc-dir=%p/share/doc/%n \
+ --disable-glc \
+ FILE_CMD=/usr/bin/file \
+ --with-GL-prefix=/usr/X11R6 \
+
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
<<
-ConfigureParams: --mandir='${prefix}/share/man'
--infodir='${prefix}/share/info'
-DocFiles: AUTHORS COPYING ChangeLog NEWS NOTES README TODO
+CompileScript: <<
+ ./configure %c
+ make
+ fink-package-precedence .
+<<
+InstallScript: <<
+ make install DESTDIR=%d
+ ln -s fsv2 %i/bin/fsv
+<<
+DocFiles: ABOUT-NLS AUTHORS COPYING ChangeLog NEWS NOTES README TODO
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
