[arch-commits] Commit in python-httptools/repos/community-x86_64 (4 files)

Filipe Laíns ffy00 at archlinux.org
Tue Jun 22 18:35:26 UTC 2021


    Date: Tuesday, June 22, 2021 @ 18:35:26
  Author: ffy00
Revision: 966866

archrelease: copy trunk to community-x86_64

Added:
  python-httptools/repos/community-x86_64/0001-fix-use-system-http-parser.patch
    (from rev 966865, python-httptools/trunk/0001-fix-use-system-http-parser.patch)
  python-httptools/repos/community-x86_64/PKGBUILD
    (from rev 966865, python-httptools/trunk/PKGBUILD)
Deleted:
  python-httptools/repos/community-x86_64/0001-fix-use-system-http-parser.patch
  python-httptools/repos/community-x86_64/PKGBUILD

---------------------------------------+
 0001-fix-use-system-http-parser.patch |   84 +++++++++++++++----------------
 PKGBUILD                              |   85 ++++++++++++++++++--------------
 2 files changed, 91 insertions(+), 78 deletions(-)

Deleted: 0001-fix-use-system-http-parser.patch
===================================================================
--- 0001-fix-use-system-http-parser.patch	2021-06-22 18:35:17 UTC (rev 966865)
+++ 0001-fix-use-system-http-parser.patch	2021-06-22 18:35:26 UTC (rev 966866)
@@ -1,42 +0,0 @@
-From d9bb42946103ea9f16e7843bb70d6eb32c7c610f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains at archlinux.org>
-Date: Sat, 30 May 2020 22:59:38 +0100
-Subject: [PATCH] fix use system http-parser
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Filipe Laíns <lains at archlinux.org>
----
- httptools/parser/cparser.pxd | 2 +-
- setup.py                     | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/httptools/parser/cparser.pxd b/httptools/parser/cparser.pxd
-index bad2060..7644a1c 100644
---- a/httptools/parser/cparser.pxd
-+++ b/httptools/parser/cparser.pxd
-@@ -1,7 +1,7 @@
- from libc.stdint cimport uint16_t, uint32_t, uint64_t
- 
- 
--cdef extern from "../../vendor/http-parser/http_parser.h":
-+cdef extern from "http_parser.h":
-     ctypedef int (*http_data_cb) (http_parser*,
-                                   const char *at,
-                                   size_t length) except -1
-diff --git a/setup.py b/setup.py
-index ee6bd7d..f57124e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -110,6 +110,7 @@ class httptools_build_ext(build_ext):
-     def build_extensions(self):
-         if self.use_system_http_parser:
-             self.compiler.add_library('http_parser')
-+            self.compiler.add_include_dir('/usr/lib/include')
- 
-             if sys.platform == 'darwin' and \
-                     os.path.exists('/opt/local/include'):
--- 
-2.26.2
-

