[arch-commits] Commit in kdebase/repos (20 files)
Andrea Scarpino
andrea at archlinux.org
Sat Jan 5 13:05:13 UTC 2013
Date: Saturday, January 5, 2013 @ 08:05:13
Author: andrea
Revision: 174650
db-move: moved kdebase from [testing] to [extra] (i686, x86_64)
Added:
kdebase/repos/extra-i686/PKGBUILD
(from rev 174649, kdebase/repos/testing-i686/PKGBUILD)
kdebase/repos/extra-i686/kdebase-dolphin.install
(from rev 174649, kdebase/repos/testing-i686/kdebase-dolphin.install)
kdebase/repos/extra-i686/kdebase-konqueror.install
(from rev 174649, kdebase/repos/testing-i686/kdebase-konqueror.install)
kdebase/repos/extra-i686/kdebase.install
(from rev 174649, kdebase/repos/testing-i686/kdebase.install)
kdebase/repos/extra-x86_64/PKGBUILD
(from rev 174649, kdebase/repos/testing-x86_64/PKGBUILD)
kdebase/repos/extra-x86_64/kdebase-dolphin.install
(from rev 174649, kdebase/repos/testing-x86_64/kdebase-dolphin.install)
kdebase/repos/extra-x86_64/kdebase-konqueror.install
(from rev 174649, kdebase/repos/testing-x86_64/kdebase-konqueror.install)
kdebase/repos/extra-x86_64/kdebase.install
(from rev 174649, kdebase/repos/testing-x86_64/kdebase.install)
Deleted:
kdebase/repos/extra-i686/PKGBUILD
kdebase/repos/extra-i686/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
kdebase/repos/extra-i686/kdebase-dolphin.install
kdebase/repos/extra-i686/kdebase-konqueror.install
kdebase/repos/extra-i686/kdebase.install
kdebase/repos/extra-x86_64/PKGBUILD
kdebase/repos/extra-x86_64/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
kdebase/repos/extra-x86_64/kdebase-dolphin.install
kdebase/repos/extra-x86_64/kdebase-konqueror.install
kdebase/repos/extra-x86_64/kdebase.install
kdebase/repos/testing-i686/
kdebase/repos/testing-x86_64/
-------------------------------------------------------------+
extra-i686/PKGBUILD | 244 ++++------
extra-i686/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff | 232 ---------
extra-i686/kdebase-dolphin.install | 22
extra-i686/kdebase-konqueror.install | 24
extra-i686/kdebase.install | 22
extra-x86_64/PKGBUILD | 244 ++++------
extra-x86_64/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff | 232 ---------
extra-x86_64/kdebase-dolphin.install | 22
extra-x86_64/kdebase-konqueror.install | 24
extra-x86_64/kdebase.install | 22
10 files changed, 306 insertions(+), 782 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-01-05 13:04:41 UTC (rev 174649)
+++ extra-i686/PKGBUILD 2013-01-05 13:05:13 UTC (rev 174650)
@@ -1,125 +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.9.4
-pkgrel=2
-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.xz"
- 'kde-baseapps-4.9.4-fix-bugs-311206-311246.diff')
-sha1sums=('b68e76766331272a45b1d897adf4c1928a11e747'
- '998f1db2309744dd2c054aec3462a717bc107c2e')
-
-build() {
- cd kde-baseapps-${pkgver}
- patch -p1 -i "${srcdir}"/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
- cd ../
-
- 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/PKGBUILD (from rev 174649, kdebase/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-01-05 13:05:13 UTC (rev 174650)
@@ -0,0 +1,119 @@
+# $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.9.5
+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.xz")
+sha1sums=('67d1c2c83570aac1d3c026cdecd82833e8d8b568')
+
+build() {
+ 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
+}
Deleted: extra-i686/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
===================================================================
--- extra-i686/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff 2013-01-05 13:04:41 UTC (rev 174649)
+++ extra-i686/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff 2013-01-05 13:05:13 UTC (rev 174650)
@@ -1,232 +0,0 @@
-diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-index f92cab5..af16954 100644
---- a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-@@ -193,7 +193,8 @@ KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* infor
- m_additionalInfoTextColor(),
- m_overlay(),
- m_rating(),
-- m_roleEditor(0)
-+ m_roleEditor(0),
-+ m_oldRoleEditor(0)
- {
- }
-
-@@ -203,6 +204,7 @@ KStandardItemListWidget::~KStandardItemListWidget()
- m_textInfo.clear();
-
- delete m_roleEditor;
-+ delete m_oldRoleEditor;
- }
-
- void KStandardItemListWidget::setLayout(Layout layout)
-@@ -609,13 +611,16 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const
- this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
- disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
- this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
-- // Do not delete the role editor using deleteLater() because we might be
-- // inside a nested event loop which has been started by one of its event
-- // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
-- m_roleEditor->deleteWhenIdle();
-+ m_oldRoleEditor = m_roleEditor;
-+ m_roleEditor->hide();
- m_roleEditor = 0;
- }
- return;
-+ } else if (m_oldRoleEditor) {
-+ // Delete the old editor before constructing the new one to
-+ // prevent a memory leak.
-+ m_oldRoleEditor->deleteLater();
-+ m_oldRoleEditor = 0;
- }
-
- Q_ASSERT(!m_roleEditor);
-@@ -1267,21 +1272,19 @@ QRectF KStandardItemListWidget::roleEditingRect(const QByteArray& role) const
-
- void KStandardItemListWidget::closeRoleEditor()
- {
-+ disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
-+ this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
-+ disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
-+ this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
-+
- if (m_roleEditor->hasFocus()) {
- // If the editing was not ended by a FocusOut event, we have
- // to transfer the keyboard focus back to the KItemListContainer.
- scene()->views()[0]->parentWidget()->setFocus();
- }
-
-- disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
-- this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
-- disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
-- this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
--
-- // Do not delete the role editor using deleteLater() because we might be
-- // inside a nested event loop which has been started by one of its event
-- // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
-- m_roleEditor->deleteWhenIdle();
-+ m_oldRoleEditor = m_roleEditor;
-+ m_roleEditor->hide();
- m_roleEditor = 0;
- }
-
-diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.h b/dolphin/src/kitemviews/kstandarditemlistwidget.h
-index 787722d..386f60e 100644
---- a/dolphin/src/kitemviews/kstandarditemlistwidget.h
-+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.h
-@@ -241,6 +241,7 @@ private:
- QPixmap m_rating;
-
- KItemListRoleEditor* m_roleEditor;
-+ KItemListRoleEditor* m_oldRoleEditor;
-
- friend class KStandardItemListWidgetInformant; // Accesses private static methods to be able to
- // share a common layout calculation
-diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-index 78dbfe9..1e4b5fd 100644
---- a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-+++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-@@ -26,9 +26,7 @@ KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
- KTextEdit(parent),
- m_index(0),
- m_role(),
-- m_blockFinishedSignal(false),
-- m_eventHandlingLevel(0),
-- m_deleteAfterEventHandling(false)
-+ m_blockFinishedSignal(false)
- {
- setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-@@ -66,20 +64,6 @@ QByteArray KItemListRoleEditor::role() const
- return m_role;
- }
-
--void KItemListRoleEditor::deleteWhenIdle()
--{
-- if (m_eventHandlingLevel > 0) {
-- // We are handling an event at the moment. It could be that we
-- // are in a nested event loop run by contextMenuEvent() or a
-- // call of mousePressEvent() which results in drag&drop.
-- // -> do not call deleteLater() to prevent a crash when we
-- // return from the nested event loop.
-- m_deleteAfterEventHandling = true;
-- } else {
-- deleteLater();
-- }
--}
--
- bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
- {
- if (watched == parentWidget() && event->type() == QEvent::Resize) {
-@@ -91,42 +75,13 @@ bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
-
- bool KItemListRoleEditor::event(QEvent* event)
- {
-- ++m_eventHandlingLevel;
--
- if (event->type() == QEvent::FocusOut) {
- QFocusEvent* focusEvent = static_cast<QFocusEvent*>(event);
- if (focusEvent->reason() != Qt::PopupFocusReason) {
- emitRoleEditingFinished();
- }
- }
--
-- const int result = KTextEdit::event(event);
-- --m_eventHandlingLevel;
--
-- if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
-- // Schedule this object for deletion and make sure that we do not try
-- // to deleteLater() again when the DeferredDelete event is received.
-- deleteLater();
-- m_deleteAfterEventHandling = false;
-- }
--
-- return result;
--}
--
--bool KItemListRoleEditor::viewportEvent(QEvent* event)
--{
-- ++m_eventHandlingLevel;
-- const bool result = KTextEdit::viewportEvent(event);
-- --m_eventHandlingLevel;
--
-- if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
-- // Schedule this object for deletion and make sure that we do not try
-- // to deleteLater() again when the DeferredDelete event is received.
-- deleteLater();
-- m_deleteAfterEventHandling = false;
-- }
--
-- return result;
-+ return KTextEdit::event(event);
- }
-
- void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
-@@ -144,8 +99,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
- return;
- case Qt::Key_Enter:
- case Qt::Key_Return:
-- // TODO: find a better way to fix the bug 309760
-- clearFocus(); // emitRoleEditingFinished(); results in a crash
-+ emitRoleEditingFinished();
- event->accept();
- return;
- default:
-diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.h b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-index a2f7058..aa2c977 100644
---- a/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-+++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-@@ -47,15 +47,6 @@ public:
- void setRole(const QByteArray& role);
- QByteArray role() const;
-
-- /**
-- * Calls deleteLater() if no event is being handled at the moment.
-- * Otherwise, the deletion is deferred until the event handling is
-- * finished. This prevents that the deletion happens inside a nested
-- * event loop which might be run in contextMenuEvent() or
-- * mouseMoveEvent() because this would probably cause a crash.
-- */
-- void deleteWhenIdle();
--
- virtual bool eventFilter(QObject* watched, QEvent* event);
-
- signals:
-@@ -64,7 +55,6 @@ signals:
-
- protected:
- virtual bool event(QEvent* event);
-- virtual bool viewportEvent(QEvent* event);
- virtual void keyPressEvent(QKeyEvent* event);
-
- private slots:
-@@ -85,8 +75,6 @@ private:
- int m_index;
- QByteArray m_role;
- bool m_blockFinishedSignal;
-- int m_eventHandlingLevel;
-- bool m_deleteAfterEventHandling;
- };
-
- #endif
-diff --git a/dolphin/src/views/dolphinview.cpp b/dolphin/src/views/dolphinview.cpp
-index 70a7394..0e97c5a 100644
---- a/dolphin/src/views/dolphinview.cpp
-+++ b/dolphin/src/views/dolphinview.cpp
-@@ -1227,11 +1227,14 @@ void DolphinView::updateViewState()
-
- QSet<int> selectedItems = selectionManager->selectedItems();
-
-- for (QList<KUrl>::iterator it = m_selectedUrls.begin(); it != m_selectedUrls.end(); ++it) {
-+ QList<KUrl>::iterator it = m_selectedUrls.begin();
-+ while (it != m_selectedUrls.end()) {
- const int index = m_model->index(*it);
- if (index >= 0) {
- selectedItems.insert(index);
-- m_selectedUrls.erase(it);
-+ it = m_selectedUrls.erase(it);
-+ } else {
-+ ++it;
- }
- }
-
Deleted: extra-i686/kdebase-dolphin.install
===================================================================
--- extra-i686/kdebase-dolphin.install 2013-01-05 13:04:41 UTC (rev 174649)
+++ extra-i686/kdebase-dolphin.install 2013-01-05 13:05:13 UTC (rev 174650)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdebase/repos/extra-i686/kdebase-dolphin.install (from rev 174649, kdebase/repos/testing-i686/kdebase-dolphin.install)
===================================================================
--- extra-i686/kdebase-dolphin.install (rev 0)
+++ extra-i686/kdebase-dolphin.install 2013-01-05 13:05:13 UTC (rev 174650)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-i686/kdebase-konqueror.install
===================================================================
--- extra-i686/kdebase-konqueror.install 2013-01-05 13:04:41 UTC (rev 174649)
+++ extra-i686/kdebase-konqueror.install 2013-01-05 13:05:13 UTC (rev 174650)
@@ -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: kdebase/repos/extra-i686/kdebase-konqueror.install (from rev 174649, kdebase/repos/testing-i686/kdebase-konqueror.install)
===================================================================
--- extra-i686/kdebase-konqueror.install (rev 0)
+++ extra-i686/kdebase-konqueror.install 2013-01-05 13:05:13 UTC (rev 174650)
@@ -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 2013-01-05 13:04:41 UTC (rev 174649)
+++ extra-i686/kdebase.install 2013-01-05 13:05:13 UTC (rev 174650)
@@ -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 174649, kdebase/repos/testing-i686/kdebase.install)
===================================================================
--- extra-i686/kdebase.install (rev 0)
+++ extra-i686/kdebase.install 2013-01-05 13:05:13 UTC (rev 174650)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-01-05 13:04:41 UTC (rev 174649)
+++ extra-x86_64/PKGBUILD 2013-01-05 13:05:13 UTC (rev 174650)
@@ -1,125 +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.9.4
-pkgrel=2
-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.xz"
- 'kde-baseapps-4.9.4-fix-bugs-311206-311246.diff')
-sha1sums=('b68e76766331272a45b1d897adf4c1928a11e747'
- '998f1db2309744dd2c054aec3462a717bc107c2e')
-
-build() {
- cd kde-baseapps-${pkgver}
- patch -p1 -i "${srcdir}"/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
- cd ../
-
- 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-x86_64/PKGBUILD (from rev 174649, kdebase/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-01-05 13:05:13 UTC (rev 174650)
@@ -0,0 +1,119 @@
+# $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.9.5
+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.xz")
+sha1sums=('67d1c2c83570aac1d3c026cdecd82833e8d8b568')
+
+build() {
+ 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
+}
Deleted: extra-x86_64/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
===================================================================
--- extra-x86_64/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff 2013-01-05 13:04:41 UTC (rev 174649)
+++ extra-x86_64/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff 2013-01-05 13:05:13 UTC (rev 174650)
@@ -1,232 +0,0 @@
-diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-index f92cab5..af16954 100644
---- a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-@@ -193,7 +193,8 @@ KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* infor
- m_additionalInfoTextColor(),
- m_overlay(),
- m_rating(),
-- m_roleEditor(0)
-+ m_roleEditor(0),
-+ m_oldRoleEditor(0)
- {
- }
-
-@@ -203,6 +204,7 @@ KStandardItemListWidget::~KStandardItemListWidget()
- m_textInfo.clear();
-
- delete m_roleEditor;
-+ delete m_oldRoleEditor;
- }
-
- void KStandardItemListWidget::setLayout(Layout layout)
-@@ -609,13 +611,16 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const
- this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
- disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
- this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
-- // Do not delete the role editor using deleteLater() because we might be
-- // inside a nested event loop which has been started by one of its event
-- // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
-- m_roleEditor->deleteWhenIdle();
-+ m_oldRoleEditor = m_roleEditor;
-+ m_roleEditor->hide();
- m_roleEditor = 0;
- }
- return;
-+ } else if (m_oldRoleEditor) {
-+ // Delete the old editor before constructing the new one to
-+ // prevent a memory leak.
-+ m_oldRoleEditor->deleteLater();
-+ m_oldRoleEditor = 0;
- }
-
- Q_ASSERT(!m_roleEditor);
-@@ -1267,21 +1272,19 @@ QRectF KStandardItemListWidget::roleEditingRect(const QByteArray& role) const
-
- void KStandardItemListWidget::closeRoleEditor()
- {
-+ disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
-+ this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
-+ disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
-+ this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
-+
- if (m_roleEditor->hasFocus()) {
- // If the editing was not ended by a FocusOut event, we have
- // to transfer the keyboard focus back to the KItemListContainer.
- scene()->views()[0]->parentWidget()->setFocus();
- }
-
-- disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
-- this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
-- disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
-- this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
--
-- // Do not delete the role editor using deleteLater() because we might be
-- // inside a nested event loop which has been started by one of its event
-- // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
-- m_roleEditor->deleteWhenIdle();
-+ m_oldRoleEditor = m_roleEditor;
-+ m_roleEditor->hide();
- m_roleEditor = 0;
- }
-
-diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.h b/dolphin/src/kitemviews/kstandarditemlistwidget.h
-index 787722d..386f60e 100644
---- a/dolphin/src/kitemviews/kstandarditemlistwidget.h
-+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.h
-@@ -241,6 +241,7 @@ private:
- QPixmap m_rating;
-
- KItemListRoleEditor* m_roleEditor;
-+ KItemListRoleEditor* m_oldRoleEditor;
-
- friend class KStandardItemListWidgetInformant; // Accesses private static methods to be able to
- // share a common layout calculation
-diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-index 78dbfe9..1e4b5fd 100644
---- a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-+++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-@@ -26,9 +26,7 @@ KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
- KTextEdit(parent),
- m_index(0),
- m_role(),
-- m_blockFinishedSignal(false),
-- m_eventHandlingLevel(0),
-- m_deleteAfterEventHandling(false)
-+ m_blockFinishedSignal(false)
- {
- setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-@@ -66,20 +64,6 @@ QByteArray KItemListRoleEditor::role() const
- return m_role;
- }
-
--void KItemListRoleEditor::deleteWhenIdle()
--{
-- if (m_eventHandlingLevel > 0) {
-- // We are handling an event at the moment. It could be that we
-- // are in a nested event loop run by contextMenuEvent() or a
-- // call of mousePressEvent() which results in drag&drop.
-- // -> do not call deleteLater() to prevent a crash when we
-- // return from the nested event loop.
-- m_deleteAfterEventHandling = true;
-- } else {
-- deleteLater();
-- }
--}
--
- bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
- {
- if (watched == parentWidget() && event->type() == QEvent::Resize) {
-@@ -91,42 +75,13 @@ bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
-
- bool KItemListRoleEditor::event(QEvent* event)
- {
-- ++m_eventHandlingLevel;
--
- if (event->type() == QEvent::FocusOut) {
- QFocusEvent* focusEvent = static_cast<QFocusEvent*>(event);
- if (focusEvent->reason() != Qt::PopupFocusReason) {
- emitRoleEditingFinished();
- }
- }
--
-- const int result = KTextEdit::event(event);
-- --m_eventHandlingLevel;
--
-- if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
-- // Schedule this object for deletion and make sure that we do not try
-- // to deleteLater() again when the DeferredDelete event is received.
-- deleteLater();
-- m_deleteAfterEventHandling = false;
-- }
--
-- return result;
--}
--
--bool KItemListRoleEditor::viewportEvent(QEvent* event)
--{
-- ++m_eventHandlingLevel;
-- const bool result = KTextEdit::viewportEvent(event);
-- --m_eventHandlingLevel;
--
-- if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
-- // Schedule this object for deletion and make sure that we do not try
-- // to deleteLater() again when the DeferredDelete event is received.
-- deleteLater();
-- m_deleteAfterEventHandling = false;
-- }
--
-- return result;
-+ return KTextEdit::event(event);
- }
-
- void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
-@@ -144,8 +99,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
- return;
- case Qt::Key_Enter:
- case Qt::Key_Return:
-- // TODO: find a better way to fix the bug 309760
-- clearFocus(); // emitRoleEditingFinished(); results in a crash
-+ emitRoleEditingFinished();
- event->accept();
- return;
- default:
-diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.h b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-index a2f7058..aa2c977 100644
---- a/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-+++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-@@ -47,15 +47,6 @@ public:
- void setRole(const QByteArray& role);
- QByteArray role() const;
-
-- /**
-- * Calls deleteLater() if no event is being handled at the moment.
-- * Otherwise, the deletion is deferred until the event handling is
-- * finished. This prevents that the deletion happens inside a nested
-- * event loop which might be run in contextMenuEvent() or
-- * mouseMoveEvent() because this would probably cause a crash.
-- */
-- void deleteWhenIdle();
--
- virtual bool eventFilter(QObject* watched, QEvent* event);
-
- signals:
-@@ -64,7 +55,6 @@ signals:
-
- protected:
- virtual bool event(QEvent* event);
-- virtual bool viewportEvent(QEvent* event);
- virtual void keyPressEvent(QKeyEvent* event);
-
- private slots:
-@@ -85,8 +75,6 @@ private:
- int m_index;
- QByteArray m_role;
- bool m_blockFinishedSignal;
-- int m_eventHandlingLevel;
-- bool m_deleteAfterEventHandling;
- };
-
- #endif
-diff --git a/dolphin/src/views/dolphinview.cpp b/dolphin/src/views/dolphinview.cpp
-index 70a7394..0e97c5a 100644
---- a/dolphin/src/views/dolphinview.cpp
-+++ b/dolphin/src/views/dolphinview.cpp
-@@ -1227,11 +1227,14 @@ void DolphinView::updateViewState()
-
- QSet<int> selectedItems = selectionManager->selectedItems();
-
-- for (QList<KUrl>::iterator it = m_selectedUrls.begin(); it != m_selectedUrls.end(); ++it) {
-+ QList<KUrl>::iterator it = m_selectedUrls.begin();
-+ while (it != m_selectedUrls.end()) {
- const int index = m_model->index(*it);
- if (index >= 0) {
- selectedItems.insert(index);
-- m_selectedUrls.erase(it);
-+ it = m_selectedUrls.erase(it);
-+ } else {
-+ ++it;
- }
- }
-
Deleted: extra-x86_64/kdebase-dolphin.install
===================================================================
--- extra-x86_64/kdebase-dolphin.install 2013-01-05 13:04:41 UTC (rev 174649)
+++ extra-x86_64/kdebase-dolphin.install 2013-01-05 13:05:13 UTC (rev 174650)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdebase/repos/extra-x86_64/kdebase-dolphin.install (from rev 174649, kdebase/repos/testing-x86_64/kdebase-dolphin.install)
===================================================================
--- extra-x86_64/kdebase-dolphin.install (rev 0)
+++ extra-x86_64/kdebase-dolphin.install 2013-01-05 13:05:13 UTC (rev 174650)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/kdebase-konqueror.install
===================================================================
--- extra-x86_64/kdebase-konqueror.install 2013-01-05 13:04:41 UTC (rev 174649)
+++ extra-x86_64/kdebase-konqueror.install 2013-01-05 13:05:13 UTC (rev 174650)
@@ -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: kdebase/repos/extra-x86_64/kdebase-konqueror.install (from rev 174649, kdebase/repos/testing-x86_64/kdebase-konqueror.install)
===================================================================
--- extra-x86_64/kdebase-konqueror.install (rev 0)
+++ extra-x86_64/kdebase-konqueror.install 2013-01-05 13:05:13 UTC (rev 174650)
@@ -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-x86_64/kdebase.install
===================================================================
--- extra-x86_64/kdebase.install 2013-01-05 13:04:41 UTC (rev 174649)
+++ extra-x86_64/kdebase.install 2013-01-05 13:05:13 UTC (rev 174650)
@@ -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-x86_64/kdebase.install (from rev 174649, kdebase/repos/testing-x86_64/kdebase.install)
===================================================================
--- extra-x86_64/kdebase.install (rev 0)
+++ extra-x86_64/kdebase.install 2013-01-05 13:05:13 UTC (rev 174650)
@@ -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