diff options
Diffstat (limited to 'libre/kdebase-runtime-libre')
| -rw-r--r-- | libre/kdebase-runtime-libre/PKGBUILD | 66 | ||||
| -rw-r--r-- | libre/kdebase-runtime-libre/kdebug-324470.patch | 49 |
2 files changed, 87 insertions, 28 deletions
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 88735feed..a27f22dcf 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -1,16 +1,19 @@ -# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $ +# $Id: PKGBUILD 194219 2013-09-10 22:35:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.11.0 -pkgrel=1 +pkgver=4.11.1 +pkgrel=2 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' license=('GPL' 'LGPL') +replaces=("${_pkgname}") +conflicts=("${_pkgname}") +provides=("${_pkgname}=${pkgver}") depends=("kdelibs>=${pkgver}" 'kactivities' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth' 'libwebp') makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen' @@ -19,48 +22,55 @@ optdepends=('kdepimlibs: needed by DrKonqi to send crash reports to KDE.org' 'gdb: needed by DrKonqi to generate backtrace' 'htdig: to build the search index in the KHelpCenter' 'rarian: needed by KHelpCenter') -replaces=("${_pkgname}") -conflicts=("${_pkgname}") -provides=("${_pkgname}=${pkgver}") install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" + 'kdebug-324470.patch' 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('87f693a9cbb149dfa2be49d98562b2bc7add99b7' +sha1sums=('3457ffdbd1921bc6bc78cd8a9a463822d515b079' + '80db2d34f9e62dbea5d7e94b7bef93d2cf46f6d7' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') prepare() { - mkdir build + mkdir build + + cd kde-runtime-${pkgver} + patch -p1 -i "${srcdir}"/kdebug-324470.patch } build() { - cd "${srcdir}" + cd "${srcdir}" - # Removing non-privacy search providers - rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,amazon{,_mp3},amg,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,imdb,jamendo,jeeves,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop + # Removing non-privacy search providers + rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,amazon{,_mp3},amg,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,imdb,jamendo,jeeves,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop - # Adding DuckDuckGo HTML - cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders" + # Adding DuckDuckGo HTML + cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders" - # Adding DuckDuckGo Lite - cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders" + # Adding DuckDuckGo Lite + cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders" - cd build - cmake ../kde-runtime-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_QNtrack=OFF \ - -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 - make + cd build + cmake ../kde-runtime-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_QNtrack=OFF \ + -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 + make } package() { - cd build - make DESTDIR="$pkgdir" install - rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme" + cd build + make DESTDIR="$pkgdir" install + + rm "${pkgdir}"/usr/share/icons/hicolor/index.theme + + ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" - ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" + # https://bugs.archlinux.org/task/36668 + chown :nobody "${pkgdir}"/usr/lib/kde4/libexec/kdesud + chmod g+s "${pkgdir}"/usr/lib/kde4/libexec/kdesud } diff --git a/libre/kdebase-runtime-libre/kdebug-324470.patch b/libre/kdebase-runtime-libre/kdebug-324470.patch new file mode 100644 index 000000000..4269df829 --- /dev/null +++ b/libre/kdebase-runtime-libre/kdebug-324470.patch @@ -0,0 +1,49 @@ +commit be1a5d484c70f4f6a383150810afbfbb367db2ac +Author: Eike Hein <hein@kde.org> +Date: Tue Sep 3 20:29:23 2013 +0200 + + Discard the recorded events in the item-local handlers. + + Solves problems with identical events being ignored due to + QGraphicsView's reuse of QGraphicsSceneMouseEvent instances. + + CCMAIL:rdieter@fedoraproject.org + BUG:324470 + BUG:324471 + +diff --git a/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp +index b534845..36530e0 100644 +--- a/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp ++++ b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp +@@ -90,6 +90,7 @@ bool MouseEventListener::containsMouse() const + void MouseEventListener::mousePressEvent(QGraphicsSceneMouseEvent *me) + { + if (m_lastEvent == me) { ++ m_lastEvent = 0; + return; + } + +@@ -112,6 +113,7 @@ void MouseEventListener::mousePressEvent(QGraphicsSceneMouseEvent *me) + void MouseEventListener::mouseMoveEvent(QGraphicsSceneMouseEvent *me) + { + if (m_lastEvent == me) { ++ m_lastEvent = 0; + return; + } + +@@ -122,6 +124,7 @@ void MouseEventListener::mouseMoveEvent(QGraphicsSceneMouseEvent *me) + void MouseEventListener::mouseReleaseEvent(QGraphicsSceneMouseEvent *me) + { + if (m_lastEvent == me) { ++ m_lastEvent = 0; + return; + } + +@@ -138,6 +141,7 @@ void MouseEventListener::mouseReleaseEvent(QGraphicsSceneMouseEvent *me) + void MouseEventListener::wheelEvent(QGraphicsSceneWheelEvent *we) + { + if (m_lastEvent == we) { ++ m_lastEvent = 0; + return; + } + |