[PR PATCH] snapper: update to 0.8.15.

[PR PATCH] snapper: update to 0.8.15.

[ailiop-git]

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

There is a new pull request by ailiop-git against master on the void-packages repository

https://github.com/ailiop-git/void-packages snapper
https://github.com/void-linux/void-packages/pull/28151

snapper: update to 0.8.15.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 147b9f537c6ebe449b630d718b0d51ce0df4af4c Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 17:01:21 +0100
Subject: [PATCH] snapper: update to 0.8.15.

---
 srcpkgs/snapper/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index 292cfed6a19..9254659294c 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,7 +1,7 @@
 # Template file for 'snapper'
 pkgname=snapper
-version=0.8.14
-revision=2
+version=0.8.15
+revision=1
 build_style=gnu-configure
 configure_args="--disable-zypp --with-conf=/etc/conf.d"
 conf_files="/etc/conf.d/snapper"
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://snapper.io"
 distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz"
-checksum=d3abe4d542dade06b361e7c89b5de03bb5202853bc5e314ca74080caa24923f6
+checksum=fe0e32912275713f8fad17dbe510f32dbba8526365a849e3f7d6c786d43cfca2
 lib32disabled=yes
 
 case "$XBPS_TARGET_MACHINE" in

Re: snapper: update to 0.8.15.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28151#issuecomment-766402942

Comment:
I don't think the Musl stuff is still necessary, I have worked with upstream to be more standards compliant.

Re: snapper: update to 0.8.15.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28151#issuecomment-766402942

Comment:
I don't think the Musl stuff is still necessary, I have worked a bit with upstream to be more standards compliant.

Re: snapper: update to 0.8.15.

[FollieHiyuki]

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

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/28151#issuecomment-766423549

Comment:
I was working on this for a few days and got it built on my machine. Can I take over and make another PR? It still fails some tests with locale though

Re: snapper: update to 0.8.15.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28151#issuecomment-766425379

Comment:
Superseded by #28192

Re: [PR PATCH] [Closed]: snapper: update to 0.8.15.

[ericonr]

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

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

snapper: update to 0.8.15.
https://github.com/void-linux/void-packages/pull/28151

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

[PR PATCH] snapper: update to 0.8.15

[FollieHiyuki]

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

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

https://github.com/FollieHiyuki/void-packages snapper
https://github.com/void-linux/void-packages/pull/28192

snapper: update to 0.8.15
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 70ec6a6501bf9aa1d500e0d00004a5d58aa314a5 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 24 Jan 2021 23:13:06 +0300
Subject: [PATCH] snapper: update to 0.8.15

---
 .../snapper/patches/0001-musl-sterror_r.patch | 26 ------------------
 .../snapper/patches/0002-musl-mktime.patch    | 26 ------------------
 .../patches/0004-musl-stdout_stderr.patch     | 26 ------------------
 srcpkgs/snapper/patches/musl_u_int-type.patch | 27 -------------------
 srcpkgs/snapper/template                      | 15 +++++------
 5 files changed, 6 insertions(+), 114 deletions(-)
 delete mode 100644 srcpkgs/snapper/patches/0001-musl-sterror_r.patch
 delete mode 100644 srcpkgs/snapper/patches/0002-musl-mktime.patch
 delete mode 100644 srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
 delete mode 100644 srcpkgs/snapper/patches/musl_u_int-type.patch

