[arch-commits] Commit in kdebase/trunk (PKGBUILD fix-folder-view-regression.patch)
Andrea Scarpino
andrea at archlinux.org
Mon Feb 28 23:54:03 UTC 2011
Date: Monday, February 28, 2011 @ 18:54:02
Author: andrea
Revision: 111774
KDE 4.6.1
Modified:
kdebase/trunk/PKGBUILD
Deleted:
kdebase/trunk/fix-folder-view-regression.patch
----------------------------------+
PKGBUILD | 44 +++++++----------
fix-folder-view-regression.patch | 95 -------------------------------------
2 files changed, 19 insertions(+), 120 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-02-28 23:53:58 UTC (rev 111773)
+++ PKGBUILD 2011-02-28 23:54:02 UTC (rev 111774)
@@ -13,23 +13,17 @@
'kdebase-kwrite'
'kdebase-lib'
'kdebase-plasma')
-pkgver=4.6.0
-pkgrel=2
+pkgver=4.6.1
+pkgrel=1
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdebase')
makedepends=('kdebase-workspace' 'pkgconfig' 'cmake' 'automoc4' 'docbook-xsl')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'fix-folder-view-regression.patch')
-sha1sums=('887ddea760aaabb277082f9e8c0b2f8905e318b8'
- '63f3b16e9c05711465d9a059c53d94680d8709e7')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('18722baacb67e0e997acb79ce6836c25413633ba')
build() {
- # Already fixed upstream
- cd ${srcdir}/${pkgbase}-${pkgver}
- patch -Np1 -i ${srcdir}/fix-folder-view-regression.patch
-
cd ${srcdir}
mkdir build
cd build
@@ -45,32 +39,32 @@
depends=('kdebase-runtime' 'kdebase-lib')
optdepends=('ruby: servicemenu installation')
url="http://kde.org/applications/system/dolphin/"
- cd $srcdir/build/apps/dolphin
+ cd $srcdir/build/dolphin
make DESTDIR=$pkgdir install
- cd $srcdir/build/apps/doc/dolphin
+ cd $srcdir/build/doc/dolphin
make DESTDIR=$pkgdir install
}
package_kdebase-kdepasswd() {
pkgdesc='Change Password'
depends=('kdebase-runtime' 'kdebase-lib')
- cd $srcdir/build/apps/kdepasswd
+ cd $srcdir/build/kdepasswd
make DESTDIR=$pkgdir install
- cd $srcdir/build/apps/doc/kdepasswd
+ 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/apps/kdialog
+ cd $srcdir/build/kdialog
make DESTDIR=$pkgdir install
}
package_kdebase-keditbookmarks() {
pkgdesc='Bookmark Organizer and Editor'
depends=('kdebase-runtime')
- cd $srcdir/build/apps/keditbookmarks
+ cd $srcdir/build/keditbookmarks
make DESTDIR=$pkgdir install
}
@@ -79,9 +73,9 @@
depends=('kdebase-runtime' 'kdebase-lib')
url="http://kde.org/applications/utilities/kfind/"
install='kdebase.install'
- cd $srcdir/build/apps/kfind
+ cd $srcdir/build/kfind
make DESTDIR=$pkgdir install
- cd $srcdir/build/apps/doc/kfind
+ cd $srcdir/build/doc/kfind
make DESTDIR=$pkgdir install
}
@@ -94,7 +88,7 @@
conflicts=('kdebase-nsplugins')
replaces=('kdebase-nsplugins')
for i in konqueror doc/konqueror nsplugins; do
- cd $srcdir/build/apps/${i}
+ cd $srcdir/build/${i}
make DESTDIR=$pkgdir install
done
}
@@ -103,9 +97,9 @@
pkgdesc='Terminal'
depends=('kdebase-runtime')
url="http://kde.org/applications/system/konsole/"
- cd $srcdir/build/apps/konsole
+ cd $srcdir/build/konsole
make DESTDIR=$pkgdir install
- cd $srcdir/build/apps/doc/konsole
+ cd $srcdir/build/konsole/doc/manual
make DESTDIR=$pkgdir install
}
@@ -113,9 +107,9 @@
pkgdesc='Text Editor'
depends=('kdebase-runtime')
url="http://kde.org/applications/utilities/kwrite/"
- cd $srcdir/build/apps/kwrite
+ cd $srcdir/build/kwrite
make DESTDIR=$pkgdir install
- cd $srcdir/build/apps/doc/kwrite
+ cd $srcdir/build/doc/kwrite
make DESTDIR=$pkgdir install
}
@@ -123,13 +117,13 @@
pkgdesc='KDE libraries for the basic desktop applications'
groups=()
depends=('kdelibs')
- cd $srcdir/build/apps/lib
+ 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/apps/plasma
+ cd $srcdir/build/plasma
make DESTDIR=$pkgdir install
}
Deleted: fix-folder-view-regression.patch
===================================================================
--- fix-folder-view-regression.patch 2011-02-28 23:53:58 UTC (rev 111773)
+++ fix-folder-view-regression.patch 2011-02-28 23:54:02 UTC (rev 111774)
@@ -1,95 +0,0 @@
---- a/apps/plasma/applets/folderview/iconview.cpp
-+++ b/apps/plasma/applets/folderview/iconview.cpp
-@@ -1732,9 +1732,8 @@ void IconView::keyPressEvent(QKeyEvent *
- }
-
- nextIndex = currentIndex.sibling(newItem, currentIndex.column());
-- }
--
-- else { //If the user has moved the icons, i.e. the view is no longer sorted
-+ } else {
-+ //If the user has moved the icons, i.e. the view is no longer sorted
- QPoint currentPos = visualRect(currentIndex).center();
-
- //Store distance between the first and the current index-
-@@ -1813,8 +1812,7 @@ void IconView::mousePressEvent(QGraphics
- const QModelIndex index = indexAt(pos);
-
- // If an icon was pressed
-- if (index.isValid())
-- {
-+ if (index.isValid()) {
- //if ctrl is held
- if (event->modifiers() & Qt::ControlModifier) {
- m_selectionModel->select(index, QItemSelectionModel::Toggle);
-@@ -1833,16 +1831,11 @@ void IconView::mousePressEvent(QGraphics
- m_selectionModel->select(index, QItemSelectionModel::ClearAndSelect);
- m_selectionModel->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
- markAreaDirty(visibleArea());
-- }
-- else {
-+ } else {
- markAreaDirty(visualRect(index));
- }
-
-- if (!(event->modifiers() & (Qt::ControlModifier | Qt::ShiftModifier)) &&
-- KGlobalSettings::singleClick()) {
-- m_pressedIndex = index;
-- }
--
-+ m_pressedIndex = index;
- m_buttonDownPos = pos;
- return;
- }
-@@ -1882,8 +1875,7 @@ void IconView::mousePressEvent(QGraphics
-
- void IconView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
- {
-- if (event->button() == Qt::LeftButton)
-- {
-+ if (event->button() == Qt::LeftButton) {
- if (m_rubberBand.isValid()) {
- markAreaDirty(m_rubberBand);
- m_rubberBand = QRect();
-@@ -1894,22 +1886,27 @@ void IconView::mouseReleaseEvent(QGraphi
- const QModelIndex index = indexAt(pos);
-
- bool ctrlOrShiftPressed = (event->modifiers() & (Qt::ControlModifier | Qt::ShiftModifier));
-- if (index.isValid() && index == m_pressedIndex && !ctrlOrShiftPressed) {
-- if (!m_doubleClick && KGlobalSettings::singleClick()) {
-- emit activated(index);
-- m_selectionModel->clearSelection();
-- markAreaDirty(visibleArea());
-- }
-- // We don't clear and update the selection and current index in
-- // mousePressEvent() if the item is already selected when it's pressed,
-- // so we need to do that here.
-- if (m_selectionModel->currentIndex() != index ||
-- m_selectionModel->selectedIndexes().count() > 1) {
-- m_selectionModel->select(index, QItemSelectionModel::ClearAndSelect);
-- m_selectionModel->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
-+ if (index.isValid() && index == m_pressedIndex) {
-+ if (ctrlOrShiftPressed) {
- markAreaDirty(visibleArea());
-+ } else {
-+ if (!m_doubleClick) {
-+ if (KGlobalSettings::singleClick()) {
-+ emit activated(index);
-+ m_selectionModel->clearSelection();
-+ }
-+ markAreaDirty(visibleArea());
-+ }
-+ // We don't clear and update the selection and current index in
-+ // mousePressEvent() if the item is already selected when it's pressed,
-+ // so we need to do that here.
-+ if (m_selectionModel->currentIndex() != index ||
-+ m_selectionModel->selectedIndexes().count() > 1) {
-+ m_selectionModel->select(index, QItemSelectionModel::ClearAndSelect);
-+ m_selectionModel->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
-+ markAreaDirty(visibleArea());
-+ }
- }
-- m_doubleClick = false;
- }
- }
-
More information about the arch-commits
mailing list