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

Accepting request 399521 from home:dimstar:Factory

Browse Source 
Fix build with libxcb 1.12 - fix submitted upstream via github, ref in patch tag line

OBS-URL: https://build.opensuse.org/request/show/399521
OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/lxqt-panel?expand=0&rev=6
This commit is contained in:
Michael Vetter 2016-06-01 15:52:33 +00:00 committed by Git OBS Bridge
parent 6b74817085
commit 86a8d4c12f
3 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lxqt-panel-xcb-1.12.patch Normal file
View File

@ -0,0 +1,33 @@
From 43d62a769773f5087c58f36ca043e998299e1487 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
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
)

7
lxqt-panel.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jun 1 15:27:40 UTC 2016 - dimstar@opensuse.org
- 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 - mvetter@suse.com

3
lxqt-panel.spec
View File

@ -29,6 +29,8 @@ 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
# PATCH-FIX-UPSTREAM lxqt-panel-xcb-1.12.patch gh#lxde/lxqt-panel#354 dimstar@opensuse.org -- Fix build with libxcb 1.12
Patch2: lxqt-panel-xcb-1.12.patch
BuildRequires: cmake >= 3.0.2
BuildRequires: extra-cmake-modules
BuildRequires: fdupes
@ -74,6 +76,7 @@ LXQt panel development files and headers
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%cmake