-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upstream Release Signed-off-by: txtsd <[email protected]>
- Loading branch information
Showing
3 changed files
with
38 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,53 +1,32 @@ | ||
From acc6ef53d87ab1a464beaf6203c64bf63006090f Mon Sep 17 00:00:00 2001 | ||
From 4982ee077d8b9ed7324ca48dd356f57054a090a7 Mon Sep 17 00:00:00 2001 | ||
From: txtsd <[email protected]> | ||
Date: Sat, 9 Nov 2024 15:59:24 +0530 | ||
Date: Fri, 29 Nov 2024 08:51:54 +0530 | ||
Subject: [PATCH] patch for arch | ||
|
||
Signed-off-by: txtsd <[email protected]> | ||
--- | ||
CMakeLists.txt | 71 ++++++++++++-------------------------------- | ||
CMakeLists.txt | 66 ++++++++++---------------------------------- | ||
src/http/handler.hpp | 2 +- | ||
2 files changed, 20 insertions(+), 53 deletions(-) | ||
2 files changed, 16 insertions(+), 52 deletions(-) | ||
|
||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 6afe703..c208814 100644 | ||
index 30bdb3e..2ffdd6c 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -2,14 +2,15 @@ cmake_minimum_required(VERSION 3.12) | ||
|
||
cmake_policy(SET CMP0114 NEW) | ||
cmake_policy(SET CMP0135 NEW) | ||
+cmake_policy(SET CMP0167 OLD) | ||
|
||
project(porla) | ||
|
||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") | ||
+list(APPEND CMAKE_MODULE_PATH "/usr/share/cmake/Modules") | ||
@@ -9,9 +9,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") | ||
|
||
set(CMAKE_CXX_STANDARD 20) | ||
|
||
-include(ExternalAntlr4Cpp) | ||
include(FetchContent) | ||
|
||
set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build static library" FORCE) | ||
@@ -24,7 +25,7 @@ set(ENABLE_ZSTD OFF) | ||
|
||
set(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib .so .dll) | ||
set(LINK_WITH_STATIC_LIBRARIES ON CACHE BOOL "Link with static libs" FORCE) | ||
-set(OPENSSL_USE_STATIC_LIBS TRUE) | ||
+set(OPENSSL_USE_STATIC_LIBS FALSE) | ||
|
||
# uriparser options | ||
set(URIPARSER_BUILD_DOCS OFF CACHE BOOL "Build docs" FORCE) | ||
@@ -36,22 +37,19 @@ set(URIPARSER_SHARED_LIBS OFF CACHE BOOL "Shared libs" FORCE) | ||
find_package(Boost REQUIRED COMPONENTS log program_options system) | ||
find_package(LibtorrentRasterbar REQUIRED) | ||
find_package(Lua REQUIRED) | ||
-find_package(OpenSSL REQUIRED) | ||
+find_package(OpenSSL REQUIRED COMPONENTS SSL Crypto) | ||
-include(FetchContent) | ||
- | ||
set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE) | ||
set(BUILD_TOOLS OFF CACHE BOOL "Build tools" FORCE) | ||
set(BUILD_REGRESS OFF CACHE BOOL "Build regression tests" FORCE) | ||
@@ -36,18 +33,16 @@ find_package(OpenSSL REQUIRED) | ||
find_package(SQLite3 REQUIRED) | ||
find_package(ZLIB REQUIRED) | ||
- | ||
|
||
-FetchContent_Declare(curl URL https://github.com/curl/curl/archive/refs/tags/curl-8_6_0.tar.gz) | ||
-FetchContent_Declare(jwt-cpp URL https://github.com/Thalhammer/jwt-cpp/archive/refs/tags/v0.7.0.tar.gz) | ||
-FetchContent_Declare(libzip URL https://github.com/nih-at/libzip/archive/refs/tags/v1.10.1.tar.gz) | ||
|
@@ -60,20 +39,20 @@ index 6afe703..c208814 100644 | |
- libzip | ||
- tomlplusplus | ||
- uriparser) | ||
+find_package(libzip REQUIRED) | ||
+find_package(tomlplusplus REQUIRED) | ||
+find_package(uriparser REQUIRED) | ||
+find_package(libzip REQUIRED) | ||
+find_package(tomlplusplus REQUIRED) | ||
+find_package(uriparser REQUIRED) | ||
+set(jwt-cpp_DIR /usr/lib/cmake) | ||
+find_package(jwt-cpp REQUIRED) | ||
+find_package(sol2 REQUIRED) | ||
+find_package(antlr4-runtime REQUIRED) | ||
+find_package(PkgConfig REQUIRED) | ||
+pkg_check_modules(usockets REQUIRED IMPORTED_TARGET usockets) | ||
+pkg_check_modules(curl REQUIRED IMPORTED_TARGET libcurl) | ||
+find_package(jwt-cpp REQUIRED) | ||
+find_package(sol2 REQUIRED) | ||
+find_package(antlr4-runtime REQUIRED) | ||
+find_package(PkgConfig REQUIRED) | ||
+pkg_check_modules(usockets REQUIRED IMPORTED_TARGET usockets) | ||
+pkg_check_modules(curl REQUIRED IMPORTED_TARGET libcurl) | ||
|
||
add_custom_command( | ||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.cpp | ||
@@ -65,38 +63,6 @@ add_custom_command( | ||
@@ -61,38 +56,6 @@ add_custom_command( | ||
COMMAND ${CMAKE_COMMAND} -P | ||
${CMAKE_CURRENT_SOURCE_DIR}/cmake/FileEmbed.cmake) | ||
|
||
|
@@ -112,7 +91,7 @@ index 6afe703..c208814 100644 | |
add_library( | ||
${PROJECT_NAME}_utils | ||
STATIC | ||
@@ -238,7 +204,7 @@ target_include_directories( | ||
@@ -234,7 +197,7 @@ target_include_directories( | ||
${LUA_INCLUDE_DIR} | ||
vendor/croncpp/include | ||
vendor/nlohmann-json/include | ||
|
@@ -121,7 +100,7 @@ index 6afe703..c208814 100644 | |
) | ||
|
||
target_link_libraries( | ||
@@ -248,16 +214,17 @@ target_link_libraries( | ||
@@ -244,16 +207,17 @@ target_link_libraries( | ||
${PROJECT_NAME}_utils | ||
|
||
Boost::boost Boost::log Boost::program_options | ||
|
@@ -141,15 +120,15 @@ index 6afe703..c208814 100644 | |
-lcrypto | ||
-lssl | ||
-lgit2 | ||
@@ -271,5 +238,5 @@ add_executable( | ||
@@ -268,5 +232,5 @@ add_executable( | ||
target_link_libraries( | ||
${PROJECT_NAME} | ||
${PROJECT_NAME}_core | ||
- uSockets | ||
+ PkgConfig::usockets | ||
) | ||
diff --git a/src/http/handler.hpp b/src/http/handler.hpp | ||
index e6ef4cd..a51f03b 100644 | ||
index e6ef4cd..2019df4 100644 | ||
--- a/src/http/handler.hpp | ||
+++ b/src/http/handler.hpp | ||
@@ -2,7 +2,7 @@ | ||
|
@@ -162,4 +141,5 @@ index e6ef4cd..a51f03b 100644 | |
namespace porla::Http | ||
{ | ||
-- | ||
2.47.0 | ||
2.47.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
# Maintainer: txtsd <[email protected]> | ||
|
||
pkgname=porla | ||
pkgver=0.40.0 | ||
pkgrel=2 | ||
pkgver=0.41.0 | ||
pkgrel=1 | ||
pkgdesc='A high performance BitTorrent client for servers and seedboxes' | ||
arch=(x86_64 aarch64) | ||
url='https://porla.org' | ||
|
@@ -50,8 +50,8 @@ source=( | |
porla.sysusers | ||
porla.tmpfiles | ||
) | ||
sha256sums=('dd4e215c72822fe5fbaa212f87ccaebaba54281ccf9f6cc4f0ce51ee173401ad' | ||
'faf57e78eb2de9ae96aa7b66565fb9fa42f7fc66f57d44e0cd21a8ac7a6ed55b' | ||
sha256sums=('c91a513051e0b64b0d4fb5b8202093d3a6ae70baa4155d28f6c521eb095aabb7' | ||
'e95284505f6219cd43f5f7c53fabc040102656ca9a80de7d954890cbe3fa3d20' | ||
'fa1962c158eae8f47b99cf6e2c0403c1f2e00c430e15f33780b9b91123c6637f' | ||
'277760130b9c35ca5d009be5b3838fdccc7cc89d19392afea54322b91c3a9f08' | ||
'a1d0aed79d00d65c1a1dee38249adf0e94091f36b838bb31d734ce6d3d152baf' | ||
|