a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
57 lines
1.8 KiB
Diff
57 lines
1.8 KiB
Diff
From a44d2f3aa6075fb6e63da75f84a257294d21d161 Mon Sep 17 00:00:00 2001
|
|
From: Pierre Lamot <pierre@videolabs.io>
|
|
Date: Wed, 27 May 2020 11:05:53 +0200
|
|
Subject: [PATCH] qt: fix missing header when compiling with Qt 5.15
|
|
|
|
Upstream bug report: https://trac.videolan.org/vlc/ticket/24882
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
[backported upstream commit for modules/gui/qt/dialogs/plugins.cpp
|
|
http://git.videolan.org/?p=vlc.git;a=patch;h=0e88143ed2fe8eedfa4d3afdafcd0df901644c1d
|
|
the other two patches were proposed on the upstream bugtracker]
|
|
---
|
|
modules/gui/qt/components/playlist/views.cpp | 1 +
|
|
modules/gui/qt/dialogs/plugins.cpp | 1 +
|
|
modules/gui/qt/util/timetooltip.hpp | 1 +
|
|
3 files changed, 3 insertions(+)
|
|
|
|
diff --git a/modules/gui/qt/components/playlist/views.cpp b/modules/gui/qt/components/playlist/views.cpp
|
|
index ecc6b9918d..d3fd76da1a 100644
|
|
--- a/modules/gui/qt/components/playlist/views.cpp
|
|
+++ b/modules/gui/qt/components/playlist/views.cpp
|
|
@@ -35,6 +35,7 @@
|
|
#include <QMetaType>
|
|
#include <QHeaderView>
|
|
#include <QSvgRenderer>
|
|
+#include <QPainterPath>
|
|
|
|
#include <assert.h>
|
|
|
|
diff --git a/modules/gui/qt/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins.cpp
|
|
index 93c92b9fa6..e05ec0594a 100644
|
|
--- a/modules/gui/qt/dialogs/plugins.cpp
|
|
+++ b/modules/gui/qt/dialogs/plugins.cpp
|
|
@@ -66,6 +66,7 @@
|
|
#include <QSplitter>
|
|
#include <QToolButton>
|
|
#include <QStackedWidget>
|
|
+#include <QPainterPath>
|
|
|
|
//match the image source (width/height)
|
|
#define SCORE_ICON_WIDTH_SCALE 4
|
|
diff --git a/modules/gui/qt/util/timetooltip.hpp b/modules/gui/qt/util/timetooltip.hpp
|
|
index b6d7c646c9..f213eac459 100644
|
|
--- a/modules/gui/qt/util/timetooltip.hpp
|
|
+++ b/modules/gui/qt/util/timetooltip.hpp
|
|
@@ -25,6 +25,7 @@
|
|
#include "qt.hpp"
|
|
|
|
#include <QWidget>
|
|
+#include <QPainterPath>
|
|
|
|
class TimeTooltip : public QWidget
|
|
{
|
|
--
|
|
2.27.0
|
|
|