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

Update to jpilot-0.99.9.

Browse Source 
ok steven@
This commit is contained in:
ajacoutot 2006-10-20 11:49:42 +00:00
parent e65e8bb968
commit 7f8e85cc3f
10 changed files with 104 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
comms/jpilot/Makefile
View File

@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.36 2006/09/18 11:40:07 espie Exp $
# $OpenBSD: Makefile,v 1.37 2006/10/20 11:49:42 ajacoutot Exp $
COMMENT= "desktop organizer software for the palm pilot"
DISTNAME= jpilot-0.99.8
PKGNAME= ${DISTNAME}p3
DISTNAME= jpilot-0.99.9
CATEGORIES= comms palm
MASTER_SITES= ${HOMEPAGE}
HOMEPAGE= http://www.jpilot.org/
MAINTAINER= Antoine Jacoutot <ajacoutot@lphp.org>
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -18,14 +17,14 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c readline crypto m ncurses X11 Xext \
Xrender fontconfig freetype atk-1.0.>=800.0 \
gdk_pixbuf-2.0.>=400.14 glib-2.0.>=400.8 gmodule-2.0.>=400.8 \
gobject-2.0.>=400.8 pango-1.0.>=600.0 pangoft2-1.0.>=600.0 \
pangocairo-1.0 cairo glitz png z
WANTLIB= c crypto m X11 Xext Xrender fontconfig freetype png.>=5 \
atk-1.0.>=800.0 gdk_pixbuf-2.0.>=400.14 cairo glitz z \
glib-2.0.>=400.8 gmodule-2.0.>=400.8 pangocairo-1.0 \
gobject-2.0.>=400.8 pango-1.0.>=600.0 \
pangoft2-1.0.>=600.0
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
LIB_DEPENDS= pisock.>=8::comms/pilot-link \
LIB_DEPENDS= pisock.>=9::comms/pilot-link \
gtk-x11-2.0.>=400.13,gdk-x11-2.0.>=400.13,gdk_pixbuf-2.0.>=400.13::x11/gtk+2
MODULES= devel/gettext
@ -37,11 +36,10 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-gtk2 \
--with-pilot-prefix=${LOCALBASE} \
--with-gtk-prefix=${LOCALBASE}
MAN1= jpilot-dump.1 jpilot-sync.1 jpilot-upgrade-99.1 jpilot.1
MAN1= jpilot-dump.1 jpilot-sync.1 jpilot.1
pre-build:
.for i in ${MAN1}

8
comms/jpilot/distinfo
View File

@ -1,4 +1,4 @@
MD5 (jpilot-0.99.8.tar.gz) = 4bdb200367e691e64d02bd6dfcdec604
RMD160 (jpilot-0.99.8.tar.gz) = 9d19e41a8d73f1dbfc5107e0ee1657ac09b55189
SHA1 (jpilot-0.99.8.tar.gz) = 5ad7c15f4583a15afb7acd96db2c4e8e58311b29
SIZE (jpilot-0.99.8.tar.gz) = 1589217
MD5 (jpilot-0.99.9.tar.gz) = c39df29aeed57b84a674524856ebc290
RMD160 (jpilot-0.99.9.tar.gz) = 0286b9f9579dbbdb8e9bd207384561814bab5114
SHA1 (jpilot-0.99.9.tar.gz) = 19a76f8815188a1b7993fbff81624e852a3bbc5c
SIZE (jpilot-0.99.9.tar.gz) = 1671351

8
comms/jpilot/patches/patch-Expense_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Expense_Makefile_in,v 1.7 2005/10/31 21:08:15 naddy Exp $
--- Expense/Makefile.in.orig Mon Oct 31 19:48:02 2005
+++ Expense/Makefile.in Mon Oct 31 19:48:19 2005
@@ -247,7 +247,7 @@ target_alias = @target_alias@
$OpenBSD: patch-Expense_Makefile_in,v 1.8 2006/10/20 11:49:42 ajacoutot Exp $
--- Expense/Makefile.in.orig Thu Aug 24 01:22:09 2006
+++ Expense/Makefile.in Mon Aug 28 11:19:49 2006
@@ -248,7 +248,7 @@ target_alias = @target_alias@
@MAKE_EXPENSE_TRUE@lib_LTLIBRARIES = libexpense.la
@MAKE_EXPENSE_TRUE@libexpense_la_SOURCES = expense.c
@MAKE_EXPENSE_TRUE@libexpense_la_CFLAGS = -Wall @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)

