Date: Thursday, June 4, 2020 @ 17:38:15 Author: dvzrv Revision: 388293
archrelease: copy trunk to extra-x86_64 Added: libgit2/repos/extra-x86_64/PKGBUILD (from rev 388292, libgit2/trunk/PKGBUILD) libgit2/repos/extra-x86_64/libgit2-0.99.0-remove_http-parse_incompatible_tests.patch (from rev 388292, libgit2/trunk/libgit2-0.99.0-remove_http-parse_incompatible_tests.patch) Deleted: libgit2/repos/extra-x86_64/PKGBUILD libgit2/repos/extra-x86_64/libgit2-0.99.0-remove_http-parse_incompatible_tests.patch -----------------------------------------------------------+ PKGBUILD | 105 ++++++------ libgit2-0.99.0-remove_http-parse_incompatible_tests.patch | 82 ++++----- 2 files changed, 94 insertions(+), 93 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-06-04 17:38:08 UTC (rev 388292) +++ PKGBUILD 2020-06-04 17:38:15 UTC (rev 388293) @@ -1,52 +0,0 @@ -# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> -# Contributor: David Runge <dv...@archlinux.org> -# Contributor: Hilton Medeiros <medeiros.hil...@gmail.com> -# Contributor: Dave Reisner <d...@falconindy.com> - -pkgname=libgit2 -pkgver=1.0.0 -pkgrel=1 -epoch=1 -pkgdesc='A linkable library for Git' -arch=('x86_64') -url="https://libgit2.github.com/" -depends=('glibc' 'http-parser' 'openssl' 'pcre' 'zlib') -makedepends=('cmake' 'libssh2' 'python') -provides=('libgit2.so') -license=('GPL2') -source=("$pkgname-$pkgver.tar.gz::https://github.com/libgit2/libgit2/archive/v${pkgver}.tar.gz" - "${pkgname}-0.99.0-remove_http-parse_incompatible_tests.patch") -sha256sums=('6a1fa16a7f6335ce8b2630fbdbb5e57c4027929ebc56fcd1ac55edb141b409b4' - '0a597176a551dfe8dda56a46362ff1ef614928206a162d78fdf2d3074c9273ca') - -prepare() { - cd "$pkgname-$pkgver" - # removing tests that are only compatible with the (modified) vendored - # version of http-parser, but not with upstream http-parser - patch -Np1 -i "../${pkgname}-0.99.0-remove_http-parse_incompatible_tests.patch" -} - - -build() { - cd "$pkgname-$pkgver" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DUSE_HTTP_PARSER=system \ - -DTHREADSAFE=ON \ - -B build \ - -S . - make -C build VERBOSE=1 -} - -check() { - cd "$pkgname-$pkgver" - make -C build test VERBOSE=1 -} - -package() { - depends+=('libssh2.so') - cd "$pkgname-$pkgver" - make -C build DESTDIR="$pkgdir" install - install -vDm 644 {AUTHORS,README.md} \ - -t "${pkgdir}/usr/share/doc/${pkgname}" -} Copied: libgit2/repos/extra-x86_64/PKGBUILD (from rev 388292, libgit2/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-06-04 17:38:15 UTC (rev 388293) @@ -0,0 +1,53 @@ +# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> +# Contributor: David Runge <dv...@archlinux.org> +# Contributor: Hilton Medeiros <medeiros.hil...@gmail.com> +# Contributor: Dave Reisner <d...@falconindy.com> + +pkgname=libgit2 +pkgver=1.0.1 +pkgrel=1 +epoch=1 +pkgdesc='A linkable library for Git' +arch=('x86_64') +url="https://libgit2.github.com/" +depends=('glibc' 'http-parser' 'openssl' 'pcre' 'zlib') +makedepends=('cmake' 'libssh2' 'python') +provides=('libgit2.so') +license=('GPL2') +source=("$pkgname-$pkgver.tar.gz::https://github.com/libgit2/libgit2/archive/v${pkgver}.tar.gz" + "${pkgname}-0.99.0-remove_http-parse_incompatible_tests.patch") +sha256sums=('1775427a6098f441ddbaa5bd4e9b8a043c7401e450ed761e69a415530fea81d2' + '0a597176a551dfe8dda56a46362ff1ef614928206a162d78fdf2d3074c9273ca') + +prepare() { + cd "$pkgname-$pkgver" + # removing tests that are only compatible with the (modified) vendored + # version of http-parser, but not with upstream http-parser + patch -Np1 -i "../${pkgname}-0.99.0-remove_http-parse_incompatible_tests.patch" +} + + +build() { + cd "$pkgname-$pkgver" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE='None' \ + -DUSE_HTTP_PARSER=system \ + -DTHREADSAFE=ON \ + -Wno-dev \ + -B build \ + -S . + make -C build VERBOSE=1 +} + +check() { + cd "$pkgname-$pkgver" + make -C build test VERBOSE=1 +} + +package() { + depends+=('libssh2.so') + cd "$pkgname-$pkgver" + make -C build DESTDIR="$pkgdir" install + install -vDm 644 {AUTHORS,README.md} \ + -t "${pkgdir}/usr/share/doc/${pkgname}" +} Deleted: libgit2-0.99.0-remove_http-parse_incompatible_tests.patch =================================================================== --- libgit2-0.99.0-remove_http-parse_incompatible_tests.patch 2020-06-04 17:38:08 UTC (rev 388292) +++ libgit2-0.99.0-remove_http-parse_incompatible_tests.patch 2020-06-04 17:38:15 UTC (rev 388293) @@ -1,41 +0,0 @@ -diff -ruN a/tests/network/urlparse.c b/tests/network/urlparse.c ---- a/tests/network/urlparse.c 2020-02-19 11:27:00.000000000 +0100 -+++ b/tests/network/urlparse.c 2020-02-20 17:29:46.667262285 +0100 -@@ -61,18 +61,6 @@ - cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); - } - --void test_network_urlparse__implied_root_empty_port(void) --{ -- cl_git_pass(git_net_url_parse(&conndata, "http://example.com:")); -- cl_assert_equal_s(conndata.scheme, "http"); -- cl_assert_equal_s(conndata.host, "example.com"); -- cl_assert_equal_s(conndata.port, "80"); -- cl_assert_equal_s(conndata.path, "/"); -- cl_assert_equal_p(conndata.username, NULL); -- cl_assert_equal_p(conndata.password, NULL); -- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); --} -- - void test_network_urlparse__encoded_password(void) - { - cl_git_pass(git_net_url_parse(&conndata, -@@ -127,18 +115,6 @@ - cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); - } - --void test_network_urlparse__empty_port(void) --{ -- cl_git_pass(git_net_url_parse(&conndata, "http://example.com:/resource")); -- cl_assert_equal_s(conndata.scheme, "http"); -- cl_assert_equal_s(conndata.host, "example.com"); -- cl_assert_equal_s(conndata.port, "80"); -- cl_assert_equal_s(conndata.path, "/resource"); -- cl_assert_equal_p(conndata.username, NULL); -- cl_assert_equal_p(conndata.password, NULL); -- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); --} -- - void test_network_urlparse__user_port(void) - { - /* u...@hostname.tld:port/resource */ Copied: libgit2/repos/extra-x86_64/libgit2-0.99.0-remove_http-parse_incompatible_tests.patch (from rev 388292, libgit2/trunk/libgit2-0.99.0-remove_http-parse_incompatible_tests.patch) =================================================================== --- libgit2-0.99.0-remove_http-parse_incompatible_tests.patch (rev 0) +++ libgit2-0.99.0-remove_http-parse_incompatible_tests.patch 2020-06-04 17:38:15 UTC (rev 388293) @@ -0,0 +1,41 @@ +diff -ruN a/tests/network/urlparse.c b/tests/network/urlparse.c +--- a/tests/network/urlparse.c 2020-02-19 11:27:00.000000000 +0100 ++++ b/tests/network/urlparse.c 2020-02-20 17:29:46.667262285 +0100 +@@ -61,18 +61,6 @@ + cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); + } + +-void test_network_urlparse__implied_root_empty_port(void) +-{ +- cl_git_pass(git_net_url_parse(&conndata, "http://example.com:")); +- cl_assert_equal_s(conndata.scheme, "http"); +- cl_assert_equal_s(conndata.host, "example.com"); +- cl_assert_equal_s(conndata.port, "80"); +- cl_assert_equal_s(conndata.path, "/"); +- cl_assert_equal_p(conndata.username, NULL); +- cl_assert_equal_p(conndata.password, NULL); +- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); +-} +- + void test_network_urlparse__encoded_password(void) + { + cl_git_pass(git_net_url_parse(&conndata, +@@ -127,18 +115,6 @@ + cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); + } + +-void test_network_urlparse__empty_port(void) +-{ +- cl_git_pass(git_net_url_parse(&conndata, "http://example.com:/resource")); +- cl_assert_equal_s(conndata.scheme, "http"); +- cl_assert_equal_s(conndata.host, "example.com"); +- cl_assert_equal_s(conndata.port, "80"); +- cl_assert_equal_s(conndata.path, "/resource"); +- cl_assert_equal_p(conndata.username, NULL); +- cl_assert_equal_p(conndata.password, NULL); +- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); +-} +- + void test_network_urlparse__user_port(void) + { + /* u...@hostname.tld:port/resource */