Date: Tuesday, June 16, 2015 @ 17:25:17 Author: arojas Revision: 240950
archrelease: copy trunk to extra-i686, extra-x86_64 Added: plasma-desktop/repos/extra-i686/trash-applet.patch (from rev 240949, plasma-desktop/trunk/trash-applet.patch) plasma-desktop/repos/extra-x86_64/trash-applet.patch (from rev 240949, plasma-desktop/trunk/trash-applet.patch) Deleted: plasma-desktop/repos/extra-i686/PKGBUILD plasma-desktop/repos/extra-i686/plasma-desktop.install plasma-desktop/repos/extra-x86_64/PKGBUILD plasma-desktop/repos/extra-x86_64/plasma-desktop.install -------------------------------------+ extra-i686/PKGBUILD | 49 ---------------------------------- extra-i686/plasma-desktop.install | 12 -------- extra-i686/trash-applet.patch | 24 ++++++++++++++++ extra-x86_64/PKGBUILD | 49 ---------------------------------- extra-x86_64/plasma-desktop.install | 12 -------- extra-x86_64/trash-applet.patch | 24 ++++++++++++++++ 6 files changed, 48 insertions(+), 122 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-06-16 15:24:48 UTC (rev 240949) +++ extra-i686/PKGBUILD 2015-06-16 15:25:17 UTC (rev 240950) @@ -1,49 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Antonio Rojas - -pkgname=plasma-desktop -pkgver=5.3.1 -pkgrel=3 -pkgdesc='KDE Plasma Desktop' -arch=('i686' 'x86_64') -url='https://www.kde.org/workspaces/plasmadesktop/' -license=('LGPL') -depends=('powerdevil' 'polkit-kde-agent' - 'libcanberra' 'kwin' 'libusb-compat' 'libxkbfile' 'kmenuedit' - 'systemsettings' 'ksysguard' 'kpeople' 'baloo') -makedepends=('extra-cmake-modules' 'kdoctools' 'boost' 'xf86-input-evdev' 'xf86-input-synaptics' 'xorg-server-devel') -optdepends=('plasma-nm: Network manager applet') -conflicts=('kdebase-workspace' 'kcm-touchpad-frameworks') -replaces=('kcm-touchpad-frameworks') -install="${pkgname}.install" -groups=('plasma') -source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz" 'trash-applet.patch') -md5sums=('df4a3fabb26c7aa4f87405185835c20c' - '1e13230b7b5858e6c2c9b327095917e7') - -prepare() { - mkdir build - -# Fix trash applet loading with plasma-framework 5.11 https://bugs.kde.org/show_bug.cgi?id=349207 - cd $pkgname-$pkgver - patch -p1 -i "$srcdir"/trash-applet.patch -} - -build() { - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=lib \ - -DLIBEXEC_INSTALL_DIR=lib \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DBUILD_TESTING=OFF - make -} - -package() { - cd build - make DESTDIR="${pkgdir}" install -} Deleted: extra-i686/plasma-desktop.install =================================================================== --- extra-i686/plasma-desktop.install 2015-06-16 15:24:48 UTC (rev 240949) +++ extra-i686/plasma-desktop.install 2015-06-16 15:25:17 UTC (rev 240950) @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: plasma-desktop/repos/extra-i686/trash-applet.patch (from rev 240949, plasma-desktop/trunk/trash-applet.patch) =================================================================== --- extra-i686/trash-applet.patch (rev 0) +++ extra-i686/trash-applet.patch 2015-06-16 15:25:17 UTC (rev 240950) @@ -0,0 +1,24 @@ +From: Bhushan Shah <bhus...@gmail.com> +Date: Tue, 16 Jun 2015 12:05:00 +0000 +Subject: Remove X-KDE-Library from the trash library +X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=f0d4cce819b3ce683a11b49a93ba81bafef7a4dd +--- +Remove X-KDE-Library from the trash library + +trash applet is not using the c++ applet part, so remove it + +BUG: 349207 +--- + + +--- a/applets/trash/package/metadata.desktop ++++ b/applets/trash/package/metadata.desktop +@@ -82,7 +82,6 @@ + X-Plasma-API=declarativeappletscript + X-Plasma-MainScript=ui/main.qml + +-X-KDE-Library=plasma_applet_trash + X-KDE-PluginInfo-Author=Heena + X-KDE-PluginInfo-Email=heena...@gmail.com + X-KDE-PluginInfo-Name=org.kde.plasma.trash + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-06-16 15:24:48 UTC (rev 240949) +++ extra-x86_64/PKGBUILD 2015-06-16 15:25:17 UTC (rev 240950) @@ -1,49 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Antonio Rojas - -pkgname=plasma-desktop -pkgver=5.3.1 -pkgrel=3 -pkgdesc='KDE Plasma Desktop' -arch=('i686' 'x86_64') -url='https://www.kde.org/workspaces/plasmadesktop/' -license=('LGPL') -depends=('powerdevil' 'polkit-kde-agent' - 'libcanberra' 'kwin' 'libusb-compat' 'libxkbfile' 'kmenuedit' - 'systemsettings' 'ksysguard' 'kpeople' 'baloo') -makedepends=('extra-cmake-modules' 'kdoctools' 'boost' 'xf86-input-evdev' 'xf86-input-synaptics' 'xorg-server-devel') -optdepends=('plasma-nm: Network manager applet') -conflicts=('kdebase-workspace' 'kcm-touchpad-frameworks') -replaces=('kcm-touchpad-frameworks') -install="${pkgname}.install" -groups=('plasma') -source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz" 'trash-applet.patch') -md5sums=('df4a3fabb26c7aa4f87405185835c20c' - '1e13230b7b5858e6c2c9b327095917e7') - -prepare() { - mkdir build - -# Fix trash applet loading with plasma-framework 5.11 https://bugs.kde.org/show_bug.cgi?id=349207 - cd $pkgname-$pkgver - patch -p1 -i "$srcdir"/trash-applet.patch -} - -build() { - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=lib \ - -DLIBEXEC_INSTALL_DIR=lib \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DBUILD_TESTING=OFF - make -} - -package() { - cd build - make DESTDIR="${pkgdir}" install -} Deleted: extra-x86_64/plasma-desktop.install =================================================================== --- extra-x86_64/plasma-desktop.install 2015-06-16 15:24:48 UTC (rev 240949) +++ extra-x86_64/plasma-desktop.install 2015-06-16 15:25:17 UTC (rev 240950) @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: plasma-desktop/repos/extra-x86_64/trash-applet.patch (from rev 240949, plasma-desktop/trunk/trash-applet.patch) =================================================================== --- extra-x86_64/trash-applet.patch (rev 0) +++ extra-x86_64/trash-applet.patch 2015-06-16 15:25:17 UTC (rev 240950) @@ -0,0 +1,24 @@ +From: Bhushan Shah <bhus...@gmail.com> +Date: Tue, 16 Jun 2015 12:05:00 +0000 +Subject: Remove X-KDE-Library from the trash library +X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=f0d4cce819b3ce683a11b49a93ba81bafef7a4dd +--- +Remove X-KDE-Library from the trash library + +trash applet is not using the c++ applet part, so remove it + +BUG: 349207 +--- + + +--- a/applets/trash/package/metadata.desktop ++++ b/applets/trash/package/metadata.desktop +@@ -82,7 +82,6 @@ + X-Plasma-API=declarativeappletscript + X-Plasma-MainScript=ui/main.qml + +-X-KDE-Library=plasma_applet_trash + X-KDE-PluginInfo-Author=Heena + X-KDE-PluginInfo-Email=heena...@gmail.com + X-KDE-PluginInfo-Name=org.kde.plasma.trash +