Chakra_Linux/desktop
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/desktop.git synced 2025-01-24 10:32:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove applied patch

Browse Source
This commit is contained in:
Manuel 2011-10-02 18:47:36 +00:00
parent 3544c393a3
commit 482d5a94e4
2 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kdelibs/PKGBUILD
View File

@ -60,8 +60,7 @@ build()
patch -Np1 -i ${srcdir}/03_chakra_menu.patch || return 1
# fixes
msg "applying fixes ..."
patch -Np1 -i ${srcdir}/fix-kdirwatch.patch || return 1
# msg "applying fixes ..."
cd ..

33
kdelibs/fix-kdirwatch.patch
View File

@ -1,33 +0,0 @@
--- 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)