[arch-commits] Commit in libgit2/trunk (2 files)

[David Runge]

    Date: Thursday, February 20, 2020 @ 16:41:54
  Author: dvzrv
Revision: 375927

upgpkg: libgit2 1:0.99.0-2: Adding option to build libgit2 thread safe and building against system http-parser. Adding patch to remove tests, that are not compatible with upstream http-parser (url string with colon, but no port).

Added:
  libgit2/trunk/libgit2-0.99.0-remove_http-parse_incompatible_tests.patch
Modified:
  libgit2/trunk/PKGBUILD

-----------------------------------------------------------+
 PKGBUILD                                                  |   18 ++++-
 libgit2-0.99.0-remove_http-parse_incompatible_tests.patch |   41 ++++++++++++
 2 files changed, 56 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-20 15:14:35 UTC (rev 375926)
+++ PKGBUILD	2020-02-20 16:41:54 UTC (rev 375927)
@@ -5,7 +5,7 @@
 
 pkgname=libgit2
 pkgver=0.99.0
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='A linkable library for Git'
 arch=('x86_64')
@@ -14,13 +14,25 @@
 makedepends=('cmake' 'python')
 provides=('libgit2.so')
 license=('GPL2')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/libgit2/libgit2/archive/v${pkgver}.tar.gz")
-sha256sums=('174024310c1563097a6613a0d3f7539d11a9a86517cd67ce533849065de08a11')
+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=('174024310c1563097a6613a0d3f7539d11a9a86517cd67ce533849065de08a11'
+            '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

Added: 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-02-20 16:41:54 UTC (rev 375927)
@@ -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)
+ {
+ 	/* user at hostname.tld:port/resource */