pool/lxqt-panel
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 343389 from X11:LXQt

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/343389
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxqt-panel?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2015-11-13 22:35:55 +00:00 committed by Git OBS Bridge
parent 5d6284d132
commit 3583572f2c
8 changed files with 66 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lxqt-panel-0.10.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:df83db7789daecd358f074db2100d7b251c00e48aa3aa62957d5a657a4309d5e
size 329984

3
lxqt-panel-0.9.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:96b2c2f1b7de7605ac79f094936e6fcf8f0034342e11d84624a033f2450f6bf1
size 277840

26
lxqt-panel-0.9.0_add_libxcb_to_cmakelist.patch
View File

@ -1,26 +0,0 @@
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})

52
lxqt-panel-0.9.0_fix_lxqtmount_include.patch
View File

@ -1,52 +0,0 @@
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"

20
lxqt-panel.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Mon Nov 9 16:03:17 UTC 2015 - hrvoje.senjan@gmail.com
- Added no-undefined.patch: include sources which export used functions
- Added xkbcommon-includes.patch: explicitly add include path for
xkbcommon headers, otherwise they are picked up accidentally
- Enable mount and kbindicator plugins
-------------------------------------------------------------------
Fri Nov 6 16:19:12 UTC 2015 - mvetter@suse.com
- Upstream release 0.10.0
We have to compile it with -DKBINDICATOR_PLUGIN=No -DMOUNT_PLUGIN=No
for now because we have problems otherwise.
Deleted patches:
- lxqt-panel-0.9.0_fix_lxqtmount_include.patch
- lxqt-panel-0.9.0_add_libxcb_to_cmakelist.patch
Not needed anymore
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 9 14:01:55 UTC 2015 - mvetter@suse.com Thu Jul 9 14:01:55 UTC 2015 - mvetter@suse.com

40
lxqt-panel.spec
View File

@ -17,39 +17,42 @@
Name: lxqt-panel Name: lxqt-panel
Version: 0.9.0 Version: 0.10.0
Release: 0 Release: 0
Summary: Desktop Panel for LXQt Summary: Desktop Panel for LXQt
License: GPL-2.0+ License: GPL-2.0+
Group: System/GUI/LXQt Group: System/GUI/LXQt
Url: http://www.lxde.org Url: http://www.lxde.org
Source0: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz 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 # PATCH-FIX-UPSTREAM no-undefined.patch -- include sources which export used functions
Patch0: lxqt-panel-0.9.0_fix_lxqtmount_include.patch Patch0: no-undefined.patch
# PATCH-FIX-UPSTREAM sfalken@opensuse.org -- Add libxcb to CMakeLists.txt, to comply with --no-undefined --as-needed in cmake # PATCH-FIX-UPSTREAM xkbcommon-includes.patch -- explicitly add include path for
Patch1: lxqt-panel-0.9.0_add_libxcb_to_cmakelist.patch # xkbcommon headers, otherwise they are picked up accidentally
BuildRequires: cmake Patch1: xkbcommon-includes.patch
BuildRequires: cmake >= 3.0.2
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: kguiaddons-devel BuildRequires: kguiaddons-devel
BuildRequires: kwindowsystem-devel BuildRequires: kwindowsystem-devel >= 5.5.0
BuildRequires: libsensors4-devel BuildRequires: libsensors4-devel
BuildRequires: solid-devel >= 5.5.0
BuildRequires: xcb-util-devel BuildRequires: xcb-util-devel
BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(Qt5UiTools)
BuildRequires: pkgconfig(Qt5Xdg) >= 1.0.0 BuildRequires: pkgconfig(Qt5Xdg) >= 1.3.0
BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(dbusmenu-qt5)
BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(libmenu-cache) BuildRequires: pkgconfig(libmenu-cache)
BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libstatgrab) BuildRequires: pkgconfig(libstatgrab)
BuildRequires: pkgconfig(lxqt) >= %{version} BuildRequires: pkgconfig(lxqt) >= %{version}
BuildRequires: pkgconfig(lxqt-globalkeys) >= %{version} BuildRequires: pkgconfig(lxqt-globalkeys) >= %{version}
BuildRequires: pkgconfig(lxqtmount) >= %{version}
BuildRequires: pkgconfig(sysstat-qt5) BuildRequires: pkgconfig(sysstat-qt5)
BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xcomposite)
BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xrender)
Requires: lxmenu-data BuildRequires: libxkbcommon-x11-devel
#Requires: lxmenu-data
Requires: menu-cache Requires: menu-cache
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -62,15 +65,9 @@ Group: Development/Libraries/C and C++
Requires: %{name} = %{version} Requires: %{name} = %{version}
%description devel %description devel
Lxqt panel development files and headers LXQt panel development files and headers
%package -n %{name}-lang %lang_package
Summary: Translations for lxqt-panel
Group: System/GUI/LXQt
Requires: %{name} = %{version}
%description -n %{name}-lang
Translation files for lxqt-panel
%prep %prep
%setup -q %setup -q
@ -79,7 +76,8 @@ Translation files for lxqt-panel
%build %build
%cmake %cmake
%__make %{?_smp_mflags}
make %{?_smp_mflags}
%install %install
%cmake_install %cmake_install
@ -91,7 +89,7 @@ Translation files for lxqt-panel
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING %doc AUTHORS LICENSE
%{_bindir}/%{name} %{_bindir}/%{name}
%dir %{_sysconfdir}/xdg/ %dir %{_sysconfdir}/xdg/
%dir %{_sysconfdir}/xdg/lxqt %dir %{_sysconfdir}/xdg/lxqt
@ -103,7 +101,7 @@ Translation files for lxqt-panel
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/lxqt %{_includedir}/lxqt
%files -n %{name}-lang %files lang
%defattr(-,root,root) %defattr(-,root,root)
%{_datadir}/lxqt/translations %{_datadir}/lxqt/translations

10
no-undefined.patch Normal file
View File

@ -0,0 +1,10 @@
--- lxqt-panel-0.10.0/plugin-mount/CMakeLists.txt.orig 2015-11-09 17:00:50.797687143 +0100
+++ lxqt-panel-0.10.0/plugin-mount/CMakeLists.txt 2015-11-09 16:58:00.526054338 +0100
@@ -13,6 +13,7 @@ set(HEADERS
)
set(SOURCES
+ ${PROJECT_SOURCE_DIR}/panel/lxqtpanelpluginconfigdialog.cpp
lxqtmountplugin.cpp
configuration.cpp
button.cpp

13
xkbcommon-includes.patch Normal file
View File

@ -0,0 +1,13 @@
--- lxqt-panel-0.10.0/plugin-kbindicator/CMakeLists.txt.orig 2015-11-09 17:22:17.507364102 +0100
+++ lxqt-panel-0.10.0/plugin-kbindicator/CMakeLists.txt 2015-11-09 17:19:51.951629548 +0100
@@ -33,8 +33,10 @@ find_package(PkgConfig REQUIRED)
pkg_check_modules(XKB_COMMON REQUIRED xkbcommon)
pkg_check_modules(XKB_COMMON_X11 QUIET xkbcommon-x11)
+include_directories(${XKB_COMMON_INCLUDEDIR})
if(XKB_COMMON_X11_FOUND)
message(STATUS "XkbCommon X11 was found")
+ include_directories(${XKB_COMMON_X11_INCLUDEDIR})
find_package(Qt5 COMPONENTS X11Extras Xml)
pkg_check_modules(XCB_XCB xcb-xkb)