goffice: separate from gnome3

It's got practically no coupling with gnome, except for gtk3.
This commit is contained in:
Vladimír Čunát
2015-06-11 20:50:43 +02:00
parent 03e4e3e92a
commit 39902b01bf
6 changed files with 11 additions and 13 deletions

View File

@@ -0,0 +1,37 @@
{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
, pango, libgsf, libxml2, libart, intltool, gettext
, cairo, gconf, libgnomeui, pcre, goffice/*just meta*/ }:
stdenv.mkDerivation rec {
name = "goffice-0.8.17";
src = fetchurl {
url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz";
sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15";
};
# fix linking error: undefined reference to pcre_info
patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986
buildInputs = [
pkgconfig libglade bzip2 libart intltool gettext
gconf libgnomeui pcre
];
propagatedBuildInputs = [
# All these are in the "Requires:" field of `libgoffice-0.6.pc'.
glib libgsf libxml2 gtk libglade libart cairo pango
];
postInstall =
''
# Get GnuCash to build. Might be unnecessary if we upgrade pkgconfig.
substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires
'';
doCheck = true;
meta = goffice.meta // {
maintainers = [ ];
};
}

View File

@@ -0,0 +1,36 @@
{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3
, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
stdenv.mkDerivation rec {
name = "goffice-0.10.22";
src = fetchurl {
url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
sha256 = "0206a87a323b52a874dc54491374245f9e1c5f62e93a2ce4a02fb444a26b0e28";
};
nativeBuildInputs = [ pkgconfig intltool ];
propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection?
glib gtk3 libxml2 cairo pango libgsf
];
buildInputs = [ libxslt librsvg ];
enableParallelBuilding = true;
doCheck = true;
meta = {
description = "A Glib/GTK+ set of document centric objects and utilities";
longDescription = ''
There are common operations for document centric applications that are
conceptually simple, but complex to implement fully: plugins, load/save
documents, undo/redo.
'';
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.gnu;
};
}

View File

@@ -0,0 +1,13 @@
diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c
index bc4aae4..3adb696 100644
--- a/goffice/utils/regutf8.c
+++ b/goffice/utils/regutf8.c
@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags)
default: return GO_REG_BADPAT;
}
} else {
- gor->re_nsub = pcre_info (r, NULL, NULL);
+ gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL);
gor->nosub = (cflags & GO_REG_NOSUB) != 0;
return 0;
}