[Debian-hebrew-package] r807 - in /pkg/bidiv/trunk/debian: changelog patches/cast_fix patches/fribidi_019 patches/series patches/term_size_get patches/try_utf8_fix patches/type_fix

tzafrir at users.alioth.debian.org tzafrir at users.alioth.debian.org
Tue Apr 20 14:01:38 UTC 2010 

Author: tzafrir
Date: Tue Apr 20 14:01:31 2010
New Revision: 807

URL: http://svn.debian.org/wsvn/debian-hebrew/?sc=1&rev=807
Log:
* Patches cast_fix, type_fix: fix build warnings.
* Refresh other patches, while we're at it.

Added:
    pkg/bidiv/trunk/debian/patches/cast_fix
    pkg/bidiv/trunk/debian/patches/type_fix
Modified:
    pkg/bidiv/trunk/debian/changelog
    pkg/bidiv/trunk/debian/patches/fribidi_019
    pkg/bidiv/trunk/debian/patches/series
    pkg/bidiv/trunk/debian/patches/term_size_get
    pkg/bidiv/trunk/debian/patches/try_utf8_fix

Modified: pkg/bidiv/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/changelog?rev=807&op=diff
==============================================================================
--- pkg/bidiv/trunk/debian/changelog (original)
+++ pkg/bidiv/trunk/debian/changelog Tue Apr 20 14:01:31 2010
@@ -18,8 +18,9 @@
   * Patch makefile: simple Makefile fixes (originally in diff).
   * Patch try_utf8_fix: if-def out a variable that is unused if TRY_UTF8
     (originally in diff).
+  * Patches cast_fix, type_fix: fix build warnings.
 
- -- Tzafrir Cohen <tzafrir at debian.org>  Sun, 11 Apr 2010 02:54:10 +0300
+ -- Tzafrir Cohen <tzafrir at debian.org>  Tue, 20 Apr 2010 17:00:05 +0300
 
 bidiv (1.5-3) unstable; urgency=low
 

Added: pkg/bidiv/trunk/debian/patches/cast_fix
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/patches/cast_fix?rev=807&op=file
==============================================================================
--- pkg/bidiv/trunk/debian/patches/cast_fix (added)
+++ pkg/bidiv/trunk/debian/patches/cast_fix Tue Apr 20 14:01:31 2010
@@ -1,0 +1,23 @@
+Description: Hush a warning with a cast.
+Author: Tzafrir Cohen <tzafrir at debian.org>
+
+--- a/bidiv.c
++++ b/bidiv.c
+@@ -145,7 +145,7 @@ bidiv(FILE *fp)
+ 					ungetc(c1, fp);
+ 					fribidi_charset_to_unicode(
+ 						FRIBIDI_CHAR_SET_ISO8859_8,
+-						&c, 1, &unicode_in[len]);
++						(char *)&c, 1, &unicode_in[len]);
+ 				} else
+ 				unicode_in[len]=((c & 037) << 6) + (c1 & 077);
+ 				newline=0;
+@@ -158,7 +158,7 @@ bidiv(FILE *fp)
+ 				   as the output encoding). */
+ 				fribidi_charset_to_unicode(
+ 					FRIBIDI_CHAR_SET_ISO8859_8,
+-					&c, 1, &unicode_in[len]);
++					(char *)&c, 1, &unicode_in[len]);
+ #else
+ 				in[len]=c;
+ #endif

