fixed / adapted sylpheed for new gpgme (compiles but not tested ...)

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@981 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -9,6 +9,7 @@ whole rxr-tree.
  - blacklisted a driver not compiling in 2.6
  - refactored coda
  - fixed samba
+ - fixed / adapted sylpheed for new gpgme (compiles but not tested ...)
 
 *) 2003-08-01 (2.0.0-beta7 - 2.0.0-rc1) 
 

package/rene/sylpheed/gpgme-update.patch

@@ -0,0 +1,138 @@
+
+--- sylpheed-0.9.0/src/rfc2015.c.orig	2003-08-03 02:15:15.000000000 +0200
++++ sylpheed-0.9.0/src/rfc2015.c	2003-08-03 02:28:09.000000000 +0200
+@@ -340,7 +340,7 @@
+         goto leave;
+     }
+ 
+-    err = gpgme_op_verify (ctx, sig, text, &status);
++    err = gpgme_op_verify (ctx, sig, text, NULL, &status);
+     if (err)  {
+         debug_print ("gpgme_op_verify failed: %s\n", gpgme_strerror (err));
+         goto leave;
+@@ -395,11 +395,11 @@
+     if (err)
+         debug_print ("gpgme_data_rewind failed: %s\n", gpgme_strerror (err));
+ 
+-    while (!(err = gpgme_data_read (data, buf, 100, &nread))) {
++    while ((nread = gpgme_data_read (data, buf, 100)) > 0) {
+         fwrite ( buf, nread, 1, fp );
+     }
+ 
+-    if (err != GPGME_EOF)
++    if (nread != GPGME_EOF)
+         debug_print ("gpgme_data_read failed: %s\n", gpgme_strerror (err));
+ 
+     fclose (fp);
+@@ -666,11 +666,11 @@
+     if (err)
+         debug_print ("gpgme_data_rewind failed: %s\n", gpgme_strerror (err));
+ 
+-    while (!(err = gpgme_data_read (plain, buf, sizeof(buf), &nread))) {
++    while ((nread = gpgme_data_read (plain, buf, sizeof(buf))) > 0) {
+         fwrite (buf, nread, 1, dstfp);
+     }
+ 
+-    if (err != GPGME_EOF) {
++    if (nread != GPGME_EOF) {
+         debug_print ("gpgme_data_read failed: %s\n", gpgme_strerror (err));
+     }
+ 
+@@ -885,10 +885,10 @@
+         debug_print ("gpgme_data_rewind failed: %s\n", gpgme_strerror (err));
+         goto failure;
+     }
+-    while (!(err = gpgme_data_read (header, buf, BUFFSIZE, &nread))) {
++    while ((nread = gpgme_data_read (header, buf, BUFFSIZE)) > 0) {
+         fwrite (buf, nread, 1, fp);
+     }
+-    if (err != GPGME_EOF) {
++    if (nread != GPGME_EOF) {
+         debug_print ("gpgme_data_read failed: %s\n", gpgme_strerror (err));
+         goto failure;
+     }
+@@ -931,10 +931,10 @@
+         goto failure;
+     }
+ 
+-    while (!(err = gpgme_data_read (cipher, buf, BUFFSIZE, &nread))) {
++    while ((nread = gpgme_data_read (cipher, buf, BUFFSIZE)) > 0) {
+         fwrite (buf, nread, 1, fp);
+     }
+-    if (err != GPGME_EOF) {
++    if (nread != GPGME_EOF) {
+         debug_print ("** gpgme_data_read failed: %s\n", gpgme_strerror (err));
+         goto failure;
+     }
+@@ -1204,10 +1204,10 @@
+     err = gpgme_data_rewind (header);
+     if (err)
+         debug_print ("gpgme_data_rewind failed: %s\n", gpgme_strerror (err));
+-    while (!(err = gpgme_data_read (header, buf, BUFFSIZE, &nread))) {
++    while ((nread = gpgme_data_read (header, buf, BUFFSIZE)) > 0) {
+         fwrite (buf, nread, 1, fp);
+     }
+-    if (err != GPGME_EOF) {
++    if (nread != GPGME_EOF) {
+         debug_print ("gpgme_data_read failed: %s\n", gpgme_strerror (err));
+         goto failure;
+     }
+@@ -1236,10 +1236,10 @@
+                    gpgme_strerror (err));
+         goto failure;
+     }
+-    while (!(err = gpgme_data_read (plain, buf, BUFFSIZE, &nread))) {
++    while ((nread = gpgme_data_read (plain, buf, BUFFSIZE)) > 0) {
+         fwrite (buf, nread, 1, fp);   
+     }
+-    if (err != GPGME_EOF) {
++    if (nread != GPGME_EOF) {
+         debug_print ("gpgme_data_read failed: %s\n", gpgme_strerror (err));
+         goto failure;
+     }
+@@ -1258,10 +1258,10 @@
+         goto failure;
+     }
+ 
+-    while (!(err = gpgme_data_read (sigdata, buf, BUFFSIZE, &nread))) {
++    while ((nread = gpgme_data_read (sigdata, buf, BUFFSIZE)) > 0) {
+         fwrite (buf, nread, 1, fp);
+     }
+-    if (err != GPGME_EOF) {
++    if (nread != GPGME_EOF) {
+         debug_print ("gpgme_data_read failed: %s\n", gpgme_strerror (err));
+         goto failure;
+     }
+@@ -1356,10 +1356,10 @@
+ 	goto failure;
+     }
+ 
+-    while (!(err = gpgme_data_read(sigdata, buf, sizeof(buf), &nread))) {
++    while ((nread = gpgme_data_read(sigdata, buf, sizeof(buf))) > 0) {
+ 	fwrite(buf, nread, 1, fp);
+     }
+-    if (err != GPGME_EOF) {
++    if (nread != GPGME_EOF) {
+ 	debug_print("gpgme_data_read failed: %s\n", gpgme_strerror(err));
+ 	goto failure;
+     }
+--- sylpheed-0.9.0/src/main.c.orig	2003-08-03 02:40:06.000000000 +0200
++++ sylpheed-0.9.0/src/main.c	2003-08-03 02:34:24.000000000 +0200
+@@ -231,7 +231,7 @@
+ 	prefs_common_read_config();
+ 
+ #if USE_GPGME
+-	if (gpgme_check_engine()) {  /* Also does some gpgme init */
++	/*if (gpgme_check_engine()) { */ /* Also does some gpgme init */
+ 		rfc2015_disable_all();
+ 		debug_print("gpgme_engine_version:\n%s\n",
+ 			    gpgme_get_engine_info());
+@@ -246,7 +246,7 @@
+ 			if (val & G_ALERTDISABLE)
+ 				prefs_common.gpg_warning = FALSE;
+ 		}
+-	}
++	/* } */
+ 	gpgme_register_idle(idle_function_for_gpgme);
+ #endif
+