From 15312e1110479d28c87f46346e5cc2f503838dc3 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 1 Apr 2022 10:42:12 +0200 Subject: [PATCH 1/3] nghttp2: drop msysize patch --- nghttp2/PKGBUILD | 9 +- nghttp2/nghttp2-1.24.0-msys2.patch | 206 ----------------------------- 2 files changed, 5 insertions(+), 210 deletions(-) delete mode 100644 nghttp2/nghttp2-1.24.0-msys2.patch diff --git a/nghttp2/PKGBUILD b/nghttp2/PKGBUILD index fc12fc57..7f8c932a 100644 --- a/nghttp2/PKGBUILD +++ b/nghttp2/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=libnghttp2 pkgname=("nghttp2" "${pkgbase}" "${pkgbase}-devel") pkgver=1.46.0 -pkgrel=1 +pkgrel=2 pkgdesc='Framing layer of HTTP/2 is implemented as a reusable C library' arch=(i686 x86_64) url='https://nghttp2.org/' @@ -16,8 +16,7 @@ depends=("jansson" "gcc-libs") makedepends=('jansson-devel' 'libevent-devel' 'openssl-devel' 'libcares-devel' 'zlib-devel' 'autotools') license=(MIT) -source=(https://github.com/nghttp2/nghttp2/releases/download/v$pkgver/nghttp2-${pkgver}.tar.xz - nghttp2-1.24.0-msys2.patch) +source=(https://github.com/nghttp2/nghttp2/releases/download/v$pkgver/nghttp2-${pkgver}.tar.xz) sha256sums=('1a68cc4a5732afb735baf50aaac3cb3a6771e49f744bd5db6c49ab5042f12a43' '8619c21f76c435ffd8790e4c439038770c73eaca8e23b2d7654067e956a4b86d') @@ -42,12 +41,14 @@ del_file_exists() { prepare() { cd nghttp2-${pkgver} - apply_patch_with_msg nghttp2-1.24.0-msys2.patch + autoreconf -fiv } build() { cd nghttp2-${pkgver} + + CHOST="${CHOST/-msys/-cygwin}" \ ./configure \ --prefix=/usr \ --enable-static=yes \ diff --git a/nghttp2/nghttp2-1.24.0-msys2.patch b/nghttp2/nghttp2-1.24.0-msys2.patch deleted file mode 100644 index ec0dd3bd..00000000 --- a/nghttp2/nghttp2-1.24.0-msys2.patch +++ /dev/null @@ -1,206 +0,0 @@ ---- nghttp2-1.24.0/m4/libtool.m4.orig 2017-08-16 05:46:57.953112700 -0400 -+++ nghttp2-1.24.0/m4/libtool.m4 2017-08-16 06:06:37.880697000 -0400 -@@ -1691,7 +1691,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d - lt_cv_sys_max_cmd_len=-1; - ;; - -- cygwin* | mingw* | cegcc*) -+ cygwin* | msys* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, -@@ -1939,7 +1939,7 @@ else - lt_cv_dlopen_libs= - ;; - -- cygwin*) -+ cygwin* | msys*) - lt_cv_dlopen=dlopen - lt_cv_dlopen_libs= - ;; -@@ -2520,7 +2520,7 @@ bsdi[[45]]*) - # libtool to hard-code these into programs - ;; - --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=.dll - need_version=no -@@ -2552,6 +2552,12 @@ cygwin* | mingw* | pw32* | cegcc*) - m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) - ;; -+ msys*) -+ # MSYS DLLs use 'msys-' prefix rather than 'lib' -+ soname_spec='`echo $libname | sed -e 's/^lib/msys-/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' -+m4_if([$1], [],[ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/"]) -+ ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' -@@ -2586,7 +2592,7 @@ m4_if([$1], [],[ - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` - ;; -- cygwin*) -+ cygwin*|msys*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... -@@ -3376,7 +3382,7 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - if test yes != "$GCC"; then - reload_cmds=false - fi -@@ -3469,7 +3475,7 @@ bsdi[[45]]*) - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - --cygwin*) -+cygwin* | msys*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' -@@ -3782,7 +3788,7 @@ lt_cv_sharedlib_from_linklib_cmd, - [lt_cv_sharedlib_from_linklib_cmd='unknown' - - case $host_os in --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh; - # decide which one to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in -@@ -3852,7 +3858,7 @@ AC_DEFUN([LT_LIB_M], - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - LIBM= - case $host in --*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) -+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; - *-ncr-sysv4.3*) -@@ -3927,7 +3933,7 @@ case $host_os in - aix*) - symcode='[[BCDT]]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[[ABCDGISTW]]' - ;; - hpux*) -@@ -4233,7 +4239,7 @@ m4_if([$1], [CXX], [ - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | cygwin* | os2* | pw32* | cegcc*) -+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style -@@ -4309,7 +4315,7 @@ m4_if([$1], [CXX], [ - ;; - esac - ;; -- mingw* | cygwin* | os2* | pw32* | cegcc*) -+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], -@@ -4557,7 +4563,7 @@ m4_if([$1], [CXX], [ - # PIC is the default for these OSes. - ;; - -- mingw* | cygwin* | pw32* | os2* | cegcc*) -+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style -@@ -4661,7 +4667,7 @@ m4_if([$1], [CXX], [ - esac - ;; - -- mingw* | cygwin* | pw32* | os2* | cegcc*) -+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], -@@ -4936,7 +4942,7 @@ m4_if([$1], [CXX], [ - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds - ;; -- cygwin* | mingw* | cegcc*) -+ cygwin* | msys* | mingw* | cegcc*) - case $cc_basename in - cl*) - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' -@@ -4997,7 +5003,7 @@ dnl Note also adjust exclude_expsyms for - extract_expsyms_cmds= - - case $host_os in -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. -@@ -5115,7 +5121,7 @@ _LT_EOF - fi - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -@@ -5571,7 +5577,7 @@ _LT_EOF - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -6647,7 +6653,7 @@ if test yes != "$_lt_caught_CXX_error"; - esac - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC -@@ -8335,7 +8341,7 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd, - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; -- *-*-cygwin* ) -+ *-*-cygwin* | *-*-msys*) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix -@@ -8348,7 +8354,7 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd, - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; -- *-*-cygwin* ) -+ *-*-cygwin* | *-*-msys*) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix ---- nghttp2-1.24.0/m4/ltoptions.m4.orig 2017-08-16 06:11:51.852482200 -0400 -+++ nghttp2-1.24.0/m4/ltoptions.m4 2017-08-16 06:12:20.511157500 -0400 -@@ -128,7 +128,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll], - [enable_win32_dll=yes - - case $host in --*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) -+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) From 170fda25d1ac622247d012921a25470692e82d75 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 1 Apr 2022 10:47:26 +0200 Subject: [PATCH 2/3] nghttp2: Update to 1.47.0 --- nghttp2/PKGBUILD | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/nghttp2/PKGBUILD b/nghttp2/PKGBUILD index 7f8c932a..8d9adf66 100644 --- a/nghttp2/PKGBUILD +++ b/nghttp2/PKGBUILD @@ -2,13 +2,12 @@ pkgbase=libnghttp2 pkgname=("nghttp2" "${pkgbase}" "${pkgbase}-devel") -pkgver=1.46.0 -pkgrel=2 +pkgver=1.47.0 +pkgrel=1 pkgdesc='Framing layer of HTTP/2 is implemented as a reusable C library' arch=(i686 x86_64) url='https://nghttp2.org/' depends=("jansson" - #"jemalloc" "libevent" "libxml2" "openssl" @@ -17,27 +16,7 @@ depends=("jansson" makedepends=('jansson-devel' 'libevent-devel' 'openssl-devel' 'libcares-devel' 'zlib-devel' 'autotools') license=(MIT) source=(https://github.com/nghttp2/nghttp2/releases/download/v$pkgver/nghttp2-${pkgver}.tar.xz) -sha256sums=('1a68cc4a5732afb735baf50aaac3cb3a6771e49f744bd5db6c49ab5042f12a43' - '8619c21f76c435ffd8790e4c439038770c73eaca8e23b2d7654067e956a4b86d') - -# Helper macros to help make tasks easier # -apply_patch_with_msg() { - for _patch in "$@" - do - msg2 "Applying $_patch" - patch -Nbp1 -i "${srcdir}/${_patch}" - done -} - -del_file_exists() { - for _fname in "$@" - do - if [ -f $_fname ]; then - rm -rf $_fname - fi - done -} -# =========================================== # +sha256sums=('68271951324554c34501b85190f22f2221056db69f493afc3bbac8e7be21e7cc') prepare() { cd nghttp2-${pkgver} @@ -55,7 +34,7 @@ build() { --enable-shared=yes \ --disable-examples \ --disable-python-bindings -# --enable-lib-only + make make DESTDIR="${srcdir}/dest" install } @@ -87,5 +66,4 @@ package_libnghttp2-devel() { cp -rf ${srcdir}/dest/usr/include ${pkgdir}/usr/ cp -rf ${srcdir}/dest/usr/lib ${pkgdir}/usr/ cp -rf ${srcdir}/dest/usr/share ${pkgdir}/usr/ - } From bb4c304d49683b3ced87b2a460b9cd7b2960b765 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 1 Apr 2022 11:02:27 +0200 Subject: [PATCH 3/3] fix makedepends --- nghttp2/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nghttp2/PKGBUILD b/nghttp2/PKGBUILD index 8d9adf66..17319a4f 100644 --- a/nghttp2/PKGBUILD +++ b/nghttp2/PKGBUILD @@ -13,7 +13,7 @@ depends=("jansson" "openssl" "libcares" "gcc-libs") -makedepends=('jansson-devel' 'libevent-devel' 'openssl-devel' 'libcares-devel' 'zlib-devel' 'autotools') +makedepends=('jansson-devel' 'libevent-devel' 'openssl-devel' 'libcares-devel' 'zlib-devel' 'autotools' 'gcc' 'make') license=(MIT) source=(https://github.com/nghttp2/nghttp2/releases/download/v$pkgver/nghttp2-${pkgver}.tar.xz) sha256sums=('68271951324554c34501b85190f22f2221056db69f493afc3bbac8e7be21e7cc')