diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | 0001-No-Werror.patch (renamed from 0003-No-Werror.patch) | 0 | ||||
| -rw-r--r-- | 0001-No-install.patch | 22 | ||||
| -rw-r--r-- | 0002-Make_build_gcc_10_compatible.patch | 22 | ||||
| -rw-r--r-- | PKGBUILD | 39 |
5 files changed, 24 insertions, 71 deletions
@@ -1,10 +1,10 @@ pkgbase = sasquatch-git - pkgdesc = Patched unsquashfs utility with support for vendor-specific SquashFS implementations. + pkgdesc = Patched unsquashfs utility with support for vendor-specific SquashFS implementations pkgver = r60.bd864a1 pkgrel = 1 url = https://github.com/devttys0/sasquatch arch = x86_64 - license = unknown + license = GPL2 makedepends = git depends = lzo depends = xz @@ -12,12 +12,10 @@ pkgbase = sasquatch-git provides = sasquatch conflicts = sasquatch source = sasquatch-git::git+https://github.com/devttys0/sasquatch.git - source = 0001-No-install.patch - source = 0002-Make_build_gcc_10_compatible.patch - source = 0003-No-Werror.patch + source = https://downloads.sourceforge.net/project/squashfs/squashfs/squashfs4.3/squashfs4.3.tar.gz + source = 0001-No-Werror.patch sha512sums = SKIP - sha512sums = c94ebf6c2274b81fa749b226d04804d0f1d0e20b6579f74717584abbf5590bfa68e13b31163aa69ab6b5e5f214a30b8ce74115ea343bede05ddf8ae19008d37b - sha512sums = 9f61b5052f6daa0ef84f08426d420d1a308b149cf8b7bae30566dd85c825b9c7fcd90ec4833f075d0244076894e2572212ad1bc33f018adbe043fed54657c2b2 + sha512sums = 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79 sha512sums = 8f92c3589b3d74d611a2bff9b7a1933d8e2284c32dc460f060a2fc0232578bf4ca1852297180b674a3c1e63af6f2b664bf335c7224b7a6b95e464337bf222901 pkgname = sasquatch-git diff --git a/0003-No-Werror.patch b/0001-No-Werror.patch index 16a200bf8c56..16a200bf8c56 100644 --- a/0003-No-Werror.patch +++ b/0001-No-Werror.patch diff --git a/0001-No-install.patch b/0001-No-install.patch deleted file mode 100644 index 7bfb1d8ed1b0..000000000000 --- a/0001-No-install.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 00b176d02b0d79db9aea5e3122013c0ae46567d1 Mon Sep 17 00:00:00 2001 -From: Christian Mauderer <oss@c-mauderer.de> -Date: Wed, 11 Dec 2019 15:31:45 +0100 -Subject: [PATCH] No install. - ---- - build.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build.sh b/build.sh -index b1bc341..f7f8a48 100755 ---- a/build.sh -+++ b/build.sh -@@ -34,4 +34,4 @@ tar -zxvf squashfs4.3.tar.gz - cd squashfs4.3 - patch -p0 < ../patches/patch0.txt - cd squashfs-tools --make && $SUDO make install -+make --- -2.24.0 - diff --git a/0002-Make_build_gcc_10_compatible.patch b/0002-Make_build_gcc_10_compatible.patch deleted file mode 100644 index dc8369e2bf4c..000000000000 --- a/0002-Make_build_gcc_10_compatible.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f7908b7cae17d6514abef600a27e601bf582a8d9 Mon Sep 17 00:00:00 2001 -From: Sven Schwermer <sven@svenschwermer.de> -Date: Sun, 31 May 2020 19:09:55 +0200 -Subject: [PATCH] Make build gcc 10 compatible - -Signed-off-by: Sven Schwermer <sven@svenschwermer.de> ---- - build.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build.sh b/build.sh -index f7f8a48..e59facf 100755 ---- a/build.sh -+++ b/build.sh -@@ -34,4 +34,4 @@ tar -zxvf squashfs4.3.tar.gz - cd squashfs4.3 - patch -p0 < ../patches/patch0.txt - cd squashfs-tools --make -+make EXTRA_CFLAGS=-fcommon --- -2.26.2 @@ -1,41 +1,40 @@ pkgname=sasquatch-git pkgrel=1 pkgver=r60.bd864a1 -pkgdesc='Patched unsquashfs utility with support for vendor-specific SquashFS implementations.' +pkgdesc='Patched unsquashfs utility with support for vendor-specific SquashFS implementations' arch=('x86_64') url='https://github.com/devttys0/sasquatch' -license=('unknown') +license=(GPL2) depends=('lzo' 'xz' 'zlib') makedepends=('git') provides=('sasquatch') conflicts=('sasquatch') -source=("${pkgname}"::'git+'$url'.git' - 0001-No-install.patch - 0002-Make_build_gcc_10_compatible.patch - 0003-No-Werror.patch) +source=("${pkgname}::git+$url.git" + "https://downloads.sourceforge.net/project/squashfs/squashfs/squashfs4.3/squashfs4.3.tar.gz" + "0001-No-Werror.patch") sha512sums=('SKIP' - 'c94ebf6c2274b81fa749b226d04804d0f1d0e20b6579f74717584abbf5590bfa68e13b31163aa69ab6b5e5f214a30b8ce74115ea343bede05ddf8ae19008d37b' - '9f61b5052f6daa0ef84f08426d420d1a308b149cf8b7bae30566dd85c825b9c7fcd90ec4833f075d0244076894e2572212ad1bc33f018adbe043fed54657c2b2' + '854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79' '8f92c3589b3d74d611a2bff9b7a1933d8e2284c32dc460f060a2fc0232578bf4ca1852297180b674a3c1e63af6f2b664bf335c7224b7a6b95e464337bf222901') -prepare() { - cd "$pkgname" - patch -p1 < "${srcdir}/0001-No-install.patch" - patch -p1 < "${srcdir}/0002-Make_build_gcc_10_compatible.patch" - patch -p1 < "${srcdir}/0003-No-Werror.patch" +pkgver() { + cd "${srcdir}/${pkgname}" + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } -pkgver() { - cd "$pkgname" - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +prepare() { + cd "${srcdir}/${pkgname}" + patch -p1 < "${srcdir}/0001-No-Werror.patch" + + cd "${srcdir}/squashfs4.3" + patch -p0 < "${srcdir}/${pkgname}/patches/patch0.txt" } build() { - cd "${srcdir}/${pkgname}" - ./build.sh + cd "${srcdir}/squashfs4.3/squashfs-tools" + make EXTRA_CFLAGS=-fcommon } package() { - cd "${srcdir}/${pkgname}/squashfs"*"/squashfs-tools/" - install -D -m0755 sasquatch ${pkgdir}/usr/local/bin/sasquatch + cd "${srcdir}/squashfs4.3/squashfs-tools" + make INSTALL_DIR="${pkgdir}/usr/bin" install } |