Commit 7eaf2803 authored by Rafaël Carré's avatar Rafaël Carré

contribs: update to fribidi2 beta (0.19.1) to hopefully solve problems with arabic ligatures

parent 2b2ab5eb
......@@ -515,13 +515,7 @@ fribidi-$(FRIBIDI_VERSION).tar.gz:
fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz
$(EXTRACT_GZ)
patch -p0 < Patches/fribidi.patch.real
ifdef HAVE_WIN32
patch -p0 <Patches/fribidi-win32.patch
endif
ifdef HAVE_UCLIBC
patch -p0 < Patches/fribidi-uclibc.patch
endif
patch -p0 < Patches/fribidi.patch
.fribidi: fribidi .iconv
(cd $<; rm -f configure; ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
......
--- fribidi/config.sub.orig 2001-08-23 12:40:51.000000000 +0200
+++ fribidi/config.sub 2007-05-16 12:19:10.000000000 +0200
@@ -260,7 +260,7 @@
# FIXME: clean up the formatting here.
vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
- | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armel-*| armv*-* | strongarm-* | xscale-* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
| power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
| xmp-* | ymp-* \
@@ -1000,6 +1000,9 @@
-unixware*)
os=-sysv4.2uw
;;
+ -uclibc*)
+ os=-linux
+ ;;
-gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
@@ -1154,6 +1157,9 @@
arm*-semi)
os=-aout
;;
+ arm*-linux)
+ os=-linux
+ ;;
pdp10-*)
os=-tops20
;;
diff -Naur fribidi-orig/Makefile.am fribidi/Makefile.am
--- fribidi-orig/Makefile.am 2002-05-16 12:25:37.000000000 +0200
+++ fribidi/Makefile.am 2005-08-26 15:20:26.000000000 +0200
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = gnu
-noinst_PROGRAMS = fribidi_benchmark \
+noinst_PROGRAMS = \
fribidi_create_char_types \
fribidi_create_mirroring
@@ -103,8 +103,6 @@
$(OTHER_FILES) \
$(EXTRA_HEADERS)
-fribidi_benchmark_SOURCES = fribidi_benchmark.c $(GETOPT_SRC)
-fribidi_benchmark_LDADD = libfribidi.la
fribidi_create_char_types_SOURCES = fribidi_create_char_types.c packtab.c
This diff is collapsed.
diff -ruN gettext/gettext-runtime/libasprintf/Makefile.am gettext.old/gettext-runtime/libasprintf/Makefile.am
--- gettext/gettext-runtime/libasprintf/Makefile.am 2006-10-20 13:49:02.000000000 +0200
+++ gettext.old/gettext-runtime/libasprintf/Makefile.am 2006-11-03 01:30:44.000000000 +0100
@@ -98,7 +98,7 @@
# make autosprintf.pdf
all-local: html-local
-install-data-local: install-html
+install-data-local:
installdirs-local: installdirs-html
uninstall-local: uninstall-html
diff -ruN gettext/gettext-runtime/libasprintf/Makefile.in gettext.old/gettext-runtime/libasprintf/Makefile.in
--- gettext/gettext-runtime/libasprintf/Makefile.in 2006-11-03 01:56:38.000000000 +0100
+++ gettext.old/gettext-runtime/libasprintf/Makefile.in 2006-11-03 01:35:12.000000000 +0100
@@ -881,7 +881,7 @@
# make autosprintf.pdf
all-local: html-local
-install-data-local: install-html
+install-data-local:
installdirs-local: installdirs-html
uninstall-local: uninstall-html
# autosprintf.dvi and autosprintf.ps are already known to automake.
diff -ruN gettext/gettext-runtime/man/Makefile.in gettext.old/gettext-runtime/man/Makefile.in
--- gettext/gettext-runtime/man/Makefile.in 2006-11-03 01:56:28.000000000 +0100
+++ gettext.old/gettext-runtime/man/Makefile.in 2006-11-03 02:15:57.000000000 +0100
@@ -695,6 +695,8 @@
$(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
mv t-$@ $@
+install-html: install-html-local
+
install-html-local:
$(mkdir_p) $(DESTDIR)$(htmldir)
for file in $(man_HTML); do \
diff -ruN gettext/gettext-tools/man/Makefile.in gettext.old/gettext-tools/man/Makefile.in
--- gettext/gettext-tools/man/Makefile.in 2006-11-03 01:57:09.000000000 +0100
+++ gettext.old/gettext-tools/man/Makefile.in 2006-11-03 01:52:46.000000000 +0100
@@ -802,6 +802,8 @@
$(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
mv t-$@ $@
+install-html: install-html-local
+
install-html-local:
$(mkdir_p) $(DESTDIR)$(htmldir)
for file in $(man_HTML); do \
......@@ -53,8 +53,8 @@ FONTCONFIG_VERSION=2.4.2
FONTCONFIG_URL=http://fontconfig.org/release/fontconfig-$(FONTCONFIG_VERSION).tar.gz
FREETYPE2_VERSION=2.3.5
FREETYPE2_URL=$(SF)/freetype/freetype-$(FREETYPE2_VERSION).tar.gz
FRIBIDI_VERSION=0.10.4
FRIBIDI_URL=$(SF)/fribidi/fribidi-$(FRIBIDI_VERSION).tar.gz
FRIBIDI_VERSION=0.19.1
FRIBIDI_URL=http://fribidi.org/download/fribidi-$(FRIBIDI_VERSION).tar.gz
#FRIBIDI_URL=ftp://ftp.videolan.org/pub/testing/contrib/fribidi-$(FRIBIDI_VERSION).tar.bz2
A52DEC_VERSION=0.7.4
A52DEC_URL=$(VIDEOLAN)/testing/contrib/a52dec-$(A52DEC_VERSION).tar.gz
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment