Compare commits
2 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 76ac2d11f8 | |||
| 6e8a2b5ec6 |
12
boost.patch
Normal file
12
boost.patch
Normal file
@@ -0,0 +1,12 @@
|
||||
diff -Nrua trojan-1.16.0.orig/CMakeLists.txt trojan-1.16.0/CMakeLists.txt
|
||||
--- trojan-1.16.0.orig/CMakeLists.txt 2020-06-10 06:09:18.000000000 +0200
|
||||
+++ trojan-1.16.0/CMakeLists.txt 2025-10-09 12:53:46.869236609 +0200
|
||||
@@ -36,7 +36,7 @@
|
||||
find_package(Threads REQUIRED)
|
||||
target_link_libraries(trojan ${CMAKE_THREAD_LIBS_INIT})
|
||||
|
||||
-find_package(Boost 1.66.0 REQUIRED COMPONENTS system program_options)
|
||||
+find_package(Boost 1.66.0 REQUIRED COMPONENTS program_options)
|
||||
include_directories(${Boost_INCLUDE_DIR})
|
||||
target_link_libraries(trojan ${Boost_LIBRARIES})
|
||||
if(MSVC)
|
||||
@@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 9 10:51:26 UTC 2025 - Ana Guerrero <ana.guerrero@suse.com>
|
||||
|
||||
- Remove BuildRequires on libboost_system-devel-impl,
|
||||
removed on boost 1.89 (bsc#1249599)
|
||||
* Add patch boost.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 28 19:55:26 UTC 2024 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package trojan
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -24,10 +24,10 @@ License: GPL-3.0-or-later
|
||||
Group: Productivity/Networking/Web/Proxy
|
||||
URL: https://github.com/trojan-gfw/trojan
|
||||
Source0: https://github.com/trojan-gfw/trojan/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0: boost.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libboost_program_options-devel-impl >= 1.66.0
|
||||
BuildRequires: libboost_system-devel-impl >= 1.66.0
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: pkgconfig(libmariadb)
|
||||
BuildRequires: pkgconfig(openssl)
|
||||
@@ -45,7 +45,7 @@ are the GreatER Fire; we ship Trojan Horses.
|
||||
%lang_package
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%autosetup -p1 -n %{name}-%{version}
|
||||
|
||||
%build
|
||||
%define build_args %{nil}
|
||||
|
||||
Reference in New Issue
Block a user