Hello community, here is the log from the commit of package lxqt-panel for openSUSE:Factory checked in at 2015-11-13 23:35:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-19 11:45:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxqt-panel.new/lxqt-panel.changes 2015-11-13 23:35:56.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Nov 9 16:03:17 UTC 2015 - [email protected] + +- 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 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- lxqt-panel-0.9.0.tar.xz lxqt-panel-0.9.0_add_libxcb_to_cmakelist.patch lxqt-panel-0.9.0_fix_lxqtmount_include.patch New: ---- lxqt-panel-0.10.0.tar.xz no-undefined.patch xkbcommon-includes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxqt-panel.spec ++++++ --- /var/tmp/diff_new_pack.sJ15Rt/_old 2015-11-13 23:35:57.000000000 +0100 +++ /var/tmp/diff_new_pack.sJ15Rt/_new 2015-11-13 23:35:57.000000000 +0100 @@ -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 [email protected] -- Needed for plugin-mount to find the lxqt-mount headers -Patch0: lxqt-panel-0.9.0_fix_lxqtmount_include.patch -# PATCH-FIX-UPSTREAM [email protected] -- 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-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 @@ 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 @@ %build %cmake -%__make %{?_smp_mflags} + +make %{?_smp_mflags} %install %cmake_install @@ -91,7 +89,7 @@ %files %defattr(-,root,root) -%doc AUTHORS COPYING +%doc AUTHORS LICENSE %{_bindir}/%{name} %dir %{_sysconfdir}/xdg/ %dir %{_sysconfdir}/xdg/lxqt @@ -103,7 +101,7 @@ %defattr(-,root,root) %{_includedir}/lxqt -%files -n %{name}-lang +%files lang %defattr(-,root,root) %{_datadir}/lxqt/translations ++++++ lxqt-panel-0.9.0.tar.xz -> lxqt-panel-0.10.0.tar.xz ++++++ ++++ 83320 lines of diff (skipped) ++++++ no-undefined.patch ++++++ --- 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 ++++++ xkbcommon-includes.patch ++++++ --- 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)
