From d95e2bc8267a24b585856b23e7819fc365dda981 Mon Sep 17 00:00:00 2001
From: Leo <thinkabit.ukim@gmail.com>
Date: Tue, 7 Apr 2020 13:17:26 -0300
Subject: [PATCH] {main,community,testing}/*: rebuild against libffi.so.7
---
community/cabal/APKBUILD | 2 +-
community/cloudi/APKBUILD | 2 +-
community/ecl/APKBUILD | 2 +-
community/firefox-esr/APKBUILD | 2 +-
community/firefox/APKBUILD | 2 +-
community/ghc/APKBUILD | 2 +-
community/java-jna/APKBUILD | 2 +-
community/llvm5/APKBUILD | 2 +-
community/llvm8/APKBUILD | 2 +-
community/lua-lgi/APKBUILD | 2 +-
community/mozjs68/APKBUILD | 2 +-
community/ruby-ffi/APKBUILD | 2 +-
community/shellcheck/APKBUILD | 2 ++
main/glib/APKBUILD | 2 +-
main/gobject-introspection/APKBUILD | 2 +-
main/guile/APKBUILD | 2 +-
main/llvm10/APKBUILD | 2 +-
main/llvm9/APKBUILD | 2 +-
main/mozjs60/APKBUILD | 2 +-
main/p11-kit/APKBUILD | 2 +-
main/py3-cffi/APKBUILD | 2 +-
main/py3-gobject3/APKBUILD | 2 +-
main/python3/APKBUILD | 2 +-
main/ruby/APKBUILD | 2 +-
main/wayland/APKBUILD | 2 +-
testing/gforth/APKBUILD | 2 +-
testing/idris/APKBUILD | 2 +-
testing/llvm6/APKBUILD | 2 +-
testing/micropython/APKBUILD | 2 +-
testing/moarvm/APKBUILD | 2 +-
testing/polyml/APKBUILD | 2 +-
testing/seamonkey/APKBUILD | 2 +-
testing/thunderbird/APKBUILD | 2 +-
33 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/community/cabal/APKBUILD b/community/cabal/APKBUILD
index a992a213fbe7..35a5695bf583 100644
--- a/community/cabal/APKBUILD
+++ b/community/cabal/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Mitch Tishmack <mitch.tishmack@gmail.com>
pkgname=cabal
pkgver=3.0.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="The Haskell Cabal"
url="https://haskell.org/"
arch="x86_64"
diff --git a/community/cloudi/APKBUILD b/community/cloudi/APKBUILD
index 69460024f20e..809e8e6be62e 100644
--- a/community/cloudi/APKBUILD
+++ b/community/cloudi/APKBUILD
@@ -29,7 +29,7 @@
pkgname=cloudi
pkgver=1.8.0
-pkgrel=1
+pkgrel=2
pkgdesc="Cloud computing framework for efficient, scalable, and stable soft-realtime event processing."
url="https://cloudi.org/"
license="MIT"
diff --git a/community/ecl/APKBUILD b/community/ecl/APKBUILD
index 8637f2e5e973..bc3ae55b851f 100644
--- a/community/ecl/APKBUILD
+++ b/community/ecl/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Lucas Ramage <ramage.lucas@openmailbox.org>
pkgname=ecl
pkgver=16.1.3
-pkgrel=3
+pkgrel=4
pkgdesc="Embeddable Common Lisp"
# not compatible with soft-float archs (like mips)
arch="all !mips !mips64"
diff --git a/community/firefox-esr/APKBUILD b/community/firefox-esr/APKBUILD
index 532f08fd5932..9c8a6f8d0a4f 100644
--- a/community/firefox-esr/APKBUILD
+++ b/community/firefox-esr/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=firefox-esr
pkgver=68.7.0
-pkgrel=0
+pkgrel=1
pkgdesc="Firefox web browser - Extended Support Release"
url="https://www.mozilla.org/en-US/firefox/organizations/"
# limited by rust and cargo on mips s390x, fails to build on armhf
diff --git a/community/firefox/APKBUILD b/community/firefox/APKBUILD
index e4eaa93c6ecd..fbe994ce9102 100644
--- a/community/firefox/APKBUILD
+++ b/community/firefox/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=firefox
pkgver=75.0
-pkgrel=0
+pkgrel=1
pkgdesc="Firefox web browser"
url="https://www.firefox.com/"
# Limited on:
diff --git a/community/ghc/APKBUILD b/community/ghc/APKBUILD
index 1b5eae502323..5c3b5da68eb7 100644
--- a/community/ghc/APKBUILD
+++ b/community/ghc/APKBUILD
@@ -2,7 +2,7 @@
pkgname=ghc
pkgver=8.6.5
_llvmver=9
-pkgrel=3
+pkgrel=4
# Normal non rc candidate
_urlprefix="$pkgver"
_pkgprefix="$pkgname-$pkgver"
diff --git a/community/java-jna/APKBUILD b/community/java-jna/APKBUILD
index 9a532d109aac..57abdd5ee115 100644
--- a/community/java-jna/APKBUILD
+++ b/community/java-jna/APKBUILD
@@ -3,7 +3,7 @@
pkgname=java-jna
_pkgname=${pkgname#java-}
pkgver=5.5.0
-pkgrel=0
+pkgrel=1
pkgdesc="JNA provides Java programs easy access to native shared libraries."
url="https://github.com/java-native-access/jna"
arch="all !mips !mips64"
diff --git a/community/llvm5/APKBUILD b/community/llvm5/APKBUILD
index c53fd1ce8346..6d370ce2299d 100644
--- a/community/llvm5/APKBUILD
+++ b/community/llvm5/APKBUILD
@@ -6,7 +6,7 @@ _pkgname=llvm
pkgver=5.0.2
_majorver=${pkgver%%.*}
pkgname=$_pkgname$_majorver
-pkgrel=3
+pkgrel=4
pkgdesc="Low Level Virtual Machine compiler system, version $_majorver"
arch="all !mips !mips64"
url="https://llvm.org/"
diff --git a/community/llvm8/APKBUILD b/community/llvm8/APKBUILD
index e9ec1844007a..ef40c2bf13c6 100644
--- a/community/llvm8/APKBUILD
+++ b/community/llvm8/APKBUILD
@@ -8,7 +8,7 @@ _pkgname=llvm
pkgver=8.0.1
_majorver=${pkgver%${pkgver##[0-9]}}
pkgname=$_pkgname$_majorver
-pkgrel=3
+pkgrel=4
pkgdesc="Low Level Virtual Machine compiler system, version $_majorver"
arch="all"
url="https://llvm.org/"
diff --git a/community/lua-lgi/APKBUILD b/community/lua-lgi/APKBUILD
index cfb460b7ad76..c735ef2be8b0 100644
--- a/community/lua-lgi/APKBUILD
+++ b/community/lua-lgi/APKBUILD
@@ -3,7 +3,7 @@
_luaversions="5.1 5.2 5.3"
pkgname=lua-lgi
pkgver=0.9.2
-pkgrel=0
+pkgrel=1
pkgdesc="Dynamic Lua binding to GObject libraries using GObject-Introspection"
url="https://github.com/pavouk/lgi"
arch="all"
diff --git a/community/mozjs68/APKBUILD b/community/mozjs68/APKBUILD
index ab1590002cec..29b91f053d7f 100644
--- a/community/mozjs68/APKBUILD
+++ b/community/mozjs68/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=mozjs68
pkgver=68.6.0
-pkgrel=2
+pkgrel=3
pkgdesc="Standalone Mozilla JavaScript engine"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
arch="x86_64 armv7 armhf aarch64 x86 ppc64le" # limited by rust and cargo
diff --git a/community/ruby-ffi/APKBUILD b/community/ruby-ffi/APKBUILD
index dc25f79b0628..5b5b2aadcd25 100644
--- a/community/ruby-ffi/APKBUILD
+++ b/community/ruby-ffi/APKBUILD
@@ -3,7 +3,7 @@
pkgname=ruby-ffi
_gemname=ffi
pkgver=1.12.2
-pkgrel=0
+pkgrel=1
pkgdesc="Ruby FFI library"
url="https://github.com/ffi/ffi"
arch="all"
diff --git a/community/shellcheck/APKBUILD b/community/shellcheck/APKBUILD
index dc2b4bde957a..2a05f2b8ae41 100644
--- a/community/shellcheck/APKBUILD
+++ b/community/shellcheck/APKBUILD
@@ -5,6 +5,8 @@ pkgrel=1
pkgdesc="a static analysis tool for shell scripts"
url="https://github.com/koalaman/shellcheck"
arch="x86_64" # Limited by GHC / Cabal
+# Fails to build shellcheck.1
+arch=""
license="GPL-3.0"
makedepends="cabal ghc"
subpackages="$pkgname-doc"
diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index e7e786d3b497..a48dde1ee30f 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=glib
pkgver=2.64.2
-pkgrel=0
+pkgrel=1
pkgdesc="Common C routines used by Gtk+ and other libs"
url="https://developer.gnome.org/glib/"
arch="all"
diff --git a/main/gobject-introspection/APKBUILD b/main/gobject-introspection/APKBUILD
index b52e1df204b9..9fd2ee511702 100644
--- a/main/gobject-introspection/APKBUILD
+++ b/main/gobject-introspection/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gobject-introspection
pkgver=1.64.1
-pkgrel=0
+pkgrel=1
pkgdesc="Introspection system for GObject-based libraries"
url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection"
arch="all"
diff --git a/main/guile/APKBUILD b/main/guile/APKBUILD
index 9193fa1a97d2..00dce413947c 100644
--- a/main/guile/APKBUILD
+++ b/main/guile/APKBUILD
@@ -6,7 +6,7 @@
pkgname=guile
pkgver=2.0.14
-pkgrel=0
+pkgrel=1
pkgdesc="Guile is a portable, embeddable Scheme implementation written in C"
url="https://www.gnu.org/software/guile/"
arch="all"
diff --git a/main/llvm10/APKBUILD b/main/llvm10/APKBUILD
index 46de6cb695ab..ed10b617dd0a 100644
--- a/main/llvm10/APKBUILD
+++ b/main/llvm10/APKBUILD
@@ -8,7 +8,7 @@ _pkgname=llvm
pkgver=10.0.0
_majorver=${pkgver%%.*}
pkgname=$_pkgname$_majorver
-pkgrel=0
+pkgrel=1
pkgdesc="Low Level Virtual Machine compiler system, version $_majorver"
arch="all"
url="https://llvm.org/"
diff --git a/main/llvm9/APKBUILD b/main/llvm9/APKBUILD
index fb9803112c5e..9a8be63d5e78 100644
--- a/main/llvm9/APKBUILD
+++ b/main/llvm9/APKBUILD
@@ -8,7 +8,7 @@ _pkgname=llvm
pkgver=9.0.1
_majorver=${pkgver%${pkgver##[0-9]}}
pkgname=$_pkgname$_majorver
-pkgrel=1
+pkgrel=2
pkgdesc="Low Level Virtual Machine compiler system, version $_majorver"
arch="all"
url="https://llvm.org/"
diff --git a/main/mozjs60/APKBUILD b/main/mozjs60/APKBUILD
index 7b4a23753443..32b4aed8ca32 100644
--- a/main/mozjs60/APKBUILD
+++ b/main/mozjs60/APKBUILD
@@ -3,7 +3,7 @@
pkgname=mozjs60
pkgver=60.9.0
_majver=${pkgver%%.*}
-pkgrel=3
+pkgrel=4
pkgdesc="standalone mozilla javascript engine"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/60"
arch="all"
diff --git a/main/p11-kit/APKBUILD b/main/p11-kit/APKBUILD
index 56b018fe27e6..725867b4ad89 100644
--- a/main/p11-kit/APKBUILD
+++ b/main/p11-kit/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=p11-kit
pkgver=0.23.20
-pkgrel=2
+pkgrel=3
pkgdesc="Library for loading and sharing PKCS#11 modules"
url="https://p11-glue.freedesktop.org/"
arch="all"
diff --git a/main/py3-cffi/APKBUILD b/main/py3-cffi/APKBUILD
index ecabf6a65768..a5b36fa9f13b 100644
--- a/main/py3-cffi/APKBUILD
+++ b/main/py3-cffi/APKBUILD
@@ -3,7 +3,7 @@
pkgname=py3-cffi
_pkgname=cffi
pkgver=1.14.0
-pkgrel=0
+pkgrel=1
pkgdesc="A foreign function interface for calling C code from Python3"
url="http://cffi.readthedocs.org/"
arch="all"
diff --git a/main/py3-gobject3/APKBUILD b/main/py3-gobject3/APKBUILD
index 2a1c5227cc52..e65c1ebb2fdd 100644
--- a/main/py3-gobject3/APKBUILD
+++ b/main/py3-gobject3/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=py3-gobject3
pkgver=3.36.0
-pkgrel=0
+pkgrel=1
pkgdesc="Python bindings for the GObject library"
url="https://wiki.gnome.org/Projects/PyGObject/"
arch="all"
diff --git a/main/python3/APKBUILD b/main/python3/APKBUILD
index 2121d7722946..13e23a651b06 100644
--- a/main/python3/APKBUILD
+++ b/main/python3/APKBUILD
@@ -6,7 +6,7 @@ pkgname=python3
pkgver=3.8.2
_bluez_ver=5.53
_basever="${pkgver%.*}"
-pkgrel=3
+pkgrel=4
pkgdesc="A high-level scripting language"
url="https://www.python.org/"
arch="all"
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index c7ce5dd10afb..1f782b885a9b 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
@@ -36,7 +36,7 @@
pkgname=ruby
pkgver=2.6.6
_abiver="${pkgver%.*}.0"
-pkgrel=2
+pkgrel=3
pkgdesc="An object-oriented language for quick and easy programming"
url="https://www.ruby-lang.org/"
arch="all"
diff --git a/main/wayland/APKBUILD b/main/wayland/APKBUILD
index e078b69d4056..28ada71eaf26 100644
--- a/main/wayland/APKBUILD
+++ b/main/wayland/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Valery Kartel <valery.kartel@gmail.com>
pkgname=wayland
pkgver=1.18.0
-pkgrel=1
+pkgrel=2
pkgdesc="A computer display server protocol"
url="https://wayland.freedesktop.org"
arch="all"
diff --git a/testing/gforth/APKBUILD b/testing/gforth/APKBUILD
index b6cff3e3621c..c8589b77c232 100644
--- a/testing/gforth/APKBUILD
+++ b/testing/gforth/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=gforth
pkgver=0.7.3
-pkgrel=1
+pkgrel=2
pkgdesc="Fast and portable implementation of the ANS Forth language"
url="http://www.gnu.org/software/gforth/"
arch="all !x86" # build fail on x86
diff --git a/testing/idris/APKBUILD b/testing/idris/APKBUILD
index ed2fffb40abf..b8a6cc63ea31 100644
--- a/testing/idris/APKBUILD
+++ b/testing/idris/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Mitch Tishmack <mitch.tishmack@gmail.com>
pkgname=idris
pkgver=1.3.0
-pkgrel=1
+pkgrel=2
pkgdesc="A Language with Dependent Types"
url="https://www.idris-lang.org/"
# Note: same as ghc, if it gets ported elsewhere this should run too.
diff --git a/testing/llvm6/APKBUILD b/testing/llvm6/APKBUILD
index 2798d4e26087..928a27d008f1 100644
--- a/testing/llvm6/APKBUILD
+++ b/testing/llvm6/APKBUILD
@@ -6,7 +6,7 @@ _pkgname=llvm
pkgver=6.0.1
_majorver=${pkgver%%.*}
pkgname=$_pkgname$_majorver
-pkgrel=5
+pkgrel=6
pkgdesc="Low Level Virtual Machine compiler system, version $_majorver"
arch="all"
url="https://llvm.org/"
diff --git a/testing/micropython/APKBUILD b/testing/micropython/APKBUILD
index f496f46ac281..37c5938afdd4 100644
--- a/testing/micropython/APKBUILD
+++ b/testing/micropython/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Marian <marian.buschsieweke@ovgu.de>
pkgname=micropython
pkgver=1.12
-pkgrel=0
+pkgrel=1
pkgdesc="A lean and efficient Python implementation for MCUs and constrained systems"
url="https://www.micropython.org/"
diff --git a/testing/moarvm/APKBUILD b/testing/moarvm/APKBUILD
index 9f7a77c8feae..86ad20d5b160 100644
--- a/testing/moarvm/APKBUILD
+++ b/testing/moarvm/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Curt Tilmes <Curt.Tilmes@nasa.gov>
pkgname=moarvm
pkgver=2019.07.1
-pkgrel=0
+pkgrel=1
pkgdesc="A VM for NQP And Rakudo Perl 6"
url="http://moarvm.org/"
arch="all"
diff --git a/testing/polyml/APKBUILD b/testing/polyml/APKBUILD
index eef15e8bd44a..b2349d62b80a 100644
--- a/testing/polyml/APKBUILD
+++ b/testing/polyml/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=polyml
pkgver=5.8
-pkgrel=0
+pkgrel=1
pkgdesc="ML97 compatible Standard ML implementation"
url="https://www.polyml.org/"
arch="all !aarch64 !ppc64le !s390x"
diff --git a/testing/seamonkey/APKBUILD b/testing/seamonkey/APKBUILD
index 5da3b5f293f9..0dce3e1f78fe 100644
--- a/testing/seamonkey/APKBUILD
+++ b/testing/seamonkey/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Marc Vertes <mvertes@free.fr>
pkgname=seamonkey
pkgver=2.49.5
-pkgrel=2
+pkgrel=3
pkgdesc="all-in-one internet application suite"
url="https://www.seamonkey-project.org/"
arch="x86_64 x86"
diff --git a/testing/thunderbird/APKBUILD b/testing/thunderbird/APKBUILD
index df862e149ee6..ae4f23474871 100644
--- a/testing/thunderbird/APKBUILD
+++ b/testing/thunderbird/APKBUILD
@@ -5,7 +5,7 @@ pkgname=thunderbird
pkgver=68.6.0
_pkgver=$pkgver
_xulver=$pkgver
-pkgrel=2
+pkgrel=3
pkgdesc="Thunderbird email client"
url="https://www.thunderbird.net/"
arch="all !s390x !armhf !mips !mips64" # limited by rust and cargo. Fails on armhf due to bad assembly
--
GitLab