[arch-commits] Commit in kdelibs/trunk (3 files)
Date: Wednesday, March 4, 2015 @ 03:27:31
Author: fyan
Revision: 232515
upgpkg: kdelibs 4.14.6-1
Modified:
kdelibs/trunk/PKGBUILD
Deleted:
kdelibs/trunk/kdelibs-cve-2014-5033.patch
kdelibs/trunk/pyqt.patch
-+
PKGBUILD|6 -
kdelibs-cve-2014-5033.patch | 36 --
pyqt.patch | 247 --
3 files changed, 3 insertions(+), 286 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-03-04 02:11:51 UTC (rev 232514)
+++ PKGBUILD2015-03-04 02:27:31 UTC (rev 232515)
@@ -4,8 +4,8 @@
# Contributor: Pierre Schmitz pie...@archlinux.de
pkgname=kdelibs
-pkgver=4.14.5
-_kdeappver=14.12.2
+pkgver=4.14.6
+_kdeappver=14.12.3
pkgrel=1
pkgdesc=KDE Core Libraries
arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@
install=${pkgname}.install
source=(http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz;
'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
-sha1sums=('92e4b13e41f946de0d647331f31ad83f4921c99a'
+sha1sums=('4411de9589204ed3b741ec68eeb3c37c7a0abca5'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67'
'ed1f57ee661e5c7440efcaba7e51d2554709701c')
Deleted: kdelibs-cve-2014-5033.patch
===
--- kdelibs-cve-2014-5033.patch 2015-03-04 02:11:51 UTC (rev 232514)
+++ kdelibs-cve-2014-5033.patch 2015-03-04 02:27:31 UTC (rev 232515)
@@ -1,36 +0,0 @@
a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
-+++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
-@@ -144,7 +144,7 @@
-
- Action::AuthStatus Polkit1Backend::actionStatus(const QString action)
- {
--PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid());
-+PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID()));
- PolkitQt1::Authority::Result r =
PolkitQt1::Authority::instance()-checkAuthorizationSync(action, subject,
-
PolkitQt1::Authority::None);
- switch (r) {
-@@ -160,21 +160,12 @@
-
- QByteArray Polkit1Backend::callerID() const
- {
--QByteArray a;
--QDataStream s(a, QIODevice::WriteOnly);
--s QCoreApplication::applicationPid();
--
--return a;
-+return QDBusConnection::systemBus().baseService().toUtf8();
- }
-
- bool Polkit1Backend::isCallerAuthorized(const QString action, QByteArray
callerID)
- {
--QDataStream s(callerID, QIODevice::ReadOnly);
--qint64 pid;
--
--s pid;
--
--PolkitQt1::UnixProcessSubject subject(pid);
-+PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID));
- PolkitQt1::Authority *authority = PolkitQt1::Authority::instance();
-
- PolkitResultEventLoop e;
-
Deleted: pyqt.patch
===
--- pyqt.patch 2015-03-04 02:11:51 UTC (rev 232514)
+++ pyqt.patch 2015-03-04 02:27:31 UTC (rev 232515)
@@ -1,247 +0,0 @@
-Make FindPyKDE4 work with PyQt's new build system.
-Make FindPyQt4 work with PyQt's new build system.
-
-Since PyQt 4.10, PyQt.pyqtconfig is deprecated and not available unless
-PyQt is built using the old configure script.
-
-PyKDE4 itself has recently been adjusted to mimic PyQt itself and only
-install its pykdeconfig module if pyqtconfig is present. Additionally,
-information such as SIP flags and the directory where PyKDE's SIP files
-are installed are now also provided in the
-PyKDE4.kdecore.PYKDE_CONFIGURATION dict.
-
-This commit completely rewrites FindPyKDE4.py to make it look like
-FindPyQt.cmake after commit a7e4743: most of the information used by
-FindPyKDE4.cmake is fetched from PyKDE4.kdecore, and we first try to
-obtain the SIP flags and directory from pykdeconfig and, if it fails, we
-use PYKDE_CONFIGURATION.
-
-Furthermore, FindPyKDE4.py now only prints the variables that are
-actually consumed by FindPyKDE4.cmake -- it is not possible to obtain
-all the data provided by pykdeconfig in PYKDE_CONFIGURATION. We've also
-stopped reading and setting PYKDE4_VERSION_TAG, since PyKDE4 stopped
-setting a KDE tag in 2008 (and its value was 3_92_0 at the time).
-
-CCBUG: 327633
-REVIEW: 119454
-
-BUG: 337462
-FIXED-IN: 4.14.0
-REVIEW: 119302
kdelibs-4.13.3/cmake/modules/FindPyKDE4.cmake~ 2014-08-06
21:54:27.564432282 +
-+++ kdelibs-4.13.3/cmake/modules/FindPyKDE4.cmake 2014-08-06
21:54:43.417702615 +
-@@ -25,7 +25,6 @@
- STRING(REGEX REPLACE .*\npykde_version_str:([^\n]+).*$ \\1
PYKDE4_VERSION_STR ${pykde_config})
- STRING(REGEX REPLACE .*\npykde_kde_sip_flags:([^\n]+).*$ \\1
PYKDE4_SIP_FLAGS ${pykde_config})
- STRING(REGEX REPLACE .*\npykde_sip_dir:([^\n]+).*$ \\1 PYKDE4_SIP_DIR
${pykde_config})
--STRING(REGEX REPLACE
[arch-commits] Commit in kdelibs/trunk (3 files)
Date: Wednesday, January 2, 2013 @ 05:59:35
Author: andrea
Revision: 174033
KDE 4.9.5
Modified:
kdelibs/trunk/PKGBUILD
Deleted:
kdelibs/trunk/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
kdelibs/trunk/fix-crash-on-open-with.patch
-+
0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch | 53
--
PKGBUILD| 18 ---
fix-crash-on-open-with.patch| 19 ---
3 files changed, 5 insertions(+), 85 deletions(-)
Deleted: 0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
===
--- 0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
2013-01-02 09:54:00 UTC (rev 174032)
+++ 0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
2013-01-02 10:59:35 UTC (rev 174033)
@@ -1,53 +0,0 @@
-From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001
-From: David Faure fa...@kde.org
-Date: Wed, 5 Dec 2012 22:42:25 +0100
-Subject: [PATCH] Revert Also check parent mimetypes in
- protocolForArchiveMimetype().
-
-This reverts commit 4f296cfbced2c4ad54beec8f500ed2d3fc04ee05.
-It breaks opening odt and other zip-based files in external apps.
-That's what I get for delegating the testing :-)
-BUG: 311214
- kio/kio/kprotocolmanager.cpp | 19 +--
- 1 files changed, 1 insertions(+), 18 deletions(-)
-
-diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
-index 3f1cadd..502a3e6 100644
a/kio/kio/kprotocolmanager.cpp
-+++ b/kio/kio/kprotocolmanager.cpp
-@@ -47,7 +47,6 @@
- #include ksharedconfig.h
- #include kstandarddirs.h
- #include kurl.h
--#include kmimetype.h
- #include kmimetypetrader.h
- #include kprotocolinfofactory.h
-
-@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype(
const QString mimeType )
- }
- }
- }
--const QString prot = d-protocolForArchiveMimetypes.value(mimeType);
--if (!prot.isEmpty())
--return prot;
--
--// Check parent mimetypes
--KMimeType::Ptr mime = KMimeType::mimeType(mimeType);
--if (mime) {
--const QStringList parentMimeTypes = mime-allParentMimeTypes();
--Q_FOREACH(const QString parentMimeType, parentMimeTypes) {
--const QString res =
d-protocolForArchiveMimetypes.value(parentMimeType);
--if (!res.isEmpty()) {
--return res;
--}
--}
--}
--
--return QString();
-+return d-protocolForArchiveMimetypes.value(mimeType);
- }
-
- #undef PRIVATE_DATA
---
-1.7.7
Modified: PKGBUILD
===
--- PKGBUILD2013-01-02 09:54:00 UTC (rev 174032)
+++ PKGBUILD2013-01-02 10:59:35 UTC (rev 174033)
@@ -3,8 +3,8 @@
# Contributor: Pierre Schmitz pie...@archlinux.de
pkgname=kdelibs
-pkgver=4.9.4
-pkgrel=4
+pkgver=4.9.5
+pkgrel=1
pkgdesc=KDE Core Libraries
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kdelibs'
@@ -17,14 +17,10 @@
makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
install=${pkgname}.install
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
-'kde-applications-menu.patch' 'archlinux-menu.patch'
-'0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch'
-'fix-crash-on-open-with.patch')
-sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be'
+'kde-applications-menu.patch' 'archlinux-menu.patch')
+sha1sums=('899a58c5cf2115a1a18fb1690c99b2b3815975c6'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'f5d203932f67ab6d87c794e9cb78a3b1a22ef747'
- '8faa5984ba37e9c6da04bc64f1fe21cd24f1cf07')
+ '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -34,10 +30,6 @@
# add Archlinux menu entry
patch -p1 -i ${srcdir}/archlinux-menu.patch
- # Fixed upstream
- patch -p1 -i
${srcdir}/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
- patch -p1 -i ${srcdir}/fix-crash-on-open-with.patch
-
cd ${srcdir}
mkdir build
cd build
Deleted: fix-crash-on-open-with.patch
===
--- fix-crash-on-open-with.patch2013-01-02 09:54:00 UTC (rev 174032)
+++ fix-crash-on-open-with.patch2013-01-02 10:59:35 UTC (rev 174033)
@@ -1,19 +0,0 @@
-commit 0820b3173aff4f0f3c803a9e75e726024da38ee5
-Author: David Faure fa...@kde.org
-Date: Thu Dec 6 11:55:05 2012 +0100
-
-Fix crash when no service was selected (user clicked on Open With...)
-
-diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp
-index 6d84800..6de0380 100644
a/kparts/browserrun.cpp
-+++
[arch-commits] Commit in kdelibs/trunk (3 files)
Date: Sunday, December 2, 2012 @ 02:41:49
Author: andrea
Revision: 172196
KDE 4.9.4
Modified:
kdelibs/trunk/PKGBUILD
Deleted:
kdelibs/trunk/fix-save-path.patch
kdelibs/trunk/use-pythondontwritebytecode.patch
---+
PKGBUILD | 18 +
fix-save-path.patch | 27
use-pythondontwritebytecode.patch | 113
3 files changed, 5 insertions(+), 153 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-12-02 04:41:05 UTC (rev 172195)
+++ PKGBUILD2012-12-02 07:41:49 UTC (rev 172196)
@@ -3,8 +3,8 @@
# Contributor: Pierre Schmitz pie...@archlinux.de
pkgname=kdelibs
-pkgver=4.9.3
-pkgrel=2
+pkgver=4.9.4
+pkgrel=1
pkgdesc=KDE Core Libraries
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kdelibs'
@@ -17,14 +17,10 @@
makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
install=${pkgname}.install
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
-'kde-applications-menu.patch' 'archlinux-menu.patch'
-'use-pythondontwritebytecode.patch'
-'fix-save-path.patch')
-sha1sums=('d5d60c431159b17a753ee7427d9ca129d550e3f8'
+'kde-applications-menu.patch' 'archlinux-menu.patch')
+sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- '1138e78f15faa7221669ea81e313c595000cc953'
- 'e3d2621bd1451fe7f45a454af970fae108614ddd')
+ '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -34,10 +30,6 @@
# add Archlinux menu entry
patch -p1 -i ${srcdir}/archlinux-menu.patch
- # Fixed upstream
- patch -p1 -i ${srcdir}/use-pythondontwritebytecode.patch
- patch -p1 -i ${srcdir}/fix-save-path.patch
-
cd ${srcdir}
mkdir build
cd build
Deleted: fix-save-path.patch
===
--- fix-save-path.patch 2012-12-02 04:41:05 UTC (rev 172195)
+++ fix-save-path.patch 2012-12-02 07:41:49 UTC (rev 172196)
@@ -1,27 +0,0 @@
-commit 793e2a69f8aa193b60494b03d51c5fd44373c0e7
-Author: Jonathan Marten j...@keelhaul.me.uk
-Date: Wed Nov 7 12:45:03 2012 +
-
-Fix regression: specified or remembered save path is not used
-
-As requested on review https://git.reviewboard.kde.org/r/106475/
-
-diff --git a/kfile/kfilewidget.cpp b/kfile/kfilewidget.cpp
-index 65deca2..e755aae 100644
a/kfile/kfilewidget.cpp
-+++ b/kfile/kfilewidget.cpp
-@@ -2593,8 +2593,12 @@ KUrl KFileWidget::getStartUrl( const KUrl startDir,
- }
- else // not special
kfiledialog URL
- {
--if (!startDir.isRelative()) // has directory, maybe with
filename
--{
-+// We can use startDir as the starting directory if either:
-+// (a) it has a directory part, or
-+// (b) there is a scheme (protocol), and it is not just file.
-+if (!startDir.directory().isEmpty() ||
-+(!startDir.scheme().isEmpty() !startDir.isLocalFile()))
-+{ // can use start
directory
- ret = startDir; // will be
checked by stat later
- // If we won't be able to list it (e.g. http), then use
default
- if ( !KProtocolManager::supportsListing( ret ) ) {
Deleted: use-pythondontwritebytecode.patch
===
--- use-pythondontwritebytecode.patch 2012-12-02 04:41:05 UTC (rev 172195)
+++ use-pythondontwritebytecode.patch 2012-12-02 07:41:49 UTC (rev 172196)
@@ -1,113 +0,0 @@
-From: Arfrever Frehtes Taifersar Arahesis arfre...@apache.org
-Date: Wed, 07 Nov 2012 19:08:01 +
-Subject: Respect PYTHONDONTWRITEBYTECODE environmental variable.
-X-Git-Url:
http://quickgit.kde.org/?p=kdelibs.gitamp;a=commitdiffamp;h=5a3cedacdb6485f7551090467cffb2cdf150b05a
-Respect PYTHONDONTWRITEBYTECODE environmental variable.
-
-BUG: 276151
-REVIEW: 107228
-
-
a/cmake/modules/PythonMacros.cmake
-+++ b/cmake/modules/PythonMacros.cmake
-@@ -23,54 +23,56 @@
- # Install the source file.
- INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR})
-
-- # Byte compile and install the .pyc file.
-- GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
-- GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
-- GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
-- GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
-+ # Byte compile and install the .pyc file.
-+ IF($ENV{PYTHONDONTWRITEBYTECODE} STREQUAL )
-+GET_FILENAME_COMPONENT(_absfilename
[arch-commits] Commit in kdelibs/trunk (3 files)
Date: Thursday, March 15, 2012 @ 09:55:48
Author: andrea
Revision: 153517
Fix a kmail bug with nepomuk (FS#28907); Set PYTHONDONTWRITEBYTECODE to build
PyKDE4 with Python3 support (KDEBUG#276151)
Added:
kdelibs/trunk/fix-kmail-crash.patch
kdelibs/trunk/use-pythondontwritebytecode.patch
Modified:
kdelibs/trunk/PKGBUILD
---+
PKGBUILD | 16 +--
fix-kmail-crash.patch | 71 +++
use-pythondontwritebytecode.patch | 80
3 files changed, 164 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-15 13:53:43 UTC (rev 153516)
+++ PKGBUILD2012-03-15 13:55:48 UTC (rev 153517)
@@ -4,7 +4,7 @@
pkgname=kdelibs
pkgver=4.8.1
-pkgrel=1
+pkgrel=2
pkgdesc=KDE Core Libraries
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -17,10 +17,14 @@
replaces=('kdelibs-experimental')
install=${pkgname}.install
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
-'kde-applications-menu.patch' 'archlinux-menu.patch')
+'kde-applications-menu.patch' 'archlinux-menu.patch'
+'fix-kmail-crash.patch'
+'use-pythondontwritebytecode.patch')
sha1sums=('da4e13f63ac340619351e9a2f4211cce8ec4fdf8'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+ '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+ '081b0663480568359120b573d26abb91e1a348c0'
+ 'a1e35760d5b4e29471ad357c963a343c67200f32')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -30,6 +34,12 @@
# add Archlinux menu entry
patch -p1 -i ${srcdir}/archlinux-menu.patch
+ # Upstream (FS#28907)
+ patch -p1 -i ${srcdir}/fix-kmail-crash.patch
+
+ # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
+ patch -p0 -i ${srcdir}/use-pythondontwritebytecode.patch
+
cd ${srcdir}
mkdir build
cd build
Added: fix-kmail-crash.patch
===
--- fix-kmail-crash.patch (rev 0)
+++ fix-kmail-crash.patch 2012-03-15 13:55:48 UTC (rev 153517)
@@ -0,0 +1,71 @@
+commit 979b0436510e7807c054e79c40c3753834ac2863
+Author: Sebastian Trueg tr...@kde.org
+Date: Thu Mar 15 09:14:35 2012 +0100
+
+Thread-safe ResourceWatcher handling.
+
+We simply perform all RW operations in the manager thread.
+
+BUG: 295474
+FIXED-IN: 4.8.2
+
+diff --git a/nepomuk/core/resourcedata.cpp b/nepomuk/core/resourcedata.cpp
+index abe55ea..9d45228 100644
+--- a/nepomuk/core/resourcedata.cpp
b/nepomuk/core/resourcedata.cpp
+@@ -175,7 +175,8 @@ void Nepomuk::ResourceData::resetAll( bool isDelete )
+ if( !m_uri.isEmpty() ) {
+ m_rm-m_initializedData.remove( m_uri );
+ if( m_rm-m_watcher m_addedToWatcher ) {
+-m_rm-m_watcher-removeResource(Resource::fromResourceUri(m_uri));
++// See load() for an explanation of the QMetaObject call
++QMetaObject::invokeMethod(m_rm-m_watcher, removeResource,
Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Resource::fromResourceUri(m_uri)));
+ m_addedToWatcher = false;
+ }
+ }
+@@ -393,16 +394,23 @@ bool Nepomuk::ResourceData::load()
+ m_cache.clear();
+
+ if(!m_rm-m_watcher) {
++//
++// The ResourceWatcher is not thread-safe. Thus, we need to
ensure the safety ourselves.
++// We do that by simply handling all RW related operations in the
manager thread.
++// This also means to invoke methods on the watcher through
QMetaObject to make sure they
++// get queued in case of calls between different threads.
++//
+ m_rm-m_watcher = new ResourceWatcher(m_rm-m_manager);
++m_rm-m_watcher-moveToThread(m_rm-m_manager-thread());
+ QObject::connect( m_rm-m_watcher,
SIGNAL(propertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
+ m_rm-m_manager,
SLOT(slotPropertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant))
);
+ QObject::connect( m_rm-m_watcher,
SIGNAL(propertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
+ m_rm-m_manager,
SLOT(slotPropertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property,
QVariant)) );
+ m_rm-m_watcher-addResource(
Nepomuk::Resource::fromResourceUri(m_uri) );
+-m_rm-m_watcher-start();
++QMetaObject::invokeMethod(m_rm-m_watcher, start,
Qt::AutoConnection);
+ }
+ else {
+-m_rm-m_watcher-addResource(
Nepomuk::Resource::fromResourceUri(m_uri) );
++QMetaObject::invokeMethod(m_rm-m_watcher, addResource,
Qt::AutoConnection,
[arch-commits] Commit in kdelibs/trunk (3 files)
Date: Tuesday, July 12, 2011 @ 13:46:50
Author: andrea
Revision: 131295
Fix regressions in KLineEdit BUG#277457 BUG#246513
Added:
kdelibs/trunk/fix-lineedit-clear-button.patch
kdelibs/trunk/fix-lineedit-completion-tab.patch
Modified:
kdelibs/trunk/PKGBUILD
---+
PKGBUILD | 14 +++--
fix-lineedit-clear-button.patch | 30 +++
fix-lineedit-completion-tab.patch | 56
3 files changed, 97 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-07-12 17:46:49 UTC (rev 131294)
+++ PKGBUILD2011-07-12 17:46:50 UTC (rev 131295)
@@ -4,7 +4,7 @@
pkgname=kdelibs
pkgver=4.6.5
-pkgrel=1
+pkgrel=2
pkgdesc=KDE Core Libraries
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -20,11 +20,15 @@
install='kdelibs.install'
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
'kde-applications-menu.patch' 'archlinux-menu.patch'
-'abs-syntax-highlight.patch')
+'abs-syntax-highlight.patch'
+'fix-lineedit-clear-button.patch'
+'fix-lineedit-completion-tab.patch')
sha1sums=('9bb948769a3a5d4d5b6c65e84a8cf570bd7bc120'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'd994f262356af5b9e4e9619646e471bd98c91efb')
+ 'd994f262356af5b9e4e9619646e471bd98c91efb'
+ '3deae3fc6733624759ad8bf5a1560d9a2f792d73'
+ 'a5f223b61499fa03043def0b3a45b1712cc72d70')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -36,6 +40,10 @@
# 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
Added: fix-lineedit-clear-button.patch
===
--- fix-lineedit-clear-button.patch (rev 0)
+++ fix-lineedit-clear-button.patch 2011-07-12 17:46:50 UTC (rev 131295)
@@ -0,0 +1,30 @@
+commit 0b7201c1fe4f12dc7b17abbf19047864d1cca302
+Author: Andrea Iacovitti aiacovi...@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 );
Added: fix-lineedit-completion-tab.patch
===
--- fix-lineedit-completion-tab.patch (rev 0)
+++ fix-lineedit-completion-tab.patch 2011-07-12 17:46:50 UTC (rev 131295)
@@ -0,0 +1,56 @@
+--- 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());
[arch-commits] Commit in kdelibs/trunk (3 files)
Date: Tuesday, April 5, 2011 @ 06:07:38
Author: andrea
Revision: 118061
KDE 4.6.2
Modified:
kdelibs/trunk/PKGBUILD
Deleted:
kdelibs/trunk/CVE-2011-1168.patch
kdelibs/trunk/fix-empty-dolphin-home.patch
--+
CVE-2011-1168.patch | 14 -
PKGBUILD | 18 -
fix-empty-dolphin-home.patch | 389 -
3 files changed, 5 insertions(+), 416 deletions(-)
Deleted: CVE-2011-1168.patch
===
--- CVE-2011-1168.patch 2011-04-05 09:38:47 UTC (rev 118060)
+++ CVE-2011-1168.patch 2011-04-05 10:07:38 UTC (rev 118061)
@@ -1,14 +0,0 @@
a/khtml/khtml_part.cpp
-+++ b/khtml/khtml_part.cpp
-@@ -1804,7 +1804,10 @@ void KHTMLPart::htmlError( int errorCode
- stream errorName techName description causes solutions;
-
- QString url, protocol, datetime;
-- url = Qt::escape( reqUrl.prettyUrl() );
-+
-+ // This is somewhat confusing, but we have to escape the externally-
-+ // controlled URL twice: once for i18n, and once for HTML.
-+ url = Qt::escape( Qt::escape( reqUrl.prettyUrl() ) );
- protocol = reqUrl.protocol();
- datetime = KGlobal::locale()-formatDateTime( QDateTime::currentDateTime(),
- KLocale::LongDate );
Modified: PKGBUILD
===
--- PKGBUILD2011-04-05 09:38:47 UTC (rev 118060)
+++ PKGBUILD2011-04-05 10:07:38 UTC (rev 118061)
@@ -3,8 +3,8 @@
# Contributor: Pierre Schmitz pie...@archlinux.de
pkgname=kdelibs
-pkgver=4.6.1
-pkgrel=3
+pkgver=4.6.2
+pkgrel=1
pkgdesc=KDE Core Libraries
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -19,15 +19,11 @@
replaces=('arts' 'kdelibs-experimental')
install='kdelibs.install'
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
-'kde-applications-menu.patch' 'archlinux-menu.patch'
'abs-syntax-highlight.patch'
-'CVE-2011-1168.patch'
-'fix-empty-dolphin-home.patch')
-sha1sums=('5868d43084b2dc9de4c0404dbec137375664e893'
+'kde-applications-menu.patch' 'archlinux-menu.patch'
'abs-syntax-highlight.patch')
+sha1sums=('b4794a9a69492ce4725abd9eb5d00d3a50e46603'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'd994f262356af5b9e4e9619646e471bd98c91efb'
- '730534a337c88ef2a7c716f5d118f445d06898e7'
- 'aaec293322f1483990ad8edbb1ec1a6dd69cf3ee')
+ 'd994f262356af5b9e4e9619646e471bd98c91efb')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -39,10 +35,6 @@
# add syntax highlightning for PKGBUILD and .install files
patch -p1 -i $srcdir/abs-syntax-highlight.patch
- # Already fixed upstream
- patch -Np1 -i ${srcdir}/CVE-2011-1168.patch
- patch -Np1 -i ${srcdir}/fix-empty-dolphin-home.patch
-
cd ${srcdir}
mkdir build
cd build
Deleted: fix-empty-dolphin-home.patch
===
--- fix-empty-dolphin-home.patch2011-04-05 09:38:47 UTC (rev 118060)
+++ fix-empty-dolphin-home.patch2011-04-05 10:07:38 UTC (rev 118061)
@@ -1,389 +0,0 @@
-commit 51707e7154082b549216b8a8ecde73505302fadc
-Author: David Faure fa...@kde.org
-Date: Tue Mar 8 11:23:47 2011 +0100
-
-Fix stop() killing the list job even if another dirlister needs it.
-
-Regression introduced by me in bef0bd3e3ff.
-Symptom: dolphin $HOME showed up empty.
-
-In the case of concurrent listings, I made the use of the cached items job
-conditional (only created if there's anything to emit) so that we can join
-the current listjob without killing it (updateDirectory) if it hasn't
emitted
-anything yet.
-The unittest also uncovered inconsistencies in the emission of the
cancelled
-signal, now cacheditemsjob behaves like the listjob in this respect.
-
-FIXED-IN: 4.6.2
-BUG: 267709
-
-diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp
-index 75360e08f..df81dc8 100644
a/kio/kio/kdirlister.cpp
-+++ b/kio/kio/kdirlister.cpp
-@@ -194,7 +194,7 @@ bool KDirListerCache::listDir( KDirLister *lister, const
KUrl _u,
-
- // List items from the cache in a delayed manner, just like
things would happen
- // if we were not using the cache.
--new KDirLister::Private::CachedItemsJob(lister, itemU-lstItems,
itemU-rootItem, _url, _reload);
-+new KDirLister::Private::CachedItemsJob(lister, _url, _reload);
-
- } else {
- // dir not in cache or _reload is true
-@@ -260,8 +260,13 @@ bool KDirListerCache::listDir( KDirLister *lister, const
KUrl _u,
-
- // List existing items in a delayed manner, just like things would
happen
- // if we were not using the cache.
--//kDebug() Listing
[arch-commits] Commit in kdelibs/trunk (3 files)
Date: Sunday, March 27, 2011 @ 09:27:39
Author: andrea
Revision: 117004
CVE-2011-1168; fix empty dolphin /home/andrea
Added:
kdelibs/trunk/CVE-2011-1168.patch
kdelibs/trunk/fix-empty-dolphin-home.patch
Modified:
kdelibs/trunk/PKGBUILD
--+
CVE-2011-1168.patch | 14 +
PKGBUILD | 14 +
fix-empty-dolphin-home.patch | 389 +
3 files changed, 414 insertions(+), 3 deletions(-)
Added: CVE-2011-1168.patch
===
--- CVE-2011-1168.patch (rev 0)
+++ CVE-2011-1168.patch 2011-03-27 13:27:39 UTC (rev 117004)
@@ -0,0 +1,14 @@
+--- a/khtml/khtml_part.cpp
b/khtml/khtml_part.cpp
+@@ -1804,7 +1804,10 @@ void KHTMLPart::htmlError( int errorCode
+ stream errorName techName description causes solutions;
+
+ QString url, protocol, datetime;
+- url = Qt::escape( reqUrl.prettyUrl() );
++
++ // This is somewhat confusing, but we have to escape the externally-
++ // controlled URL twice: once for i18n, and once for HTML.
++ url = Qt::escape( Qt::escape( reqUrl.prettyUrl() ) );
+ protocol = reqUrl.protocol();
+ datetime = KGlobal::locale()-formatDateTime( QDateTime::currentDateTime(),
+ KLocale::LongDate );
Modified: PKGBUILD
===
--- PKGBUILD2011-03-27 13:06:05 UTC (rev 117003)
+++ PKGBUILD2011-03-27 13:27:39 UTC (rev 117004)
@@ -4,7 +4,7 @@
pkgname=kdelibs
pkgver=4.6.1
-pkgrel=2
+pkgrel=3
pkgdesc=KDE Core Libraries
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -19,11 +19,15 @@
replaces=('arts' 'kdelibs-experimental')
install='kdelibs.install'
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
-'kde-applications-menu.patch' 'archlinux-menu.patch'
'abs-syntax-highlight.patch')
+'kde-applications-menu.patch' 'archlinux-menu.patch'
'abs-syntax-highlight.patch'
+'CVE-2011-1168.patch'
+'fix-empty-dolphin-home.patch')
sha1sums=('5868d43084b2dc9de4c0404dbec137375664e893'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'd994f262356af5b9e4e9619646e471bd98c91efb')
+ 'd994f262356af5b9e4e9619646e471bd98c91efb'
+ '730534a337c88ef2a7c716f5d118f445d06898e7'
+ 'aaec293322f1483990ad8edbb1ec1a6dd69cf3ee')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -35,6 +39,10 @@
# add syntax highlightning for PKGBUILD and .install files
patch -p1 -i $srcdir/abs-syntax-highlight.patch
+ # Already fixed upstream
+ patch -Np1 -i ${srcdir}/CVE-2011-1168.patch
+ patch -Np1 -i ${srcdir}/fix-empty-dolphin-home.patch
+
cd ${srcdir}
mkdir build
cd build
Added: fix-empty-dolphin-home.patch
===
--- fix-empty-dolphin-home.patch(rev 0)
+++ fix-empty-dolphin-home.patch2011-03-27 13:27:39 UTC (rev 117004)
@@ -0,0 +1,389 @@
+commit 51707e7154082b549216b8a8ecde73505302fadc
+Author: David Faure fa...@kde.org
+Date: Tue Mar 8 11:23:47 2011 +0100
+
+Fix stop() killing the list job even if another dirlister needs it.
+
+Regression introduced by me in bef0bd3e3ff.
+Symptom: dolphin $HOME showed up empty.
+
+In the case of concurrent listings, I made the use of the cached items job
+conditional (only created if there's anything to emit) so that we can join
+the current listjob without killing it (updateDirectory) if it hasn't
emitted
+anything yet.
+The unittest also uncovered inconsistencies in the emission of the
cancelled
+signal, now cacheditemsjob behaves like the listjob in this respect.
+
+FIXED-IN: 4.6.2
+BUG: 267709
+
+diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp
+index 75360e08f..df81dc8 100644
+--- a/kio/kio/kdirlister.cpp
b/kio/kio/kdirlister.cpp
+@@ -194,7 +194,7 @@ bool KDirListerCache::listDir( KDirLister *lister, const
KUrl _u,
+
+ // List items from the cache in a delayed manner, just like
things would happen
+ // if we were not using the cache.
+-new KDirLister::Private::CachedItemsJob(lister, itemU-lstItems,
itemU-rootItem, _url, _reload);
++new KDirLister::Private::CachedItemsJob(lister, _url, _reload);
+
+ } else {
+ // dir not in cache or _reload is true
+@@ -260,8 +260,13 @@ bool KDirListerCache::listDir( KDirLister *lister, const
KUrl _u,
+
+ // List existing items in a delayed manner, just like things would
happen
+ // if we were not using the cache.
+-//kDebug() Listing itemU-lstItems.count() cached items
soon;
+-new KDirLister::Private::CachedItemsJob(lister, itemU-lstItems,
[arch-commits] Commit in kdelibs/trunk (3 files)
Date: Monday, February 28, 2011 @ 18:52:39
Author: andrea
Revision: 111767
KDE 4.6.1
Modified:
kdelibs/trunk/PKGBUILD
Deleted:
kdelibs/trunk/fix-crash-in-plasma.patch
kdelibs/trunk/fix-vlc-hangs.patch
---+
PKGBUILD | 18 +-
fix-crash-in-plasma.patch | 22
fix-vlc-hangs.patch | 118
3 files changed, 5 insertions(+), 153 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-28 21:58:39 UTC (rev 111766)
+++ PKGBUILD2011-02-28 23:52:39 UTC (rev 111767)
@@ -3,8 +3,8 @@
# Contributor: Pierre Schmitz pie...@archlinux.de
pkgname=kdelibs
-pkgver=4.6.0
-pkgrel=3
+pkgver=4.6.1
+pkgrel=1
pkgdesc=KDE Core Libraries
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -19,15 +19,11 @@
replaces=('arts' 'kdelibs-experimental')
install='kdelibs.install'
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
-'kde-applications-menu.patch' 'archlinux-menu.patch'
'abs-syntax-highlight.patch'
-'fix-crash-in-plasma.patch'
-'fix-vlc-hangs.patch')
-sha1sums=('6ea3fc69f98fa91c5159ccd743d4d548e801c7bc'
+'kde-applications-menu.patch' 'archlinux-menu.patch'
'abs-syntax-highlight.patch')
+sha1sums=('5868d43084b2dc9de4c0404dbec137375664e893'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'd994f262356af5b9e4e9619646e471bd98c91efb'
- '270f24d9682c32c9f69b3e6e13696888724c5169'
- 'b4cefad7e1aec2a9d3c52c5c633566aad3b08d1d')
+ 'd994f262356af5b9e4e9619646e471bd98c91efb')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -39,10 +35,6 @@
# add syntax highlightning for PKGBUILD and .install files
patch -p1 -i $srcdir/abs-syntax-highlight.patch
- # Already fixed upstream
- patch -Np1 -i ${srcdir}/fix-crash-in-plasma.patch
- patch -Np1 -i ${srcdir}/fix-vlc-hangs.patch
-
cd ${srcdir}
mkdir build
cd build
Deleted: fix-crash-in-plasma.patch
===
--- fix-crash-in-plasma.patch 2011-02-28 21:58:39 UTC (rev 111766)
+++ fix-crash-in-plasma.patch 2011-02-28 23:52:39 UTC (rev 111767)
@@ -1,22 +0,0 @@
-commit 709f75ac353cd735ccac31f87363ea90dde345d3
-Author: Marco Martin notm...@gmail.com
-Date: Tue Feb 1 21:15:49 2011 +0100
-
-don't collapse when it's destroying
-try to not crash upon deletion of the extender
-
-diff --git a/plasma/extenders/extenderitem.cpp
b/plasma/extenders/extenderitem.cpp
-index bdbc886..3e5809f 100644
a/plasma/extenders/extenderitem.cpp
-+++ b/plasma/extenders/extenderitem.cpp
-@@ -596,6 +596,10 @@ void ExtenderItem::destroy()
-
- void ExtenderItem::setCollapsed(bool collapsed)
- {
-+if (extender()-d-destroying) {
-+return;
-+}
-+
- config().writeEntry(isCollapsed, collapsed);
- d-collapsed = collapsed;
- d-collapseIcon-setToolTip(collapsed ? i18n(Expand this widget) :
i18n(Collapse this widget));
Deleted: fix-vlc-hangs.patch
===
--- fix-vlc-hangs.patch 2011-02-28 21:58:39 UTC (rev 111766)
+++ fix-vlc-hangs.patch 2011-02-28 23:52:39 UTC (rev 111767)
@@ -1,118 +0,0 @@
-commit 7ca7e81303c50769e286897be0afe0793dabdf52
-Author: Dawit Alemayehu ada...@kde.org
-Date: Fri Feb 4 18:29:51 2011 -0500
-
-Workaround for the hang (freeze) when opening VLC's file dialog under KDE.
-See http://git.reviewboard.kde.org/r/100539/ for the details.
-
-BUG:260719
-REVIEW:100539
-
-diff --git a/kdecore/services/kmimetyperepository.cpp
b/kdecore/services/kmimetyperepository.cpp
-index 9f4c3ca..39e6a61 100644
a/kdecore/services/kmimetyperepository.cpp
-+++ b/kdecore/services/kmimetyperepository.cpp
-@@ -683,29 +683,84 @@ bool KMimeTypeRepository::useFavIcons()
- return m_useFavIcons;
- }
-
--int KMimeTypeRepository::sharedMimeInfoVersion()
-+static void addPlatformSpecificPkgConfigPath(QStringList paths)
- {
--m_mutex.lockForWrite();
--if (m_sharedMimeInfoVersion == 0) {
--QProcess smi;
--const QString umd =
KStandardDirs::findExe(QString::fromLatin1(update-mime-database));
--if (umd.isEmpty()) {
--kWarning() update-mime-database not found!;
--m_sharedMimeInfoVersion = -1;
--} else {
--smi.start(umd, QStringList() QString::fromLatin1(-v));
--smi.waitForStarted();
--smi.waitForFinished();
--const QString out =
QString::fromLocal8Bit(smi.readAllStandardError());
--QRegExp versionRe(QString::fromLatin1(update-mime-database
\\(shared-mime-info\\) (\\d+)\\.(\\d+)(\\.(\\d+))?));
--if (versionRe.indexIn(out) -1) {
--m_sharedMimeInfoVersion =
[arch-commits] Commit in kdelibs/trunk (3 files)
Date: Friday, November 27, 2009 @ 20:40:00
Author: andrea
Revision: 59820
updated trunk PKGBUILDs to 4.3.4
Modified:
kdelibs/trunk/PKGBUILD
Deleted:
kdelibs/trunk/CVE-2009-0689.patch
kdelibs/trunk/fix-glibc-2.11.patch
--+
CVE-2009-0689.patch | 13 ---
PKGBUILD | 28 ++--
fix-glibc-2.11.patch | 165 -
3 files changed, 9 insertions(+), 197 deletions(-)
Deleted: CVE-2009-0689.patch
===
--- CVE-2009-0689.patch 2009-11-28 01:35:26 UTC (rev 59819)
+++ CVE-2009-0689.patch 2009-11-28 01:40:00 UTC (rev 59820)
@@ -1,13 +0,0 @@
-Index: kjs/dtoa.cpp
-===
kjs/dtoa.cpp (Revision 1052099)
-+++ kjs/dtoa.cpp (Revision 1052100)
-@@ -457,7 +457,7 @@
- #define FREE_DTOA_LOCK(n) /*nothing*/
- #endif
-
--#define Kmax 15
-+#define Kmax (sizeof(size_t) 3)
-
- struct
- Bigint {
Modified: PKGBUILD
===
--- PKGBUILD2009-11-28 01:35:26 UTC (rev 59819)
+++ PKGBUILD2009-11-28 01:40:00 UTC (rev 59820)
@@ -2,38 +2,28 @@
# Maintainer: Pierre Schmitz pie...@archlinux.de
pkgname=kdelibs
-pkgver=4.3.3
-pkgrel=2
+pkgver=4.3.4
+pkgrel=1
pkgdesc=KDE Core Libraries
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
depends=('qt' 'shared-mime-info' 'hal' 'xz-utils' 'heimdal'
-'enchant' 'jasper' 'openexr' 'strigi=0.7.0' 'libxtst'
-'giflib' 'soprano=2.3.0' 'ca-certificates' 'xdg-utils')
+'enchant' 'jasper' 'openexr' 'strigi' 'libxtst'
+'giflib' 'soprano' 'ca-certificates' 'xdg-utils')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
'hspell' 'libxslt')
replaces=('arts')
install='kdelibs.install'
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
-'kde-applications-menu.patch' 'archlinux-menu.patch'
'abs-syntax-highlight.patch'
-'CVE-2009-0689.patch'
- 'fix-glibc-2.11.patch')
-md5sums=('20fd3793d9d23088ecb1d5aed0254216'
+'kde-applications-menu.patch' 'archlinux-menu.patch'
'abs-syntax-highlight.patch')
+md5sums=('4bd639bae91df0f4c5d1ae54c90f83c9'
'280f34ee159845f8902c31bd499254fc'
'0f214b222bfb0327e7a2b6fb13756895'
- '18ea42696a7f41332a092d6ead7efc6a'
- 'ec70af24f769f17082a9ab69dc1e24e9'
-'ed737b0b9d14f6f13d150121f088290c')
+ '18ea42696a7f41332a092d6ead7efc6a')
build() {
- cd $srcdir/${pkgname}-${pkgver}
+ cd ${srcdir}/${pkgname}-${pkgver}
- # see http://securityreason.com/it_news/0/0x31
- # will be fixed in 4.3.4
- patch -p0 -i $srcdir/CVE-2009-0689.patch || return 1
- # see https://bugs.kde.org/show_bug.cgi?id=213223
- patch -p0 -i ${srcdir}/fix-glibc-2.11.patch || return 1
-
# avoid file conflict with gnome-menu
patch -p1 -i $srcdir/kde-applications-menu.patch
# add Archlinux menu entry
@@ -41,7 +31,7 @@
# add syntax highlightning for PKGBUILD and .install files
patch -p1 -i $srcdir/abs-syntax-highlight.patch
- cd ..
+ cd ${srcdir}
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
Deleted: fix-glibc-2.11.patch
===
--- fix-glibc-2.11.patch2009-11-28 01:35:26 UTC (rev 59819)
+++ fix-glibc-2.11.patch2009-11-28 01:40:00 UTC (rev 59820)
@@ -1,165 +0,0 @@
-Index: kdecore/fakes.c
-===
kdecore/fakes.c(revision 1046198)
-+++ kdecore/fakes.c(revision 1046199)
-@@ -31,7 +31,7 @@
-
-
- #define KDE_open open
--#define KDE_mkdir mkdir
-+#define KDE_mkdir mkdir
-
-
- #ifndef HAVE_SETENV
-@@ -39,10 +39,15 @@
- #ifdef HAVE_ALLOCA_H
- #include alloca.h
- #endif
--
-+#ifdef HAVE_STRING_H
- #include string.h
-+#endif
-+#ifdef HAVE_STDLIB_H
- #include stdlib.h
-+#endif
-+#ifdef HAVE_UNISTD_H
- #include unistd.h
-+#endif
-
- KDECORE_EXPORT int setenv(const char *name, const char *value, int overwrite)
{
- int i;
-@@ -67,11 +72,18 @@
- #ifdef HAVE_ALLOCA_H
- #include alloca.h
- #endif
--
-+#ifdef HAVE_STRING_H
- #include string.h
-+#endif
-+#ifdef HAVE_STDLIB_H
- #include stdlib.h
-+#endif
-+#ifdef HAVE_ERRNO_H
- #include errno.h
-+#endif
-+#ifdef HAVE_UNISTD_H
- #include unistd.h
-+#endif
-
- #ifndef environ
- extern char ** environ;
-@@ -154,24 +166,32 @@
- {
- srand48(seed);
- }
--#endif
-+#endif /* !HAVE_RANDOM */
-
- #ifndef HAVE_SETEUID
- int seteuid(uid_t euid)
- {
- return setreuid(-1, euid); /* Well, if you have neither you are in
trouble :) */
- }
--#endif
-+#endif /* !HAVE_SETEUID */
-
- #ifndef HAVE_MKSTEMPS
-+#ifdef HAVE_SYS_TYPES_H
- #include sys/types.h
-+#endif
- #ifdef HAVE_SYS_STAT_H
- #include sys/stat.h
-