diff --git a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch b/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
deleted file mode 100644
index 3bd9be5872e..00000000000
--- a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a4068f03b471777151c4eb43fc70c3b6ebf8df3a Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:23:38 -0600
-Subject: [PATCH 1/4] musl-sterror_r
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 553065c..2897276 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -223,7 +223,7 @@ namespace snapper
-     string
-     stringerror(int errnum)
-     {
--#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE
-+#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE || MUSL_LIBC
- 	char buf1[100];
- 	if (strerror_r(errnum, buf1, sizeof(buf1) - 1) == 0)
- 	    return string(buf1);
--- 
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0002-musl-mktime.patch b/srcpkgs/snapper/patches/0002-musl-mktime.patch
deleted file mode 100644
index 25850a519a3..00000000000
--- a/srcpkgs/snapper/patches/0002-musl-mktime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6385e34fb13dbfabd0b4b93f7670eac0c490637f Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:24:08 -0600
-Subject: [PATCH 2/4] musl-mktime
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 2897276..64812d7 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -288,7 +288,7 @@ namespace snapper
- 	const char* p = strptime(str.c_str(), "%F %T", &s);
- 	if (!p || *p != '\0')
- 	    return (time_t)(-1);
--	return utc ? timegm(&s) : timelocal(&s);
-+	return utc ? timegm(&s) : mktime(&s);
-     }
- 
- 
--- 
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch b/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
deleted file mode 100644
index 0524aa1c0fb..00000000000
--- a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d519c3c94a029d6891b0703ce5adb6ea0ac8b9fa Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:27:17 -0600
-Subject: [PATCH 4/4] musl-stdout_stderr
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/SystemCmd.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/snapper/SystemCmd.h b/snapper/SystemCmd.h
-index 3d38604..72bbb2b 100644
---- snapper/SystemCmd.h
-+++ snapper/SystemCmd.h
-@@ -32,6 +32,8 @@
- #include <list>
- #include <boost/noncopyable.hpp>
- 
-+#undef stdout
-+#undef stderr
- 
- namespace snapper
- {
--- 
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/musl_u_int-type.patch b/srcpkgs/snapper/patches/musl_u_int-type.patch
deleted file mode 100644
index 66cb63b2f12..00000000000
--- a/srcpkgs/snapper/patches/musl_u_int-type.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7ddd58ee5e6b7c3a8df3086ff5a6d17d19362761 Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:35:55 -0600
-Subject: [PATCH] musl-_u_int-types
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- client/utils/JsonFormatter.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git client/utils/JsonFormatter.h client/utils/JsonFormatter.h
-index 79f7672..501b77d 100644
---- client/utils/JsonFormatter.h
-+++ client/utils/JsonFormatter.h
-@@ -25,6 +25,9 @@
- #include <string>
- #include <vector>
- #include <utility>
-+#ifndef __GLIBC__
-+#include <sys/types.h>
-+#endif
- 
- namespace snapper
- {
--- 
-2.24.1
-
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index 292cfed6a19..5ae53b8c25f 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,7 +1,7 @@
 # Template file for 'snapper'
 pkgname=snapper
-version=0.8.14
-revision=2
+version=0.8.15
+revision=1
 build_style=gnu-configure
 configure_args="--disable-zypp --with-conf=/etc/conf.d"
 conf_files="/etc/conf.d/snapper"
@@ -9,23 +9,20 @@ make_dirs="/etc/snapper/configs 0755 root root"
 hostmakedepends="automake docbook-xsl libtool libxml2-devel libxslt
  gettext pkg-config"
 makedepends="acl-devel boost-devel dbus-devel e2fsprogs-devel libbtrfs-devel
- libmount-devel libxml2-devel pam-devel"
+ libmount-devel libxml2-devel pam-devel ncurses-devel ncurses-libtinfo-devel json-c-devel"
 depends="dbus"
 short_desc="Tool for Linux filesystem snapshot management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://snapper.io"
 distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz"
-checksum=d3abe4d542dade06b361e7c89b5de03bb5202853bc5e314ca74080caa24923f6
+checksum=fe0e32912275713f8fad17dbe510f32dbba8526365a849e3f7d6c786d43cfca2
 lib32disabled=yes
 
 case "$XBPS_TARGET_MACHINE" in
-	*-musl)	# We define MUSL_LIBC to pick the correct return type
-		# for strerror_r(2) which is int (XSI-compliant)
-		CXXFLAGS="-DMUSL_LIBC=1"
-		# We also link against libintl
+	*-musl)
 		makedepends+=" gettext-devel"
-		LDFLAGS="-lintl"
+		LDFLAGS="-lintl -ljson-c"
 esac
 
 pre_configure() {