Alf Gaida
7 years ago
commit
428c2f0cb5
@ -0,0 +1,31 @@
|
||||
Description: some cosmetics backported
|
||||
- display volume percent
|
||||
- fix worldclock size
|
||||
|
||||
Author: Alf Gaida <agaida@siduction.org>
|
||||
Last-Update: 2017-11-05
|
||||
|
||||
--- lxqt-panel-0.12.0.orig/plugin-volume/lxqtvolume.cpp
|
||||
+++ lxqt-panel-0.12.0/plugin-volume/lxqtvolume.cpp
|
||||
@@ -286,7 +286,7 @@ void LXQtVolume::showNotification(bool f
|
||||
if (m_defaultSink->mute())
|
||||
m_notification->setSummary(tr("Volume: muted"));
|
||||
else
|
||||
- m_notification->setSummary(tr("Volume: %1").arg(QString::number(m_defaultSink->volume())));
|
||||
+ m_notification->setSummary(tr("Volume: %1%").arg(QString::number(m_defaultSink->volume())));
|
||||
m_notification->update();
|
||||
}
|
||||
}
|
||||
--- lxqt-panel-0.12.0.orig/plugin-worldclock/lxqtworldclock.cpp
|
||||
+++ lxqt-panel-0.12.0/plugin-worldclock/lxqtworldclock.cpp
|
||||
@@ -132,7 +132,10 @@ void LXQtWorldClock::updateTimeText()
|
||||
|
||||
if (!isUpToDate)
|
||||
{
|
||||
+ const QSize old_size = mContent->sizeHint();
|
||||
mContent->setText(tzNow.toString(preformat(mFormat, timeZone, tzNow)));
|
||||
+ if (old_size != mContent->sizeHint())
|
||||
+ mRotatedWidget->adjustContentSize();
|
||||
mRotatedWidget->update();
|
||||
updatePopupContent();
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
Description: Fixes #873599 FTBFS explicit
|
||||
No further action needed, patch was taken with description from
|
||||
upstream and can disappear with the next release.
|
||||
Last-Update: 2017-09-03
|
||||
|
||||
--- 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"
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
From 9d857d1871b1c9e3b988412d691e9dfba4a14f6d Mon Sep 17 00:00:00 2001
|
||||
From: Alf Gaida <agaida@siduction.org>
|
||||
Date: Wed, 29 Nov 2017 01:00:07 +0100
|
||||
Subject: [PATCH] move panel config to /usr/share/lxqt
|
||||
|
||||
---
|
||||
panel/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/panel/CMakeLists.txt b/panel/CMakeLists.txt
|
||||
index 5a322a3e..522c1ffc 100644
|
||||
--- a/panel/CMakeLists.txt
|
||||
+++ b/panel/CMakeLists.txt
|
||||
@@ -114,7 +114,7 @@ target_link_libraries(${PROJECT}
|
||||
)
|
||||
|
||||
install(TARGETS ${PROJECT} RUNTIME DESTINATION bin)
|
||||
-install(FILES ${CONFIG_FILES} DESTINATION ${LXQT_ETC_XDG_DIR}/lxqt)
|
||||
+install(FILES ${CONFIG_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/lxqt)
|
||||
install(FILES ${PUB_HEADERS} DESTINATION include/lxqt)
|
||||
install(FILES
|
||||
man/lxqt-panel.1
|
||||
@ -1 +1,2 @@
|
||||
fix-explicit.patch
|
||||
clock-and-volume.patch
|
||||
move-configs.patch
|
||||
|
||||
Loading…
Reference in new issue