diff options
| -rw-r--r-- | patches/fuse-zip-0.4.0/0001-added-macro-and-include-to-access-UINT16_MAX-constan.patch | 27 | ||||
| -rw-r--r-- | patches/fuse-zip-0.4.0/series | 4 | ||||
| -rw-r--r-- | rules/fuse-zip.in | 8 | ||||
| -rw-r--r-- | rules/fuse-zip.make | 14 |
4 files changed, 7 insertions, 46 deletions
diff --git a/patches/fuse-zip-0.4.0/0001-added-macro-and-include-to-access-UINT16_MAX-constan.patch b/patches/fuse-zip-0.4.0/0001-added-macro-and-include-to-access-UINT16_MAX-constan.patch deleted file mode 100644 index 81e3a2026..000000000 --- a/patches/fuse-zip-0.4.0/0001-added-macro-and-include-to-access-UINT16_MAX-constan.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Alexander Galanin <al@galanin.nnov.ru> -Date: Sat, 13 Dec 2014 21:29:34 +0300 -Subject: [PATCH] added macro and include to access UINT16_MAX constant (closes - issue 44) - ---- - lib/fileNode.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/fileNode.cpp b/lib/fileNode.cpp -index e2ab19dc9ef0..bee74f0a923b 100644 ---- a/lib/fileNode.cpp -+++ b/lib/fileNode.cpp -@@ -19,10 +19,13 @@ - // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // - //////////////////////////////////////////////////////////////////////////// - -+#define __STDC_LIMIT_MACROS -+ - #include <cerrno> - #include <climits> - #include <ctime> - #include <cstdlib> -+#include <stdint.h> - #include <cstring> - #include <stdexcept> - #include <syslog.h> diff --git a/patches/fuse-zip-0.4.0/series b/patches/fuse-zip-0.4.0/series deleted file mode 100644 index 1cb964d84..000000000 --- a/patches/fuse-zip-0.4.0/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-added-macro-and-include-to-access-UINT16_MAX-constan.patch -# b6c8f7155ad8797e98366908c4a0b6b9 - git-ptx-patches magic diff --git a/rules/fuse-zip.in b/rules/fuse-zip.in index 76aecd437..40d7e3857 100644 --- a/rules/fuse-zip.in +++ b/rules/fuse-zip.in @@ -1,6 +1,4 @@ -## SECTION=staging -## old section: -### SECTION=disk_and_file +## SECTION=disk_and_file config FUSE_ZIP tristate @@ -16,7 +14,3 @@ config FUSE_ZIP With fuse-zip you really can work with ZIP archives as real directories. Unlike KIO or Gnome VFS, it can be used in any application without modifications. - - STAGING: remove in ptxdist-2019.05.0 - Old version that is no longer available for download. - Should be updated to a new version. diff --git a/rules/fuse-zip.make b/rules/fuse-zip.make index 482fe1840..8f7fb8c44 100644 --- a/rules/fuse-zip.make +++ b/rules/fuse-zip.make @@ -1,6 +1,6 @@ # -*-makefile-*- # -# Copyright (C) 2014 by Guillermo Rodriguez <guille.rodriguez@gmail.com> +# Copyright (C) 2018 by Guillermo Rodriguez <guille.rodriguez@gmail.com> # # See CREDITS for details about who has contributed to this project. # @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_FUSE_ZIP) += fuse-zip # # Paths and names # -FUSE_ZIP_VERSION := 0.4.0 -FUSE_ZIP_MD5 := da2d85c5b28ccd153c928f8030e3f729 -FUSE_ZIP := fuse-zip-$(FUSE_ZIP_VERSION) +FUSE_ZIP_VERSION := 0.4.2 +FUSE_ZIP_MD5 := 673a351e4116d5576a92d62d21208afe +FUSE_ZIP := fuse-zip-$(FUSE_ZIP_VERSION) FUSE_ZIP_SUFFIX := tar.gz -FUSE_ZIP_URL := http://fuse-zip.googlecode.com/files/$(FUSE_ZIP).$(FUSE_ZIP_SUFFIX) +FUSE_ZIP_URL := https://bitbucket.org/agalanin/fuse-zip/downloads/$(FUSE_ZIP).$(FUSE_ZIP_SUFFIX) FUSE_ZIP_SOURCE := $(SRCDIR)/$(FUSE_ZIP).$(FUSE_ZIP_SUFFIX) FUSE_ZIP_DIR := $(BUILDDIR)/$(FUSE_ZIP) FUSE_ZIP_LICENSE := LGPL @@ -31,9 +31,7 @@ FUSE_ZIP_LICENSE := LGPL FUSE_ZIP_CONF_TOOL := NO FUSE_ZIP_MAKE_ENV := $(CROSS_ENV) - -# Makefile ignores DESTDIR -FUSE_ZIP_INSTALL_OPT := 'INSTALLPREFIX=$(FUSE_ZIP_PKGDIR)/usr' install +FUSE_ZIP_INSTALL_OPT := 'prefix=/usr' install # ---------------------------------------------------------------------------- |