diff options
| author | Chih-Hsuan Yen | 2018-06-18 22:00:21 +0800 |
|---|---|---|
| committer | Chih-Hsuan Yen | 2018-06-18 22:00:21 +0800 |
| commit | 6470636573e3dc464edfdfe00a8ae1a2b037ed4d (patch) | |
| tree | 6b1f1727a81684db907ba6ee692327cfb037dc51 | |
| parent | 25f1262373e125cdd631f4bfd570f0a86c272571 (diff) | |
| download | aur-6470636573e3dc464edfdfe00a8ae1a2b037ed4d.tar.gz | |
add a patch to fix compiling with GCC 8
Ref: https://github.com/darlinghq/darling-dmg/issues/51
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | issue51.patch | 16 |
3 files changed, 32 insertions, 6 deletions
@@ -1,6 +1,6 @@ pkgbase = darling-dmg-git pkgdesc = FUSE module for .dmg files (containing an HFS+ filesystem) - pkgver = 1.0.4.r15.g4e3a2ed + pkgver = 1.0.4.r22.geca0aea pkgrel = 1 epoch = 1 url = https://www.darlinghq.org @@ -16,11 +16,13 @@ pkgbase = darling-dmg-git depends = libxml2 depends = openssl depends = zlib - provides = darling-dmg=1.0.4.r15.g4e3a2ed + provides = darling-dmg=1.0.4.r22.geca0aea conflicts = darling-git conflicts = darling-dmg source = git+https://github.com/darlinghq/darling-dmg + source = issue51.patch sha256sums = SKIP + sha256sums = ef77322fc0e4792f0ba5ff3f1aa67ca2078a02e502777c2483816f55fc255277 pkgname = darling-dmg-git @@ -1,9 +1,9 @@ -# Maintainer: Yen Chi Hsuan <yan12125@gmail.com> +# Maintainer: Chih-Hsuan Yen <yan12125@gmail.com> # Contributor: James An <james@jamesan.ca> _pkgname=darling-dmg pkgname=$_pkgname-git -pkgver=1.0.4.r15.g4e3a2ed +pkgver=1.0.4.r22.geca0aea pkgrel=1 epoch=1 pkgdesc="FUSE module for .dmg files (containing an HFS+ filesystem)" @@ -13,8 +13,10 @@ url='https://www.darlinghq.org' depends=('bzip2' 'fuse' 'icu' 'libxml2' 'openssl' 'zlib') # boost is used only in check() but the build step requires it to build a test executable makedepends=('cmake' 'git' 'boost') -source=("git+https://github.com/darlinghq/darling-dmg") -sha256sums=('SKIP') +source=("git+https://github.com/darlinghq/darling-dmg" + issue51.patch) +sha256sums=('SKIP' + 'ef77322fc0e4792f0ba5ff3f1aa67ca2078a02e502777c2483816f55fc255277') conflicts=('darling-git' "$_pkgname") provides=("$_pkgname=$pkgver") @@ -26,6 +28,12 @@ pkgver() { ) } +prepare() { + cd "$srcdir/$_pkgname" + + patch -Np1 -i ../issue51.patch +} + build() { cd "$srcdir/$_pkgname" mkdir -p build && cd build diff --git a/issue51.patch b/issue51.patch new file mode 100644 index 000000000000..e2040d9a8a38 --- /dev/null +++ b/issue51.patch @@ -0,0 +1,16 @@ +diff --git a/src/HFSBTreeNode.h b/src/HFSBTreeNode.h +index 0a98378..029f60a 100644 +--- a/src/HFSBTreeNode.h ++++ b/src/HFSBTreeNode.h +@@ -129,6 +129,11 @@ public: + m_index++; + return *this; + } ++ RecordIterator& operator--() ++ { ++ m_index--; ++ return *this; ++ } + + difference_type operator-(const RecordIterator& that) + { |