git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@4797 33e552b5-05e3-0310-8538-816dae2090ed

4 files changed, 178 insertions, 0 deletions

diff --git a/patches/blackbox-0.70.1/generic/blackbox-0.70.1-cppflags.diff b/patches/blackbox-0.70.1/generic/blackbox-0.70.1-cppflags.diff
new file mode 100644
index 000000000..2efb911f4
--- /dev/null
+++ b/patches/blackbox-0.70.1/generic/blackbox-0.70.1-cppflags.diff
@@ -0,0 +1,41 @@
+# 
+# Submitted-By: Robert Schwebel, 2006-02-27
+# Committed-By: Robert Schwebel
+#
+# Error: 
+#
+# Unspecified include paths are leaking in. 
+#
+# Description: 
+#
+# I'm not sure how somebody can invent such a braindamaged mechanism...
+# Note: prefix is specifying the run path, which isn't necessarily the
+# install path. 
+#
+# State:
+# 
+# Make configure.ac patch for upstream (not done yet). 
+#
+
+diff -urN blackbox-0.70.1/configure blackbox-0.70.1-ptx/configure
+--- blackbox-0.70.1/configure	2005-11-03 09:27:16.000000000 +0100
++++ blackbox-0.70.1-ptx/configure	2006-02-27 20:06:54.000000000 +0100
+@@ -1980,12 +1980,12 @@
+ 
+ test "x$prefix" = "xNONE" && prefix="$ac_default_prefix"
+ 
+-CPPFLAGS="$CPPFLAGS -I$prefix/include"
+-LDFLAGS="$LDFLAGS -L$prefix/lib"
+-if test "x$prefix" != "x/usr/local"; then
+-  CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-  LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-fi
++# CPPFLAGS="$CPPFLAGS -I$prefix/include"
++# LDFLAGS="$LDFLAGS -L$prefix/lib"
++# if test "x$prefix" != "x/usr/local"; then
++#   CPPFLAGS="$CPPFLAGS -I/usr/local/include"
++#   LDFLAGS="$LDFLAGS -L/usr/local/lib"
++# fi
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
diff --git a/patches/fontconfig-2.3.94/generic/fontconfig-2.3.94-expat.diff b/patches/fontconfig-2.3.94/generic/fontconfig-2.3.94-expat.diff
new file mode 100644
index 000000000..0f87e71c0
--- /dev/null
+++ b/patches/fontconfig-2.3.94/generic/fontconfig-2.3.94-expat.diff
@@ -0,0 +1,24 @@
+diff -urN fontconfig-2.3.94-orig/configure fontconfig-2.3.94/configure
+--- fontconfig-2.3.94-orig/configure	2006-02-24 20:19:34.000000000 +0100
++++ fontconfig-2.3.94/configure	2006-02-27 22:25:21.000000000 +0100
+@@ -20640,17 +20640,17 @@
+ 		yes)
+ 			case "$expat" in
+ 			yes)
+-				EXPAT_LIBS="-lexpat"
++				EXPAT_LIBS="-Wl,-lexpat"
+ 				;;
+ 			*)
+-				EXPAT_LIBS="-L$expat/lib -lexpat"
++				EXPAT_LIBS="-L$expat/lib -Wl,-lexpat"
+ 				;;
+ 			esac
+ 			;;
+ 		no)
+ 			;;
+ 		*)
+-			EXPAT_LIBS="-L$expat_lib -lexpat"
++			EXPAT_LIBS="-L$expat_lib -Wl,-lexpat"
+ 			;;
+ 		esac
+ 
diff --git a/patches/fontconfig-2.3.94/generic/fontconfig-2.3.94-tweak-freetype.diff b/patches/fontconfig-2.3.94/generic/fontconfig-2.3.94-tweak-freetype.diff
new file mode 100644
index 000000000..1894a0aa6
--- /dev/null
+++ b/patches/fontconfig-2.3.94/generic/fontconfig-2.3.94-tweak-freetype.diff
@@ -0,0 +1,101 @@
+# 
+# Submitted-By: Robert Schwebel, 2006-02-27
+# Committed-By: Robert Schwebel
+#
+# Error: 
+#
+# Programs don't link against libfreetype. 
+#
+# Description: 
+#
+# Needs to be fixed in a less tweaky way :-) 
+#
+# State:
+# 
+# unknown
+#
+
+diff -urN fontconfig-2.3.94/fc-cache/Makefile.in fontconfig-2.3.94-ptx/fc-cache/Makefile.in
+--- fontconfig-2.3.94/fc-cache/Makefile.in	2006-02-24 20:19:31.000000000 +0100
++++ fontconfig-2.3.94-ptx/fc-cache/Makefile.in	2006-02-27 22:58:17.000000000 +0100
+@@ -152,7 +152,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(FREETYPE_LIBS)
+ LIBTOOL = @LIBTOOL@
+ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
+ LIBXML2_LIBS = @LIBXML2_LIBS@
+diff -urN fontconfig-2.3.94/fc-case/Makefile.in fontconfig-2.3.94-ptx/fc-case/Makefile.in
+--- fontconfig-2.3.94/fc-case/Makefile.in	2006-02-24 20:19:31.000000000 +0100
++++ fontconfig-2.3.94-ptx/fc-case/Makefile.in	2006-02-27 22:58:42.000000000 +0100
+@@ -149,7 +149,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(FREETYPE_LIBS)
+ LIBTOOL = @LIBTOOL@
+ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
+ LIBXML2_LIBS = @LIBXML2_LIBS@
+diff -urN fontconfig-2.3.94/fc-cat/Makefile.in fontconfig-2.3.94-ptx/fc-cat/Makefile.in
+--- fontconfig-2.3.94/fc-cat/Makefile.in	2006-02-24 20:19:32.000000000 +0100
++++ fontconfig-2.3.94-ptx/fc-cat/Makefile.in	2006-02-27 22:58:58.000000000 +0100
+@@ -152,7 +152,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(FREETYPE_LIBS)
+ LIBTOOL = @LIBTOOL@
+ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
+ LIBXML2_LIBS = @LIBXML2_LIBS@
+diff -urN fontconfig-2.3.94/fc-glyphname/Makefile.in fontconfig-2.3.94-ptx/fc-glyphname/Makefile.in
+--- fontconfig-2.3.94/fc-glyphname/Makefile.in	2006-02-24 20:19:32.000000000 +0100
++++ fontconfig-2.3.94-ptx/fc-glyphname/Makefile.in	2006-02-27 22:59:22.000000000 +0100
+@@ -149,7 +149,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(FREETYPE_LIBS)
+ LIBTOOL = @LIBTOOL@
+ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
+ LIBXML2_LIBS = @LIBXML2_LIBS@
+diff -urN fontconfig-2.3.94/fc-lang/Makefile.in fontconfig-2.3.94-ptx/fc-lang/Makefile.in
+--- fontconfig-2.3.94/fc-lang/Makefile.in	2006-02-24 20:19:32.000000000 +0100
++++ fontconfig-2.3.94-ptx/fc-lang/Makefile.in	2006-02-27 22:59:39.000000000 +0100
+@@ -149,7 +149,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(FREETYPE_LIBS)
+ LIBTOOL = @LIBTOOL@
+ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
+ LIBXML2_LIBS = @LIBXML2_LIBS@
+diff -urN fontconfig-2.3.94/fc-list/Makefile.in fontconfig-2.3.94-ptx/fc-list/Makefile.in
+--- fontconfig-2.3.94/fc-list/Makefile.in	2006-02-24 20:19:32.000000000 +0100
++++ fontconfig-2.3.94-ptx/fc-list/Makefile.in	2006-02-27 22:59:58.000000000 +0100
+@@ -152,7 +152,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(FREETYPE_LIBS)
+ LIBTOOL = @LIBTOOL@
+ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
+ LIBXML2_LIBS = @LIBXML2_LIBS@
+diff -urN fontconfig-2.3.94/fc-match/Makefile.in fontconfig-2.3.94-ptx/fc-match/Makefile.in
+--- fontconfig-2.3.94/fc-match/Makefile.in	2006-02-24 20:19:32.000000000 +0100
++++ fontconfig-2.3.94-ptx/fc-match/Makefile.in	2006-02-27 23:00:15.000000000 +0100
+@@ -152,7 +152,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(FREETYPE_LIBS)
+ LIBTOOL = @LIBTOOL@
+ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
+ LIBXML2_LIBS = @LIBXML2_LIBS@
diff --git a/patches/freetype-2.1.9/generic/freetype-2.1.9-libtool.diff b/patches/freetype-2.1.9/generic/freetype-2.1.9-libtool.diff
new file mode 100644
index 000000000..7c6d81adf
--- /dev/null
+++ b/patches/freetype-2.1.9/generic/freetype-2.1.9-libtool.diff
@@ -0,0 +1,12 @@
+diff -urN freetype-2.1.9-orig/builds/unix/freetype-config.in freetype-2.1.9/builds/unix/freetype-config.in
+--- freetype-2.1.9-orig/builds/unix/freetype-config.in	2004-04-17 20:58:43.000000000 +0200
++++ freetype-2.1.9/builds/unix/freetype-config.in	2006-02-27 22:11:53.000000000 +0100
+@@ -118,7 +118,7 @@
+   if test "$enable_shared" = "yes" ; then
+     eval "rpath=\"$hardcode_libdir_flag_spec\""
+   fi
+-  libs="-lfreetype @LIBZ@"
++  libs="${wl}-lfreetype @LIBZ@"
+   if test "$libdir" != "/usr/lib" ; then
+     echo -L$libdir $rpath $libs
+   else