diff --git a/common/shlibs b/common/shlibs index 57200679c8..4dfe14678f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1279,7 +1279,7 @@ libunwind-arm.so.8 libunwind-1.1_4 libunwind-mips.so.8 libunwind-1.1_4 libunwind-aarch64.so.8 libunwind-1.2rc1_1 libmicrohttpd.so.12 libmicrohttpd-0.9.48_1 -libgit2.so.26 libgit2-0.26.0_1 +libgit2.so.27 libgit2-0.27.3_1 libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1 libagg.so.2 agg-2.5_1 libzzip-0.so.13 zziplib-0.13.62_1 diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template index 0919052071..5a047dd096 100644 --- a/srcpkgs/Fritzing/template +++ b/srcpkgs/Fritzing/template @@ -1,7 +1,7 @@ # Template file for 'Fritzing' pkgname=Fritzing version=0.9.3b -revision=2 +revision=3 _partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14 wrksrc="fritzing-app-${version}" build_style=qmake diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template index 066fca78fb..8882c1be08 100644 --- a/srcpkgs/amp/template +++ b/srcpkgs/amp/template @@ -1,7 +1,7 @@ # Template file for 'amp' pkgname=amp version=0.5.0 -revision=1 +revision=2 hostmakedepends="cargo cmake git perl pkg-config python3" makedepends="libcurl-devel libgit2-devel libxcb-devel" short_desc="A complete text editor for your terminal" diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 401d615b98..e9e47d2be5 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,7 +1,7 @@ # Template file for 'cargo' pkgname=cargo version=0.29.0 -revision=1 +revision=2 hostmakedepends="rust python curl cmake pkg-config" makedepends="libcurl-devel libgit2-devel" depends="rust" @@ -16,21 +16,21 @@ nocross=yes case "$XBPS_MACHINE" in x86_64-musl) distfiles+=" - https://repo.voidlinux.eu/distfiles/cargo-0.26.0-x86_64-unknown-linux-musl.tar.gz" + https://repo.voidlinux.eu/distfiles/cargo-0.29.0-x86_64-unknown-linux-musl.tar.gz" checksum+=" - 406a348567577cb2859749f1b1e1a843de20e7c1f305de89d3a3760635c4979e" + d54f7b4c6e8af657e6173e9e0200130b2f297f365ed4c06a4e9029762d975836" ;; x86_64) distfiles+=" - https://static.rust-lang.org/dist/cargo-0.26.0-x86_64-unknown-linux-gnu.tar.gz" + https://static.rust-lang.org/dist/cargo-0.29.0-x86_64-unknown-linux-gnu.tar.gz" checksum+=" - 9ba227f2364f618dc9415dacf3a5dce17458e1cb9f6d4fe860416cb68db894e4" + a5e7749767c47669ed9b6e32c6fb8eda6b0fe1c63ac73a6d4666b5c1352bad24" ;; i686) distfiles+=" - https://static.rust-lang.org/dist/cargo-0.26.0-i686-unknown-linux-gnu.tar.gz" + https://static.rust-lang.org/dist/cargo-0.29.0-i686-unknown-linux-gnu.tar.gz" checksum+=" - 200c24872796d19e14ecc1a71febc28e7c08b4cde35712e5154ec0d79350f81e" + ec9ba3aa064719222bb59de4cf8f2ad061bb31288e7dd4e98b80215203aa5876" ;; esac diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template index de41a980f8..d160c90702 100644 --- a/srcpkgs/geany-plugins/template +++ b/srcpkgs/geany-plugins/template @@ -1,7 +1,7 @@ # Template file for 'geany-plugins' pkgname=geany-plugins version=1.33.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-all-plugins" hostmakedepends="automake gettext-devel intltool libtool pkg-config vala @@ -17,13 +17,22 @@ distfiles="https://github.com/geany/${pkgname}/archive/${version}.tar.gz>${pkgna checksum=e889073b573452c91b4d3d87ce45bd4bb57f63e4cde03dea25b6304c5a89bf55 pre_configure() { + # Force python2.7 (configure seems to find the python3 libs for some reason) + rm /usr/bin/python + ln -s python2 /usr/bin/python + NOCONFIGURE=1 ./autogen.sh + if [ "$CROSS_BUILD" ]; then # Use cross prefix for python sed -e "s;-L\$ac_python_libdir;-L${XBPS_CROSS_BASE}/usr/lib;g" \ -e "s;PYTHON_CPPFLAGS=\$python_path;PYTHON_CPPFLAGS=-I${XBPS_CROSS_BASE}/usr/include/python2.7;g" -i configure + else + sed -e "s;-L\$ac_python_libdir;-L/usr/lib;g" \ + -e "s;PYTHON_CPPFLAGS=\$python_path;PYTHON_CPPFLAGS=-I/usr/include/python2.7;g" -i configure fi + } pre_build() { diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template index 21171107cd..0634b887fa 100644 --- a/srcpkgs/git-series/template +++ b/srcpkgs/git-series/template @@ -1,7 +1,7 @@ # Template file for 'git-series' pkgname=git-series version=0.9.1 -revision=6 +revision=7 hostmakedepends="cargo cmake pkg-config rust perl" makedepends="libgit2-devel libcurl-devel" depends="git" diff --git a/srcpkgs/grv/patches/Prevent-overflow-of-unsigned-options-in-git2.patch b/srcpkgs/grv/patches/Prevent-overflow-of-unsigned-options-in-git2.patch new file mode 100644 index 0000000000..6fcbd55610 --- /dev/null +++ b/srcpkgs/grv/patches/Prevent-overflow-of-unsigned-options-in-git2.patch @@ -0,0 +1,11 @@ +--- cmd/grv/vendor/gopkg.in/libgit2/git2go.v27/diff.go 2018-07-14 03:13:29.682424699 -0700 ++++ cmd/grv/vendor/gopkg.in/libgit2/git2go.v27/diff.go 2018-07-14 03:13:24.210458876 -0700 +@@ -405,7 +405,7 @@ + return newPatchFromC(patchPtr), nil + } + +-type DiffOptionsFlag int ++type DiffOptionsFlag uint + + const ( + DiffNormal DiffOptionsFlag = C.GIT_DIFF_NORMAL diff --git a/srcpkgs/grv/template b/srcpkgs/grv/template index caa9ef4164..7d9a06d6f9 100644 --- a/srcpkgs/grv/template +++ b/srcpkgs/grv/template @@ -1,7 +1,7 @@ # Template file for 'grv' pkgname=grv -version=0.1.3 -revision=4 +version=0.2.0 +revision=2 wrksrc=${pkgname} build_style=go go_import_path="github.com/rgburke/grv" @@ -13,7 +13,7 @@ maintainer="Michael Gehring " license="GPL-3" homepage="https://github.com/rgburke/grv" distfiles="https://github.com/rgburke/grv/releases/download/v${version}/grv-${version}-src.tar.gz" -checksum=61c73aff8e73fe86ee5a1b7a37e8506afa87fda3f81edacadfc6b9aeebc22314 +checksum=4988bb0a74853ada3808d7c819bd159b2acee741baa1565e97033cd3118224b7 post_install() { vdoc doc/documentation.md diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template index 5913923bb1..cac6501500 100644 --- a/srcpkgs/ktexteditor/template +++ b/srcpkgs/ktexteditor/template @@ -1,7 +1,7 @@ # Template file for 'ktexteditor' pkgname=ktexteditor version=5.49.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules pkg-config" diff --git a/srcpkgs/libgit2-glib/patches/0001-Add-NULL-repo-argument-is-optional.patch b/srcpkgs/libgit2-glib/patches/0001-Add-NULL-repo-argument-is-optional.patch new file mode 100644 index 0000000000..c79324aed5 --- /dev/null +++ b/srcpkgs/libgit2-glib/patches/0001-Add-NULL-repo-argument-is-optional.patch @@ -0,0 +1,24 @@ +From 368134cf950f242a1690bd57d435c887760fb19c Mon Sep 17 00:00:00 2001 +From: Jasper Chan +Date: Fri, 13 Jul 2018 21:10:12 -0700 +Subject: [PATCH] Add NULL repo argument (is optional) + +--- + libgit2-glib/ggit-config.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git libgit2-glib/ggit-config.c libgit2-glib/ggit-config.c +index b6536ce..2785574 100644 +--- libgit2-glib/ggit-config.c ++++ libgit2-glib/ggit-config.c +@@ -295,6 +295,7 @@ ggit_config_add_file (GgitConfig *config, + ret = git_config_add_file_ondisk (_ggit_native_get (config), + path, + (git_config_level_t)level, ++ NULL, + force); + g_free (path); + +-- +2.18.0 + diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template index 849e1df5b5..7814bf46c2 100644 --- a/srcpkgs/libgit2-glib/template +++ b/srcpkgs/libgit2-glib/template @@ -1,7 +1,7 @@ # Template file for 'libgit2-glib' pkgname=libgit2-glib version=0.26.4 -revision=1 +revision=2 build_style=meson configure_args="-Dintrospection=false -Dvapi=false" hostmakedepends="pkg-config glib-devel" diff --git a/srcpkgs/libgit2/patches/patch-src_openssl_stream_h.patch b/srcpkgs/libgit2/patches/patch-src_openssl_stream_h.patch deleted file mode 100644 index f5306b96d5..0000000000 --- a/srcpkgs/libgit2/patches/patch-src_openssl_stream_h.patch +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_openssl_stream_h,v 1.8 2018/03/19 18:28:12 jasper Exp $ - -Index: src/openssl_stream.h ---- src/openssl_stream.h.orig -+++ src/openssl_stream.h -@@ -27,7 +27,8 @@ extern int git_openssl_stream_new(git_stream **out, co - - - --# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+# if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - - GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name) - { diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template index 9cf918bdfd..ab7297542b 100644 --- a/srcpkgs/libgit2/template +++ b/srcpkgs/libgit2/template @@ -1,17 +1,18 @@ # Template file for 'libgit2' pkgname=libgit2 -version=0.26.6 +version=0.27.3 revision=1 build_style=cmake configure_args="-DTHREADSAFE=ON" hostmakedepends="python git pkg-config" -makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel" +makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel libuv libuv-devel" short_desc="The Git linkable library" maintainer="Juan RP " license="GPL-2.0-or-later WITH GCC-exception-2.0" homepage="https://libgit2.org" distfiles="https://github.com/libgit2/libgit2/archive/v${version}.tar.gz" -checksum=7669dd47ebdab86ced8888816c552596ec923b6e126704a3445b2081cb0e5662 +checksum=50a57bd91f57aa310fb7d5e2a340b3779dc17e67b4e7e66111feac5c2432f1a5 +configure_args="-DTHREADSAFE=ON" case "$XBPS_TARGET_MACHINE" in *-musl) diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template index 0bb46c64a1..f3d55d2b23 100644 --- a/srcpkgs/marble5/template +++ b/srcpkgs/marble5/template @@ -1,7 +1,7 @@ # Template file for 'marble5' pkgname=marble5 version=18.08.0 -revision=1 +revision=2 wrksrc="marble-${version}" build_style=cmake configure_args="-DBUILD_MARBLE_TESTS=NO -DKF5_HOST_TOOLING=/usr/lib/cmake" diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template index 21d805465e..f606c92e1b 100644 --- a/srcpkgs/slcp/template +++ b/srcpkgs/slcp/template @@ -1,7 +1,7 @@ # Template file for 'slcp' pkgname=slcp version=0.2 -revision=8 +revision=9 build_style=gnu-makefile makedepends="libgit2-devel" short_desc="Simple shell prompt written in C" diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template index 7a53fdedff..a13a47f3c3 100644 --- a/srcpkgs/stagit/template +++ b/srcpkgs/stagit/template @@ -1,7 +1,7 @@ # Template file for 'stagit' pkgname=stagit version=0.8 -revision=1 +revision=2 build_style=gnu-makefile make_install_args="MANPREFIX=/usr/share/man" makedepends="libgit2-devel"