From 92e4d2dee35a198d9cf0b99d96c6993434026d67 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 11 May 2023 20:09:07 +0200 Subject: [PATCH] nghttp2: use CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION instead of patching --- mingw-w64-nghttp2/002-versioned-dll.patch | 10 ---------- mingw-w64-nghttp2/PKGBUILD | 8 +++----- 2 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 mingw-w64-nghttp2/002-versioned-dll.patch diff --git a/mingw-w64-nghttp2/002-versioned-dll.patch b/mingw-w64-nghttp2/002-versioned-dll.patch deleted file mode 100644 index 56a57ca35d..0000000000 --- a/mingw-w64-nghttp2/002-versioned-dll.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nghttp2-1.50.0/lib/CMakeLists.txt.orig 2022-10-31 19:10:27 +0000 -+++ nghttp2-1.50.0/lib/CMakeLists.txt 2022-10-31 19:08:45 +0000 -@@ -44,6 +44,7 @@ - set_target_properties(nghttp2 PROPERTIES - COMPILE_FLAGS "${WARNCFLAGS}" - VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION} -+ RUNTIME_OUTPUT_NAME "nghttp2-${LT_SOVERSION}" - C_VISIBILITY_PRESET hidden - ) - target_include_directories(nghttp2 INTERFACE diff --git a/mingw-w64-nghttp2/PKGBUILD b/mingw-w64-nghttp2/PKGBUILD index 82e859db21..e566a6e73e 100644 --- a/mingw-w64-nghttp2/PKGBUILD +++ b/mingw-w64-nghttp2/PKGBUILD @@ -18,17 +18,14 @@ makedepends=( ) license=('spdx:MIT') source=("https://github.com/nghttp2/nghttp2/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.xz" - "001-fix-pc-prefix.patch" - "002-versioned-dll.patch") + "001-fix-pc-prefix.patch") sha256sums=('b867184254e5a29b0ba68413aa14f8b0ce1142a371761374598dec092dabb809' - 'baf901e7d565eaea1133d30b13620b02681ce96ebe56d38e1dea4394299106b6' - '69d3784778f83bfab8a55413f363a2aab2a6fcf41372b8dc6cd2739212ad1f7c') + 'baf901e7d565eaea1133d30b13620b02681ce96ebe56d38e1dea4394299106b6') prepare() { cd $srcdir/${_realname}-${pkgver} patch -Nbp1 -i "${srcdir}/001-fix-pc-prefix.patch" - patch -Nbp1 -i "${srcdir}/002-versioned-dll.patch" } build() { @@ -49,6 +46,7 @@ build() { "${extra_config[@]}" \ -DENABLE_SHARED_LIB=ON \ -DENABLE_STATIC_LIB=OFF \ + -DCMAKE_SHARED_LIBRARY_NAME_WITH_VERSION=ON \ -DENABLE_LIB_ONLY=ON \ -DWITH_JEMALLOC=OFF \ -DWITH_LIBXML2=OFF \