[arch-commits] Commit in kdenetwork/trunk (5 files)
Pierre Schmitz
pierre at archlinux.org
Wed Jul 23 23:44:47 UTC 2008
Date: Wednesday, July 23, 2008 @ 19:44:46
Author: pierre
Revision: 6152
upgpkg: kdenetwork 4.1.0-1
updating to 4.1.0
Modified:
kdenetwork/trunk/PKGBUILD
Deleted:
kdenetwork/trunk/icq-server.patch
kdenetwork/trunk/lisa
kdenetwork/trunk/post-3.5.5-kdenetwork-ksirc.diff
kdenetwork/trunk/post-kde-3.5.5.patch
----------------------------------+
PKGBUILD | 53 ++++++++++++++-----------------------
icq-server.patch | 11 -------
lisa | 35 ------------------------
post-3.5.5-kdenetwork-ksirc.diff | 27 ------------------
post-kde-3.5.5.patch | 11 -------
5 files changed, 21 insertions(+), 116 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-07-23 23:42:52 UTC (rev 6151)
+++ PKGBUILD 2008-07-23 23:44:46 UTC (rev 6152)
@@ -1,39 +1,28 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# $ Id: $
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
pkgname=kdenetwork
-pkgver=3.5.9
-kdever=3.5.9 # if minor 0, then without .0
+pkgver=4.1.0
pkgrel=1
-pkgdesc="KDE Networking Programs."
-arch=(i686 x86_64)
-url="http://www.kde.org"
-license=('GPL')
+pkgdesc="KDE Network related programs"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
groups=('kde')
-makedepends=('pkgconfig')
-depends=('kdebase>=3.5.9' 'wireless_tools' 'ppp' 'openslp' 'rdesktop' 'kdelibs>=3.5.9' 'gnutls>=1.2.4' 'qca-tls' 'perl-io-socket-ssl' 'libxss')
+depends=('kdebase-workspace' 'kdepimlibs' 'gmp' 'libvncserver' 'openslp' 'libidn' 'libotr' 'decibel' 'qca')
+makedepends=('pkgconfig' 'cmake' 'automoc4')
+options=('docs')
+source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('0920bd6f104351931ffdfd6dfd632c68')
-# for easier build, just uncomment the mirror you want to use
- mirror="ftp.solnet.ch/mirror/KDE" # updated every 2 hours, very fast for Europe
-# mirror="ftp.kde.org/pub/kde/" # main server
-# mirror="ibiblio.org/pub/mirrors/kde/" # ibiblio mirror
-
-source=(ftp://$mirror/stable/$kdever/src/$pkgname-$pkgver.tar.bz2 lisa)
-
-
build() {
- # Source the QT and KDE profile
- [ "$QTDIR" = "" ] && source /etc/profile.d/qt3.sh
- [ "$KDEDIR" = "" ] && source /etc/profile.d/kde.sh
- # start building
- cd $startdir/src/$pkgname-$pkgver
- ./configure --prefix=/opt/kde --disable-debug --disable-dependency-tracking --enable-gcc-hidden-visibility \
- --enable-final
- # --enable-final # remove this if you build with < 512mb ram.
- make || return 1
- make DESTDIR=$startdir/pkg install || return 1
- # Install lisa network daemon
- install -D -m 755 $startdir/src/lisa $startdir/pkg/etc/rc.d/lisa
+ cd $srcdir
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DWITH_Xmms=OFF
+ make
+ make DESTDIR=$pkgdir install
}
-md5sums=('0ec1d4ccd550510821a622eb91b893e8'
- 'cb621ff9a11c2c5f5672d9c895cea1a9')
Deleted: icq-server.patch
===================================================================
--- icq-server.patch 2008-07-23 23:42:52 UTC (rev 6151)
+++ icq-server.patch 2008-07-23 23:44:46 UTC (rev 6152)
@@ -1,11 +0,0 @@
---- branches/KDE/3.5/kdenetwork/kopete/protocols/oscar/liboscar/oscartypes.h 2006/07/11 18:00:43 561016
-+++ branches/KDE/3.5/kdenetwork/kopete/protocols/oscar/liboscar/oscartypes.h 2006/07/31 16:42:04 568263
-@@ -237,7 +237,7 @@
- const WORD ICQ_MAJOR = 0x0014;
- const WORD ICQ_MINOR = 0x0034;
- const WORD ICQ_POINT = 0x0000;
-- const WORD ICQ_BUILD = 0x0A0F;
-+ const WORD ICQ_BUILD = 0x0BB8;
- const char ICQ_OTHER[] = { 0x00, 0x00, 0x04, 0x3d };
- const char ICQ_COUNTRY[] = "us";
- const char ICQ_LANG[] = "en";
Deleted: lisa
===================================================================
--- lisa 2008-07-23 23:42:52 UTC (rev 6151)
+++ lisa 2008-07-23 23:44:46 UTC (rev 6152)
@@ -1,35 +0,0 @@
-#!/bin/bash
-
- . /etc/rc.conf
- . /etc/rc.d/functions
-
- case "$1" in
-
- start)
- stat_busy "Starting LISa"
- /opt/kde/bin/lisa &>/dev/null
- if [ $? -ne 0 ]; then
- stat_fail
- else
- add_daemon lisa
- stat_done
- fi
- ;;
-
- stop)
- stat_busy "Stopping LISa"
- kill -9 `pidof /opt/kde/bin/lisa` &>/dev/null
- rm_daemon lisa
- stat_done
- ;;
-
- restart)
- stat_busy "Restarting LISa ..."
- $0 stop
- $0 start
- stat_done
- ;;
-
- *)
- echo "usage: $0 {start|stop|restart}"
- esac
\ No newline at end of file
Deleted: post-3.5.5-kdenetwork-ksirc.diff
===================================================================
--- post-3.5.5-kdenetwork-ksirc.diff 2008-07-23 23:42:52 UTC (rev 6151)
+++ post-3.5.5-kdenetwork-ksirc.diff 2008-07-23 23:44:46 UTC (rev 6152)
@@ -1,27 +0,0 @@
---- ksirc/iocontroller.cpp
-+++ ksirc/iocontroller.cpp
-@@ -237,7 +237,7 @@
-
- if((line.length() > 0) && (line[0] == '~')){
- pos3 = line.find('~', 1);
-- if(pos3 > 0){
-+ if(pos3 > 1){
- name = line.mid(1,pos3-1).lower();
- name = name.lower();
- line.remove(0, pos3+1);
-@@ -266,13 +266,13 @@
- if(ksopts->autoCreateWin == TRUE && line[0] != '`' && line[1] != '#' && line[1] != '&' && noticeCreate) {
- //kdDebug(5008) << "Creating window for: " << qsname << " because of: " << line.data() << endl;
- ksircproc->new_toplevel(KSircChannel(ksircproc->serverName(), qsname));
-- assert(ksircproc->TopList[qsname] != 0x0);
- }
-- else{
-+ if (!ksircproc->TopList[qsname]) {
- qsname = "!default";
- if(line[0] == '`')
- qsname = "!discard";
- }
-+ assert(ksircproc->TopList[qsname]);
- }
-
- ksircproc->TopList[qsname]->sirc_receive(line);
Deleted: post-kde-3.5.5.patch
===================================================================
--- post-kde-3.5.5.patch 2008-07-23 23:42:52 UTC (rev 6151)
+++ post-kde-3.5.5.patch 2008-07-23 23:44:46 UTC (rev 6152)
@@ -1,11 +0,0 @@
---- branches/KDE/3.5/kdenetwork/kopete/protocols/oscar/liboscar/client.cpp 2006/08/17 13:37:13 573903
-+++ branches/KDE/3.5/kdenetwork/kopete/protocols/oscar/liboscar/client.cpp 2006/10/31 18:48:12 600778
-@@ -340,6 +340,7 @@
- //we've finished logging in. start the services setup
- kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "stage two done. setting up services" << endl;
- initializeStaticTasks();
-+ d->ownStatusTask->go();
- ServiceSetupTask* ssTask = new ServiceSetupTask( d->connections.defaultConnection()->rootTask() );
- connect( ssTask, SIGNAL( finished() ), this, SLOT( serviceSetupFinished() ) );
- ssTask->go( true ); //fire and forget
-
More information about the arch-commits
mailing list