[arch-commits] Commit in kdebase/repos (8 files)

Andrea Scarpino andrea at archlinux.org
Sat Jan 28 10:33:03 UTC 2012


    Date: Saturday, January 28, 2012 @ 05:33:03
  Author: andrea
Revision: 147789

db-move: moved kdebase from [testing] to [extra] (i686)

Added:
  kdebase/repos/extra-i686/PKGBUILD
    (from rev 147757, kdebase/repos/testing-i686/PKGBUILD)
  kdebase/repos/extra-i686/fix-controlclick-selection.patch
    (from rev 147757, kdebase/repos/testing-i686/fix-controlclick-selection.patch)
  kdebase/repos/extra-i686/kdebase-dolphin.install
    (from rev 147757, kdebase/repos/testing-i686/kdebase-dolphin.install)
  kdebase/repos/extra-i686/kdebase-konqueror.install
    (from rev 147757, kdebase/repos/testing-i686/kdebase-konqueror.install)
  kdebase/repos/extra-i686/kdebase.install
    (from rev 147757, kdebase/repos/testing-i686/kdebase.install)
Deleted:
  kdebase/repos/extra-i686/PKGBUILD
  kdebase/repos/extra-i686/kdebase.install
  kdebase/repos/testing-i686/

----------------------------------+
 PKGBUILD                         |  244 ++++++++++++++++++-------------------
 fix-controlclick-selection.patch |   11 +
 kdebase-dolphin.install          |   11 +
 kdebase-konqueror.install        |   12 +
 kdebase.install                  |   22 +--
 5 files changed, 170 insertions(+), 130 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-01-28 10:33:01 UTC (rev 147788)
