Github messages for voidlinux
 help / color / mirror / Atom feed
From: leahneukirchen <leahneukirchen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] rhash: update to 1.4.4.
Date: Tue, 18 Jul 2023 15:10:19 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45103@inbox.vuxu.org> (raw)

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

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

https://github.com/leahneukirchen/void-packages rhash144
https://github.com/void-linux/void-packages/pull/45103

rhash: update to 1.4.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**


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

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

From f97aa8ca74d3ad3adcbca26fe00879a7c59e428d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 18 Jul 2023 14:47:31 +0200
Subject: [PATCH 1/4] rhash: update to 1.4.4.

---
 common/shlibs                                 |  2 +-
 .../patches/0001-Fix-version-macro.patch      | 27 -------------------
 srcpkgs/rhash/template                        | 18 ++++++-------
 3 files changed, 10 insertions(+), 37 deletions(-)
 delete mode 100644 srcpkgs/rhash/patches/0001-Fix-version-macro.patch

diff --git a/common/shlibs b/common/shlibs
index 23c9adb2dd31a..00437143f9170 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3021,7 +3021,7 @@ libXfont2.so.2 libXfont2-2.0.1_1
 libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 ostree-2023.1_1
-librhash.so.0 rhash-1.3.4_1
+librhash.so.1 rhash-1.4.4_1
 libserialport.so.0 libserialport-0.1.1_1
 libsigrok.so.4 libsigrok-0.5.0_1
 libsigrokcxx.so.4 libsigrok-0.5.0_1
diff --git a/srcpkgs/rhash/patches/0001-Fix-version-macro.patch b/srcpkgs/rhash/patches/0001-Fix-version-macro.patch
deleted file mode 100644
index ca22078e6ae6f..0000000000000
--- a/srcpkgs/rhash/patches/0001-Fix-version-macro.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 01bcf3b6163a1e43845fbc08efe9ff551534db3c Mon Sep 17 00:00:00 2001
-From: Aleksey Kravchenko <rhash.admin@gmail.com>
-Date: Wed, 15 Jun 2022 06:17:59 +0300
-Subject: [PATCH 1/2] Fix version macro
-
----
- bindings/version.properties | 2 +-
- version.h                   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bindings/version.properties b/bindings/version.properties
-index 162590e..54aef26 100644
---- a/bindings/version.properties
-+++ b/bindings/version.properties
-@@ -1 +1 @@
--version=1.4.2
-+version=1.4.3
-diff --git a/version.h b/version.h
-index af30db7..3fc0325 100644
---- a/version.h
-+++ b/version.h
-@@ -1 +1 @@
--#define VERSION "1.4.2"
-+#define VERSION "1.4.3"
--- 
-2.36.1
-
diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 8bc588d5d336c..9bb5ac5182694 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,20 +1,18 @@
 # Template file for 'rhash'
 pkgname=rhash
-version=1.4.3
-revision=2
+version=1.4.4
+revision=1
 build_style=configure
-configure_args="--enable-openssl --disable-openssl-runtime
- --prefix=/usr --sysconfdir=/etc"
+configure_args="--enable-openssl --prefix=/usr --sysconfdir=/etc"
+make_install_target="install install-lib-headers"
 conf_files="/etc/rhashrc"
-make_build_target="all lib-shared"
-make_install_target="install install-lib-shared"
 makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"
 homepage="https://github.com/rhash/RHash"
 distfiles="https://github.com/rhash/RHash/archive/v${version}.tar.gz"
-checksum=1e40fa66966306920f043866cbe8612f4b939b033ba5e2708c3f41be257c8a3e
+checksum=8e7d1a8ccac0143c8fe9b68ebac67d485df119ea17a613f4038cda52f84ef52a
 
 post_extract() {
 	vsed -i -e 's/__GLIBC__/__linux__/' librhash/byte_order.h
@@ -22,8 +20,10 @@ post_extract() {
 
 post_install() {
 	vlicense COPYING
-	make -C librhash install-lib-headers DESTDIR=$DESTDIR PREFIX=/usr
-	ln -s librhash.so.0 $DESTDIR/usr/lib/librhash.so
+	(
+		cd $DESTDIR/usr/lib
+		ln -sf librhash.so.[0-9] librhash.so
+	)
 }
 
 rhash-devel_package() {

From 3601237316341501b3be61a95ca5cd4d0d03559e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 18 Jul 2023 14:49:15 +0200
Subject: [PATCH 2/4] cmake: rebuild for rhash-1.4.4.

---
 srcpkgs/cmake/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 6a2fc292f2b4b..3f7c2682c5110 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,7 @@
 # Template file for 'cmake'
 pkgname=cmake
 version=3.26.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
  -DSPHINX_MAN=1 -DCMAKE_MAN_DIR=/share/man

From c63904839bcdd8c9ce552612c5d7b2643ae8a796 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 18 Jul 2023 14:49:17 +0200
Subject: [PATCH 3/4] cmake-gui: rebuild for rhash-1.4.4.

---
 srcpkgs/cmake-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 612a72d91f410..d1a1d15725c50 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
 version=3.26.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
  -DSPHINX_MAN=1 -DCMAKE_MAN_DIR=/share/man

From aef57951dd837bff711460a0e4fd2e2d31c1c87f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 18 Jul 2023 14:47:47 +0200
Subject: [PATCH 4/4] LGOGDownloader: rebuild for rhash-1.4.4.

---
 srcpkgs/LGOGDownloader/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 2284da4a37474..37bb3b973594c 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,7 +1,7 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.11
-revision=1
+revision=2
 build_style=cmake
 configure_args="$(vopt_bool qt USE_QT_GUI)"
 hostmakedepends="pkg-config"

             reply	other threads:[~2023-07-18 13:10 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-18 13:10 leahneukirchen [this message]
2023-07-21 11:16 ` [PR PATCH] [Merged]: " leahneukirchen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45103@inbox.vuxu.org \
    --to=leahneukirchen@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).