Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3369/main/finkinfo/utils
Modified Files:
Tag: pangocairo-branch
jpilot.info jpilot.patch
Log Message:
more buildfink fixes
Index: jpilot.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/jpilot.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- jpilot.patch 2 Sep 2006 14:52:37 -0000 1.2
+++ jpilot.patch 6 Feb 2007 17:21:35 -0000 1.2.2.1
@@ -1,33 +1,72 @@
+diff -uNr jpilot-0.99.9/jpilot.c jpilot-0.99.9-new/jpilot.c
--- 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 @@
++++ jpilot-0.99.9-new/jpilot.c 2007-02-06 12:19:24.000000000 -0500
+@@ -2180,7 +2180,7 @@
/* 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)
++# if defined(HAVE_LANGINFO_H) && defined(_NL_TIME_FIRST_WEEKDAY)
+ /* GTK 2.8 libraries */
+ week_start = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
+ pref_fdow = *((unsigned char *) week_start) - 1;
+diff -uNr jpilot-0.99.9/plugins.c jpilot-0.99.9-new/plugins.c
+--- jpilot-0.99.9/plugins.c 2005-05-08 11:57:31.000000000 -0400
++++ jpilot-0.99.9-new/plugins.c 2007-02-06 12:19:43.000000000 -0500
+@@ -22,6 +22,7 @@
+
+ #include "config.h"
+ #ifdef ENABLE_PLUGINS
++#include <sys/types.h>
+ #include <dirent.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -81,6 +82,8 @@
+ struct dirent *dirent;
+ char full_name[FILENAME_MAX];
+ struct plugin_s temp_plugin, *new_plugin;
++ GList *plugin_names = NULL; /* keep a list of plugins found so far */
++ GList *temp_list = NULL;
+
+ count = 0;
+ for (i=0; (dirent = readdir(dir)); i++) {
+@@ -90,7 +93,8 @@
+ }
+ /* If the filename has either of these extensions then plug it in */
+ if ((strcmp(&(dirent->d_name[strlen(dirent->d_name)-3]), ".so")) &&
+- (strcmp(&(dirent->d_name[strlen(dirent->d_name)-3]), ".sl"))) {
++ (strcmp(&(dirent->d_name[strlen(dirent->d_name)-3]), ".sl")) &&
++ (strcmp(&(dirent->d_name[strlen(dirent->d_name)-6]), ".dylib"))) {
+ continue;
+ } else {
+ jp_logf(JP_LOG_DEBUG, "found plugin %s\n", dirent->d_name);
+@@ -103,6 +107,7 @@
+ if (temp_plugin.name) {
+ jp_logf(JP_LOG_DEBUG, "plugin name is [%s]\n", temp_plugin.name);
+ }
++ if (g_list_find_custom(plugin_names, temp_plugin.name,
(GCompareFunc)strcmp) == NULL) {
+ new_plugin = malloc(sizeof(struct plugin_s));
+ if (!new_plugin) {
+ jp_logf(JP_LOG_WARN, "load plugins(): %s\n", _("Out of memory"));
+@@ -113,13 +118,21 @@
+ * we want to avoid that slowness, prepend works for that
+ * in this case since we have the head */
+ plugins = g_list_prepend(plugins, new_plugin);
++ plugin_names = g_list_prepend(plugin_names,
g_strdup(temp_plugin.name));
+ count++;
+ (*number)++;
+ }
+ }
++ }
+ }
+
+ plugins = g_list_sort(plugins, plugin_sort);
++ for (temp_list = plugin_names; temp_list; temp_list = temp_list->next) {
++ if (temp_list->data) {
++ g_free(temp_list->data);
++ }
++ }
++ g_list_free(plugin_names);
+
+ return count;
+ }
Index: jpilot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/jpilot.info,v
retrieving revision 1.7.2.8
retrieving revision 1.7.2.9
diff -u -d -r1.7.2.8 -r1.7.2.9
--- jpilot.info 5 Feb 2007 19:13:23 -0000 1.7.2.8
+++ jpilot.info 6 Feb 2007 17:21:34 -0000 1.7.2.9
@@ -25,6 +25,7 @@
Source: http://jpilot.org/jpilot-%v.tar.gz
Source-MD5: c39df29aeed57b84a674524856ebc290
###
+Patch: %n.patch
PatchScript: <<
### Fix plugins
perl -pi.bak -e 's,libexpense_la_LIBADD =,libexpense_la_LIBADD = -module
-avoid-version,g' Expense/Makefile.in
-------------------------------------------------------------------------
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
