Date: Tuesday, October 4, 2011 @ 13:49:04 Author: andrea Revision: 139671
KDE 4.7.2 Modified: kdelibs/trunk/PKGBUILD Deleted: kdelibs/trunk/fix-kdirwatch-with-linux3.patch ---------------------------------+ PKGBUILD | 17 ++++------- fix-kdirwatch-with-linux3.patch | 56 -------------------------------------- 2 files changed, 6 insertions(+), 67 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-10-04 16:57:18 UTC (rev 139670) +++ PKGBUILD 2011-10-04 17:49:04 UTC (rev 139671) @@ -3,8 +3,8 @@ # Contributor: Pierre Schmitz <pie...@archlinux.de> pkgname=kdelibs -pkgver=4.7.1 -pkgrel=2 +pkgver=4.7.2 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -19,24 +19,19 @@ replaces=('kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde-applications-menu.patch' 'archlinux-menu.patch' - 'fix-kdirwatch-with-linux3.patch') -sha1sums=('661cc56f199b7250bd825cc0e85ff442b85171e2' + 'kde-applications-menu.patch' 'archlinux-menu.patch') +sha1sums=('4b074633cbf69752fda96018514ee771efe8f18b' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67' - '54e6cbd7a8c4f9df947f18692512ca618c824c43') + '63a850ab4196b9d06934f2b4a13acd9f7739bc67') build() { cd "${srcdir}"/${pkgname}-${pkgver} - # avoid file conflict with gnome-menu + # avoid file conflict with gnome-menus patch -p1 -i "${srcdir}"/kde-applications-menu.patch # add Archlinux menu entry patch -p1 -i "${srcdir}"/archlinux-menu.patch - # Already fixed upstream - patch -p1 -i "${srcdir}"/fix-kdirwatch-with-linux3.patch - cd "${srcdir}" mkdir build cd build Deleted: fix-kdirwatch-with-linux3.patch =================================================================== --- fix-kdirwatch-with-linux3.patch 2011-10-04 16:57:18 UTC (rev 139670) +++ fix-kdirwatch-with-linux3.patch 2011-10-04 17:49:04 UTC (rev 139671) @@ -1,56 +0,0 @@ -From: Alex Fiestas <afies...@kde.org> -Date: Fri, 09 Sep 2011 16:54:23 +0000 -Subject: Fix KDirWatch when using Kernel 3.0 -X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=7df5a79fb9f09e4a4a80cd541cc478b5fa6df00f ---- -Fix KDirWatch when using Kernel 3.0 - -To know INotify is available in the kernel we are checking for a -kernel newer than 2.6.14, that's all allright but the problem is -that the Kernel version format has changed and now we can't be sure -that it is going to be formed by 3 numbers. -Basically we where checking for: - -%d.%d.%d and now it can be %d.%d as it is with 3.0 - -This patch what does is check if the kernel is 2.6, if it is then -it proceed with the version checking. - -CCMAIL: dfa...@kde.org ---- - - ---- a/kdecore/io/kdirwatch.cpp -+++ b/kdecore/io/kdirwatch.cpp -@@ -210,16 +210,24 @@ KDirWatchPrivate::KDirWatchPrivate() - { - struct utsname uts; - int major, minor, patch; -- if (uname(&uts) < 0) -- supports_inotify = false; // *shrug* -- else if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3) -- supports_inotify = false; // *shrug* -- else if( major * 1000000 + minor * 1000 + patch < 2006014 ) { // <2.6.14 -- kDebug(7001) << "Can't use INotify, Linux kernel too old"; -+ if (uname(&uts) < 0) { - supports_inotify = false; -+ kDebug(7001) << "Unable to get uname"; -+ } else if (sscanf(uts.release, "%d.%d", &major, &minor) != 2) { -+ supports_inotify = false; -+ kDebug(7001) << "The version is malformed: " << uts.release; -+ } else if(major == 2 && minor == 6) { // If it is 2.6 check further... -+ if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3) { -+ supports_inotify = false; -+ kDebug() << "Detected 2.6 kernel but can't know more: " << uts.release; -+ } else if (major * 1000000 + minor * 1000 + patch < 2006014 ){ -+ supports_inotify = false; -+ kDebug(7001) << "Can't use INotify, Linux kernel too old " << uts.release; -+ } - } - } - -+ kDebug() << "INotify available: " << supports_inotify; - if ( supports_inotify ) { - availableMethods << "INotify"; - fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC); -