[ooo-build-commit] .: 4 commits - bin/unpack configure.in download.in patches/dev300

Thorsten Behrens thorsten at kemper.freedesktop.org
Thu Jun 3 05:14:21 PDT 2010 

 bin/unpack                 |   21 ---------------------
 configure.in               |   12 ++++++------
 download.in                |    6 +++---
 patches/dev300/libwpd.diff |   17 ++++++++---------
 patches/dev300/libwpg.diff |    2 +-
 patches/dev300/libwps.diff |    2 +-
 6 files changed, 19 insertions(+), 41 deletions(-)

New commits:
commit 04bbf74614c9cde48374524b1ffeb43d1ddbacca
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Thu Jun 3 14:08:44 2010 +0200

    Adapting download/configure script to different libwp[sdg] names
    
    * configure.in:
    * download.in:

diff --git a/configure.in b/configure.in
index dd8468b..857a276 100644
--- a/configure.in
+++ b/configure.in
@@ -1303,9 +1303,9 @@ if test -n "$with_system_libwpd" && test "$with_system_libwpd" = "yes"; then
 else
     SYSTEM_LIBWPD=NO
     if test "$UNSTABLE_WP" = "YES"; then
-	LIBWPD_TARBALL=libwpd-0.9.0~CVS20081118.tar.gz
+	LIBWPD_TARBALL=32c8599f6f4cbb420e485288f74b398a-libwpd-0.9.0~CVS20081118.tar.gz
     else
-	LIBWPD_TARBALL=libwpd-0.8.14.tar.gz
+	LIBWPD_TARBALL=64d66018897d759358f454010b6e75d2-libwpd-0.8.14.tar.gz
     fi
 fi
 AC_SUBST(SYSTEM_LIBWPD)
@@ -1316,9 +1316,9 @@ if test -n "$with_system_libwps" && test "$with_system_libwps" = "yes"; then
 else
     SYSTEM_LIBWPS=NO
     if test "$UNSTABLE_WP" = "YES"; then
-	LIBWPS_TARBALL=libwps-0.2.0~CVS20081118.tar.gz
+	LIBWPS_TARBALL=3c77ef8cb348ab6f98ebf53961cc59ea-libwps-0.2.0~CVS20081118.tar.gz
     else
-	LIBWPS_TARBALL=libwps-0.1.2.tar.gz
+	LIBWPS_TARBALL=799fc3b835a79adce8c88a3fee0150c1-libwps-0.1.2.tar.gz
     fi
 fi
 AC_SUBST(SYSTEM_LIBWPS)
@@ -1329,9 +1329,9 @@ if test "$with_system_libwpg" = "yes"; then
 else
     SYSTEM_LIBWPG=NO
     if test "$UNSTABLE_WP" = "YES"; then
-	LIBWPG_TARBALL=libwpg-0.2.0~CVS20081118.tar.gz
+	LIBWPG_TARBALL=6f0defec3c4342c0f3e1a1fe50f3f5f9-libwpg-0.2.0~CVS20081118.tar.gz
     else
-	LIBWPG_TARBALL=libwpg-0.1.3.tar.gz
+	LIBWPG_TARBALL=db556b750bf3eac8481a4cc5e29e5af1-libwpg-0.1.3.tar.gz
     fi
 fi
 AC_SUBST(SYSTEM_LIBWPG)
