Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a48be9926200beeb8d77292c65d7f27a1d88361c
commit a48be9926200beeb8d77292c65d7f27a1d88361c
Author: crazy <cr...@frugalware.org>
Date: Thu Feb 26 01:19:24 2009 +0100
kdelibs-3.5.10-1-x86_64
* Version bump
diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild
index 10e7698..9c45a87 100644
--- a/source/kde/kdelibs/FrugalBuild
+++ b/source/kde/kdelibs/FrugalBuild
@@ -3,10 +3,10 @@
# Contributor: Kapolnasi Tamas <kta...@tdc.hu>
pkgname=kdelibs
-pkgver=3.5.9
-pkgrel=6
+pkgver=3.5.10
+pkgrel=1
pkgdesc="KDE Core Libraries."
-depends=('arts>=1.5.9' 'hicolor-icon-theme' 'libxslt' 'pcre' 'openmotif'
'openssl' 'libart_lgpl' 'gamin' 'bzip2' \
+depends=('arts>=1.5.10' 'hicolor-icon-theme' 'libxslt' 'pcre' 'openmotif'
'openssl' 'libart_lgpl' 'gamin' 'bzip2' \
'xfsprogs-acl' 'openexr>=1.4.0a-2' 'libidn' 'aspell' 'jasper>=1.900.1-2'
'avahi-qt3>=0.6.14-2' \
'avahi-compat>=0.6.14-2' 'heimdal>=1.2.1' 'rgb' 'qt>=3.3.8-8' 'libdrm'
'libxrender' 'libxcb')
makedepends=('cups>=1.2.3' 'openldap' 'sane-backends' 'hspell' 'flex' 'opensp' \
@@ -17,15 +17,14 @@ archs=('i686' 'x86_64' 'ppc')
_F_kde_reconf=1
Finclude kde
source=(${sour...@]} kde.sh \
- ftp://ftp.kde.org/pub/kde/security_patches/post-kde-3.5.5-kinit.diff \
-
kdelibs-kill-broken-AM_LDFLAGS_use_foo_LDFLAGS_to_fix_automake1.10.patch \
fix-warning.patch \
x-mplayer2.desktop \
fw-default-dejavu-font.patch \
avahi.patch \
kdeprintrc.patch \
kbuildservicefactory.patch \
- distribution.patch)
+ distribution.patch \
+ use_sys_inotify.h_the_kernel_headers_are_br0ken.patch)
## NOTE: if someone change fw-default-dejavu-font.patch its _NEED_ be in sync
with
## fw-default-dejavu-font.patch from kdebase and both pkgs _NEED_ be recompiled!
@@ -63,15 +62,14 @@ build()
touch $Fdestdir/usr/env/.hold || Fdie
}
-sha1sums=('b8197d94075a54f90f08a9ef7bed95ccf53e12ad' \
+sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82' \
'0144175104312fcd56c4e74f6d041edbe50a0c22' \
- '35147db4d6791e4c98d7cec5e72509547813dd98' \
- '916c2a2c5e28f4d72720d37348f9c813114adabf' \
'538d8f2076e360f1d733e79b7c35b5326edb41af' \
'e45f5f357859f243e627cfaa7bd9682ac49c2eab' \
'49b52e2c722f2b519818ceea186da39fe7314f5c' \
'b5b86e4dec97f2355f0a1ac42979cb8d4640bf42' \
'92a69598fca05c346e954ad55bb9ea9defa93b1e' \
'9579606c340dc9b983e5f8d0b163e7e0ab7f90b4' \
- 'dc36cd3f10324974038eb569cfa4e3fb95e790fa')
+ 'dc36cd3f10324974038eb569cfa4e3fb95e790fa' \
+ 'd72dfea89dd1cb6dcdb3d3f8d4dfca011566d757')
# optimization OK
diff --git
a/source/kde/kdelibs/kdelibs-kill-broken-AM_LDFLAGS_use_foo_LDFLAGS_to_fix_automake1.10.patch
b/source/kde/kdelibs/kdelibs-kill-broken-AM_LDFLAGS_use_foo_LDFLAGS_to_fix_automake1.10.patch
deleted file mode 100644
index 7d34f34..0000000
---
a/source/kde/kdelibs/kdelibs-kill-broken-AM_LDFLAGS_use_foo_LDFLAGS_to_fix_automake1.10.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Index: kioslave/metainfo/Makefile.am
-===================================================================
---- kioslave/metainfo/Makefile.am (Revision 606834)
-+++ kioslave/metainfo/Makefile.am (Arbeitskopie)
-@@ -2,7 +2,7 @@
- ## Makefile.am of kdebase/kioslave/metainfo
-
- INCLUDES = $(all_includes)
--AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+AM_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- METASOURCES = AUTO
-
- kde_module_LTLIBRARIES = kio_metainfo.la
-Index: kioslave/gzip/Makefile.am
-===================================================================
---- kioslave/gzip/Makefile.am (Revision 606834)
-+++ kioslave/gzip/Makefile.am (Arbeitskopie)
-@@ -1,5 +1,5 @@
- INCLUDES = -I$(top_srcdir)/kio $(all_includes)
--AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+AM_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- METASOURCES = AUTO
-
- kde_module_LTLIBRARIES = kgzipfilter.la
-Index: kio/tests/Makefile.am
-===================================================================
---- kio/tests/Makefile.am (Revision 606834)
-+++ kio/tests/Makefile.am (Arbeitskopie)
-@@ -18,7 +18,7 @@
-
- INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes)
- LDADD = $(LIB_KIO)
--AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+AM_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-
- check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\
- kioslavetest kdirwatchtest kshredtest speed kurifiltertest \
-Index: dcop/tests/Makefile.am
-===================================================================
---- dcop/tests/Makefile.am (Revision 606834)
-+++ dcop/tests/Makefile.am (Arbeitskopie)
-@@ -3,7 +3,6 @@
- @echo -e "dcop tests not run.\nRun make tests in the tests directory to
make them"
-
- INCLUDES = $(all_includes)
--AM_LDFLAGS = $(all_libraries)
-
- METASOURCES = AUTO
-
-@@ -17,7 +16,7 @@
-
- driver_SOURCES = driver.cpp test.stub
- driver_LDADD = $(LIB_KDECORE)
--driver_LDFLAGS = $(KDE_RPATH)
-+driver_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-
- CLEANFILES = batch.generated definitions.generated driver.generated
shell.generated
-
-Index: dcop/dcopidl2cpp/Makefile.am
-===================================================================
---- dcop/dcopidl2cpp/Makefile.am (Revision 606834)
-+++ dcop/dcopidl2cpp/Makefile.am (Arbeitskopie)
-@@ -1,6 +1,5 @@
-
- INCLUDES = $(all_includes)
--AM_LDFLAGS = $(all_libraries)
-
- ####### Files
-
-@@ -10,7 +9,7 @@
- noinst_HEADERS = main.h
-
- dcopidl2cpp_LDADD = $(LIB_QT)
--dcopidl2cpp_LDFLAGS = $(KDE_RPATH)
-+dcopidl2cpp_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-
- dcopidl_output.kidl: ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h
- ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h > dcopidl_output.kidl
-Index: dcop/client/Makefile.am
-===================================================================
---- dcop/client/Makefile.am (Revision 606834)
-+++ dcop/client/Makefile.am (Arbeitskopie)
-@@ -1,6 +1,5 @@
-
- INCLUDES = $(all_includes)
--AM_LDFLAGS = $(all_libraries)
- DCOP_LIB = ../libDCOP.la
-
- ####### Files
-@@ -9,19 +8,19 @@
-
- dcop_SOURCES = dcop.cpp
- dcop_LDADD = $(LIB_QT) $(DCOP_LIB)
--dcop_LDFLAGS = $(KDE_RPATH)
-+dcop_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-
- dcopstart_SOURCES = dcopstart.cpp
- dcopstart_LDADD = $(LIB_QT) $(DCOP_LIB)
--dcopstart_LDFLAGS = $(KDE_RPATH)
-+dcopstart_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-
- dcopquit_SOURCES = dcopquit.cpp
- dcopquit_LDADD = $(LIB_QT) $(DCOP_LIB)
--dcopquit_LDFLAGS = $(KDE_RPATH)
-+dcopquit_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-
- dcopfind_SOURCES = dcopfind.cpp
- dcopfind_LDADD = $(LIB_QT) $(DCOP_LIB)
--dcopfind_LDFLAGS = $(KDE_RPATH)
-+dcopfind_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-
- dcopclient_SOURCES = dcopclient.c
- dcopobject_SOURCES = dcopobject.c
-Index: dcop/dcopidl/Makefile.am
-===================================================================
---- dcop/dcopidl/Makefile.am (Revision 606834)
-+++ dcop/dcopidl/Makefile.am (Arbeitskopie)
-@@ -1,6 +1,5 @@
-
- INCLUDES = $(all_includes)
--AM_LDFLAGS = $(all_libraries)
- AM_CPPFLAGS = -DYYDEBUG
-
- ####### Files
-@@ -11,7 +10,7 @@
- noinst_HEADERS = yacc.cc.h
-
- dcopidl_LDADD = $(LIB_QT)
--dcopidl_LDFLAGS = $(KDE_RPATH)
-+dcopidl_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-
- ####### Build rules
-
diff --git
a/source/kde/kdelibs/use_sys_inotify.h_the_kernel_headers_are_br0ken.patch
b/source/kde/kdelibs/use_sys_inotify.h_the_kernel_headers_are_br0ken.patch
new file mode 100644
index 0000000..e19c211
--- /dev/null
+++ b/source/kde/kdelibs/use_sys_inotify.h_the_kernel_headers_are_br0ken.patch
@@ -0,0 +1,27 @@
+diff -Naurp kdelibs-3.5.10/kio/kio/kdirwatch.cpp
kdelibs-3.5.10-p/kio/kio/kdirwatch.cpp
+--- kdelibs-3.5.10/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000
+0200
++++ kdelibs-3.5.10-p/kio/kio/kdirwatch.cpp 2009-02-26 00:45:49.000000000
+0100
+@@ -71,22 +71,8 @@
+ #include <linux/types.h>
+ // Linux kernel headers are documented to not compile
+ #define _S390_BITOPS_H
+-#include <linux/inotify.h>
++#include <sys/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
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
