Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19987/10.3/unstable/main/finkinfo/graphics
Modified Files:
zphoto.info zphoto.patch
Log Message:
* s/TRUE/true/g and s/FALSE/false/g to eliminate compilation errors.
* Make zphoto, zphoto-wxgtk and zphoto-wxmac independent mutually.
Before, zphoto-wxgtk and zphoto-wxmac depended on zphoto.
And then zphoto appeared as SplitOffs of both zphoto-wxgtk
and zphoto-wxmac. I think it's dangerous. Now zphoto is not a SplitOff
but a variant of zphoto%type_pkg[-gui].
Index: zphoto.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/zphoto.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- zphoto.patch 12 Nov 2004 13:29:04 -0000 1.3
+++ zphoto.patch 26 Aug 2005 16:39:06 -0000 1.4
@@ -1,6 +1,6 @@
-diff -Naur zphoto-1.2/Info.plist zphoto-1.2.fink/Info.plist
---- zphoto-1.2/Info.plist Thu Jan 1 09:00:00 1970
-+++ zphoto-1.2.fink/Info.plist Mon Nov 8 03:38:50 2004
+diff -Naur zphoto-1.2.orig/Info.plist zphoto-1.2/Info.plist
+--- zphoto-1.2.orig/Info.plist Thu Jan 1 00:00:00 1970
++++ zphoto-1.2/Info.plist Sun Nov 7 18:38:50 2004
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM
"file://localhost/System/Library/DTDs/PropertyList.dtd">
@@ -38,9 +38,9 @@
+ <true/>
+</dict>
+</plist>
-diff -Naur zphoto-1.2/configure zphoto-1.2.fink/configure
---- zphoto-1.2/configure Wed Jul 21 01:49:27 2004
-+++ zphoto-1.2.fink/configure Mon Nov 8 04:04:39 2004
+diff -Naur zphoto-1.2.orig/configure zphoto-1.2/configure
+--- zphoto-1.2.orig/configure Tue Jul 20 16:49:27 2004
++++ zphoto-1.2/configure Sun Nov 7 19:04:39 2004
@@ -4494,7 +4494,7 @@
SWFMovie_save(movie, "foo"); /* 0.2a API */
}
@@ -50,9 +50,9 @@
cat >>confdefs.h <<_ACEOF
#define MING_0_2a 1
-diff -Naur zphoto-1.2/flash.c zphoto-1.2.fink/flash.c
---- zphoto-1.2/flash.c Wed Jul 21 01:48:11 2004
-+++ zphoto-1.2.fink/flash.c Mon Nov 8 03:41:00 2004
+diff -Naur zphoto-1.2.orig/flash.c zphoto-1.2/flash.c
+--- zphoto-1.2.orig/flash.c Tue Jul 20 16:48:11 2004
++++ zphoto-1.2/flash.c Sun Nov 7 18:41:00 2004
@@ -409,6 +409,7 @@
SWFDisplayItem shadow;
SWFMovieClip clip;
@@ -81,9 +81,9 @@
item = SWFMovieClip_add(caption.clip, text.text);
SWFDisplayItem_moveTo(item, 0, frame.size.height);
-diff -Naur zphoto-1.2/support/Makefile.in zphoto-1.2.fink/support/Makefile.in
---- zphoto-1.2/support/Makefile.in Wed Jul 21 01:49:23 2004
-+++ zphoto-1.2.fink/support/Makefile.in Mon Nov 8 03:41:00 2004
+diff -Naur zphoto-1.2.orig/support/Makefile.in zphoto-1.2/support/Makefile.in
+--- zphoto-1.2.orig/support/Makefile.in Tue Jul 20 16:49:23 2004
++++ zphoto-1.2/support/Makefile.in Sun Nov 7 18:41:00 2004
@@ -56,7 +56,7 @@
LIBRARIES = $(noinst_LIBRARIES)
libsupport_a_AR = $(AR) $(ARFLAGS)
@@ -93,14 +93,14 @@
libsupport_a_OBJECTS = $(am_libsupport_a_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-diff -Naur zphoto-1.2/support/null.c zphoto-1.2.fink/support/null.c
---- zphoto-1.2/support/null.c Thu Jan 1 09:00:00 1970
-+++ zphoto-1.2.fink/support/null.c Mon Nov 8 03:41:00 2004
+diff -Naur zphoto-1.2.orig/support/null.c zphoto-1.2/support/null.c
+--- zphoto-1.2.orig/support/null.c Thu Jan 1 00:00:00 1970
++++ zphoto-1.2/support/null.c Sun Nov 7 18:41:00 2004
@@ -0,0 +1 @@
+void null() {}
-diff -Naur zphoto-1.2/util.c zphoto-1.2.fink/util.c
---- zphoto-1.2/util.c Wed Jul 21 01:48:11 2004
-+++ zphoto-1.2.fink/util.c Mon Nov 8 03:41:00 2004
+diff -Naur zphoto-1.2.orig/util.c zphoto-1.2/util.c
+--- zphoto-1.2.orig/util.c Tue Jul 20 16:48:11 2004
++++ zphoto-1.2/util.c Sun Nov 7 18:41:00 2004
@@ -79,7 +79,7 @@
va_end(args);
}
@@ -110,3 +110,54 @@
/*
* They have the declaration of vasprintf in stdio.h
*/
+diff -Naur zphoto-1.2.orig/wxzphoto.cpp zphoto-1.2/wxzphoto.cpp
+--- zphoto-1.2.orig/wxzphoto.cpp Tue Jul 20 17:40:53 2004
++++ zphoto-1.2/wxzphoto.cpp Mon Aug 22 13:59:49 2005
+@@ -292,9 +292,9 @@
+ menu.Append(Menu_Context_Clear_Selected, _("&Clear the selected file"));
+ menu.Append(Menu_Context_Clear_All, _("Clear &all files"));
+ if (!Selected(GetSelection()))
+- menu.Enable(Menu_Context_Clear_Selected, FALSE);
++ menu.Enable(Menu_Context_Clear_Selected, false);
+ if (GetCount() == 0)
+- menu.Enable(Menu_Context_Clear_All, FALSE);
++ menu.Enable(Menu_Context_Clear_All, false);
+ PopupMenu(&menu, pos.x, pos.y);
+ }
+
+@@ -318,7 +318,7 @@
+ if (zphoto_supported_file_p(filenames[n]))
+ m_pOwner->Append(filenames[n]);
+ }
+- return TRUE;
++ return true;
+ }
+
+ // end byHand
+@@ -475,7 +475,7 @@
+ // begin byHand
+ SetIcon(wxICON(wxzphoto));
+
+- colorData.SetChooseFull(TRUE);
++ colorData.SetChooseFull(true);
+ for (int i = 0; i < 16; i++) {
+ wxColour color(i*16, i*16, i*16);
+ colorData.SetCustomColour(i, color);
+@@ -1166,7 +1166,7 @@
+ int width, height;
+ unsigned char *bare_bitmap =
+ zphoto_image_get_bitmap(filename.c_str(), &width, &height);
+- wxImage image = wxImage(width, height, bare_bitmap, FALSE);
++ wxImage image = wxImage(width, height, bare_bitmap, false);
+ return wxBitmap(image);
+ } else {
+ return wxBitmap(filename, wxBITMAP_TYPE_ANY);
+@@ -1434,7 +1434,7 @@
+
+ void wxZphotoFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+ {
+- Close(TRUE);
++ Close(true);
+ }
+
+ void wxZphotoFrame::OnClose(wxCloseEvent& event)
Index: zphoto.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/zphoto.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- zphoto.info 17 Jul 2005 09:24:49 -0000 1.5
+++ zphoto.info 26 Aug 2005 16:39:06 -0000 1.6
@@ -1,27 +1,37 @@
Info2: <<
-Package: zphoto-wx%type_pkg[wx]
-Description: GUI frontend for zphoto
+Package: zphoto%type_pkg[-gui]
+Description: Zooming photo album generator
Version: 1.2
-Revision: 10
+Revision: 11
GCC: 3.3
-Type: wx (gtk, mac)
+Type: -gui (. -wxgtk -wxmac)
License: LGPL
Maintainer: ASARI Takashi <[EMAIL PROTECTED]>
-BuildDepends: libiconv-dev, gettext-dev, gettext-bin, gettext-tools, ming
(>=0.2a), imlib2 (>=1.1.0), popt (>=1.6.3), freetype, wx%type_pkg[wx] (>=2.4.1)
-Depends: ming-shlibs (>=0.2a), imlib2-shlibs (>=1.1.0), popt-shlibs (>=1.6.3),
freetype-shlibs, wx%type_pkg[wx]-shlibs (>=2.4.1), zphoto (=%v-%r)
-Conflicts: (%type_raw[wx] = gtk) wxzphoto (<< 1.2-4)
-Replaces: (%type_raw[wx] = gtk) wxzphoto (<< 1.2-4)
+BuildDepends: libiconv-dev, gettext-dev, gettext-bin, gettext-tools, ming
(>=0.2a), imlib2 (>=1.1.0), popt (>=1.6.3), freetype, (%type_raw[-gui] =
-wxgtk) wxgtk (>=2.4.1), (%type_raw[-gui] = -wxmac) wxmac (>=2.4.1)
+Depends: ming-shlibs (>=0.2a), imlib2-shlibs (>=1.1.0), popt-shlibs (>=1.6.3),
freetype-shlibs, (%type_raw[-gui] = -wxgtk) wxgtk (>=2.4.1), (%type_raw[-gui] =
-wxmac) wxmac (>=2.4.1)
+Conflicts: wxzphoto (<< 1.2-4), (%type_raw[-gui] != .) zphoto,
(%type_raw[-gui] != -wxgtk) zphoto-wxgtk, (%type_raw[-gui] != -wxmac)
zphoto-wxmac
+Replaces: wxzphoto (<< 1.2-4), (%type_raw[-gui] != .) zphoto, (%type_raw[-gui]
!= -wxgtk) zphoto-wxgtk, (%type_raw[-gui] != -wxmac) zphoto-wxmac
+Provides: (%type_raw[-gui] != .) zphoto
Source: http://namazu.org/~satoru/zphoto/zphoto-%v.tar.gz
Source-MD5: 636a9cffec9131043e29c1f5812a6c3c
Patch: zphoto.patch
+CompileScript: <<
+ #!/bin/sh -ev
+ case "x%type_raw[-gui]" in
+ x.) args="--disable-wx";;
+ x-wxgtk|x-wxmac) args="--with-wx-config=%p/bin/wx-config";;
+ esac
+ ./configure %c $args
+ make
+<<
InstallScript: <<
#!/bin/sh -ev
%{default_script}
- if [ "%type_raw[wx]" == "mac" ]; then
+ if [ "x%type_raw[-gui]" = "x-wxmac" ]; then
/bin/mkdir -p %i/Applications/Zphoto.app/Contents/MacOS
/bin/mv %I/bin/wxzphoto %i/Applications/Zphoto.app/Contents/MacOS/Zphoto
/bin/mkdir -p %i/Applications/Zphoto.app/Contents/Resources
@@ -32,20 +42,12 @@
<<
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
PostInstScript: <<
- #!/bin/sh -ev
- if [ "%type_raw[wx]" == "mac" ]; then
+ if [ "x%type_raw[-gui]" = "x-wxmac" ]; then
/usr/bin/install -m 775 -d /Applications/Fink
/bin/ln -fs %p/Applications/Zphoto.app /Applications/Fink/Zphoto.app
fi
<<
-PreRmScript: [ "%type_raw[wx]" == "mac" ] && /bin/rm -f
/Applications/Fink/Zphoto.app
-
-SplitOff: <<
- Package: zphoto
- Description: Zooming photo album generator
- Files: %p/bin/zphoto %p/share
- DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
-<<
+PreRmScript: [ "x%type_raw[-gui]" = "x-wxmac" ] && /bin/rm -f
/Applications/Fink/Zphoto.app
DescDetail: <<
zphoto is a zooming photo album generator.
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
