Hello community, here is the log from the commit of package lxqt-panel for openSUSE:Factory checked in at 2016-06-02 09:40:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-01-12 16:12:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lxqt-panel.new/lxqt-panel.changes 2016-06-02 09:40:06.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Jun 1 15:27:40 UTC 2016 - [email protected] + +- Add lxqt-panel-xcb-1.12.patch: Fix linking with libxcb-1.12: + we use xcb symbols by ourselves, so we are also responsible to + link libxcb. + +------------------------------------------------------------------- +Tue May 24 14:25:08 UTC 2016 - [email protected] + +- Use pkgconfig to require libxkbcommon-x11-devel +- Require lxqt-mount to have mounter option working + +------------------------------------------------------------------- New: ---- lxqt-panel-xcb-1.12.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxqt-panel.spec ++++++ --- /var/tmp/diff_new_pack.sKGJla/_old 2016-06-02 09:40:06.000000000 +0200 +++ /var/tmp/diff_new_pack.sKGJla/_new 2016-06-02 09:40:06.000000000 +0200 @@ -29,6 +29,8 @@ # PATCH-FIX-UPSTREAM xkbcommon-includes.patch -- explicitly add include path for # xkbcommon headers, otherwise they are picked up accidentally Patch1: xkbcommon-includes.patch +# PATCH-FIX-UPSTREAM lxqt-panel-xcb-1.12.patch gh#lxde/lxqt-panel#354 [email protected] -- Fix build with libxcb 1.12 +Patch2: lxqt-panel-xcb-1.12.patch BuildRequires: cmake >= 3.0.2 BuildRequires: extra-cmake-modules BuildRequires: fdupes @@ -48,10 +50,11 @@ BuildRequires: pkgconfig(libstatgrab) BuildRequires: pkgconfig(lxqt) >= %{version} BuildRequires: pkgconfig(lxqt-globalkeys) >= %{version} +BuildRequires: pkgconfig(lxqtmount) BuildRequires: pkgconfig(sysstat-qt5) BuildRequires: pkgconfig(xcomposite) +BuildRequires: pkgconfig(xkbcommon-x11) BuildRequires: pkgconfig(xrender) -BuildRequires: libxkbcommon-x11-devel Requires: lxmenu-data Requires: menu-cache BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -73,6 +76,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %cmake ++++++ lxqt-panel-xcb-1.12.patch ++++++ >From 43d62a769773f5087c58f36ca043e998299e1487 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <[email protected]> Date: Wed, 1 Jun 2016 17:26:22 +0200 Subject: [PATCH] kbindicator-plugin: fix linking with libxcb-1.12 --- plugin-kbindicator/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) Index: lxqt-panel-0.10.0/plugin-kbindicator/CMakeLists.txt =================================================================== --- lxqt-panel-0.10.0.orig/plugin-kbindicator/CMakeLists.txt +++ lxqt-panel-0.10.0/plugin-kbindicator/CMakeLists.txt @@ -38,7 +38,8 @@ 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) + pkg_check_modules(XCB xcb) + pkg_check_modules(XCB_XKB xcb-xkb) set(HEADERS ${HEADERS} @@ -53,7 +54,8 @@ if(XKB_COMMON_X11_FOUND) set(LIBRARIES ${LIBRARIES} ${XKB_COMMON_X11_LIBRARIES} - ${XCB_XCB_LIBRARIES} + ${XCB_LIBRARIES} + ${XCB_XKB_LIBRARIES} Qt5::Xml )
