[arch-commits] Commit in openoffice-base-beta/repos (4 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Tue Nov 10 14:00:40 UTC 2009
Date: Tuesday, November 10, 2009 @ 09:00:39
Author: andyrtr
Revision: 58624
Merged revisions 58612 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/openoffice-base-beta/trunk
........
r58612 | andyrtr | 2009-11-10 11:38:53 +0100 (Di, 10 Nov 2009) | 2 lines
upgpkg: openoffice-base-beta 3.2.0_ooo320_m4-1
new version 3.2.0_ooo320_m4
........
Added:
openoffice-base-beta/repos/extra-i686/system-neon-fix.diff
(from rev 58612, openoffice-base-beta/trunk/system-neon-fix.diff)
Modified:
openoffice-base-beta/repos/extra-i686/ (properties)
openoffice-base-beta/repos/extra-i686/ChangeLog
openoffice-base-beta/repos/extra-i686/PKGBUILD
----------------------+
ChangeLog | 8 +++++++-
PKGBUILD | 5 ++++-
system-neon-fix.diff | 30 ++++++++++++++++++++++++++++++
3 files changed, 41 insertions(+), 2 deletions(-)
Property changes on: openoffice-base-beta/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /openoffice-base-beta/trunk:1-57560
+ /openoffice-base-beta/trunk:1-58622
Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog 2009-11-10 14:00:19 UTC (rev 58623)
+++ extra-i686/ChangeLog 2009-11-10 14:00:39 UTC (rev 58624)
@@ -1,6 +1,12 @@
+2009-11-09 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.2.0-OOO320_m4-1 :
+ - new snapshot
+ - fix build with system neon
+
2009-10-31 Andreas Radke <andyrtr at archlinux.org>
- * 3.2.0-OOO320_m2-1 :
+ * 3.2.0-OOO320_m3-1 :
- new snapshot
- add KDE4 support to the profile file + install msg
- install all built extensions
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-11-10 14:00:19 UTC (rev 58623)
+++ extra-i686/PKGBUILD 2009-11-10 14:00:39 UTC (rev 58624)
@@ -4,7 +4,7 @@
pkgbase="openoffice-base-beta"
pkgname=('openoffice-base-beta' 'openoffice-sdk-beta')
-_OO_milestone=OOO320_m3
+_OO_milestone=OOO320_m4
pkgver=3.2.0_${_OO_milestone/OOO/ooo} # m2=3.2.0 BETA
pkgrel=1
arch=('i686' 'x86_64')
@@ -29,6 +29,7 @@
buildfix-gcc44.diff
buildfix_FormulaMissingHeader.diff
buildfix_system_db48.diff
+ system-neon-fix.diff
openoffice-beta.profile)
options=('!distcc' '!ccache' '!makeflags')
@@ -60,6 +61,8 @@
patch -Np0 -i ${srcdir}/buildfix-gcc44.diff || return 1
patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
patch -Np0 -i ${srcdir}/buildfix_system_db48.diff || return 1
+ # http://www.openoffice.org/issues/show_bug.cgi?id=106757
+ patch -Np0 -i ${srcdir}/system-neon-fix.diff || return 1
# allows soffice to find the user's firefox profile so that it can read
# its digital certificates. Nss stores digital certificates in your mozilla firefox profile.
Copied: openoffice-base-beta/repos/extra-i686/system-neon-fix.diff (from rev 58612, openoffice-base-beta/trunk/system-neon-fix.diff)
===================================================================
--- extra-i686/system-neon-fix.diff (rev 0)
+++ extra-i686/system-neon-fix.diff 2009-11-10 14:00:39 UTC (rev 58624)
@@ -0,0 +1,30 @@
+Index: scp2/source/ooo/makefile.mk
+===================================================================
+--- scp2/source/ooo/makefile.mk (Revision 277420)
++++ scp2/source/ooo/makefile.mk (Arbeitskopie)
+@@ -212,6 +212,9 @@
+ .IF "$(DISABLE_NEON)" == "TRUE"
+ SCPDEFS+=-DDISABLE_NEON
+ .ENDIF
++.IF "$(SYSTEM_NEON)" == "YES"
++SCPDEFS+=-DSYSTEM_NEON
++.ENDIF
+
+ # if yes or unset (neon not used) -> do not install openssl library!
+ .IF $(SYSTEM_OPENSSL) != "YES"
+Index: source/ooo/file_library_ooo.scp
+===================================================================
+--- scp2/source/ooo/file_library_ooo.scp (Revision 277420)
++++ scp2/source/ooo/file_library_ooo.scp (Arbeitskopie)
+@@ -1547,8 +1547,10 @@
+
+ #ifndef DISABLE_NEON
+ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
++#ifndef SYSTEM_NEON
+ SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon)
+ #endif
++#endif
+
+ SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1)
+
+
More information about the arch-commits
mailing list