[arch-commits] CVS update of extra/kde/kdebase (PKGBUILD fix-hal.patch)
Tobias Powalowski
tpowa at archlinux.org
Mon Mar 3 19:01:51 UTC 2008
Date: Monday, March 3, 2008 @ 14:01:51
Author: tpowa
Path: /home/cvs-extra/extra/kde/kdebase
Added: fix-hal.patch (1.1)
Modified: PKGBUILD (1.90 -> 1.91)
upgppkg: update to new version
---------------+
PKGBUILD | 39 ++++++++---------------------
fix-hal.patch | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 87 insertions(+), 27 deletions(-)
Index: extra/kde/kdebase/PKGBUILD
diff -u extra/kde/kdebase/PKGBUILD:1.90 extra/kde/kdebase/PKGBUILD:1.91
--- extra/kde/kdebase/PKGBUILD:1.90 Sat Jan 26 14:18:09 2008
+++ extra/kde/kdebase/PKGBUILD Mon Mar 3 14:01:51 2008
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD,v 1.90 2008/01/26 19:18:09 tpowa Exp $
+# $Id: PKGBUILD,v 1.91 2008/03/03 19:01:51 tpowa Exp $
# Contributor: Roman Kreisel <roman.kreisel at epost.de>
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
pkgname=kdebase
-pkgver=3.5.8
-kdever=3.5.8 # if minor 0, then without .0
-pkgrel=3
+pkgver=3.5.9
+kdever=3.5.9 # if minor 0, then without .0
+pkgrel=1
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.8' 'libldap' 'eject>=2.1.5' 'lm_sensors>=3.0.0' 'mtools' 'libusb' 'libraw1394' 'cyrus-sasl' \
+depends=('kdelibs>=3.5.9' 'libldap' 'eject>=2.1.5' 'lm_sensors>=3.0.0' 'mtools' 'libusb' 'libraw1394' 'cyrus-sasl' \
'libxcomposite' 'libxdamage' 'hal>=0.5.8.1-2' 'pmount>=0.9.13-2' 'libxxf86misc' 'libxkbfile' 'libxss' \
'libfontenc' 'dbus-qt3' 'xorg-xauth' 'db>=4.6')
backup=('opt/kde/share/config/kdm/Xservers' 'opt/kde/share/config/kdm/kdmrc' \
@@ -25,33 +25,25 @@
# parallel builds break kcontrol and whatnot
options=(!makeflags)
source=(ftp://$mirror/stable/$kdever/src/$pkgname-$pkgver.tar.bz2
- tango.diff kdm-grub.patch lmsensors.patch fix-nfs.patch)
-
-
+ tango.diff kdm-grub.patch fix-hal.patch)
build() {
# Source the QT and KDE profile
- [ "$QTDIR" = "" ] && source /etc/profile.d/qt.sh
+ [ "$QTDIR" = "" ] && source /etc/profile.d/qt3.sh
[ "$KDEDIR" = "" ] && source /etc/profile.d/kde.sh
# start building
- export PATH=$PATH:/usr/X11R6/bin
cd $startdir/src/$pkgname-$pkgver
patch -Np1 -i ../kdm-grub.patch || return 1
patch -Np0 -i ../tango.diff || return 1
- # fix sensors
- patch -Np0 -i ../lmsensors.patch || return 1
- # fix nfs http://bugs.archlinux.org/task/9172
- patch -Np0 -i ../fix-nfs.patch || return 1
+ # fix hal #8342
+ patch -Np1 -i ../fix-hal.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}" \
--disable-dependency-tracking --disable-debug --enable-gcc-hidden-visibility --enable-final \
--enable-new-ldflags LDFLAGS="${LDFLAGS} -L/opt/kde/lib"
# --enable-final # remove this if you build with < 512mb ram.
- #fix floppy ioslave
- #sed -i -e 's#^LIBS = #LIBS = -L/opt/kde/lib -lkio#g' kioslave/floppy/Makefile || return 1
- #sed -i -e 's#^LIBS = #LIBS = -L/opt/kde/lib -lkio#g' kioslave/smb/Makefile || return 1
make || return 1
make DESTDIR=$startdir/pkg install || return 1
@@ -71,16 +63,9 @@
# Adding Arch graphics for kde
mv $startdir/pkg/opt/kde/share/apps/ksmserver/pics/shutdownkonq.png \
$startdir/pkg/opt/kde/share/apps/ksmserver/pics/shutdownkonq.png.old
-
- # remove trademarked mozilla icons
- #rm $startdir/pkg/opt/kde/share/icons/crystalsvg/16x16/apps/firefox.png
- #rm $startdir/pkg/opt/kde/share/icons/crystalsvg/32x32/apps/firefox.png
- #rm $startdir/pkg/opt/kde/share/icons/crystalsvg/48x48/apps/firefox.png
- #rm $startdir/pkg/opt/kde/share/icons/crystalsvg/16x16/apps/thunderbird.png
- #rm $startdir/pkg/opt/kde/share/icons/crystalsvg/32x32/apps/thunderbird.png
}
-md5sums=('9990c669229daaaa8fca4c5e354441fd'
+
+md5sums=('c8c35389a238aa1b73e68ef5298eadf8'
'43232dcb916b1d25e0ad7ef3575763a4'
'f8645dc5d0044476a01c9c6a95c4853f'
- '7fec06bac92febdf0a26dfd72faabf50'
- '3652ba1bbc971f0a8dfbb0cf2036db5a')
+ '6202110beb1faf768c3f76e2b4e811b7')
Index: extra/kde/kdebase/fix-hal.patch
diff -u /dev/null extra/kde/kdebase/fix-hal.patch:1.1
--- /dev/null Mon Mar 3 14:01:51 2008
+++ extra/kde/kdebase/fix-hal.patch Mon Mar 3 14:01:51 2008
@@ -0,0 +1,75 @@
+diff -r -u kdebase-3.5.5a.dfsg.1.orig/kioslave/media/mediamanager/halbackend.cpp kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.cpp
+--- kdebase-3.5.5a.dfsg.1.orig/kioslave/media/mediamanager/halbackend.cpp 2007-01-25 12:34:07.805485000 +0300
++++ kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.cpp 2007-01-25 16:46:59.118184525 +0300
+@@ -745,6 +745,33 @@
+ s_HALBackend->DeviceCondition(udi, condition_name);
+ }
+
++QStringList HALBackend::getHALmountoptions(QString udi)
++{
++ const char* _ppt_string;
++ LibHalVolume* volume;
++ LibHalDrive* drive;
++
++ QString _ppt_QString;
++
++ volume = libhal_volume_from_udi( m_halContext, udi.latin1() );
++ if( volume )
++ drive = libhal_drive_from_udi( m_halContext, libhal_volume_get_storage_device_udi( volume ) );
++ else
++ drive = libhal_drive_from_udi( m_halContext, udi.latin1() );
++
++ if( !drive )
++ return QString::null;
++
++ if( volume )
++ _ppt_string = libhal_volume_policy_get_mount_options ( drive, volume, NULL );
++ else
++ _ppt_string = libhal_drive_policy_get_mount_options ( drive, NULL );
++
++ _ppt_QString = QString(_ppt_string ? _ppt_string : "");
++
++ return QStringList::split(",",_ppt_QString);
++}
++
+ QStringList HALBackend::mountoptions(const QString &name)
+ {
+ const Medium* medium = m_mediaList.findById(name);
+@@ -1069,10 +1096,25 @@
+ soptions << QString("data=ordered");
+ }
+
++ QStringList hal_mount_options = getHALmountoptions(medium->id());
++ for (QValueListIterator<QString> it=hal_mount_options.begin();it!=hal_mount_options.end();it++)
++ {
++ soptions << *it;
++ kdDebug()<<"HALOption: "<<*it<<endl;
++ if ((*it).startsWith("iocharset="))
++ {
++ soptions.remove("utf8");
++ kdDebug()<<"\"iocharset=\" found. Removing \"utf8\" from options."<<endl;
++ }
++ }
++
+ const char **options = new const char*[soptions.size() + 1];
+ uint noptions = 0;
+ for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions)
++ {
+ options[noptions] = (*it).latin1();
++ kdDebug()<<"Option: "<<*it<<endl;
++ }
+ options[noptions] = NULL;
+
+ QString qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection);
+diff -r -u kdebase-3.5.5a.dfsg.1.orig/kioslave/media/mediamanager/halbackend.h kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.h
+--- kdebase-3.5.5a.dfsg.1.orig/kioslave/media/mediamanager/halbackend.h 2007-01-25 12:34:07.133446000 +0300
++++ kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.h 2007-01-25 16:33:54.413638693 +0300
+@@ -192,6 +192,7 @@
+ const char* message
+ );
+
++ QStringList getHALmountoptions(QString udi);
+ /* HAL and DBus structures */
+ private:
+ /**
+
More information about the arch-commits
mailing list