+++ extra-i686/PKGBUILD	2012-01-28 10:33:03 UTC (rev 147789)
@@ -1,119 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgbase=kdebase
-pkgname=('kdebase-dolphin'
-         'kdebase-kdepasswd'
-         'kdebase-kdialog'
-         'kdebase-keditbookmarks'
-         'kdebase-kfind'
-         'kdebase-konq-plugins'
-         'kdebase-konqueror'
-         'kdebase-lib'
-         'kdebase-plasma')
-pkgver=4.7.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebase')
-makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml')
-source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2")
-sha1sums=('ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../kde-baseapps-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdebase-dolphin() {
-	pkgdesc='File Manager'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	optdepends=('kdegraphics-svgpart: thumbailers for SVG files'
-                'kdegraphics-thumbnailers: thumbnailers for graphics file'
-                'ruby: servicemenu installation')
-	url="http://kde.org/applications/system/dolphin/"
-	cd $srcdir/build/dolphin
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/dolphin
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdepasswd() {
-	pkgdesc='Change Password'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	cd $srcdir/build/kdepasswd
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kdepasswd
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdialog() {
-	pkgdesc='A utility for displaying dialog boxes from shell scripts'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kdialog
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-keditbookmarks() {
-	pkgdesc='Bookmark Organizer and Editor'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/keditbookmarks
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kfind() {
-	pkgdesc='Find Files/Folders'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	url="http://kde.org/applications/utilities/kfind/"
-	install='kdebase.install'
-	cd $srcdir/build/kfind
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kfind
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-konq-plugins() {
-	pkgdesc='Extra plugins for Konqueror'
-	depends=('kdebase-konqueror' 'tidyhtml')
-	replaces=('konq-plugins')
-	install='kdebase.install'
-	cd $srcdir/build/konq-plugins
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-konqueror() {
-	pkgdesc='KDE File Manager & Web Browser'
-	depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
-	optdepends=('kwebkitpart: to enable webkit engine')
-	url="http://kde.org/applications/internet/konqueror/"
-	install='kdebase.install'
-    conflicts=('kdebase-nsplugins')
-    replaces=('kdebase-nsplugins')
-    for i in konqueror doc/konqueror nsplugins; do
-        cd $srcdir/build/${i}
-        make DESTDIR=$pkgdir install
-    done
-}
-
-package_kdebase-lib() {
-	pkgdesc='KDE libraries for the basic desktop applications'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/lib
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-plasma() {
-	pkgdesc='Display the contents of folders (User´s home folder as default)'
-	depends=('kdebase-workspace' 'kdebase-lib')
-	cd $srcdir/build/plasma
-	make DESTDIR=$pkgdir install
-}

Copied: kdebase/repos/extra-i686/PKGBUILD (from rev 147757, kdebase/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-01-28 10:33:03 UTC (rev 147789)
@@ -0,0 +1,125 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=kdebase
+pkgname=('kdebase-dolphin'
+         'kdebase-kdepasswd'
+         'kdebase-kdialog'
+         'kdebase-keditbookmarks'
+         'kdebase-kfind'
+         'kdebase-konq-plugins'
+         'kdebase-konqueror'
+         'kdebase-lib'
+         'kdebase-plasma')
+pkgver=4.8.0
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdebase')
+makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
+source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2"
+        'fix-controlclick-selection.patch')
+sha1sums=('25151b551793164c5eb1cb303d3031e63a6122e3'
+          'b29c42301b84475f95f19ff9edb22d2134df9c1c')
+
+build() {
+    cd "${srcdir}"/kde-baseapps-${pkgver}
+    patch -p1 -i "${srcdir}"/fix-controlclick-selection.patch
+
+	cd ${srcdir}
+	mkdir build
+	cd build
+	cmake ../kde-baseapps-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	make
+}
+
+package_kdebase-dolphin() {
+	pkgdesc='File Manager'
+	depends=('kdebase-runtime' 'kdebase-lib')
+	optdepends=('kdegraphics-svgpart: thumbailers for SVG files'
+                'kdegraphics-thumbnailers: thumbnailers for graphics file'
+                'ruby: servicemenu installation')
+	url="http://kde.org/applications/system/dolphin/"
+        install=kdebase-dolphin.install
+	cd $srcdir/build/dolphin
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/dolphin
+	make DESTDIR=$pkgdir install
+}
+
+package_kdebase-kdepasswd() {
+	pkgdesc='Change Password'
+	depends=('kdebase-runtime' 'kdebase-lib')
+	cd $srcdir/build/kdepasswd
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kdepasswd
+	make DESTDIR=$pkgdir install
+}
+
+package_kdebase-kdialog() {
+	pkgdesc='A utility for displaying dialog boxes from shell scripts'
+	depends=('kdebase-runtime')
+	cd $srcdir/build/kdialog
+	make DESTDIR=$pkgdir install
+}
+
+package_kdebase-keditbookmarks() {
+	pkgdesc='Bookmark Organizer and Editor'
+	depends=('kdebase-runtime')
+	cd $srcdir/build/keditbookmarks
+	make DESTDIR=$pkgdir install
+}
+
+package_kdebase-kfind() {
+	pkgdesc='Find Files/Folders'
+	depends=('kdebase-runtime' 'kdebase-lib')
+	url="http://kde.org/applications/utilities/kfind/"
+	install='kdebase.install'
+	cd $srcdir/build/kfind
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kfind
+	make DESTDIR=$pkgdir install
+}
+
+package_kdebase-konq-plugins() {
+	pkgdesc='Extra plugins for Konqueror'
+	depends=('kdebase-konqueror' 'tidyhtml')
+	replaces=('konq-plugins')
+	install='kdebase.install'
+	cd $srcdir/build/konq-plugins
+	make DESTDIR=$pkgdir install
+}
+
+package_kdebase-konqueror() {
+	pkgdesc='KDE File Manager & Web Browser'
+	depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
+	optdepends=('kwebkitpart: to enable webkit engine')
+	url="http://kde.org/applications/internet/konqueror/"
+	install='kdebase-konqueror.install'
+        conflicts=('kdebase-nsplugins')
+        replaces=('kdebase-nsplugins')
+        for i in konqueror doc/konqueror nsplugins; do
+              cd $srcdir/build/${i}
+              make DESTDIR=$pkgdir install
+        done
+}
+
+package_kdebase-lib() {
+	pkgdesc='KDE libraries for the basic desktop applications'
+	groups=()
+	depends=('kdelibs')
+	cd $srcdir/build/lib
+	make DESTDIR=$pkgdir install
+}
+
+package_kdebase-plasma() {
+	pkgdesc='Display the contents of folders (User´s home folder as default)'
+	depends=('kdebase-workspace' 'kdebase-lib')
+	cd $srcdir/build/plasma
+	make DESTDIR=$pkgdir install
+}

Copied: kdebase/repos/extra-i686/fix-controlclick-selection.patch (from rev 147757, kdebase/repos/testing-i686/fix-controlclick-selection.patch)
===================================================================
--- extra-i686/fix-controlclick-selection.patch	                        (rev 0)
+++ extra-i686/fix-controlclick-selection.patch	2012-01-28 10:33:03 UTC (rev 147789)
@@ -0,0 +1,11 @@
+--- a/dolphin/src/kitemviews/kitemlistcontroller.cpp
++++ b/dolphin/src/kitemviews/kitemlistcontroller.cpp
+@@ -471,7 +471,7 @@ bool KItemListController::mousePressEven
+                                 (!shiftOrControlPressed && !pressedItemAlreadySelected);
+     if (clearSelection) {
+         m_selectionManager->clearSelection();
+-    } else if (pressedItemAlreadySelected && (event->buttons() & Qt::LeftButton)) {
++    } else if (pressedItemAlreadySelected && !shiftOrControlPressed && (event->buttons() & Qt::LeftButton)) {
+         // The user might want to start dragging multiple items, but if he clicks the item
+         // in order to trigger it instead, the other selected items must be deselected.
+         // However, we do not know yet what the user is going to do.

Copied: kdebase/repos/extra-i686/kdebase-dolphin.install (from rev 147757, kdebase/repos/testing-i686/kdebase-dolphin.install)
===================================================================
--- extra-i686/kdebase-dolphin.install	                        (rev 0)
+++ extra-i686/kdebase-dolphin.install	2012-01-28 10:33:03 UTC (rev 147789)
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Copied: kdebase/repos/extra-i686/kdebase-konqueror.install (from rev 147757, kdebase/repos/testing-i686/kdebase-konqueror.install)
===================================================================
--- extra-i686/kdebase-konqueror.install	                        (rev 0)
+++ extra-i686/kdebase-konqueror.install	2012-01-28 10:33:03 UTC (rev 147789)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-i686/kdebase.install
===================================================================
--- extra-i686/kdebase.install	2012-01-28 10:33:01 UTC (rev 147788)
+++ extra-i686/kdebase.install	2012-01-28 10:33:03 UTC (rev 147789)
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdebase/repos/extra-i686/kdebase.install (from rev 147757, kdebase/repos/testing-i686/kdebase.install)
===================================================================
--- extra-i686/kdebase.install	                        (rev 0)
+++ extra-i686/kdebase.install	2012-01-28 10:33:03 UTC (rev 147789)
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}




More information about the arch-commits mailing list