Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4853d466d7b46609ba72a1e90436daf42bbb16f0
commit 4853d466d7b46609ba72a1e90436daf42bbb16f0
Author: Miklos Vajna
Date: Fri May 8 09:18:17 2009 +0200
openoffice.org-3.0.1-1-i686
- prepare version bump to 3.1
- add fix for mono-2.4
- disable ODK for now (breaks the build)
diff --git a/source/xapps/openoffice.org/FrugalBuild
b/source/xapps/openoffice.org/FrugalBuild
index 5b7ea70..52a2611 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -14,14 +14,14 @@ if ! Fuse $USE_DEVEL; then
pkgrel=1
snapshot=r15151
else
- upstream=3.0.1
- branch=-3-0-1
- tree=ooo300
+ upstream=3.1.0
+ branch=-3-1
+ tree=ooo310
dir=`echo $tree|tr [a-z] [A-Z]`
- milestone=15
+ milestone=11
pkgver=$upstream${tree}_m$milestone
pkgrel=1
- snapshot=r15151
+ snapshot=bb48d86
fi
pkgdesc="OpenOffice.org, a full office productivity suite."
url="http://www.openoffice.org/";
@@ -51,7 +51,8 @@ else
up2date="lynx -dump
http://svn.gnome.org/viewcvs/ooo-build/$path/configure.in?view=markup |grep
^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/$upstream\1_\2/'"
fi
source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2
\
-http://download.go-oo.org/$dir/$tree-m$milestone-{ure,sdk,base,calc,l10n,writer,impress,artwork,filters,testing,bootstrap,libs_gui,libs_core,libs_extern,components,postprocess,libs_extern_sys,extensions}.tar.bz2)
+http://download.go-oo.org/$dir/$tree-m$milestone-{ure,sdk,base,calc,writer,impress,artwork,filters,testing,bootstrap,libs-gui,libs-core,libs-extern,components,postprocess,libs-extern-sys,extensions}.tar.bz2
\
+mono24-hack)
signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
NOEXTRACT=1
options=(${optio...@]} 'scriptlet')
@@ -146,6 +147,7 @@ build()
else
Fcd ooo-build
fi
+ cp -fv $Fsrcdir/mono24-hack patches/hotfixes/mono24-hack.diff || Fdie
# Predownloaded tarballs
for i in $Fsrcdir/$tree-m$milestone-*
@@ -167,7 +169,7 @@ build()
# SMP build
if [ ! -z "$MAKEFLAGS" ]; then
# Comment this out if you think the build failed because of being SMP.
- Fconfopts="$Fconfopts --with-num-cpus=${MAKEFLAGS/-j}"
+ #Fconfopts="$Fconfopts --with-num-cpus=${MAKEFLAGS/-j}"
unset MAKEFLAGS
fi
@@ -180,7 +182,8 @@ build()
--enable-gtk \
--with-binsuffix=no \
--disable-dependency-tracking \
- --with-installed-ooo-dirname=openoffice.org"
+ --with-installed-ooo-dirname=openoffice.org\
+ --disable-odk"
# Set our version.
Fsed "AC_PACKAGE_VERSION" "$pkgver-$pkgrel" configure.in
diff --git a/source/xapps/openoffice.org/mono24-hack
b/source/xapps/openoffice.org/mono24-hack
new file mode 100644
index 000..b1b55f8
--- /dev/null
+++ b/source/xapps/openoffice.org/mono24-hack
@@ -0,0 +1,22 @@
+See https://bugzilla.novell.com/show_bug.cgi?id=495112
+
+--- cli_ure/source/mono_bridge/typedescription.cs.old 2009-04-15
12:24:38.0 +0200
cli_ure/source/mono_bridge/typedescription.cs 2009-04-15
16:05:34.0 +0200
+@@ -85,7 +85,7 @@ public unsafe struct TypeDescriptionRefe
+ public uno.rtl.UString * pTypeName;
+ /** pointer to full typedescription; this value is only valid if the type
is never swapped out
+ */
+-public TypeDescription * pType;
++public void * pType;
+ /** pointer to optimize the runtime; not for public use
+ */
+ public void * pUniqueIdentifier;
+@@ -136,7 +136,7 @@ public unsafe struct TypeDescription
+ public uno.rtl.UString * pTypeName;
+ /** pointer to self to distinguish reference from description; for
internal use only
+ */
+-public TypeDescription * pSelf;
++public void * pSelf;
+ /** pointer to optimize the runtime; not for public use
+ */
+ public void * pUniqueIdentifier;
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
