Re: [PR PATCH] [Updated] New package: dwarfs-0.7.5

[NafzorOB <NafzorOB@users.noreply.github.com>]

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

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

https://github.com/NafzorOB/void-packages-utf8cpp dwarfs
https://github.com/void-linux/void-packages/pull/48294

New package: dwarfs-0.7.5
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

Made this because the [dwarfs pull request](https://github.com/void-linux/void-packages/pull/26819) has been marked as a work in progress for more than 2 years.

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

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

From 2ca01971077711ac4558feb8dd5a49fc9ff33096 Mon Sep 17 00:00:00 2001
From: nafZZZob <130201394+NafzorOB@users.noreply.github.com>
Date: Fri, 19 Jan 2024 17:35:51 -0500
Subject: [PATCH 1/7] Create template

add dwarfs template
---
 srcpkgs/dwarfs/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/dwarfs/template

diff --git a/srcpkgs/dwarfs/template b/srcpkgs/dwarfs/template
new file mode 100644
index 0000000000000..8a837c99b1bf0
--- /dev/null
+++ b/srcpkgs/dwarfs/template
@@ -0,0 +1,15 @@
+# Template file for 'dwarfs'
+pkgname=dwarfs
+version=0.7.5
+revision=1
+build_style=cmake
+configure_args="-DWITH_TESTS=ON"
+hostmakedepends="ruby-ronn git pkg-config utfcpp"
+makedepends="boost-devel fuse3-devel double-conversion-devel libevent-devel jemalloc-devel libarchive-devel glog-devel"
+depends="fuse3"
+short_desc="Fast high compression read-only file system"
+maintainer="NafzorOB <nafzorob@proton.me>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/mhx/dwarfs"
+distfiles="https://github.com/mhx/dwarfs/releases/download/v${version}/dwarfs-${version}.tar.xz"
+checksum=31fabc3a3a8233e247f77149a7c702b79c4105dc814459fef85d4c4747a2b4f0

From 766a251b9e073b44e3a143674af12e1845b54ec2 Mon Sep 17 00:00:00 2001
From: nafZZZob <130201394+NafzorOB@users.noreply.github.com>
Date: Fri, 19 Jan 2024 17:37:10 -0500
Subject: [PATCH 2/7] Create sbin-to-bin.patch

add sbin-to-bin patch, this changes the installation directory from the dwarfs binary from /usr/sbin to /usr/bin
---
 srcpkgs/dwarfs/patches/sbin-to-bin.patch | 26 ++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/dwarfs/patches/sbin-to-bin.patch

diff --git a/srcpkgs/dwarfs/patches/sbin-to-bin.patch b/srcpkgs/dwarfs/patches/sbin-to-bin.patch
new file mode 100644
index 0000000000000..5186785a70c32
--- /dev/null
+++ b/srcpkgs/dwarfs/patches/sbin-to-bin.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4dd4ac0..efda8cb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -574,8 +574,8 @@ if(FUSE3_FOUND OR WINFSP)
+                        COMMAND ${CMAKE_COMMAND} -E create_symlink dwarfs mount.dwarfs
+                        DEPENDS dwarfs-bin)
+     list(APPEND SYMLINKS mount.dwarfs)
+-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mount.dwarfs DESTINATION sbin)
+-    install(TARGETS dwarfs-bin RUNTIME DESTINATION sbin)
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mount.dwarfs DESTINATION bin)
++    install(TARGETS dwarfs-bin RUNTIME DESTINATION bin)
+   endif()
+   list(APPEND BINARY_TARGETS dwarfs-bin)
+   list(APPEND MAIN_TARGETS dwarfs_main)
+@@ -596,8 +596,8 @@ if(FUSE_FOUND AND (WITH_LEGACY_FUSE OR NOT FUSE3_FOUND))
+                      COMMAND ${CMAKE_COMMAND} -E create_symlink dwarfs2 mount.dwarfs2
+                      DEPENDS dwarfs2-bin)
+   list(APPEND SYMLINKS mount.dwarfs2)
+-  install(TARGETS dwarfs2-bin RUNTIME DESTINATION sbin)
+-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mount.dwarfs2 DESTINATION sbin)
++  install(TARGETS dwarfs2-bin RUNTIME DESTINATION bin)
++  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mount.dwarfs2 DESTINATION bin)
+   list(APPEND BINARY_TARGETS dwarfs2-bin)
+   list(APPEND MAIN_TARGETS dwarfs2_main)
+ endif()

From 2c46bfa126feb607f4c89be72b4deeaa71963b4d Mon Sep 17 00:00:00 2001
From: nafZZZob <nafzorob@proton.me>
Date: Fri, 19 Jan 2024 18:14:46 -0500
Subject: [PATCH 3/7] add utfcpp

this library is required for dwarfs to be compiled
---
 srcpkgs/utfcpp/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/utfcpp/template

diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 0000000000000..3bac76bfd59a5
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,11 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.5
+revision=1
+build_style=cmake
+short_desc="UTF-8 with C++ in a Portable Way"
+maintainer="NafzorOB <nafzorob@proton.me>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/refs/tags/v${version}.tar.gz"
+checksum=ffc668a310e77607d393f3c18b32715f223da1eac4c4d6e0579a11df8e6b59cf

