mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 13:48:21 +03:00
OpenOffice update. It configures OK, but I prefer to let Hydra build it (old build failed anyway)
svn path=/nixpkgs/trunk/; revision=17504
This commit is contained in:
parent
f20dc4d468
commit
88db61f5cf
@ -17,12 +17,9 @@ preConfigure() {
|
|||||||
SRCDIR=
|
SRCDIR=
|
||||||
|
|
||||||
sed -e '/CURL_NO_OLDIES/d' -i ucb/source/ucp/ftp/makefile.mk
|
sed -e '/CURL_NO_OLDIES/d' -i ucb/source/ucp/ftp/makefile.mk
|
||||||
|
|
||||||
cd config_office/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
postConfigure() {
|
postConfigure() {
|
||||||
cd ..
|
|
||||||
for i in LinuxX86*Env.Set; do
|
for i in LinuxX86*Env.Set; do
|
||||||
substituteInPlace $i --replace /usr /no-such-path
|
substituteInPlace $i --replace /usr /no-such-path
|
||||||
done
|
done
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
|
, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
|
||||||
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
|
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
|
||||||
, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
|
, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
|
||||||
, libXinerama, openssl, gperf, cppunit
|
, libXinerama, openssl, gperf, cppunit, GConf
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let version = "3.1.1"; in
|
let version = "3.1.1"; in
|
||||||
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||||||
libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl
|
libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl
|
||||||
libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack
|
libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack
|
||||||
getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
|
getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
|
||||||
cups libXinerama openssl gperf
|
cups libXinerama openssl gperf GConf
|
||||||
];
|
];
|
||||||
|
|
||||||
inherit icu fontconfig libjpeg jdk cups;
|
inherit icu fontconfig libjpeg jdk cups;
|
||||||
|
@ -50,20 +50,20 @@ index 5719272..75c31b7 100644
|
|||||||
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/hunspell/hunspell-1.1.12.patch b/hunspell/hunspell-1.1.12.patch
|
diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch
|
||||||
index 37b7964..e6fd962 100644
|
index 37b7964..e6fd962 100644
|
||||||
--- a/hunspell/hunspell-1.1.12.patch
|
--- a/hunspell/hunspell-1.2.8.patch
|
||||||
+++ b/hunspell/hunspell-1.1.12.patch
|
+++ b/hunspell/hunspell-1.2.8.patch
|
||||||
@@ -487,3 +487,15 @@
|
@@ -619,3 +619,15 @@
|
||||||
i68568utf.test \
|
p++;
|
||||||
1706659.test \
|
}
|
||||||
digits_in_words.test \
|
if (i > 0 && buf[i - 1] == '\n') {
|
||||||
+diff --git a/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh b/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
|
+diff --git a/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh b/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
|
||||||
+index 90080f6..f069517 100755
|
+index 90080f6..f069517 100755
|
||||||
+--- a/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
|
+--- a/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh
|
||||||
++++ b/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
|
++++ b/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh
|
||||||
+--- misc/hunspell-1.1.12/tests/test.sh Sep 4 01:25:35 2007
|
+--- misc/hunspell-1.2.8/tests/test.sh Sep 4 01:25:35 2007
|
||||||
++++ misc/build/hunspell-1.1.12/tests/test.sh Jun 18 11:53:11 2008
|
++++ misc/build/hunspell-1.2.8/tests/test.sh Jun 18 11:53:11 2008
|
||||||
+@@ -1,4 +1,4 @@
|
+@@ -1,4 +1,4 @@
|
||||||
+-#!/bin/bash
|
+-#!/bin/bash
|
||||||
++#!/bin/sh
|
++#!/bin/sh
|
||||||
|
@ -7240,6 +7240,7 @@ let
|
|||||||
inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
|
inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
|
||||||
inherit (gtkLibs) gtk;
|
inherit (gtkLibs) gtk;
|
||||||
inherit (perlPackages) ArchiveZip CompressZlib;
|
inherit (perlPackages) ArchiveZip CompressZlib;
|
||||||
|
inherit (gnome26) GConf;
|
||||||
};
|
};
|
||||||
|
|
||||||
opera = import ../applications/networking/browsers/opera {
|
opera = import ../applications/networking/browsers/opera {
|
||||||
|
Loading…
Reference in New Issue
Block a user