[arch-commits] Commit in deepin-launcher/trunk (PKGBUILD disable-uninstall.patch)

[Felix Yan]

    Date: Thursday, February 7, 2019 @ 12:44:35
  Author: felixonmars
Revision: 429907

upgpkg: deepin-launcher 4.6.4-2

disable uninstall correctly

Added:
  deepin-launcher/trunk/disable-uninstall.patch
Modified:
  deepin-launcher/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   11 +++++++----
 disable-uninstall.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-07 12:35:02 UTC (rev 429906)
+++ PKGBUILD	2019-02-07 12:44:35 UTC (rev 429907)
@@ -4,7 +4,7 @@
 
 pkgname=deepin-launcher
 pkgver=4.6.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Deepin desktop-environment - Launcher module'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-launcher"
@@ -15,17 +15,20 @@
 conflicts=('dde-launcher')
 replaces=('dde-launcher')
 groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-launcher/archive/$pkgver.tar.gz")
-sha512sums=('3546e7627f11fef7a096161cb959fb6d898661866de0a39f997e741f92b7d154601980f2603011c716c46d4c365100f63bcf116e47ea2760208e077cdccadea5')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-launcher/archive/$pkgver.tar.gz"
+        disable-uninstall.patch)
+sha512sums=('3546e7627f11fef7a096161cb959fb6d898661866de0a39f997e741f92b7d154601980f2603011c716c46d4c365100f63bcf116e47ea2760208e077cdccadea5'
+            '3689b2605f72a4394a8cc0822671b4c174d893b6e826dd8f54a342d94001cf8191395048ac11b693c6cc45286b6a3d74dfb86af29f9e51d528e26b4afe4c60f4')
 
 prepare() {
   cd dde-launcher-$pkgver
+  patch -p1 -i ../disable-uninstall.patch
   sed -i 's|/usr/share/backgrounds/default_background.jpg|/usr/share/backgrounds/deepin/desktop.jpg|' src/boxframe/*.cpp
 }
 
 build() {
   cd dde-launcher-$pkgver
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWITHOUT_UNINSTALL_APP=1
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWITHOUT_UNINSTALL_APP=
   make
 }
 

Added: disable-uninstall.patch
===================================================================
--- disable-uninstall.patch	                        (rev 0)
+++ disable-uninstall.patch	2019-02-07 12:44:35 UTC (rev 429907)
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index de695d2..4c71030 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,6 +19,10 @@ if (DEFINED DISABLE_DRAG_ANIMATION)
+     add_definitions(-DDISABLE_DRAG_ANIMATION)
+ endif ()
+ 
++if (DEFINED WITHOUT_UNINSTALL_APP)
++    add_definitions(-DWITHOUT_UNINSTALL_APP)
++endif ()
++
+ set(BIN_NAME dde-launcher)
+ 
+ # Sources files
+diff --git a/src/worker/menuworker.cpp b/src/worker/menuworker.cpp
+index 91e226d..c00452f 100644
+--- a/src/worker/menuworker.cpp
++++ b/src/worker/menuworker.cpp
+@@ -122,7 +122,10 @@ void MenuWorker::showMenuByAppItem(QPoint pos, const QModelIndex &index) {
+     }
+ 
+     uninstall->setEnabled(m_isRemovable);
++
++#ifndef WITHOUT_UNINSTALL_APP
+     menu->addAction(uninstall);
++#endif
+ 
+     connect(open, &QAction::triggered, signalMapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
+     connect(desktop, &QAction::triggered, signalMapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));