diff --git a/lxqt-panel-0.10.0.tar.xz b/lxqt-panel-0.10.0.tar.xz new file mode 100644 index 0000000..2aaa1cd --- /dev/null +++ b/lxqt-panel-0.10.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df83db7789daecd358f074db2100d7b251c00e48aa3aa62957d5a657a4309d5e +size 329984 diff --git a/lxqt-panel-0.9.0.tar.xz b/lxqt-panel-0.9.0.tar.xz deleted file mode 100644 index 2e40a4a..0000000 --- a/lxqt-panel-0.9.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96b2c2f1b7de7605ac79f094936e6fcf8f0034342e11d84624a033f2450f6bf1 -size 277840 diff --git a/lxqt-panel-0.9.0_add_libxcb_to_cmakelist.patch b/lxqt-panel-0.9.0_add_libxcb_to_cmakelist.patch deleted file mode 100644 index a2c1b2b..0000000 --- a/lxqt-panel-0.9.0_add_libxcb_to_cmakelist.patch +++ /dev/null @@ -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}) diff --git a/lxqt-panel-0.9.0_fix_lxqtmount_include.patch b/lxqt-panel-0.9.0_fix_lxqtmount_include.patch deleted file mode 100644 index c634a0e..0000000 --- a/lxqt-panel-0.9.0_fix_lxqtmount_include.patch +++ /dev/null @@ -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 - #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 3aa0213..c7dc2cb 100644 --- a/lxqt-panel.changes +++ b/lxqt-panel.changes @@ -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 diff --git a/lxqt-panel.spec b/lxqt-panel.spec index 5c4c24f..2f4aa5d 100644 --- a/lxqt-panel.spec +++ b/lxqt-panel.spec @@ -17,39 +17,42 @@ Name: lxqt-panel -Version: 0.9.0 +Version: 0.10.0 Release: 0 Summary: Desktop Panel for LXQt License: GPL-2.0+ Group: System/GUI/LXQt 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 +# PATCH-FIX-UPSTREAM no-undefined.patch -- include sources which export used functions +Patch0: no-undefined.patch +# PATCH-FIX-UPSTREAM xkbcommon-includes.patch -- explicitly add include path for +# xkbcommon headers, otherwise they are picked up accidentally +Patch1: xkbcommon-includes.patch +BuildRequires: cmake >= 3.0.2 BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: kguiaddons-devel -BuildRequires: kwindowsystem-devel +BuildRequires: kwindowsystem-devel >= 5.5.0 BuildRequires: libsensors4-devel +BuildRequires: solid-devel >= 5.5.0 BuildRequires: xcb-util-devel BuildRequires: pkgconfig(Qt5UiTools) -BuildRequires: pkgconfig(Qt5Xdg) >= 1.0.0 +BuildRequires: pkgconfig(Qt5Xdg) >= 1.3.0 BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(dbusmenu-qt5) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(libmenu-cache) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libstatgrab) -BuildRequires: pkgconfig(lxqt) >= %{version} +BuildRequires: pkgconfig(lxqt) >= %{version} BuildRequires: pkgconfig(lxqt-globalkeys) >= %{version} -BuildRequires: pkgconfig(lxqtmount) >= %{version} BuildRequires: pkgconfig(sysstat-qt5) BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xrender) -Requires: lxmenu-data +BuildRequires: libxkbcommon-x11-devel +#Requires: lxmenu-data Requires: menu-cache BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,15 +65,9 @@ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} %description devel -Lxqt panel development files and headers +LXQt panel development files and headers -%package -n %{name}-lang -Summary: Translations for lxqt-panel -Group: System/GUI/LXQt -Requires: %{name} = %{version} - -%description -n %{name}-lang -Translation files for lxqt-panel +%lang_package %prep %setup -q @@ -79,7 +76,8 @@ Translation files for lxqt-panel %build %cmake -%__make %{?_smp_mflags} + +make %{?_smp_mflags} %install %cmake_install @@ -91,7 +89,7 @@ Translation files for lxqt-panel %files %defattr(-,root,root) -%doc AUTHORS COPYING +%doc AUTHORS LICENSE %{_bindir}/%{name} %dir %{_sysconfdir}/xdg/ %dir %{_sysconfdir}/xdg/lxqt @@ -103,7 +101,7 @@ Translation files for lxqt-panel %defattr(-,root,root) %{_includedir}/lxqt -%files -n %{name}-lang +%files lang %defattr(-,root,root) %{_datadir}/lxqt/translations diff --git a/no-undefined.patch b/no-undefined.patch new file mode 100644 index 0000000..fbc6b72 --- /dev/null +++ b/no-undefined.patch @@ -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 diff --git a/xkbcommon-includes.patch b/xkbcommon-includes.patch new file mode 100644 index 0000000..870d9ee --- /dev/null +++ b/xkbcommon-includes.patch @@ -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) +