Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=621f7d99df81c1bb686b6b0d524322020676f637
commit 621f7d99df81c1bb686b6b0d524322020676f637
Author: centuri0 <achev...@gmail.com>
Date: Wed Oct 5 18:08:25 2011 +0200
kdelibs-4.7.2-1-i686
* version bump
* removing kdirwatch_kernel3.patch (fixed upstream)
diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild
index 0c1e5cc..6146110 100644
--- a/source/kde/kdelibs/FrugalBuild
+++ b/source/kde/kdelibs/FrugalBuild
@@ -4,7 +4,7 @@
USE_DETECTDEPENDS=${USE_DETECTDEPENDS:-"n"}
pkgname=kdelibs
-pkgrel=3
+pkgrel=1
pkgdesc="KDE4 Core Libraries."
groups=('kde')
archs=('i686' 'x86_64' 'ppc')
@@ -15,12 +15,10 @@ makedepends=("${makedepends[@]}" "krb5"
"libqttest>=$_F_kde_qtver" \
"shared-desktop-ontologies>=0.5" "soprano-backend-redland>=2.7.0")
source=("${source[@]}" \
frugalware-menu.patch \
- kde-applications-menu.patch \
- kdirwatch_kernel3.patch)
+ kde-applications-menu.patch)
sha1sums=("${sha1sums[@]}" \
'c657c474875c155197dde1c846f1791e744febc2' \
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7' \
- '54e6cbd7a8c4f9df947f18692512ca618c824c43')
+ '86ee8c8660f19de8141ac99cd6943964d97a1ed7')
provides=('kat' 'libkdecore-data')
conflicts=("${provides[@]}")
diff --git a/source/kde/kdelibs/kdirwatch_kernel3.patch
b/source/kde/kdelibs/kdirwatch_kernel3.patch
deleted file mode 100644
index 6685d9c..0000000
--- a/source/kde/kdelibs/kdirwatch_kernel3.patch
+++ /dev/null
@@ -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);
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
