diff mbox series

nghttp2: upgrade 1.68.1 -> 1.69.0

Message ID 20260502075808.1860034-1-ankur.tyagi85@gmail.com
State New
Headers show
Series nghttp2: upgrade 1.68.1 -> 1.69.0 | expand

Commit Message

Ankur Tyagi May 2, 2026, 7:58 a.m. UTC 
From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Dropped patch which is now merged in the upstream version.

Changelog:
https://github.com/nghttp2/nghttp2/releases/tag/v1.69.0

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 ...xt-Fix-NGHTTP2_CONFIG_INSTALL_DIR-pa.patch | 26 -------------------
 .../{nghttp2_1.68.1.bb => nghttp2_1.69.0.bb}  |  3 +--
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 meta/recipes-support/nghttp2/nghttp2/0001-lib-CMakeLists.txt-Fix-NGHTTP2_CONFIG_INSTALL_DIR-pa.patch
 rename meta/recipes-support/nghttp2/{nghttp2_1.68.1.bb => nghttp2_1.69.0.bb} (74%)
diff mbox series

Patch

diff --git a/meta/recipes-support/nghttp2/nghttp2/0001-lib-CMakeLists.txt-Fix-NGHTTP2_CONFIG_INSTALL_DIR-pa.patch b/meta/recipes-support/nghttp2/nghttp2/0001-lib-CMakeLists.txt-Fix-NGHTTP2_CONFIG_INSTALL_DIR-pa.patch
deleted file mode 100644
index 32adb05e07..0000000000
--- a/meta/recipes-support/nghttp2/nghttp2/0001-lib-CMakeLists.txt-Fix-NGHTTP2_CONFIG_INSTALL_DIR-pa.patch
+++ /dev/null
@@ -1,26 +0,0 @@ 
-From eb5812d018eb96284aa6ef82569d0b6b75bcd020 Mon Sep 17 00:00:00 2001
-From: Ankur Tyagi <ankur.tyagi85@gmail.com>
-Date: Sun, 9 Nov 2025 12:45:25 +1300
-Subject: [PATCH] lib/CMakeLists.txt: Fix NGHTTP2_CONFIG_INSTALL_DIR path
-
-Remove hard coded path to fix installation on 64-bit arch.
-
-Upstream-Status: Submitted [https://github.com/nghttp2/nghttp2/pull/2551]
-Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
----
- lib/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 98e3dbe7..3b6a4400 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -51,7 +51,7 @@ set(NGHTTP2_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
- set(NGHTTP2_VERSION_CONFIG "${NGHTTP2_GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
- set(NGHTTP2_PROJECT_CONFIG "${NGHTTP2_GENERATED_DIR}/${PROJECT_NAME}Config.cmake")
- set(NGHTTP2_TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
--set(NGHTTP2_CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}")
-+set(NGHTTP2_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
- set(NGHTTP2_NAMESPACE "${PROJECT_NAME}::")
- set(NGHTTP2_VERSION ${PROJECT_VERSION})
- 
diff --git a/meta/recipes-support/nghttp2/nghttp2_1.68.1.bb b/meta/recipes-support/nghttp2/nghttp2_1.69.0.bb
similarity index 74%
rename from meta/recipes-support/nghttp2/nghttp2_1.68.1.bb
rename to meta/recipes-support/nghttp2/nghttp2_1.69.0.bb
index 71d5eef8d6..1d9a1b38a2 100644
--- a/meta/recipes-support/nghttp2/nghttp2_1.68.1.bb
+++ b/meta/recipes-support/nghttp2/nghttp2_1.69.0.bb
@@ -6,10 +6,9 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec"
 
 SRC_URI = "\
     ${GITHUB_BASE_URI}/download/v${PV}/nghttp2-${PV}.tar.xz \
-    file://0001-lib-CMakeLists.txt-Fix-NGHTTP2_CONFIG_INSTALL_DIR-pa.patch \
 "
 
-SRC_URI[sha256sum] = "6abd7ab0a7f1580d5914457cb3c85eb80455657ee5119206edbd7f848c14f0b2"
+SRC_URI[sha256sum] = "1fb324b6ec2c56f6bde0658f4139ffd8209fa9e77ce98fd7a5f63af8d0e508ad"
 
 inherit cmake manpages python3native github-releases