[arch-commits] Commit in kdelibs3/repos (4 files)

Pierre Schmitz pierre at archlinux.org
Fri May 29 17:29:08 EDT 2009


    Date: Friday, May 29, 2009 @ 17:29:08
  Author: pierre
Revision: 40686

Merged revisions 40685 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/kdelibs3/trunk

........
  r40685 | pierre | 2009-05-29 23:28:32 +0200 (Fr, 29 Mai 2009) | 1 line
  
  upgpkg: kdelibs3 3.5.10-3
........

Added:
  kdelibs3/repos/extra-x86_64/ftp-kioslave-constness.patch
    (from rev 40685, kdelibs3/trunk/ftp-kioslave-constness.patch)
  kdelibs3/repos/extra-x86_64/inotify-compile.patch
    (from rev 40685, kdelibs3/trunk/inotify-compile.patch)
Modified:
  kdelibs3/repos/extra-x86_64/	(properties)
  kdelibs3/repos/extra-x86_64/PKGBUILD

------------------------------+
 PKGBUILD                     |   13 ++++++--
 ftp-kioslave-constness.patch |   21 ++++++++++++++
 inotify-compile.patch        |   60 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+), 4 deletions(-)


Property changes on: kdelibs3/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /kdelibs3/trunk:1-21153
   + /kdelibs3/trunk:1-40685
Deleted: svn:mergeinfo
   - 

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-29 21:28:32 UTC (rev 40685)
+++ extra-x86_64/PKGBUILD	2009-05-29 21:29:08 UTC (rev 40686)
@@ -4,21 +4,23 @@
 
 pkgname=kdelibs3
 pkgver=3.5.10
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE3 Core Libraries"
 arch=('i686' 'x86_64')
 url="http://www.kde.org"
 license=('GPL' 'LGPL')
 depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups'
