[arch-commits] Commit in openoffice-base-devel/trunk (4 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Fri Jul 23 13:20:20 EDT 2010


    Date: Friday, July 23, 2010 @ 13:20:19
  Author: andyrtr
Revision: 85987

prepare new snapshot DEV300_m85

Added:
  openoffice-base-devel/trunk/dictionaries-needs-th-gen-idx.pl.diff
Modified:
  openoffice-base-devel/trunk/ChangeLog
  openoffice-base-devel/trunk/PKGBUILD
  openoffice-base-devel/trunk/startcenter.desktop

---------------------------------------+
 ChangeLog                             |    8 +++
 PKGBUILD                              |   23 ++++++-----
 dictionaries-needs-th-gen-idx.pl.diff |   36 +++++++++++++++++
 startcenter.desktop                   |   66 ++++++++++++++++----------------
 4 files changed, 89 insertions(+), 44 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-07-23 16:32:16 UTC (rev 85986)
+++ ChangeLog	2010-07-23 17:20:19 UTC (rev 85987)
@@ -1,5 +1,11 @@
-2010-0717 Andreas Radke <andyrtr at archlinux.org>
+2010-07-23 Andreas Radke <andyrtr at archlinux.org>
 
+        * 3.3_dev300_m85-1:
+	- new snapshot
+	- add patch to build with system libmythes
+
+2010-07-17 Andreas Radke <andyrtr at archlinux.org>
+
         * 3.3_dev300_m84-1:
 	- disable PYTHONPATH changes in profile file
 	- remove system-mythes patch that went upstream

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-23 16:32:16 UTC (rev 85986)
+++ PKGBUILD	2010-07-23 17:20:19 UTC (rev 85987)
@@ -4,8 +4,8 @@
 
 pkgbase="openoffice-base-devel"
 pkgname=('openoffice-base-devel' 'openoffice-sdk-devel')
-_OO_milestone=DEV300_m84
-pkgver=3.3_${_OO_milestone/DEV/dev}
+_OO_milestone=DEV300_m85
+pkgver=3.4_${_OO_milestone/DEV/dev}
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
@@ -31,6 +31,7 @@
 	buildfix_FormulaMissingHeader.diff
 	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff
 	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/sal-cpprt-gcc-4.5-workaround.diff
+	dictionaries-needs-th-gen-idx.pl.diff
 	cppunit_gcc45.diff
 	openoffice.profile)
 options=('!distcc' '!ccache' '!makeflags')
@@ -71,6 +72,8 @@
 	# gcc4.5 fix
 	patch -Np0 -i ${srcdir}/cppu-lbnames-enable-gcc-4.5.diff
 	patch -Np0 -i ${srcdir}/sal-cpprt-gcc-4.5-workaround.diff
+	# http://www.openoffice.org/issues/show_bug.cgi?id=113223
+	patch -Np1 -i ${srcdir}/dictionaries-needs-th-gen-idx.pl.diff
 
 	# 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. 
@@ -88,7 +91,7 @@
 	  sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" ${srcdir}/${_OO_milestone}/solenv/inc/libs.mk
 	 else EXTRAOPTS="--with-stlport	--without-system-cppunit"
 	  # 	http://hg.services.openoffice.org/cws/sb122/raw-rev/f77b0e62cc92
-	  cp -v ${srcdir}/cppunit_gcc45.diff ${srcdir}/${_OO_milestone}/cppunit/ldflags.patch
+#	  cp -v ${srcdir}/cppunit_gcc45.diff ${srcdir}/${_OO_milestone}/cppunit/ldflags.patch
 	fi
 
 	cd ${srcdir}/${_OO_milestone}
@@ -231,14 +234,14 @@
 
         ## Step 1 
         cd ${pkgdir}/usr/lib/openoffice.org
-        mv ure/ basis3.3/
-        cd basis3.3
+        mv ure/ basis3.4/
+        cd basis3.4
         rm ure-link && mv ure ure-link
         ## Step 2
         cd ${pkgdir}/usr/lib/
