[PR PATCH] djvulibre: update to 3.5.28

[PR PATCH] djvulibre: update to 3.5.28

[4ricci]

[-- Attachment #1: Type: text/plain, Size: 319 bytes --]

There is a new pull request by 4ricci against master on the void-packages repository

https://github.com/4ricci/void-packages djvulibre-3.5.28
https://github.com/void-linux/void-packages/pull/26934

djvulibre: update to 3.5.28


A patch file from https://github.com/void-linux/void-packages/pull/26934.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-djvulibre-3.5.28-26934.patch --]
[-- Type: text/x-diff, Size: 1946 bytes --]

From 60c4bacadf6a912416a6cdec8c848f3797adb53a Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 3 Dec 2020 23:36:33 +0100
Subject: [PATCH] djvulibre: update to 3.5.28

---
 .../djvulibre/patches/djvu-3.5.23-gcc-4.6.patch    | 12 ------------
 srcpkgs/djvulibre/template                         | 14 +++++++++-----
 2 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/djvulibre/patches/djvu-3.5.23-gcc-4.6.patch

diff --git a/srcpkgs/djvulibre/patches/djvu-3.5.23-gcc-4.6.patch b/srcpkgs/djvulibre/patches/djvu-3.5.23-gcc-4.6.patch
deleted file mode 100644
index afd59f0f2a0..00000000000
--- a/srcpkgs/djvulibre/patches/djvu-3.5.23-gcc-4.6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libdjvu/GSmartPointer.h~	2011-03-29 12:35:05.000000000 +0400
-+++ libdjvu/GSmartPointer.h	2011-03-29 12:35:25.000000000 +0400
-@@ -58,6 +58,9 @@
- 
- #ifndef _GSMARTPOINTER_H_
- #define _GSMARTPOINTER_H_
-+
-+#include <cstring>
-+
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
diff --git a/srcpkgs/djvulibre/template b/srcpkgs/djvulibre/template
index 4e6f3134bc8..9f893ea04e0 100644
--- a/srcpkgs/djvulibre/template
+++ b/srcpkgs/djvulibre/template
@@ -1,16 +1,20 @@
 # Template file for 'djvulibre'
 pkgname=djvulibre
-version=3.5.27
-revision=4
+version=3.5.28
+revision=1
 build_style=gnu-configure
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config automake libtool"
 makedepends="tiff-devel"
 short_desc="Utilities for the DjVu image format"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://djvu.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/djvu/$pkgname-$version.tar.gz"
-checksum=e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f
+checksum=82e392a9cccfee94fa604126c67f06dbc43ed5f9f0905d15b6c8164f83ed5655
+
+pre_configure() {
+	./autogen.sh
+}
 
 libdjvulibre_package() {
 	short_desc+=" - runtime libraries"

Re: [PR PATCH] [Updated] djvulibre: update to 3.5.28

[4ricci]

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

There is an updated pull request by 4ricci against master on the void-packages repository

https://github.com/4ricci/void-packages djvulibre-3.5.28
https://github.com/void-linux/void-packages/pull/26934

djvulibre: update to 3.5.28


A patch file from https://github.com/void-linux/void-packages/pull/26934.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-djvulibre-3.5.28-26934.patch --]
[-- Type: text/x-diff, Size: 2001 bytes --]

From 42f5e77cc21abdeaa84ccdc27bb487be61bf9a98 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 3 Dec 2020 23:36:33 +0100
Subject: [PATCH] djvulibre: update to 3.5.28

---
 .../djvulibre/patches/djvu-3.5.23-gcc-4.6.patch   | 12 ------------
 srcpkgs/djvulibre/template                        | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/djvulibre/patches/djvu-3.5.23-gcc-4.6.patch

diff --git a/srcpkgs/djvulibre/patches/djvu-3.5.23-gcc-4.6.patch b/srcpkgs/djvulibre/patches/djvu-3.5.23-gcc-4.6.patch
deleted file mode 100644
index afd59f0f2a0..00000000000
--- a/srcpkgs/djvulibre/patches/djvu-3.5.23-gcc-4.6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libdjvu/GSmartPointer.h~	2011-03-29 12:35:05.000000000 +0400
-+++ libdjvu/GSmartPointer.h	2011-03-29 12:35:25.000000000 +0400
-@@ -58,6 +58,9 @@
- 
- #ifndef _GSMARTPOINTER_H_
- #define _GSMARTPOINTER_H_
-+
-+#include <cstring>
-+
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
diff --git a/srcpkgs/djvulibre/template b/srcpkgs/djvulibre/template
index 4e6f3134bc8..ff103ff33cb 100644
--- a/srcpkgs/djvulibre/template
+++ b/srcpkgs/djvulibre/template
@@ -1,16 +1,21 @@
 # Template file for 'djvulibre'
 pkgname=djvulibre
-version=3.5.27
-revision=4
+version=3.5.28
+revision=1
 build_style=gnu-configure
-hostmakedepends="pkg-config"
+configure_args="--host=${XBPS_TRIPLET}"
+hostmakedepends="pkg-config automake libtool"
 makedepends="tiff-devel"
 short_desc="Utilities for the DjVu image format"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://djvu.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/djvu/$pkgname-$version.tar.gz"
-checksum=e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f
+checksum=82e392a9cccfee94fa604126c67f06dbc43ed5f9f0905d15b6c8164f83ed5655
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
 
 libdjvulibre_package() {
 	short_desc+=" - runtime libraries"

Re: [PR REVIEW] djvulibre: update to 3.5.28

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 302 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26934#discussion_r536882234

Comment:
Most of our templates use `autoreconf -fi` directly. Is there a reason this shouldn't do that?

Did they stop distributing tarballs with `configure`? :/ 

Re: [PR PATCH] [Closed]: djvulibre: update to 3.5.28

[4ricci]

[-- Attachment #1: Type: text/plain, Size: 161 bytes --]

There's a closed pull request on the void-packages repository

djvulibre: update to 3.5.28
https://github.com/void-linux/void-packages/pull/26934

Description:

Re: [PR REVIEW] djvulibre: update to 3.5.28

[4ricci]

[-- Attachment #1: Type: text/plain, Size: 442 bytes --]

New review comment by 4ricci on void-packages repository

https://github.com/void-linux/void-packages/pull/26934#discussion_r536887923

Comment:
Yes, they stopped shipping `configure`.
There's a lot of templates calling `autogen.sh`, too. I think this is more robust because `autogen.sh` might do something more than just calling `autoreconf -fi` (not this case). But the two approaches are essentially the same.
I can change it if needed.

Re: [PR REVIEW] djvulibre: update to 3.5.28

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 218 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26934#discussion_r536889911

Comment:
There are others doing the same thing too, so it should be fine. Thanks

Re: [PR PATCH] [Merged]: djvulibre: update to 3.5.28

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 161 bytes --]

There's a merged pull request on the void-packages repository

djvulibre: update to 3.5.28
https://github.com/void-linux/void-packages/pull/26934

Description: