Accepting request 460276 from home:sfalken:branches:X11:LXQt

- Update to 0.11.1:
  * Show Auto-Hiding Panels with Delay (#387)
  * Enabling testing on weston (#380)
  * Update *da.desktop files
  * plugin-showdesktop: Cleanup left behind XCB artifacts
  * plugin-kbindicator: Use FindXCB CMake module
  * plugin-tray: Use the FindXCB CMake module
  * Use the new lxqt-build-tools CMake modules (FindMenuCache)
  * plugin-desktopswitch: Add LABEL_TYPE_NONE
  * Add/Update Portugese translations
  * taskbar: Add "cycle on wheel" configuration
  * taskbar: Forward wheelEvent
  * Add/Update french desktop entries
  * taskbar: Set toolButtonStyle for popup correctly
  * Fix faulty link in README.md
  * Remove arbitrary limit of taskbar button width
  * Remove cpack (#371)
- Added 0001-lxqt_panel_override_explicit_keyword.patch
  * Fixes compile errors  https://github.com/lxde/lxqt/issues/1251
- Added CXXFLAGS change from X11:LXQT:git for libxkbcommon-x11

OBS-URL: https://build.opensuse.org/request/show/460276
OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/lxqt-panel?expand=0&rev=8
This commit is contained in:
Michael Vetter 2017-02-26 12:18:20 +00:00 committed by Git OBS Bridge
parent 68302af085
commit b00b56881a
7 changed files with 69 additions and 21 deletions

View File

@ -0,0 +1,20 @@
Index: lxqt-panel-0.11.1/plugin-kbindicator/src/x11/kbdlayout.cpp
===================================================================
--- lxqt-panel-0.11.1.orig/plugin-kbindicator/src/x11/kbdlayout.cpp
+++ lxqt-panel-0.11.1/plugin-kbindicator/src/x11/kbdlayout.cpp
@@ -33,8 +33,15 @@
#include <xkbcommon/xkbcommon-x11.h>
#include <xcb/xcb.h>
+
+// Note: We need to override "explicit" as this is a C++ keyword. But it is
+// used as variable name in xkb.h. This is causing a failure in c++ compile
+// time.
+// similar bug here: https://bugs.freedesktop.org/show_bug.cgi?id=74080
#define explicit _explicit
#include <xcb/xkb.h>
+#undef explicit
+
#include "../kbdinfo.h"
#include "../controls.h"

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABCgAGBQJX5bCkAAoJEELJyNOvXqXjjWEP/06dJpUOyN+GtVi/tqIDNxct
WBpcqCgqTTRtJ9NjFsKe2pZJytg9PV/KyFZwx5ctvHJBobU4T9k242LD0UNDyJfW
zLjZ61PagNMhkh0ZnvnscEFXPxhXIb9fZ+QixDxS8cKUfqIVy+HqZtAI6dzw3fnT
Q79TQF+wxi/zcMN3OyKVZf4w+0riXceBV1+6PrReZMH4V40EcZvvdvsLMXlGa/en
XAN1Xj5OxnCrSyppmwsrDF1Ueb4LOXFG/orahfi5b/2y2Fw8pDdjVVUse6HNICGV
EC1LNJmpPmXDaSd6b2+oOJvr+TdUCo0zxA6mGGjfQvnX0598+iJv4fwkT/lTcb3G
7/Iz6OH02ONlEFv/2QFsXenYvDiRofxDnckLs8sniqRFNGTmqzYGEfmQeVSbwq4z
UPaALhn8BZPhiRmCcswcir9YHmhlt0NXNQgBHAZ2tzODDrY66Lmd94Im2UlApQuo
Ka9QP/efBVV2mLZfq8/c1FGQER1S7fgK5n4F6kOMxgRhOY87jn9o7QXM2tTFauk6
htkb1UDzgA2HBINyeSNBnrIf+kwDTshmuvkC6P0bCIQWRA4BbaTSC1GiEEXfw7Qj
LEXHcUVeEawOXxwoLmzsQHkRt21nmaxBKxMZA38K8YD9mB7wHiAw8S8YnQiaaixJ
oPDSskDBpRUvZLiBo5Gs
=S+EG
-----END PGP SIGNATURE-----

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

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEfHM7pfWFqtZp5NI6QsnI069epeMFAlhpgk0ACgkQQsnI069e
peNLtg/+MZ/K6eJ9m6VZ7YQVBWnIZ3V3Ne23u05kHClvaRBbJWdwQuH2dvmM0Aut
ji7R6avWkSQjaCYGTLaXnYQ66GQf4jr4Q2826XK0a++9lV1pyAyXYVxAqIyJJHut
FSRQRSWjXPfRMKngjCVU3r+T72g7qTUcIjEzPajhp/EPfddCHWOTxu1n5oSk//TT
iLntuOxpJr0DDxcEXYgZYuUShaWeh/P5MB7qoxaMY1uxmfQdKnFBjwwa8yr6tsCB
4B7hZVva4SNic/5jawpWrt4+M8opbQs1MP14dq0g9xUBeaK7ZnYPrUcb88jj2VsK
9ZEoAIVeTYDSyKtgzrYHgb71j4RB7jTney28wyReo1Ijz35xNkYNLFfVrr4Zyv2v
nvjYQjXkDi9O4scM/1gvrxNlr/X8lJGWmXjYyNuzVGgGfwxBJQTV3adqNs7wJNzr
wd8E+3pXvAH//fXBZO5QuWPCBTtBEdPE/ZyUtmASCxcsNGnpT6OHFiuk6HIqbUbj
qq7WAhRXPVq/WgBIkQNDYphV6Q2a5a4SJKDP2IppbtS0ZlJi7I/JZb/Ev6uIgPxw
0LGq/wukvzqrwBYK41rucpDipi5Y+x9UdUHsW1POSPN5EgObuBrr4faxRiwVTLcH
DnQVgok+5UO1DKZIBWEwB7liJZHnSGmWQoGRtYHORJgl8FfCjOU=
=nCpZ
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Fri Feb 24 17:36:48 UTC 2017 - sfalken@opensuse.org
- Update to 0.11.1:
* Show Auto-Hiding Panels with Delay (#387)
* Enabling testing on weston (#380)
* Update *da.desktop files
* plugin-showdesktop: Cleanup left behind XCB artifacts
* plugin-kbindicator: Use FindXCB CMake module
* plugin-tray: Use the FindXCB CMake module
* Use the new lxqt-build-tools CMake modules (FindMenuCache)
* plugin-desktopswitch: Add LABEL_TYPE_NONE
* Add/Update Portugese translations
* taskbar: Add "cycle on wheel" configuration
* taskbar: Forward wheelEvent
* Add/Update french desktop entries
* taskbar: Set toolButtonStyle for popup correctly
* Fix faulty link in README.md
* Remove arbitrary limit of taskbar button width
* Remove cpack (#371)
- Added 0001-lxqt_panel_override_explicit_keyword.patch
* Fixes compile errors https://github.com/lxde/lxqt/issues/1251
- Added CXXFLAGS change from X11:LXQT:git for libxkbcommon-x11
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Sep 24 21:26:27 UTC 2016 - mvetter@suse.com Sat Sep 24 21:26:27 UTC 2016 - mvetter@suse.com

View File

@ -17,7 +17,7 @@
Name: lxqt-panel Name: lxqt-panel
Version: 0.11.0 Version: 0.11.1
Release: 0 Release: 0
Summary: Desktop Panel for LXQt Summary: Desktop Panel for LXQt
License: GPL-2.0+ License: GPL-2.0+
@ -26,8 +26,11 @@ Url: http://www.lxqt.org
Source0: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz Source0: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz
Source1: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz.asc Source1: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz.asc
Source2: %{name}.keyring Source2: %{name}.keyring
# PATCH-FIX-UPSTREAM 0001-lxqt_panel_override_explicit_keyword.patch https://github.com/lxde/lxqt/issues/1251 sfalken@opensuse.org -- Fixes compile failures
Patch0: 0001-lxqt_panel_override_explicit_keyword.patch
BuildRequires: cmake >= 3.0.2 BuildRequires: cmake >= 3.0.2
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules
BuildRequires: lxqt-build-tools-devel
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libsensors4-devel BuildRequires: libsensors4-devel
@ -76,10 +79,11 @@ LXQt panel development files and headers
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
export CXXFLAGS="%{optflags} -I/usr/include/pkg/libxkbcommon"
%cmake -DPULL_TRANSLATIONS=No -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" %cmake -DPULL_TRANSLATIONS=No -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now"
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install