From cb711f5af87f7ed4ff9ced7f14c1455c0b7c49945d7ff64edf30d5ed28feec98 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 25 Feb 2015 01:17:44 +0000 Subject: [PATCH] Accepting request 287410 from X11:lxde 1 OBS-URL: https://build.opensuse.org/request/show/287410 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxqt-panel?expand=0&rev=4 --- ...-panel-0.9.0_add_libxcb_to_cmakelist.patch | 26 ++++++++++ lxqt-panel-0.9.0_fix_lxqtmount_include.patch | 52 +++++++++++++++++++ lxqt-panel.changes | 8 +++ lxqt-panel.spec | 18 +++---- 4 files changed, 95 insertions(+), 9 deletions(-) create mode 100644 lxqt-panel-0.9.0_add_libxcb_to_cmakelist.patch create mode 100644 lxqt-panel-0.9.0_fix_lxqtmount_include.patch diff --git a/lxqt-panel-0.9.0_add_libxcb_to_cmakelist.patch b/lxqt-panel-0.9.0_add_libxcb_to_cmakelist.patch new file mode 100644 index 0000000..a2c1b2b --- /dev/null +++ b/lxqt-panel-0.9.0_add_libxcb_to_cmakelist.patch @@ -0,0 +1,26 @@ +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}) diff --git a/lxqt-panel-0.9.0_fix_lxqtmount_include.patch b/lxqt-panel-0.9.0_fix_lxqtmount_include.patch new file mode 100644 index 0000000..c634a0e --- /dev/null +++ b/lxqt-panel-0.9.0_fix_lxqtmount_include.patch @@ -0,0 +1,52 @@ +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 + #include +-#include ++#include + + 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 ++#include + #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 + #include "menudiskitem.h" +-#include ++#include + #include + #include + #include +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 + #include + #include +-#include ++#include + #include "menudiskitem.h" + #include "popup.h" + diff --git a/lxqt-panel.changes b/lxqt-panel.changes index 50820ab..424b5a8 100644 --- a/lxqt-panel.changes +++ b/lxqt-panel.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Feb 20 21:13:52 UTC 2015 - sfalken@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 + ------------------------------------------------------------------- Mon Feb 9 22:39:02 UTC 2015 - sfalken@opensuse.org diff --git a/lxqt-panel.spec b/lxqt-panel.spec index 117f803..cb22083 100644 --- a/lxqt-panel.spec +++ b/lxqt-panel.spec @@ -24,7 +24,12 @@ License: GPL-2.0+ Group: System/GUI/LXDE-Qt Url: http://www.lxde.org Source0: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM sfalken@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 sfalken@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 @@ Translation files for lxqt-panel %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