Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=748b303accec282eb8826667bc0b5aa0b200bd1c
commit 748b303accec282eb8826667bc0b5aa0b200bd1c
Author: VMiklos <[EMAIL PROTECTED]>
Date: Sat Jul 21 22:50:33 2007 +0200
openoffice.org-2.2.1-2-i686
added fix-invisible-text.diff
closes #2224
diff --git a/source/xapps/openoffice.org/FrugalBuild
b/source/xapps/openoffice.org/FrugalBuild
index 5c22483..1aa69ce 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -11,7 +11,7 @@ if [ ! "`check_option DEVEL`" ]; then
tree=oof680
milestone=18
pkgver=$upstream
- pkgrel=1
+ pkgrel=2
snapshot=20070628
else
upstream=2.2.0
@@ -37,8 +37,9 @@ archs=('i686' 'x86_64')
if [ ! "`check_option DEVEL`" ]; then
up2date="lynx -dump $url |grep version:|sed 's/.*: //'"
source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build-$branch-$snapshot.tar.bz2
\
-
http://hu.openoffice.org/source/browse/*checkout*/hu/src/2.2.0/SDF/hu.sdf.bz2)
- signatures=($source.asc '')
+
http://hu.openoffice.org/source/browse/*checkout*/hu/src/2.2.0/SDF/hu.sdf.bz2 \
+ fix-invisible-text.diff)
+ signatures=($source.asc '' '')
else
up2date="lynx -dump
http://svn.gnome.org/viewcvs/*checkout*/ooo-build/trunk/configure.in|grep
^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/${pkgver%%oo*}\1_\2/'"
source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build-$snapshot.tar.bz2
\
@@ -109,7 +110,7 @@ build() {
cp $Fsrcdir/hu.sdf src/GSI_hu.sdf || return 1
# Remove our patches so that incremental build will be possible.
- #rm -f patches/src680/disable-regcomp-python.diff
+ rm -f patches/src680/fix-invisible-text.diff
Fpatchall
# Defined $CARCH config
diff --git a/source/xapps/openoffice.org/fix-invisible-text.diff
b/source/xapps/openoffice.org/fix-invisible-text.diff
new file mode 100644
index 0000000..eb2c0b5
--- /dev/null
+++ b/source/xapps/openoffice.org/fix-invisible-text.diff
@@ -0,0 +1,25 @@
+diff -Naur ooo-build-2-2.orig/patches/src680/apply
ooo-build-2-2/patches/src680/apply
+--- ooo-build-2-2.orig/patches/src680/apply 2007-07-21 22:40:29.000000000
+0200
++++ ooo-build-2-2/patches/src680/apply 2007-07-21 22:46:46.000000000 +0200
+@@ -781,6 +781,7 @@
+ gcc401-stlport45-include.diff, gghibo
+ # needed by CXXHelpLinker
+ system-db-4.3-java-library-path.diff
++fix-invisible-text.diff
+
+
+ # ( [EMAIL PROTECTED] deals with defaults apparently )
+diff -Naur ooo-build-2-2.orig/patches/src680/fix-invisible-text.diff
ooo-build-2-2/patches/src680/fix-invisible-text.diff
+--- ooo-build-2-2.orig/patches/src680/fix-invisible-text.diff 1970-01-01
01:00:00.000000000 +0100
++++ ooo-build-2-2/patches/src680/fix-invisible-text.diff 2007-07-21
22:46:23.000000000 +0200
+@@ -0,0 +1,10 @@
++--- sw/source/core/bastyp/swregion.cxx
+++++ sw/source/core/bastyp/swregion.cxx
++@@ -79,6 +79,7 @@
++ {
++ if( rDel )
++ {
+++ pData = (SwRect*) pData;
++ *(pData+nPos) = rRect;
++ rDel = FALSE;
++ }
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
