Hello community, here is the log from the commit of package leechcraft for openSUSE:Factory checked in at 2016-07-15 12:54:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/leechcraft (Old) and /work/SRC/openSUSE:Factory/.leechcraft.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "leechcraft" Changes: -------- --- /work/SRC/openSUSE:Factory/leechcraft/leechcraft.changes 2016-06-19 10:49:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.leechcraft.new/leechcraft.changes 2016-07-15 12:54:15.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Jul 4 19:51:29 UTC 2016 - [email protected] + +- Updated leechcraft-0.6.70-6645-gcd10d7e-torrent110.diff & added + BOOST_ASIO_HAS_STD_CHRONO vs. bittorrent initialization failure. +- Cmake clean-up. +- Man pages clean-up. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ leechcraft.spec ++++++ --- /var/tmp/diff_new_pack.vQlvWG/_old 2016-07-15 12:54:17.000000000 +0200 +++ /var/tmp/diff_new_pack.vQlvWG/_new 2016-07-15 12:54:17.000000000 +0200 @@ -69,7 +69,7 @@ %else BuildRequires: boost-devel >= 1.50 %endif -BuildRequires: cmake > 2.8.10 +BuildRequires: cmake >= 3 BuildRequires: fdupes BuildRequires: file-devel %if %{use_cpp14} @@ -2421,11 +2421,6 @@ %build mkdir build && cd build -%if 0%{suse_version} <= 1320 -export CC=/usr/bin/clang -export CXX=/usr/bin/clang++ -%endif - # bypass bug 927268 for PowerPC if clang is used above in place of gcc tmpflags="%{optflags}" %ifarch ppc64 ppc64le @@ -2434,6 +2429,7 @@ %endif %endif +# NOTE that %%cmake macro breaks compiler configuring. cmake ../src \ %if "%{_lib}" == "lib64" -DLIB_SUFFIX=64 \ @@ -2441,9 +2437,13 @@ %if %{use_cpp14} -DUSE_CPP14=True \ %endif - -DCMAKE_CXX_FLAGS="${tmpflags} -Doverride=" \ + -DCMAKE_CXX_FLAGS="${tmpflags} -Doverride= -DBOOST_ASIO_HAS_STD_CHRONO" \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ +%if 0%{?suse_version} <= 1320 + -DCMAKE_C_COMPILER=/usr/bin/clang \ + -DCMAKE_CXX_COMPILER=/usr/bin/clang++ \ +%endif -DSTRICT_LICENSING=True \ -DWITH_DBUS_LOADERS=True \ -DWITH_PCRE=True \ @@ -2552,7 +2552,6 @@ -DENABLE_SB2=True \ -DENABLE_SCROBLIBRE=True \ -DENABLE_SECMAN=True \ - -DENABLE_SHAITAN=False \ -DENABLE_SHELLOPEN=False \ -DENABLE_SNAILS=False \ -DENABLE_SYNCER=False \ @@ -2573,20 +2572,18 @@ -DENABLE_XPROXY=False \ %endif -DENABLE_ZALIL=True \ - -DLEECHCRAFT_VERSION=%{LEECHCRAFT_VERSION} + -DLEECHCRAFT_VERSION="%{LEECHCRAFT_VERSION} with bittorrent 0.6.70-7122-g83dc80a" make -k %{?_smp_mflags} VERBOSE=1 %install -cd build -%makeinstall +%cmake_install # Unneeded here Qt5 build' files: rm -rf %{buildroot}%{_datadir}/leechcraft/qml5 rm -rf %{buildroot}%{_datadir}/applications/%{name}*qt5.desktop -gzip -c9 %{SOURCE8} | tee -a %{buildroot}%{_mandir}/man1/leechcraft-session.1.gz -gzip -c9 %{SOURCE9} | tee -a %{buildroot}%{_mandir}/man1/lc_plugin_wrapper.1.gz +cp %{SOURCE8} %{SOURCE9} %{buildroot}%{_mandir}/man1 %fdupes -s %{buildroot}%{_datadir}/%{name}/translations %fdupes -s %{buildroot}%{_datadir}/%{name}/azoth @@ -2691,13 +2688,13 @@ %defattr(-,root,root) %doc CHANGELOG LICENSE README %{_bindir}/%{name} -%{_mandir}/man1/%{name}.1.gz +%{_mandir}/man1/%{name}.1.* %{_bindir}/%{name}-add-file -%{_mandir}/man1/%{name}-add-file.1.gz +%{_mandir}/man1/%{name}-add-file.1.* %{_bindir}/%{name}-handle-file -%{_mandir}/man1/%{name}-handle-file.1.gz +%{_mandir}/man1/%{name}-handle-file.1.* %{_bindir}/lc_plugin_wrapper -%{_mandir}/man1/lc_plugin_wrapper.1.gz +%{_mandir}/man1/lc_plugin_wrapper.1.* %{settings_dir}/coresettings.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/*/* @@ -3064,7 +3061,7 @@ %{plugin_dir}/*craft_fenet.so %{settings_dir}/fenetsettings.xml %{_bindir}/%{name}-session -%{_mandir}/man1/*-session.1.gz +%{_mandir}/man1/*-session.1.* %dir %{_datadir}/leechcraft/fenet %dir %{_datadir}/leechcraft/fenet/compositing %dir %{_datadir}/leechcraft/fenet/wms ++++++ leechcraft-0.6.70-6645-gcd10d7e-torrent110.diff ++++++ --- /var/tmp/diff_new_pack.vQlvWG/_old 2016-07-15 12:54:17.000000000 +0200 +++ /var/tmp/diff_new_pack.vQlvWG/_new 2016-07-15 12:54:17.000000000 +0200 @@ -849,3 +849,67 @@ #else QTime Announce2Time (const boost::posix_time::time_duration& announce) +commit f36242163844e9e1d8b722ea0cf3b4d82def9269 +Author: 0xd34df00d <[email protected]> +Date: Thu Jun 30 03:45:41 2016 +0100 + + [BT] Don't define BOOST_ASIO_DYN_LINK. + + Seems to fix defining some asio symbols with libtorrent 1.1.0. + +diff --git a/src/plugins/bittorrent/CMakeLists.txt b/src/plugins/bittorrent/CMakeLists.txt +index 3ebef80..d75d260 100644 +--- a/src/plugins/bittorrent/CMakeLists.txt ++++ b/src/plugins/bittorrent/CMakeLists.txt +@@ -127,10 +127,6 @@ if (UNIX) + ) + message (STATUS "BitTorrent: fetched flags for version ${RB_LT_VERSION}: ${RB_LT_CFLAGS}") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RB_LT_CFLAGS}") +- +- if (RB_LT_VERSION VERSION_GREATER 0.15.9999) +- add_definitions (-DBOOST_ASIO_DYN_LINK) +- endif () + endif () + + if (WIN32) +commit 83dc80a1d238a0fb9d305f509eb4ba687e06a0ac +Author: 0xd34df00d <[email protected]> +Date: Thu Jun 30 03:51:53 2016 +0100 + + [BT] Set empty IP filter after initializing the session. + + Seems to fix a crash with libtorrent 1.1.0. + +diff --git a/src/plugins/bittorrent/core.cpp b/src/plugins/bittorrent/core.cpp +index ecb6b75..1ce65a2 100644 +--- a/src/plugins/bittorrent/core.cpp ++++ b/src/plugins/bittorrent/core.cpp +@@ -188,6 +188,7 @@ namespace BitTorrent + ver.at (2).digitValue (), + ver.at (3).digitValue ()), + 0); ++ Session_->set_ip_filter ({}); + + SessionSettingsMgr_ = new SessionSettingsManager { Session_, Proxy_, this }; + +diff --git a/src/plugins/bittorrent/CMakeLists.txt b/src/plugins/bittorrent/CMakeLists.txt +index d75d260..d522a7c 100644 +--- a/src/plugins/bittorrent/CMakeLists.txt ++++ b/src/plugins/bittorrent/CMakeLists.txt +@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 2.8) + project (leechcraft_bittorrent) + include (InitLCPlugin OPTIONAL) + +-find_package (Boost REQUIRED COMPONENTS date_time filesystem system thread) ++find_package (Boost REQUIRED COMPONENTS chrono date_time filesystem system thread) + + set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + +@@ -161,6 +161,7 @@ target_link_libraries (leechcraft_bittorrent + ${Boost_THREAD_LIBRARY} + ${Boost_DATE_TIME_LIBRARY} + ${Boost_FILESYSTEM_LIBRARY} ++ ${Boost_CHRONO_LIBRARY} + ${QT_LIBRARIES} + ${RBTorrent_LIBRARY} + ${LEECHCRAFT_LIBRARIES}
