diff --git a/extra/analitza/PKGBUILD b/extra/analitza/PKGBUILD index 943d72d67..e76c145dc 100644 --- a/extra/analitza/PKGBUILD +++ b/extra/analitza/PKGBUILD @@ -6,7 +6,7 @@ # - patch to disable opengl for ARM pkgname=analitza -pkgver=15.04.0 +pkgver=15.04.1 pkgrel=1 pkgdesc="A library to add mathematical features to your program" url="https://projects.kde.org/projects/kde/kdeedu/analitza" @@ -18,7 +18,7 @@ replaces=('kdebase-analitza') conflicts=('kdebase-analitza') source=("http://download.kde.org/stable/applications/${pkgver}/src/analitza-${pkgver}.tar.xz" 'analitza-disable-opengl.patch') -sha1sums=('3553bced6fa0bca56ae577c900752822c1165f44' +sha1sums=('3e792e9e6802adb51d2dcb113b9c9604a30cf785' 'db4b031c52e10272af54542eebef5b68d8bd0c45') prepare() { diff --git a/extra/kalgebra/PKGBUILD b/extra/kalgebra/PKGBUILD index 9b8e6fd6f..222d41fe9 100644 --- a/extra/kalgebra/PKGBUILD +++ b/extra/kalgebra/PKGBUILD @@ -6,7 +6,7 @@ # - patch and cmake define to disable opengl for ARM pkgname=kalgebra -pkgver=15.04.0 +pkgver=15.04.1 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -20,7 +20,7 @@ conflicts=('kdeedu-kalgebra' 'kdeedu-analitza') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${pkgver}/src/kalgebra-${pkgver}.tar.xz" 'kalgebra-disable-opengl.patch') -sha1sums=('4566f55db3bb81288c9dee22c3ef0925659426fb' +sha1sums=('5d7de0c69230333cd61f02cde11e04b286bd4cae' '103de918b6fdfb74a030db01afeb378fa0599717') prepare() { diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index adb8bf3ab..32bda16cc 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -7,9 +7,9 @@ # - patch to fix unclickable plasmoid buttons on ARM pkgname=kdelibs -pkgver=4.14.7 -_kdeappver=15.04.0 -pkgrel=3 +pkgver=4.14.8 +_kdeappver=15.04.1 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kdelibs' @@ -21,9 +21,9 @@ depends=('attica-qt4' 'libxss' 'krb5' 'qca' 'libdbusmenu-qt' 'polkit-qt4' makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa' 'grantlee-qt4') 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' 'dolphin-places.patch' + 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' 'arm-coronaoffscreen-input-fixes.diff') -sha1sums=('6de82328f692717b97ad6833109a564a7b6a0a9a' +sha1sums=('98b174dbbbef340bcfc11b819405d8e838cac34c' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' '63a850ab4196b9d06934f2b4a13acd9f7739bc67' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' @@ -40,8 +40,6 @@ prepare() { patch -p1 -i "${srcdir}"/qt4.patch # fix unclickable plasmoid buttons on ARM patch -p1 -i "${srcdir}"/arm-coronaoffscreen-input-fixes.diff - # fix disappearing bookmarks in Dolphin https://bugs.kde.org/show_bug.cgi?id=345174 - patch -p1 -i "$srcdir"/dolphin-places.patch } build() { diff --git a/extra/kdelibs/dolphin-places.patch b/extra/kdelibs/dolphin-places.patch deleted file mode 100644 index a43812eff..000000000 --- a/extra/kdelibs/dolphin-places.patch +++ /dev/null @@ -1,119 +0,0 @@ -From: Emmanuel Pescosta -Date: Wed, 29 Apr 2015 14:02:02 +0000 -Subject: Remove bookmarks syncing from KFilePlacesModel and use user-places.xbel only. -X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=5c0a31a2f2a46aa44b8c34baae67b6951b2abcaf ---- -Remove bookmarks syncing from KFilePlacesModel and use user-places.xbel only. - -FIXED-IN: 4.14.8 -BUG: 345174 -REVIEW: 123568 ---- - - ---- a/kfile/CMakeLists.txt -+++ b/kfile/CMakeLists.txt -@@ -22,7 +22,6 @@ - kfilewidget.cpp - kfileplacesitem.cpp - kfileplacesmodel.cpp -- kfileplacessharedbookmarks.cpp - kfileplacesview.cpp - kfileplaceeditdialog.cpp - kfilepreviewgenerator.cpp - ---- a/kfile/kfileplacesmodel.cpp -+++ b/kfile/kfileplacesmodel.cpp -@@ -19,7 +19,6 @@ - */ - #include "kfileplacesmodel.h" - #include "kfileplacesitem_p.h" --#include "kfileplacessharedbookmarks_p.h" - - #ifdef _WIN32_WCE - #include "Windows.h" -@@ -61,10 +60,9 @@ - class KFilePlacesModel::Private - { - public: -- Private(KFilePlacesModel *self) : q(self), bookmarkManager(0), sharedBookmarks(0) {} -+ Private(KFilePlacesModel *self) : q(self), bookmarkManager(0) {} - ~Private() - { -- delete sharedBookmarks; - qDeleteAll(items); - } - -@@ -76,7 +74,6 @@ - - Solid::Predicate predicate; - KBookmarkManager *bookmarkManager; -- KFilePlacesSharedBookmarks * sharedBookmarks; - - void reloadAndSignal(); - QList loadBookmarkList(); -@@ -93,8 +90,8 @@ - KFilePlacesModel::KFilePlacesModel(QObject *parent) - : QAbstractItemModel(parent), d(new Private(this)) - { -- const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml"); -- d->bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces"); -+ const QString file = KStandardDirs().localxdgdatadir() + "user-places.xbel"; -+ d->bookmarkManager = KBookmarkManager::managerForExternalFile(file); - - // Let's put some places in there if it's empty. We have a corner case here: - // Given you have bookmarked some folders (which have been saved on -@@ -145,9 +142,6 @@ - // user-places.xbel will be filled later). (ereslibre) - d->bookmarkManager->saveAs(file); - } -- -- // create after, so if we have own places, they are added afterwards, in case of equal priorities -- d->sharedBookmarks = new KFilePlacesSharedBookmarks(d->bookmarkManager); - - QString predicate("[[[[ StorageVolume.ignored == false AND [ StorageVolume.usage == 'FileSystem' OR StorageVolume.usage == 'Encrypted' ]]" - " OR " -@@ -632,8 +626,6 @@ - return false; - } - -- d->sharedBookmarks->updateSharedBookmarks(); -- - d->reloadAndSignal(); - - return true; -@@ -660,8 +652,6 @@ - KFilePlacesItem *item = static_cast(after.internalPointer()); - d->bookmarkManager->root().moveBookmark(bookmark, item->bookmark()); - } -- -- d->sharedBookmarks->updateSharedBookmarks(); - - d->reloadAndSignal(); - } -@@ -684,8 +674,6 @@ - bookmark.setIcon(iconName); - bookmark.setMetaDataItem("OnlyInApp", appName); - -- d->sharedBookmarks->updateSharedBookmarks(); -- - d->reloadAndSignal(); - emit dataChanged(index, index); - } -@@ -703,7 +691,6 @@ - if (bookmark.isNull()) return; - - d->bookmarkManager->root().deleteBookmark(bookmark); -- d->sharedBookmarks->updateSharedBookmarks(); - d->reloadAndSignal(); - } - -@@ -718,8 +705,6 @@ - if (bookmark.isNull()) return; - - bookmark.setMetaDataItem("IsHidden", (hidden ? "true" : "false")); -- -- d->sharedBookmarks->updateSharedBookmarks(); - - d->reloadAndSignal(); - emit dataChanged(index, index); diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 82af09a89..6508887df 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=mesa pkgname=('mesa' 'mesa-libgl' 'libva-mesa-driver') -pkgver=10.5.4 +pkgver=10.5.5 pkgrel=1 arch=('i686' 'x86_64') makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' @@ -20,7 +20,7 @@ license=('custom') options=('!libtool') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}.tar.xz{,.sig} LICENSE) -sha256sums=('b51e723f3a20d842c88a92d809435b229fc4744ca0dbec0317d9d4a3ac4c6803' +sha256sums=('4ac4e4ea3414f1cadb1467f2f173f9e56170d31e8674f7953a46f0549d319f28' 'SKIP' '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index 08dd57458..1d67aee2e 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -39,7 +39,7 @@ pkgname=('qt5-base' 'qt5-x11extras' 'qt5-xmlpatterns') pkgver=5.4.1 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL' 'FDL' 'custom') @@ -161,6 +161,7 @@ build() { -dbus-linked \ -system-harfbuzz \ -journald \ + -no-use-gold-linker \ -no-sse2 \ -no-sse3 \ -no-ssse3 \