diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-12-18 18:02:35 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-12-18 18:02:35 +0000 |
| commit | 46f1e5db6ce295c6842dbcec50c75f2552c5a463 (patch) | |
| tree | 17815910ef92a937f75863415fe03e40317ad6ce | |
| parent | 94749d466a1c060165299ede44ebf640c99b162a (diff) | |
| download | aports-46f1e5db6ce295c6842dbcec50c75f2552c5a463.tar.bz2 aports-46f1e5db6ce295c6842dbcec50c75f2552c5a463.tar.xz | |
main/midori: fix musl build
| -rw-r--r-- | main/midori/APKBUILD | 24 | ||||
| -rw-r--r-- | main/midori/execinfo-detect.patch | 18 |
2 files changed, 37 insertions, 5 deletions
diff --git a/main/midori/APKBUILD b/main/midori/APKBUILD index 06c567a798..4c2f5fb2d9 100644 --- a/main/midori/APKBUILD +++ b/main/midori/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=midori pkgver=0.5.6 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight web browser based on Gtk WebKit" url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" arch="all" @@ -30,9 +30,20 @@ makedepends=" " subpackages="$pkgname-lang" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" -source="http://www.midori-browser.org/downloads/midori_${pkgver}_all_.tar.bz2" +source="http://www.midori-browser.org/downloads/midori_${pkgver}_all_.tar.bz2 + execinfo-detect.patch + " _builddir="$srcdir"/midori-${pkgver} +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + build() { cd "$_builddir" cmake \ @@ -52,6 +63,9 @@ package() { paxctl -c -m -p "$pkgdir"/usr/bin/midori } -md5sums="62ee86eb103b74efe71d40e343120a3c midori_0.5.6_all_.tar.bz2" -sha256sums="c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a midori_0.5.6_all_.tar.bz2" -sha512sums="42d67ab55b2586098f88088e7c72eda4daebf667881d464fd08b03c076557dfa9c1a62bff3924285a7c67f9fb9f0e1cd044703244caad2c00e4a88cb88569ee7 midori_0.5.6_all_.tar.bz2" +md5sums="62ee86eb103b74efe71d40e343120a3c midori_0.5.6_all_.tar.bz2 +ddeee1a42503ca911a9830f096fc64e9 execinfo-detect.patch" +sha256sums="c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a midori_0.5.6_all_.tar.bz2 +7e8d1ba1ee7d5e017375465d525b5a3794fb96e5683b14263f9a51ac759c18ce execinfo-detect.patch" +sha512sums="42d67ab55b2586098f88088e7c72eda4daebf667881d464fd08b03c076557dfa9c1a62bff3924285a7c67f9fb9f0e1cd044703244caad2c00e4a88cb88569ee7 midori_0.5.6_all_.tar.bz2 +664837bd52054ac404baad8f63c96a44f8c0c58390ff57a69dae6682a1f9ec1c5a4b8a6907ba38f1349aa3af18380d44399e79ac4269d4ae398b22be72e970a5 execinfo-detect.patch" diff --git a/main/midori/execinfo-detect.patch b/main/midori/execinfo-detect.patch new file mode 100644 index 0000000000..171bcacb6f --- /dev/null +++ b/main/midori/execinfo-detect.patch @@ -0,0 +1,18 @@ +--- midori-0.5.6.orig/CMakeLists.txt ++++ midori-0.5.6/CMakeLists.txt +@@ -97,13 +97,8 @@ + endif () + + # Check if execinfo.h header exists +-string(FIND ${CMAKE_SYSTEM_NAME} "BSD" BEGIN) +-if (${BEGIN} GREATER 0) +- string(SUBSTRING ${CMAKE_SYSTEM_NAME} ${BEGIN} 3 BSD) +-else() +- set(BSD 0) +-endif() +-if (UNIX AND NOT BSD) ++find_file (EXECINFO execinfo.h) ++if (EXECINFO) + set(VALAFLAGS ${VALAFLAGS} -D HAVE_EXECINFO_H) + endif () + |