[arch-commits] CVS update of extra/office/openoffice-base (3 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Mon Sep 3 18:30:10 UTC 2007
Date: Monday, September 3, 2007 @ 14:30:10
Author: andyrtr
Path: /home/cvs-extra/extra/office/openoffice-base
Added: buildfix-agg_2_5_oog680_m3.diff (1.1) neon27-oog680_m3.diff (1.1)
Modified: PKGBUILD (1.48 -> 1.49)
updatepkg 2.3.0rc1
---------------------------------+
PKGBUILD | 51 +++++++++++++++++++++-------
buildfix-agg_2_5_oog680_m3.diff | 14 +++++++
neon27-oog680_m3.diff | 68 ++++++++++++++++++++++++++++++++++++++
3 files changed, 121 insertions(+), 12 deletions(-)
Index: extra/office/openoffice-base/PKGBUILD
diff -u extra/office/openoffice-base/PKGBUILD:1.48 extra/office/openoffice-base/PKGBUILD:1.49
--- extra/office/openoffice-base/PKGBUILD:1.48 Mon Aug 27 02:58:47 2007
+++ extra/office/openoffice-base/PKGBUILD Mon Sep 3 14:30:06 2007
@@ -3,17 +3,17 @@
pkgname=openoffice-base
pkgver=2.3.0
-pkgrel=0.15
+pkgrel=0.16
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
arch=(i686 x86_64)
-_OO_milestone=oog680-m2
+_OO_milestone=oog680-m3
license=('LGPL')
url="http://www.openoffice.org"
install=openoffice.install
depends=('ttf-dejavu' 'curl' 'desktop-file-utils' 'fontconfig>=2.4'
'gtk2>=2.10.11' 'hunspell>=1.1.5' 'icu' 'perl' 'python>=2.5' 'libwpd'
'xmlsec' 'libsndfile' 'startup-notification>=0.9' 'xalan-java' 'libxaw'
- 'libcups' 'hsqldb-java' 'gstreamer0.10-base') # 'neon>=0.27.0')
+ 'libcups' 'hsqldb-java' 'gstreamer0.10-base' 'neon>=0.27.0') #'agg'
# for gnu java/ecj
makedepends=('bison' 'ccache' 'cvs' 'curl' 'findutils'
'flex' 'gawk' 'gcc' 'kdelibs' 'libart-lgpl' 'pam' 'sane' 'zip'
@@ -57,7 +57,29 @@
fix-invisible-text.diff
system-xmlsec_oog680_m1.diff
gui-insensitive_oog680_m2.diff
+ neon27-oog680_m3.diff
+ buildfix-agg_2_5_oog680_m3.diff
awt_x86_64.diff)
+md5sums=('7653db8b5e2f73f299b4cc2f38527243'
+ 'bad5f30c661a7118768675b2d58bed57'
+ '18e281491eadda03ed661b0261be0c22'
+ 'd9475c3aaf879c294bd9bc692071bd41'
+ '0faab33566196ddc9c405d68cf614663'
+ '39e4c1b1e864b22ee4650b2bff44c695'
+ '16fd0652748039de238dd3374b364d0f'
+ '006bd83b71d1d85ad0c75478b17fabf6'
+ '777754df8f9a1d5d98a4dac2142f02d8'
+ '2b218f0c8672329eeaea8c1be1297a6d'
+ 'c5bbc077ad65add8feec1ae76fb4d9b5'
+ 'cfaf776e3254123f764c31cc93621e8b'
+ 'ab3305973c8665b2e48304221c8f10ca'
+ '50ca7bcb38d62062e861667fa8ce01eb'
+ '509697a7da6508ac9377b7750a57bfc4'
+ '42b45865406bdbff65ab50fa64443b93'
+ '4c76c07e867d51c416ea258220a90a6a'
+ '5fe090550df3ce4a3a6f203ab50d07b5'
+ '4f0da68601120267be643c9cdaca2772'
+ '83bb5e235c4e4062eed404829d760c14')
options=('!distcc' 'ccache' '!strip')
# see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
@@ -83,12 +105,17 @@
patch -Np0 -i ../buildfix-sc-vba_oog680_m1.diff || return 1
# allows internal Berkely db to build without java bindings.
patch -Np0 -i ../internal-db-no-java_oog680_m1.diff || return 1
+ # allows to build against neoin 0.27
+ patch -Np1 -i ../neon27-oog680_m3.diff || return 1
+ # allows to build against neoin 0.27
+ patch -Np0 -i ../buildfix-agg_2_5_oog680_m3.diff || return 1
+
# important bugfixes
# fix for invisible text with gcc 4.2 http://www.openoffice.org/issues/show_bug.cgi?id=78417
patch -Np0 -i ../fix-invisible-text.diff || return 1
# fix for database connection failure(requires and extra sed hack to work).
- patch -Np0 -i ../fix-dba-connectivity-i80338_oog680_m1.diff || return 1
+# patch -Np0 -i ../fix-dba-connectivity-i80338_oog680_m1.diff || return 1
# fix font hinting
patch -Np0 -i ../fix-font-hinting_oog680_m2.diff || return 1
@@ -100,7 +127,7 @@
# remove the startup wizard
patch -Np0 -i ../default-no-startup-wizard_oog680_m1.diff || return 1
# remove broken wizards (install dictionaries/fonts
- patch -Np0 -i ../remove-broken-wizards_oog680_m1.diff || return 1
+# patch -Np0 -i ../remove-broken-wizards_oog680_m1.diff || return 1
# enables the default system-file-picker in case we have that built
patch -Np0 -i ../default-system-fpicker_oog680_m1.diff || return 1
@@ -142,7 +169,6 @@
--disable-odk\
--disable-qadevooo\
--disable-systray\
- --disable-neon\
--disable-gpc\
--enable-gtk\
--enable-kde\
@@ -154,6 +180,7 @@
--enable-libsn\
--enable-vba\
--with-package-format=native\
+ --with-system-agg\
--with-system-db\
--with-system-cairo\
--with-system-curl\
@@ -166,6 +193,7 @@
--with-system-libxml\
--with-system-libxslt\
--with-system-mozilla\
+ --with-system-neon\
--with-system-python\
--with-system-sane-header\
--with-system-sndfile\
@@ -200,8 +228,6 @@
# --enable-dbgutil\ # breaks build
# --enable-symbols\
-# --with-system-neon\
-
#--enable-gcjaot\
# --without-ppds\ # some user want it back
@@ -288,14 +314,15 @@
rmdir $startdir/pkg/opt/openoffice/presets/psprint/{driver,fontmetric}
rmdir $startdir/pkg/opt/openoffice/presets/uno_packages/cache
rmdir $startdir/pkg/opt/openoffice/presets/{autocorr,store,Scripts,wordbook,backup,temp,psprint,uno_packages}
- #rmdir $startdir/pkg/opt/openoffice/share/samples/en-US - needed for starting the templates.desktop
- rmdir $startdir/pkg/opt/openoffice/share/uno_packages/cache
- rmdir $startdir/pkg/opt/openoffice/share/{samples,uno_packages}
+# rmdir $startdir/pkg/opt/openoffice/share/samples/en-US - needed for starting the templates.desktop
+# rmdir -rf $startdir/pkg/opt/openoffice/share/uno_packages/cache
+ rm -rf $startdir/pkg/opt/openoffice/share/uno_packages
+# rmdir $startdir/pkg/opt/openoffice/share/{samples,uno_packages}
# remove unecessary temp files if they exist
rm -f $startdir/pkg/opt/openoffice/program/root*.dat
rm -f $startdir/pkg/opt/openoffice/program/root*.dat.*
## CRITICAL ## Fix before 2.3.0
# Workaround for system hsqldb.jar until a new hsqldb version is released
- sed -i -e 's|jar file|jar;file|g' $startdir/pkg/opt/openoffice/program/jvmfwk3rc
+# sed -i -e 's|jar file|jar;file|g' $startdir/pkg/opt/openoffice/program/jvmfwk3rc
}
Index: extra/office/openoffice-base/buildfix-agg_2_5_oog680_m3.diff
diff -u /dev/null extra/office/openoffice-base/buildfix-agg_2_5_oog680_m3.diff:1.1
--- /dev/null Mon Sep 3 14:30:10 2007
+++ extra/office/openoffice-base/buildfix-agg_2_5_oog680_m3.diff Mon Sep 3 14:30:06 2007
@@ -0,0 +1,14 @@
+--- config_office/configure.in
++++ config_office/configure.in
+@@ -4072,7 +4072,10 @@
+ AGG_INCDIR="`echo $AGG_CFLAGS | $SED -e s/-I//`"
+ fi
+ # we could have used pkg-config --modversion but 2.4's libagg.pc.in still contains 2.3 :/
+- if $GREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then
++ if echo Detected agg version is `pkg-config --modversion libagg` | grep 2.5.0
++ then AGG_VERSION=2500
++ AC_MSG_RESULT([2.5])
++ elif $GREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then
+ AC_MSG_RESULT([2.4])
+ AGG_VERSION=2400
+ else
Index: extra/office/openoffice-base/neon27-oog680_m3.diff
diff -u /dev/null extra/office/openoffice-base/neon27-oog680_m3.diff:1.1
--- /dev/null Mon Sep 3 14:30:10 2007
+++ extra/office/openoffice-base/neon27-oog680_m3.diff Mon Sep 3 14:30:07 2007
@@ -0,0 +1,68 @@
+Index: source/ucp/webdav/NeonSession.cxx
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonSession.cxx,v
+retrieving revision 1.49
+diff -u -r1.49 NeonSession.cxx
+--- openoffice.org.orig/ucb/source/ucp/webdav/NeonSession.cxx 18 Jul 2007 07:55:41 -0000 1.49
++++ openoffice.org/ucb/source/ucp/webdav/NeonSession.cxx 23 Aug 2007 09:48:56 -0000
+@@ -364,32 +364,6 @@
+ }
+
+ // -------------------------------------------------------------------
+-extern "C" void NeonSession_ProgressNotify( void *,
+- off_t,
+- off_t )
+-{
+- // progress: bytes read so far
+- // total: total bytes to read, -1 -> total count not known
+-}
+-
+-// -------------------------------------------------------------------
+-extern "C" void NeonSession_StatusNotify( void *,
+- ne_conn_status,
+- const char * )
+-{
+-#if 0
+- typedef enum {
+- ne_conn_namelookup, /* lookup up hostname (info = hostname) */
+- ne_conn_connecting, /* connecting to host (info = hostname) */
+- ne_conn_connected, /* connected to host (info = hostname) */
+- ne_conn_secure /* connection now secure (info = crypto level) */
+- } ne_conn_status;
+-#endif
+-
+- // info: hostname
+-}
+-
+-// -------------------------------------------------------------------
+ extern "C" void NeonSession_PreSendRequest( ne_request * req,
+ void * userdata,
+ ne_buffer * headers )
+@@ -578,13 +552,6 @@
+ NeonUri::makeConnectionEndPointString(
+ m_aHostName, m_nPort ) );
+
+- // Set a progress callback for the session.
+- ne_set_progress( m_pHttpSession, NeonSession_ProgressNotify, this );
+-
+- // Set a status notification callback for the session, to report
+- // connection status.
+- ne_set_status( m_pHttpSession, NeonSession_StatusNotify, this );
+-
+ // Add hooks (i.e. for adding additional headers to the request)
+
+ #if 0
+diff -ru config_office/configure.in config_office/configure.in
+--- openoffice.org.orig/config_office/configure.in 2007-08-23 11:49:35.000000000 +0100
++++ openoffice.org/config_office/configure.in 2007-08-23 11:50:28.000000000 +0100
+@@ -4019,8 +4019,7 @@
+ if test -n "$with_system_neon" -o -n "$with_system_libs" && \
+ test "$with_system_neon" != "no"; then
+ AC_MSG_RESULT([external])
+- PKG_CHECK_MODULES(NEON, neon >= 0.26.0)
+- PKG_CHECK_MODULES(NEON, neon < 0.27.0, , AC_MSG_ERROR([you need neon 0.26.x for system-neon]))
++ PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for system-neon]))
+ NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
+ NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
+ SYSTEM_NEON=YES
+
More information about the arch-commits
mailing list