xmlroff: 0.3.98 -> 0.6.2

pkgs/tools/typesetting/xmlroff/default.nix

@@ -1,27 +1,39 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, popt
-, glib, pango, libgnomeprint, pangoxsl, gtk}:
+{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, popt, perl
+, glib, pango, pangoxsl, gtk, libtool, autoconf, automake }:
+
+stdenv.mkDerivation rec {
+  name = "xmlroff-${version}";
+  version = "0.6.2";
 
-stdenv.mkDerivation {
-  #name = "xmlroff-0.3.5";
-  name = "xmlroff-0.3.98";
   src = fetchurl {
-    url = mirror://sourceforge/xmlroff/xmlroff-0.3.98.tar.gz;
-    sha256 = "0pg7zc8ri0xzmdk30vnyd84wy8yn973h1bnrvibv71q44s6xhwp2";
+    url = "https://github.com/xmlroff/xmlroff/archive/v${version}.tar.gz";
+    sha256 = "1sczn6xjczsfdxlbjqv4xqlki2a95y2s8ih2nl9v1vhqfk17fiww";
   };
 
   buildInputs = [
     pkgconfig
+    autoconf
+    automake
     libxml2
     libxslt
+    libtool
     glib
     pango
-    libgnomeprint
     pangoxsl
     gtk
     popt
   ];
 
-  configureFlags = "--disable-pangoxsl";
+  configureScript = "./autogen.sh";
+
+  configureFlags = "--disable-pangoxsl --disable-gp";
+
+  preBuild = ''
+    substituteInPlace tools/insert-file-as-string.pl --replace "/usr/bin/perl" "${perl}/bin/perl"
+    substituteInPlace Makefile --replace "docs" ""
+  '';
+
+  sourceRoot = "${name}/xmlroff/";
 
   patches = [./xmlroff.patch];
 }

pkgs/tools/typesetting/xmlroff/xmlroff.patch

@@ -1,12 +1,11 @@
-diff -ruN xmlroff-0.3.98/Makefile.in xmlroff-0.3.98.new/Makefile.in
---- xmlroff-0.3.98/Makefile.in	2006-05-30 17:46:37.000000000 +0200
-+++ xmlroff-0.3.98.new/Makefile.in	2006-06-18 13:47:37.000000000 +0200
-@@ -288,7 +288,7 @@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = pangoxsl libfo area fo datatype property expr util . examples docs
-+SUBDIRS = libfo area fo datatype property expr util . examples docs
- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
- INCLUDES = \
- 	-DG_LOG_DOMAIN=\"libfo\"	\
+--- xmlroff-0.6.2.orig/libfo/fo-libfo-basic.h
++++ xmlroff-0.6.2/libfo/fo-libfo-basic.h
+@@ -11,8 +11,7 @@
+ #define __FO_LIBFO_BASIC_H__
+ 
+ #include <stdio.h>
+-#include <glib/gtypes.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS

pkgs/top-level/all-packages.nix

@@ -2808,9 +2808,7 @@ let
 
   xml2 = callPackage ../tools/text/xml/xml2 { };
 
-  xmlroff = callPackage ../tools/typesetting/xmlroff {
-    inherit (gnome) libgnomeprint;
-  };
+  xmlroff = callPackage ../tools/typesetting/xmlroff { };
 
   xmlstarlet = callPackage ../tools/text/xml/xmlstarlet { };