-         'jasper' 'bzip2' 'openssl' 'libidn' 'libxrender'
+         'jasper' 'bzip2' 'openssl' 'libidn' 'libxrender' 'openexr'
 	 'aspell' 'heimdal' 'acl' 'libtiff' 'qt3' 'ca-certificates')
 makedepends=('pkgconfig' 'cups')
 options=('libtool')
 install='kdelibs3.install'
 source=("http://download.kde.org/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2"
-        'kde3.profile')
+        'kde3.profile' 'ftp-kioslave-constness.patch' 'inotify-compile.patch')
 md5sums=('43cd55ed15f63b5738d620ef9f9fd568'
-         '3c49828eb8985cfb25af8e1495f7800a')
+         '3c49828eb8985cfb25af8e1495f7800a'
+         '4089cba4fe34abcdd77188b5cb635a90'
+         '3bdff94f04f9282e8acde3fe7605d126')
 
 build() {
 	cd $srcdir/kdelibs-$pkgver
@@ -26,6 +28,9 @@
 	. /etc/profile.d/qt3.sh
 	. $srcdir/kde3.profile
 
+	patch -p1 -i $srcdir/inotify-compile.patch
+	patch -p1 -i $srcdir/ftp-kioslave-constness.patch
+
 	# install KDE3 profile
 	install -D -m755 $srcdir/kde3.profile $pkgdir/etc/profile.d/kde3.sh
 

Copied: kdelibs3/repos/extra-x86_64/ftp-kioslave-constness.patch (from rev 40685, kdelibs3/trunk/ftp-kioslave-constness.patch)
===================================================================
--- extra-x86_64/ftp-kioslave-constness.patch	                        (rev 0)
+++ extra-x86_64/ftp-kioslave-constness.patch	2009-05-29 21:29:08 UTC (rev 40686)
@@ -0,0 +1,21 @@
+diff -Nur kdelibs-3.5.10.orig/kioslave/ftp/ftp.cc kdelibs-3.5.10/kioslave/ftp/ftp.cc
+--- kdelibs-3.5.10.orig/kioslave/ftp/ftp.cc	2008-08-19 20:18:12.000000000 +0200
++++ kdelibs-3.5.10/kioslave/ftp/ftp.cc	2009-05-29 20:40:07.618209710 +0200
+@@ -876,7 +876,7 @@
+   // The usual answer is '227 Entering Passive Mode. (160,39,200,55,6,245)'
+   // but anonftpd gives '227 =160,39,200,55,6,245'
+   int i[6];
+-  char *start = strchr(ftpResponse(3), '(');
++  const char *start = strchr(ftpResponse(3), '(');
+   if ( !start )
+     start = strchr(ftpResponse(3), '=');
+   if ( !start ||
+@@ -931,7 +931,7 @@
+     return ERR_INTERNAL;
+   }
+ 
+-  char *start = strchr(ftpResponse(3), '|');
++  const char *start = strchr(ftpResponse(3), '|');
+   if ( !start || sscanf(start, "|||%d|", &portnum) != 1)
+     return ERR_INTERNAL;
+ 

Copied: kdelibs3/repos/extra-x86_64/inotify-compile.patch (from rev 40685, kdelibs3/trunk/inotify-compile.patch)
===================================================================
--- extra-x86_64/inotify-compile.patch	                        (rev 0)
+++ extra-x86_64/inotify-compile.patch	2009-05-29 21:29:08 UTC (rev 40686)
@@ -0,0 +1,60 @@
+diff -Nur kdelibs-3.5.10.orig/configure kdelibs-3.5.10/configure
+--- kdelibs-3.5.10.orig/configure	2008-08-20 18:06:05.000000000 +0200
++++ kdelibs-3.5.10/configure	2009-05-29 20:19:40.049141853 +0200
+@@ -50392,7 +50392,7 @@
+ 
+ #include <asm/unistd.h>
+ #define _S390_BITOPS_H
+-#include <linux/inotify.h>
++#include <sys/inotify.h>
+ 
+ int
+ main ()
+diff -Nur kdelibs-3.5.10.orig/configure.in kdelibs-3.5.10/configure.in
+--- kdelibs-3.5.10.orig/configure.in	2008-08-20 18:05:03.000000000 +0200
++++ kdelibs-3.5.10/configure.in	2009-05-29 20:19:40.069141952 +0200
+@@ -1703,7 +1703,7 @@
+   [
+ #include <asm/unistd.h>
+ #define _S390_BITOPS_H
+-#include <linux/inotify.h>
++#include <sys/inotify.h>
+   ],
+   [
+ #ifndef IN_ALL_EVENTS
+diff -Nur kdelibs-3.5.10.orig/kio/kio/configure.in.in kdelibs-3.5.10/kio/kio/configure.in.in
+--- kdelibs-3.5.10.orig/kio/kio/configure.in.in	2006-07-22 10:16:37.000000000 +0200
++++ kdelibs-3.5.10/kio/kio/configure.in.in	2009-05-29 20:19:40.092475716 +0200
+@@ -124,7 +124,7 @@
+   [
+ #include <asm/unistd.h>
+ #define _S390_BITOPS_H
+-#include <linux/inotify.h>
++#include <sys/inotify.h>
+   ],
+   [
+ #ifndef IN_ALL_EVENTS
+diff -Nur kdelibs-3.5.10.orig/kio/kio/kdirwatch.cpp kdelibs-3.5.10/kio/kio/kdirwatch.cpp
+--- kdelibs-3.5.10.orig/kio/kio/kdirwatch.cpp	2006-07-22 10:16:37.000000000 +0200
++++ kdelibs-3.5.10/kio/kio/kdirwatch.cpp	2009-05-29 20:21:43.978299306 +0200
+@@ -70,9 +70,10 @@
+ #include <sys/syscall.h>
+ #include <linux/types.h>
+ // Linux kernel headers are documented to not compile
+-#define _S390_BITOPS_H
+-#include <linux/inotify.h>
++/*#define _S390_BITOPS_H*/
++#include <sys/inotify.h>
+ 
++/*
+ static inline int inotify_init (void)
+ {
+   return syscall (__NR_inotify_init);
+@@ -87,6 +88,7 @@
+ {
+   return syscall (__NR_inotify_rm_watch, fd, wd);
+ }
++*/
+ 
+ #ifndef  IN_ONLYDIR
+ #define  IN_ONLYDIR 0x01000000 



More information about the arch-commits mailing list