Modified: pkg/bidiv/trunk/debian/patches/fribidi_019
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/patches/fribidi_019?rev=807&op=diff
==============================================================================
--- pkg/bidiv/trunk/debian/patches/fribidi_019 (original)
+++ pkg/bidiv/trunk/debian/patches/fribidi_019 Tue Apr 20 14:01:31 2010
@@ -1,6 +1,10 @@
---- a/Makefile.orig	2008-02-19 15:21:53.000000000 +0200
-+++ b/Makefile	2008-02-19 15:22:05.000000000 +0200
-@@ -4,8 +4,8 @@
+Description: Fix building with fribidi 1.9
+Author: أحÙ
د الÙ
Ø­Ù
ودي <aelmahmoudy at users.sourceforge.net>
+Bug-Debian: http://bugs.debian.org/568130
+
+--- a/Makefile
++++ b/Makefile
+@@ -4,8 +4,8 @@ MAN_PATH=$(PREFIX)/share/man
  CC_OPT_FLAGS=-O2 -Wall
  
  
@@ -11,9 +15,9 @@
  
  all: bidiv
  
---- a/bidiv.c.orig	2008-02-19 15:26:53.000000000 +0200
-+++ b/bidiv.c	2008-02-19 19:17:23.000000000 +0200
-@@ -136,8 +136,9 @@
+--- a/bidiv.c
++++ b/bidiv.c
+@@ -141,8 +141,9 @@ bidiv(FILE *fp)
  				*/
  				if(c1<0x80||c1>0xbf){
  					ungetc(c1, fp);
@@ -25,7 +29,7 @@
  				} else
  				unicode_in[len]=((c & 037) << 6) + (c1 & 077);
  				newline=0;
-@@ -148,8 +149,9 @@
+@@ -153,8 +154,9 @@ bidiv(FILE *fp)
  				   In the future we will have a language
  				   option, which will control this (as well
  				   as the output encoding). */
@@ -37,7 +41,7 @@
  #else
  				in[len]=c;
  #endif
-@@ -201,11 +203,11 @@
+@@ -206,11 +208,11 @@ bidiv(FILE *fp)
  			rtl_line=0;
  
  		if(out_utf8)

Modified: pkg/bidiv/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/patches/series?rev=807&op=diff
==============================================================================
--- pkg/bidiv/trunk/debian/patches/series (original)
+++ pkg/bidiv/trunk/debian/patches/series Tue Apr 20 14:01:31 2010
@@ -3,3 +3,5 @@
 fribidi_019
 hyphen_minus
 term_size_get
+type_fix
+cast_fix

Modified: pkg/bidiv/trunk/debian/patches/term_size_get
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/patches/term_size_get?rev=807&op=diff
==============================================================================
--- pkg/bidiv/trunk/debian/patches/term_size_get (original)
+++ pkg/bidiv/trunk/debian/patches/term_size_get Tue Apr 20 14:01:31 2010
@@ -1,9 +1,9 @@
 Description: properly check terminal width
 Author: Baruch Even <baruch at debian.org>
 
---- bidiv-1.5.orig/bidiv.c
-+++ bidiv-1.5/bidiv.c
-@@ -31,6 +31,8 @@
+--- a/bidiv.c
++++ b/bidiv.c
+@@ -32,6 +32,8 @@
  #include <string.h>
  #endif
  
@@ -12,7 +12,7 @@
  char *progname;
  
  int width=80;