diff --git a/download.in b/download.in
index 8457d26..997f58f 100755
--- a/download.in
+++ b/download.in
@@ -126,11 +126,11 @@ sub download_external_sources() {
 # Windows .ico icons
     'ooo-windows-icons-0.2.tar.bz2'     => '@MIRROR@/OOO300',
 # Updated libwpd
-    'libwpd-*'                           => '@MIRROR@/libwpd',
+    '*libwpd-*'                           => '@MIRROR@/libwpd',
 # MS Works importer bits
-    'libwps-*'                           => '@MIRROR@/SRC680',
+    '*libwps-*'                           => '@MIRROR@/SRC680',
 # WPG importer bits
-    'libwpg-*'                           => '@MIRROR@/SRC680',
+    '*libwpg-*'                           => '@MIRROR@/SRC680',
 # cairo sources
     'cairo-.*'			         => 'http://cairographics.org/releases/',
 # OxygenOffice extras
commit 952ed469675e56fa27041ec6124c5f492e301941
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Wed Jun 2 22:01:16 2010 +0200

    Move libwps tarball out of src tree
    
    * bin/unpack: removed cp to src tree
    * patches/dev300/libwps.diff: added md5 sum

diff --git a/bin/unpack b/bin/unpack
index 375d84b..1eda417 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -853,13 +853,6 @@ if test "$CAIRO_ENABLED" = "TRUE" -a "$SYSTEM_CAIRO" != "TRUE"; then
     $GNUCP $SRCDIR/cairo-${CAIRO_VER}.tar.gz $OOBUILDDIR/cairo/download/
 fi
 
-if test "$SYSTEM_LIBWPS" != "YES"; then
-  check_tarball $SRCDIR/$LIBWPS_TARBALL
-  echo "Copying libwps package into the tree"
-  mkdir -p $OOBUILDDIR/libwps/download || exit 1
-  $GNUCP $SRCDIR/$LIBWPS_TARBALL $OOBUILDDIR/libwps/download/ || exit 1
-fi
-
 # OxygenOffice extras
 for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLATES_PACK ; do
     check_file $SRCDIR/$pack
diff --git a/patches/dev300/libwps.diff b/patches/dev300/libwps.diff
index 33f11f1..f5cf44a 100644
--- a/patches/dev300/libwps.diff
+++ b/patches/dev300/libwps.diff
@@ -178,7 +178,7 @@ index 0000000..6837e45
 +.ENDIF
 +
 +TARFILE_NAME=libwps-0.1.2
-+#PATCH_FILE_NAME=$(TARFILE_NAME).diff
++TARFILE_MD5=799fc3b835a79adce8c88a3fee0150c1
 +BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 +BUILD_DIR=src/lib
 +
commit 756a82b4684b4f022e9a7887690e4d690941950b
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Wed Jun 2 21:58:40 2010 +0200

    Have libwpg stay in TARFILE_LOCATION
    
    * bin/unpack: removed cp to src tree
    * patches/dev300/libwpg.diff: added md5 sum

diff --git a/bin/unpack b/bin/unpack
index 7522953..375d84b 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -860,13 +860,6 @@ if test "$SYSTEM_LIBWPS" != "YES"; then
   $GNUCP $SRCDIR/$LIBWPS_TARBALL $OOBUILDDIR/libwps/download/ || exit 1
 fi
 
-if test "$SYSTEM_LIBWPG" != "YES"; then
-  check_tarball $SRCDIR/$LIBWPG_TARBALL
-  echo "Copying libwpg package into the tree"
-  mkdir -p $OOBUILDDIR/libwpg/download || exit 1
-  $GNUCP $SRCDIR/$LIBWPG_TARBALL $OOBUILDDIR/libwpg/download/ || exit 1
-fi
-
 # OxygenOffice extras
 for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLATES_PACK ; do
     check_file $SRCDIR/$pack
diff --git a/patches/dev300/libwpg.diff b/patches/dev300/libwpg.diff
index 7725d1d..fb8bd70 100644
--- a/patches/dev300/libwpg.diff
+++ b/patches/dev300/libwpg.diff
@@ -77,7 +77,7 @@ index 0000000..04b919c
 +.ENDIF
 +
 +TARFILE_NAME=libwpg-0.1.3
-+#PATCH_FILE_NAME=$(TARFILE_NAME).diff
++TARFILE_MD5=db556b750bf3eac8481a4cc5e29e5af1
 +BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 +BUILD_DIR=src/lib
 +
commit a64b3802cc6586906ba917830ae59b3989f09dd4
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Wed Jun 2 21:42:07 2010 +0200

    Have updated libwpd stay in TARFILE_LOCATION
    
    * bin/unpack: no need to copy anymore
    * patches/dev300/libwpd.diff: no in-tree tarfile anymore

diff --git a/bin/unpack b/bin/unpack
index 096ce4f..7522953 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -853,13 +853,6 @@ if test "$CAIRO_ENABLED" = "TRUE" -a "$SYSTEM_CAIRO" != "TRUE"; then
     $GNUCP $SRCDIR/cairo-${CAIRO_VER}.tar.gz $OOBUILDDIR/cairo/download/
 fi
 
-if test "$SYSTEM_LIBWPD" != "YES"; then
-  check_tarball $SRCDIR/$LIBWPD_TARBALL
-  echo "Copying libwpd package into the tree"
-  mkdir -p $OOBUILDDIR/libwpd/download || exit 1
-  $GNUCP $SRCDIR/$LIBWPD_TARBALL $OOBUILDDIR/libwpd/download/ || exit 1
-fi
-
 if test "$SYSTEM_LIBWPS" != "YES"; then
   check_tarball $SRCDIR/$LIBWPS_TARBALL
   echo "Copying libwps package into the tree"
diff --git a/patches/dev300/libwpd.diff b/patches/dev300/libwpd.diff
index 2ce4011..09f3859 100644
--- a/patches/dev300/libwpd.diff
+++ b/patches/dev300/libwpd.diff
@@ -1,14 +1,16 @@
-From 20110da47287a4447e5cb5337a86ac6fc2c7ca7b Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 16:53:54 +0200
-Subject: [PATCH 061/768] libwpd.diff
+Up-to-date libwpd version
+
+From: Thorsten Behrens <thb at openoffice.org>
+
 
 ---
+
  libwpd/makefile.mk |    5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)
 
+
 diff --git libwpd/makefile.mk libwpd/makefile.mk
-index abca6ff..9beba21 100644
+index abca6ff..104d79f 100644
 --- libwpd/makefile.mk
 +++ libwpd/makefile.mk
 @@ -41,9 +41,8 @@ TARGET=wpd
@@ -19,10 +21,7 @@ index abca6ff..9beba21 100644
 -TARFILE_MD5=cd5997284f4ba1e8dde5d1e5869fc342
 -PATCH_FILES=$(TARFILE_NAME).diff
 +TARFILE_NAME=libwpd-0.8.14
-+#PATCH_FILES=$(TARFILE_NAME).diff
++TARFILE_MD5=64d66018897d759358f454010b6e75d2
  BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
  BUILD_DIR=src$/lib
  
--- 
-1.7.0.1
-

More information about the ooo-build-commit mailing list