diff options
author | Blair Bonnett | 2023-06-24 14:26:29 +0200 |
---|---|---|
committer | Blair Bonnett | 2023-06-24 14:26:29 +0200 |
commit | c1f8c6decc7415cfeb445dfe56539c2eb6d2face (patch) | |
tree | 87346a731593d8f7489a7b993d6fa396f95f0761 | |
parent | 4950448ce766ecfb9e922be0d34cee012d60513d (diff) | |
download | aur-perl-git-repository.tar.gz |
Add patches to fix tests with new Git versions.
-rw-r--r-- | .SRCINFO | 7 | ||||
-rw-r--r-- | PKGBUILD | 25 | ||||
-rw-r--r-- | tests_git_editor_fix.patch | 11 | ||||
-rw-r--r-- | tests_git_file_protocol_fix.patch | 10 |
4 files changed, 46 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = perl-git-repository pkgdesc = Perl interface to Git repositories pkgver = 1.325 - pkgrel = 1 + pkgrel = 2 url = https://metacpan.org/release/Git-Repository arch = any license = PerlArtistic @@ -15,7 +15,10 @@ pkgbase = perl-git-repository options = purge options = !emptydirs source = https://cpan.metacpan.org/authors/id/B/BO/BOOK/Git-Repository-1.325.tar.gz - md5sums = 34979454fb75e50810458cde7313d920 + source = tests_git_editor_fix.patch + source = tests_git_file_protocol_fix.patch sha256sums = 9b2a4fa194f4a0eb452355d0c808727e5e9c16c145ac7d24c3ea96d0abefed43 + sha256sums = f1f15501d09fcb6b403e9a022e83bbd0b756b8a050fc839a0f66613e73aaacc4 + sha256sums = 63577a73e0339a6bb7b40d93ec26f7f5d4fb3316d080b69f3f3ddf069d4f796c pkgname = perl-git-repository @@ -3,18 +3,33 @@ pkgname=perl-git-repository pkgver=1.325 -pkgrel=1 +pkgrel=2 pkgdesc="Perl interface to Git repositories" _dist=Git-Repository arch=('any') license=('PerlArtistic' 'GPL') options=(purge '!emptydirs') +url="https://metacpan.org/release/$_dist" + depends=(perl perl-git-version-compare perl-system-command perl-namespace-clean) checkdepends=(git perl-test-requires-git) -url="https://metacpan.org/release/$_dist" -source=("https://cpan.metacpan.org/authors/id/B/BO/BOOK/$_dist-$pkgver.tar.gz") -md5sums=('34979454fb75e50810458cde7313d920') -sha256sums=('9b2a4fa194f4a0eb452355d0c808727e5e9c16c145ac7d24c3ea96d0abefed43') + +source=( + "https://cpan.metacpan.org/authors/id/B/BO/BOOK/$_dist-$pkgver.tar.gz" + 'tests_git_editor_fix.patch' + 'tests_git_file_protocol_fix.patch' +) +sha256sums=( + '9b2a4fa194f4a0eb452355d0c808727e5e9c16c145ac7d24c3ea96d0abefed43' + 'f1f15501d09fcb6b403e9a022e83bbd0b756b8a050fc839a0f66613e73aaacc4' + '63577a73e0339a6bb7b40d93ec26f7f5d4fb3316d080b69f3f3ddf069d4f796c' +) + +prepare() { + cd "$_dist-$pkgver" + patch -p0 -i "$srcdir/tests_git_editor_fix.patch" + patch -p0 -i "$srcdir/tests_git_file_protocol_fix.patch" +} build() { cd "$srcdir/$_dist-$pkgver" diff --git a/tests_git_editor_fix.patch b/tests_git_editor_fix.patch new file mode 100644 index 000000000000..457e017d78d3 --- /dev/null +++ b/tests_git_editor_fix.patch @@ -0,0 +1,11 @@ +--- t/20-simple.t ++++ t/20-simple.t +@@ -85,6 +85,9 @@ From https://github.com/book/Git-Repository/pull/23#issuecomment-1479838028 + skip "this test does not work with msysgit on Win32", 2 + if $^O eq 'MSWin32'; + ++ skip "'git var GIT_EDITOR' behaviour was changed in git 2.40.0, and we have $version", 2 ++ if Git::Repository->version_ge('2.40.0'); ++ + ok( !eval { $r->run( var => 'GIT_EDITOR' ); 1; }, 'git var GIT_EDITOR' ); + like( diff --git a/tests_git_file_protocol_fix.patch b/tests_git_file_protocol_fix.patch new file mode 100644 index 000000000000..524388396ed6 --- /dev/null +++ b/tests_git_file_protocol_fix.patch @@ -0,0 +1,10 @@ +--- t/21-submodule.t ++++ t/21-submodule.t +@@ -44,6 +44,7 @@ From https://github.com/eserte/Git-Repository/commit/e957384f + # now test adding a submodule + my $r = test_repository(@init); + $r->run( ++ ('-c', 'protocol.file.allow=always'), + submodule => add => $s->work_tree => 'sub', + { env => { GIT_WORK_TREE => undef } } + ); |