Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8627/utils
Modified Files:
jpilot.info jpilot.patch
Log Message:
Update jpilot for pilot-link10
Index: jpilot.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/jpilot.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jpilot.patch 2 Jan 2006 23:52:28 -0000 1.2
+++ jpilot.patch 3 Sep 2006 23:11:38 -0000 1.3
@@ -1,54 +1,33 @@
-diff -ruN jpilot-0.99.8.orig/jpilot-sync.c jpilot-0.99.8/jpilot-sync.c
---- jpilot-0.99.8.orig/jpilot-sync.c 2005-11-17 16:11:55.000000000 -0500
-+++ jpilot-0.99.8/jpilot-sync.c 2005-11-17 20:52:13.000000000 -0500
-@@ -44,6 +44,7 @@
- pid_t glob_child_pid;
- GtkWidget *glob_dialog;
- pid_t glob_child_pid;
-+GtkTooltips *glob_tooltips;
-
- unsigned char skip_plugins;
-
---- jpilot-0.99.8.orig/jpilot.c 2005-11-18 11:34:14.000000000 -0500
-+++ jpilot-0.99.8/jpilot.c 2005-11-18 12:11:21.000000000 -0500
-@@ -1074,19 +1074,6 @@
- install_gui_and_size(window);
- }
-
--void get_main_menu(GtkWidget *window,
-- GtkWidget **menubar,
-- GList *plugin_list)
--/* Some of this code was copied from the gtk_tut.txt file */
--{
--#ifdef ENABLE_GTK2
--#define ICON(icon) "<StockItem>", icon
--#define ICON_XPM(icon, size) "<ImageItem>", get_inline_pixbuf_data(icon, size)
--#else
--#define ICON(icon) NULL
--#define ICON_XPM(icon, size) NULL
--#endif
--
- #ifdef ENABLE_GTK2
- #include <gdk-pixbuf/gdk-pixdata.h>
-
-@@ -1378,6 +1365,20 @@
- }
- #endif
+--- jpilot-0.99.9/jpilot.c 2006-06-09 16:42:57.000000000 -0400
++++ jpilot-0.99.9-patched/jpilot.c 2006-08-30 07:58:22.000000000 -0400
+@@ -2180,19 +2180,19 @@
-+void get_main_menu(GtkWidget *window,
-+ GtkWidget **menubar,
-+ GList *plugin_list)
-+/* Some of this code was copied from the gtk_tut.txt file */
-+{
-+#ifdef ENABLE_GTK2
-+#define ICON(icon) "<StockItem>", icon
-+#define ICON_XPM(icon, size) "<ImageItem>", get_inline_pixbuf_data(icon, size)
-+#else
-+#define ICON(icon) NULL
-+#define ICON_XPM(icon, size) NULL
-+#endif
-+
-+
- GtkItemFactoryEntry menu_items1[]={
- { _("/_File"), NULL, NULL, 0,
"<Branch>" },
- { _("/File/tear"), NULL, NULL, 0,
"<Tearoff>" },
+ /* Extract first day of week preference from locale in GTK2 */
+ # ifdef ENABLE_GTK2
+-# ifdef HAVE_LANGINFO_H
+- /* GTK 2.8 libraries */
+- week_start = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
+- pref_fdow = *((unsigned char *) week_start) - 1;
+-# else
+- /* GTK 2.6 libraries */
++ /* # ifdef HAVE_LANGINFO_H
++ /* GTK 2.8 libraries
++ week_start = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
++ pref_fdow = *((unsigned char *) week_start) - 1;
++ # else */
++ /* GTK 2.6 libraries */
+ # if defined(ENABLE_NLS)
+- week_start = dgettext("gtk20", "calendar:week_start:0");
+- if (strncmp("calendar:week_start:", week_start, 20) == 0) {
+- pref_fdow = *(week_start + 20) - '0';
+- }
++ week_start = dgettext("gtk20", "calendar:week_start:0");
++ if (strncmp("calendar:week_start:", week_start, 20) == 0) {
++ pref_fdow = *(week_start + 20) - '0';
++ }
+ # endif
+-# endif
++ /* # endif */
+ if (pref_fdow > 1)
+ pref_fdow = 1;
+ if (pref_fdow < 0)
Index: jpilot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/jpilot.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- jpilot.info 19 Mar 2006 23:16:59 -0000 1.10
+++ jpilot.info 3 Sep 2006 23:11:38 -0000 1.11
@@ -1,14 +1,28 @@
Package: jpilot
-Version: 0.99.8
-Revision: 2
+Version: 0.99.9
+Revision: 1
###
-Depends: x11, x11-shlibs, atk1-shlibs, pango1-xft2-shlibs, readline5-shlibs,
gtk+2-shlibs, glib2-shlibs, pilot-link9-shlibs, pilot-link9-bin, libiconv,
libgettext3-shlibs
-BuildDepends: atk1, pango1-xft2-dev, pilot-link9, gtk+2-dev, glib2-dev,
readline5, pkgconfig, libiconv-dev, libgettext3-dev, system-openssl-dev,
intltool
-Replaces: jpilot0, jpilot, jpilot-ssl0, jpilot-ssl-shlibs, jpilot-shlibs,
jpilot-ssl (<= 0.99.7 )
-Conflicts: jpilot0, jpilot, jpilot-ssl0, jpilot-ssl-shlibs, jpilot-shlibs,
jpilot-ssl ( <= 0.99.7 )
+Depends: <<
+x11, x11-shlibs, atk1-shlibs, pango1-xft2-shlibs,
+readline5-shlibs, gtk+2-shlibs ( <= 2.6.999-1999 ) , glib2-shlibs,
+pilot-link10-shlibs, libiconv, libgettext3-shlibs
+<<
+BuildDepends: <<
+atk1, pango1-xft2-dev, pilot-link10, gtk+2-dev ( <= 2.6.999-1999 ) ,
glib2-dev,
+readline5, pkgconfig, libiconv-dev, libgettext3-dev,
+system-openssl-dev, intltool
+<<
+Replaces: <<
+jpilot0, jpilot, jpilot-ssl0, jpilot-ssl-shlibs, jpilot-shlibs,
+jpilot-ssl ( <= 0.99.7 )
+<<
+Conflicts: <<
+jpilot0, jpilot, jpilot-ssl0, jpilot-ssl-shlibs, jpilot-shlibs,
+jpilot-ssl ( <= 0.99.7 )
+<<
###
Source: http://jpilot.org/jpilot-%v.tar.gz
-Source-MD5: 4bdb200367e691e64d02bd6dfcdec604
+Source-MD5: c39df29aeed57b84a674524856ebc290
###
Patch: %n.patch
PatchScript: <<
@@ -16,20 +30,21 @@
perl -pi.bak -e 's,libexpense_la_LIBADD =,libexpense_la_LIBADD = -module
-avoid-version,g' Expense/Makefile.in
perl -pi.bak -e 's,libkeyring_la_LIBADD =,libkeyring_la_LIBADD = -module
-avoid-version,g' KeyRing/Makefile.in
perl -pi.bak -e 's,libsynctime_la_LIBADD =,libsynctime_la_LIBADD = -module
-avoid-version,g' SyncTime/Makefile.in
- ### fix relink
- # This has apparently been fixed upstream but leaeve the comment just
- # in case
-# perl -pi.bak -e 's,need_relink=yes,need_relink=no,g' ltmain.sh
<<
###
-DocFiles: ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO
UPGRADING
+DocFiles: ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO
###
-
SetCPPFLAGS: -I%p/lib/system-openssl/include
SetLDFLAGS: -L%p/lib/system-openssl/lib
-ConfigureParams: --with-ssl=%p/lib/system-openssl --with-libintl-prefix=%p
--with-libiconv-prefix=%p --enable-gtk2 --with-pilot-prefix=%p --with-pic
--enable-shared --enable-static --mandir=%p/share/man --infodir=%p/share/info
--libexecdir=%p/lib --disable-dependency-tracking
+ConfigureParams: <<
+--with-ssl=%p/lib/system-openssl --with-libintl-prefix=%p \
+--with-libiconv-prefix=%p --with-gtk-prefix=%p --with-gtk-exec-prefix=%p \
+--with-pilot-prefix=%p/lib/pilot-link10 --with-pic --enable-shared \
+--enable-static --mandir=%p/share/man --infodir=%p/share/info \
+--libexecdir=%p/lib --disable-dependency-tracking
+<<
###
InstallScript: <<
make install DESTDIR=%d
@@ -46,21 +61,21 @@
J-Pilot is a full-featured desktop organizer application for the Palm Pilot
that runs under Linux and UNIX. It includes support for datebooks,
addresses, memos, todos, expenses, and has plugin support. It uses the
- GTK+ libraries.
-<<
+ GTK+2 libraries.
+ J-Pilot uses the pilot-link libraries and executables.
+ <<
DescUsage: <<
-Until a fink pilot-link package based on the upstream prerelease 0.12 tree is
-made, using jpilot to connect to a USB device requires installation of the
-USB-TCP bridge from http://osx-palm-tools.sourceforge.net/ .
+ If you are using a USB Palm device, you will need to set the Serial port
+ field under Preferences -> Settings to "usb:" (without the quotes)
<<
DescPort: <<
The KeyRing, Expense, and SyncTime plugins apparently have to be built as .so
files to be useable, hence the PatchScript.
-Extracted a nested function to keep Apple's gcc4.0.1 happy.
+Patch out a condition that was supposed to be applied for GTK+ > 2.8 but
somehow
+showed up as true for GTK+-2.6--hence the reason for the maximum gtk+2
allowable.
<<
DescPackaging: <<
-The .patch file contains an upstream patch:
-"Patch to fix unresolved symbol glob_tooltips when using jpilot-sync"
+Uses system's OpenSSL.
<<
###
License: GPL
-------------------------------------------------------------------------
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
