Hello community, here is the log from the commit of package leechcraft for openSUSE:Factory checked in at 2018-02-14 10:52:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/leechcraft (Old) and /work/SRC/openSUSE:Factory/.leechcraft.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "leechcraft" Wed Feb 14 10:52:28 2018 rev:48 rq:576390 version:0.6.70+git.10870.g558588d6ec Changes: -------- --- /work/SRC/openSUSE:Factory/leechcraft/leechcraft.changes 2018-01-25 12:41:33.911793455 +0100 +++ /work/SRC/openSUSE:Factory/.leechcraft.new/leechcraft.changes 2018-02-14 10:52:28.415844822 +0100 @@ -1,0 +2,5 @@ +Tue Feb 13 17:11:37 UTC 2018 - aloi...@gmx.com + +- Added leechcraft-projectM-qt5.patch + +------------------------------------------------------------------- New: ---- leechcraft-projectM-qt5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ leechcraft.spec ++++++ --- /var/tmp/diff_new_pack.ovUdJM/_old 2018-02-14 10:52:29.327811997 +0100 +++ /var/tmp/diff_new_pack.ovUdJM/_new 2018-02-14 10:52:29.331811853 +0100 @@ -54,6 +54,8 @@ Source4: %{name}-rpmlintrc Source8: leechcraft-session.1 Source9: lc_plugin_wrapper-qt5.1 +# PATCH-FEATURE-OPENSUSE leechcraft-projectM-qt5.patch use qt5 version of projectM -- aloi...@gmx.com +Patch0: leechcraft-projectM-qt5.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_atomic-devel @@ -140,7 +142,11 @@ %if %{with ffmpeg} BuildRequires: pkgconfig(libpostproc) %endif +%if 0%{?suse_version} >= 1500 +BuildRequires: pkgconfig(libprojectM-qt5) +%else BuildRequires: pkgconfig(libprojectM) +%endif BuildRequires: pkgconfig(libqrencode) %if %{with ffmpeg} BuildRequires: pkgconfig(libswresample) @@ -2266,6 +2272,9 @@ %prep %setup -q -n leechcraft-%{LEECHCRAFT_VERSION} +%if 0%{?suse_version} >= 1500 +%patch0 -p1 +%endif #removing non-free icons rm -rf src/plugins/azoth/share/azoth/iconsets/clients/default ++++++ leechcraft-projectM-qt5.patch ++++++ Index: leechcraft-0.6.70-10870-g558588d6ec/src/plugins/lmp/plugins/potorchu/cmake/FindProjectM.cmake =================================================================== --- leechcraft-0.6.70-10870-g558588d6ec.orig/src/plugins/lmp/plugins/potorchu/cmake/FindProjectM.cmake +++ leechcraft-0.6.70-10870-g558588d6ec/src/plugins/lmp/plugins/potorchu/cmake/FindProjectM.cmake @@ -1,15 +1,15 @@ find_package (PkgConfig) -pkg_check_modules (PC_PROJECTM QUIET libprojectM) +pkg_check_modules (PC_PROJECTM QUIET libprojectM-qt5) # Include dir find_path (ProjectM_INCLUDE_DIR - NAMES libprojectM/projectM.hpp + NAMES libprojectM-qt5/projectM.hpp PATHS ${PC_PROJECTM_INCLUDE_DIRS} ) # Finally the library itself find_library(ProjectM_LIBRARIES - NAMES projectM + NAMES projectM-qt5 PATHS ${PC_PROJECTM_LIBRARY_DIRS} ) Index: leechcraft-0.6.70-10870-g558588d6ec/src/plugins/lmp/plugins/potorchu/visualfilter.cpp =================================================================== --- leechcraft-0.6.70-10870-g558588d6ec.orig/src/plugins/lmp/plugins/potorchu/visualfilter.cpp +++ leechcraft-0.6.70-10870-g558588d6ec/src/plugins/lmp/plugins/potorchu/visualfilter.cpp @@ -33,7 +33,7 @@ #include <QWidget> #include <QAction> #include <gst/gst.h> -#include <libprojectM/projectM.hpp> +#include <libprojectM-qt5/projectM.hpp> #include <util/sll/util.h> #include <util/lmp/gstutil.h> #include <interfaces/lmp/ilmpguiproxy.h> @@ -172,7 +172,7 @@ namespace Potorchu 512, sceneRect.width (), sceneRect.height (), - "/usr/share/projectM/presets", + "/usr/share/projectM-qt5/presets", fontFileNameStr, fontFileNameStr, 5,