public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenOffice.org update attempt to 3.2.0 - maybe it will work

Browse Source 
I'll wait for the hydra report.

svn path=/nixpkgs/trunk/; revision=21850
This commit is contained in:
Lluís Batlle i Rossell 2010-05-18 20:57:00 +00:00
parent ad1684ae13
commit 84f61fadd1
3 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/office/openoffice/default.nix
View File

@ -6,7 +6,7 @@
, libXinerama, openssl, gperf, cppunit, GConf, ORBit2 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2
}: }:
let version = "3.1.1"; in let version = "3.2.0"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openoffice.org-${version}"; name = "openoffice.org-${version}";
builder = ./builder.sh; builder = ./builder.sh;
@ -17,16 +17,20 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_core.tar.bz2"; url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_core.tar.bz2";
sha256 = "95440f09f8dce616178b86b26af8e543c869d01579207aa68e8474019b59caca"; sha256 = "0jl14rxmvhz86jlhhwqlbr9nfi9p271aknqxada9775qfm6bjjml";
}; };
patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ./root-required.patch ]; patches = [ ./oo.patch ./root-required.patch ];
src_system = fetchurl { src_system = fetchurl {
url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_system.tar.bz2"; url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_system.tar.bz2";
sha256 = "bb4a440ca91a40cd2b5692abbc19e8fbd3d311525edb266dc5cd9ebc324f2b4a"; sha256 = "0nihw4iyh9qc188dkyfjr3zvp6ym6i1spm16j0cyh5rgxcrn6ycp";
}; };
preConfigure = ''
PATH=$PATH:${icu}/sbin
'';
configureFlags = " configureFlags = "
--with-package-format=native --with-package-format=native
--disable-epm --disable-epm
@ -41,6 +45,7 @@ stdenv.mkDerivation rec {
--with-system-libs --with-system-libs
--with-system-python --with-system-python
--with-system-boost --with-system-boost
--with-system-db
--with-jdk-home=${jdk} --with-jdk-home=${jdk}
--with-ant-home=${ant} --with-ant-home=${ant}
--without-afms --without-afms
@ -56,7 +61,6 @@ stdenv.mkDerivation rec {
--without-system-xerces --without-system-xerces
--without-system-xml-apis --without-system-xml-apis
--without-system-xt --without-system-xt
--without-system-db
--without-system-jars --without-system-jars
--without-system-hunspell --without-system-hunspell
--without-system-altlinuxhyph --without-system-altlinuxhyph
@ -64,6 +68,11 @@ stdenv.mkDerivation rec {
--without-system-graphite --without-system-graphite
"; ";
# Double make - I don't know why a single make reports error, and two, do not.
buildPhase = ''
make || make
'';
LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib"; LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib";
buildInputs = [ buildInputs = [

26
pkgs/applications/office/openoffice/oo.patch
View File

@ -1,5 +1,5 @@
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index 602b9b1..6be8427 100644 index 74c64bf..fbf8d21 100644
--- a/libtextcat/makefile.mk --- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk +++ b/libtextcat/makefile.mk
@@ -57,7 +57,7 @@ ADDITIONAL_FILES= \ @@ -57,7 +57,7 @@ ADDITIONAL_FILES= \
@ -8,46 +8,46 @@ index 602b9b1..6be8427 100644
#relative to CONFIGURE_DIR #relative to CONFIGURE_DIR
-CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" -CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
+CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" --prefix=$(TMPDIR) +CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" --prefix=$(TMPDIR)
CONFIGURE_FLAGS= CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
BUILD_ACTION=make BUILD_ACTION=make
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 0e64d50..547d66b 100644 index 0d92de9..aae3b4f 100644
--- a/redland/raptor/makefile.mk --- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk
@@ -104,7 +104,7 @@ XSLTLIB:=$(XSLTLIB) @@ -130,7 +130,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
CONFIGURE_DIR= CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml # do not enable grddl parser (#i93768#)
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR) -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
BUILD_ACTION=$(GNUMAKE) BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 850ee9c..3293a79 100644 index fba6460..fc70419 100644
--- a/redland/rasqal/makefile.mk --- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk
@@ -104,7 +104,7 @@ XSLTLIB:=$(XSLTLIB) @@ -126,7 +126,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
CONFIGURE_DIR= CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR) +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
BUILD_ACTION=$(GNUMAKE) BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 5719272..75c31b7 100644 index 710d7d6..dd60f0d 100644
--- a/redland/redland/makefile.mk --- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk
@@ -108,7 +108,7 @@ XSLTLIB:=$(XSLTLIB) @@ -132,7 +132,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
CONFIGURE_DIR= CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR) +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
BUILD_ACTION=$(GNUMAKE) BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch

3
pkgs/top-level/all-packages.nix
View File

@ -8211,7 +8211,7 @@ let
}; };
openoffice = import ../applications/office/openoffice { openoffice = import ../applications/office/openoffice {
inherit fetchurl stdenv pam python tcsh libxslt perl zlib libjpeg inherit fetchurl pam python tcsh libxslt perl zlib libjpeg
expat pkgconfig freetype fontconfig libwpd libxml2 db4 sablotron expat pkgconfig freetype fontconfig libwpd libxml2 db4 sablotron
curl libsndfile flex zip unzip libmspack getopt file cairo curl libsndfile flex zip unzip libmspack getopt file cairo
which icu jdk ant cups openssl bison boost gperf cppunit; which icu jdk ant cups openssl bison boost gperf cppunit;
@ -8220,6 +8220,7 @@ let
inherit (perlPackages) ArchiveZip CompressZlib; inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome) GConf ORBit2; inherit (gnome) GConf ORBit2;
neon = neon026; neon = neon026;
stdenv = stdenv2;
}; };
opera = import ../applications/networking/browsers/opera { opera = import ../applications/networking/browsers/opera {