This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2004-08-15 10:59:26 UTC wolf <wolf@pld-linux.org> '- magic alphasparc fix'
Cherrypick from master 2007-06-14 16:09:42 UTC Jakub Bogusz <qboosh@pld-linux.org> '- updated for 2.0.1':
    expat-ac_fixes.patch -> 1.2
    expat-soname.patch -> 1.2

diff --git a/expat-ac_fixes.patch b/expat-ac_fixes.patch
index 1b94244a126a6a24bf55288f302770c88d8a490a..ebc5208bab3bfd4599b885cc60cf75d8e2930fd6 100644 (file)
--- a/expat-ac_fixes.patch
+++ b/expat-ac_fixes.patch
@@ -1,18 +1,15 @@
---- expat-1.95.6/configure.in~ Sat May 17 23:49:50 2003
-+++ expat-1.95.6/configure.in  Sat May 17 23:49:50 2003
-@@ -23,11 +23,7 @@
- dnl NOTE: esyscmd() is a GNU M4 extension. Thus, we wrap it in an appropriate
- dnl test. I believe this test will work, but I don't have a place with non-
- dnl GNU M4 to test it right now.
--define([expat_version], ifdef([__gnu__],
--                              [esyscmd(conftools/get-version.sh lib/expat.h)],
--                              [1.95.x]))
--AC_INIT(expat, expat_version, expat-bugs@mail.libexpat.org)
--undefine([expat_version])
-+AC_INIT(expat, 1.95.6, expat-bugs@mail.libexpat.org)
+diff -urN expat-2.0.0.org/configure.in expat-2.0.0/configure.in
+--- expat-2.0.0.org/configure.in       2006-01-11 02:10:46.000000000 +0100
++++ expat-2.0.0/configure.in   2006-04-09 18:08:18.483504500 +0200
+@@ -26,7 +26,7 @@
+ define([expat_version], ifdef([__gnu__],
+                               [esyscmd(conftools/get-version.sh lib/expat.h)],
+                               [2.0.x]))
+-AC_INIT(expat, expat_version, expat-bugs@libexpat.org)
++AC_INIT(expat, 2.0.0, expat-bugs@libexpat.org)
+ undefine([expat_version])
  
  AC_CONFIG_SRCDIR(Makefile.in)
- AC_CONFIG_AUX_DIR(conftools)
 @@ -50,9 +50,6 @@
  
  AC_CONFIG_HEADER(expat_config.h)
@@ -23,7 +20,7 @@
  AC_LIBTOOL_WIN32_DLL
  AC_PROG_LIBTOOL
  
-@@ -77,9 +77,7 @@
+@@ -83,9 +80,7 @@
  
  dnl Checks for typedefs, structures, and compiler characteristics.
  
@@ -33,4 +30,4 @@
 +AC_C_BIGENDIAN
  
  AC_C_CONST
- AC_TYPE_OFF_T
+ AC_TYPE_SIZE_T

diff --git a/expat-soname.patch b/expat-soname.patch
new file mode 100644 (file)
index 0000000..8fd504c
--- /dev/null
+++ b/expat-soname.patch
@@ -0,0 +1,11 @@
+--- expat-2.0.1/configure.in.orig      2006-04-18 23:08:39.531073000 +0200
++++ expat-2.0.1/configure.in   2006-04-18 23:18:45.256928500 +0200
+@@ -46,7 +46,7 @@
+ 
+ LIBCURRENT=6
+ LIBREVISION=2
+-LIBAGE=5
++LIBAGE=6
+ 
+ AC_CONFIG_HEADER(expat_config.h)
+