Merge branch 'master' into core-updates

2 files changed, 0 insertions, 154 deletions

diff --git a/gnu/packages/patches/twinkle-include-qregexpvalidator.patch b/gnu/packages/patches/twinkle-include-qregexpvalidator.patch
deleted file mode 100755
index 4096cc8712..0000000000
--- a/gnu/packages/patches/twinkle-include-qregexpvalidator.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-Copied from upstream:
-
-https://github.com/LubosD/twinkle/commit/4b42755619011c117a76bdf98e417ebedc47e319
-
-From 4b42755619011c117a76bdf98e417ebedc47e319 Mon Sep 17 00:00:00 2001
-From: Michal Kubecek <mkubecek@suse.cz>
-Date: Wed, 6 Jun 2018 10:07:21 +0200
-Subject: [PATCH] Include <QRegExpValidator> explicitly
-
-Since Qt 5.11, generated ui_getprofilename.h no longer includes QHeaderView
-which breaks the chain that included qvalidator.h in getprofilename.cpp.
-As it feels rather fragile to rely on such indirect includes, let's include
-<QRegExpValidator> explicitly in each file using QRegExpValidator class.
----
- src/gui/diamondcardprofileform.cpp | 1 +
- src/gui/getprofilenameform.cpp     | 2 +-
- src/gui/inviteform.cpp             | 1 +
- src/gui/mphoneform.cpp             | 1 +
- src/gui/numberconversionform.cpp   | 1 +
- src/gui/syssettingsform.cpp        | 1 +
- src/gui/userprofileform.cpp        | 1 +
- src/gui/wizardform.cpp             | 1 +
- 8 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/gui/diamondcardprofileform.cpp b/src/gui/diamondcardprofileform.cpp
-index 6656909..517180b 100644
---- a/src/gui/diamondcardprofileform.cpp
-+++ b/src/gui/diamondcardprofileform.cpp
-@@ -21,6 +21,7 @@
- 
- #include <QRegExp>
- #include <QValidator>
-+#include <QRegExpValidator>
- #include "gui.h"
- #include "diamondcard.h"
- #include "getprofilenameform.h"
-diff --git a/src/gui/getprofilenameform.cpp b/src/gui/getprofilenameform.cpp
-index 1319e1d..89c715e 100644
---- a/src/gui/getprofilenameform.cpp
-+++ b/src/gui/getprofilenameform.cpp
-@@ -1,7 +1,7 @@
- #include "getprofilenameform.h"
--
- #include <QDir>
- #include <QMessageBox>
-+#include <QRegExpValidator>
- #include "user.h"
- #include "protocol.h"
- 
-diff --git a/src/gui/inviteform.cpp b/src/gui/inviteform.cpp
-index 433fb22..2a5b68d 100644
---- a/src/gui/inviteform.cpp
-+++ b/src/gui/inviteform.cpp
-@@ -7,6 +7,7 @@
- #include "sys_settings.h"
- #include <QRegExp>
- #include <QValidator>
-+#include <QRegExpValidator>
- 
- /*
-     Copyright (C) 2005-2009  Michel de Boer <michel@twinklephone.com>
-diff --git a/src/gui/mphoneform.cpp b/src/gui/mphoneform.cpp
-index 260fda7..c4e3c1d 100644
---- a/src/gui/mphoneform.cpp
-+++ b/src/gui/mphoneform.cpp
-@@ -54,6 +54,7 @@
- #include <QRegExp>
- #include <QValidator>
- #include <QSettings>
-+#include <QRegExpValidator>
- #include "buddyform.h"
- #include "diamondcardprofileform.h"
- #include "osd.h"
-diff --git a/src/gui/numberconversionform.cpp b/src/gui/numberconversionform.cpp
-index f8ae64c..8481a9b 100644
---- a/src/gui/numberconversionform.cpp
-+++ b/src/gui/numberconversionform.cpp
-@@ -1,5 +1,6 @@
- #include "numberconversionform.h"
- 
-+#include <QRegExpValidator>
- #include "gui.h"
- 
- /*
-diff --git a/src/gui/syssettingsform.cpp b/src/gui/syssettingsform.cpp
-index 216af54..355df59 100644
---- a/src/gui/syssettingsform.cpp
-+++ b/src/gui/syssettingsform.cpp
-@@ -28,6 +28,7 @@
- #include "twinkle_config.h"
- #include <QRegExp>
- #include <QValidator>
-+#include <QRegExpValidator>
- #include "syssettingsform.h"
- /*
-  *  Constructs a SysSettingsForm as a child of 'parent', with the
-diff --git a/src/gui/userprofileform.cpp b/src/gui/userprofileform.cpp
-index 28700a6..9ed9209 100644
---- a/src/gui/userprofileform.cpp
-+++ b/src/gui/userprofileform.cpp
-@@ -31,6 +31,7 @@
- #include <QStringList>
- #include "twinkle_config.h"
- #include <QListWidget>
-+#include <QRegExpValidator>
- #include "numberconversionform.h"
- #include "util.h"
- #include "userprofileform.h"
-diff --git a/src/gui/wizardform.cpp b/src/gui/wizardform.cpp
-index 777aa12..f925875 100644
---- a/src/gui/wizardform.cpp
-+++ b/src/gui/wizardform.cpp
-@@ -23,6 +23,7 @@
- #include <QTextStream>
- #include "gui.h"
- #include <QFile>
-+#include <QRegExpValidator>
- #include "wizardform.h"
- 
- #define PROV_NONE	QT_TRANSLATE_NOOP("WizardForm", "None (direct IP to IP calls)")
--- 
-2.17.0
-
diff --git a/gnu/packages/patches/xfce4-session-fix-xflock4.patch b/gnu/packages/patches/xfce4-session-fix-xflock4.patch
deleted file mode 100644
index 74769e4257..0000000000
--- a/gnu/packages/patches/xfce4-session-fix-xflock4.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From cbb9c769316b4d32956a2c78aa01a38b473f0cfc Mon Sep 17 00:00:00 2001
-From: David Thompson <dthompson2@worcester.edu>
-Date: Fri, 30 Oct 2015 08:30:43 -0400
-Subject: [PATCH] xflock4: Do not override PATH with hardcoded value.
-
-The PATH "/bin:/usr/bin" may not be a valid search path on the user's
-machine.  The screen locking program may be in /usr/local/bin or
-elsewhere.  Distros that do not conform to the FHS, such as GuixSD and
-NixOS, will not have their executables in either location.  Thus, we
-simply leave PATH alone.
----
- scripts/xflock4 | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/scripts/xflock4 b/scripts/xflock4
-index ec4d05d..e7981ac 100644
---- a/scripts/xflock4
-+++ b/scripts/xflock4
-@@ -21,9 +21,6 @@
- #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
- 
--PATH=/bin:/usr/bin
--export PATH
--
- # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
- for lock_cmd in \
-     "xscreensaver-command -lock" \
--- 
-2.5.0
-