-@@ -226,23 +233,15 @@
+@@ -235,23 +237,15 @@ int
  main(int argc, char *argv[])
  {
  	FILE *fp;
@@ -39,8 +39,8 @@
  
  #ifdef HAVE_LOCALE
  	setlocale(LC_CTYPE, "");
---- bidiv-1.5.orig/term.h
-+++ bidiv-1.5/term.h
+--- /dev/null
++++ b/term.h
 @@ -0,0 +1,9 @@
 +#ifndef _TERM_H_
 +#define _TERM_H_
@@ -51,8 +51,8 @@
 +int term_size_get(void);
 +
 +#endif
---- bidiv-1.5.orig/term.c
-+++ bidiv-1.5/term.c
+--- /dev/null
++++ b/term.c
 @@ -0,0 +1,22 @@
 +#include <sys/ioctl.h>
 +#include <stdlib.h>

Modified: pkg/bidiv/trunk/debian/patches/try_utf8_fix
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/patches/try_utf8_fix?rev=807&op=diff
==============================================================================
--- pkg/bidiv/trunk/debian/patches/try_utf8_fix (original)
+++ pkg/bidiv/trunk/debian/patches/try_utf8_fix Tue Apr 20 14:01:31 2010
@@ -1,9 +1,17 @@
 Description: if-def out a variable that is unused if TRY_UTF8.
 Author: Baruch Even <baruch at debian.org>
 
---- bidiv-1.5.orig/bidiv.c
-+++ bidiv-1.5/bidiv.c
-@@ -47,7 +49,10 @@
+--- a/bidiv.c
++++ b/bidiv.c
+@@ -24,6 +24,7 @@
+ 
+ /* In the future, this should be done with autoconf */
+ #define HAVE_LOCALE
++#define TRY_UTF8
+ 
+ #ifdef HAVE_LOCALE
+ #include <locale.h>
+@@ -47,7 +48,10 @@ int out_utf8=0;
  void
  bidiv(FILE *fp)
  {
@@ -15,7 +23,7 @@
  	FriBidiChar *unicode_in, *unicode_out;
  	int len, i, c;
  	int rtl_line;
-@@ -62,7 +67,9 @@
+@@ -62,7 +66,9 @@ bidiv(FILE *fp)
  	*/
  	int newline=1, newpara=1;
  
@@ -25,3 +33,21 @@
  	out=(char *)malloc(width*7+1); /* 7 is the maximum number of
  					  bytes in one UTF8 char? */
  	/* We use (width+1) not just width, to leave place for a double-
+@@ -101,7 +107,6 @@ bidiv(FILE *fp)
+ 			   option to bidiv. This is enabled when TRY_UTF8
+ 			   is defined
+ 			*/
+-#define TRY_UTF8
+ 			if((c=getc(fp))==EOF)
+ 				break;
+ 			else if(c=='\r'){
+@@ -216,7 +221,9 @@ bidiv(FILE *fp)
+ 		puts(out);
+ 	}
+ 	/* Free the memory we have allocated */
++#ifndef TRY_UTF8
+ 	free(in);
++#endif
+ 	free(out);
+ 	free(unicode_in);
+ 	free(unicode_out);

Added: pkg/bidiv/trunk/debian/patches/type_fix
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/patches/type_fix?rev=807&op=file
==============================================================================
--- pkg/bidiv/trunk/debian/patches/type_fix (added)
+++ pkg/bidiv/trunk/debian/patches/type_fix Tue Apr 20 14:01:31 2010
@@ -1,0 +1,23 @@
+Description: use proper enumerator type
+Author: Tzafrir Cohen <tzafrir at debian.org>
+
+--- a/bidiv.c
++++ b/bidiv.c
+@@ -42,7 +42,7 @@ int width=80;
+    change the base direction on every newline, and =2 means change it every
+    paragraph (where a paragraph starts after a completely empty line.
+ */
+-FriBidiCharType base_dir=FRIBIDI_TYPE_N, prev_base_dir=FRIBIDI_TYPE_LTR;
++FriBidiParType base_dir=FRIBIDI_TYPE_N, prev_base_dir=FRIBIDI_TYPE_LTR;
+ int auto_basedir=2;
+ int justify=1;
+ int out_utf8=0;
+@@ -199,7 +199,7 @@ bidiv(FILE *fp)
+ 			fribidi_log2vis(unicode_in, len, &base_dir,
+ 					unicode_out, NULL, NULL, NULL);
+ #else
+-			FriBidiCharType tmp_dir=prev_base_dir;
++			FriBidiParType tmp_dir=prev_base_dir;
+ 			fribidi_log2vis(unicode_in, len, &tmp_dir,
+ 					unicode_out, NULL, NULL, NULL);
+ 			rtl_line= (tmp_dir==FRIBIDI_TYPE_RTL);

More information about the Debian-hebrew-package mailing list