[arch-commits] Commit in go-openoffice/repos/extra-i686 (5 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sat Sep 5 11:43:19 UTC 2009
Date: Saturday, September 5, 2009 @ 07:43:19
Author: andyrtr
Revision: 51145
fix svn conflicts
Deleted:
go-openoffice/repos/extra-i686/ArchLinux.patch
go-openoffice/repos/extra-i686/ChangeLog
go-openoffice/repos/extra-i686/PKGBUILD
go-openoffice/repos/extra-i686/go-openoffice.install
go-openoffice/repos/extra-i686/ooo_getline.diff
-----------------------+
ArchLinux.patch | 11 ---
ChangeLog | 98 ---------------------------
PKGBUILD | 169 ------------------------------------------------
go-openoffice.install | 20 -----
ooo_getline.diff | 43 ------------
5 files changed, 341 deletions(-)
Deleted: ArchLinux.patch
===================================================================
--- ArchLinux.patch 2009-09-05 11:27:43 UTC (rev 51144)
+++ ArchLinux.patch 2009-09-05 11:43:19 UTC (rev 51145)
@@ -1,11 +0,0 @@
---- patches/dev300/apply 2009-05-07 19:44:13.000000000 +0000
-+++ patches/dev300/apply.new 2009-05-11 18:46:58.108316633 +0000
-@@ -108,7 +108,7 @@
- rpl2: rPathCommon
- rpl2-64: rPathCommon
- # ArchLinux
--ArchLinux: LinuxCommon
-+ArchLinux: LinuxCommon, NotDebian, CairoFonts, Shrink, Lockdown, OOXMLExport, Gcc44
- # Win32
- Win32 : Win32Common
- # translate.org.za
Deleted: ChangeLog
===================================================================
--- ChangeLog 2009-09-05 11:27:43 UTC (rev 51144)
+++ ChangeLog 2009-09-05 11:43:19 UTC (rev 51145)
@@ -1,98 +0,0 @@
-2009-08-21 Andreas Radke <andyrtr at archlinux.org>
-
- * 3.1.0.99.3-1 :
- new upstrem release = go-oo 3.1.1 beta 3
- backup sofficerc file for
- http://bugs.archlinux.org/task/15161
-
-2009-08-05 Andreas Radke <andyrtr at archlinux.org>
-
- * 3.1.0.99.2-1 :
- new upstrem release = go-oo 3.1.1 beta 2
-
-2009-07-04 Andreas Radke <andyrtr at archlinux.org>
-
- * 3.1.0.98.2-2 :
- rebuild with lowered compiler optimizations
- http://bugs.archlinux.org/task/15290
-
-2009-07-02 Andreas Radke <andyrtr at archlinux.org>
-
- * 3.1.0.98.2-1 :
- new upstrem release = go-oo 3.1.1 alpha 2
- build with system libjpeg 7
- rebuild for xulrunner, hotfix patch added from Fedora
- change install path name (remove releaseversion in path)
-
-2009-06-24 Andreas Radke <andyrtr at archlinux.org>
-
- * 3.1.0.98.1-1 :
- new upstrem release = go-oo 3.1.1 alpha 1
- enable OOXMLExport patch section needed by some other patches
- enable experimental kde integration
-
-2009-06-03 Andreas Radke <andyrtr at archlinux.org>
-
- * 3.1.0-1 :
- 3.1.0.6 rebuild against new icu, rc7 = final
-
-2009-05-29 Andreas Radke <andyrtr at archlinux.org>
-
- * 3.1.0.6-1 :
- new upstream release = go-oo 3.1.0 rc7
-
-2009-05-22 Andreas Radke <andyrtr at archlinux.org>
-
- * 3.1.0.4-1 :
- new upstream release = go-oo 3.1.0 rc5
-
-2009-05-22 Andreas Radke <andyrtr at archlinux.org>
-
- * 3.1.0.3-1 :
- new upstream release = go-oo 3.1.0 rc4
- *cancelled*
-
-2009-05-19 Andreas Radke <andyrtr at archlinux.org>
-
- * 3.1.0.2-1 :
- new upstream release = go-oo 3.1.0 rc3
-
-2009-05-16 Andreas Radke <andyrtr at archlinux.org>
-
- * 3.1.0.1-1 :
- new upstream release = go-oo 3.1.0 rc2
-
-2009-05-11 Andreas Radke <andyrtr at archlinux.org>
-
- * 3.1.0.0-1 :
- new upstream release = go-oo 3.1.0 rc1
- add NotDebian, CairoFonts, Shrink, Lockdown, Gcc44
- sections to ArchLinux patches, not yet upstream
-
-2009-05-02 Andreas Radke <andyrtr at archlinux.org>
-
- * 3.0.99.7-2 :
- build without stlport on x86_64 and with on i686
- to fix extensions (e.g. SunPDFImport)
- try move mono and gstreamer to optdepends
-
-2009-04-25 Andreas Radke <andyrtr at archlinux.org>
-
- * 3.0.99.7-1 :
- new upstream release, OOo 310_m11=3.1.0rc2
- fix project url
- rediff the ArchLinux.patch - will send it upstream now
-
-2009-04-25 Andreas Radke <andyrtr at archlinux.org>
-
- * 3.0.99.6-1 :
- new upstream pre-release
- manually install all built dicts+extension
-
-2009-04-04 Andreas Radke <andyrtr at archlinux.org>
-
- * 3.0.99.4-1 :
- initial ArchLinux pkg
- based on the vanilla OOo-base-beta pkg
- known issue: Xfce menu does not show icons
- and dictionaries are not present
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2009-09-05 11:27:43 UTC (rev 51144)
+++ PKGBUILD 2009-09-05 11:43:19 UTC (rev 51145)
@@ -1,169 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-
-pkgname=go-openoffice
-pkgver=3.1.0.99.3
-_GOver=3.1.0.99.3 # = 3.1.1.beta3
-pkgrel=1
-pkgdesc="OpenOffice.org - go-oo.org enhanced version of SUN's office suite"
-arch=('i686' 'x86_64')
-_go_tree="OOO310"
-_ootag=ooo310-m18 # m19 = OOo 3.1.1 RC2 = final?
-license=('LGPL3')
-url="http://go-oo.org/"
-install=${pkgname}.install
-depends=("curl>=7.19.5" "hunspell>=1.2.8" "python>=2.6.2" 'libwpd' 'redland'
- 'libxaw' "neon>=0.28.4" "icu>=4.2.1" 'hsqldb-java' 'libxslt' 'libxtst'
- 'hicolor-icon-theme' 'shared-mime-info' 'desktop-file-utils')
-optdepends=('java-runtime: adds java support'
- 'libcups: adds printing support'
- 'gconf: adds additional gnome support'
- 'nss: adds support for signed files/macros'
- 'pstoedit: translates PostScript and PDF graphics into other vector formats'
- 'poppler: for the pdfimport extension'
- 'mesa: for the OGLTrans extension'
- 'mono: allows UNO automation with Mono'
- 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress'
- 'kdelibs: for kde integration')
-makedepends=('automake' 'autoconf' 'wget' 'bison' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl'
- 'pam' 'sane' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.1.2" 'apache-ant' 'cairo'
- 'gperf' 'libcups' 'pstoedit' 'gconf' "openjdk6>=1.5-4" 'unixodbc' 'mesa>=7.5' 'poppler>=0.10.7'
- 'gstreamer0.10-base>=0.10.23' 'mono>=2.4.2' 'kdelibs>=4.3.0') # 'boost' # 'libjpeg'
-backup=(usr/lib/go-openoffice/program/sofficerc)
-provides=('openoffice-base')
-conflicts=('openoffice-base')
-_mirror="http://download.go-oo.org/"
-source=(${_mirror}/${_go_tree}/ooo-build-${_GOver}.tar.gz
- ArchLinux.patch
- http://download.go-oo.org//DEV300/ooo-cli-prebuilt-3.1.1.tar.bz2
- http://cairographics.org/releases//cairo-1.4.10.tar.gz
- http://download.go-oo.org//SRC680/mdbtools-0.6pre1.tar.gz
- ${_mirror}/${_go_tree}/${_ootag}-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions}.tar.bz2
- http://download.go-oo.org//SRC680/extras-3.tar.bz2
- http://download.go-oo.org//SRC680/biblio.tar.bz2
- http://tools.openoffice.org/unowinreg_prebuild/680//unowinreg.dll
- http://download.go-oo.org//DEV300/scsolver.2008-10-30.tar.bz2
- http://download.go-oo.org//libwpd/libwpd-0.8.14.tar.gz
- http://download.go-oo.org//SRC680/libwps-0.1.2.tar.gz
- http://download.go-oo.org//SRC680/libwpg-0.1.3.tar.gz
- http://download.go-oo.org//DEV300/ooo_oxygen_images-2009-06-17.tar.gz
- buildfix_64bit_system_libjpeg.diff
- openoffice.org-3.0.1.oooXXXXX.extensions.npapi.diff)
-#options=('!distcc' '!ccache' '!makeflags')
-noextract=(ooo-cli-prebuilt-3.1.1.tar.bz2 cairo-1.4.10.tar.gz mdbtools-0.6pre1.tar.gz
- ${_ootag}-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions}.tar.bz2
- extras-3.tar.bz2 biblio.tar.bz2 unowinreg.dll scsolver.2008-10-30.tar.bz2 libwpd-0.8.14.tar.gz libwps-0.1.2.tar.gz libwpg-0.1.3.tar.gz ooo_oxygen_images-2009-06-17.tar.gz)
-md5sums=('89c911c8713dc3064fb1763b6b61b950'
- 'a1ff3d64d0ca95c62a15c07e7f19f193'
- '222a42af5b874ea15dbafd07b2381aee'
- '5598a5e500ad922e37b159dee72fc993'
- '246e8f38b2a1af1bcff60ee0da59300b'
- 'd043092dfd2974bedb036854f4b2c2f5'
- 'c29fe7996b06f62737d0f1680509cfbe'
- 'bbd4c7e9a9cc5799eead5b67f36543f9'
- '914f14c4d35196591587ee031b31dfe0'
- '61740e0521533543c5a26da98d24ebd0'
- 'b8ed343ef9e91ef51b6b38d54e8d45ac'
- '37c24740dc5f2ed6fb4f350b8b4b9d2b'
- 'aec3f1df346047bcfc3fa8d47bc6d121'
- '38fef95dcd5353f08857905a635c4e42'
- '4bc0e0ad22553ff49e70fe42c01dc049'
- 'd23e742eab8441d0d7209995f3b343f6'
- 'cae346105f5990509c47f2af265838f6'
- '02f475d2f6c4f58d4227b55e69c50a66'
- 'f6485d55a78b3f5bb6fef47c19a124a7'
- 'db066f855e529b3fbddf13c5c42378cb'
- 'a91f198250264e9690bdc0d87488e2cf'
- '93ab00c3a60d49caa028d8ad6a859ea9'
- '278eb4eba6b7d80f2b1fce62e23285fc'
- '1403588a9ccc0cd528172d2b4036a970'
- '36f323a55ee83e9dc968e1b92569b62a'
- '1948e39a68f12bfa0b7eb309c14d940c'
- 'e3a0b76dcd876f3d721ee7183729153d'
- '04181e5ef82973eb349d3122a19d2274'
- '64d66018897d759358f454010b6e75d2'
- '799fc3b835a79adce8c88a3fee0150c1'
- 'db556b750bf3eac8481a4cc5e29e5af1'
- '0b3ffc43231c525db1798495a6676902'
- 'b005c4cf9f8e586539ca98c9cfe9bb77'
- '6573ab0f3893806b366b06d575c4f547')
-
-build() {
- unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
- [ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh
- [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
-
- cd ${srcdir}/ooo-build-${_GOver}
-
- # our ArchLinux distribution patch until we go upstream
- patch -Np0 -i ${srcdir}/ArchLinux.patch || return 1
-
- # hotfixes not yet upstream
-# cp ${srcdir}/*.diff ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
- cp ${srcdir}/buildfix_64bit_system_libjpeg.diff ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
- cp ${srcdir}/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.diff ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
-
- # export C(XX)FLAGS
- # http://www.openoffice.org/issues/show_bug.cgi?id=103205
- unset CFLAGS
- unset CXXFLAGS
-# export ARCH_FLAGS="$CFLAGS"
-
- if [ "$CARCH" = "x86_64" ]; then
- EXTRAOPTS="--without-stlport"
- else EXTRAOPTS="--with-stlport"
- fi
-
-# autoreconf
- ./configure --with-distro=ArchLinux \
- --with-build-version="${_GOver} ArchLinux build-${pkgrel} (${_ootag})"\
- --with-srcdir=${srcdir} \
- --with-max-jobs=${MAKEFLAGS/-j/} \
- --with-installed-ooo-dirname="${pkgname}" \
- --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
- --with-docdir=/usr/share/doc/packages/"${pkgname}" \
- --mandir=/usr/share/man \
- --with-lang="en-US" \
- --with-dict=ALL\
- --with-binsuffix=no \
- --disable-ldap \
- --enable-cairo\
- --disable-kde\
- --enable-kde4\
- --enable-lockdown\
- --with-system-cairo\
- --enable-crashdump\
- --without-gpc\
- --enable-opengl \
- --enable-minimizer \
- --enable-presenter-console \
- --enable-pdfimport \
- --enable-wiki-publisher \
- --enable-ogltrans \
- --with-ant-home="/usr/share/java/apache-ant"\
- $EXTRAOPTS || return 1
-
-# --with-tag=${_ootag}
-# --enable-report-builder \
-# --with-additional-sections="OOXMLExport"
-
- unset MAKEFLAGS
- ./download
- make || return 1
- make DESTDIR=${pkgdir} install || return 1
-
- # install all built dictionaries from source tree
- pushd ${srcdir}/ooo-build-${_GOver}/build/${_ootag}/dictionaries/unxlng?6.pro/bin/
- for i in `ls -1 dict-??.oxt`; do
- install -D -m644 $i ${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/$i || return 1
- done
- popd
-
- # install all other built extensions
- pushd ${srcdir}/ooo-build-${_GOver}/build/${_ootag}/solver/310/unxlng?6.pro/bin/
- install -m644 pdfimport/pdfimport.oxt ${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/pdfimport.oxt || return 1
- install -m644 swext/wiki-publisher.oxt ${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/wiki-publisher.oxt || return 1
- install -m644 minimizer/sun-presentation-minimizer.oxt ${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/sun-presentation-minimizer.oxt || return 1
- install -m644 presenter/presenter-screen.oxt ${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/presenter-screen.oxt || return 1
- popd
-}
Deleted: go-openoffice.install
===================================================================
--- go-openoffice.install 2009-09-05 11:27:43 UTC (rev 51144)
+++ go-openoffice.install 2009-09-05 11:43:19 UTC (rev 51145)
@@ -1,20 +0,0 @@
-post_install() {
-
-gtk-update-icon-cache -f -q /usr/share/icons/hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime
-
-echo " see http://wiki.archlinux.org/index.php/Openoffice"
-echo " how to use extensions, e.g. for spell checking"
-echo " see /usr/lib/go-openoffice/share/extension/install what"
-echo " is shipped with this package"
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
-update-desktop-database -q
-gtk-update-icon-cache -f -q /usr/share/icons/hicolor
-}
Deleted: ooo_getline.diff
===================================================================
--- ooo_getline.diff 2009-09-05 11:27:43 UTC (rev 51144)
+++ ooo_getline.diff 2009-09-05 11:43:19 UTC (rev 51145)
@@ -1,43 +0,0 @@
---- soltools/mkdepend/def.h.orig 2009-05-18 15:28:59.000000000 +0200
-+++ soltools/mkdepend/def.h 2009-05-18 15:29:36.000000000 +0200
-@@ -154,7 +154,7 @@
-
- char *copy();
- char *base_name();
--char *getline();
-+char *ooo_getline();
- char *isdefined();
- struct filepointer *getfile();
- struct inclist *newinclude();
---- soltools/mkdepend/main.c.orig 2009-05-18 15:29:08.000000000 +0200
-+++ soltools/mkdepend/main.c 2009-05-18 15:30:23.000000000 +0200
-@@ -548,7 +548,7 @@
- * Get the next line. We only return lines beginning with '#' since that
- * is all this program is ever interested in.
- */
--char *getline(filep)
-+char *ooo_getline(filep)
- register struct filepointer *filep;
- {
- register char *p, /* walking pointer */
---- soltools/mkdepend/parse.c.orig 2009-05-18 15:29:17.000000000 +0200
-+++ soltools/mkdepend/parse.c 2009-05-18 15:30:43.000000000 +0200
-@@ -45,7 +45,7 @@
- register int type;
- boolean recfailOK;
-
-- while ((line = getline(filep))) {
-+ while ((line = ooo_getline(filep))) {
- switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) {
- case IF:
- doif:
-@@ -168,7 +168,7 @@
- register char *line;
- register int type;
-
-- while ((line = getline(filep))) {
-+ while ((line = ooo_getline(filep))) {
- switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
- case IF:
- case IFFALSE:
-
More information about the arch-commits
mailing list