* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/ixwebsocket/files/, net-libs/ixwebsocket/
@ 2021-09-20 14:34 Adrian Schollmeyer
0 siblings, 0 replies; 4+ messages in thread
From: Adrian Schollmeyer @ 2021-09-20 14:34 UTC (permalink / raw
To: gentoo-commits
commit: 230ae6504e8044193141d4455eff013e56e7aebe
Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
AuthorDate: Mon Sep 20 14:28:11 2021 +0000
Commit: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
CommitDate: Mon Sep 20 14:33:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=230ae650
net-libs/ixwebsocket: Add new package
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Adrian Schollmeyer <nex+b-g-o <AT> nexadn.de>
net-libs/ixwebsocket/Manifest | 1 +
.../files/ixwebsocket-11.2.8-remove-deflate.patch | 19 +++++++
.../ixwebsocket-11.2.8-remove-network-tests.patch | 28 ++++++++++
.../ixwebsocket-11.2.8-use-gnuinstalldirs.patch | 34 ++++++++++++
.../ixwebsocket-11.2.8-use-system-spdlog.patch | 55 +++++++++++++++++++
net-libs/ixwebsocket/ixwebsocket-11.2.8.ebuild | 62 ++++++++++++++++++++++
net-libs/ixwebsocket/metadata.xml | 11 ++++
7 files changed, 210 insertions(+)
diff --git a/net-libs/ixwebsocket/Manifest b/net-libs/ixwebsocket/Manifest
new file mode 100644
index 000000000..a2f68d56b
--- /dev/null
+++ b/net-libs/ixwebsocket/Manifest
@@ -0,0 +1 @@
+DIST ixwebsocket-11.2.8.tar.gz 583075 BLAKE2B 014af74ec236a49b8bad574761e6d861348ef22f3cbda798862f87591c27c2ee8b94f740d534ed7f6fc0736ea2e06788c64a208dab65575aa815d40472c6c50d SHA512 7938c2b59b5f310afa1a0c94171dd55a4e8821ac0763feb11528d520f1d3bf1037bb8d53d31eec1952888f601f597c00c9490e15cfca7f9c3aa6d80614d7b1f5
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-deflate.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-deflate.patch
new file mode 100644
index 000000000..fffedc6b7
--- /dev/null
+++ b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-deflate.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 77d2f6b..665c35f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -206,14 +206,6 @@ if (USE_ZLIB)
+ target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_ZLIB)
+ endif()
+
+-# brew install libdeflate
+-find_package(Deflate)
+-if (DEFLATE_FOUND)
+- include_directories(${DEFLATE_INCLUDE_DIRS})
+- target_link_libraries(ixwebsocket ${DEFLATE_LIBRARIES})
+- target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_DEFLATE)
+-endif()
+-
+ if (WIN32)
+ target_link_libraries(ixwebsocket wsock32 ws2_32 shlwapi)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-network-tests.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-network-tests.patch
new file mode 100644
index 000000000..a2d1360cb
--- /dev/null
+++ b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-network-tests.patch
@@ -0,0 +1,28 @@
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 661aebb..bab73c7 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -11,15 +11,12 @@ option(USE_TLS "Add TLS support" ON)
+
+ # Shared sources
+ set (TEST_TARGET_NAMES
+- IXSocketTest
+ IXSocketConnectTest
+ IXWebSocketServerTest
+ IXWebSocketTestConnectionDisconnection
+ IXUrlParserTest
+- IXHttpClientTest
+ IXUnityBuildsTest
+ IXHttpTest
+- IXDNSLookupTest
+ IXWebSocketSubProtocolTest
+ # IXWebSocketBroadcastTest ## FIXME was depending on cobra / take a broadcast server from ws
+ IXStrCaseCompareTest
+@@ -33,7 +30,6 @@ if (UNIX)
+
+ # Fail on Windows in CI probably because the pathing is wrong and
+ # some resource files cannot be found
+- IXHttpServerTest
+ IXWebSocketChatTest
+ )
+ endif()
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-gnuinstalldirs.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-gnuinstalldirs.patch
new file mode 100644
index 000000000..a7e2b6ba8
--- /dev/null
+++ b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-gnuinstalldirs.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 77d2f6b..4c64106 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -238,23 +238,25 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+ target_compile_options(ixwebsocket PRIVATE /MP)
+ endif()
+
++include(GNUInstallDirs)
++
+ target_include_directories(ixwebsocket PUBLIC
+ $<BUILD_INTERFACE:${IXWEBSOCKET_INCLUDE_DIRS}/>
+- $<INSTALL_INTERFACE:include/ixwebsocket>
++ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ixwebsocket>
+ )
+
+ set_target_properties(ixwebsocket PROPERTIES PUBLIC_HEADER "${IXWEBSOCKET_HEADERS}")
+
+ install(TARGETS ixwebsocket
+ EXPORT ixwebsocket
+- ARCHIVE DESTINATION lib
+- PUBLIC_HEADER DESTINATION include/ixwebsocket/
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ixwebsocket/
+ )
+
+ install(EXPORT ixwebsocket
+ FILE ixwebsocket-config.cmake
+ NAMESPACE ixwebsocket::
+- DESTINATION lib/cmake/ixwebsocket)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ixwebsocket)
+
+ if (USE_WS OR USE_TEST)
+ include(FetchContent)
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-system-spdlog.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-system-spdlog.patch
new file mode 100644
index 000000000..ed329b41d
--- /dev/null
+++ b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-system-spdlog.patch
@@ -0,0 +1,55 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 77d2f6b..86c7172 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -257,13 +257,9 @@ install(EXPORT ixwebsocket
+ DESTINATION lib/cmake/ixwebsocket)
+
+ if (USE_WS OR USE_TEST)
+- include(FetchContent)
+- FetchContent_Declare(spdlog
+- GIT_REPOSITORY "https://github.com/gabime/spdlog"
+- GIT_TAG "v1.8.0"
+- GIT_SHALLOW 1)
+-
+- FetchContent_MakeAvailable(spdlog)
++ find_package(spdlog REQUIRED)
++ find_package(fmt REQUIRED)
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPDLOG_FMT_EXTERNAL")
+
+ if (USE_WS)
+ add_subdirectory(ws)
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 661aebb..ab0c92e 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -66,7 +66,7 @@ target_include_directories(ixwebsocket_test PRIVATE
+ ../third_party
+ )
+ target_link_libraries(ixwebsocket_test ixwebsocket)
+-target_link_libraries(ixwebsocket_test spdlog)
++target_link_libraries(ixwebsocket_test spdlog::spdlog fmt::fmt)
+
+ foreach(TEST_TARGET_NAME ${TEST_TARGET_NAMES})
+ add_executable(${TEST_TARGET_NAME}
+@@ -89,7 +89,7 @@ foreach(TEST_TARGET_NAME ${TEST_TARGET_NAMES})
+ target_link_libraries(${TEST_TARGET_NAME} ixwebsocket_test)
+ target_link_libraries(${TEST_TARGET_NAME} ixwebsocket)
+
+- target_link_libraries(${TEST_TARGET_NAME} spdlog)
++ target_link_libraries(${TEST_TARGET_NAME} spdlog fmt)
+
+ add_test(NAME ${TEST_TARGET_NAME}
+ COMMAND ${TEST_TARGET_NAME}
+diff --git a/ws/CMakeLists.txt b/ws/CMakeLists.txt
+index 98f15de..10834e5 100644
+--- a/ws/CMakeLists.txt
++++ b/ws/CMakeLists.txt
+@@ -31,6 +31,6 @@ add_executable(ws
+ # library with the most dependencies come first
+ target_link_libraries(ws ixwebsocket)
+
+-target_link_libraries(ws spdlog)
++target_link_libraries(ws spdlog::spdlog fmt::fmt)
+
+ install(TARGETS ws RUNTIME DESTINATION bin)
diff --git a/net-libs/ixwebsocket/ixwebsocket-11.2.8.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.2.8.ebuild
new file mode 100644
index 000000000..43bcde917
--- /dev/null
+++ b/net-libs/ixwebsocket/ixwebsocket-11.2.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_P="IXWebSocket-${PV}"
+
+DESCRIPTION="C++ websocket client and server library"
+HOMEPAGE="https://github.com/machinezone/IXWebSocket"
+SRC_URI="https://github.com/machinezone/IXWebSocket/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ssl test zlib ws"
+
+DEPEND="
+ sys-libs/zlib:=
+
+ ws? (
+ >=dev-libs/spdlog-1.8.0:=
+ )
+ test? (
+ >=dev-libs/spdlog-1.8.0:=
+ )
+"
+RDEPEND="
+ sys-libs/zlib:=
+"
+BDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ # Upstream installs to hardcoded lib- and include-dirs
+ "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
+ # Some tests require network connectivity
+ "${FILESDIR}/${P}-remove-network-tests.patch"
+ # Upstream uses git submodules
+ "${FILESDIR}/${P}-use-system-spdlog.patch"
+ # Upstream detects deflate dynamically, so let's remove it
+ "${FILESDIR}/${P}-remove-deflate.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_TLS="$(usex ssl)"
+ -DUSE_ZLIB="$(usex zlib)"
+ -DUSE_WS="$(usex ws)"
+ -DUSE_TEST="$(usex test)"
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ ctest --output-on-failure || die
+}
diff --git a/net-libs/ixwebsocket/metadata.xml b/net-libs/ixwebsocket/metadata.xml
new file mode 100644
index 000000000..1d44d14fb
--- /dev/null
+++ b/net-libs/ixwebsocket/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <name>Adrian Schollmeyer</name>
+ <email>nex+b-g-o@nexadn.de</email>
+ </maintainer>
+ <use>
+ <flag name="ws">Build the ws utility</flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/ixwebsocket/files/, net-libs/ixwebsocket/
@ 2021-11-28 13:57 Adrian Schollmeyer
0 siblings, 0 replies; 4+ messages in thread
From: Adrian Schollmeyer @ 2021-11-28 13:57 UTC (permalink / raw
To: gentoo-commits
commit: d93e9e03612215ec613e1736e02356d82540924c
Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
AuthorDate: Sun Nov 28 13:54:45 2021 +0000
Commit: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
CommitDate: Sun Nov 28 13:57:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d93e9e03
net-libs/ixwebsocket: Bump to 11.3.2
Patching CMakeLists.txt to use GNUInstallDirs has become obsolete, since
the patches have been applied upstream.
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Adrian Schollmeyer <nex+b-g-o <AT> nexadn.de>
net-libs/ixwebsocket/Manifest | 2 +-
.../files/ixwebsocket-11.3.2-remove-deflate.patch | 19 ++++++++
.../ixwebsocket-11.3.2-remove-network-tests.patch | 28 +++++++++++
.../ixwebsocket-11.3.2-use-system-spdlog.patch | 55 ++++++++++++++++++++++
...ket-11.2.8.ebuild => ixwebsocket-11.3.2.ebuild} | 2 -
5 files changed, 103 insertions(+), 3 deletions(-)
diff --git a/net-libs/ixwebsocket/Manifest b/net-libs/ixwebsocket/Manifest
index a2f68d56b..75cedd7f5 100644
--- a/net-libs/ixwebsocket/Manifest
+++ b/net-libs/ixwebsocket/Manifest
@@ -1 +1 @@
-DIST ixwebsocket-11.2.8.tar.gz 583075 BLAKE2B 014af74ec236a49b8bad574761e6d861348ef22f3cbda798862f87591c27c2ee8b94f740d534ed7f6fc0736ea2e06788c64a208dab65575aa815d40472c6c50d SHA512 7938c2b59b5f310afa1a0c94171dd55a4e8821ac0763feb11528d520f1d3bf1037bb8d53d31eec1952888f601f597c00c9490e15cfca7f9c3aa6d80614d7b1f5
+DIST ixwebsocket-11.3.2.tar.gz 600266 BLAKE2B 21051ddbea29fa1cb7a2e4a04426b9bc2e518e7ab93bb866005948e9726b78cb45ce5a2f672c2924affc5e897e5e37e6d2f62fdf7d07d6675888352b9dd0c5ba SHA512 2ee25575d3315a64eef370df87f431e055293105cc6e784c4a776c2c5c5ec45f6c9d39e900fdcea1ad6b4a26b55581600250a9b1c300ce2eb8eebd670e6fda26
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-remove-deflate.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-remove-deflate.patch
new file mode 100644
index 000000000..fffedc6b7
--- /dev/null
+++ b/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-remove-deflate.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 77d2f6b..665c35f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -206,14 +206,6 @@ if (USE_ZLIB)
+ target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_ZLIB)
+ endif()
+
+-# brew install libdeflate
+-find_package(Deflate)
+-if (DEFLATE_FOUND)
+- include_directories(${DEFLATE_INCLUDE_DIRS})
+- target_link_libraries(ixwebsocket ${DEFLATE_LIBRARIES})
+- target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_DEFLATE)
+-endif()
+-
+ if (WIN32)
+ target_link_libraries(ixwebsocket wsock32 ws2_32 shlwapi)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-remove-network-tests.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-remove-network-tests.patch
new file mode 100644
index 000000000..a2d1360cb
--- /dev/null
+++ b/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-remove-network-tests.patch
@@ -0,0 +1,28 @@
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 661aebb..bab73c7 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -11,15 +11,12 @@ option(USE_TLS "Add TLS support" ON)
+
+ # Shared sources
+ set (TEST_TARGET_NAMES
+- IXSocketTest
+ IXSocketConnectTest
+ IXWebSocketServerTest
+ IXWebSocketTestConnectionDisconnection
+ IXUrlParserTest
+- IXHttpClientTest
+ IXUnityBuildsTest
+ IXHttpTest
+- IXDNSLookupTest
+ IXWebSocketSubProtocolTest
+ # IXWebSocketBroadcastTest ## FIXME was depending on cobra / take a broadcast server from ws
+ IXStrCaseCompareTest
+@@ -33,7 +30,6 @@ if (UNIX)
+
+ # Fail on Windows in CI probably because the pathing is wrong and
+ # some resource files cannot be found
+- IXHttpServerTest
+ IXWebSocketChatTest
+ )
+ endif()
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-use-system-spdlog.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-use-system-spdlog.patch
new file mode 100644
index 000000000..ed329b41d
--- /dev/null
+++ b/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-use-system-spdlog.patch
@@ -0,0 +1,55 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 77d2f6b..86c7172 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -257,13 +257,9 @@ install(EXPORT ixwebsocket
+ DESTINATION lib/cmake/ixwebsocket)
+
+ if (USE_WS OR USE_TEST)
+- include(FetchContent)
+- FetchContent_Declare(spdlog
+- GIT_REPOSITORY "https://github.com/gabime/spdlog"
+- GIT_TAG "v1.8.0"
+- GIT_SHALLOW 1)
+-
+- FetchContent_MakeAvailable(spdlog)
++ find_package(spdlog REQUIRED)
++ find_package(fmt REQUIRED)
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPDLOG_FMT_EXTERNAL")
+
+ if (USE_WS)
+ add_subdirectory(ws)
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 661aebb..ab0c92e 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -66,7 +66,7 @@ target_include_directories(ixwebsocket_test PRIVATE
+ ../third_party
+ )
+ target_link_libraries(ixwebsocket_test ixwebsocket)
+-target_link_libraries(ixwebsocket_test spdlog)
++target_link_libraries(ixwebsocket_test spdlog::spdlog fmt::fmt)
+
+ foreach(TEST_TARGET_NAME ${TEST_TARGET_NAMES})
+ add_executable(${TEST_TARGET_NAME}
+@@ -89,7 +89,7 @@ foreach(TEST_TARGET_NAME ${TEST_TARGET_NAMES})
+ target_link_libraries(${TEST_TARGET_NAME} ixwebsocket_test)
+ target_link_libraries(${TEST_TARGET_NAME} ixwebsocket)
+
+- target_link_libraries(${TEST_TARGET_NAME} spdlog)
++ target_link_libraries(${TEST_TARGET_NAME} spdlog fmt)
+
+ add_test(NAME ${TEST_TARGET_NAME}
+ COMMAND ${TEST_TARGET_NAME}
+diff --git a/ws/CMakeLists.txt b/ws/CMakeLists.txt
+index 98f15de..10834e5 100644
+--- a/ws/CMakeLists.txt
++++ b/ws/CMakeLists.txt
+@@ -31,6 +31,6 @@ add_executable(ws
+ # library with the most dependencies come first
+ target_link_libraries(ws ixwebsocket)
+
+-target_link_libraries(ws spdlog)
++target_link_libraries(ws spdlog::spdlog fmt::fmt)
+
+ install(TARGETS ws RUNTIME DESTINATION bin)
diff --git a/net-libs/ixwebsocket/ixwebsocket-11.2.8.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.3.2.ebuild
similarity index 92%
rename from net-libs/ixwebsocket/ixwebsocket-11.2.8.ebuild
rename to net-libs/ixwebsocket/ixwebsocket-11.3.2.ebuild
index a31363a8c..1f07f2f48 100644
--- a/net-libs/ixwebsocket/ixwebsocket-11.2.8.ebuild
+++ b/net-libs/ixwebsocket/ixwebsocket-11.3.2.ebuild
@@ -45,8 +45,6 @@ S="${WORKDIR}/${MY_P}"
RESTRICT="!test? ( test )"
PATCHES=(
- # Upstream installs to hardcoded lib- and include-dirs
- "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
# Some tests require network connectivity
"${FILESDIR}/${P}-remove-network-tests.patch"
# Upstream uses git submodules
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/ixwebsocket/files/, net-libs/ixwebsocket/
@ 2022-02-27 12:32 Adrian Schollmeyer
0 siblings, 0 replies; 4+ messages in thread
From: Adrian Schollmeyer @ 2022-02-27 12:32 UTC (permalink / raw
To: gentoo-commits
commit: 2169715304bb55399f1418d5851cd4bd5352db1e
Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
AuthorDate: Sun Feb 27 12:29:00 2022 +0000
Commit: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
CommitDate: Sun Feb 27 12:32:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=21697153
net-libs/ixwebsocket: Bump to 11.3.3, add subslot
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Adrian Schollmeyer <nex+b-g-o <AT> nexadn.de>
net-libs/ixwebsocket/Manifest | 2 +-
.../files/ixwebsocket-11.2.8-remove-deflate.patch | 19 --------
.../ixwebsocket-11.2.8-use-gnuinstalldirs.patch | 34 -------------
.../files/ixwebsocket-11.3.2-remove-deflate.patch | 19 --------
.../ixwebsocket-11.3.2-remove-network-tests.patch | 28 -----------
.../ixwebsocket-11.3.2-use-system-spdlog.patch | 55 ----------------------
... ixwebsocket-11.3.3-remove-network-tests.patch} | 4 +-
... => ixwebsocket-11.3.3-use-system-spdlog.patch} | 0
...ket-11.3.2.ebuild => ixwebsocket-11.3.3.ebuild} | 6 +--
9 files changed, 5 insertions(+), 162 deletions(-)
diff --git a/net-libs/ixwebsocket/Manifest b/net-libs/ixwebsocket/Manifest
index 75cedd7f5..1bdbe5089 100644
--- a/net-libs/ixwebsocket/Manifest
+++ b/net-libs/ixwebsocket/Manifest
@@ -1 +1 @@
-DIST ixwebsocket-11.3.2.tar.gz 600266 BLAKE2B 21051ddbea29fa1cb7a2e4a04426b9bc2e518e7ab93bb866005948e9726b78cb45ce5a2f672c2924affc5e897e5e37e6d2f62fdf7d07d6675888352b9dd0c5ba SHA512 2ee25575d3315a64eef370df87f431e055293105cc6e784c4a776c2c5c5ec45f6c9d39e900fdcea1ad6b4a26b55581600250a9b1c300ce2eb8eebd670e6fda26
+DIST ixwebsocket-11.3.3.tar.gz 631670 BLAKE2B 77e88fd107b5670ff70ff06e1cb6c32145ce709008fc2c51abf7c05d0b5f6e02524846261a5b3252b1e5d95e55545aa8a3d9ae663675f91ead709bf133e48d3e SHA512 3831794450bd9e5c08251301afae83ed0ffdb5d1d2e1db40d02d09545e0a78f8ea9d637210181211dff113b78dbb9a4ebaa26faef28f8f65a340321067fa3a8f
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-deflate.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-deflate.patch
deleted file mode 100644
index fffedc6b7..000000000
--- a/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-deflate.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 77d2f6b..665c35f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -206,14 +206,6 @@ if (USE_ZLIB)
- target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_ZLIB)
- endif()
-
--# brew install libdeflate
--find_package(Deflate)
--if (DEFLATE_FOUND)
-- include_directories(${DEFLATE_INCLUDE_DIRS})
-- target_link_libraries(ixwebsocket ${DEFLATE_LIBRARIES})
-- target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_DEFLATE)
--endif()
--
- if (WIN32)
- target_link_libraries(ixwebsocket wsock32 ws2_32 shlwapi)
- add_definitions(-D_CRT_SECURE_NO_WARNINGS)
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-gnuinstalldirs.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-gnuinstalldirs.patch
deleted file mode 100644
index a7e2b6ba8..000000000
--- a/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-gnuinstalldirs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 77d2f6b..4c64106 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -238,23 +238,25 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
- target_compile_options(ixwebsocket PRIVATE /MP)
- endif()
-
-+include(GNUInstallDirs)
-+
- target_include_directories(ixwebsocket PUBLIC
- $<BUILD_INTERFACE:${IXWEBSOCKET_INCLUDE_DIRS}/>
-- $<INSTALL_INTERFACE:include/ixwebsocket>
-+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ixwebsocket>
- )
-
- set_target_properties(ixwebsocket PROPERTIES PUBLIC_HEADER "${IXWEBSOCKET_HEADERS}")
-
- install(TARGETS ixwebsocket
- EXPORT ixwebsocket
-- ARCHIVE DESTINATION lib
-- PUBLIC_HEADER DESTINATION include/ixwebsocket/
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ixwebsocket/
- )
-
- install(EXPORT ixwebsocket
- FILE ixwebsocket-config.cmake
- NAMESPACE ixwebsocket::
-- DESTINATION lib/cmake/ixwebsocket)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ixwebsocket)
-
- if (USE_WS OR USE_TEST)
- include(FetchContent)
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-remove-deflate.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-remove-deflate.patch
deleted file mode 100644
index fffedc6b7..000000000
--- a/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-remove-deflate.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 77d2f6b..665c35f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -206,14 +206,6 @@ if (USE_ZLIB)
- target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_ZLIB)
- endif()
-
--# brew install libdeflate
--find_package(Deflate)
--if (DEFLATE_FOUND)
-- include_directories(${DEFLATE_INCLUDE_DIRS})
-- target_link_libraries(ixwebsocket ${DEFLATE_LIBRARIES})
-- target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_DEFLATE)
--endif()
--
- if (WIN32)
- target_link_libraries(ixwebsocket wsock32 ws2_32 shlwapi)
- add_definitions(-D_CRT_SECURE_NO_WARNINGS)
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-remove-network-tests.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-remove-network-tests.patch
deleted file mode 100644
index a2d1360cb..000000000
--- a/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-remove-network-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 661aebb..bab73c7 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -11,15 +11,12 @@ option(USE_TLS "Add TLS support" ON)
-
- # Shared sources
- set (TEST_TARGET_NAMES
-- IXSocketTest
- IXSocketConnectTest
- IXWebSocketServerTest
- IXWebSocketTestConnectionDisconnection
- IXUrlParserTest
-- IXHttpClientTest
- IXUnityBuildsTest
- IXHttpTest
-- IXDNSLookupTest
- IXWebSocketSubProtocolTest
- # IXWebSocketBroadcastTest ## FIXME was depending on cobra / take a broadcast server from ws
- IXStrCaseCompareTest
-@@ -33,7 +30,6 @@ if (UNIX)
-
- # Fail on Windows in CI probably because the pathing is wrong and
- # some resource files cannot be found
-- IXHttpServerTest
- IXWebSocketChatTest
- )
- endif()
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-use-system-spdlog.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-use-system-spdlog.patch
deleted file mode 100644
index ed329b41d..000000000
--- a/net-libs/ixwebsocket/files/ixwebsocket-11.3.2-use-system-spdlog.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 77d2f6b..86c7172 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -257,13 +257,9 @@ install(EXPORT ixwebsocket
- DESTINATION lib/cmake/ixwebsocket)
-
- if (USE_WS OR USE_TEST)
-- include(FetchContent)
-- FetchContent_Declare(spdlog
-- GIT_REPOSITORY "https://github.com/gabime/spdlog"
-- GIT_TAG "v1.8.0"
-- GIT_SHALLOW 1)
--
-- FetchContent_MakeAvailable(spdlog)
-+ find_package(spdlog REQUIRED)
-+ find_package(fmt REQUIRED)
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPDLOG_FMT_EXTERNAL")
-
- if (USE_WS)
- add_subdirectory(ws)
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 661aebb..ab0c92e 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -66,7 +66,7 @@ target_include_directories(ixwebsocket_test PRIVATE
- ../third_party
- )
- target_link_libraries(ixwebsocket_test ixwebsocket)
--target_link_libraries(ixwebsocket_test spdlog)
-+target_link_libraries(ixwebsocket_test spdlog::spdlog fmt::fmt)
-
- foreach(TEST_TARGET_NAME ${TEST_TARGET_NAMES})
- add_executable(${TEST_TARGET_NAME}
-@@ -89,7 +89,7 @@ foreach(TEST_TARGET_NAME ${TEST_TARGET_NAMES})
- target_link_libraries(${TEST_TARGET_NAME} ixwebsocket_test)
- target_link_libraries(${TEST_TARGET_NAME} ixwebsocket)
-
-- target_link_libraries(${TEST_TARGET_NAME} spdlog)
-+ target_link_libraries(${TEST_TARGET_NAME} spdlog fmt)
-
- add_test(NAME ${TEST_TARGET_NAME}
- COMMAND ${TEST_TARGET_NAME}
-diff --git a/ws/CMakeLists.txt b/ws/CMakeLists.txt
-index 98f15de..10834e5 100644
---- a/ws/CMakeLists.txt
-+++ b/ws/CMakeLists.txt
-@@ -31,6 +31,6 @@ add_executable(ws
- # library with the most dependencies come first
- target_link_libraries(ws ixwebsocket)
-
--target_link_libraries(ws spdlog)
-+target_link_libraries(ws spdlog::spdlog fmt::fmt)
-
- install(TARGETS ws RUNTIME DESTINATION bin)
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-network-tests.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.3.3-remove-network-tests.patch
similarity index 92%
rename from net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-network-tests.patch
rename to net-libs/ixwebsocket/files/ixwebsocket-11.3.3-remove-network-tests.patch
index a2d1360cb..64761c4ce 100644
--- a/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-network-tests.patch
+++ b/net-libs/ixwebsocket/files/ixwebsocket-11.3.3-remove-network-tests.patch
@@ -1,5 +1,5 @@
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 661aebb..bab73c7 100644
+index c8822a4..9ec705c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -11,15 +11,12 @@ option(USE_TLS "Add TLS support" ON)
@@ -18,7 +18,7 @@ index 661aebb..bab73c7 100644
IXWebSocketSubProtocolTest
# IXWebSocketBroadcastTest ## FIXME was depending on cobra / take a broadcast server from ws
IXStrCaseCompareTest
-@@ -33,7 +30,6 @@ if (UNIX)
+@@ -34,7 +31,6 @@ if (UNIX)
# Fail on Windows in CI probably because the pathing is wrong and
# some resource files cannot be found
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-system-spdlog.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.3.3-use-system-spdlog.patch
similarity index 100%
rename from net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-system-spdlog.patch
rename to net-libs/ixwebsocket/files/ixwebsocket-11.3.3-use-system-spdlog.patch
diff --git a/net-libs/ixwebsocket/ixwebsocket-11.3.2.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.3.3.ebuild
similarity index 88%
rename from net-libs/ixwebsocket/ixwebsocket-11.3.2.ebuild
rename to net-libs/ixwebsocket/ixwebsocket-11.3.3.ebuild
index 1f07f2f48..005c7834d 100644
--- a/net-libs/ixwebsocket/ixwebsocket-11.3.2.ebuild
+++ b/net-libs/ixwebsocket/ixwebsocket-11.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/machinezone/IXWebSocket"
SRC_URI="https://github.com/machinezone/IXWebSocket/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/11.3.2"
KEYWORDS="~amd64 ~x86"
IUSE="+ssl test zlib ws"
@@ -49,8 +49,6 @@ PATCHES=(
"${FILESDIR}/${P}-remove-network-tests.patch"
# Upstream uses git submodules
"${FILESDIR}/${P}-use-system-spdlog.patch"
- # Upstream detects deflate dynamically, so let's remove it
- "${FILESDIR}/${P}-remove-deflate.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/ixwebsocket/files/, net-libs/ixwebsocket/
@ 2022-05-13 21:46 Adrian Schollmeyer
0 siblings, 0 replies; 4+ messages in thread
From: Adrian Schollmeyer @ 2022-05-13 21:46 UTC (permalink / raw
To: gentoo-commits
commit: 59097860f40842628ae26604d71be78feaa50a05
Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
AuthorDate: Fri May 13 21:46:12 2022 +0000
Commit: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
CommitDate: Fri May 13 21:46:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=59097860
net-libs/ixwebsocket: add 11.4.3, drop 11.4.2
Signed-off-by: Adrian Schollmeyer <nex+b-g-o <AT> nexadn.de>
net-libs/ixwebsocket/Manifest | 2 +-
...etwork-tests.patch => ixwebsocket-11.4.3-remove-network-tests.patch} | 0
...e-system-spdlog.patch => ixwebsocket-11.4.3-use-system-spdlog.patch} | 0
.../{ixwebsocket-11.4.2.ebuild => ixwebsocket-11.4.3.ebuild} | 0
4 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/ixwebsocket/Manifest b/net-libs/ixwebsocket/Manifest
index a9658fa9f..7228a3647 100644
--- a/net-libs/ixwebsocket/Manifest
+++ b/net-libs/ixwebsocket/Manifest
@@ -1,2 +1,2 @@
DIST ixwebsocket-11.3.3.tar.gz 631670 BLAKE2B 77e88fd107b5670ff70ff06e1cb6c32145ce709008fc2c51abf7c05d0b5f6e02524846261a5b3252b1e5d95e55545aa8a3d9ae663675f91ead709bf133e48d3e SHA512 3831794450bd9e5c08251301afae83ed0ffdb5d1d2e1db40d02d09545e0a78f8ea9d637210181211dff113b78dbb9a4ebaa26faef28f8f65a340321067fa3a8f
-DIST ixwebsocket-11.4.2.tar.gz 631385 BLAKE2B 1f6cff44263548d8bb0be9308ec75aaccef93a4e0ef83d8c647fbc5567b8b9b85f0d91414907905fc4e9ebcfb3eb62fd71241888ffa25fbea1adda93c50f4be2 SHA512 7a7d2207986007ad0f09f98dec4f6e8fa61c73b8189b47f931b43a49779a55e55669e882763f78b2f5ab805b6adcb254f09c16efd8280f0d32db7d7e71dbb426
+DIST ixwebsocket-11.4.3.tar.gz 633130 BLAKE2B 8208b83979ce1a842d41d2cf19c7e9475dc5801677e21a0c502d6268d3cc913cb8b3a1c493b9b816ec7734e2179839fe9eef6c9985452e9de6a8378204d2221b SHA512 6db4f05b3a73aa5f6efdb6d4692d9f9665b14c3a6e4837ff6b2719d9261aa660166fd4ddf99ca8e6804202d6f71c399fe1c223932493ea8db0a73752cb5b8e97
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.4.2-remove-network-tests.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.4.3-remove-network-tests.patch
similarity index 100%
rename from net-libs/ixwebsocket/files/ixwebsocket-11.4.2-remove-network-tests.patch
rename to net-libs/ixwebsocket/files/ixwebsocket-11.4.3-remove-network-tests.patch
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.4.2-use-system-spdlog.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.4.3-use-system-spdlog.patch
similarity index 100%
rename from net-libs/ixwebsocket/files/ixwebsocket-11.4.2-use-system-spdlog.patch
rename to net-libs/ixwebsocket/files/ixwebsocket-11.4.3-use-system-spdlog.patch
diff --git a/net-libs/ixwebsocket/ixwebsocket-11.4.2.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.4.3.ebuild
similarity index 100%
rename from net-libs/ixwebsocket/ixwebsocket-11.4.2.ebuild
rename to net-libs/ixwebsocket/ixwebsocket-11.4.3.ebuild
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-13 21:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-13 21:46 [gentoo-commits] repo/proj/guru:dev commit in: net-libs/ixwebsocket/files/, net-libs/ixwebsocket/ Adrian Schollmeyer
-- strict thread matches above, loose matches on Subject: below --
2022-02-27 12:32 Adrian Schollmeyer
2021-11-28 13:57 Adrian Schollmeyer
2021-09-20 14:34 Adrian Schollmeyer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox