Hello community, here is the log from the commit of package leechcraft for openSUSE:Factory checked in at 2020-06-02 14:39:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/leechcraft (Old) and /work/SRC/openSUSE:Factory/.leechcraft.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "leechcraft" Tue Jun 2 14:39:06 2020 rev:59 rq:810479 version:0.6.70+git.13907.g785196c688 Changes: -------- --- /work/SRC/openSUSE:Factory/leechcraft/leechcraft-doc.changes 2020-05-13 22:55:51.590982963 +0200 +++ /work/SRC/openSUSE:Factory/.leechcraft.new.3606/leechcraft-doc.changes 2020-06-02 14:39:58.183773760 +0200 @@ -1,0 +2,6 @@ +Thu May 21 12:25:32 UTC 2020 - Dmitriy Perlow <dap.darkn...@gmail.com> + +- Updated to 0.6.70-13907-g785196c688 snapshot: + * Current source-url provides 0.6.70-13870-ga08049301b. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/leechcraft/leechcraft.changes 2020-05-13 22:55:51.630983042 +0200 +++ /work/SRC/openSUSE:Factory/.leechcraft.new.3606/leechcraft.changes 2020-06-02 14:39:58.699775391 +0200 @@ -1,0 +2,12 @@ +Thu May 21 12:25:32 UTC 2020 - Dmitriy Perlow <dap.darkn...@gmail.com> + +- Updated to 0.6.70-13907-g785196c688 snapshot: + * Current source-url provides 0.6.70-13870-ga08049301b. + * Pkgconfig for XCB, X11, udev, libguess, taglib, libmtp, + libprojectM, qtermwidget (doesn't work for Leap, so patched back), + pcre, libtorrent, maxminddb, libpurple, qca2, qxmpp, tox. + * Added leechcraft-Qt5_12.patch to save Qt 5.12 compatibility. + * Added leechcraft-qtermwidget-Leap-15_2.patch for Leap 15.2. + * Unembed some resources. + +------------------------------------------------------------------- Old: ---- leechcraft-0.6.70-13729-g7046a9d2a7.tar.xz New: ---- leechcraft-0.6.70-13907-g785196c688.tar.xz leechcraft-Qt5_12.patch leechcraft-qtermwidget-Leap-15_2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ leechcraft-doc.spec ++++++ --- /var/tmp/diff_new_pack.TW82dI/_old 2020-06-02 14:39:59.683778502 +0200 +++ /var/tmp/diff_new_pack.TW82dI/_new 2020-06-02 14:39:59.687778514 +0200 @@ -16,16 +16,16 @@ # -%define LEECHCRAFT_VERSION 0.6.70-13729-g7046a9d2a7 +%define LEECHCRAFT_VERSION 0.6.70-13907-g785196c688 Name: leechcraft-doc -Version: 0.6.70+git.13729.g7046a9d2a7 +Version: 0.6.70+git.13907.g785196c688 Release: 0 Summary: Modular Internet Client Documentation License: BSL-1.0 Group: Development/Libraries/Other URL: http://leechcraft.org -Source0: https://dist.leechcraft.org/LeechCraft/0.6.75/leechcraft-%{LEECHCRAFT_VERSION}.tar.xz +Source0: leechcraft-%{LEECHCRAFT_VERSION}.tar.xz BuildRequires: doxygen >= 1.8.3.1 BuildRequires: fdupes ++++++ leechcraft.spec ++++++ --- /var/tmp/diff_new_pack.TW82dI/_old 2020-06-02 14:39:59.707778578 +0200 +++ /var/tmp/diff_new_pack.TW82dI/_new 2020-06-02 14:39:59.711778590 +0200 @@ -24,7 +24,7 @@ %define qml_dir %{_datadir}/leechcraft/qml5 %define so_ver -qt5-0_6_75 -%define LEECHCRAFT_VERSION 0.6.70-13729-g7046a9d2a7 +%define LEECHCRAFT_VERSION 0.6.70-13907-g785196c688 %define db_postfix %{so_ver}_1 %define gui_postfix %{so_ver}_1 @@ -43,18 +43,23 @@ %define xsd_postfix %{so_ver} Name: leechcraft -Version: 0.6.70+git.13729.g7046a9d2a7 +Version: 0.6.70+git.13907.g785196c688 Release: 0 Summary: Modular Internet Client License: BSL-1.0 Group: Productivity/Networking/Other URL: http://leechcraft.org -Source0: https://dist.leechcraft.org/LeechCraft/0.6.75/leechcraft-%{LEECHCRAFT_VERSION}.tar.xz +Source0: leechcraft-%{LEECHCRAFT_VERSION}.tar.xz Source4: %{name}-rpmlintrc Source8: leechcraft-session.1 Source9: lc_plugin_wrapper-qt5.1 +# PATCH-FIX-OPENSUSE to save Qt 5.12 (i.e. Leap 15.2) compatibility. +Patch0: leechcraft-Qt5_12.patch +# PATCH-FIX-OPENSUSE vs. Leap 15.2 qtermwidget' pkgconfig issue. +Patch1: leechcraft-qtermwidget-Leap-15_2.patch + BuildRequires: cmake >= 3.8 BuildRequires: fdupes BuildRequires: file-devel @@ -162,6 +167,7 @@ BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(xscrnsaver) BuildConflicts: gstreamer-0_10-devel BuildConflicts: gstreamer-0_10-plugins-base-devel @@ -2251,6 +2257,10 @@ %prep %setup -q -n leechcraft-%{LEECHCRAFT_VERSION} +%if 0%{?sle_version} <= 150300 && 0%{?suse_version} < 1550 +%patch0 -p1 +%patch1 -p1 +%endif #removing non-free icons rm -rf src/plugins/azoth/share/azoth/iconsets/clients/default @@ -2630,6 +2640,7 @@ %files azoth-embedmedia %defattr(-,root,root) %{plugin_dir}/*craft_azoth_embedmedia.so +%{_datadir}/leechcraft/azoth/embedmedia %files azoth-herbicide %defattr(-,root,root) @@ -2686,6 +2697,7 @@ %{plugin_dir}/*craft_azoth_murm.so %{translations_dir}/*craft_azoth_murm*.qm %{settings_dir}/azothmurmsettings.xml +%{_datadir}/leechcraft/azoth/murm %files azoth-nativeemoticons %defattr(-,root,root) ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.TW82dI/_old 2020-06-02 14:39:59.735778666 +0200 +++ /var/tmp/diff_new_pack.TW82dI/_new 2020-06-02 14:39:59.735778666 +0200 @@ -5,7 +5,7 @@ <size unit="G">3</size> </physicalmemory> <disk> - <size unit="G">5</size> + <size unit="G">9</size> </disk> </hardware> </constraints> ++++++ _service ++++++ --- /var/tmp/diff_new_pack.TW82dI/_old 2020-06-02 14:39:59.751778716 +0200 +++ /var/tmp/diff_new_pack.TW82dI/_new 2020-06-02 14:39:59.751778716 +0200 @@ -1,7 +1,7 @@ <services> <service name="verify_file" mode="buildtime"> - <param name="file">leechcraft-0.6.70-13729-g7046a9d2a7.tar.xz</param> + <param name="file">leechcraft-0.6.70-13907-g785196c688.tar.xz</param> <param name="verifier">sha1</param> - <param name="checksum">9bb780d3560ffef69ad3aa8740720ffe65782b6a</param> + <param name="checksum">1f5b6f0c4e39a9c964f3bfd3b62190f2485581f4</param> </service> </services> ++++++ leechcraft-0.6.70-13729-g7046a9d2a7.tar.xz -> leechcraft-0.6.70-13907-g785196c688.tar.xz ++++++ ++++ 44414 lines of diff (skipped) ++++++ leechcraft-Qt5_12.patch ++++++ commit 5131562d2624a9abc1ba6d99052d0a4d7ba1927e Author: Dmitriy A. Perlow <dap.darkn...@gmail.com> Date: Fri May 22 14:34:59 2020 +0300 Revert "[CertMgr] Drop Qt <5.13" This reverts commit aa33ce39533072bee93a16af9800c28ad6c06df1. diff --git a/src/plugins/certmgr/certsmodel.cpp b/src/plugins/certmgr/certsmodel.cpp index 9bfb9f73ad..13f11c2b7a 100644 --- a/src/plugins/certmgr/certsmodel.cpp +++ b/src/plugins/certmgr/certsmodel.cpp @@ -153,9 +153,11 @@ namespace CertMgr case QSsl::EmailEntry: name = CertsModel::tr ("Email"); break; +#if QT_VERSION >= QT_VERSION_CHECK (5, 13, 0) case QSsl::IpAddressEntry: name = CertsModel::tr ("IP address"); break; +#endif } add (name, QStringList { subjs.values (key) }.join ("; ")); commit 47e508aaa72493916d8c9a96d0cdf7db739d308f Author: Dmitriy A. Perlow <dap.darkn...@gmail.com> Date: Sat May 23 22:03:12 2020 +0300 Revert "[Overall] Enable full compression for resources" This reverts commit f2f43347ed0f75dd02de713eb7ae7e0dfa3f4098. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6fdd88b0bf..b3113b30c2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -134,7 +134,7 @@ endmacro () macro (QtAddResources outfiles) set (RCCS) - QT5_ADD_RESOURCES (RCCS ${ARGN} OPTIONS -compress-algo best -threshold 0) + QT5_ADD_RESOURCES (RCCS ${ARGN}) set (${outfiles} ${${outfiles}} ${RCCS}) endmacro () diff --git a/src/FindLeechCraft.cmake.in b/src/FindLeechCraft.cmake.in index bf27f097f6..4ede894c6c 100644 --- a/src/FindLeechCraft.cmake.in +++ b/src/FindLeechCraft.cmake.in @@ -32,7 +32,7 @@ endmacro () macro (QtAddResources outfiles) set (RCCS) - QT5_ADD_RESOURCES (RCCS ${ARGN} OPTIONS -compress-algo best -threshold 0) + QT5_ADD_RESOURCES (RCCS ${ARGN}) set (${outfiles} ${${outfiles}} ${RCCS}) endmacro () ++++++ leechcraft-qtermwidget-Leap-15_2.patch ++++++ commit 3fe556e3be29327288895fdc02059121a3bb2ad2 Author: Dmitriy A. Perlow <dap.darkn...@gmail.com> Date: Sat May 23 12:59:22 2020 +0300 Revert "[ER] Use pkgconfig to find qtermwidget" This reverts commit 171e73df165e747b4bc453604adbb87c386f1a13. diff --git a/src/plugins/eleeminator/CMakeLists.txt b/src/plugins/eleeminator/CMakeLists.txt index b46094c45f..e59452f69d 100644 --- a/src/plugins/eleeminator/CMakeLists.txt +++ b/src/plugins/eleeminator/CMakeLists.txt @@ -2,12 +2,13 @@ cmake_minimum_required (VERSION 3.3) project (leechcraft_eleeminator) include (InitLCPlugin NO_POLICY_SCOPE) -find_package (PkgConfig) -pkg_check_modules (QTermWidget REQUIRED IMPORTED_TARGET qtermwidget5) +set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +find_package (QTermWidget REQUIRED) include_directories ( ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIR} + ${QTERMWIDGET_INCLUDE_DIR} ${LEECHCRAFT_INCLUDE_DIR} ) set (SRCS @@ -36,7 +37,7 @@ add_library (leechcraft_eleeminator SHARED ) target_link_libraries (leechcraft_eleeminator ${LEECHCRAFT_LIBRARIES} - PkgConfig::QTermWidget + ${QTERMWIDGET_LIBRARIES} ) install (TARGETS leechcraft_eleeminator DESTINATION ${LC_PLUGINS_DEST}) install (FILES eleeminatorsettings.xml DESTINATION ${LC_SETTINGS_DEST}) diff --git a/src/plugins/eleeminator/cmake/FindQTermWidget.cmake b/src/plugins/eleeminator/cmake/FindQTermWidget.cmake new file mode 100644 index 0000000000..9efc79e6dc --- /dev/null +++ b/src/plugins/eleeminator/cmake/FindQTermWidget.cmake @@ -0,0 +1,36 @@ +find_path(QTERMWIDGET_INCLUDE_DIR qtermwidget.h + PATHS + ${QTERMWIDGET_PATH_INCLUDES}/ + /usr/include/ + /usr/local/include/ + /usr/local/include/ + /opt/local/include/ + PATH_SUFFIXES + qtermwidget5 + ) + +find_library(QTERMWIDGET_LIBRARIES + NAMES + qtermwidget5 + qtermwidget + PATHS + ${QTERMWIDGET_PATH_LIB} + /usr/lib/ + /usr/lib64/ + /usr/local/lib/ + /usr/local/lib64/ + /opt/local/lib/ + ) + +if (QTERMWIDGET_LIBRARIES AND QTERMWIDGET_INCLUDE_DIR) + set (QTERMWIDGET_FOUND TRUE) +endif () + +message (STATUS "Found QTermWidget includes at ${QTERMWIDGET_INCLUDE_DIR}") +message (STATUS "Found QTermWidget libraries at ${QTERMWIDGET_LIBRARIES}") + +if (NOT QTERMWIDGET_FOUND) + if (QTermWidget_FIND_REQUIRED) + message (FATAL_ERROR "Could not find QTermWidget library") + endif () +endif ()
