Date: Tuesday, March 28, 2023 @ 19:11:41 Author: dvzrv Revision: 1430052
upgpkg: ruby-rugged 1.6.2-1: Upgrade to 1.6.2. Update patch to remove broken libgit2 detection. Added: ruby-rugged/trunk/ruby-rugged-1.6.2-remove_broken_libgit2_detection.patch Modified: ruby-rugged/trunk/PKGBUILD Deleted: ruby-rugged/trunk/ruby-rugged-1.5.0.1-remove_broken_libgit2_test.patch ---------------------------------------------------------+ PKGBUILD | 22 ++++---- ruby-rugged-1.5.0.1-remove_broken_libgit2_test.patch | 36 -------------- ruby-rugged-1.6.2-remove_broken_libgit2_detection.patch | 36 ++++++++++++++ 3 files changed, 47 insertions(+), 47 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-28 19:10:44 UTC (rev 1430051) +++ PKGBUILD 2023-03-28 19:11:41 UTC (rev 1430052) @@ -4,10 +4,10 @@ _name=rugged # ideally this should match $pkgver, as package() might fail otherwise. thanks, github -_libgit2_pkgver=1.6.2 +_libgit2_pkgver=1.6.3 pkgname=ruby-rugged -pkgver=1.5.1 -pkgrel=3 +pkgver=1.6.2 +pkgrel=1 pkgdesc="A Ruby binding to the libgit2 linkable library" arch=(x86_64) url="https://github.com/libgit2/rugged"; @@ -30,19 +30,19 @@ source=( $_name-$pkgver.tar.gz::https://github.com/libgit2/$_name/archive/v$pkgver.tar.gz libgit2-$_libgit2_pkgver.tar.gz::https://github.com/libgit2/libgit2/archive/v$_libgit2_pkgver.tar.gz - $pkgname-1.5.0.1-remove_broken_libgit2_test.patch + $pkgname-1.6.2-remove_broken_libgit2_detection.patch ) -sha512sums=('f32c70ab08f995218d7703f2ac34c9538e5dc1362737a83bb68cbf9669671ae43817271e2563b13ea2b09ebbd41b2d4b6decf8ee0489b98fcafc275194584e6b' - 'ef9feef36c5876776f3aa608101115c9e7a0970e6dd752851d930cb85b4b1789ed68f42700ebea51095ff54600e37c18a4de0c0678d9a4d7d4aba83668890c09' - '7cf8c8f5ad361e8a88633d3ee75f15f5ece14c4d68471c7724b9b2752e2833efb4b01dbc50535b4a0b5a7c8cf36b4b610bc6c3f773cea8cea9a452d8f991bc40') -b2sums=('936ddc26bd76d74d906ca6bd1ed8eddedeb5917cd96658f8b2313800ba2db924db855e37309008b53b611b685685dbe07b7f6a75664cac369063a60b69f1bf44' - '7a42d8440fbe0afa24057bf53d52bcb04b4e8654f71cfa55871a7e77a150297731879d8f5be51df61ad91556656b66b102536a508cf61d9c11e8658e841fc560' - '28e7d1d61402dbedf19343013ead01175d7353b9c0bf965530662f0182a4942717889552479c8f145512c5ebae93425a74c3fe4060b91bbe5d30917f0d9ac5c0') +sha512sums=('23b9e292dcc2114333ad76d842551a0bea54e3fe487572e41b00480ed4c8b101c9eb9ae0314b44b07257ec448295748f7930bc1fe105bb2ad9c7c24bf813d0f9' + '5a390030395d5e00217ca3229ff1374f064b41c7c14c332618778af7067c378bca5ffee5c072ad144a71126f7e8cfcd770746b6af8eccf086c8a8b8afa1733f1' + '955a01271852fcae00750f2bc155e7697e033429fa4f47615d7a611eab5e9296038324d0c486942d878ade118872d1f895f580c08e463b854ab405419673824e') +b2sums=('e17c05bfb27192db70d3704ee6504035699b58532c18442042ae9ae767a5fdd8fb09060d04e15639051459f659c92f804b539a9c07224800f44b0d7fbb51b966' + 'c0a588e962c182c09b91e257760484bc0ebf2ab07fdd89b7b90db1dd6749d7fb65b8e3fcd20e8a46a6381038aeac8759161dc409be36eadc776a55d74290e59c' + 'bf6339a9e4cf26336ea8c693e0ef115b7e4afb1dc56d8b7a5ee3faff7e07eac4b420c67d694c690e78328780730787eec64e816e4c840391500af29a5f4818b0') prepare() { # remove broken and useless libgit2 "version check": # https://github.com/libgit2/rugged/issues/698 - patch -Np1 -d $_name-$pkgver -i ../$pkgname-1.5.0.1-remove_broken_libgit2_test.patch + patch -Np1 -d $_name-$pkgver -i ../$pkgname-1.6.2-remove_broken_libgit2_detection.patch cd $_name-$pkgver # we don't do version pinning Deleted: ruby-rugged-1.5.0.1-remove_broken_libgit2_test.patch =================================================================== --- ruby-rugged-1.5.0.1-remove_broken_libgit2_test.patch 2023-03-28 19:10:44 UTC (rev 1430051) +++ ruby-rugged-1.5.0.1-remove_broken_libgit2_test.patch 2023-03-28 19:11:41 UTC (rev 1430052) @@ -1,36 +0,0 @@ -diff -ruN a/ext/rugged/extconf.rb b/ext/rugged/extconf.rb ---- a/ext/rugged/extconf.rb 2022-07-27 14:36:43.000000000 +0200 -+++ b/ext/rugged/extconf.rb 2022-08-16 16:50:55.253886438 +0200 -@@ -65,32 +65,6 @@ - - if arg_config("--use-system-libraries", !!ENV['RUGGED_USE_SYSTEM_LIBRARIES']) - puts "Building Rugged using system libraries.\n" -- -- dir_config('git2').any? or pkg_config('libgit2') -- -- major = minor = nil -- -- File.readlines(File.join(LIBGIT2_DIR, "include", "git2", "version.h")).each do |line| -- if !major && (matches = line.match(/^#define LIBGIT2_VER_MAJOR ([0-9]+)$/)) -- major = matches[1] -- next -- end -- -- if !minor && (matches = line.match(/^#define LIBGIT2_VER_MINOR ([0-9]+)$/)) -- minor = matches[1] -- next -- end -- -- break if major && minor -- end -- -- try_compile(<<-SRC) or abort "libgit2 version is not compatible, expected ~> #{major}.#{minor}.0" --#include <git2/version.h> -- --#if LIBGIT2_VER_MAJOR != #{major} || LIBGIT2_VER_MINOR != #{minor} --#error libgit2 version is not compatible --#endif -- SRC - else - if !find_executable('cmake') - abort "ERROR: CMake is required to build Rugged." Added: ruby-rugged-1.6.2-remove_broken_libgit2_detection.patch =================================================================== --- ruby-rugged-1.6.2-remove_broken_libgit2_detection.patch (rev 0) +++ ruby-rugged-1.6.2-remove_broken_libgit2_detection.patch 2023-03-28 19:11:41 UTC (rev 1430052) @@ -0,0 +1,36 @@ +diff -ruN a/ext/rugged/extconf.rb b/ext/rugged/extconf.rb +--- a/ext/rugged/extconf.rb 2023-03-17 12:08:41.000000000 +0100 ++++ b/ext/rugged/extconf.rb 2023-03-28 21:08:17.593554575 +0200 +@@ -65,32 +65,6 @@ + + if arg_config("--use-system-libraries", !!ENV['RUGGED_USE_SYSTEM_LIBRARIES']) + puts "Building Rugged using system libraries.\n" +- +- dir_config('git2').any? or pkg_config('libgit2') +- +- major = minor = nil +- +- File.readlines(File.join(LIBGIT2_DIR, "include", "git2", "version.h")).each do |line| +- if !major && (matches = line.match(/^#define LIBGIT2_VER_MAJOR\s+([0-9]+)$/)) +- major = matches[1] +- next +- end +- +- if !minor && (matches = line.match(/^#define LIBGIT2_VER_MINOR\s+([0-9]+)$/)) +- minor = matches[1] +- next +- end +- +- break if major && minor +- end +- +- try_compile(<<-SRC) or abort "libgit2 version is not compatible, expected ~> #{major}.#{minor}.0" +-#include <git2/version.h> +- +-#if LIBGIT2_VER_MAJOR != #{major} || LIBGIT2_VER_MINOR != #{minor} +-#error libgit2 version is not compatible +-#endif +- SRC + else + if !find_executable('cmake') + abort "ERROR: CMake is required to build Rugged."
