Skip to content

Commit a3a0aed

Browse files
ognevnylazka
ognevny
authored and
lazka
committed
libgit2 rebuilds
1 parent 923ee5d commit a3a0aed

File tree

13 files changed

+302
-38
lines changed

13 files changed

+302
-38
lines changed

Diff for: ‎mingw-w64-bat/PKGBUILD

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _realname=bat
44
pkgbase=mingw-w64-${_realname}
55
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
66
pkgver=0.25.0
7-
pkgrel=1
7+
pkgrel=2
88
pkgdesc="Cat clone with syntax highlighting and git integration (mingw-w64)"
99
arch=('any')
1010
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -32,7 +32,8 @@ sha256sums=('d3f4ee9ca8ea0f5927901dc3e41875a1cb68b44959d7b8be0a210010d4434bc5')
3232
prepare() {
3333
cd "${_realname}"
3434

35-
cargo update -p cc
35+
# bump git2 crate (also updates cc)
36+
git cherry-pick -n 01680e444ba4273b17d2d6d85a19f7a5e7046820
3637
cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
3738
}
3839

Diff for: ‎mingw-w64-cargo-generate/PKGBUILD

+15-15
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _realname=cargo-generate
44
pkgbase=mingw-w64-${_realname}
55
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
66
pkgver=0.22.1
7-
pkgrel=1
7+
pkgrel=2
88
pkgdesc="Use pre-existing git repositories as templates (mingw-w64)"
99
arch=('any')
1010
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -19,40 +19,40 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-rust"
1919
"${MINGW_PACKAGE_PREFIX}-mdbook"
2020
"${MINGW_PACKAGE_PREFIX}-pkgconf"
2121
"${MINGW_PACKAGE_PREFIX}-openssl")
22-
source=("${url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
23-
sha256sums=('f912f1c172a5a51ac7a693f44acaef99f5b9278723aa4daaeb96278807e025bd')
22+
source=("${url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
23+
"https://github.com/cargo-generate/cargo-generate/commit/be2237177ee7ae996e2991189b07a5d211cd0d01.patch")
24+
sha256sums=('f912f1c172a5a51ac7a693f44acaef99f5b9278723aa4daaeb96278807e025bd'
25+
'1e3d113bb77975abe3984247219ddc3499c634f21e34b861181077e476efd50c')
2426

2527
prepare() {
26-
cd "${srcdir}/${_realname}-${pkgver}"
28+
cd "${_realname}-${pkgver}"
29+
30+
# bump git2 crate
31+
patch -Np1 -i ../be2237177ee7ae996e2991189b07a5d211cd0d01.patch
2732

2833
export LIBSSH2_SYS_USE_PKG_CONFIG=1
2934
export LIBGIT2_NO_VENDOR=1
30-
export LIBZ_SYS_STATIC=0
3135
export OPENSSL_NO_VENDOR=1
3236
cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
3337
}
3438

3539
build() {
36-
cd "${srcdir}/${_realname}-${pkgver}"
40+
cd "${_realname}-${pkgver}"
3741

38-
"${MINGW_PREFIX}/bin/cargo.exe" build \
39-
--release \
40-
--frozen
42+
cargo build --release --frozen
4143

4244
cd guide
43-
"${MINGW_PREFIX}/bin/mdbook.exe" build
45+
mdbook build
4446
}
4547

4648
check() {
47-
cd "${srcdir}/${_realname}-${pkgver}"
49+
cd "${_realname}-${pkgver}"
4850

49-
"${MINGW_PREFIX}/bin/cargo.exe" test \
50-
--release \
51-
--locked
51+
cargo test --release --locked
5252
}
5353

5454
package() {
55-
cd "${srcdir}/${_realname}-${pkgver}"
55+
cd "${_realname}-${pkgver}"
5656

5757
install -Dm755 "target/release/${_realname}.exe" "${pkgdir}${MINGW_PREFIX}/bin/${_realname}.exe"
5858
install -d "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}"

Diff for: ‎mingw-w64-eza/PKGBUILD

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _realname=eza
44
pkgbase=mingw-w64-${_realname}
55
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
66
pkgver=0.20.16
7-
pkgrel=1
7+
pkgrel=2
88
pkgdesc="A modern, maintained replacement for ls (mingw-w64)"
99
arch=('any')
1010
mingw_arch=('ucrt64' 'clang64' 'clangarm64' 'mingw64')
@@ -36,9 +36,6 @@ _env() {
3636
prepare() {
3737
cd "${_realname}"
3838

39-
# revert git2 update to support libgit2 1.8.x
40-
patch -R -p1 -i ../7241ea4d128ca47b8f5e756a65fa3d4f1d5b5ce7.patch
41-
4239
rm rust-toolchain.toml
4340
cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
4441
}

Diff for: ‎mingw-w64-fritzing/PKGBUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _realname=fritzing
44
pkgbase=mingw-w64-${_realname}
55
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
66
pkgver=0.9.9
7-
pkgrel=6
7+
pkgrel=7
88
pkgdesc="Electronic Design Automation software with a low entry barrier, suited for the needs of makers and hobbyists (mingw-w64)"
99
arch=('any')
1010
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')

Diff for: ‎mingw-w64-geany-plugins/PKGBUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributor (MSYS2): David Macek <[email protected]>
22
# Maintainer (Arch Linux): Alexander Rødseth <[email protected]>
3-
# Contributor (Arch Linux): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
3+
# Contributor (Arch Linux): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
44
# Contributor (Arch Linux): djgera
55
# Contributor (Arch Linux): Patrick Melo <[email protected]>
66

@@ -9,7 +9,7 @@ _realpkgver=2.0.0
99
pkgbase="mingw-w64-${_realname}"
1010
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
1111
pkgver=${_realpkgver%.*}
12-
pkgrel=2
12+
pkgrel=3
1313
pkgdesc='Plugins for Geany (mingw-w64)'
1414
arch=('any')
1515
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')

Diff for: ‎mingw-w64-kicad/PKGBUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ _realname=kicad
1010
pkgbase=mingw-w64-${_realname}
1111
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
1212
pkgver=8.0.6
13-
pkgrel=3
13+
pkgrel=4
1414
pkgdesc="Software for the creation of electronic schematic diagrams and printed circuit board artwork (mingw-w64)"
1515
arch=(any)
1616
mingw_arch=('mingw64' 'ucrt64' 'clang64')

Diff for: ‎mingw-w64-ktexteditor-qt5/PKGBUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ _variant=-${KF5_VARIANT:-shared}
55
source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
66
_kde_f5_init_package "${_variant}" "ktexteditor"
77
pkgver=5.116.0
8-
pkgrel=1
8+
pkgrel=2
99
arch=('any')
1010
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
1111
msys2_references=(

Diff for: ‎mingw-w64-libgit2-glib/0001-Unbreak-micro-version.patch

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: "Jan Alexander Steffens (heftig)" <[email protected]>
3+
Date: Sun, 5 Jan 2025 01:37:29 +0100
4+
Subject: [PATCH] Unbreak micro version
5+
6+
---
7+
libgit2-glib/ggit-version.h.in | 4 ++--
8+
1 file changed, 2 insertions(+), 2 deletions(-)
9+
10+
diff --git a/libgit2-glib/ggit-version.h.in b/libgit2-glib/ggit-version.h.in
11+
index 4b251855a435..ab9b1b613774 100644
12+
--- a/libgit2-glib/ggit-version.h.in
13+
+++ b/libgit2-glib/ggit-version.h.in
14+
@@ -35,19 +35,19 @@
15+
*
16+
* libgit2-glib micro version component (e.g. 3 if %GGIT_VERSION is 1.2.3)
17+
*/
18+
-#define GGIT_MINOR_VERSION (@MICRO_VERSION@)
19+
+#define GGIT_MICRO_VERSION (@MICRO_VERSION@)
20+
21+
#define GGIT_ENCODE_VERSION(major,minor,micro) \
22+
((major) << 24 | (minor) << 16 | (micro) << 8)
23+
24+
/**
25+
* GGIT_VERSION_HEX:
26+
*
27+
* libgit2-glib version, encoded as an hexadecimal number, useful for
28+
* integer comparisons.
29+
*/
30+
#define GGIT_VERSION_HEX \
31+
- (GGIT_ENCODE_VERSION (GGIT_MAJOR_VERSION, GGIT_MINOR_VERSION, 0))
32+
+ (GGIT_ENCODE_VERSION (GGIT_MAJOR_VERSION, GGIT_MINOR_VERSION, GGIT_MICRO_VERSION))
33+
34+
/**
35+
* GGIT_BUILD_TYPE:

Diff for: ‎mingw-w64-libgit2-glib/0002-build-Fix-build-against-and-require-libgit2-1.8.0.patch

+100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Dominique Leuenberger <[email protected]>
3+
Date: Fri, 5 Apr 2024 10:28:16 +0200
4+
Subject: [PATCH] build: Fix build against, and require, libgit2 1.8.0
5+
6+
---
7+
libgit2-glib/ggit-clone-options.c | 1 +
8+
libgit2-glib/ggit-cred-ssh-interactive.c | 2 +-
9+
libgit2-glib/ggit-remote-callbacks.h | 1 +
10+
libgit2-glib/ggit-repository.c | 4 ++--
11+
libgit2-glib/ggit-types.h | 3 ++-
12+
meson.build | 2 +-
13+
6 files changed, 8 insertions(+), 5 deletions(-)
14+
15+
diff --git a/libgit2-glib/ggit-clone-options.c b/libgit2-glib/ggit-clone-options.c
16+
index b47fdb17b3d7..30c7d860d8bc 100644
17+
--- a/libgit2-glib/ggit-clone-options.c
18+
+++ b/libgit2-glib/ggit-clone-options.c
19+
@@ -19,6 +19,7 @@
20+
*/
21+
22+
#include <git2.h>
23+
+#include <git2/sys/errors.h>
24+
#include <gio/gio.h>
25+
26+
#include "ggit-clone-options.h"
27+
diff --git a/libgit2-glib/ggit-cred-ssh-interactive.c b/libgit2-glib/ggit-cred-ssh-interactive.c
28+
index 4f60f8bd548b..0bdca95f7d60 100644
29+
--- a/libgit2-glib/ggit-cred-ssh-interactive.c
30+
+++ b/libgit2-glib/ggit-cred-ssh-interactive.c
31+
@@ -191,7 +191,7 @@ callback_wrapper (const char *name,
32+
{
33+
gchar *text;
34+
35+
- text = g_strndup (prompts[i].text, prompts[i].length);
36+
+ text = g_strndup ((const gchar *)prompts[i].text, prompts[i].length);
37+
38+
wprompts[i] = ggit_cred_ssh_interactive_prompt_new (wname,
39+
winstruction,
40+
diff --git a/libgit2-glib/ggit-remote-callbacks.h b/libgit2-glib/ggit-remote-callbacks.h
41+
index 3005ff4c4966..2340712a7ba3 100644
42+
--- a/libgit2-glib/ggit-remote-callbacks.h
43+
+++ b/libgit2-glib/ggit-remote-callbacks.h
44+
@@ -24,6 +24,7 @@
45+
46+
#include <glib-object.h>
47+
#include <git2.h>
48+
+#include <git2/sys/errors.h>
49+
#include <libgit2-glib/ggit-cred.h>
50+
51+
G_BEGIN_DECLS
52+
diff --git a/libgit2-glib/ggit-repository.c b/libgit2-glib/ggit-repository.c
53+
index bf099f6c8a9a..936c6fcff79f 100644
54+
--- a/libgit2-glib/ggit-repository.c
55+
+++ b/libgit2-glib/ggit-repository.c
56+
@@ -3182,7 +3182,7 @@ ggit_repository_create_commit (GgitRepository *repository,
57+
message,
58+
_ggit_native_get (tree),
59+
parent_count,
60+
- (const git_commit **)parents_native);
61+
+ (gpointer)parents_native);
62+
63+
g_free (parents_native);
64+
65+
@@ -3323,7 +3323,7 @@ ggit_repository_create_commit_buffer(GgitRepository *repository,
66+
message,
67+
_ggit_tree_get_tree (tree),
68+
parent_count,
69+
- (git_commit const **)parents_native);
70+
+ (gpointer)parents_native);
71+
72+
g_free (parents_native);
73+
74+
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
75+
index 7e28975b3d96..2a2ed99e5511 100644
76+
--- a/libgit2-glib/ggit-types.h
77+
+++ b/libgit2-glib/ggit-types.h
78+
@@ -355,7 +355,8 @@ typedef enum
79+
GGIT_CONFIG_LEVEL_XDG = 3,
80+
GGIT_CONFIG_LEVEL_GLOBAL = 4,
81+
GGIT_CONFIG_LEVEL_LOCAL = 5,
82+
- GGIT_CONFIG_LEVEL_APP = 6,
83+
+ GGIT_CONFIG_LEVEL_WORKTREE = 6,
84+
+ GGIT_CONFIG_LEVEL_APP = 7,
85+
GGIT_CONFIG_LEVEL_HIGHEST = -1
86+
} GgitConfigLevel;
87+
88+
diff --git a/meson.build b/meson.build
89+
index e54a8b431d7b..c21107d5cab5 100644
90+
--- a/meson.build
91+
+++ b/meson.build
92+
@@ -126,7 +126,7 @@ glib_dep = dependency('glib-2.0', version: '>=' + glib_req)
93+
gobject_dep = dependency('gobject-2.0', version: '>=' + glib_req)
94+
gio_dep = dependency('gio-2.0', version: '>=' + glib_req)
95+
96+
-libgit2_dep = dependency('libgit2', version: '>= 0.25.0')
97+
+libgit2_dep = dependency('libgit2', version: '>= 1.8.0')
98+
99+
# XXX: Not nice, but probably our best option
100+
enable_gir = get_option('introspection') and find_program('g-ir-scanner', required: false).found()

Diff for: ‎mingw-w64-libgit2-glib/0003-Adjust-API-for-libgit2-1.9.0.patch

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: "Jan Alexander Steffens (heftig)" <[email protected]>
3+
Date: Sun, 5 Jan 2025 01:37:27 +0100
4+
Subject: [PATCH] Adjust API for libgit2 1.9.0
5+
6+
---
7+
libgit2-glib/ggit-types.c | 4 +++-
8+
libgit2-glib/ggit-types.h | 6 ++++--
9+
2 files changed, 7 insertions(+), 3 deletions(-)
10+
11+
diff --git a/libgit2-glib/ggit-types.c b/libgit2-glib/ggit-types.c
12+
index df8ed6e56ad1..3b3c8bc96b85 100644
13+
--- a/libgit2-glib/ggit-types.c
14+
+++ b/libgit2-glib/ggit-types.c
15+
@@ -250,26 +250,28 @@ ASSERT_ENUM (GGIT_ATTRIBUTE_CHECK_NO_SYSTEM, GIT_ATTR_CHECK_NO_SYSTEM);
16+
ASSERT_ENUM (GGIT_PACKBUILDER_STAGE_ADDING_OBJECTS, GIT_PACKBUILDER_ADDING_OBJECTS);
17+
ASSERT_ENUM (GGIT_PACKBUILDER_STAGE_DELTAFICATION, GIT_PACKBUILDER_DELTAFICATION);
18+
19+
-ASSERT_ENUM (GGIT_CHECKOUT_NONE, GIT_CHECKOUT_NONE);
20+
ASSERT_ENUM (GGIT_CHECKOUT_SAFE, GIT_CHECKOUT_SAFE);
21+
ASSERT_ENUM (GGIT_CHECKOUT_FORCE, GIT_CHECKOUT_FORCE);
22+
ASSERT_ENUM (GGIT_CHECKOUT_RECREATE_MISSING, GIT_CHECKOUT_RECREATE_MISSING);
23+
ASSERT_ENUM (GGIT_CHECKOUT_ALLOW_CONFLICTS, GIT_CHECKOUT_ALLOW_CONFLICTS);
24+
ASSERT_ENUM (GGIT_CHECKOUT_REMOVE_UNTRACKED, GIT_CHECKOUT_REMOVE_UNTRACKED);
25+
ASSERT_ENUM (GGIT_CHECKOUT_REMOVE_IGNORED, GIT_CHECKOUT_REMOVE_IGNORED);
26+
ASSERT_ENUM (GGIT_CHECKOUT_UPDATE_ONLY, GIT_CHECKOUT_UPDATE_ONLY);
27+
ASSERT_ENUM (GGIT_CHECKOUT_DONT_UPDATE_INDEX, GIT_CHECKOUT_DONT_UPDATE_INDEX);
28+
ASSERT_ENUM (GGIT_CHECKOUT_NO_REFRESH, GIT_CHECKOUT_NO_REFRESH);
29+
ASSERT_ENUM (GGIT_CHECKOUT_SKIP_UNMERGED, GIT_CHECKOUT_SKIP_UNMERGED);
30+
ASSERT_ENUM (GGIT_CHECKOUT_USE_OURS, GIT_CHECKOUT_USE_OURS);
31+
ASSERT_ENUM (GGIT_CHECKOUT_USE_THEIRS, GIT_CHECKOUT_USE_THEIRS);
32+
ASSERT_ENUM (GGIT_CHECKOUT_DISABLE_PATHSPEC_MATCH, GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH);
33+
ASSERT_ENUM (GGIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES, GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES);
34+
ASSERT_ENUM (GGIT_CHECKOUT_DONT_OVERWRITE_IGNORED, GIT_CHECKOUT_DONT_OVERWRITE_IGNORED);
35+
ASSERT_ENUM (GGIT_CHECKOUT_CONFLICT_STYLE_MERGE, GIT_CHECKOUT_CONFLICT_STYLE_MERGE);
36+
ASSERT_ENUM (GGIT_CHECKOUT_CONFLICT_STYLE_DIFF3, GIT_CHECKOUT_CONFLICT_STYLE_DIFF3);
37+
ASSERT_ENUM (GGIT_CHECKOUT_DONT_REMOVE_EXISTING, GIT_CHECKOUT_DONT_REMOVE_EXISTING);
38+
ASSERT_ENUM (GGIT_CHECKOUT_DONT_WRITE_INDEX, GIT_CHECKOUT_DONT_WRITE_INDEX);
39+
+ASSERT_ENUM (GGIT_CHECKOUT_DRY_RUN, GIT_CHECKOUT_DRY_RUN);
40+
+ASSERT_ENUM (GGIT_CHECKOUT_CONFLICT_STYLE_ZDIFF3, GIT_CHECKOUT_CONFLICT_STYLE_ZDIFF3);
41+
+ASSERT_ENUM (GGIT_CHECKOUT_NONE, GIT_CHECKOUT_NONE);
42+
ASSERT_ENUM (GGIT_CHECKOUT_UPDATE_SUBMODULES, GIT_CHECKOUT_UPDATE_SUBMODULES);
43+
ASSERT_ENUM (GGIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED, GIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED);
44+
45+
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
46+
index 2a2ed99e5511..8cf932a854a8 100644
47+
--- a/libgit2-glib/ggit-types.h
48+
+++ b/libgit2-glib/ggit-types.h
49+
@@ -990,26 +990,28 @@ typedef enum
50+
51+
typedef enum
52+
{
53+
- GGIT_CHECKOUT_NONE = 0,
54+
- GGIT_CHECKOUT_SAFE = (1u << 0),
55+
+ GGIT_CHECKOUT_SAFE = 0,
56+
GGIT_CHECKOUT_FORCE = (1u << 1),
57+
GGIT_CHECKOUT_RECREATE_MISSING = (1u << 2),
58+
GGIT_CHECKOUT_ALLOW_CONFLICTS = (1u << 4),
59+
GGIT_CHECKOUT_REMOVE_UNTRACKED = (1u << 5),
60+
GGIT_CHECKOUT_REMOVE_IGNORED = (1u << 6),
61+
GGIT_CHECKOUT_UPDATE_ONLY = (1u << 7),
62+
GGIT_CHECKOUT_DONT_UPDATE_INDEX = (1u << 8),
63+
GGIT_CHECKOUT_NO_REFRESH = (1u << 9),
64+
GGIT_CHECKOUT_SKIP_UNMERGED = (1u << 10),
65+
GGIT_CHECKOUT_USE_OURS = (1u << 11),
66+
GGIT_CHECKOUT_USE_THEIRS = (1u << 12),
67+
GGIT_CHECKOUT_DISABLE_PATHSPEC_MATCH = (1u << 13),
68+
GGIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES = (1u << 18),
69+
GGIT_CHECKOUT_DONT_OVERWRITE_IGNORED = (1u << 19),
70+
GGIT_CHECKOUT_CONFLICT_STYLE_MERGE = (1u << 20),
71+
GGIT_CHECKOUT_CONFLICT_STYLE_DIFF3 = (1u << 21),
72+
GGIT_CHECKOUT_DONT_REMOVE_EXISTING = (1u << 22),
73+
GGIT_CHECKOUT_DONT_WRITE_INDEX = (1u << 23),
74+
+ GGIT_CHECKOUT_DRY_RUN = (1u << 24),
75+
+ GGIT_CHECKOUT_CONFLICT_STYLE_ZDIFF3 = (1u << 25),
76+
+ GGIT_CHECKOUT_NONE = (1u << 30),
77+
GGIT_CHECKOUT_UPDATE_SUBMODULES = (1u << 16),
78+
GGIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED = (1u << 17)
79+
} GgitCheckoutStrategy;

0 commit comments

Comments
 (0)