summaryrefslogtreecommitdiff
path: root/extra/kdelibs
diff options
context:
space:
mode:
Diffstat (limited to 'extra/kdelibs')
-rw-r--r--extra/kdelibs/PKGBUILD31
-rw-r--r--extra/kdelibs/abs-syntax-highlight.patch12
-rw-r--r--extra/kdelibs/fix-lineedit-clear-button.patch30
-rw-r--r--extra/kdelibs/fix-lineedit-completion-tab.patch56
-rw-r--r--extra/kdelibs/kdelibs.install3
5 files changed, 10 insertions, 122 deletions
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index 55535c10c..759360ddd 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131295 2011-07-12 17:46:50Z andrea $
+# $Id: PKGBUILD 132565 2011-07-25 00:11:50Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdelibs
-pkgver=4.6.5
-pkgrel=2
+pkgver=4.7.0
+pkgrel=1
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -16,36 +16,22 @@ depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
'docbook-xsl')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
'hspell')
-replaces=('arts' 'kdelibs-experimental')
+replaces=('kdelibs-experimental')
install='kdelibs.install'
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
- 'kde-applications-menu.patch'
- 'abs-syntax-highlight.patch'
- 'fix-lineedit-clear-button.patch'
- 'fix-lineedit-completion-tab.patch')
-sha1sums=('9bb948769a3a5d4d5b6c65e84a8cf570bd7bc120'
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- 'd994f262356af5b9e4e9619646e471bd98c91efb'
- '3deae3fc6733624759ad8bf5a1560d9a2f792d73'
- 'a5f223b61499fa03043def0b3a45b1712cc72d70')
+ 'kde-applications-menu.patch')
+sha1sums=('2a7a59ac78a161c7c2393db89179449b495dd2db'
+ '86ee8c8660f19de8141ac99cd6943964d97a1ed7')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
# avoid file conflict with gnome-menu
patch -p1 -i $srcdir/kde-applications-menu.patch
- # add syntax highlightning for PKGBUILD and .install files
- patch -p1 -i $srcdir/abs-syntax-highlight.patch
-
- # Already fixed upstream
- patch -p1 -i "${srcdir}"/fix-lineedit-clear-button.patch
- patch -p1 -i "${srcdir}"/fix-lineedit-completion-tab.patch
cd ${srcdir}
mkdir build
cd build
-# Fix for distcc
- CXX="g++" \
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
@@ -54,8 +40,7 @@ build() {
-DSYSCONF_INSTALL_DIR=/etc \
-DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-DKDE_DEFAULT_HOME='.kde4' \
- -DWITH_FAM=OFF \
- -DKAUTH_BACKEND=PolkitQt-1
+ -DWITH_FAM=OFF
make
}
diff --git a/extra/kdelibs/abs-syntax-highlight.patch b/extra/kdelibs/abs-syntax-highlight.patch
deleted file mode 100644
index 477479a9b..000000000
--- a/extra/kdelibs/abs-syntax-highlight.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nura kdelibs-4.3.0.orig/kate/syntax/data/bash.xml kdelibs-4.3.0/kate/syntax/data/bash.xml
---- kdelibs-4.3.0.orig/kate/syntax/data/bash.xml 2009-04-15 12:26:37.000000000 +0200
-+++ kdelibs-4.3.0/kate/syntax/data/bash.xml 2009-07-30 13:24:01.000000000 +0200
-@@ -8,7 +8,7 @@
- <!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or - following -->
- <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )"> <!-- valid character in a file name -->
- ]>
--<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;*.install" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-
- <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
- Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
diff --git a/extra/kdelibs/fix-lineedit-clear-button.patch b/extra/kdelibs/fix-lineedit-clear-button.patch
deleted file mode 100644
index 315892940..000000000
--- a/extra/kdelibs/fix-lineedit-clear-button.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 0b7201c1fe4f12dc7b17abbf19047864d1cca302
-Author: Andrea Iacovitti <aiacovitti@libero.it>
-Date: Sat Jul 9 19:51:40 2011 +0200
-
- Fix regression about input text clearButton stopping to work on khtml forms
- BUG: 246513
- FIXED-IN: 4.7.0
-
-diff --git a/kdeui/widgets/klineedit.cpp b/kdeui/widgets/klineedit.cpp
-index 7382806..8f1c8a4 100644
---- a/kdeui/widgets/klineedit.cpp
-+++ b/kdeui/widgets/klineedit.cpp
-@@ -1116,7 +1116,7 @@ void KLineEdit::mousePressEvent( QMouseEvent* e )
- if ( (e->button() == Qt::LeftButton ||
- e->button() == Qt::MidButton ) &&
- d->clearButton ) {
-- d->clickInClear = d->clearButton == childAt( e->pos() );
-+ d->clickInClear = ( d->clearButton == childAt(e->pos()) || d->clearButton->underMouse() );
-
- if ( d->clickInClear ) {
- d->possibleTripleClick = false;
-@@ -1145,7 +1145,7 @@ void KLineEdit::mousePressEvent( QMouseEvent* e )
- void KLineEdit::mouseReleaseEvent( QMouseEvent* e )
- {
- if ( d->clickInClear ) {
-- if ( d->clearButton == childAt( e->pos() ) ) {
-+ if ( d->clearButton == childAt(e->pos()) || d->clearButton->underMouse() ) {
- QString newText;
- if ( e->button() == Qt::MidButton ) {
- newText = QApplication::clipboard()->text( QClipboard::Selection );
diff --git a/extra/kdelibs/fix-lineedit-completion-tab.patch b/extra/kdelibs/fix-lineedit-completion-tab.patch
deleted file mode 100644
index 0c88dffc9..000000000
--- a/extra/kdelibs/fix-lineedit-completion-tab.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- kdelibs/khtml/rendering/render_form.cpp
-+++ kdelibs/khtml/rendering/render_form.cpp
-@@ -1012,11 +1012,11 @@
- // -----------------------------------------------------------------------------
-
- RenderLineEdit::RenderLineEdit(HTMLInputElementImpl *element)
-- : RenderFormElement(element)
-+ : RenderFormElement(element), m_blockElementUpdates(false)
- {
- LineEditWidget *edit = new LineEditWidget(element, view(), view()->widget());
- connect(edit,SIGNAL(returnPressed()), this, SLOT(slotReturnPressed()));
-- connect(edit,SIGNAL(textEdited(QString)),this,SLOT(slotTextEdited(QString)));
-+ connect(edit,SIGNAL(textChanged(QString)),this,SLOT(slotTextChanged(QString)));
-
- if(element->inputType() == HTMLInputElementImpl::PASSWORD)
- edit->setEchoMode( QLineEdit::Password );
-@@ -1142,17 +1142,21 @@
- }
-
- if (element()->value().string() != widget()->text()) {
-+ m_blockElementUpdates = true;
- int pos = widget()->cursorPosition();
- widget()->setText(element()->value().string());
- widget()->setCursorPosition(pos);
-+ m_blockElementUpdates = false;
- }
- widget()->setReadOnly(element()->readOnly());
-
- RenderFormElement::updateFromElement();
- }
-
--void RenderLineEdit::slotTextEdited(const QString &string)
-+void RenderLineEdit::slotTextChanged(const QString &string)
- {
-+ if (m_blockElementUpdates) return;
-+
- // don't use setValue here!
- element()->m_value = string;
- element()->m_unsubmittedFormChange = true;
---- kdelibs/khtml/rendering/render_form.h
-+++ kdelibs/khtml/rendering/render_form.h
-@@ -282,12 +282,13 @@
- void setSelectionRange(long start, long end);
- public Q_SLOTS:
- void slotReturnPressed();
-- void slotTextEdited(const QString &string);
-+ void slotTextChanged(const QString &string);
- protected:
-
- private:
- virtual bool isEditable() const { return true; }
- virtual bool canHaveBorder() const { return true; }
-+ bool m_blockElementUpdates;
- };
-
- // -------------------------------------------------------------------------
diff --git a/extra/kdelibs/kdelibs.install b/extra/kdelibs/kdelibs.install
index ce5c32e1b..c77e68041 100644
--- a/extra/kdelibs/kdelibs.install
+++ b/extra/kdelibs/kdelibs.install
@@ -1,6 +1,7 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
}
post_upgrade() {
@@ -9,4 +10,4 @@ post_upgrade() {
post_remove() {
post_install
-} \ No newline at end of file
+}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-10 18:42:45 +0000