Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libtorrent-rasterbar for openSUSE:Factory checked in at 2022-05-08 21:52:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libtorrent-rasterbar (Old) and /work/SRC/openSUSE:Factory/.libtorrent-rasterbar.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libtorrent-rasterbar" Sun May 8 21:52:57 2022 rev:83 rq:975630 version:2.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/libtorrent-rasterbar/libtorrent-rasterbar.changes 2022-04-21 15:49:28.380368431 +0200 +++ /work/SRC/openSUSE:Factory/.libtorrent-rasterbar.new.1538/libtorrent-rasterbar.changes 2022-05-08 21:53:14.759530586 +0200 @@ -1,0 +2,6 @@ +Sun May 8 11:44:19 UTC 2022 - Luigi Baldoni <aloi...@gmx.com> + +- Add libtorrent-rasterbar-2.0.6-fix_pkgconfig_creation.patch to + fix pkgconfig file properly + +------------------------------------------------------------------- New: ---- libtorrent-rasterbar-2.0.6-fix_pkgconfig_creation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtorrent-rasterbar.spec ++++++ --- /var/tmp/diff_new_pack.nu1O7a/_old 2022-05-08 21:53:15.271531234 +0200 +++ /var/tmp/diff_new_pack.nu1O7a/_new 2022-05-08 21:53:15.275531239 +0200 @@ -33,6 +33,8 @@ Group: Development/Libraries/C and C++ URL: https://libtorrent.org/ Source: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM libtorrent-rasterbar-2.0.6-fix_pkgconfig_creation.patch +Patch0: libtorrent-rasterbar-2.0.6-fix_pkgconfig_creation.patch BuildRequires: cmake >= 3.12.0 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -136,10 +138,6 @@ %fdupes %{buildroot}%{python3_sitearch} -# quick and dirty fix until upstream gh#arvidn/libtorrent#6830 is addressed -sed -e 's/\-l\-pthread/\-pthread/' \ - -i %{buildroot}%{_libdir}/pkgconfig/%{name}.pc - %if %{with tests} %check export LD_LIBRARY_PATH=$PWD/build ++++++ libtorrent-rasterbar-2.0.6-fix_pkgconfig_creation.patch ++++++ >From a5925cfc862923544d4d2b4dc5264836e2cd1030 Mon Sep 17 00:00:00 2001 From: Nick Korotysh <kolchaprogram...@list.ru> Date: Thu, 21 Apr 2022 01:02:32 +0300 Subject: [PATCH] fixed pkg-config file libraries list generation do not append '-l' to anything starting with '-' previously cmake-generated pkg-config file contained next line: Libs: -L${libdir} -ltorrent-rasterbar -l-pthread -lssl -lcrypto (note '-l' before '-pthread', even without space) the same line with this fix included is correct: Libs: -L${libdir} -ltorrent-rasterbar -pthread -lssl -lcrypto --- cmake/Modules/GeneratePkgConfig/generate-pkg-config.cmake.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/Modules/GeneratePkgConfig/generate-pkg-config.cmake.in b/cmake/Modules/GeneratePkgConfig/generate-pkg-config.cmake.in index d4cb81db69..6adea52ac5 100644 --- a/cmake/Modules/GeneratePkgConfig/generate-pkg-config.cmake.in +++ b/cmake/Modules/GeneratePkgConfig/generate-pkg-config.cmake.in @@ -37,7 +37,12 @@ function(split_library_dirs _libraries _base_library_dir _library_dirs_var _libr endfunction() split_library_dirs("${_TARGET_INTERFACE_LINK_LIBRARIES}" "${CMAKE_INSTALL_PREFIX}/${_INSTALL_LIBDIR}" _lib_dirs _library_names) +set(_linker_options "${_library_names}") +list(FILTER _linker_options INCLUDE REGEX "^-.*") +list(FILTER _library_names EXCLUDE REGEX "^-.*") cmake_list_to_pkg_config(_libs "${_library_names}" "-l") +list(JOIN _linker_options " " _linker_options) +string(JOIN " " _libs "${_linker_options}" "${_libs}") list(LENGTH _lib_dirs _additional_libdirs_count) if (_additional_libdirs_count GREATER 0) cmake_list_to_pkg_config(_additional_libdirs "${_lib_dirs}" "-L")