diff options
Diffstat (limited to 'x11/leechcraft/files')
10 files changed, 0 insertions, 217 deletions
diff --git a/x11/leechcraft/files/patch-5c29ae8130.diff b/x11/leechcraft/files/patch-5c29ae8130.diff deleted file mode 100644 index 6ebed7db0951..000000000000 --- a/x11/leechcraft/files/patch-5c29ae8130.diff +++ /dev/null @@ -1,65 +0,0 @@ ---- plugins/bittorrent/core.h.orig 2014-07-28 18:35:44 UTC -+++ plugins/bittorrent/core.h -@@ -271,7 +271,7 @@ namespace BitTorrent - const QVector<bool>& files = QVector<bool> (), - LeechCraft::TaskParameters params = LeechCraft::NoParameters); - void KillTask (int); -- void RemoveTorrent (int, int opt = libtorrent::session::none); -+ void RemoveTorrent (int, int opt = 0); - void PauseTorrent (int); - void ResumeTorrent (int); - void ForceReannounce (int); ---- plugins/bittorrent/core.cpp.orig 2014-07-28 18:35:44 UTC -+++ plugins/bittorrent/core.cpp -@@ -230,9 +230,11 @@ namespace BitTorrent - setLoggingSettings (); - tcpPortRangeChanged (); - -+#if LIBTORRENT_VERSION_NUM < 010000 - if (XmlSettingsManager::Instance ()-> - property ("EnableMetadata").toBool ()) - Session_->add_extension (&libtorrent::create_metadata_plugin); -+#endif - if (XmlSettingsManager::Instance ()-> - property ("EnablePEX").toBool ()) - Session_->add_extension (&libtorrent::create_ut_pex_plugin); -@@ -1932,10 +1934,17 @@ namespace BitTorrent - atp.paused = pause; - atp.duplicate_is_error = true; - #endif -+ -+#if LIBTORRENT_VERSION_NUM >= 010000 -+ std::copy (resumeData.constData (), -+ resumeData.constData () + resumeData.size (), -+ std::back_inserter (atp.resume_data)); -+#else - atp.resume_data = new std::vector<char>; - std::copy (resumeData.constData (), - resumeData.constData () + resumeData.size (), - std::back_inserter (*atp.resume_data)); -+#endif - - handle = Session_->add_torrent (atp); - if (XmlSettingsManager::Instance ()->property ("ResolveCountries").toBool ()) ---- plugins/bittorrent/torrentplugin.cpp.orig 2014-07-28 18:35:44 UTC -+++ plugins/bittorrent/torrentplugin.cpp -@@ -555,7 +555,7 @@ namespace LeechCraft - - confirm.exec (); - -- int roptions = libtorrent::session::none; -+ int roptions = 0; - if (confirm.clickedButton () == deleteTorrentsAndFilesButton) - roptions |= libtorrent::session::delete_files; - else if (confirm.clickedButton () == deleteTorrentsButton) ---- plugins/bittorrent/torrenttab.cpp.orig 2014-07-28 18:35:44 UTC -+++ plugins/bittorrent/torrenttab.cpp -@@ -450,7 +450,7 @@ namespace BitTorrent - - confirm.exec (); - -- int roptions = libtorrent::session::none; -+ int roptions = 0; - if (confirm.clickedButton () == deleteTorrentsAndFilesButton) - roptions |= libtorrent::session::delete_files; - else if (confirm.clickedButton () == deleteTorrentsButton) diff --git a/x11/leechcraft/files/patch-CMakeLists.txt b/x11/leechcraft/files/patch-CMakeLists.txt deleted file mode 100644 index b424dd368899..000000000000 --- a/x11/leechcraft/files/patch-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- CMakeLists.txt.orig 2014-07-28 18:35:44 UTC -+++ CMakeLists.txt -@@ -40,7 +40,6 @@ if (UNIX OR (WIN32 AND MINGW)) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQ_COMPILER_VARIADIC_TEMPLATES -DQ_COMPILER_AUTO_TYPE -DQ_COMPILER_EXTERN_TEMPLATES -DQ_COMPILER_DEFAULT_DELETE_MEMBERS -DQ_COMPILER_CLASS_ENUM -DQ_COMPILER_INITIALIZER_LISTS") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQ_COMPILER_LAMBDA -DQ_COMPILER_UNICODE_STRINGS") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQ_COMPILER_CONSTEXPR -DQ_COMPILER_AUTO_FUNCTION") -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register") - endif () - endif () - diff --git a/x11/leechcraft/files/patch-cmake_FindQwt.cmake b/x11/leechcraft/files/patch-cmake_FindQwt.cmake deleted file mode 100644 index a21842fa077b..000000000000 --- a/x11/leechcraft/files/patch-cmake_FindQwt.cmake +++ /dev/null @@ -1,18 +0,0 @@ ---- cmake/FindQwt.cmake.orig 2018-03-09 18:41:44 UTC -+++ cmake/FindQwt.cmake -@@ -6,6 +6,7 @@ - find_path (QWT_INCLUDE_DIRS - NAMES qwt_plot.h - PATHS -+ %%QT_INCDIR%%/qwt6 - /usr/local/include/qwt-qt4 - /usr/local/include/qwt6 - /usr/local/include/qwt -@@ -18,6 +19,7 @@ find_path (QWT_INCLUDE_DIRS - find_library (QWT_LIBRARIES - NAMES qwt-qt4 qwt6 qwt - PATHS -+ %%QT_LIBDIR%% - /usr/local/lib - /usr/lib - /usr/local/lib/qwt.framework diff --git a/x11/leechcraft/files/patch-plugins__lmp__plugins__fradj__eqbandwidget.cpp b/x11/leechcraft/files/patch-plugins__lmp__plugins__fradj__eqbandwidget.cpp deleted file mode 100644 index 54c437147d86..000000000000 --- a/x11/leechcraft/files/patch-plugins__lmp__plugins__fradj__eqbandwidget.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/lmp/plugins/fradj/eqbandwidget.cpp.orig 2014-07-28 18:35:44 UTC -+++ plugins/lmp/plugins/fradj/eqbandwidget.cpp -@@ -98,7 +98,7 @@ namespace Fradj - this, - SLOT (setGainBoxValue (int))); - -- Ui_.GainSlider_->setValue (std::round (value * SliderPrecision)); -+ Ui_.GainSlider_->setValue (round (value * SliderPrecision)); - - connect (Ui_.GainSlider_, - SIGNAL (valueChanged (int)), diff --git a/x11/leechcraft/files/patch-plugins_azoth_plugins_otroid_otrhandler.cpp b/x11/leechcraft/files/patch-plugins_azoth_plugins_otroid_otrhandler.cpp deleted file mode 100644 index f57c9a8bf2da..000000000000 --- a/x11/leechcraft/files/patch-plugins_azoth_plugins_otroid_otrhandler.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/azoth/plugins/otroid/otrhandler.cpp.orig 2014-07-28 20:35:44.000000000 +0200 -+++ plugins/azoth/plugins/otroid/otrhandler.cpp 2016-01-26 13:30:45.499740000 +0100 -@@ -510,7 +510,7 @@ namespace OTRoid - auto list = proxy->GetReturnValue ().toList (); - - const auto& actionsStruct = Entry2Action_.value (entry); -- const auto actions -+ const auto actions = - { - actionsStruct.ToggleOtr_.get (), - actionsStruct.ToggleOtrCtx_.get (), diff --git a/x11/leechcraft/files/patch-plugins_lmp_cmake_FindTaglib.cmake b/x11/leechcraft/files/patch-plugins_lmp_cmake_FindTaglib.cmake deleted file mode 100644 index 430ec0790868..000000000000 --- a/x11/leechcraft/files/patch-plugins_lmp_cmake_FindTaglib.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/lmp/cmake/FindTaglib.cmake.orig 2016-01-03 16:39:26 UTC -+++ plugins/lmp/cmake/FindTaglib.cmake -@@ -29,7 +29,7 @@ if(TAGLIBCONFIG_EXECUTABLE) - - exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) - -- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") -+ if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") - message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") - set(TAGLIB_FOUND FALSE) - else() diff --git a/x11/leechcraft/files/patch-plugins_musiczombie_chroma.cpp b/x11/leechcraft/files/patch-plugins_musiczombie_chroma.cpp deleted file mode 100644 index baba8f202aed..000000000000 --- a/x11/leechcraft/files/patch-plugins_musiczombie_chroma.cpp +++ /dev/null @@ -1,50 +0,0 @@ -https://github.com/0xd34df00d/leechcraft/commit/307be1dd37059e49eca37f77ddc4806125a8f843 -https://github.com/0xd34df00d/leechcraft/commit/53d56cafd3a1d299601d9f3bfd4ee051ae9121ba -https://github.com/0xd34df00d/leechcraft/commit/875e3b43b7a91656f61180b2b2179137f18e6d71 -https://github.com/0xd34df00d/leechcraft/commit/14f5f8823ec7b23fdb4409f4f689e565d8995536 - ---- plugins/musiczombie/chroma.cpp.orig 2014-07-28 18:35:44 UTC -+++ plugins/musiczombie/chroma.cpp -@@ -38,7 +38,6 @@ extern "C" - { - #include <libavcodec/avcodec.h> - #include <libavformat/avformat.h> --#include <libavutil/audioconvert.h> - #include <libavutil/samplefmt.h> - #include <libavutil/opt.h> - #include <libswresample/swresample.h> -@@ -122,8 +121,8 @@ namespace MusicZombie - auto remaining = maxLength * codecCtx->channels * codecCtx->sample_rate; - chromaprint_start (Ctx_, codecCtx->sample_rate, codecCtx->channels); - -- std::shared_ptr<AVFrame> frame (avcodec_alloc_frame (), -- [] (AVFrame *frame) { avcodec_free_frame (&frame); }); -+ std::shared_ptr<AVFrame> frame (av_frame_alloc (), -+ [] (AVFrame *frame) { av_frame_free (&frame); }); - auto maxDstNbSamples = 0; - - uint8_t *dstData [1] = { nullptr }; -@@ -140,7 +139,7 @@ namespace MusicZombie - if (packet.stream_index != streamIndex) - continue; - -- avcodec_get_frame_defaults (frame.get ()); -+ av_frame_unref (frame.get ()); - int gotFrame = false; - auto consumed = avcodec_decode_audio4 (codecCtx.get (), frame.get (), &gotFrame, &packet); - -@@ -168,7 +167,13 @@ namespace MusicZombie - data = frame->data; - - auto length = std::min (remaining, frame->nb_samples * codecCtx->channels); -- if (!chromaprint_feed (Ctx_, data [0], length)) -+ if (!chromaprint_feed (Ctx_, -+#if CHROMAPRINT_VERSION_MAJOR > 1 || CHROMAPRINT_VERSION_MINOR >= 4 -+ reinterpret_cast<const int16_t*> (data [0]), -+#else -+ data [0], -+#endif -+ length)) - throw std::runtime_error ("cannot feed data"); - - bool finished = false; diff --git a/x11/leechcraft/files/patch-plugins_rosenthal_cmake_FindHunspell.cmake b/x11/leechcraft/files/patch-plugins_rosenthal_cmake_FindHunspell.cmake deleted file mode 100644 index b4acf41470c8..000000000000 --- a/x11/leechcraft/files/patch-plugins_rosenthal_cmake_FindHunspell.cmake +++ /dev/null @@ -1,12 +0,0 @@ ---- plugins/rosenthal/cmake/FindHunspell.cmake.orig 2014-07-28 18:35:44 UTC -+++ plugins/rosenthal/cmake/FindHunspell.cmake -@@ -28,7 +28,8 @@ if (WIN32) - ${HUNSPELL_DIR}/src/win_api/Release_dll/libhunspell) - endif () - --find_library (HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2 libhunspell HINTS ${HUNSPELL_DIR} ${PROBE_DIR}) -+find_library (HUNSPELL_LIBRARIES NAMES hunspell-1.7 hunspell-1.6 hunspell-1.5 hunspell-1.4 -+ hunspell-1.3 hunspell-1.2 libhunspell HINTS ${HUNSPELL_DIR} ${PROBE_DIR}) - find_path (HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx HINTS ${HUNSPELL_DIR} ${HUNSPELL_INCLUDE_WIN32}) - - # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if diff --git a/x11/leechcraft/files/patch-util_network_addresses.cpp b/x11/leechcraft/files/patch-util_network_addresses.cpp deleted file mode 100644 index 4c3ae0d99dc6..000000000000 --- a/x11/leechcraft/files/patch-util_network_addresses.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- util/network/addresses.cpp.orig 2014-07-28 20:35:44.000000000 +0200 -+++ util/network/addresses.cpp 2016-01-26 12:58:09.726934000 +0100 -@@ -38,7 +38,7 @@ namespace Util - AddrList_t GetLocalAddresses (int defaultPort) - { - AddrList_t defaultAddrs; -- const auto locals -+ const auto locals = - { - QHostAddress::parseSubnet ("10.0.0.0/8"), - QHostAddress::parseSubnet ("172.16.0.0/12"), diff --git a/x11/leechcraft/files/patch-util_xdg_xdg.cpp b/x11/leechcraft/files/patch-util_xdg_xdg.cpp deleted file mode 100644 index a12ff6a4f31b..000000000000 --- a/x11/leechcraft/files/patch-util_xdg_xdg.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- util/xdg/xdg.cpp.orig 2014-07-28 20:35:44.000000000 +0200 -+++ util/xdg/xdg.cpp 2016-01-26 13:01:00.517701000 +0100 -@@ -44,13 +44,13 @@ namespace XDG - - QPixmap GetAppPixmap (const QString& name) - { -- const auto prefixes -+ const auto prefixes = - { - "/usr/share/pixmaps/", - "/usr/local/share/pixmaps/" - }; - -- const auto sizes { "192", "128", "96", "72", "64", "48", "36", "32" }; -+ const auto sizes = { "192", "128", "96", "72", "64", "48", "36", "32" }; - const QStringList themes - { - "/usr/local/share/icons/hicolor/", |