Hello community, here is the log from the commit of package lxqt-panel for openSUSE:Factory checked in at 2015-02-25 02:17:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxqt-panel (Old) and /work/SRC/openSUSE:Factory/.lxqt-panel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxqt-panel" Changes: -------- --- /work/SRC/openSUSE:Factory/lxqt-panel/lxqt-panel.changes 2015-02-16 21:08:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lxqt-panel.new/lxqt-panel.changes 2015-02-25 02:18:20.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Feb 20 21:13:52 UTC 2015 - sfal...@opensuse.org + +- Changed %build and %include to use cmake macros +- Added Patches: + + lxqt-panel-0.9.0_fix_lxqtmount_include.patch + + lxqt-panel-0.9.0_add_libxcb_to_cmakelist.patch + +------------------------------------------------------------------- New: ---- lxqt-panel-0.9.0_add_libxcb_to_cmakelist.patch lxqt-panel-0.9.0_fix_lxqtmount_include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxqt-panel.spec ++++++ --- /var/tmp/diff_new_pack.M54W6H/_old 2015-02-25 02:18:21.000000000 +0100 +++ /var/tmp/diff_new_pack.M54W6H/_new 2015-02-25 02:18:21.000000000 +0100 @@ -24,7 +24,12 @@ Group: System/GUI/LXDE-Qt Url: http://www.lxde.org Source0: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM sfal...@opensuse.org -- Needed for plugin-mount to find the lxqt-mount headers +Patch0: lxqt-panel-0.9.0_fix_lxqtmount_include.patch +# PATCH-FIX-UPSTREAM sfal...@opensuse.org -- Add libxcb to CMakeLists.txt, to comply with --no-undefined --as-needed in cmake +Patch1: lxqt-panel-0.9.0_add_libxcb_to_cmakelist.patch BuildRequires: cmake +BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: kguiaddons-devel @@ -69,20 +74,15 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build -mkdir build -pushd build -cmake \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - .. +%cmake %__make %{?_smp_mflags} -popd %install -pushd build -make DESTDIR=$RPM_BUILD_ROOT install -popd +%cmake_install %fdupes -s %{buildroot}/%{_datadir} %post -p /sbin/ldconfig ++++++ lxqt-panel-0.9.0_add_libxcb_to_cmakelist.patch ++++++ Index: lxqt-panel-0.9.0/CMakeLists.txt =================================================================== --- lxqt-panel-0.9.0.orig/CMakeLists.txt +++ lxqt-panel-0.9.0/CMakeLists.txt @@ -163,6 +163,9 @@ endif() setByDefault(SHOWDESKTOP_PLUGIN Yes) if(SHOWDESKTOP_PLUGIN) + find_package(ECM 1.0.0 REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_MODULE_PATH}) + find_package(XCB REQUIRED COMPONENTS XCB) set(ENABLED_PLUGINS ${ENABLED_PLUGINS} "Show Desktop") add_subdirectory(plugin-showdesktop) endif() Index: lxqt-panel-0.9.0/plugin-showdesktop/CMakeLists.txt =================================================================== --- lxqt-panel-0.9.0.orig/plugin-showdesktop/CMakeLists.txt +++ lxqt-panel-0.9.0/plugin-showdesktop/CMakeLists.txt @@ -16,6 +16,7 @@ set(LIBRARIES ${LIBRARIES} ${LXQT_GLOBALKEYS_LIBRARIES} ${QTXDG_LIBRARIES} + XCB::XCB ) BUILD_LXQT_PLUGIN(${PLUGIN}) ++++++ lxqt-panel-0.9.0_fix_lxqtmount_include.patch ++++++ Index: lxqt-panel-0.9.0/plugin-mount/actions/deviceaction.h =================================================================== --- lxqt-panel-0.9.0.orig/plugin-mount/actions/deviceaction.h +++ lxqt-panel-0.9.0/plugin-mount/actions/deviceaction.h @@ -31,7 +31,7 @@ #include <QObject> #include <QSettings> -#include <LXQtMount/Mount> +#include <lxqtmount/LXQtMount/Mount> namespace { class MountDevice; Index: lxqt-panel-0.9.0/plugin-mount/lxqtmountplugin.cpp =================================================================== --- lxqt-panel-0.9.0.orig/plugin-mount/lxqtmountplugin.cpp +++ lxqt-panel-0.9.0/plugin-mount/lxqtmountplugin.cpp @@ -28,7 +28,7 @@ #include "lxqtmountplugin.h" #include "lxqtmountconfiguration.h" -#include <LXQtMount/Mount> +#include <lxqtmount/LXQtMount/Mount> #include "actions/deviceaction.h" #include "popup.h" #include "mountbutton.h" Index: lxqt-panel-0.9.0/plugin-mount/menudiskitem.cpp =================================================================== --- lxqt-panel-0.9.0.orig/plugin-mount/menudiskitem.cpp +++ lxqt-panel-0.9.0/plugin-mount/menudiskitem.cpp @@ -27,7 +27,7 @@ #include <QDesktopServices> #include "menudiskitem.h" -#include <LXQtMount/Mount> +#include <lxqtmount/LXQtMount/Mount> #include <XdgIcon> #include <QDebug> #include <QUrl> Index: lxqt-panel-0.9.0/plugin-mount/popup.cpp =================================================================== --- lxqt-panel-0.9.0.orig/plugin-mount/popup.cpp +++ lxqt-panel-0.9.0/plugin-mount/popup.cpp @@ -29,7 +29,7 @@ #include <QGridLayout> #include <QLabel> #include <QDesktopWidget> -#include <LXQtMount/Mount> +#include <lxqtmount/LXQtMount/Mount> #include "menudiskitem.h" #include "popup.h" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
