- updated for yesterdays snap and for version 1.2.1 (I hope)

Changed files:
    scribus-nolibs.patch -> 1.2
    scribus-python.patch -> 1.5

diff --git a/scribus-nolibs.patch b/scribus-nolibs.patch
index 0e070a904cc7a07d6717a7528cf81c87a12a591a..a87a9324a939ac6c622e8a49e5df51682d4b1ae5 100644 (file)
--- a/scribus-nolibs.patch
+++ b/scribus-nolibs.patch
@@ -23,13 +23,3 @@
  LIBCUPS=""
  hacups=
  AC_CHECK_LIB(cups, httpConnect, [LIBCUPS="-lcups";hacups=yes],[LIBCUPS="";hacups=no])
---- scribus-0.9.9/acinclude.m4.orig    Sat Apr 19 20:31:18 2003
-+++ scribus-0.9.9/acinclude.m4 Wed May  7 12:51:16 2003
-@@ -705,7 +705,6 @@
- res_init(); 
- ],
-         LIBRESOLV="-lresolv"
--        X_EXTRA_LIBS="$X_EXTRA_LIBS $LIBRESOLV"
-         AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
-      )
-      LIBS=$kde_libs_safe

diff --git a/scribus-python.patch b/scribus-python.patch
index 24bdc2f50fceaf9f63ae347f0cb13a4ee27019f1..857e6f6c91e3f0ad4c1bf3cf9084db900b26186b 100644 (file)
--- a/scribus-python.patch
+++ b/scribus-python.patch
@@ -1,29 +1,20 @@
-diff -ur scribus-1.1.4/acinclude.m4 scribus-1.1.4-python/acinclude.m4
---- scribus-1.1.4/acinclude.m4 2003-12-19 22:29:43.000000000 +0100
-+++ scribus-1.1.4-python/acinclude.m4  2004-01-29 14:04:57.778323080 +0100
-@@ -3918,11 +3918,11 @@
+diff -ur scribus-1.2.1/acinclude.m4 scribus-1.2.1-patch/acinclude.m4
+--- scribus-1.2.1/acinclude.m4 2004-11-17 10:49:56.000000000 +0100
++++ scribus-1.2.1-patch/acinclude.m4   2004-11-18 13:30:11.421704096 +0100
+@@ -4114,7 +4114,7 @@
+ 
  PYTHONINC=-I$python_incdir
  
- python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
--AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
--if test ! -r $python_libdir/libpython$version.a; then
--  AC_FIND_FILE(python$version/config/libpython$version.a, $python_libdirs, python_libdir)
-+AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
-+if test ! -r $python_libdir/libpython$version.so; then
-+  AC_FIND_FILE(python$version/config/libpython$version.so, $python_libdirs, python_libdir)
-   python_libdir=$python_libdir/python$version/config
--  if test ! -r $python_libdir/libpython$version.a; then
-+  if test ! -r $python_libdir/libpython$version.so; then
-     python_libdir=no
-   fi
- fi
-@@ -3933,10 +3933,10 @@
+-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
++python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/share /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
+ AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
+ if test ! -r $python_libdir/libpython$version.so; then
+   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
+@@ -4133,9 +4133,9 @@
    LIBPYTHON=-lpython$version
  fi
  
--python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
 -AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
-+python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib /usr/share $kde_extra_libs"
 +AC_FIND_FILE(python$version/copy.pyo, $python_libdirs, python_moddir)
  python_moddir=$python_moddir/python$version
 -if test ! -r $python_moddir/copy.py; then