Attachment #70777 for bug #103203




# "?=" and "+=" are for including this Makefile from japanese/jpilot

PORTNAME=	jpilot
PORTVERSION=	0.99.9
PORTREVISION=	4
CATEGORIES+=	palm comms
MASTER_SITES=	http://jpilot.org/

MAINTAINER?=	samm@os2.kiev.ua
COMMENT=	Desktop Organizer Software for the Palm Pilot

LIB_DEPENDS=	pisock.9:${PORTSDIR}/palm/pilot-link

USE_X_PREFIX=	yes
USE_GNOME=	gnomehier
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
LDCONFIG_DIRS=	%%PREFIX%%/lib/jpilot/plugins
CFLAGS+=	-I${LOCALBASE}/include
CONFIGURE_ENV+=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \


.if defined(WITH_GTK1)
USE_GNOME+=	gtk12
CONFIGURE_ARGS+=	--disable-gtk2=yes
.else
USE_GNOME+=	gtk20
CONFIGURE_ARGS+=	--enable-gtk2=yes
.endif

MAN1=		jpilot-dial.1 jpilot-dump.1 jpilot-sync.1 jpilot.1

.for ext in html png jpg
	${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${DOCSDIR}
.endfor
.for i in AUTHORS BUGS COPYING ChangeLog INSTALL README TODO
	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
	${INSTALL_DATA} ${WRKSRC}/icons/README ${DOCSDIR}/README.icons

Lines 1-3 Link Here

(-)/usr/home/samm/tmp/jpilot/distinfo (-3 / +3 lines)
1	MD5 (jpilot-0.99.8.tar.gz) = 4bdb200367e691e64d02bd6dfcdec604	1	MD5 (jpilot-0.99.9.tar.gz) = c39df29aeed57b84a674524856ebc290
2	SHA256 (jpilot-0.99.8.tar.gz) = a89ca99df142efa6046509df7522794c34da84158893bfbce836c9f5fd943d78	2	SHA256 (jpilot-0.99.9.tar.gz) = 341491ad727e234b58c7d5f057bcff363d15d2f223c1beab05fc49820dfe6432
3	SIZE (jpilot-0.99.8.tar.gz) = 1589217	3	SIZE (jpilot-0.99.9.tar.gz) = 1671351




--- utils.c.orig	2005-12-11 13:04:24.000000000 -0500
+++ utils.c	2005-12-11 13:04:38.000000000 -0500
@@ -2042,9 +2042,6 @@
       fwrite(RecordBuffer->data, header.rec_len, 1, pc_in);
 #endif /* PILOT_LINK_0_12 */
       jp_logf(JP_LOG_DEBUG, "record deleted\n");
-#ifdef PILOT_LINK_0_12
-      pi_buffer_free(RecordBuffer);
-#endif /* PILOT_LINK_0_12 */
       fclose(pc_in);
 #ifdef PILOT_LINK_0_12
       pi_buffer_free(RecordBuffer);

Lines 1-11 Link Here

(-)/usr/home/samm/tmp/jpilot/files/patch-Makefile.in (-11 lines)
1	--- Makefile.in.orig Sun Oct 30 18:00:53 2005
2	+++ Makefile.in Tue Nov 1 17:17:43 2005
3	@@ -302,7 +302,7 @@
4	sharedstatedir = @sharedstatedir@
5	sysconfdir = @sysconfdir@
6	target_alias = @target_alias@
7	-SUBDIRS = Expense SyncTime KeyRing docs dialer po m4 empty icons
8	+SUBDIRS = Expense SyncTime KeyRing dialer po m4 empty
9
10	# install the manual docs
11	colordir = $(prefix)/share/$(PACKAGE)

Lines 1-18 Link Here

(-)/usr/home/samm/tmp/jpilot/files/patch-jpilot (-18 lines)
1	diff -u -r1.127 -r1.128
2	--- jpilot.c 28 Nov 2005 07:22:22 -0000 1.127
3	+++ jpilot.c 16 Dec 2005 13:33:27 -0000 1.128
4	@@ -1,4 +1,4 @@
5	-/* $Id: jpilot.c,v 1.127 2005/11/28 07:22:22 rikster5 Exp $ */
6	+/* $Id: jpilot.c,v 1.128 2005/12/16 13:33:27 rousseau Exp $ */
7
8	/*******************************************************************************
9	* jpilot.c
10	@@ -1367,7 +1367,7 @@
11	gdk_pixdata_from_pixbuf(pixdata, pixbuf, FALSE);
12	data = gdk_pixdata_serialize(pixdata, &len);
13
14	- g_free(pixbuf);
15	+ g_object_unref(pixbuf);
16	g_free(pixdata);
17
18	return data;

Line 0 Link Here

(-)/usr/home/samm/tmp/jpilot/files/patch-jpilot-langinfo (+11 lines)
	1	--- jpilot.c.orig Thu Sep 14 08:45:18 2006
	2	+++ jpilot.c Thu Sep 14 08:46:04 2006
	3	@@ -2180,7 +2180,7 @@
	4
	5	/* Extract first day of week preference from locale in GTK2 */
	6	# ifdef ENABLE_GTK2
	7	-# ifdef HAVE_LANGINFO_H
	8	+# if defined(HAVE_LANGINFO_H) && defined(_NL_TIME_FIRST_WEEKDAY)
	9	/* GTK 2.8 libraries */
	10	week_start = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
	11	pref_fdow = ((unsigned char ) week_start) - 1;




Index: jpilot-sync.c
===================================================================
RCS file: /cvs/jpilot/jpilot_src/jpilot-sync.c,v
retrieving revision 1.23
diff -u -r1.23 jpilot-sync.c
--- jpilot-sync.c	28 Jan 2005 16:54:13 -0000	1.23
+++ jpilot-sync.c	5 Nov 2005 15:07:57 -0000
@@ -44,6 +44,7 @@
 pid_t glob_child_pid;
 GtkWidget *glob_dialog;
 pid_t glob_child_pid;
+GtkTooltips *glob_tooltips;
 
 unsigned char skip_plugins;
 

Return to bug 103203

Lines 7-26 Link Here

(-)/usr/home/samm/tmp/jpilot/Makefile (-6 / +5 lines)
7	# "?=" and "+=" are for including this Makefile from japanese/jpilot	7	# "?=" and "+=" are for including this Makefile from japanese/jpilot
8		8
9	PORTNAME= jpilot	9	PORTNAME= jpilot
10	PORTVERSION= 0.99.8	10	PORTVERSION= 0.99.9
11	PORTREVISION= 4
12	CATEGORIES+= palm comms	11	CATEGORIES+= palm comms
13	MASTER_SITES= http://jpilot.org/	12	MASTER_SITES= http://jpilot.org/
14		13
15	MAINTAINER?= samm@os2.kiev.ua	14	MAINTAINER?= samm@os2.kiev.ua
16	COMMENT= Desktop Organizer Software for the Palm Pilot	15	COMMENT= Desktop Organizer Software for the Palm Pilot
17		16
18	LIB_DEPENDS= pisock.8:${PORTSDIR}/palm/pilot-link	17	LIB_DEPENDS= pisock.9:${PORTSDIR}/palm/pilot-link
19		18
20	USE_X_PREFIX= yes	19	USE_X_PREFIX= yes
21	USE_GNOME= gnomehier	20	USE_GNOME= gnomehier
22	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
23	INSTALLS_SHLIB= yes	22	USE_LDCONFIG= yes
24	LDCONFIG_DIRS= %%PREFIX%%/lib/jpilot/plugins	23	LDCONFIG_DIRS= %%PREFIX%%/lib/jpilot/plugins
25	CFLAGS+= -I${LOCALBASE}/include	24	CFLAGS+= -I${LOCALBASE}/include
26	CONFIGURE_ENV+= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \	25	CONFIGURE_ENV+= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
Lines 38-46 Link Here
38		37
39	.if defined(WITH_GTK1)	38	.if defined(WITH_GTK1)
40	USE_GNOME+= gtk12	39	USE_GNOME+= gtk12
		40	CONFIGURE_ARGS+= --disable-gtk2=yes
41	.else	41	.else
42	USE_GNOME+= gtk20	42	USE_GNOME+= gtk20
43	CONFIGURE_ARGS+= --enable-gtk2=yes
44	.endif	43	.endif
45		44
46	MAN1= jpilot-dial.1 jpilot-dump.1 jpilot-sync.1 jpilot.1	45	MAN1= jpilot-dial.1 jpilot-dump.1 jpilot-sync.1 jpilot.1
Lines 71-77 Link Here
71	.for ext in html png jpg	70	.for ext in html png jpg
72	${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${DOCSDIR}	71	${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${DOCSDIR}
73	.endfor	72	.endfor
74	.for i in AUTHORS BUGS COPYING ChangeLog INSTALL README TODO UPGRADING	73	.for i in AUTHORS BUGS COPYING ChangeLog INSTALL README TODO
75	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}	74	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
76	.endfor	75	.endfor
77	${INSTALL_DATA} ${WRKSRC}/icons/README ${DOCSDIR}/README.icons	76	${INSTALL_DATA} ${WRKSRC}/icons/README ${DOCSDIR}/README.icons

Lines 1-12 Link Here

(-)/usr/home/samm/tmp/jpilot/files/patch-0.99.8-memory (-12 lines)
1	--- utils.c.orig 2005-12-11 13:04:24.000000000 -0500
2	+++ utils.c 2005-12-11 13:04:38.000000000 -0500
3	@@ -2042,9 +2042,6 @@
4	fwrite(RecordBuffer->data, header.rec_len, 1, pc_in);
5	#endif /* PILOT_LINK_0_12 */
6	jp_logf(JP_LOG_DEBUG, "record deleted\n");
7	-#ifdef PILOT_LINK_0_12
8	- pi_buffer_free(RecordBuffer);
9	-#endif /* PILOT_LINK_0_12 */
10	fclose(pc_in);
11	#ifdef PILOT_LINK_0_12
12	pi_buffer_free(RecordBuffer);

Lines 1-15 Link Here

(-)/usr/home/samm/tmp/jpilot/files/patch-jpilot-sync (-15 lines)
1	Index: jpilot-sync.c
2	===================================================================
3	RCS file: /cvs/jpilot/jpilot_src/jpilot-sync.c,v
4	retrieving revision 1.23
5	diff -u -r1.23 jpilot-sync.c
6	--- jpilot-sync.c 28 Jan 2005 16:54:13 -0000 1.23
7	+++ jpilot-sync.c 5 Nov 2005 15:07:57 -0000
8	@@ -44,6 +44,7 @@
9	pid_t glob_child_pid;
10	GtkWidget *glob_dialog;
11	pid_t glob_child_pid;
12	+GtkTooltips *glob_tooltips;
13
14	unsigned char skip_plugins;
15