Copied: python-httptools/repos/community-x86_64/0001-fix-use-system-http-parser.patch (from rev 966865, python-httptools/trunk/0001-fix-use-system-http-parser.patch)
===================================================================
--- 0001-fix-use-system-http-parser.patch	                        (rev 0)
+++ 0001-fix-use-system-http-parser.patch	2021-06-22 18:35:26 UTC (rev 966866)
@@ -0,0 +1,42 @@
+From d9bb42946103ea9f16e7843bb70d6eb32c7c610f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains at archlinux.org>
+Date: Sat, 30 May 2020 22:59:38 +0100
+Subject: [PATCH] fix use system http-parser
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Filipe Laíns <lains at archlinux.org>
+---
+ httptools/parser/cparser.pxd | 2 +-
+ setup.py                     | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/httptools/parser/cparser.pxd b/httptools/parser/cparser.pxd
+index bad2060..7644a1c 100644
+--- a/httptools/parser/cparser.pxd
++++ b/httptools/parser/cparser.pxd
+@@ -1,7 +1,7 @@
+ from libc.stdint cimport uint16_t, uint32_t, uint64_t
+ 
+ 
+-cdef extern from "../../vendor/http-parser/http_parser.h":
++cdef extern from "http_parser.h":
+     ctypedef int (*http_data_cb) (http_parser*,
+                                   const char *at,
+                                   size_t length) except -1
+diff --git a/setup.py b/setup.py
+index ee6bd7d..f57124e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -110,6 +110,7 @@ class httptools_build_ext(build_ext):
+     def build_extensions(self):
+         if self.use_system_http_parser:
+             self.compiler.add_library('http_parser')
++            self.compiler.add_include_dir('/usr/lib/include')
+ 
+             if sys.platform == 'darwin' and \
+                     os.path.exists('/opt/local/include'):
+-- 
+2.26.2
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-22 18:35:17 UTC (rev 966865)
+++ PKGBUILD	2021-06-22 18:35:26 UTC (rev 966866)
@@ -1,36 +0,0 @@
-# Maintainer: Filipe Laíns (FFY00) <lains at archlinux.org>
-
-_pkgname=httptools
-pkgname=python-$_pkgname
-pkgver=0.1.1
-pkgrel=4
-pkgdesc='Fast HTTP parser'
-arch=('x86_64')
-url='https://github.com/MagicStack/httptools'
-license=('MIT')
-depends=('python' 'http-parser')
-makedepends=('python-setuptools')
-source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
-sha512sums=('afee301be87ec01a1cf64ab4593a99e5c6c8366238f4a7660d2f40dd87c3c2ed2b82da4b047ef736546fe1450ac747322521cbd67f2a430ce31b4415be3a8251')
-
-prepare() {
-  cd $_pkgname-$pkgver
-
-  sed -i 's|../../vendor/http-parser/http_parser.h|/usr/include/http_parser.h|' $_pkgname/parser/cparser.pxd
-}
-
-build() {
-  cd $_pkgname-$pkgver
-
-  python setup.py build build_ext --use-system-http-parser
-}
-
-package() {
-  cd $_pkgname-$pkgver
-
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-
-  install -Dm 644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-# vim:set ts=2 sw=2 et:

Copied: python-httptools/repos/community-x86_64/PKGBUILD (from rev 966865, python-httptools/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-06-22 18:35:26 UTC (rev 966866)
@@ -0,0 +1,49 @@
+# Maintainer: Filipe Laíns (FFY00) <lains at archlinux.org>
+
+_pkgname=httptools
+pkgname=python-$_pkgname
+pkgver=0.2.0
+pkgrel=1
+pkgdesc='Fast HTTP parser'
+arch=('x86_64')
+url='https://github.com/MagicStack/httptools'
+license=('MIT')
+depends=('python' 'http-parser')
+makedepends=('git' 'python-setuptools' 'python-wheel' 'cython')
+#source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+source=("git+$url#tag=v$pkgver"
+        'git+https://github.com/nodejs/llhttp.git')
+sha512sums=('SKIP'
+            'SKIP')
+
+prepare() {
+  #cd $_pkgname-$pkgver
+  cd $_pkgname
+
+  sed -i 's|CYTHON_DEPENDENCY =.*|CYTHON_DEPENDENCY = "Cython"|' setup.py
+  sed -i 's|../../vendor/http-parser/http_parser.h|/usr/include/http_parser.h|' $_pkgname/parser/cparser.pxd
+
+  git rm vendor/http-parser
+
+  git submodule init
+  git config submodule.vendor/llhttp.url "$srcdir"/llhttp
+  git submodule update
+}
+
+build() {
+  #cd $_pkgname-$pkgver
+  cd $_pkgname
+
+  python setup.py build build_ext --use-system-http-parser
+}
+
+package() {
+  #cd $_pkgname-$pkgver
+  cd $_pkgname
+
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+
+  install -Dm 644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+# vim:set ts=2 sw=2 et:



More information about the arch-commits mailing list