fixed memosync problems

5 files changed, 88 insertions, 4 deletions

diff --git a/app-pda/gnome-pilot-conduits/Manifest b/app-pda/gnome-pilot-conduits/Manifest
index d0f76a42b4a7..be3b84a4886f 100644
--- a/app-pda/gnome-pilot-conduits/Manifest
+++ b/app-pda/gnome-pilot-conduits/Manifest
@@ -1,7 +1,7 @@
-MD5 ee28905bdcb234b84e8ecb1500788876 ChangeLog 2494
+MD5 3ac2ddba713508e9288eed504d423c5e ChangeLog 2767
 MD5 bac37e36aba2336ac4c6f7ef1100aad0 gnome-pilot-conduits-0.9.ebuild 1046
-MD5 933b689186b9bc5b9da9f025a422d9ee gnome-pilot-conduits-2.0.10-r1.ebuild 785
-MD5 2e161508a73383c9ced4ac330be96479 gnome-pilot-conduits-2.0.10.ebuild 784
+MD5 f406c783d79791255494ae3a6c814210 gnome-pilot-conduits-2.0.10-r1.ebuild 787
+MD5 376f8fe81f0792b82d9bb5e2e6945c41 gnome-pilot-conduits-2.0.10.ebuild 783
 MD5 f88e72f2cdd2ea2cd71ef30f9f28180b gnome-pilot-conduits-2.0.8.ebuild 606
 MD5 53c692211e1e8c185852d95e68de456f gnome-pilot-conduits-2.0.9.ebuild 606
 MD5 1e1031eae2f36a13b2cd73550a31d03d metadata.xml 175
diff --git a/app-pda/gnome-pilot-conduits/files/digest-gnome-pilot-conduits-2.0.10-r1 b/app-pda/gnome-pilot-conduits/files/digest-gnome-pilot-conduits-2.0.10-r1
new file mode 100644
index 000000000000..951998136df2
--- /dev/null
+++ b/app-pda/gnome-pilot-conduits/files/digest-gnome-pilot-conduits-2.0.10-r1
@@ -0,0 +1 @@
+MD5 f6c0c608b04fabe6c83431ed2bda1ec3 gnome-pilot-conduits-2.0.10.tar.bz2 390631
diff --git a/app-pda/gnome-pilot-conduits/files/gnome-pilot-conduits-2.0.10-memofile.patch b/app-pda/gnome-pilot-conduits/files/gnome-pilot-conduits-2.0.10-memofile.patch
new file mode 100644
index 000000000000..7e98063359e0
--- /dev/null
+++ b/app-pda/gnome-pilot-conduits/files/gnome-pilot-conduits-2.0.10-memofile.patch
@@ -0,0 +1,45 @@
+--- gnome-pilot-conduits-2.0.10/memo_file/memo_file_conduit.c	2003-07-03 17:04:22.000000000 -0400
++++ gnome-pilot-conduits-2.0.10/memo_file/memo_file_conduit.c	2003-08-27 00:33:35.000000000 -0400
+@@ -725,7 +725,7 @@ free_loadinfo_foreach (LoadInfo *info, g
+ }
+ 
+ /** loads the records into the abs structure */
+-static gboolean
++static void
+ load_records (GnomePilotConduitStandardAbs *abs) 
+ {
+ 	FILE *idfile;
+@@ -743,12 +743,12 @@ load_records (GnomePilotConduitStandardA
+ 
+ 	if ((dir=opendir (GET_CONDUIT_CFG (abs)->dir))==NULL) {
+ 		LOG ("load_records cannot open %s", GET_CONDUIT_CFG (abs)->dir);
+-		return FALSE;
++		return;
+ 	}
+ 	if ((categories = load_categories (abs))==NULL) {
+ 		LOG ("no categories, no records");
+ 		closedir (dir);
+-		return FALSE;
++		return;
+ 	}
+ 	while ((de=readdir (dir))) {
+ 		GHashTable *loadinfo;
+@@ -857,7 +857,7 @@ load_records (GnomePilotConduitStandardA
+ 	
+ 	LOG ("records: total = %d updated = %d new = %d deleted = %d", total, updated, newrecs, deleted);
+ 
+-	return TRUE;
++	return;
+ }
+ 
+ 
+@@ -886,8 +886,7 @@ pre_sync (GnomePilotConduit *c, GnomePil
+ 		return -1;
+ 	}
+ 
+-	if (!load_records ((GnomePilotConduitStandardAbs*)c))
+-		return -1;
++	load_records ((GnomePilotConduitStandardAbs*)c);
+ 
+ 	/* If local store is empty force the slow sync. */
+ 	if (g_list_length (GET_CONDUIT_DATA (c)->records)==0){
diff --git a/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10-r1.ebuild b/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10-r1.ebuild
new file mode 100644
index 000000000000..46dcf459eb57
--- /dev/null
+++ b/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10-r1.ebuild,v 1.1 2003/09/20 14:54:29 liquidx Exp $
+
+inherit gnome2
+
+DESCRIPTION="Gnome Pilot Conduits"
+HOMEPAGE="http://www.eskil.org/gnome-pilot/"
+
+IUSE=""
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc"
+
+RDEPEND=">=gnome-base/libgnome-2.0
+	>=app-pda/gnome-pilot-${PVR}
+	>=dev-libs/libxml2-2.5"
+
+DEPEND="sys-devel/gettext
+	dev-util/pkgconfig
+	${RDEPEND}"
+
+G2CONF="${G2CONF} --enable-pilotlinktest"
+SCROLLKEEPER_UPDATE="0"
+
+src_unpack() {
+	unpack ${A}
+	# patch to fix memo file syncing
+	# http://bugzilla.gnome.org/show_bug.cgi?id=114361
+	epatch ${FILESDIR}/${P}-memofile.patch
+}
diff --git a/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10.ebuild b/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10.ebuild
index b42642c69e2e..8bfb588a827f 100644
--- a/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10.ebuild
+++ b/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10.ebuild,v 1.2 2003/09/11 00:57:51 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10.ebuild,v 1.3 2003/09/20 14:54:29 liquidx Exp $
 
 inherit gnome2
 
@@ -22,3 +22,10 @@ DEPEND="sys-devel/gettext
 
 G2CONF="${G2CONF} --enable-pilotlinktest"
 SCROLLKEEPER_UPDATE="0"
+
+src_unpack() {
+	unpack ${A}
+	# patch to fix memo file syncing
+	# http://bugzilla.gnome.org/show_bug.cgi?id=114361
+	epatch ${FILESDIR}/${P}-memofile.patch
+}