From de285b4cc5a49cfc3e9639c5193c74c1bb5c07d0 Mon Sep 17 00:00:00 2001
From: nafZZZob <nafzorob@proton.me>
Date: Fri, 19 Jan 2024 21:28:36 -0500
Subject: [PATCH 4/7] updating template - disabling tests

---
 srcpkgs/dwarfs/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/dwarfs/template b/srcpkgs/dwarfs/template
index 8a837c99b1bf0..cf291072755ba 100644
--- a/srcpkgs/dwarfs/template
+++ b/srcpkgs/dwarfs/template
@@ -3,7 +3,6 @@ pkgname=dwarfs
 version=0.7.5
 revision=1
 build_style=cmake
-configure_args="-DWITH_TESTS=ON"
 hostmakedepends="ruby-ronn git pkg-config utfcpp"
 makedepends="boost-devel fuse3-devel double-conversion-devel libevent-devel jemalloc-devel libarchive-devel glog-devel"
 depends="fuse3"

From 56e1a0c462e814413d2350661eaa505664da8a87 Mon Sep 17 00:00:00 2001
From: nafZZZob <nafzorob@proton.me>
Date: Fri, 19 Jan 2024 21:37:22 -0500
Subject: [PATCH 5/7] update template - adding tests back on and adding missing
 libraries

added tests back again and added fuse-devel and fuse libraries
---
 srcpkgs/dwarfs/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dwarfs/template b/srcpkgs/dwarfs/template
index cf291072755ba..698926226f8af 100644
--- a/srcpkgs/dwarfs/template
+++ b/srcpkgs/dwarfs/template
@@ -4,8 +4,9 @@ version=0.7.5
 revision=1
 build_style=cmake
 hostmakedepends="ruby-ronn git pkg-config utfcpp"
-makedepends="boost-devel fuse3-devel double-conversion-devel libevent-devel jemalloc-devel libarchive-devel glog-devel"
-depends="fuse3"
+makedepends="boost-devel fuse3-devel double-conversion-devel libevent-devel jemalloc-devel libarchive-devel glog-devel fuse-devel"
+depends="fuse3 fuse"
+configure_args="-DWITH_TESTS=ON"
 short_desc="Fast high compression read-only file system"
 maintainer="NafzorOB <nafzorob@proton.me>"
 license="GPL-3.0-or-later"

From de0c24b3f24764d8e5d79ced43acc176a0acc0ac Mon Sep 17 00:00:00 2001
From: nafZZZob <nafzorob@proton.me>
Date: Sun, 21 Jan 2024 19:26:15 -0500
Subject: [PATCH 6/7] Update template

---
 srcpkgs/dwarfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dwarfs/template b/srcpkgs/dwarfs/template
index 698926226f8af..30b9946b7669b 100644
--- a/srcpkgs/dwarfs/template
+++ b/srcpkgs/dwarfs/template
@@ -4,12 +4,12 @@ version=0.7.5
 revision=1
 build_style=cmake
 hostmakedepends="ruby-ronn git pkg-config utfcpp"
-makedepends="boost-devel fuse3-devel double-conversion-devel libevent-devel jemalloc-devel libarchive-devel glog-devel fuse-devel"
+makedepends="boost-devel fuse3-devel double-conversion-devel libevent-devel jemalloc-devel libarchive-devel glog-devel"
 depends="fuse3 fuse"
-configure_args="-DWITH_TESTS=ON"
 short_desc="Fast high compression read-only file system"
 maintainer="NafzorOB <nafzorob@proton.me>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/mhx/dwarfs"
 distfiles="https://github.com/mhx/dwarfs/releases/download/v${version}/dwarfs-${version}.tar.xz"
 checksum=31fabc3a3a8233e247f77149a7c702b79c4105dc814459fef85d4c4747a2b4f0
+nocross="Cross-compiling is disabled since the Folly library doesnt implement cross-compilation in its cmake build."

From a073a420aed170b9f56180d34d7ff78285755c4b Mon Sep 17 00:00:00 2001
From: nafZZZob <nafzorob@proton.me>
Date: Sun, 21 Jan 2024 19:51:29 -0500
Subject: [PATCH 7/7] update template so it doesnt build for musl

musl doesnt seem to be supported by folly.
---
 srcpkgs/dwarfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dwarfs/template b/srcpkgs/dwarfs/template
index 30b9946b7669b..0eb6fa69a11c6 100644
--- a/srcpkgs/dwarfs/template
+++ b/srcpkgs/dwarfs/template
@@ -2,6 +2,7 @@
 pkgname=dwarfs
 version=0.7.5
 revision=1
+archs="x86_64 i686" # Folly doesnt support cross-compiling into a different architecture other than these, it also doesnt seem to support musl.
 build_style=cmake
 hostmakedepends="ruby-ronn git pkg-config utfcpp"
 makedepends="boost-devel fuse3-devel double-conversion-devel libevent-devel jemalloc-devel libarchive-devel glog-devel"
@@ -12,4 +13,3 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/mhx/dwarfs"
 distfiles="https://github.com/mhx/dwarfs/releases/download/v${version}/dwarfs-${version}.tar.xz"
 checksum=31fabc3a3a8233e247f77149a7c702b79c4105dc814459fef85d4c4747a2b4f0
-nocross="Cross-compiling is disabled since the Folly library doesnt implement cross-compilation in its cmake build."