rhash: Update to 1.4.4

Adsun701 · Dec 25, 2023 · 8b52dd5 · 8b52dd5
1 parent f56ad90
commit 8b52dd5
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 47 deletions.
diff --git a/mingw-w64-rhash/PKGBUILD b/mingw-w64-rhash/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=rhash
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=1.4.3
+pkgver=1.4.4
 pkgrel=1
 pkgdesc="Great utility for computing hash sums (mingw-w64)"
 arch=('any')
@@ -14,7 +14,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
              "${MINGW_PACKAGE_PREFIX}-cc")
 license=('custom' 'BSD')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/rhash/RHash/archive/v${pkgver}.tar.gz"{,.asc}
-        rhash-link-implib.patch
+        rhash-mingw-install.patch
         rhash-all-mingw.patch)
 sha256sums=('1e40fa66966306920f043866cbe8612f4b939b033ba5e2708c3f41be257c8a3e'
             'SKIP'
@@ -24,7 +24,7 @@ validpgpkeys=('2875F6B1C2D27A4F0C8AF60B2A714497E37363AE')
 
 prepare() {
   cd "${srcdir}"/RHash-${pkgver}
-  patch -Np1 -i ../rhash-link-implib.patch
+  patch -Np1 -i ../rhash-mingw-install.patch
   patch -Np1 -i ../rhash-all-mingw.patch
 }
 

diff --git a/mingw-w64-rhash/rhash-all-mingw.patch b/mingw-w64-rhash/rhash-all-mingw.patch
@@ -1,16 +1,15 @@
---- RHash-1.4.0/configure.orig	2021-01-12 12:15:39.648212700 -0800
-+++ RHash-1.4.0/configure	2021-01-12 12:16:20.168984300 -0800
-@@ -374,12 +374,9 @@
-   HP-UX*)
-     HOST_OS=HP-UX
+--- RHash-1.4.4/configure.orig	2021-01-12 12:15:39.648212700 -0800
++++ RHash-1.4.4/configure	2021-01-12 12:16:20.168984300 -0800
+@@ -464,6 +464,12 @@
+   MINGW64*)
+     HOST_OS=MINGW64
      ;;
--  MINGW32*)
-+  MINGW*)
-     HOST_OS=MINGW32
-     ;;
--  MINGW64*)
--    HOST_OS=MINGW64
--    ;;
++  CLANG*632)
++    HOST_OS=MINGW32
++    ;;
++  CLANG*64)
++    HOST_OS=MINGW64
++    ;;
    MSYS*)
      HOST_OS=MSYS
      ;;
diff --git a/mingw-w64-rhash/rhash-link-implib.patch b/mingw-w64-rhash/rhash-link-implib.patch
diff --git a/mingw-w64-rhash/rhash-mingw-install.patch b/mingw-w64-rhash/rhash-mingw-install.patch
@@ -0,0 +1,12 @@
+--- RHash-1.4.4/librhash/Makefile.orig	2023-12-25 12:51:45.327233400 +0300
++++ RHash-1.4.4/librhash/Makefile	2023-12-25 12:53:03.480294600 +0300
+@@ -27,9 +27,6 @@
+ install-lib-shared: $(LIBRHASH_SHARED) $(EXTRA_INSTALL_LIBSHARED)
+ 	$(INSTALL) -d $(SO_DIR)
+ 	$(INSTALL_SHARED) $(LIBRHASH_SHARED) $(SO_DIR)/
+-	test "x$(LIBRHASH_SO_MAJ)" != "x$(LIBRHASH_SHARED)" && \
+-	  rm -f $(LIBDIR)/$(LIBRHASH_SO_MAJ) && \
+-	  ln -s $(LIBRHASH_SHARED) $(LIBDIR)/$(LIBRHASH_SO_MAJ)
+
+ install-implib:
+ 	$(INSTALL) -d $(LIBDIR)