diff --git a/mingw-w64-rhash/001-mingw.patch b/mingw-w64-rhash/001-mingw.patch deleted file mode 100644 index f46891415b..0000000000 --- a/mingw-w64-rhash/001-mingw.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- RHash-1.3.6/configure.orig 2018-03-13 21:42:17.000000000 -0400 -+++ RHash-1.3.6/configure 2018-03-28 05:05:49.625780400 -0400 -@@ -547,7 +547,9 @@ EXEC_EXT= - NEED_IMPLIB=no - NEED_SOLINK=yes - INSTALL_SO_DIR=$INSTALL_LIBDIR -+LN_S="ln -sf" - if win32; then -+ LN_S="cp -pR" - EXEC_EXT=".exe" - SHARED_EXT=".dll" - NEED_IMPLIB=yes -@@ -649,12 +651,12 @@ if test "$OPT_GETTEXT" != "no"; then - if cc_check_headers "libintl.h"; then - if cc_check_statement "libintl.h" "gettext(\"\");"; then - GETTEXT_FOUND=found -- elif cc_check_statement "libintl.h" "gettext(\"\");" "-lintl"; then -- GETTEXT_LDFLAGS="-lintl" -- GETTEXT_FOUND=found - elif cc_check_statement "libintl.h" "gettext(\"\");" "-lintl -liconv"; then - GETTEXT_LDFLAGS="-lintl -liconv" - GETTEXT_FOUND=found -+ elif cc_check_statement "libintl.h" "gettext(\"\");" "-lintl"; then -+ GETTEXT_LDFLAGS="-lintl" -+ GETTEXT_FOUND=found - fi - fi - test "$GETTEXT_FOUND" = "found" && RHASH_DEFINES=$(str_concat $RHASH_DEFINES -DUSE_GETTEXT) -@@ -815,6 +817,7 @@ RHASH_SHARED = $RHASH_SHARED\$(EXEC_E - BUILD_TARGETS = $RHASH_BUILD_TARGETS - EXTRA_INSTALL = $RHASH_EXTRA_INSTALL - SYMLINKS = $INSTALL_SYMLINKS -+LN_S = $LN_S - - OPTFLAGS = $OPTFLAGS - OPTLDFLAGS = $WIN_LDFLAGS -@@ -897,4 +900,4 @@ Libs: -L\${libdir} -lrhash - Libs.private: ${OPENSSL_LDFLAGS} - - EOF --fi -\ No newline at end of file -+fi ---- RHash-1.3.6/Makefile.orig 2018-03-13 21:42:17.000000000 -0400 -+++ RHash-1.3.6/Makefile 2018-03-28 05:12:48.794963500 -0400 -@@ -85,8 +85,8 @@ install-conf: - - # dependencies should be properly set, otherwise 'make -j' can fail - install-symlinks: mkdir-bin install-man install-binary -- cd $(BINDIR) && for f in $(SYMLINKS); do ln -fs $(RHASH_BINARY) $$f$(EXEC_EXT); done -- cd $(MANDIR)/man1 && for f in $(SYMLINKS); do ln -fs rhash.1* $$f.1; done -+ cd $(BINDIR) && for f in $(SYMLINKS); do $(LN_S) $(RHASH_BINARY) $$f$(EXEC_EXT); done -+ cd $(MANDIR)/man1 && for f in $(SYMLINKS); do $(LN_S) rhash.1 $$f.1; done - - install-pkg-config: - $(INSTALL) -d $(PKGCONFIGDIR) -@@ -108,10 +108,10 @@ uninstall-lib: - +cd librhash && $(MAKE) uninstall-lib - - install-lib-static: $(LIBRHASH_STATIC) -- +cd librhash && $(MAKE) install-lib-static -+ +cd librhash && $(MAKE) install-lib-static install-headers - - install-lib-shared: $(LIBRHASH_SHARED) -- +cd librhash && $(MAKE) install-lib-shared -+ +cd librhash && $(MAKE) install-lib-shared install-headers - - install-lib-so-link: - +cd librhash && $(MAKE) install-so-link ---- RHash-1.3.6/librhash/Makefile.orig 2018-03-13 21:42:17.000000000 -0400 -+++ RHash-1.3.6/librhash/Makefile 2018-03-28 05:13:33.700479900 -0400 -@@ -25,7 +25,7 @@ install-lib-static: $(LIBRHASH_STATIC) i - $(INSTALL) -d $(LIBDIR) - $(INSTALL_DATA) $(LIBRHASH_STATIC) $(LIBDIR)/ - --install-lib-shared: $(LIBRHASH_SHARED) $(EXTRA_INSTALL_LIBSHARED) -+install-lib-shared: $(LIBRHASH_SHARED) $(EXTRA_INSTALL_LIBSHARED) install-headers - $(INSTALL) -d $(SO_DIR) - $(INSTALL_SHARED) $(LIBRHASH_SHARED) $(SO_DIR)/ - ---- RHash-1.3.6/file.c.orig 2018-03-28 05:58:22.536574100 -0400 -+++ RHash-1.3.6/file.c 2018-03-28 06:46:11.141898500 -0400 -@@ -18,7 +18,9 @@ - - #if defined( _WIN32) || defined(__CYGWIN__) - # include -+#if !defined(__CYGWIN__) - # include /* for _SH_DENYWR */ -+#endif - # include /* _O_RDONLY, _O_BINARY */ - # include - #endif - diff --git a/mingw-w64-rhash/PKGBUILD b/mingw-w64-rhash/PKGBUILD index 072791d8ca..7eb927fc9d 100644 --- a/mingw-w64-rhash/PKGBUILD +++ b/mingw-w64-rhash/PKGBUILD @@ -3,24 +3,21 @@ _realname=rhash pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=1.3.6 -pkgrel=2 +pkgver=1.3.7 +pkgrel=1 pkgdesc="Great utility for computing hash sums (mingw-w64)" arch=('any') url='https://sourceforge.net/projects/rhash/' depends=("${MINGW_PACKAGE_PREFIX}-gettext") makedepends=("${MINGW_PACKAGE_PREFIX}-ruby") license=('custom' 'MIT') -source=(https://downloads.sourceforge.net/rhash/${_realname}-$pkgver-src.tar.gz{,.asc} - 001-mingw.patch) -sha256sums=('964df972b60569b5cb35ec989ced195ab8ea514fc46a74eab98e86569ffbcf92' - 'SKIP' - '0de7aa61dfe43fe7ed453d807c10604e1bcd664867b67b13c46a33efe9bc7480') +source=(https://downloads.sourceforge.net/rhash/${_realname}-${pkgver}-src.tar.gz{,.asc}) +sha256sums=('a2441b7a04ae554ddd3eafcf50365c787b012e35ee6402eb6705d9cd4b8dfa65' + 'SKIP') validpgpkeys=('2875F6B1C2D27A4F0C8AF60B2A714497E37363AE') prepare() { cd ${_realname}-${pkgver} - patch -Nbp1 -i ${srcdir}/001-mingw.patch } build() { @@ -48,5 +45,5 @@ package() { # fully qualify path for this because there might be switch in # build systems. install -Dm644 ${srcdir}/RHash-${pkgver}/COPYING \ - "$pkgdir${MINGW_PREFIX}"/share/licenses/rhash/LICENSE + "${pkgdir}${MINGW_PREFIX}"/share/licenses/rhash/LICENSE }