* [gentoo-commits] gentoo-x86 commit in app-i18n/bidiv/files: bidiv-1.5-fribidi.patch
@ 2009-04-13 23:05 Matsuu Takuto (matsuu)
0 siblings, 0 replies; 3+ messages in thread
From: Matsuu Takuto (matsuu) @ 2009-04-13 23:05 UTC (permalink / raw
To: gentoo-commits
matsuu 09/04/13 23:05:36
Added: bidiv-1.5-fribidi.patch
Log:
Fixed to work with recent fribidi, bug #264281.
(Portage version: 2.1.6.11/cvs/Linux x86_64)
Revision Changes Path
1.1 app-i18n/bidiv/files/bidiv-1.5-fribidi.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch?rev=1.1&content-type=text/plain
Index: bidiv-1.5-fribidi.patch
===================================================================
diff -Naur bidiv.orig/Makefile bidiv/Makefile
--- bidiv.orig/Makefile 2006-01-08 03:45:11.000000000 +0900
+++ bidiv/Makefile 2009-04-13 17:55:23.000000000 +0900
@@ -4,8 +4,8 @@
CC_OPT_FLAGS=-O2 -Wall
-CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags`
-LDFLAGS=`fribidi-config --libs`
+CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `pkg-config fribidi --cflags`
+LDFLAGS=`pkg-config fribidi --libs`
all: bidiv
diff -Naur bidiv.orig/bidiv.c bidiv/bidiv.c
--- bidiv.orig/bidiv.c 2006-01-08 04:05:54.000000000 +0900
+++ bidiv/bidiv.c 2009-04-13 17:55:23.000000000 +0900
@@ -172,7 +172,7 @@
}
#ifndef TRY_UTF8
in[len]='\0';
- fribidi_iso8859_8_to_unicode(in, unicode_in);
+ fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_ISO8859_8, in, unicode_in);
#endif
/* output the line */
@@ -201,10 +201,10 @@
rtl_line=0;
if(out_utf8)
- fribidi_unicode_to_utf8(unicode_out, len,
+ fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, unicode_out, len,
out);
else
- fribidi_unicode_to_iso8859_8(unicode_out, len,
+ fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_ISO8859_8, unicode_out, len,
out);
/* if rtl_line (i.e., base_dir is RL), and we didn't fill the
entire width, we need to pad with spaces. Maybe in the
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-i18n/bidiv/files: bidiv-1.5-fribidi.patch
@ 2012-05-20 4:44 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-05-20 4:44 UTC (permalink / raw
To: gentoo-commits
ssuominen 12/05/20 04:44:25
Modified: bidiv-1.5-fribidi.patch
Log:
old
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Revision Changes Path
1.2 app-i18n/bidiv/files/bidiv-1.5-fribidi.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch?r1=1.1&r2=1.2
Index: bidiv-1.5-fribidi.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bidiv-1.5-fribidi.patch 13 Apr 2009 23:05:35 -0000 1.1
+++ bidiv-1.5-fribidi.patch 20 May 2012 04:44:25 -0000 1.2
@@ -1,6 +1,5 @@
-diff -Naur bidiv.orig/Makefile bidiv/Makefile
---- bidiv.orig/Makefile 2006-01-08 03:45:11.000000000 +0900
-+++ bidiv/Makefile 2009-04-13 17:55:23.000000000 +0900
+--- Makefile
++++ Makefile
@@ -4,8 +4,8 @@
CC_OPT_FLAGS=-O2 -Wall
@@ -12,9 +11,8 @@
all: bidiv
-diff -Naur bidiv.orig/bidiv.c bidiv/bidiv.c
---- bidiv.orig/bidiv.c 2006-01-08 04:05:54.000000000 +0900
-+++ bidiv/bidiv.c 2009-04-13 17:55:23.000000000 +0900
+--- bidiv.c
++++ bidiv.c
@@ -172,7 +172,7 @@
}
#ifndef TRY_UTF8
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-i18n/bidiv/files: bidiv-1.5-fribidi.patch
@ 2012-05-20 4:55 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-05-20 4:55 UTC (permalink / raw
To: gentoo-commits
ssuominen 12/05/20 04:55:55
Modified: bidiv-1.5-fribidi.patch
Log:
Remove forced -O2 and use environment LDFLAGS wrt #341791 by Diego Elio Pettenò. Edit -fribidi.patch because it was patching Makefile as-is.
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Revision Changes Path
1.3 app-i18n/bidiv/files/bidiv-1.5-fribidi.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch?r1=1.2&r2=1.3
Index: bidiv-1.5-fribidi.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bidiv-1.5-fribidi.patch 20 May 2012 04:44:25 -0000 1.2
+++ bidiv-1.5-fribidi.patch 20 May 2012 04:55:55 -0000 1.3
@@ -1,16 +1,3 @@
---- Makefile
-+++ Makefile
-@@ -4,8 +4,8 @@
- CC_OPT_FLAGS=-O2 -Wall
-
-
--CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags`
--LDFLAGS=`fribidi-config --libs`
-+CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `pkg-config fribidi --cflags`
-+LDFLAGS=`pkg-config fribidi --libs`
-
- all: bidiv
-
--- bidiv.c
+++ bidiv.c
@@ -172,7 +172,7 @@
@@ -35,3 +22,25 @@
out);
/* if rtl_line (i.e., base_dir is RL), and we didn't fill the
entire width, we need to pad with spaces. Maybe in the
+--- Makefile
++++ Makefile
+@@ -1,16 +1,14 @@
+ PREFIX=/usr/local
+ BIN_DIR=$(PREFIX)/bin
+ MAN_PATH=$(PREFIX)/man
+-CC_OPT_FLAGS=-O2 -Wall
+
+-
+-CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags`
+-LDFLAGS=`fribidi-config --libs`
++CFLAGS+=`pkg-config fribidi --cflags` -Wall
++LIBS=`pkg-config fribidi --libs`
+
+ all: bidiv
+
+ bidiv: bidiv.o
+- $(CC) -o bidiv bidiv.o $(LDFLAGS)
++ $(CC) $(LDFLAGS) -o bidiv bidiv.o $(LIBS)
+
+ clean:
+ rm -f bidiv.o *~
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-20 4:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-13 23:05 [gentoo-commits] gentoo-x86 commit in app-i18n/bidiv/files: bidiv-1.5-fribidi.patch Matsuu Takuto (matsuu)
-- strict thread matches above, loose matches on Subject: below --
2012-05-20 4:44 Samuli Suominen (ssuominen)
2012-05-20 4:55 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox