Date: Wednesday, August 11, 2010 @ 13:50:15
Author: andyrtr
Revision: 87272
upgpkg: openoffice-base-devel 3.4_dev300_m86-1
new version 3.4_dev300_m86-1
Modified:
openoffice-base-devel/trunk/ChangeLog
openoffice-base-devel/trunk/PKGBUILD
Deleted:
openoffice-base-devel/trunk/dictionaries-needs-th-gen-idx.pl.diff
---------------------------------------+
ChangeLog | 4 ++-
PKGBUILD | 20 +++--------------
dictionaries-needs-th-gen-idx.pl.diff | 36 --------------------------------
3 files changed, 7 insertions(+), 53 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-08-11 15:57:56 UTC (rev 87271)
+++ ChangeLog 2010-08-11 17:50:15 UTC (rev 87272)
@@ -1,7 +1,9 @@
-2010-08-04 Andreas Radke <andyrtr at archlinux.org>
+2010-08-11 Andreas Radke <andyrtr at archlinux.org>
* 3.3_dev300_m86-1:
- new snapshot
+ - add buildfix for x86_64
+ - drop another buildfix
2010-07-23 Andreas Radke <andyrtr at archlinux.org>
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-08-11 15:57:56 UTC (rev 87271)
+++ PKGBUILD 2010-08-11 17:50:15 UTC (rev 87272)
@@ -31,9 +31,9 @@
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
http://www.openoffice.org/nonav/issues/showattachment.cgi/70906/fixup.patch
+
http://www.openoffice.org/nonav/issues/showattachment.cgi/70985/vcl.empty-library_path.patch
openoffice.profile)
options=('!distcc' '!ccache' '!makeflags')
@@ -75,9 +75,9 @@
patch -Np0 -i ${srcdir}/sal-cpprt-gcc-4.5-workaround.diff
# buildfix for http://www.openoffice.org/issues/show_bug.cgi?id=113563
patch -Np1 -i ${srcdir}/fixup.patch
- # http://www.openoffice.org/issues/show_bug.cgi?id=113223
-# patch -Np1 -i ${srcdir}/dictionaries-needs-th-gen-idx.pl.diff
-
+ # buildfix for http://www.openoffice.org/issues/show_bug.cgi?id=113773,
http://www.openoffice.org/issues/show_bug.cgi?id=113632
+ patch -Np1 -i ${srcdir}/vcl.empty-library_path.patch
+
# 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.
patch -Np0 -i ${srcdir}/soffice-detect-mozilla-certificates.diff
@@ -315,7 +315,6 @@
## Develize it!
cd ${pkgdir}/usr/lib/
-# mv openoffice openoffice-dev
mv openoffice.org openoffice.org-dev
mv openoffice.org3 openoffice.org3-dev
# fix link
@@ -327,9 +326,6 @@
cd ${pkgdir}/usr/bin
rm -f soffice spadmin
-# ln -sf /usr/lib/openoffice-dev/program/soffice soffice-dev
-# ln -sf /usr/lib/openoffice-dev/program/spadmin spadmin-dev
-# ln -sf /usr/lib/openoffice-dev/program/unopkg unopkg-dev
ln -sf /usr/lib/openoffice.org3-dev/program/soffice soffice-dev
ln -sf /usr/lib/openoffice.org3-dev/program/spadmin spadmin-dev
ln -sf /usr/lib/openoffice.org3-dev/program/unopkg unopkg-dev
@@ -345,7 +341,6 @@
sed -i -e 's|Icon=|Icon=dev-|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 -vsf /usr/lib/openoffice.org3-dev/program/soffice.bin soffice-dev.bin
# set desktop variable to force gtk/gnome vcl usage
@@ -354,8 +349,6 @@
# link the mozilla-plugin
mkdir -p ${pkgdir}/usr/lib/mozilla/plugins/
-# cd ${pkgdir}/usr/lib/mozilla/plugins/
-# ln -v -s /usr/lib/openoffice-dev/program/libnpsoplugin.so .
ln -vs /usr/lib/openoffice.org3-dev/program/libnpsoplugin.so
${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin.so
mv ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin.so
${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin-dev.so
}
@@ -398,16 +391,11 @@
done
cd ${pkgdir}/usr/lib/
-# mv openoffice.org openoffice
-# cd ${pkgdir}/usr/lib/openoffice/
-# mv basis3.4 basis-link
-
# fix ownership and permissions
chown root.root -R ${pkgdir}/
## Develize it!
cd ${pkgdir}/usr/lib/
-# mv openoffice openoffice-dev
mv openoffice.org openoffice.org-dev
}
Deleted: dictionaries-needs-th-gen-idx.pl.diff
===================================================================
--- dictionaries-needs-th-gen-idx.pl.diff 2010-08-11 15:57:56 UTC (rev
87271)
+++ dictionaries-needs-th-gen-idx.pl.diff 2010-08-11 17:50:15 UTC (rev
87272)
@@ -1,36 +0,0 @@
-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"
-...@all:
-- echo "Nothing to do here."
--.ELSE
- BUILD_ACTION=make
- OUT2INC += mythes.hxx
- .ENDIF
--
- .ENDIF # "$(GUI)"=="UNX"
-
-
