Author: pebender
Date: Tue Oct 21 17:12:24 2008
New Revision: 3856
Added:
trunk/gar-minimyth/script/kde/kdelibs/files/kdelibs-3.5.10-inotify_h.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/kde/kdelibs/Makefile
trunk/gar-minimyth/script/kde/kdelibs/checksums
Log:
- Fixed kde/kdelibs so that it builds when MiniMyth is built with Linux
2.6.27.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Tue Oct 21
17:12:24 2008
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 58 (2008-10-20):
+Changes since 58 (2008-10-21):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082,
@@ -114,6 +114,7 @@
Fixed build system
- Fixed check bug that prevented compiling with Xorg 7.4.
- Fixed MPlayer packages so that they do not pick up system X11
includes.
+ - Fixed kde/kdelibs so that it builds when MiniMyth is built with
Linux 2.6.27.
Removed packages
Removed nvidia/nvidia-177.13.
Modified: trunk/gar-minimyth/script/kde/kdelibs/Makefile
==============================================================================
--- trunk/gar-minimyth/script/kde/kdelibs/Makefile (original)
+++ trunk/gar-minimyth/script/kde/kdelibs/Makefile Tue Oct 21 17:12:24 2008
@@ -3,7 +3,7 @@
CATEGORIES = kde
MASTER_SITES = ftp://ftp.kde.org/pub/kde/stable/$(GARVERSION)/src/
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = $(DISTNAME).patch.gar
+PATCHFILES = $(DISTNAME)-inotify_h.patch $(DISTNAME).patch.gar
ifneq ($(DESTIMG),build)
PATCHFILES += $(DISTNAME)-cross.patch.gar
endif
Modified: trunk/gar-minimyth/script/kde/kdelibs/checksums
==============================================================================
--- trunk/gar-minimyth/script/kde/kdelibs/checksums (original)
+++ trunk/gar-minimyth/script/kde/kdelibs/checksums Tue Oct 21 17:12:24 2008
@@ -1,3 +1,4 @@
43cd55ed15f63b5738d620ef9f9fd568 download/kdelibs-3.5.10.tar.bz2
+c53e6b75b319875ba12ddfdf04f531de download/kdelibs-3.5.10-inotify_h.patch
51622294b6b66992ac7c910fb7a6f17d download/kdelibs-3.5.10.patch.gar
8bf0b7c09ba456688fa8d307ebf7761c download/kdelibs-3.5.10-cross.patch.gar
Added:
trunk/gar-minimyth/script/kde/kdelibs/files/kdelibs-3.5.10-inotify_h.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/kde/kdelibs/files/kdelibs-3.5.10-inotify_h.patch
Tue Oct 21 17:12:24 2008
@@ -0,0 +1,112 @@
+diff -Naur kdelibs-3.5.10-old/configure kdelibs-3.5.10-new/configure
+--- kdelibs-3.5.10-old/configure 2008-08-20 09:06:05.000000000 -0700
++++ kdelibs-3.5.10-new/configure 2008-10-21 13:41:25.000000000 -0700
+@@ -50390,9 +50390,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-#include <asm/unistd.h>
+-#define _S390_BITOPS_H
+-#include <linux/inotify.h>
++#include <sys/inotify.h>
+
+ int
+ main ()
+@@ -50401,9 +50399,6 @@
+ #ifndef IN_ALL_EVENTS
+ #error no inotify notification
+ #endif
+-#ifndef __NR_inotify_init
+-#error no __NR_inotify_init
+-#endif
+
+
+ ;
+diff -Naur kdelibs-3.5.10-old/configure.in kdelibs-3.5.10-new/configure.in
+--- kdelibs-3.5.10-old/configure.in 2008-08-20 09:05:03.000000000 -0700
++++ kdelibs-3.5.10-new/configure.in 2008-10-21 13:41:09.000000000 -0700
+@@ -1701,17 +1701,12 @@
+
+ AC_TRY_COMPILE(
+ [
+-#include <asm/unistd.h>
+-#define _S390_BITOPS_H
+-#include <linux/inotify.h>
++#include <sys/inotify.h>
+ ],
+ [
+ #ifndef IN_ALL_EVENTS
+ #error no inotify notification
+ #endif
+-#ifndef __NR_inotify_init
+-#error no __NR_inotify_init
+-#endif
+
+ ],kde_cv_have_inotify=yes,kde_cv_have_inotify=no)
+
+diff -Naur kdelibs-3.5.10-old/kio/kio/configure.in.in
kdelibs-3.5.10-new/kio/kio/configure.in.in
+--- kdelibs-3.5.10-old/kio/kio/configure.in.in 2006-07-22
01:16:37.000000000 -0700
++++ kdelibs-3.5.10-new/kio/kio/configure.in.in 2008-10-21
13:40:49.000000000 -0700
+@@ -122,17 +122,12 @@
+
+ AC_TRY_COMPILE(
+ [
+-#include <asm/unistd.h>
+-#define _S390_BITOPS_H
+-#include <linux/inotify.h>
++#include <sys/inotify.h>
+ ],
+ [
+ #ifndef IN_ALL_EVENTS
+ #error no inotify notification
+ #endif
+-#ifndef __NR_inotify_init
+-#error no __NR_inotify_init
+-#endif
+
+ ],kde_cv_have_inotify=yes,kde_cv_have_inotify=no)
+
+diff -Naur kdelibs-3.5.10-old/kio/kio/kdirwatch.cpp
kdelibs-3.5.10-new/kio/kio/kdirwatch.cpp
+--- kdelibs-3.5.10-old/kio/kio/kdirwatch.cpp 2006-07-22 01:16:37.000000000
-0700
++++ kdelibs-3.5.10-new/kio/kio/kdirwatch.cpp 2008-10-21 14:30:09.000000000
-0700
+@@ -67,39 +67,7 @@
+ #ifdef HAVE_INOTIFY
+ #include <unistd.h>
+ #include <fcntl.h>
+-#include <sys/syscall.h>
+-#include <linux/types.h>
+-// Linux kernel headers are documented to not compile
+-#define _S390_BITOPS_H
+-#include <linux/inotify.h>
+-
+-static inline int inotify_init (void)
+-{
+- return syscall (__NR_inotify_init);
+-}
+-
+-static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
+-{
+- return syscall (__NR_inotify_add_watch, fd, name, mask);
+-}
+-
+-static inline int inotify_rm_watch (int fd, __u32 wd)
+-{
+- return syscall (__NR_inotify_rm_watch, fd, wd);
+-}
+-
+-#ifndef IN_ONLYDIR
+-#define IN_ONLYDIR 0x01000000
+-#endif
+-
+-#ifndef IN_DONT_FOLLOW
+-#define IN_DONT_FOLLOW 0x02000000
+-#endif
+-
+-#ifndef IN_MOVE_SELF
+-#define IN_MOVE_SELF 0x00000800
+-#endif
+-
++#include <sys/inotify.h>
+ #endif
+
+ #include <sys/utsname.h>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