8
comms/jpilot/patches/patch-KeyRing_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-KeyRing_Makefile_in,v 1.3 2005/10/31 21:08:15 naddy Exp $
--- KeyRing/Makefile.in.orig Mon Oct 31 19:47:32 2005
+++ KeyRing/Makefile.in Mon Oct 31 19:47:50 2005
@@ -248,7 +248,7 @@ EXTRA_DIST = README.txt
$OpenBSD: patch-KeyRing_Makefile_in,v 1.4 2006/10/20 11:49:42 ajacoutot Exp $
--- KeyRing/Makefile.in.orig Thu Aug 24 01:22:09 2006
+++ KeyRing/Makefile.in Mon Aug 28 11:19:49 2006
@@ -249,7 +249,7 @@ EXTRA_DIST = README.txt
@MAKE_KEYRING_TRUE@lib_LTLIBRARIES = libkeyring.la
@MAKE_KEYRING_TRUE@libkeyring_la_SOURCES = keyring.c
@MAKE_KEYRING_TRUE@libkeyring_la_CFLAGS = -Wall @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)

8
comms/jpilot/patches/patch-SyncTime_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-SyncTime_Makefile_in,v 1.7 2005/10/31 21:08:15 naddy Exp $
--- SyncTime/Makefile.in.orig Mon Oct 31 19:46:59 2005
+++ SyncTime/Makefile.in Mon Oct 31 19:47:17 2005
@@ -247,7 +247,7 @@ target_alias = @target_alias@
$OpenBSD: patch-SyncTime_Makefile_in,v 1.8 2006/10/20 11:49:42 ajacoutot Exp $
--- SyncTime/Makefile.in.orig Thu Aug 24 01:22:10 2006
+++ SyncTime/Makefile.in Mon Aug 28 11:19:49 2006
@@ -248,7 +248,7 @@ target_alias = @target_alias@
@MAKE_SYNCTIME_TRUE@lib_LTLIBRARIES = libsynctime.la
@MAKE_SYNCTIME_TRUE@libsynctime_la_SOURCES = synctime.c
@MAKE_SYNCTIME_TRUE@libsynctime_la_CFLAGS = -Wall @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)

8
comms/jpilot/patches/patch-docs_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-docs_Makefile_in,v 1.2 2005/10/31 21:08:15 naddy Exp $
--- docs/Makefile.in.orig Mon Oct 31 18:58:28 2005
+++ docs/Makefile.in Mon Oct 31 19:05:36 2005
@@ -231,7 +231,7 @@ target_alias = @target_alias@
$OpenBSD: patch-docs_Makefile_in,v 1.3 2006/10/20 11:49:42 ajacoutot Exp $
--- docs/Makefile.in.orig Thu Aug 24 01:22:10 2006
+++ docs/Makefile.in Mon Aug 28 11:19:49 2006
@@ -232,7 +232,7 @@ target_alias = @target_alias@
# install the man pages
man_MANS = jpilot.1 jpilot-dial.1 jpilot-sync.1 jpilot-dump.1

8
comms/jpilot/patches/patch-icons_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-icons_Makefile_in,v 1.2 2005/10/31 21:08:15 naddy Exp $
--- icons/Makefile.in.orig Mon Oct 31 19:27:50 2005
+++ icons/Makefile.in Mon Oct 31 19:28:04 2005
@@ -223,7 +223,7 @@ sbindir = @sbindir@
$OpenBSD: patch-icons_Makefile_in,v 1.3 2006/10/20 11:49:42 ajacoutot Exp $
--- icons/Makefile.in.orig Thu Aug 24 01:22:10 2006
+++ icons/Makefile.in Mon Aug 28 11:19:49 2006
@@ -224,7 +224,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@

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

@ -1,11 +0,0 @@
$OpenBSD: patch-jpilot-sync_c,v 1.1 2005/12/04 22:19:24 steven Exp $
--- jpilot-sync.c.orig Sun Dec 4 16:09:12 2005
+++ jpilot-sync.c Sun Dec 4 16:09:31 2005
@@ -44,6 +44,7 @@ int pipe_to_parent, pipe_from_parent;
pid_t glob_child_pid;
GtkWidget *glob_dialog;
pid_t glob_child_pid;
+GtkTooltips *glob_tooltips;
unsigned char skip_plugins;

84
comms/jpilot/patches/patch-jpilot_c
View File

