diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
| commit | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch) | |
| tree | 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /dev-util/gnome-builder | |
| parent | f516638b7fe9592837389826a6152a7e1b251c54 (diff) | |
gentoo resync : 13.06.2020
Diffstat (limited to 'dev-util/gnome-builder')
| -rw-r--r-- | dev-util/gnome-builder/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/gnome-builder/files/libgit2-1.0-compat.patch | 26 | ||||
| -rw-r--r-- | dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild | 1 |
3 files changed, 29 insertions, 1 deletions
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest index 1c2de64883c2..62aee8d78ffa 100644 --- a/dev-util/gnome-builder/Manifest +++ b/dev-util/gnome-builder/Manifest @@ -1,5 +1,6 @@ AUX 3.34.1-optional-vala.patch 1249 BLAKE2B dcec506c976b6438cec14d941b911cdc11fe0941c4a1a1590e6069fc42dcf12d6e76fedcc0b356e2ac6e5f4558851bb041fa3de4b54d7d9161cf2232965ead21 SHA512 e037dddb89330807c48228600d43ef34569e9fbfbb4b75b9ca2561d7d5ee25d1953ea94afb85ee3555eeefdd3105cd402c2b231584ae241ba661ca0ced28c046 +AUX libgit2-1.0-compat.patch 968 BLAKE2B c17cfba66245c6dd15973a094a89b5fe23493e2f83521c80c214b0ca9edde99fe8982ff73cc779de07b8a4fd548c8a85ca7570d2828299cf7b1e9e599ff9c5cf SHA512 da367d649bf14e1a4b8d0d59e446e6198939fc25f49484eb05d0f9195cd1136d098d581781e872e80f385996a7b043fd5756fea12fd24a931bece04b8ba3698a DIST gnome-builder-3.34.1-patchset.tar.xz 44680 BLAKE2B 91e91ac8d0fcf6b54d32ce9f1dc209ac22db790a29d724dad20e337fe1962f3d407b59e7f976f1e88277833849c962a470346bb5a308e39b637e6e9ca1dc2c2a SHA512 a114346b093976db227087743a7bbe2ca9523b64a67c95729bfeb7c3c346b3bfb4d02f5e11d36bbbaf506bc7a7f140883bdea7c78407243287bc400dfda43b57 DIST gnome-builder-3.34.1.tar.xz 11974748 BLAKE2B c34a31c50b327d02632ff18d48ad59f925306901e8874e0c7811b9258c56027403de0d9dc1877c696d96037bdfcdcc27f56f59a41d232e47b330382b1dbf67e9 SHA512 886c732f20563818dcf1deb96d4277fe96a9499b999cfbc7a64286e816e9a36bb978932d36a1e764b54c2d36891b7546fa058f51e036b0fa101c0872f4ce51d8 -EBUILD gnome-builder-3.34.1-r1.ebuild 7332 BLAKE2B 4623f869fa97f584b301e14f194baafe0c357ad3c56baaa89701700652ce08a9124d6188c4e322f8a3cb9954be0b4e3e4bb55345504e2ed514df977f47ade030 SHA512 adb031740e1fa798d26b2cf2d1afa04487ed81180b59b11f92f346dc3053ae33a542f5d43f4189956595f46a8d173e275afdba8e6b22532af632ff15ff1e6e02 +EBUILD gnome-builder-3.34.1-r1.ebuild 7372 BLAKE2B a60c1261ab7251f3a0cfff69538f0f92bb8a197d2624e3aa62703b9e6b808e3c0793a048a61ff0b409c51c1f6467ca0f5df7d513a825103bbb4c71263fb0bd2b SHA512 e1fcba969d1a9ab368775a80cc7a0ebe35e76a11cd78d49509a2837ab5efd045f9cf1e058397ab943bcdce4eb99e71baea8d2c72f398baeca8500f40dca28bca MISC metadata.xml 1085 BLAKE2B 0b2bdcfec562b85e54880c819a0345c2aedf4f8b1c0bc34b7b4e3e8551697dcbb3ed93da1e016f3a164bb677459e8d628ba943252e51e842152282c3757f0232 SHA512 58890d32c2d04d63eaae8489ea68054ffc50df5bf9970af6b159b2dfbc99b8ed2d2db80aa29907463c137caf5eb8aa129c1470d1e19ccbf398ff8789f7f63987 diff --git a/dev-util/gnome-builder/files/libgit2-1.0-compat.patch b/dev-util/gnome-builder/files/libgit2-1.0-compat.patch new file mode 100644 index 000000000000..3e857eaac933 --- /dev/null +++ b/dev-util/gnome-builder/files/libgit2-1.0-compat.patch @@ -0,0 +1,26 @@ +From 582bf0281358437cc35d96d363f0af81a1b21068 Mon Sep 17 00:00:00 2001 +From: Igor Raits <i.gnatenko.brain@gmail.com> +Date: Tue, 3 Mar 2020 13:17:31 +0100 +Subject: [PATCH] plugins/git: Fix compatibility with libgit2 0.99.x + +Signed-off-by: Igor Raits <i.gnatenko.brain@gmail.com> +--- + src/plugins/git/daemon/ipc-git-repository-impl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/git/daemon/ipc-git-repository-impl.c b/src/plugins/git/daemon/ipc-git-repository-impl.c +index abcca5476..f2631945d 100644 +--- a/src/plugins/git/daemon/ipc-git-repository-impl.c ++++ b/src/plugins/git/daemon/ipc-git-repository-impl.c +@@ -34,7 +34,7 @@ + #include "ipc-git-types.h" + #include "ipc-git-util.h" + +-#if LIBGIT2_SOVERSION >= 28 ++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28) + G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_dispose) + #else + G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_free) +-- +2.26.2 + diff --git a/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild b/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild index a46b8a4cacfc..a7817290a9e5 100644 --- a/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild +++ b/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild @@ -116,6 +116,7 @@ that are currently available with packages include: PATCHES=( "${WORKDIR}/patches" # gnome-builder-3-34 branch 2020-01-22 (commit bf485934b37) + cherry-picked meson link_whole fixes "${FILESDIR}"/${PV}-optional-vala.patch + "${FILESDIR}"/libgit2-1.0-compat.patch ) llvm_check_deps() { |