From 3523f0ad0779d55dda4aa60f560bdc16f100e8b0 Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Sat, 15 Jun 2019 23:52:19 -0400
Subject: upgpkg: pcr/dolphin-root 19.04.2-1

Signed-off-by: David P <megver83@parabola.nu>
---
 ...sallow-executing-Dolphin-as-root-on-Linux.patch | 42 ++++++++++++++++++++++
 pcr/dolphin-root/PKGBUILD                          | 29 +++++++--------
 2 files changed, 55 insertions(+), 16 deletions(-)
 create mode 100644 pcr/dolphin-root/0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch

(limited to 'pcr/dolphin-root')

diff --git a/pcr/dolphin-root/0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch b/pcr/dolphin-root/0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch
new file mode 100644
index 000000000..1bb9355d4
--- /dev/null
+++ b/pcr/dolphin-root/0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch
@@ -0,0 +1,42 @@
+From ba74d639178916221c748b0d5d89f7ac4f5ed669 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Sat, 22 Apr 2017 14:00:33 +0200
+Subject: [PATCH] Revert "Disallow executing Dolphin as root on Linux"
+
+This reverts commit 0bdd8e0b0516555c6233fdc7901e9b417cf89791.
+We ship a desktop file to open dolphin as root and we allow YaST on the
+desktop. So this patch is absolutely pointless for us.
+---
+ src/main.cpp | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+Index: dolphin-18.07.70git.20180603T132131~3c6ecfa24/src/main.cpp
+===================================================================
+--- dolphin-18.07.70git.20180603T132131~3c6ecfa24.orig/src/main.cpp
++++ dolphin-18.07.70git.20180603T132131~3c6ecfa24/src/main.cpp
+@@ -35,25 +35,8 @@
+ #include <QApplication>
+ #include <QCommandLineParser>
+ 
+-#ifndef Q_OS_WIN
+-#include <unistd.h>
+-#endif
+-#include <iostream>
+-
+ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
+ {
+-#ifndef Q_OS_WIN
+-    // Prohibit using sudo or kdesu (but allow using the root user directly)
+-    if (getuid() == 0) {
+-        if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
+-            std::cout << "Executing Dolphin with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
+-            return EXIT_FAILURE;
+-        } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
+-            std::cout << "Executing Dolphin with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
+-            return EXIT_FAILURE;
+-        }
+-    }
+-#endif
+ 
+     QApplication app(argc, argv);
+     app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
diff --git a/pcr/dolphin-root/PKGBUILD b/pcr/dolphin-root/PKGBUILD
index 9ccf2724f..d7ec250f7 100644
--- a/pcr/dolphin-root/PKGBUILD
+++ b/pcr/dolphin-root/PKGBUILD
@@ -5,40 +5,37 @@
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=dolphin-root
-_pkgname=${pkgname/-root}
-pkgver=18.04.0
+_pkgname=${pkgname%-root}
+pkgver=19.04.2
 pkgrel=1
 pkgdesc="KDE File Manager, patched to be able to run as root"
-arch=('armv7h' 'i686' 'x86_64')
+arch=(armv7h i686 x86_64)
 url="https://kde.org/applications/system/dolphin/"
 license=(LGPL)
-depends=(baloo-widgets knewstuff kio-extras kuiserver kcmutils kparts kinit)
+depends=(baloo-widgets knewstuff kio-extras kcmutils kparts kinit phonon-qt5)
 makedepends=(extra-cmake-modules kdoctools)
 optdepends=('kde-cli-tools: for editing file type options' 'ffmpegthumbs: video thumbnails' 'kde-thumbnailer-odf: ODF thumbnails'
-            'ruby: installing new service menus from KDE Store' 'kdegraphics-thumbnailers: PDF and PS thumbnails' 'konsole: terminal panel')
+            'ruby: installing new service menus from KDE Store' 'kdegraphics-thumbnailers: PDF and PS thumbnails'
+            'konsole: terminal panel' 'purpose: share context menu')
 conflicts=($_pkgname)
 provides=($_pkgname)
-source=("https://download.kde.org/stable/applications/$pkgver/src/${_pkgname}-$pkgver.tar.xz"{,.sig}
-        "https://gitlab.com/Megver83/kdebase-root-patches/raw/master/0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch"{,.sig})
-sha512sums=('9c941c37d8c1b132c092a3c71f75b821427b170ded6be8a0d1ca19a5807c9c2689cd695ee8e953443e2769358e3a28704c1880671a1fa0daaae9c1149cc12642'
+source=("https://download.kde.org/stable/applications/$pkgver/src/$_pkgname-$pkgver.tar.xz"{,.sig}
+        0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch)
+sha512sums=('e1480c2f98f06a29048683180e1ab30992e57a4cefde1b3a1a0da1c1c654482cc2e57d23fb7a7b8102e76f86c2b09b09900d37dbddc753c85f545146d47c5574'
             'SKIP'
-            'f96ce74603d868785cece5cec4a7dc57dd1b50c9423604382065235c8930c5679496cfb9e08b2956520e8205468caf2e36cdb0ad18738d3bf75fc5dfdba114ed'
-            'SKIP')
+            '01fb828b6383250df76d71923a49ed79e54599a6b3b28428aeb94466c7a442a2e03642fffa6387f2d456b2a39149e6d38269a94fb76d07e3e02d8aa56a358f0e')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck <cfeck@kde.org>
-              6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78 # David P. <megver83@parabola.nu>
-)
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
 
 prepare() {
   mkdir -p build
-  cd $srcdir/${_pkgname}-$pkgver
+  cd $srcdir/$_pkgname-$pkgver
   patch -p1 -i $srcdir/0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch
 }
 
 build() {
   cd build
-  cmake ../${_pkgname}-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
+  cmake ../$_pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DBUILD_TESTING=OFF
-- 
cgit v1.2.3