Date: Tuesday, February 26, 2019 @ 13:28:07 Author: felixonmars Revision: 436151
archrelease: copy trunk to community-x86_64 Added: deepin-launcher/repos/community-x86_64/PKGBUILD (from rev 436150, deepin-launcher/trunk/PKGBUILD) Deleted: deepin-launcher/repos/community-x86_64/PKGBUILD deepin-launcher/repos/community-x86_64/disable-uninstall.patch -------------------------+ PKGBUILD | 73 ++++++++++++++++++++++------------------------ disable-uninstall.patch | 30 ------------------ 2 files changed, 35 insertions(+), 68 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-02-26 13:27:47 UTC (rev 436150) +++ PKGBUILD 2019-02-26 13:28:07 UTC (rev 436151) @@ -1,38 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> -# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> - -pkgname=deepin-launcher -pkgver=4.6.4 -pkgrel=2 -pkgdesc='Deepin desktop-environment - Launcher module' -arch=('x86_64') -url="https://github.com/linuxdeepin/dde-launcher" -license=('GPL3') -depends=('gsettings-qt' 'qt5-svg' 'qt5-x11extras' 'startdde' 'deepin-qt5integration' 'deepin-menu' - 'deepin-daemon' 'deepin-qt-dbus-factory' 'qt5-tools' 'xdg-user-dirs') -makedepends=('cmake') -conflicts=('dde-launcher') -replaces=('dde-launcher') -groups=('deepin') -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= - make -} - -package() { - cd dde-launcher-$pkgver - make DESTDIR="$pkgdir" install -} Copied: deepin-launcher/repos/community-x86_64/PKGBUILD (from rev 436150, deepin-launcher/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-02-26 13:28:07 UTC (rev 436151) @@ -0,0 +1,35 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> +# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> + +pkgname=deepin-launcher +pkgver=4.6.6 +pkgrel=1 +pkgdesc='Deepin desktop-environment - Launcher module' +arch=('x86_64') +url="https://github.com/linuxdeepin/dde-launcher" +license=('GPL3') +depends=('gsettings-qt' 'qt5-svg' 'qt5-x11extras' 'startdde' 'deepin-qt5integration' 'deepin-menu' + 'deepin-daemon' 'deepin-qt-dbus-factory' 'qt5-tools' 'xdg-user-dirs') +makedepends=('cmake') +conflicts=('dde-launcher') +replaces=('dde-launcher') +groups=('deepin') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-launcher/archive/$pkgver.tar.gz") +sha512sums=('0f7fad22974a4b24fc086d7a38baec358d35f7e9b00522c34c0df7df9beea85e472f6e3a8e83dddc5d12dee11e9f96a5d5f23793385f081c6483a55453b2a878') + +prepare() { + cd dde-launcher-$pkgver + 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= + make +} + +package() { + cd dde-launcher-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: disable-uninstall.patch =================================================================== --- disable-uninstall.patch 2019-02-26 13:27:47 UTC (rev 436150) +++ disable-uninstall.patch 2019-02-26 13:28:07 UTC (rev 436151) @@ -1,30 +0,0 @@ -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));