From d13e08133d533a4fe2d94fb0f61eefb58b0a1f3c Mon Sep 17 00:00:00 2001 From: Andreas Wacknitz <A.Wacknitz@gmx.de> Date: Sun, 19 Nov 2023 11:34:40 +0100 Subject: [PATCH] rebuild qbittorrent & switch to openssl-3.1 --- components/network/qbittorrent/Makefile | 29 ++++++++++++++--------------- components/network/qbittorrent/pkg5 | 8 +++----- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/components/network/qbittorrent/Makefile b/components/network/qbittorrent/Makefile index dda56d6..ae7e22d 100644 --- a/components/network/qbittorrent/Makefile +++ b/components/network/qbittorrent/Makefile @@ -12,31 +12,30 @@ # Copyright 2022 Daniel Chan # Copyright 2023 Niklas Poslovski # -BUILD_STYLE=cmake + +BUILD_STYLE= cmake +OPENSSL_VERSION= 3.1 include ../../../make-rules/shared-macros.mk -COMPILER=gcc COMPONENT_NAME= qbittorrent COMPONENT_VERSION= 4.5.5 -COMPONENT_FMRI= network/qbittorrent -COMPONENT_PROJECT_URL= https://www.qbittorrent.org/ +COMPONENT_REVISION= 1 COMPONENT_SUMMARY= Qt cross-platform application and UI framework -COMPONENT_CLASSIFICATION= Applications/Internet +COMPONENT_PROJECT_URL= https://www.qbittorrent.org/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz -COMPONENT_ARCHIVE_HASH= \ - sha256:8e84a5ba63c7203cfb2e5bb23e27d000120fb8e9dfb6e9f9a1064dce1b9294e9 -COMPONENT_ARCHIVE_URL=\ - https://sourceforge.net/projects/$(COMPONENT_NAME)/files/$(COMPONENT_NAME)/$(COMPONENT_SRC)/$(COMPONENT_ARCHIVE)/download -COMPONENT_LICENSE= LGPLv2 +COMPONENT_ARCHIVE_HASH= sha256:8e84a5ba63c7203cfb2e5bb23e27d000120fb8e9dfb6e9f9a1064dce1b9294e9 +COMPONENT_ARCHIVE_URL= https://sourceforge.net/projects/$(COMPONENT_NAME)/files/$(COMPONENT_NAME)/$(COMPONENT_SRC)/$(COMPONENT_ARCHIVE)/download +COMPONENT_FMRI= network/qbittorrent +COMPONENT_CLASSIFICATION= Applications/Internet +COMPONENT_LICENSE= LGPLv2 COMPONENT_LICENSE_FILE= COPYING -TEST_TARGET= $(NO_TESTS) - +TEST_TARGET= $(NO_TESTS) include $(WS_MAKE_RULES)/common.mk -PATH=$(QT6_BINDIR):$(PG_BINDIR.$(BITS)):$(MYSQL_BINDIR.$(BITS)):$(GCC_ROOT)/bin:$(PATH.gnu) -OPENSSL_VERSION=1.1 +PATH= $(QT6_BINDIR):$(PG_BINDIR.$(BITS)):$(MYSQL_BINDIR.$(BITS)):$(GCC_ROOT)/bin:$(PATH.gnu) + LDFLAGS += -Wl,-rpath,$(QT6_LIBDIR) CMAKE_OPTIONS += -DQT6=On CMAKE_OPTIONS += -DTESTING=On @@ -46,7 +45,7 @@ REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG) REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG) REQUIRED_PACKAGES += library/qt6 -REQUIRED_PACKAGES += library/security/openssl-11 +REQUIRED_PACKAGES += library/security/openssl-31 REQUIRED_PACKAGES += library/zlib REQUIRED_PACKAGES += network/libtorrent-rasterbar REQUIRED_PACKAGES += system/library diff --git a/components/network/qbittorrent/pkg5 b/components/network/qbittorrent/pkg5 index cdbe986..8e83b14 100644 --- a/components/network/qbittorrent/pkg5 +++ b/components/network/qbittorrent/pkg5 @@ -1,14 +1,12 @@ { "dependencies": [ - "SUNWcs", "library/qt6", - "library/security/openssl-11", + "library/security/openssl-31", "library/zlib", "network/libtorrent-rasterbar", - "shell/ksh93", "system/library", - "system/library/g++-10-runtime", - "system/library/gcc-10-runtime", + "system/library/g++-13-runtime", + "system/library/gcc-13-runtime", "system/library/math" ], "fmris": [ -- Gitblit v1.9.3