From 861c1d2f5f69e496c0593aeba7399270c2123cee Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Sun, 23 Dec 2018 18:12:10 -0300
Subject: [PATCH] recipes: libs/libxslt*: upgraded to version 1.1.33_rc2

---
 recipes/libs/libxslt/recipe              | 10 ++++++----
 recipes/libs/libxslt_pass1/recipe        |  8 +++++---
 sources/SOURCELIST.txt                   |  2 +-
 sources/libxslt-1.1.33-rc1.tar.gz.sha256 |  1 -
 sources/libxslt-1.1.33-rc2.tar.gz.sha256 |  1 +
 5 files changed, 13 insertions(+), 9 deletions(-)
 delete mode 100644 sources/libxslt-1.1.33-rc1.tar.gz.sha256
 create mode 100644 sources/libxslt-1.1.33-rc2.tar.gz.sha256

diff --git a/recipes/libs/libxslt/recipe b/recipes/libs/libxslt/recipe
index 29b15535..199d9109 100644
--- a/recipes/libs/libxslt/recipe
+++ b/recipes/libs/libxslt/recipe
@@ -1,6 +1,6 @@
 # Build recipe for libxslt.
 #
-# Copyright (C) 2018, Matias Fonzo, <selk@dragora.org>.
+# Copyright (C) 2018 Matias Fonzo, <selk@dragora.org>.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,8 @@
 # limitations under the License.
 
 program=libxslt
-version=1.1.33-rc1
+version=1.1.33-rc2
+pkgversion="$(echo $version | tr - _)"
 release=1
 
 # Set 'outdir' for a nice and well-organized output directory
@@ -40,9 +41,9 @@ homepage=http://xmlsoft.org
 license=MIT
 
 docs="AUTHORS ChangeLog Copyright NEWS README TODO"
-docsdir="${docdir}/${program}-${version}"
+docsdir="${docdir}/${program}-${pkgversion}"
 
-# Custom source directory
+# The source has a custom directory
 srcdir="${program}-${version%-*}"
 
 build()
@@ -61,6 +62,7 @@ build()
      --infodir=$infodir \
      --mandir=$mandir \
      --docdir=$docsdir \
+     --with-html-dir=${docsdir}/html \
      --enable-static=no \
      --enable-shared=yes \
      --build="$(cc -dumpmachine)"
diff --git a/recipes/libs/libxslt_pass1/recipe b/recipes/libs/libxslt_pass1/recipe
index 3c8621ee..5d0ca2c1 100644
--- a/recipes/libs/libxslt_pass1/recipe
+++ b/recipes/libs/libxslt_pass1/recipe
@@ -1,6 +1,6 @@
 # Build recipe for libxslt (pass1).
 #
-# Copyright (C) 2018, Matias Fonzo, <selk@dragora.org>.
+# Copyright (C) 2018 Matias Fonzo, <selk@dragora.org>.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 program=libxslt
 version=1.1.33-rc1
+pkgversion="$(echo $version | tr - _)"
 release=1
 
 # Set 'outdir' for a nice and well-organized output directory
@@ -39,9 +40,9 @@ homepage=http://xmlsoft.org
 license=MIT
 
 # Source documentation
-docsdir="${docdir}/${pkgname}-${version}"
+docsdir="${docdir}/${pkgname}-${pkgversion}"
 
-# Custom source directory
+# The source has a custom directory
 srcdir="${program}-${version%-*}"
 
 build()
@@ -60,6 +61,7 @@ build()
      --infodir=$infodir \
      --mandir=$mandir \
      --docdir=$docsdir \
+     --with-html-dir=${docsdir}/html \
      --enable-static=no \
      --enable-shared=yes \
      --build="$(cc -dumpmachine)"
diff --git a/sources/SOURCELIST.txt b/sources/SOURCELIST.txt
index dce318a4..523ed1ec 100644
--- a/sources/SOURCELIST.txt
+++ b/sources/SOURCELIST.txt
@@ -438,7 +438,7 @@ http://www.x.org/releases/individual/xcb/xcb-util-renderutil-0.3.9.tar.bz2
 http://www.x.org/releases/individual/xcb/xcb-util-wm-0.4.1.tar.bz2
 http://www.x.org/releases/individual/xserver/xorg-server-1.20.3.tar.bz2
 http://xkbcommon.org/download/libxkbcommon-0.8.2.tar.xz
-http://xmlsoft.org/sources/libxslt-1.1.33-rc1.tar.gz
+http://xmlsoft.org/sources/libxslt-1.1.33-rc2.tar.gz
 http://github.com/bbidulock/icewm/releases/download/1.4.2/icewm-1.4.2.tar.bz2
 http://ftp.debian.org/debian/pool/main/liba/libaio/libaio_0.3.111.orig.tar.gz
 http://rsync.dragora.org/current/sources/fittstool-7d68920.tar.lz
diff --git a/sources/libxslt-1.1.33-rc1.tar.gz.sha256 b/sources/libxslt-1.1.33-rc1.tar.gz.sha256
deleted file mode 100644
index 25256440..00000000
--- a/sources/libxslt-1.1.33-rc1.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-fe5c2cc487b010dac66529d494f220683dcc26b9c75e33518db9b37f52ee7f77  libxslt-1.1.33-rc1.tar.gz
diff --git a/sources/libxslt-1.1.33-rc2.tar.gz.sha256 b/sources/libxslt-1.1.33-rc2.tar.gz.sha256
new file mode 100644
index 00000000..31ede152
--- /dev/null
+++ b/sources/libxslt-1.1.33-rc2.tar.gz.sha256
@@ -0,0 +1 @@
+403106b45d34fa743171cb52ffd63c7180920e270d1dc7b74b08cf053e896cba  libxslt-1.1.33-rc2.tar.gz
-- 
2.11.4.GIT