From f4a00dd09788c1712c988d80d1590d02b826c39f Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 18:54:47 +0200 Subject: [PATCH 01/17] libgit2: update to 1.0.0 --- common/build-helper/rust.sh | 3 --- common/shlibs | 2 +- srcpkgs/libgit2/template | 16 ++++------------ 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh index bf6baa7fd93..cc4de30bc3a 100644 --- a/common/build-helper/rust.sh +++ b/common/build-helper/rust.sh @@ -24,9 +24,6 @@ fi # For cross-compiling rust -sys crates export PKG_CONFIG_ALLOW_CROSS=1 -# libgit2-sys -export LIBGIT2_SYS_USE_PKG_CONFIG=1 - # gettext-rs export GETTEXT_BIN_DIR=/usr/bin export GETTEXT_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib/gettext" diff --git a/common/shlibs b/common/shlibs index acc92a8ae8d..034881cefac 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1306,7 +1306,7 @@ libunwind-ppc64.so.8 libunwind-1.2.1_1 libunwind-setjmp.so.0 libunwind-1.4_1 libmicrohttpd.so.12 libmicrohttpd-0.9.48_1 libmicrodns.so.0 libmicrodns-0.1.0_1 -libgit2.so.28 libgit2-0.28.0_1 +libgit2.so.1.0 libgit2-1.0.0_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/libgit2/template b/srcpkgs/libgit2/template index 7a8247c212b..f9f3cd47425 100644 --- a/srcpkgs/libgit2/template +++ b/srcpkgs/libgit2/template @@ -1,24 +1,16 @@ # Template file for 'libgit2' pkgname=libgit2 -version=0.28.4 +version=1.0.0 revision=1 build_style=cmake -configure_args="-DTHREADSAFE=ON" hostmakedepends="python3 git pkg-config" -makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel libuv-devel" +makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel" short_desc="Git linkable library" -maintainer="Orphaned " +maintainer="q66 " license="custom: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=30f3877469d09f2e4a21be933b4e2800560d16646028dd800744dc5f7fb0c749 - -case "$XBPS_TARGET_MACHINE" in - *-musl) - # Don't use qsort_r, see src/util.c - CFLAGS="-D__ANDROID_API__" - ;; -esac +checksum=6a1fa16a7f6335ce8b2630fbdbb5e57c4027929ebc56fcd1ac55edb141b409b4 post_install() { vlicense COPYING From 3b64bb38b89084e7011cfa46755846691b43d54c Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 19:09:10 +0200 Subject: [PATCH 02/17] Fritzing: rebuild for libgit2-1.0.0 --- srcpkgs/Fritzing/patches/libgit2.patch | 3 ++- srcpkgs/Fritzing/template | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Fritzing/patches/libgit2.patch b/srcpkgs/Fritzing/patches/libgit2.patch index dd11447f187..2692ae065ef 100644 --- a/srcpkgs/Fritzing/patches/libgit2.patch +++ b/srcpkgs/Fritzing/patches/libgit2.patch @@ -1,5 +1,6 @@ make compatible with libgit2 >= 0.24.0 https://github.com/fritzing/fritzing-app/commit/4cb5185d464bf98e9da5ceca72d5af907ff824ef +https://github.com/fritzing/fritzing-app/commit/472951243d70eeb40a53b1f7e16e6eab0588d079 --- src/version/partschecker.cpp.orig 2016-06-01 21:48:27.000000000 +0200 +++ src/version/partschecker.cpp 2018-01-13 11:30:34.895137270 +0100 @@ -7,7 +8,7 @@ https://github.com/fritzing/fritzing-app/commit/4cb5185d464bf98e9da5ceca72d5af90 /** * Connect to the remote. */ -+#if LIBGIT2_VER_MINOR > 24 ++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR > 24) + error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL, NULL); +#elif LIBGIT2_VER_MINOR == 24 + error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL); diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template index 6c624ff5f23..ea09c1b8d44 100644 --- a/srcpkgs/Fritzing/template +++ b/srcpkgs/Fritzing/template @@ -1,7 +1,7 @@ # Template file for 'Fritzing' pkgname=Fritzing version=0.9.3b -revision=4 +revision=5 _partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14 wrksrc="fritzing-app-${version}" build_style=qmake From ebd0c5caecef8069d6fbbd3fd2b38aacb67766da Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 19:13:13 +0200 Subject: [PATCH 03/17] captain-ballard: rebuild for libgit2-1.0.0 --- srcpkgs/captain-ballard/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/captain-ballard/template b/srcpkgs/captain-ballard/template index f5e7fe87c5b..a44227d95e0 100644 --- a/srcpkgs/captain-ballard/template +++ b/srcpkgs/captain-ballard/template @@ -1,7 +1,7 @@ # Template file for 'captain-ballard' pkgname=captain-ballard version=1.0.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config glib-devel" makedepends="gtk+3-devel sqlite-devel libappindicator-devel libgit2-devel" From e36f524a8623071c1549962f776a3444b9056ef3 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 19:21:16 +0200 Subject: [PATCH 04/17] libgit2-glib: rebuild for libgit2-1.0.0 --- .../libgit2-glib/patches/libgit2-1.0.patch | 156 ++++++++++++++++++ srcpkgs/libgit2-glib/template | 2 +- 2 files changed, 157 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/libgit2-glib/patches/libgit2-1.0.patch diff --git a/srcpkgs/libgit2-glib/patches/libgit2-1.0.patch b/srcpkgs/libgit2-glib/patches/libgit2-1.0.patch new file mode 100644 index 00000000000..183be9909b8 --- /dev/null +++ b/srcpkgs/libgit2-glib/patches/libgit2-1.0.patch @@ -0,0 +1,156 @@ +commit bcbd4b6c84779413162f1e7fdd2a4a5329fef04a +Author: q66 +Date: Sun May 3 19:27:40 2020 +0200 + + libgit2 1.0 build fix + +diff --git libgit2-glib/ggit-clone-options.c libgit2-glib/ggit-clone-options.c +index 5e69eec..b47fdb1 100644 +--- libgit2-glib/ggit-clone-options.c ++++ libgit2-glib/ggit-clone-options.c +@@ -149,7 +149,7 @@ create_repository_wrapper (git_repository **out, + + if (error != NULL) + { +-#if LIBGIT2_SOVERSION >= 28 ++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28) + git_error_set_str (GIT_ERROR, error->message); + #else + giterr_set_str (GIT_ERROR, error->message); +@@ -191,7 +191,7 @@ create_remote_wrapper (git_remote **out, + + if (error) + { +-#if LIBGIT2_SOVERSION >= 28 ++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28) + git_error_set_str (GIT_ERROR, error->message); + #else + giterr_set_str (GIT_ERROR, error->message); +diff --git libgit2-glib/ggit-config.c libgit2-glib/ggit-config.c +index 626f7f0..58c2bbe 100644 +--- libgit2-glib/ggit-config.c ++++ libgit2-glib/ggit-config.c +@@ -191,7 +191,7 @@ ggit_config_find_global (void) + if (git_config_find_global (&buf) == GIT_OK) + { + path = g_file_new_for_path (buf.ptr); +-#if LIBGIT2_SOVERSION >= 28 ++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28) + git_buf_dispose (&buf); + #else + git_buf_free (&buf); +@@ -224,7 +224,7 @@ ggit_config_find_system (void) + if (git_config_find_system (&buf) == GIT_OK) + { + path = g_file_new_for_path (buf.ptr); +-#if LIBGIT2_SOVERSION >= 28 ++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28) + git_buf_dispose (&buf); + #else + git_buf_free (&buf); +@@ -303,9 +303,7 @@ ggit_config_add_file (GgitConfig *config, + ret = git_config_add_file_ondisk (_ggit_native_get (config), + path, + (git_config_level_t)level, +-#if LIBGIT2_SOVERSION >= 27 + NULL, +-#endif + force); + g_free (path); + +diff --git libgit2-glib/ggit-diff.c libgit2-glib/ggit-diff.c +index 43fa6cf..5189724 100644 +--- libgit2-glib/ggit-diff.c ++++ libgit2-glib/ggit-diff.c +@@ -786,7 +786,7 @@ ggit_diff_format_email (GgitDiff *diff, + + if (ret != GIT_OK) + { +-#if LIBGIT2_SOVERSION >= 28 ++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28) + git_buf_dispose (&buf); + #else + git_buf_free (&buf); +@@ -796,7 +796,7 @@ ggit_diff_format_email (GgitDiff *diff, + } + + retval = g_strndup (buf.ptr, buf.size); +-#if LIBGIT2_SOVERSION >= 28 ++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28) + git_buf_dispose (&buf); + #else + git_buf_free (&buf); +diff --git libgit2-glib/ggit-error.c libgit2-glib/ggit-error.c +index 9247064..dbdaf4e 100644 +--- libgit2-glib/ggit-error.c ++++ libgit2-glib/ggit-error.c +@@ -51,7 +51,7 @@ _ggit_error_set (GError **error, + g_return_if_fail (err < 0); + + /* TODO: add more kind of errors, see git_error_t */ +-#if LIBGIT2_SOVERSION >= 28 ++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28) + git2_err = git_error_last (); + #else + git2_err = giterr_last (); +diff --git libgit2-glib/ggit-message.c libgit2-glib/ggit-message.c +index 7bd6983..4d1b1b8 100644 +--- libgit2-glib/ggit-message.c ++++ libgit2-glib/ggit-message.c +@@ -46,7 +46,7 @@ ggit_message_prettify (const gchar *message, + git_message_prettify (&buf, message, strip_comments, comment_char); + + d = g_strdup (buf.ptr); +-#if LIBGIT2_SOVERSION >= 28 ++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28) + git_buf_dispose (&buf); + #else + git_buf_free (&buf); +diff --git libgit2-glib/ggit-patch.c libgit2-glib/ggit-patch.c +index cd35be7..b544591 100644 +--- libgit2-glib/ggit-patch.c ++++ libgit2-glib/ggit-patch.c +@@ -194,7 +194,7 @@ ggit_patch_to_string (GgitPatch *patch, + if (ret == GIT_OK) + { + result = g_strdup (buf.ptr); +-#if LIBGIT2_SOVERSION >= 28 ++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28) + git_buf_dispose (&buf); + #else + git_buf_free (&buf); +diff --git libgit2-glib/ggit-remote-callbacks.c libgit2-glib/ggit-remote-callbacks.c +index 7956f8b..a1e7b7d 100644 +--- libgit2-glib/ggit-remote-callbacks.c ++++ libgit2-glib/ggit-remote-callbacks.c +@@ -160,7 +160,7 @@ credentials_wrap (git_cred **cred, + { + if (error) + { +-#if LIBGIT2_SOVERSION >= 28 ++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28) + git_error_set_str (GIT_ERROR, error->message); + #else + giterr_set_str (GIT_ERROR, error->message); +diff --git libgit2-glib/ggit-repository.c libgit2-glib/ggit-repository.c +index 42490f4..dd9c7d6 100644 +--- libgit2-glib/ggit-repository.c ++++ libgit2-glib/ggit-repository.c +@@ -1013,7 +1013,7 @@ ggit_repository_discover_full (GFile *location, + if (ret == GIT_OK) + { + rep = g_file_new_for_path (buf.ptr); +-#if LIBGIT2_SOVERSION >= 28 ++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28) + git_buf_dispose (&buf); + #else + git_buf_free (&buf); +@@ -3684,7 +3684,7 @@ ggit_repository_get_default_notes_ref (GgitRepository *repository, + } + + ref = g_strdup (buf.ptr); +-#if LIBGIT2_SOVERSION >= 28 ++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28) + git_buf_dispose (&buf); + #else + git_buf_free (&buf); diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template index ce68cb35d66..89551f7b75d 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.28.0.1 -revision=2 +revision=3 build_style=meson build_helper="gir" configure_args="-Dintrospection=$(vopt_if gir true false) From 957d4651d330ffb91c5caccec4458310a3f9070d Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 19:31:46 +0200 Subject: [PATCH 05/17] stagit: rebuild for libgit2-1.0.0 --- srcpkgs/stagit/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template index cbb95edeb5d..e9aa9dd7bc7 100644 --- a/srcpkgs/stagit/template +++ b/srcpkgs/stagit/template @@ -1,7 +1,7 @@ # Template file for 'stagit' pkgname=stagit version=0.9.3 -revision=1 +revision=2 build_style=gnu-makefile make_install_args="MANPREFIX=/usr/share/man" makedepends="libgit2-devel" From c217fbc66e6ccd454c9b2693625406efb65aba9a Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 19:32:28 +0200 Subject: [PATCH 06/17] geany-plugins: rebuild for libgit2-1.0.0 --- .../geany-plugins/patches/libgit2-1.0.patch | 54 +++++++++++++++++++ srcpkgs/geany-plugins/template | 2 +- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/geany-plugins/patches/libgit2-1.0.patch diff --git a/srcpkgs/geany-plugins/patches/libgit2-1.0.patch b/srcpkgs/geany-plugins/patches/libgit2-1.0.patch new file mode 100644 index 00000000000..2cd070e1041 --- /dev/null +++ b/srcpkgs/geany-plugins/patches/libgit2-1.0.patch @@ -0,0 +1,54 @@ +commit c5840bc94d5870b2f8b38ea16853e0c2dd0ac981 +Author: q66 +Date: Sun May 3 19:36:54 2020 +0200 + + fix build on libgit2-1.0 + +diff --git git-changebar/src/gcb-plugin.c git-changebar/src/gcb-plugin.c +index b708319..8d3abaf 100644 +--- git-changebar/src/gcb-plugin.c ++++ git-changebar/src/gcb-plugin.c +@@ -32,25 +32,6 @@ + #include + #include + +-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 +-# define git_libgit2_init git_threads_init +-# define git_libgit2_shutdown git_threads_shutdown +-#endif +-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23 +-/* 0.23 added @p binary_cb */ +-# define git_diff_buffers(old_buffer, old_len, old_as_path, \ +- new_buffer, new_len, new_as_path, options, \ +- file_cb, binary_cb, hunk_cb, line_cb, payload) \ +- git_diff_buffers (old_buffer, old_len, old_as_path, \ +- new_buffer, new_len, new_as_path, options, \ +- file_cb, hunk_cb, line_cb, payload) +-#endif +-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28 +-# define git_buf_dispose git_buf_free +-# define git_error_last giterr_last +-#endif +- +- + GeanyPlugin *geany_plugin; + GeanyData *geany_data; + +diff --git workbench/src/plugin_main.c workbench/src/plugin_main.c +index 6fa6fc8..b620666 100644 +--- workbench/src/plugin_main.c ++++ workbench/src/plugin_main.c +@@ -35,13 +35,6 @@ + #include "idle_queue.h" + #include "tm_control.h" + +- +-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 +-# define git_libgit2_init git_threads_init +-# define git_libgit2_shutdown git_threads_shutdown +-#endif +- +- + GeanyPlugin *geany_plugin; + GeanyData *geany_data; + diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template index 7047183241d..8af71c85368 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.36.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp --disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm" From 5eda22257c4c8fdb5f9a12bb4b81d809d2a80317 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 19:42:50 +0200 Subject: [PATCH 07/17] slcp: rebuild for libgit2-1.0.0 --- srcpkgs/slcp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template index 6f3d4f7a946..1873bcc6f23 100644 --- a/srcpkgs/slcp/template +++ b/srcpkgs/slcp/template @@ -1,7 +1,7 @@ # Template file for 'slcp' pkgname=slcp version=0.2 -revision=11 +revision=12 build_style=gnu-makefile makedepends="libgit2-devel" short_desc="Simple shell prompt written in C" From 7e7aacece7b894398e12cb6f9d4a0d4adcde582c Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 19:44:01 +0200 Subject: [PATCH 08/17] ktexteditor: rebuild against libgit2-1.0.0 --- srcpkgs/ktexteditor/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template index 58bf818a74d..6578a855e22 100644 --- a/srcpkgs/ktexteditor/template +++ b/srcpkgs/ktexteditor/template @@ -1,7 +1,7 @@ # Template file for 'ktexteditor' pkgname=ktexteditor version=5.69.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" From 2576007c9bba78af956fe38a71f4e67e0cbd1232 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 19:47:07 +0200 Subject: [PATCH 09/17] juCi++: rebuild against libgit2-1.0.0 --- srcpkgs/juCi++/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template index 9decdd72538..73fa7d8b265 100644 --- a/srcpkgs/juCi++/template +++ b/srcpkgs/juCi++/template @@ -1,7 +1,7 @@ # Template file for 'juCi++' pkgname=juCi++ version=1.5.0 -revision=3 +revision=4 _libclangmm_commit="687b9c231d850504ec515acb9ccab73f26c34063" _tiny_commit="a6773276efdbc322f1abb0159301f5502647eb52" wrksrc="jucipp-v${version}" From c2afc35bff3bbce59dd8beb840319e4cac2e9a32 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 19:50:17 +0200 Subject: [PATCH 10/17] gnome-builder: rebuild against libgit2-1.0.0 --- .../gnome-builder/patches/libgit2-1.0.0.patch | 22 +++++++++++++++++++ srcpkgs/gnome-builder/template | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/gnome-builder/patches/libgit2-1.0.0.patch diff --git a/srcpkgs/gnome-builder/patches/libgit2-1.0.0.patch b/srcpkgs/gnome-builder/patches/libgit2-1.0.0.patch new file mode 100644 index 00000000000..7b9b4a2bf1a --- /dev/null +++ b/srcpkgs/gnome-builder/patches/libgit2-1.0.0.patch @@ -0,0 +1,22 @@ +commit 44136a2e5c52623b0e62c38846f511f307615ce2 +Author: q66 +Date: Sun May 3 19:52:09 2020 +0200 + + fix build with libgit2-1.0.0 + +diff --git a/src/plugins/git/daemon/ipc-git-repository-impl.c b/src/plugins/git/daemon/ipc-git-repository-impl.c +index 7f01042..2ccc4df 100644 +--- a/src/plugins/git/daemon/ipc-git-repository-impl.c ++++ b/src/plugins/git/daemon/ipc-git-repository-impl.c +@@ -33,11 +33,7 @@ + #include "ipc-git-types.h" + #include "ipc-git-util.h" + +-#if LIBGIT2_SOVERSION >= 28 + G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_dispose) +-#else +-G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_free) +-#endif + + typedef enum + { diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index d4f612b46f7..9d715064a19 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,11 +1,11 @@ # Template file for 'gnome-builder' pkgname=gnome-builder version=3.34.1 -revision=2 +revision=3 build_style=meson configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true" hostmakedepends="pkg-config appdata-tools desktop-file-utils flex gobject-introspection - gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme" + gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext" makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel From b5ab62c333d82ae456bb22a4d5c6f13437fc8aee Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 20:00:42 +0200 Subject: [PATCH 11/17] calligra: rebuild against libgit2-1.0.0 --- srcpkgs/calligra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index 94a26744fed..bb622d8e657 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.2.0 -revision=1 +revision=2 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" From 3261b7a99a836593a6cf672ff32a0390d28e0c5a Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 18:39:30 +0200 Subject: [PATCH 12/17] cargo: update to 0.44.0 The libgit2-sys crate now requires 1.0.0 via pkg-config and dropped the env var usage, so just default to that. --- .../patches/fix-cross-sysroot-libdir.patch | 96 ------------------- .../patches/revert-libgit2-sys-api.patch | 32 ------- srcpkgs/cargo/template | 59 ++++-------- 3 files changed, 20 insertions(+), 167 deletions(-) delete mode 100644 srcpkgs/cargo/patches/fix-cross-sysroot-libdir.patch delete mode 100644 srcpkgs/cargo/patches/revert-libgit2-sys-api.patch diff --git a/srcpkgs/cargo/patches/fix-cross-sysroot-libdir.patch b/srcpkgs/cargo/patches/fix-cross-sysroot-libdir.patch deleted file mode 100644 index a20ced2fee6..00000000000 --- a/srcpkgs/cargo/patches/fix-cross-sysroot-libdir.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 647ae9f8a7f9907244a8c86bceb383cbf61eb505 Mon Sep 17 00:00:00 2001 -From: Johannes Brechtmann -Date: Fri, 27 Dec 2019 18:48:31 +0100 -Subject: [PATCH] Revert "Fix wrong directories in PATH on Windows" - -This reverts commit 61188d791a29c1baae868f2ba0880c9d6db4092e. ---- - .../compiler/build_context/target_info.rs | 43 +++++++++---------- - src/cargo/core/compiler/compilation.rs | 4 +- - 2 files changed, 23 insertions(+), 24 deletions(-) - -diff --git a/src/cargo/core/compiler/build_context/target_info.rs b/src/cargo/core/compiler/build_context/target_info.rs -index 3c23d2d8b..d6e5e66f8 100644 ---- src/cargo/core/compiler/build_context/target_info.rs -+++ src/cargo/core/compiler/build_context/target_info.rs -@@ -29,12 +29,8 @@ pub struct TargetInfo { - crate_types: RefCell>>, - /// `cfg` information extracted from `rustc --print=cfg`. - cfg: Vec, -- /// Path to the "lib" or "bin" directory that rustc uses for its dynamic -- /// libraries. -- pub sysroot_host_libdir: PathBuf, -- /// Path to the "lib" directory in the sysroot which rustc uses for linking -- /// target libraries. -- pub sysroot_target_libdir: PathBuf, -+ /// Path to the "lib" directory in the sysroot. -+ pub sysroot_libdir: PathBuf, - /// Extra flags to pass to `rustc`, see `env_args`. - pub rustflags: Vec, - /// Extra flags to pass to `rustdoc`, see `env_args`. -@@ -134,20 +130,24 @@ impl TargetInfo { - output_err_info(&process, &output, &error) - ), - }; -- let mut sysroot_host_libdir = PathBuf::from(line); -- if cfg!(windows) { -- sysroot_host_libdir.push("bin"); -- } else { -- sysroot_host_libdir.push("lib"); -- } -- let mut sysroot_target_libdir = PathBuf::from(line); -- sysroot_target_libdir.push("lib"); -- sysroot_target_libdir.push("rustlib"); -- sysroot_target_libdir.push(match &kind { -- CompileKind::Host => rustc.host.as_str(), -- CompileKind::Target(target) => target.short_name(), -- }); -- sysroot_target_libdir.push("lib"); -+ let mut rustlib = PathBuf::from(line); -+ let sysroot_libdir = match kind { -+ CompileKind::Host => { -+ if cfg!(windows) { -+ rustlib.push("bin"); -+ } else { -+ rustlib.push("lib"); -+ } -+ rustlib -+ } -+ CompileKind::Target(target) => { -+ rustlib.push("lib"); -+ rustlib.push("rustlib"); -+ rustlib.push(target.short_name()); -+ rustlib.push("lib"); -+ rustlib -+ } -+ }; - - let cfg = lines - .map(|line| Ok(Cfg::from_str(line)?)) -@@ -162,8 +162,7 @@ impl TargetInfo { - Ok(TargetInfo { - crate_type_process, - crate_types: RefCell::new(map), -- sysroot_host_libdir, -- sysroot_target_libdir, -+ sysroot_libdir, - // recalculate `rustflags` from above now that we have `cfg` - // information - rustflags: env_args( -diff --git a/src/cargo/core/compiler/compilation.rs b/src/cargo/core/compiler/compilation.rs -index 140a024b1..86afe35ac 100644 ---- src/cargo/core/compiler/compilation.rs -+++ src/cargo/core/compiler/compilation.rs -@@ -101,8 +101,8 @@ impl<'cfg> Compilation<'cfg> { - root_output: PathBuf::from("/"), - deps_output: PathBuf::from("/"), - host_deps_output: PathBuf::from("/"), -- host_dylib_path: bcx.info(default_kind).sysroot_host_libdir.clone(), -- target_dylib_path: bcx.info(default_kind).sysroot_target_libdir.clone(), -+ host_dylib_path: bcx.info(CompileKind::Host).sysroot_libdir.clone(), -+ target_dylib_path: bcx.info(default_kind).sysroot_libdir.clone(), - tests: Vec::new(), - binaries: Vec::new(), - extra_env: HashMap::new(), --- -2.24.1 \ No newline at end of file diff --git a/srcpkgs/cargo/patches/revert-libgit2-sys-api.patch b/srcpkgs/cargo/patches/revert-libgit2-sys-api.patch deleted file mode 100644 index b2f819286ba..00000000000 --- a/srcpkgs/cargo/patches/revert-libgit2-sys-api.patch +++ /dev/null @@ -1,32 +0,0 @@ -Source: FreeBSD - -Revert to libgit2 0.28 API per https://github.com/rust-lang/git2-rs/issues/458 - ---- libgit2-sys/lib.rs -+++ libgit2-sys/lib.rs -@@ -331,7 +331,6 @@ pub struct git_remote_callbacks { - pub push_negotiation: Option, - pub transport: Option, - pub payload: *mut c_void, -- pub resolve_url: Option, - } - - #[repr(C)] -@@ -385,8 +384,6 @@ pub type git_push_negotiation = - - pub type git_push_update_reference_cb = - extern "C" fn(*const c_char, *const c_char, *mut c_void) -> c_int; --pub type git_url_resolve_cb = -- extern "C" fn(*mut git_buf, *const c_char, c_int, *mut c_void) -> c_int; - - #[repr(C)] - pub struct git_push_update { -@@ -2233,7 +2230,7 @@ extern "C" { - source: *const git_tree, - ) -> c_int; - pub fn git_treebuilder_clear(bld: *mut git_treebuilder); -- pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> size_t; -+ pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> c_uint; - pub fn git_treebuilder_free(bld: *mut git_treebuilder); - pub fn git_treebuilder_get( - bld: *mut git_treebuilder, diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index eea0843d147..52c80a19f47 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,25 +1,25 @@ # Template file for 'cargo' pkgname=cargo -version=0.42.0 -revision=2 +version=0.44.0 +revision=1 wrksrc="cargo-${version}" build_helper=rust hostmakedepends="rust python curl cmake pkg-config" -makedepends="libcurl-devel libgit2-devel" +makedepends="libcurl-devel" depends="rust" short_desc="Rust package manager" maintainer="Enno Boland " license="MIT, Apache-2.0" homepage="https://crates.io/" -_libgit2_ver=0.9.2 -_git2_ver=0.10.2 -distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz - https://github.com/rust-lang/git2-rs/archive/libgit2-sys-${_libgit2_ver}.tar.gz" -checksum="22e60eca84d0f146ef45534e592b1c829a0cdf23452c2a23d2cde40d6c793b8a - 61e1329785a2957721b28ec7d13c22749553f67179d7dde8e5793c4872eec48a" -_cargo_dist_version=0.41.0 +distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz" +checksum="c6da7d1d21eacf112c55dc8cc2647f2ccf7b41f9865dfa542e08ab41d1c20170" +_cargo_dist_version=0.44.0 build_options="static" +if [ -z "$build_option_static" ]; then + makedepends+=" libgit2-devel" +fi + if [ "$CROSS_BUILD" ]; then hostmakedepends+=" cargo" makedepends+=" rust" @@ -27,7 +27,7 @@ else _bootstrap_url="https://static.rust-lang.org/dist" case "$XBPS_MACHINE" in - x86_64*|i686|ppc64le|ppc) ;; + x86_64*|i686|ppc64le) ;; ppc*) _bootstrap_url="https://alpha.de.repo.voidlinux.org/distfiles" ;; *) broken="unsupported host: ${XBPS_MACHINE}" ;; esac @@ -38,39 +38,39 @@ else case "$XBPS_MACHINE" in i686) checksum+=" - c48bc132f4025ff39b1b6dc52aef9d406c3f926ce05fe92d943ceab7a5fd6058" + b60abb4d89f645ec80f83f1514758c6f374e0d86ba44d9d36966aa4262eae5e5" ;; x86_64) checksum+=" - 9b6ae643fa240c5ecbc1dc390f4020b6a683f25bac6f7437ebd4b9d32a8d0b6c" + b0b97b21aae588dd7c73508dcd14ae094f45d5c5b33299859adde1b2e241271c" ;; x86_64-musl) checksum+=" - 848646326474392bdac70a5bfa06efda4c36e2bbbf088f07456f98c7575844e1" + ba6da59754bc113eb61bcfdb384ef3b458a16fe212124252830d83968480a07b" ;; ppc64le) checksum+=" - 7705f21d938a72ba6f01818661b2dea29183209940a335f18d1761e1e03d3710" + 4f90cd6cbcf9e9d6ba11830e093092e4e6c3d156ffde2e729933869b7a039ff9" ;; ppc64le-musl) checksum+=" - 0fbe481d284a14b84cc63ccb50caeb248200f238d2c3e449c2b8a8bf49c951ce" + a85e8c9714a8bb7c17cd23993c677f51d9e0d6f5e85ab10f53ec1639b19bbbd4" ;; ppc64) checksum+=" - 23a7967b0c1c762cdbea4f850cacbb462e386977203c0d5ff060275c526d80d7" + 983e2fbec9c4bfe66bab37ad64cdd5b47918378e421d9bf639e938f120650199" ;; ppc64-musl) checksum+=" - d5a808fdb50068a14d6578f052c9e21ae7881d4ecdcf9e098c5e2c2b1ae65786" + f974893d1cac6c799345bece08c7f796eb50e1a77c4b9bc2a6451d161a57c660" ;; ppc) checksum+=" - 295030192cf5b7e1fce75845a1961619a5f701185400ad816cf950d4e18f0646" + 48f4419300fe758ebe024e6449a5ca1dff07803047a815b3d3909170baa7adcc" ;; ppc-musl) checksum+=" - 91cc5d6f0192f68d5053fb460dd8347b28cb29b4a63a6e648d6b754795b5c4e8" + bbb93a757e75d09cb5f6d6dd837e32212acd8888426406352eccf52f329386f1" ;; esac fi @@ -80,25 +80,10 @@ post_extract() { mkdir -p target/snapshot cp ../cargo-${_cargo_dist_version}-${RUST_TARGET}/cargo/bin/cargo cargo fi - - mv ${XBPS_BUILDDIR}/git2-rs-libgit2-sys-${_libgit2_ver} . - mv git2-rs-libgit2-sys-${_libgit2_ver}/libgit2-sys . -} - -post_patch() { - # but only use the patched libgit2 when not static; when static, bundled - # libgit2 is used and this would not work (libgit2 sources are not there) - if [ ! "$build_option_static" ]; then - cat >> Cargo.toml <<- EOF - [patch.crates-io] - libgit2-sys = { path = './libgit2-sys' } - EOF - fi } do_build() { if [ "$build_option_static" ]; then - unset LIBGIT2_SYS_USE_PKG_CONFIG unset LIBSSH2_SYS_USE_PKG_CONFIG export OPENSSL_STATIC=1 # rust-openssl can not be linked static if pkg-config is used @@ -112,10 +97,6 @@ do_build() { cargo="./cargo" fi - # gotta pin out libgit2-sys at the version - $cargo update - $cargo update --package git2 --precise ${_git2_ver} - $cargo update --package libgit2-sys --precise ${_libgit2_ver} $cargo build --release $(vopt_if static --features="all-static") } From 8cf4df95c0436f625038079d9a355a6eea3cb49b Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 20:12:20 +0200 Subject: [PATCH 13/17] cargo-outdated: update to 0.9.9 --- srcpkgs/cargo-outdated/template | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template index 64f5c924cbd..05e338f0c97 100644 --- a/srcpkgs/cargo-outdated/template +++ b/srcpkgs/cargo-outdated/template @@ -1,7 +1,7 @@ # Template file for 'cargo-outdated' pkgname=cargo-outdated -version=0.9.1 -revision=3 +version=0.9.9 +revision=1 build_style=cargo hostmakedepends="pkg-config" makedepends="libgit2-devel libressl-devel" @@ -10,11 +10,14 @@ maintainer="Enno Boland " license="MIT" homepage="https://github.com/kbknapp/cargo-outdated" distfiles="https://github.com/kbknapp/cargo-outdated/archive/v${version}.tar.gz" -checksum=8c3c014d84c2bdcd894e473b1f1b929c2e498fb2b5443fa1d02104e2291497f1 +checksum=f23bb266d0f31316817e6350b4a02a91cbb6b02baa280092bbd9719ebfee31b4 + +# remove with dependency update to cargo 0.44 or newer +export LIBGIT2_SYS_USE_PKG_CONFIG=1 pre_build() { - cargo update --package openssl-sys --precise 0.9.53 - cargo update --package openssl --precise 0.10.22 + cargo update --package openssl-sys --precise 0.9.55 + cargo update --package openssl --precise 0.10.29 } post_install() { From a2619b1d1f43d9ce6462d3c48cf46cc93b64f12a Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 20:47:18 +0200 Subject: [PATCH 14/17] starship: update to 0.41.0 --- srcpkgs/starship/template | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template index fa063601fd0..7da4d8b3a9c 100644 --- a/srcpkgs/starship/template +++ b/srcpkgs/starship/template @@ -1,6 +1,6 @@ # Template file for 'starship' pkgname=starship -version=0.37.0 +version=0.41.0 revision=1 build_style=cargo build_helper="rust" @@ -11,12 +11,7 @@ maintainer="Aluísio Augusto Silva Gonçalves " license="ISC" homepage="https://starship.rs" distfiles="https://github.com/starship/starship/archive/v${version}.tar.gz" -checksum=9a7344a1f61f195ddee9fef794e3214d47b38c5d18dfba8d66959dff3e06403b - -pre_build() { - vsed -i '/reqwest =/s/, "rustls-tls"//' Cargo.toml - cargo update -} +checksum=420a09f77a6355bb0f272cd45be57d89265357b4e98b88e212aba7720d270fe7 post_install() { vlicense LICENSE From 9d87b631a7026a2770725f6a46ffdfaa2db20c58 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 20:48:15 +0200 Subject: [PATCH 15/17] git-absorb: rebuild for libgit2-1.0.0 --- srcpkgs/git-absorb/template | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template index 2c960726137..8cdc77eba5b 100644 --- a/srcpkgs/git-absorb/template +++ b/srcpkgs/git-absorb/template @@ -1,7 +1,7 @@ # Template file for 'git-absorb' pkgname=git-absorb version=0.5.0 -revision=1 +revision=2 build_style=cargo makedepends="libgit2-devel" short_desc="Like git commit --fixup, but automatic" @@ -11,6 +11,12 @@ homepage="https://github.com/tummychow/git-absorb" distfiles="https://github.com/tummychow/git-absorb/archive/${version}.tar.gz" checksum=c4ef4fa28222773d695aab7711abbfac7e81c35a37eafe45f79d045516df28b1 +pre_build() { + # bump git2 version for newer libgit2-sys + vsed -i 's/\"~0.9\"/\"0.13.5\"/g' Cargo.toml + cargo update +} + post_install() { vlicense LICENSE.md } From 8976ab0f285ae1b317663be20474c1f76035b9dc Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 20:49:44 +0200 Subject: [PATCH 16/17] julia: rebuild for libgit2-1.0.0 [ci skip] --- srcpkgs/julia/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template index b18dd7b4f7c..5137a3236dd 100644 --- a/srcpkgs/julia/template +++ b/srcpkgs/julia/template @@ -1,7 +1,7 @@ # Template file for 'julia' pkgname=julia version=1.4.1 -revision=1 +revision=2 archs="i686* x86_64*" build_style=gnu-makefile make_build_args="prefix=/usr sysconfdir=/etc datarootdir=/usr/share From ae67f303a82573cb7fb138ab9bfc84923e3db922 Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 4 May 2020 16:14:10 +0200 Subject: [PATCH 17/17] cargo: nocross for now [ci skip] --- srcpkgs/cargo/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 52c80a19f47..e14a3e0f262 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -15,6 +15,7 @@ distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz" checksum="c6da7d1d21eacf112c55dc8cc2647f2ccf7b41f9865dfa542e08ab41d1c20170" _cargo_dist_version=0.44.0 build_options="static" +nocross=yes if [ -z "$build_option_static" ]; then makedepends+=" libgit2-devel"