@ -1,19 +1,69 @@
$OpenBSD: patch-jpilot_c,v 1.1 2006/06/13 07:38:01 bernd Exp $
Fixes a startup crash. From jpilot CVS. Will be fixed in 0.99.9.
Log Message:
get_inline_pixbuf_data(): use g_object_unref() instead of g_free() since
gdk_pixbuf_new_from_xpm_data() returns an object.
--- jpilot.c.orig Tue Jun 13 08:51:31 2006
+++ jpilot.c Tue Jun 13 08:51:51 2006
@@ -1371,7 +1371,7 @@ guint8 *get_inline_pixbuf_data(const cha
gdk_pixdata_from_pixbuf(pixdata, pixbuf, FALSE);
data = gdk_pixdata_serialize(pixdata, &len);
$OpenBSD: patch-jpilot_c,v 1.2 2006/10/20 11:49:42 ajacoutot Exp $
--- jpilot.c.orig Fri Jun 9 22:42:57 2006
+++ jpilot.c Wed Sep 27 09:30:26 2006
@@ -1,4 +1,4 @@
-/* $Id: patch-jpilot_c,v 1.2 2006/10/20 11:49:42 ajacoutot Exp $ */
+/* $Id: patch-jpilot_c,v 1.2 2006/10/20 11:49:42 ajacoutot Exp $ */
- g_free(pixbuf);
+ g_object_unref(pixbuf);
g_free(pixdata);
/*******************************************************************************
* jpilot.c
@@ -1953,11 +1953,21 @@ int main(int argc, char *argv[])
GtkWidget *menubar;
#ifdef ENABLE_GTK2
GtkWidget *scrolled_window;
- char *week_start;
- int pref_fdow = 0;
#else
GtkWidget *vscrollbar;
#endif
+/* Extract first day of week preference from locale in GTK2 */
+#ifdef ENABLE_GTK2
+ int pref_fdow = 0;
+# ifdef HAVE__NL_TIME_FIRST_WEEKDAY
+ char *langinfo;
+ int week_1stday = 0;
+ int first_weekday = 1;
+ unsigned int week_origin;
+# else
+ char *week_start;
+# endif
+#endif
unsigned char skip_past_alarms;
unsigned char skip_all_alarms;
int filedesc[2];
@@ -2179,18 +2189,31 @@ char * xpm_backup[] = {
pref_read_rc_file();
return data;
/* Extract first day of week preference from locale in GTK2 */
+
# ifdef ENABLE_GTK2
-# ifdef HAVE_LANGINFO_H
+# ifdef HAVE__NL_TIME_FIRST_WEEKDAY
/* GTK 2.8 libraries */
- week_start = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
- pref_fdow = *((unsigned char *) week_start) - 1;
+ langinfo = nl_langinfo(_NL_TIME_FIRST_WEEKDAY);
+ first_weekday = langinfo[0];
+ langinfo = nl_langinfo(_NL_TIME_WEEK_1STDAY);
+ week_origin = GPOINTER_TO_INT(langinfo);
+ if (week_origin == 19971130) /* Sunday */
+ week_1stday = 0;
+ else if (week_origin == 19971201) /* Monday */
+ week_1stday = 1;
+ else
+ g_warning ("Unknown value of _NL_TIME_WEEK_1STDAY.\n");
+
+ pref_fdow = (week_1stday + first_weekday - 1) % 7;
# 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';
- }
+ } else {
+ pref_fdow = -1;
+ }
# endif
# endif
if (pref_fdow > 1)

5
comms/jpilot/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2005/12/04 22:19:24 steven Exp $
@comment $OpenBSD: PLIST,v 1.10 2006/10/20 11:49:42 ajacoutot Exp $
%%SHARED%%
bin/jpilot
bin/jpilot-dump
@ -25,7 +25,6 @@ share/doc/jpilot/ChangeLog
share/doc/jpilot/INSTALL
share/doc/jpilot/README
share/doc/jpilot/TODO
share/doc/jpilot/UPGRADING
share/doc/jpilot/icons/
share/doc/jpilot/icons/README
share/doc/jpilot/icons/jpilot-icon1.xpm
@ -72,6 +71,7 @@ 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/ko/LC_MESSAGES/jpilot.mo
share/locale/nl/LC_MESSAGES/jpilot.mo
share/locale/no/LC_MESSAGES/jpilot.mo
share/locale/ru/LC_MESSAGES/jpilot.mo
@ -80,6 +80,7 @@ share/locale/rw/LC_MESSAGES/
share/locale/rw/LC_MESSAGES/jpilot.mo
share/locale/sv/LC_MESSAGES/jpilot.mo
share/locale/tr/LC_MESSAGES/jpilot.mo
share/locale/uk/LC_MESSAGES/jpilot.mo
share/locale/vi/LC_MESSAGES/jpilot.mo
share/locale/zh_CN/LC_MESSAGES/jpilot.mo
share/locale/zh_TW/LC_MESSAGES/jpilot.mo