-        mv openoffice.org/basis3.3/ openoffice.org3/
+        mv openoffice.org/basis3.4/ openoffice.org3/
         cd openoffice.org3/
-        rm basis-link && mv basis3.3 basis-link
+        rm basis-link && mv basis3.4 basis-link
         ## Step 3        
         cd ${pkgdir}/usr/lib/
         rmdir ${pkgdir}/usr/lib/openoffice.org
@@ -320,7 +323,7 @@
 	
 	cd ${pkgdir}/usr/share/applications/
 	sed -i -e 's|Icon=|Icon=dev-|g' ${pkgdir}/usr/share/applications/*.desktop
-	sed -i -e 's|OpenOffice\.org\ 3\.3|OpenOffice\.org\ devel|g' ${pkgdir}/usr/share/applications/*.desktop
+	sed -i -e 's|OpenOffice\.org\ 3\.4|OpenOffice\.org\ devel|g' ${pkgdir}/usr/share/applications/*.desktop
 
 	cd ${pkgdir}/usr/lib/openoffice-dev/program/
 	ln -sf /usr/lib/openoffice-dev/program/soffice.bin soffice-dev.bin
@@ -354,7 +357,7 @@
 	mv ${pkgdir}/opt/* ${pkgdir}/usr/lib/
 	rmdir ${pkgdir}/opt
 
-	cd ${pkgdir}/usr/lib/openoffice.org/basis3.3/sdk
+	cd ${pkgdir}/usr/lib/openoffice.org/basis3.4/sdk
 	
 	for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
         sed -e "s, at OO_SDK_NAME@,sdk," \
@@ -377,7 +380,7 @@
 	mv openoffice.org openoffice
 
  	cd ${pkgdir}/usr/lib/openoffice/
-	mv basis3.3 basis-link
+	mv basis3.4 basis-link
 
 	# fix ownership and permissions
 	chown root.root -R ${pkgdir}/

Added: dictionaries-needs-th-gen-idx.pl.diff
===================================================================
--- dictionaries-needs-th-gen-idx.pl.diff	                        (rev 0)
+++ dictionaries-needs-th-gen-idx.pl.diff	2010-07-23 17:20:19 UTC (rev 85987)
@@ -0,0 +1,36 @@
+diff --git a/dictionaries/prj/build.lst b/dictionaries/prj/build.lst
+--- a/dictionaries/prj/build.lst
++++ b/dictionaries/prj/build.lst
+@@ -1,4 +1,4 @@
+-di      dictionaries : soltools MYTHES:mythes NULL
++di      dictionaries : soltools mythes NULL
+ di	dictionaries					usr1 - all di_mkout NULL
+ di      dictionaries\af_ZA      nmake   -       all     di_af_ZA NULL
+ di      dictionaries\ca         nmake   -       all     di_ca NULL
+diff --git a/mythes/makefile.mk b/mythes/makefile.mk
+--- a/mythes/makefile.mk
++++ b/mythes/makefile.mk
+@@ -47,6 +47,8 @@
+ .IF "$(GUI)"=="UNX"
+ CONFIGURE_DIR=$(BUILD_DIR)
+ 
++.IF "$(SYSTEM_MYTHES)" != "YES"
++
+ .IF "$(SYSTEM_HUNSPELL)" != "YES"
+ HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell
+ HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.2
+@@ -74,14 +76,9 @@
+ CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
+ .ENDIF
+ 
+-.IF "$(SYSTEM_MYTHES)" == "YES"
+- at all:
+-	echo "Nothing to do here."
+-.ELSE
+ BUILD_ACTION=make
+ OUT2INC += mythes.hxx
+ .ENDIF
+-
+ .ENDIF # "$(GUI)"=="UNX"
+ 
+ 

Modified: startcenter.desktop
===================================================================
--- startcenter.desktop	2010-07-23 16:32:16 UTC (rev 85986)
+++ startcenter.desktop	2010-07-23 17:20:19 UTC (rev 85987)
@@ -8,41 +8,41 @@
 Categories=Office;X-SuSE-Core-Office;
 StartupNotify=false
 InitialPreference=5
-Name=OpenOffice.org 3.3
-Name[af]=OpenOffice.org 3.3
+Name=OpenOffice.org 3.4
+Name[af]=OpenOffice.org 3.4
 Name[ar]=أوبن أفيس.أورج
-Name[be at latin]=OpenOffice.org 3.3
-Name[ca]=OpenOffice.org 3.3
-Name[cs]=OpenOffice.org 3.3
-Name[da]=OpenOffice.org 3.3
-Name[de]=OpenOffice.org 3.3
+Name[be at latin]=OpenOffice.org 3.4
+Name[ca]=OpenOffice.org 3.4
+Name[cs]=OpenOffice.org 3.4
+Name[da]=OpenOffice.org 3.4
+Name[de]=OpenOffice.org 3.4
 Name[dz]=ཨོ་པཱན་ཨོ་ཕིསི.ཨོ་ཨར་ཇི།
-Name[el]=OpenOffice.org 3.3
-Name[en_CA]=OpenOffice.org 3.3
-Name[en_GB]=OpenOffice.org 3.3
-Name[es]=OpenOffice.org 3.3
-Name[et]=OpenOffice.org 3.3
-Name[eu]=OpenOffice.org 3.3
-Name[fi]=OpenOffice.org 3.3
-Name[fr]=OpenOffice.org 3.3
-Name[gl]=OpenOffice.org 3.3
-Name[he]=OpenOffice.org 3.3
-Name[hu]=OpenOffice.org 3.3
-Name[it]=OpenOffice.org 3.3
-Name[ko]=OpenOffice.org 3.3
-Name[lt]=OpenOffice.org 3.3
-Name[nb]=OpenOffice.org 3.3
+Name[el]=OpenOffice.org 3.4
+Name[en_CA]=OpenOffice.org 3.4
+Name[en_GB]=OpenOffice.org 3.4
+Name[es]=OpenOffice.org 3.4
+Name[et]=OpenOffice.org 3.4
+Name[eu]=OpenOffice.org 3.4
+Name[fi]=OpenOffice.org 3.4
+Name[fr]=OpenOffice.org 3.4
+Name[gl]=OpenOffice.org 3.4
+Name[he]=OpenOffice.org 3.4
+Name[hu]=OpenOffice.org 3.4
+Name[it]=OpenOffice.org 3.4
+Name[ko]=OpenOffice.org 3.4
+Name[lt]=OpenOffice.org 3.4
+Name[nb]=OpenOffice.org 3.4
 Name[ne]=ओपनअफिस डट अर्ग
-Name[nl]=OpenOffice.org 3.3
-Name[oc]=OpenOffice.org 3.3
-Name[pl]=OpenOffice.org 3.3
+Name[nl]=OpenOffice.org 3.4
+Name[oc]=OpenOffice.org 3.4
+Name[pl]=OpenOffice.org 3.4
 Name[ps]=اوپنافس.ورګ
-Name[pt]=OpenOffice.org 3.3
-Name[pt_BR]=OpenOffice.org 3.3
-Name[sl]=OpenOffice.org 3.3
-Name[sr]=OpenOffice.org 3.3
-Name[sr at latin]=OpenOffice.org 3.3
-Name[sv]=OpenOffice.org 3.3
-Name[vi]=OpenOffice.org 3.3
-Name[zh_CN]=OpenOffice.org 3.3
+Name[pt]=OpenOffice.org 3.4
+Name[pt_BR]=OpenOffice.org 3.4
+Name[sl]=OpenOffice.org 3.4
+Name[sr]=OpenOffice.org 3.4
+Name[sr at latin]=OpenOffice.org 3.4
+Name[sv]=OpenOffice.org 3.4
+Name[vi]=OpenOffice.org 3.4
+Name[zh_CN]=OpenOffice.org 3.4
 GenericName=Office



More information about the arch-commits mailing list