cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to jpilot-0.99.2

Browse Source 
Thanks to the author who accepted most patches in this release.
This commit is contained in:
pvalchev 2002-02-18 23:47:23 +00:00
parent b6be8f0ea1
commit 5accf6a94f
13 changed files with 43 additions and 408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
comms/jpilot/patches/patch-m4_gettext_m4 Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-m4_gettext_m4,v 1.1 2002/02/18 23:47:23 pvalchev Exp $
--- m4/gettext.m4.orig Thu Dec 20 22:02:52 2001
+++ m4/gettext.m4 Mon Feb 18 12:53:59 2002
@@ -46,10 +46,9 @@ AC_DEFUN(AM_WITH_NLS,
if test "$gt_cv_func_gettext_libc" != "yes"; then
AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CACHE_CHECK([for gettext in libintl],
- gt_cv_func_gettext_libintl,
+ [AC_CACHE_VAL(gt_cv_func_gettext_libintl,
[AC_CHECK_LIB(intl, gettext,
- gt_cv_func_gettext_libintl=yes,
+ [gt_cv_func_gettext_libintl=yes; LIBS="$LIBS -lintl"],
gt_cv_func_gettext_libintl=no)],
gt_cv_func_gettext_libintl=no)])
fi

85
comms/jpilot/patches/patch-memo_c
View File

@ -1,85 +0,0 @@
$OpenBSD: patch-memo_c,v 1.1.1.1 2001/05/29 00:54:46 pvalchev Exp $
--- memo.c.orig Wed Jan 31 09:18:15 2001
+++ memo.c Sun May 27 17:12:01 2001
@@ -32,10 +32,6 @@
#include "libplugin.h"
#include "password.h"
-#include "japanese.h"
-#include "cp1250.h"
-#include "russian.h"
-
#define MEMO_EOF 7
int memo_compare(const void *v1, const void *v2)
@@ -133,6 +129,12 @@ int pc_memo_write(struct Memo *memo, PCR
char record[65536];
int rec_len;
buf_rec br;
+ long char_set;
+
+ get_pref(PREF_CHAR_SET, &char_set, NULL);
+ if (char_set != CHAR_SET_ENGLISH) {
+ if (memo->text) charset_j2p(memo->text, strlen(memo->text)+1, char_set);
+ }
rec_len = pack_Memo(memo, record, 65535);
if (!rec_len) {
@@ -165,7 +167,7 @@ void free_MemoList(MemoList **memo)
int get_memo_app_info(struct MemoAppInfo *ai)
{
- int num;
+ int num,i;
unsigned int rec_size;
unsigned char *buf;
long char_set;
@@ -183,18 +185,12 @@ int get_memo_app_info(struct MemoAppInfo
}
get_pref(PREF_CHAR_SET, &char_set, NULL);
- if (char_set==CHAR_SET_JAPANESE ||
- char_set==CHAR_SET_1250 ||
- char_set==CHAR_SET_1251 ||
- char_set==CHAR_SET_1251_B) {
- int i;
- for (i = 0; i < 16; i++)
- if (ai->category.name[i][0] != '\0') {
- if (char_set==CHAR_SET_JAPANESE) Sjis2Euc(ai->category.name[i], 16);
- if (char_set==CHAR_SET_1250) Win2Lat(ai->category.name[i], 16);
- if (char_set==CHAR_SET_1251) win1251_to_koi8(ai->category.name[i], 16);
- if (char_set==CHAR_SET_1251_B) koi8_to_win1251(ai->category.name[i], 16);
- }
+ if (char_set != CHAR_SET_ENGLISH) {
+ for (i = 0; i < 16; i++) {
+ if (ai->category.name[i][0] != '\0') {
+ charset_p2j(ai->category.name[i], 16, char_set);
+ }
+ }
}
return 0;
@@ -218,8 +214,8 @@ int get_memos2(MemoList **memo_list, int
MemoList *temp_memo_list;
long keep_modified, keep_deleted;
int keep_priv;
- long char_set;
buf_rec *br;
+ long char_set;
jpilot_logf(LOG_DEBUG, "get_memos2()\n");
if (modified==2) {
@@ -274,12 +270,8 @@ int get_memos2(MemoList **memo_list, int
if ( ((br->attrib & 0x0F) != category) && category != CATEGORY_ALL) {
continue;
}
-
get_pref(PREF_CHAR_SET, &char_set, NULL);
- if (char_set==CHAR_SET_JAPANESE) Sjis2Euc(memo.text, 65536);
- if (char_set==CHAR_SET_1250) Win2Lat(memo.text, 65536);
- if (char_set==CHAR_SET_1251) win1251_to_koi8(memo.text, 65536);
- if (char_set==CHAR_SET_1251_B) koi8_to_win1251(memo.text, 65536);
+ if (memo.text) charset_p2j(memo.text, strlen(memo.text)+1, char_set);
temp_memo_list = malloc(sizeof(MemoList));
if (!temp_memo_list) {

21
comms/jpilot/patches/patch-plugins.c
View File

@ -1,21 +0,0 @@
--- plugins.c.orig Mon Feb 5 14:31:57 2001
+++ plugins.c Sun May 27 17:50:15 2001
@@ -231,7 +231,7 @@ static int get_plugin_info(struct plugin
p->plugin_post_sync = NULL;
p->plugin_exit_cleanup = NULL;
- h = dlopen(path, RTLD_NOW);
+ h = dlopen(path, DL_LAZY);
if (!h) {
jpilot_logf(LOG_WARN, "open failed on plugin [%s]\n error [%s]\n", path,
dlerror());
@@ -243,6 +243,9 @@ static int get_plugin_info(struct plugin
p->full_path = strdup(path);
/* plugin_versionM */
+#if defined __OpenBSD__ && !defined __ELF__
+#define dlsym(x,y) dlsym(x, "_" y)
+#endif
plugin_versionM = dlsym(h, "plugin_version");
if (plugin_versionM==NULL) {
err = dlerror();

17
comms/jpilot/patches/patch-po_Makefile_in_in
View File

@ -1,12 +1,17 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.1.1.1 2001/05/29 00:54:44 pvalchev Exp $
--- po/Makefile.in.in.orig Sun May 27 17:16:08 2001
+++ po/Makefile.in.in Sun May 27 17:16:19 2001
@@ -16,7 +16,7 @@ srcdir = @srcdir@
$OpenBSD: patch-po_Makefile_in_in,v 1.2 2002/02/18 23:47:23 pvalchev Exp $
--- po/Makefile.in.in.orig Fri Jan 11 17:01:12 2002
+++ po/Makefile.in.in Mon Feb 18 15:16:39 2002
@@ -16,11 +16,10 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-#prefix = ${PREFIX}
-prefix=@prefix@
+prefix = ${PREFIX}
exec_prefix = @exec_prefix@
datadir = $(prefix)/@DATADIRNAME@
localedir = $(datadir)/locale
-localedir = $(datadir)/locale
+localedir = $(prefix)/share/locale
gnulocaledir = $(prefix)/share/locale
gettextsrcdir = $(prefix)/share/gettext/po
subdir = po

12
comms/jpilot/patches/patch-po_ca_po
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-po_ca_po,v 1.1 2001/06/03 17:45:01 pvalchev Exp $
--- po/ca.po.orig Sun Feb 4 16:17:36 2001
+++ po/ca.po Tue May 29 23:25:39 2001
@@ -8,7 +8,7 @@ msgstr ""
"Last-Translator: Leopold Palomo <lepalom@wol.es>\n"
"Language-Team: catalan <docsterms@caliu.upc.es>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO 8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.6\n"

14
comms/jpilot/patches/patch-po_ja_po
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-po_ja_po,v 1.1 2001/06/03 17:45:01 pvalchev Exp $
--- po/ja.po.orig Sun Feb 4 16:32:09 2001
+++ po/ja.po Tue May 29 23:25:39 2001
@@ -10,8 +10,8 @@ msgstr ""
"Last-Translator: Hiroshi Miura <miura@da-cha.org>\n"
"Language-Team: Japanese Palm-UNIX ML <palm-unix-j@list.daionet.gr.jp>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ja_JP\n"
-"Content-Transfer-Encoding: euc-jp\n"
+"Content-Type: text/plain; charset=euc-jp\n"
+"Content-Transfer-Encoding: 8bit\n"
#: ../address.c:233 ../datebook.c:212 ../memo.c:140 ../todo.c:248
msgid "error"

128
comms/jpilot/patches/patch-sync_c
View File

@ -1,128 +0,0 @@
$OpenBSD: patch-sync_c,v 1.1.1.1 2001/05/29 00:54:46 pvalchev Exp $
--- sync.c.orig Mon Feb 5 14:33:14 2001
+++ sync.c Sun May 27 17:12:01 2001
@@ -104,10 +104,6 @@ int pdb_file_read_record_by_id(char *DB_
int pdb_file_delete_record_by_id(char *DB_name, pi_uid_t uid_in);
-
-void recode_packed_record(char *DB_name, void *record, int rec_len, long char_seet);
-
-
void sig_handler(int sig)
{
jpilot_logf(LOG_DEBUG, "caught signal SIGCHLD\n");
@@ -631,10 +627,8 @@ int jpilot_sync(struct my_sync_info *syn
return 0;
}
get_pref(PREF_CHAR_SET, &char_set, NULL);
- if (char_set == CHAR_SET_JAPANESE) Euc2Sjis(buf, 1023);
- if (char_set == CHAR_SET_1250) Lat2Win(buf, 1023);
- if (char_set == CHAR_SET_1251) koi8_to_win1251(buf, 1023);
- if (char_set == CHAR_SET_1251_B) win1251_to_koi8(buf, 1023);
+ charset_j2p(buf,1023,char_set);
+
dlp_AddSyncLogEntry(sd, buf);
dlp_AddSyncLogEntry(sd, "\n\r");
@@ -760,15 +754,6 @@ int slow_sync_application(char *DB_name,
}
}
- get_pref(PREF_CHAR_SET, &char_set, NULL);
- if (char_set==CHAR_SET_JAPANESE ||
- char_set==CHAR_SET_1250 ||
- char_set==CHAR_SET_1251 ||
- char_set==CHAR_SET_1251_B
- ) {
- recode_packed_record(DB_name, record, rec_len, char_set);
- }
-
ret = dlp_WriteRecord(sd, db, header.attrib & dlpRecAttrSecret,
0, header.attrib & 0x0F,
record, rec_len, &new_id);
@@ -1479,61 +1464,6 @@ static int sync_rotate_backups(const int
return 0;
}
-void recode_packed_record(char *DB_name, void *record, int rec_len, long char_set)
-{
- /*todo move this to before the record is written out?*/
- /* Convert to SJIS Japanese Kanji code (Palm use this code) */
- /* or convert to different encoding */
- /*Write the record to the Palm Pilot */
- if (!strcmp(DB_name, "DatebookDB")) {
- struct Appointment a;
- unpack_Appointment(&a, record, rec_len);
- if (char_set == CHAR_SET_JAPANESE) Euc2Sjis(a.description, 65536);
- if (char_set == CHAR_SET_1250) Lat2Win(a.description, 65536);
- if (char_set == CHAR_SET_1251) koi8_to_win1251(a.description, 65536);
- if (char_set == CHAR_SET_1251_B) win1251_to_koi8(a.description, 65536);
- if (char_set == CHAR_SET_JAPANESE) Euc2Sjis(a.note, 65536);
- if (char_set == CHAR_SET_1250) Lat2Win(a.note, 65536);
- if (char_set == CHAR_SET_1251) koi8_to_win1251(a.note, 65536);
- if (char_set == CHAR_SET_1251_B) win1251_to_koi8(a.note, 65536);
- rec_len = pack_Appointment(&a, record, 65535);
- }
- if (!strcmp(DB_name, "AddressDB")) {
- struct Address a;
- int i;
- unpack_Address(&a, record, rec_len);
- for (i = 0; i < 19; i++) {
- if (char_set == CHAR_SET_JAPANESE) Euc2Sjis(a.entry[i], 65536);
- if (char_set == CHAR_SET_1250) Lat2Win(a.entry[i], 65536);
- if (char_set == CHAR_SET_1251) koi8_to_win1251(a.entry[i], 65536);
- if (char_set == CHAR_SET_1251_B) win1251_to_koi8(a.entry[i], 65536);
- }
- rec_len = pack_Address(&a, record, 65535);
- }
- if (!strcmp(DB_name, "ToDoDB")) {
- struct ToDo t;
- unpack_ToDo(&t, record, rec_len);
- if (char_set == CHAR_SET_JAPANESE) Euc2Sjis(t.description, 65536);
- if (char_set == CHAR_SET_1250) Lat2Win(t.description, 65536);
- if (char_set == CHAR_SET_1251) koi8_to_win1251(t.description, 65536);
- if (char_set == CHAR_SET_1251_B) win1251_to_koi8(t.description, 65536);
- if (char_set == CHAR_SET_JAPANESE) Euc2Sjis(t.note, 65536);
- if (char_set == CHAR_SET_1250) Lat2Win(t.note, 65536);
- if (char_set == CHAR_SET_1251) koi8_to_win1251(t.note, 65536);
- if (char_set == CHAR_SET_1251_B) win1251_to_koi8(t.note, 65536);
- rec_len = pack_ToDo(&t, record, 65535);
- }
- if (!strcmp(DB_name, "MemoDB")) {
- struct Memo m;
- unpack_Memo(&m, record, rec_len);
- if (char_set == CHAR_SET_JAPANESE) Euc2Sjis(m.text, 65536);
- if (char_set == CHAR_SET_1250) Lat2Win(m.text, 65536);
- if (char_set == CHAR_SET_1251) koi8_to_win1251(m.text, 65536);
- if (char_set == CHAR_SET_1251_B) win1251_to_koi8(m.text, 65536);
- rec_len = pack_Memo(&m, record, 65535);
- }
-}
-
int fast_sync_local_recs(char *DB_name, int sd, int db)
{
unsigned long new_id;
@@ -1551,7 +1481,6 @@ int fast_sync_local_recs(char *DB_name,
char error_log_message_d[256];
char delete_log_message[256];
int index, size, attr, category;
- long char_set;
jpilot_logf(LOG_DEBUG, "fast_sync_local_recs\n");
@@ -1609,14 +1538,6 @@ int fast_sync_local_recs(char *DB_name,
if (ferror(pc_in)) {
break;
}
- }
- get_pref(PREF_CHAR_SET, &char_set, NULL);
- if (char_set==CHAR_SET_JAPANESE ||
- char_set==CHAR_SET_1250 ||
- char_set==CHAR_SET_1251 ||
- char_set==CHAR_SET_1251_B
- ) {
- recode_packed_record(DB_name, record, rec_len, char_set);
}
jpilot_logf(LOG_DEBUG, "Writing PC record to palm\n");

28
comms/jpilot/patches/patch-todo_c
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-todo_c,v 1.1.1.1 2001/05/29 00:54:46 pvalchev Exp $
--- todo.c.orig Mon Feb 5 14:33:42 2001
+++ todo.c Sun May 27 17:12:01 2001
@@ -30,10 +30,6 @@
#include "libplugin.h"
#include "password.h"
-#include "japanese.h"
-#include "cp1250.h"
-#include "russian.h"
-
#define TODO_EOF 7
static struct ToDoAppInfo *glob_Ptodo_app_info;
@@ -240,6 +236,13 @@ int pc_todo_write(struct ToDo *todo, PCR
char record[65536];
int rec_len;
buf_rec br;
+ long char_set;
+
+ get_pref(PREF_CHAR_SET, &char_set, NULL);
+ if (char_set != CHAR_SET_ENGLISH) {
+ if (todo->description) charset_j2p(todo->description, strlen(todo->description)+1, char_set);
+ if (todo->note) charset_j2p(todo->note, strlen(todo->note)+1, char_set);
+ }
rec_len = pack_ToDo(todo, record, 65535);
if (!rec_len) {

20
comms/jpilot/patches/patch-todo_gui_c
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-todo_gui_c,v 1.1.1.1 2001/05/29 00:54:46 pvalchev Exp $
--- todo_gui.c.orig Mon Feb 5 14:33:52 2001
+++ todo_gui.c Sun May 27 17:12:01 2001
@@ -425,12 +425,16 @@ int todo_get_details(struct ToDo *new_to
/*it will show it though. I allow it. */
new_todo->description = gtk_editable_get_chars
(GTK_EDITABLE(todo_text), 0, -1);
+/* charset_j2p(new_todo->description, 65536); */
new_todo->note = gtk_editable_get_chars
(GTK_EDITABLE(todo_text_note), 0, -1);
if (new_todo->note[0]=='\0') {
free(new_todo->note);
new_todo->note=NULL;
}
+/* else {
+ charset_j2p(new_todo->note, 65536);
+ }*/
for (i=0; i<NUM_TODO_CAT_ITEMS; i++) {
if (GTK_IS_WIDGET(todo_cat_menu_item2[i])) {

69
comms/jpilot/patches/patch-utils_c
View File

@ -1,69 +0,0 @@
$OpenBSD: patch-utils_c,v 1.1.1.1 2001/05/29 00:54:46 pvalchev Exp $
--- utils.c.orig Mon Feb 5 14:34:06 2001
+++ utils.c Sun May 27 17:12:01 2001
@@ -39,6 +39,9 @@
#include "plugins.h"
#include "libplugin.h"
+#include "japanese.h"
+#include "cp1250.h"
+#include "russian.h"
#include <pi-source.h>
#include <pi-socket.h>
@@ -1972,7 +1975,7 @@ void multibyte_safe_strncpy(char *dst, c
char *p, *q;
int n = 0;
p = src; q = dst;
- while ((*p) && n < (max_len-1)) {
+ while ((*p) && n < (max_len-2)) {
if ((*p) & 0x80) {
*q++ = *p++;
n++;
@@ -1985,11 +1988,10 @@ void multibyte_safe_strncpy(char *dst, c
n++;
}
}
- if ((*p & 0x80 ) && (n < max_len)) {
- *q = *p;
- } else {
- *q = '\0';
- }
+ if (!(*p & 0x80 ) && (n < max_len-1))
+ *q++ = *p++;
+
+ *q = '\0';
} else {
strncpy(dst, src, max_len);
}
@@ -2013,7 +2015,7 @@ char *multibyte_safe_memccpy(char *dst,
int n = 0;
p = (char *)src; q = dst;
- while ((*p) && (n < (len -1))) {
+ while ((*p) && (n < (len -2))) {
if ((*p) & 0x80) {
*q++ = *p++;
n++;
@@ -2024,15 +2026,15 @@ char *multibyte_safe_memccpy(char *dst,
} else {
*q++ = *p++;
n++;
+ if (*(p-1) == (char)(c & 0xff)) return q;
}
- if (*(p-1) == (char)(c & 0xff)) return q;
- }
- if ((*p & 0x80) && (n < len)) {
- *q = *p;
- } else {
- *q = '\0';
}
+ if (!(*p & 0x80) && (n < len-1))
+ *q++ = *p++;
+
+ *q = '\0';
return NULL;
} else
return memccpy(dst, src, c, len);
}
+

22
comms/jpilot/patches/patch-utils_h
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-utils_h,v 1.1.1.1 2001/05/29 00:54:46 pvalchev Exp $
--- utils.h.orig Mon Feb 5 14:24:29 2001
+++ utils.h Sun May 27 17:12:01 2001
@@ -304,3 +304,18 @@ void weekview_gui(struct tm *date_in);
void multibyte_safe_strncpy(char *dst, char *src, size_t max_len);
char *multibyte_safe_memccpy(char *dst, const char *src, int c, size_t len);
+
+/*************************************
+ * convert char code
+ *************************************/
+#define charset_j2p(buf, max_len, char_set) {\
+ if (char_set == CHAR_SET_JAPANESE) Euc2Sjis(buf, max_len);\
+ if (char_set == CHAR_SET_1250) Lat2Win(buf,max_len);\
+ if (char_set == CHAR_SET_1251) koi8_to_win1251(buf, max_len);\
+ if (char_set == CHAR_SET_1251_B) win1251_to_koi8(buf, max_len);}
+#define charset_p2j(buf, max_len, char_set) {\
+ if (char_set == CHAR_SET_JAPANESE) Sjis2Euc(buf, max_len);\
+ if (char_set == CHAR_SET_1250) Win2Lat(buf,max_len);\
+ if (char_set == CHAR_SET_1251) win1251_to_koi8(buf, max_len);\
+ if (char_set == CHAR_SET_1251_B) koi8_to_win1251(buf, max_len);}
+

3
comms/jpilot/pkg/PFRAG.shared
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2001/05/29 01:00:47 pvalchev Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2002/02/18 23:47:23 pvalchev Exp $
lib/jpilot/plugins/libexpense.so
lib/jpilot/plugins/libkeyring.so
lib/jpilot/plugins/libsynctime.so

16
comms/jpilot/pkg/PLIST
View File

@ -1,14 +1,25 @@
@comment $OpenBSD: PLIST,v 1.3 2001/06/03 17:45:01 pvalchev Exp $
@comment $OpenBSD: PLIST,v 1.4 2002/02/18 23:47:23 pvalchev Exp $
bin/jpilot
bin/jpilot-dump
bin/jpilot-sync
bin/jpilot-upgrade-99
%%SHARED%%
man/man1/jpilot-sync.1
man/man1/jpilot-upgrade-99.1
man/man1/jpilot.1
share/doc/jpilot/manual.html
share/doc/jpilot/plugin.html
share/jpilot/AddressDB.pdb
share/jpilot/DatebookDB.pdb
share/jpilot/ExpenseDB.pdb
share/jpilot/Memo32DB.pdb
share/jpilot/MemoDB.pdb
share/jpilot/ToDoDB.pdb
share/jpilot/icons/README
share/jpilot/icons/jpilot-icon1.xpm
share/jpilot/icons/jpilot-icon2.xpm
share/jpilot/icons/jpilot-icon3.xpm
share/jpilot/icons/jpilot-icon4.xpm
share/jpilot/jpilotrc.blue
share/jpilot/jpilotrc.default
share/jpilot/jpilotrc.green
@ -20,11 +31,12 @@ share/locale/da/LC_MESSAGES/jpilot.mo
share/locale/de/LC_MESSAGES/jpilot.mo
share/locale/es/LC_MESSAGES/jpilot.mo
share/locale/fr/LC_MESSAGES/jpilot.mo
share/locale/it/LC_MESSAGES/jpilot.mo
share/locale/ja/LC_MESSAGES/jpilot.mo
share/locale/nl/LC_MESSAGES/jpilot.mo
share/locale/no/LC_MESSAGES/jpilot.mo
share/locale/sv/LC_MESSAGES/jpilot.mo
%%SHARED%%
@dirrm share/jpilot/icons
@dirrm share/jpilot
@dirrm share/doc/jpilot
@dirrm lib/jpilot/plugins