community/gitea/0001-Fix-rebase-conflict-detection-in-git-2.26.patch

-From d90735d2e8ddfe02794a772ae07666aa4ebc105e Mon Sep 17 00:00:00 2001
-From: 6543 <6543@obermui.de>
-Date: Thu, 2 Apr 2020 22:46:50 +0200
-Subject: [PATCH] Fix rebase conflict detection in git 2.26
-
-Git changed the technique used in rebase from
-simple apply-patches to use merge. This breaks
-our conflict detection code.
-
-created by: Andrew Thornton <art27@cantab.net>
----
- services/pull/merge.go | 29 +++++++++++++++++++++++------
- 1 file changed, 23 insertions(+), 6 deletions(-)
-
-diff --git a/services/pull/merge.go b/services/pull/merge.go
-index f9d9a27c9..b71784f00 100644
---- a/services/pull/merge.go
-+++ b/services/pull/merge.go
-@@ -211,17 +211,34 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
- 		if err := git.NewCommand("rebase", baseBranch).RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
- 			// Rebase will leave a REBASE_HEAD file in .git if there is a conflict
- 			if _, statErr := os.Stat(filepath.Join(tmpBasePath, ".git", "REBASE_HEAD")); statErr == nil {
--				// The original commit SHA1 that is failing will be in .git/rebase-apply/original-commit
--				commitShaBytes, readErr := ioutil.ReadFile(filepath.Join(tmpBasePath, ".git", "rebase-apply", "original-commit"))
--				if readErr != nil {
--					// Abandon this attempt to handle the error
-+				var commitSha string
-+				ok := false
-+				failingCommitPaths := []string{
-+					filepath.Join(tmpBasePath, ".git", "rebase-apply", "original-commit"), // Git < 2.26
-+					filepath.Join(tmpBasePath, ".git", "rebase-merge", "stopped-sha"),     // Git >= 2.26
-+				}
-+				for _, failingCommitPath := range failingCommitPaths {
-+					if _, statErr := os.Stat(filepath.Join(failingCommitPath)); statErr == nil {
-+						commitShaBytes, readErr := ioutil.ReadFile(filepath.Join(failingCommitPath))
-+						if readErr != nil {
-+							// Abandon this attempt to handle the error
-+							log.Error("git rebase staging on to base [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
-+							return fmt.Errorf("git rebase staging on to base [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
-+						}
-+						commitSha = strings.TrimSpace(string(commitShaBytes))
-+						ok = true
-+						break
-+					}
-+				}
-+				if !ok {
-+					log.Error("Unable to determine failing commit sha for this rebase message. Cannot cast as models.ErrRebaseConflicts.")
- 					log.Error("git rebase staging on to base [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
- 					return fmt.Errorf("git rebase staging on to base [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
- 				}
--				log.Debug("RebaseConflict at %s [%s:%s -> %s:%s]: %v\n%s\n%s", strings.TrimSpace(string(commitShaBytes)), pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
-+				log.Debug("RebaseConflict at %s [%s:%s -> %s:%s]: %v\n%s\n%s", commitSha, pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
- 				return models.ErrRebaseConflicts{
- 					Style:     mergeStyle,
--					CommitSHA: strings.TrimSpace(string(commitShaBytes)),
-+					CommitSHA: commitSha,
- 					StdOut:    outbuf.String(),
- 					StdErr:    errbuf.String(),
- 					Err:       err,
--- 
-2.26.0
-

community/gitea/APKBUILD

@@ -2,8 +2,8 @@
 # Contributor: 6543 <6543@obermui.de>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=gitea
-pkgver=1.11.4
-pkgrel=2
+pkgver=1.11.5
+pkgrel=0
 pkgdesc="A self-hosted Git service written in Go"
 url="https://gitea.io"
 arch="all !mips !mips64"
@@ -19,12 +19,11 @@ subpackages="$pkgname-openrc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/go-gitea/gitea/archive/v$pkgver.tar.gz
 	$pkgname.initd
 	$pkgname.ini
-	0001-Fix-rebase-conflict-detection-in-git-2.26.patch
 	"
 builddir="$srcdir/src/code.gitea.io/$pkgname"
 
 case "$CARCH" in
-	x86_64|s390x|x86) options="$options !check" ;;
+	x86_64|s390x|x86|armhf) options="$options !check" ;;
 esac
 
 prepare() {
@@ -79,7 +78,6 @@ package() {
 		"$pkgdir"/etc/init.d/$pkgname
 }
 
-sha512sums="5b7d07fd02f3acf900f1a3d2d9bb99a94487eaaf148d11a9746b309ee97ffc2d208fd47cc7e121ac0b2a6e97c919ea0232898f7f6851248a8407c706edbc904a  gitea-1.11.4.tar.gz
-4c2c4933c482f0c06447252b50533d637cbd0ad7416684c0771ad7e3326d9793b5f28879f5251b38c51bc71ed15a4aa767ce05d08edb6ca0840749e659fb5081  0001-Fix-rebase-conflict-detection-in-git-2.26.patch
+sha512sums="ba80ba77f6f761a03d062d5ceaacf0d2f9a7c5ad3c414f3d34ff31ee37ac00c4af562ecba0f14c6dca3ad2012e6cbfd8aea105dd87cfb06aedc80cf22a9ff12b  gitea-1.11.5.tar.gz
 2497e6f2a18e3ceb65352cd220eab2c1c0893d0e731600462a60397de2b70d7c1de7db2af2769b25fe708b0822c811bb20dc797b59b9dd93efb376bea1c35796  gitea.initd
 431184faffa8996873d92d7b0d16bc4b1a0178d264cd2928d1f49b13ad3e6470d9ede7a18c12112deeeb38f0647ccc0b012e98bcbd96e7b8496a3dc18f5b1fb7  gitea.ini"

community/gitlab-runner/APKBUILD

@@ -2,13 +2,13 @@
 # Contributor: Rasmus Thomsen <oss@cogitir.dev>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=gitlab-runner
-pkgver=12.10.1
+pkgver=12.10.2
 pkgrel=1
 # first 8 chars of the git hash of the release, see
 # https://gitlab.com/gitlab-org/gitlab-runner/-/tags
 # PLEASE update this, since they're used to determine what version of
 # https://hub.docker.com/r/gitlab/gitlab-runner-helper/tags to use
-_rev=ce065b93
+_rev=c5874a4b
 pkgdesc="GitLab runner for CI/CD jobs"
 url="https://docs.gitlab.com/runner/"
 arch="all !mips !mips64"
@@ -65,6 +65,6 @@ helper() {
 		"$subpkgdir"/usr/bin/gitlab-runner-helper
 }
 
-sha512sums="1d7a96a305dfa5f52f63e2f4a9f4918e70ecb9711f87ccea1aced2e685ffc46300c2194aabb9cf1d2599d571b0f4f9b80c8b78eb5b760e93d539bea7080da69b  gitlab-runner-v12.10.1.tar.gz
+sha512sums="c4bdf4d552a2612ef035d30303d69c3c352800761bdc9853004cc255ef2cf9056b036510ad6a898c140adbd4d07bb097fe0143769909c96dfad1540f5913ffa6  gitlab-runner-v12.10.2.tar.gz
 2ae753efc220c46378e84831f01b289f3689af70cd7cbb0bbcc04dc17c910d65eb5105c198d5a23098e27797a7d1c695f49b244993ea4676eb9ec9cda064f44e  gitlab-runner.initd
 243ed9d7575e925794213973232f95f02d5e10cfab6cd29df6a4641b9d05b342ae90678b2eea4b21ddc703596429919d037b38248046d7c5e7a480406f412445  gitlab-runner.confd"

community/gnome-clocks/APKBUILD

 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=gnome-clocks
-pkgver=3.36.0
-pkgrel=3
+pkgver=3.36.2
+pkgrel=0
 pkgdesc="Clock application designed for GNOME 3"
 url="https://wiki.gnome.org/Apps/Clocks"
 arch="all !s390x !mips !mips64" # missing: libhandy
@@ -33,4 +33,4 @@ package() {
 	DESTDIR="$pkgdir" ninja -C output install
 }
 
-sha512sums="46013154aba26b7624ea76d02abb1210534bc6f0aec963c8882da7aa666b978a77b5bfd427c873aac58689f1321ffdb4b03c716b1a126ea34e5af7291c96ee5b  gnome-clocks-3.36.0.tar.xz"
+sha512sums="7b55a72e10c857e3dd0e6726b46647cb544bcee76f151af9b17a65e83b8a2e06564ed6875a0ac52dcdae6ac0f700b7b39aaf25194af52a5cb5449b2653316af6  gnome-clocks-3.36.2.tar.xz"

community/gnome-software-plugin-apk/APKBUILD

 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=gnome-software-plugin-apk
-pkgver=0.4.0.1
+pkgver=0.5.0
 pkgrel=0
 pkgdesc="APK plugin for GNOME Software"
 url="https://github.com/Cogitri/gnome-software-plugin-apk"
@@ -26,4 +26,4 @@ package() {
 	DESTDIR="$pkgdir" ninja -C output install
 }
 
-sha512sums="d9a790bfdd1848d06d65758790cdee9cfd1a39550b8d9c6eeb872b0bd8169d299ad2a9f626f6dbf959f194c7e718eccc1011e021718e70af903cb2778c962db9  gnome-software-plugin-apk-0.4.0.1.tar.gz"
+sha512sums="84309ae32b9b4f044c26e1d29facd8567834dac70f2571f79bb3d328e8f92db432d5eda68e97c6d672e556ee58c94caae71a94745add9e5ffe3b0acf071af40f  gnome-software-plugin-apk-0.5.0.tar.gz"

community/gnome-software/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=gnome-software
 pkgver=3.36.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Software lets you install and update applications and system extensions"
 url="https://wiki.gnome.org/Apps/Software"
 arch="all !s390x !mips !mips64"
@@ -22,6 +22,12 @@ case "$CARCH" in
 	x86*) makedepends="$makedepends fwupd-dev" ;;
 esac
 
+# gnome-software-plugin-apk is only a runtime dependency and unfortunately
+# not available on other arches yet due to LDC.
+case "$CARCH" in
+	x86_64|aarch64) depends="$depends gnome-software-plugin-apk" ;;
+esac
+
 build() {
 	case "$CARCH" in
 		x86*) conf="-Dfwupd=true" ;;

community/gnote/APKBUILD

 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=gnote
-pkgver=3.36.0
+pkgver=3.36.1
 pkgrel=0
 pkgdesc="https://wiki.gnome.org/Apps/Gnote"
 url="Gnote is a port of Tomboy to C++"
@@ -29,4 +29,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="94b8226470b3c66a8bc18f5aea53026829b663ee53e9a6588c858b4e80753b57b204fd14a4b3bd2e86dc68ea2ef1d8518d9d48ef38710a05f6a9602a1d461a28  gnote-3.36.0.tar.xz"
+sha512sums="4c0c9d469836366a7886928beb0b47c48e60ee41591de193b9af597214f373c2c14b25745f6238ccbede8df8e7d4d83f39a34aed1b155895479bba3e043d2cce  gnote-3.36.1.tar.xz"

community/gns3-gui/APKBUILD

 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=gns3-gui
-pkgver=2.2.7
+pkgver=2.2.8
 pkgrel=0
 pkgdesc="GNS3 network simulator. Graphical user interface package."
 url="https://github.com/GNS3/gns3-gui"
@@ -27,4 +27,4 @@ package() {
 	install -Dm644 "$builddir"/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="92d98afec867dca73a6f99026ea74bead72e73d59bebdaa0fd8a28f2ceca5b88caefb8b4f9821d6d156c92a5bfeb58089a1b04600ef6a5c49aeccc261e9bbb02  gns3-gui-2.2.7.tar.gz"
+sha512sums="28b9f6f16506f206f64831160d95687525b6709d9d0d84623763e46c3c9b2e138e3f12844619bbad00491677818a7e28da4f4ea9358d063c3427db16e62775ca  gns3-gui-2.2.8.tar.gz"

community/gns3-server/APKBUILD

 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=gns3-server
-pkgver=2.2.7
+pkgver=2.2.8
 pkgrel=0
 pkgdesc="GNS3 network simulator. Server package."
 url="https://github.com/GNS3/gns3-server"
@@ -12,7 +12,7 @@ depends="busybox dynamips python3
 	py3-async-timeout-gns3 py3-jsonschema-gns3
 	py3-pytest py3-raven
 	py3-psutil-gns3 py3-jinja2
-	py3-async_generator py3-aiofiles
+	py3-async_generator py3-aiofiles-gns3
 	py3-distro py3-py-cpuinfo
 	"
 makedepends="busybox-static py3-setuptools python3-dev linux-headers"
@@ -49,5 +49,5 @@ gns3-server has several optional packages that must be installed manually for ad
 EOF
 }
 
-sha512sums="1237b182a2e1d83d272077a6c164292fdab5c6ce458a913f4d992274ae88acf2daf39b66be636f60ac4554b00d3dfb0948042f9b02c80b95ec42558cec322af3  gns3-server-2.2.7.tar.gz
-cdc09d596f0773ec7b842859f836c4363f50fac5cf954f435b1f50957da9355b47c9dece347c599797d1a32aa31a272810c8e6b906c9e07c470090769f510146  requirements.patch"
+sha512sums="3394d368c986ce8378739bdbc15359c46bdf787a38e18bae9035653dd6dc6683973bf1b7952137189f57fd83074f3d5ea6040f5d7a1d0503f6cf21d2835cd693  gns3-server-2.2.8.tar.gz
+a5bf609c2d3dd63d4d3c3ad7b57248d044b7764f277eaf3218b38002defea20dd6e66d48b11d249149edafe076ef5b3e1981e8fc6e8e9f819e414caa83584bce  requirements.patch"

community/gns3-server/requirements.patch

 diff --git a/requirements.txt b/requirements.txt
-index 81ff0d1..9c876c9 100644
+index 57fbb79..db28f00 100644
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,3 @@
 -yarl==1.3.0  # yarl 1.4+ requires Python 3.6+ (needed by aiohttp and aiohttp-cors)
-+yarl>=1.3.0  # yarl 1.4+ requires Python 3.6+ (needed by aiohttp and aiohttp-cors)
- jsonschema==2.6.0  # pyup: ignore
+ jsonschema==3.2.0; python_version >= '3.8'  # pyup: ignore
+ jsonschema==2.6.0; python_version < '3.8'  # pyup: ignore
  aiohttp==3.6.2
- aiohttp-cors==0.7.0

community/gnumeric/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gnumeric
-pkgver=1.12.46
+pkgver=1.12.47
 pkgrel=0
 pkgdesc="GNOME Spreadsheet Program"
 url="https://www.gnome.org/projects/gnumeric"
@@ -32,4 +32,4 @@ package() {
 }
 
 
-sha512sums="b3b3befe79f3ec8db6d7d9c80a1eed5293f5c0a9ca1d8dd131320eb031952b296147c51df1c775c6f9a0c466912e5523360373ee0b6e453e928929394ab517ea  gnumeric-1.12.46.tar.xz"
+sha512sums="f6298fee752b062672acc20e18388d7424719d69ce9586888f33be07ca92bbd7d99e46b98e9ab2a546d1954d3113b59a5105d46c4e8a13e65e1ae9acc38391ab  gnumeric-1.12.47.tar.xz"

community/go-ipfs/APKBUILD

 # Contributor: Oleg Titov <oleg.titov@gmail.com>
 # Maintainer: Oleg Titov <oleg.titov@gmail.com>
 pkgname=go-ipfs
-pkgver=0.5.0
-pkgrel=1
+pkgver=0.5.1
+pkgrel=0
 pkgdesc="Inter Platnetary File System (IPFS), a peer-to-peer hypermedia distribution protocol"
 url="https://ipfs.io/"
 arch="x86_64 x86 aarch64 armhf armv7"
@@ -58,6 +58,6 @@ bashcomp() {
 		"$subpkgdir"/usr/share/bash-completion/completions/$pkgname
 }
 
-sha512sums="2ce1c281552df656376a9a0600eaa106651a9fca4c452aac9995cf28ad592aa2851b223c55f03cf71a4ed9b12adcceb2fad274d50b2764a219936724b94b23de  go-ipfs-0.5.0.tar.gz
+sha512sums="e36d1e3d5c19ac8a9fe65b83215df8a7007df8f58f96fba09cc4aed698869163813234767df19b07fe58a2159ed36d117d6c64ae0e49d20049a5fb04bb475b7c  go-ipfs-0.5.1.tar.gz
 3e51e9a3dca1b991e8549f8354f7c2cfd1bb9b73d7a59557878d5c9ab4189988676d789172af3ba1fd57193ec48ca9125919507b0de7d0400ce0d6166622e556  ipfs.initd
 c55afeb3efe381d18258ddf00f58325b77156375cf223fb2daa049df056efe22e9139cce0f81dc4c73759dad5097af5f3201414beb5950bd894df9ae8c7c4ed1  ipfs.confd"

community/goffice/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=goffice
-pkgver=0.10.46
+pkgver=0.10.47
 pkgrel=0
 _maj=${pkgver%%.*}
 _min=${pkgver#$_maj.}
@@ -42,5 +42,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="23714fef4dabccc76fe96b78d8eba9c9adb01cb9b3e2f1a9768598fb2a82742b2d2060a7d2548279998488c59e313d7a5863a96b2eb380f540b61fb08e0330f3  goffice-0.10.46.tar.xz
+sha512sums="0db26fbd049893ee9274ee492e1dc3f10ae789cf99cc0b9dda3f1c2f106423e4679cc56515eb08bbf752aaf48492212777eee08d43a9fefb0b22048e883f5a76  goffice-0.10.47.tar.xz
 1addcc0e3f1c4d908fbe4caf2a31a3ac8957f03ccce55f8a81f059ad8d40a79cb51a72ba33a57b027fce85f29b335c126f567cb0a8cef2f25d5cff79287655d4  testsuite-workaround.patch"

community/httpie/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 # Contributor: Daniel Isaksen <d@duniel.no>
 pkgname=httpie
-pkgver=2.0.0
+pkgver=2.1.0
 pkgrel=0
 pkgdesc="A CLI, cURL-like tool"
 options="!check" # Requires 'pytest-httpbin'
@@ -30,4 +30,4 @@ package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="9dc516bf3f41fda2f508133eef268a1a5208ecb56ff6f767d391a72a72dfdccd00ff4456c96a0b2070cab162983cdd51444328bcbb517e111582689e6a191b59  httpie-2.0.0.tar.gz"
+sha512sums="c1ae68f0e2dbf583d69195f34563dee4403f962f7bc12f477b59f7418b42d0e2b08b79d5e240e52c163b2da96d107cf4f2bf9bb1e03d9ec328aabe71986887fb  httpie-2.1.0.tar.gz"

community/imagemagick6/APKBUILD

@@ -3,7 +3,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=imagemagick6
 _pkgname=ImageMagick6
-pkgver=6.9.11.9
+pkgver=6.9.11.10
 _pkgver=${pkgver%.*}-${pkgver##*.}
 _abiver=${pkgname#imagemagick}
 pkgrel=0
@@ -199,4 +199,4 @@ _cxx() {
 	mv "$pkgdir"/usr/lib/libMagick++*.so.* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="e8c823a23814b189746238648b44fa723e798a4fa088a6d86d4ee7583f9e3c0cac9c7ca3e8fe585bd06924c4d8fa2d4a15ae34ffac2fcf14b96f43cf7c456103  ImageMagick6-6.9.11-9.tar.gz"
+sha512sums="78f4a842daeed178a0ae0f3695da32f7f36a0ed171e92312657b613dfac89fe86eacdb6d77a7c7d719add5a085402f6b331d420ee72b5e0b1735bf3e440c3eb5  ImageMagick6-6.9.11-10.tar.gz"

community/inkscape/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=inkscape
-pkgver=0.92.5
+pkgver=1.0
 pkgrel=0
 pkgdesc="A vector-based drawing program - svg compliant"
 url="https://inkscape.org/"
@@ -10,26 +10,37 @@ makedepends="
 	boost-dev
 	cmake
 	dbus-dev
+	double-conversion-dev
 	gc-dev
+	gdl-dev
 	gsl-dev
-	gtkmm-dev
-	gtkspell-dev
+	gtkmm3-dev
+	gtkspell3-dev
+	gzip
 	imagemagick6-dev
 	lcms-dev
+	libcdr-dev
+	libjpeg-turbo-dev
+	libsoup-dev
 	libtool
+	libvisio-dev
 	libxml2-dev
 	libxslt-dev
 	poppler-dev
 	popt-dev
+	potrace-dev
+	python3-dev
+	ttf-dejavu
 	tar
 	"
 depends="desktop-file-utils"
 checkdepends="bash py3-lxml py3-numpy>=1.14.3-r1"
 subpackages="$pkgname-doc $pkgname-lang $pkgname-view"
-source="https://media.inkscape.org/dl/resources/file/inkscape-$pkgver.tar.bz2
-	fix-python.patch
+source="https://media.inkscape.org/dl/resources/file/inkscape-$pkgver.tar.xz
+	fix-Werror.patch
 	"
 options="!check" # cxxtest hangs at least on x86_64
+builddir="$srcdir"/inkscape-1.0_2020-05-01_4035a4fb49
 
 build() {
 	export CXXFLAGS="$CXXFLAGS -std=c++11"
@@ -45,7 +56,7 @@ build() {
 		-DBUILD_TESTS=ON \
 		-DWITH_GNOME_VFS=OFF \
 		$CMAKE_CROSSOPTS .
-	make -C build
+	make -j1 -C build
 }
 
 check() {
@@ -70,5 +81,5 @@ doc() {
 		"$subpkgdir"/usr/share/inkscape
 }
 
-sha512sums="cad2b0f66ce828ad40b1caf740e23d7d7b285b615899601f7584edca50b758d9453774cb7f20f9cab87c2a44ec0bdcc39f350351edf6b2221f8bd2de4049535c  inkscape-0.92.5.tar.bz2
-6b6d17260847973ae385cc735176ec3fc666e43f244df60eacfc8ebeec05042b8b7063e9f8d93bf6bd7cfa16e5e9d48cdae66b51cc23df5e77cc2a27238ec6a4  fix-python.patch"
+sha512sums="37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0  inkscape-1.0.tar.xz
+af18732affeebf3f3b686d88e06f2637b320570095fdcf330ce078243910f43edbd99145ff370da6ec29dc9239948e83f46b2e2b6ca0ce851356912e6bc0fa2d  fix-Werror.patch"

community/inkscape/fix-Werror.patch

+Fix -Werror flags, build fails with them
+
+--- a/CMakeScripts/DefineDependsandFlags.cmake
++++ b/CMakeScripts/DefineDependsandFlags.cmake
+@@ -26,8 +26,6 @@
+ 
+ # Errors for common mistakes
+ list(APPEND INKSCAPE_CXX_FLAGS "-fstack-protector-strong")
+-list(APPEND INKSCAPE_CXX_FLAGS "-Werror=format")                # e.g.: printf("%s", std::string("foo"))
+-list(APPEND INKSCAPE_CXX_FLAGS "-Werror=format-security")       # e.g.: printf(variable);
+ list(APPEND INKSCAPE_CXX_FLAGS_DEBUG "-Og")                     # -Og for _FORTIFY_SOURCE. One could add -Weffc++ here to see approx. 6000 warnings
+ list(APPEND INKSCAPE_CXX_FLAGS_DEBUG "-D_GLIBCXX_ASSERTIONS")
+ if (CMAKE_COMPILER_IS_GNUCC)

community/intel-ucode/APKBUILD

 # Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
 pkgname=intel-ucode
-pkgver=20191115
+pkgver=20200508
 pkgrel=0
 pkgdesc="Microcode update files for Intel CPUs"
 arch="x86 x86_64"
@@ -25,4 +25,4 @@ package() {
 	install -Dm644 license "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="11014c16bde83ac290bc75e458242f5e64b8dffd49de2e938f61f4a09979cd5e80dd1a85d2ccbac067e4398dc3d93ef3583e4aa9b2e545ba46d26e65ec1e2881  microcode-20191115.tar.gz"
+sha512sums="00fa15464c7637c080c49d63b73c197418f4709eaaf55d515504f3bb8aab06dc97206c4fbef57250dc6ca8abf226e0f1fc39bad76ca8b0d705c820e3d1d8ffc9  microcode-20200508.tar.gz"

community/ipython/APKBUILD

 # Contributor: Kevin Daudt <kdaudt@alpinelinux.org>
 # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
 pkgname=ipython
-pkgver=7.13.0
+pkgver=7.14.0
 pkgrel=0
 pkgdesc="A rich toolkit to help you make the most of using Python interactively"
 options="!check" # Too many tests fail
@@ -47,4 +47,4 @@ package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="ee156643bd7d0f0c1525818ed8352b1d19b321e4f1259198946a7e0bac8af169e4f7785b685e9b9fcc6bc4288962ca8084fff52f2183e32932c7d4a09fa4fc1c  ipython-7.13.0.tar.gz"
+sha512sums="83eff5663c63c7aa7e24d46c25bf659cc9ef0274de7073f7e392a7b2d67c1deaaffabe23599536c858bc648576f45b1cb942bccbedb340831540e30c63ec1539  ipython-7.14.0.tar.gz"