[arch-commits] Commit in kdebase/trunk (2 files)

[andyrtr at archlinux.org]

    Date: Tuesday, July 1, 2008 @ 17:57:51
  Author: andyrtr
Revision: 3869

upgpkg: kdebase 3.5.9-3

Added:
  kdebase/trunk/kdesu-3.5.9-glibc28-struct-ucred.patch
Modified:
  kdebase/trunk/PKGBUILD

----------------------------------------+
 PKGBUILD                               |   27 ++++++++++++++-------------
 kdesu-3.5.9-glibc28-struct-ucred.patch |   19 +++++++++++++++++++
 2 files changed, 33 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-01 18:45:47 UTC (rev 3868)
+++ PKGBUILD	2008-07-01 21:57:51 UTC (rev 3869)
@@ -5,16 +5,16 @@
 pkgname=kdebase
 pkgver=3.5.9
 kdever=3.5.9 # if minor 0, then without .0
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE Base Programs."
 arch=(i686 x86_64)
 url="http://www.kde.org"
 license=('GPL')
 groups=('kde')
-makedepends=('samba' 'jre' 'imake' 'xorg-font-utils' 'pkgconfig')
-depends=('kdelibs>=3.5.9' 'libldap' 'eject>=2.1.5' 'lm_sensors>=3.0.0' 'mtools' 'libusb' 'libraw1394' 'cyrus-sasl' \
+makedepends=('samba>=3.0.30-2' 'jre' 'imake' 'xorg-font-utils' 'pkgconfig')
+depends=('kdelibs>=3.5.9-5' 'libldap' 'eject>=2.1.5' 'lm_sensors>=3.0.0' 'mtools' 'libusb' 'libraw1394' 'cyrus-sasl>=2.1.22-9' \
 	 'libxcomposite' 'libxdamage' 'hal>=0.5.8.1-2' 'pmount>=0.9.13-2' 'libxxf86misc' 'libxkbfile' 'libxss' \
-	 'libfontenc' 'dbus-qt3' 'xorg-xauth' 'db>=4.6')
+	 'libfontenc' 'dbus-qt3' 'xorg-xauth' 'db>=4.7')
 backup=('opt/kde/share/config/kdm/Xservers' 'opt/kde/share/config/kdm/kdmrc' \
         'opt/kde/share/config/kdm/Xaccess' 'opt/kde/share/config/kdm/Xresources' )
 
@@ -25,9 +25,15 @@
 # parallel builds break kcontrol and whatnot
 options=(!makeflags)
 source=(ftp://$mirror/stable/$kdever/src/$pkgname-$pkgver.tar.bz2
-	tango.diff kdm-grub.patch fix-hal.patch kdm-zsh-profile.patch)
+	tango.diff kdm-grub.patch fix-hal.patch kdm-zsh-profile.patch
+	kdesu-3.5.9-glibc28-struct-ucred.patch)
+md5sums=('c8c35389a238aa1b73e68ef5298eadf8'
+         '43232dcb916b1d25e0ad7ef3575763a4'
+         'f8645dc5d0044476a01c9c6a95c4853f'
+         '6202110beb1faf768c3f76e2b4e811b7'
+         '40f5556820d52a14e9d9722a5a8a491e'
+         '77078f9599ed93f28006ae853e6c7623')
 
-
 build() {
   # Source the QT and KDE profile
   [ "$QTDIR" = "" ] && source /etc/profile.d/qt3.sh 
@@ -39,6 +45,8 @@
   patch -Np0 -i ../tango.diff || return 1
   # fix hal #8342
   patch -Np1 -i ../fix-hal.patch || return 1
+  # fix a glibc2.8 build issue see http://bugs.gentoo.org/show_bug.cgi?id=225727
+  patch -Np1 -i ../kdesu-3.5.9-glibc28-struct-ucred.patch || return 1
   sed -i -e 's/applications-merged/kde-applications-merged/g' applnk/Makefile.{am,in}
   #make -f admin/Makefile.common || return 1
   ./configure --prefix=/opt/kde --with-dpms --build="${CHOST}" --host="${CHOST}" \
@@ -65,10 +73,3 @@
   mv $startdir/pkg/opt/kde/share/apps/ksmserver/pics/shutdownkonq.png \
   $startdir/pkg/opt/kde/share/apps/ksmserver/pics/shutdownkonq.png.old
 }
-
-md5sums=('c8c35389a238aa1b73e68ef5298eadf8'
-         '43232dcb916b1d25e0ad7ef3575763a4'
-         'f8645dc5d0044476a01c9c6a95c4853f'
-         '6202110beb1faf768c3f76e2b4e811b7'
-         '40f5556820d52a14e9d9722a5a8a491e')
-

Added: kdesu-3.5.9-glibc28-struct-ucred.patch
===================================================================
--- kdesu-3.5.9-glibc28-struct-ucred.patch	                        (rev 0)
+++ kdesu-3.5.9-glibc28-struct-ucred.patch	2008-07-01 21:57:51 UTC (rev 3869)
@@ -0,0 +1,19 @@
+--- kdebase/kdesu/configure.in.in	2006/10/04 23:00:23	592501
++++ kdebase/kdesu/configure.in.in	2008/04/13 14:06:43	796383
+@@ -1,6 +1,15 @@
+ dnl Check for "struct ucred"
+ AC_MSG_CHECKING("struct ucred")
+-AC_EGREP_HEADER([struct ucred], [sys/socket.h], have_ucred=yes)
++AC_TRY_COMPILE(
++[
++  #define _GNU_SOURCE 1
++  #include <sys/socket.h>
++],
++[
++  struct ucred red;
++],  have_ucred=yes
++  , have_ucred=no
++)
+ if test "$have_ucred" = "yes"; then
+     AC_DEFINE(HAVE_STRUCT_UCRED, 1, [Define if you have the struct ucred])
+     AC_MSG_RESULT(yes)