[arch-commits] Commit in kdeutils/trunk (4 files)

Pierre Schmitz pierre at archlinux.org
Wed Jul 23 19:53:45 EDT 2008


    Date: Wednesday, July 23, 2008 @ 19:53:45
  Author: pierre
Revision: 6168

upgpkg: kdeutils 4.1.0-1
    updating to 4.1.0

Modified:
  kdeutils/trunk/PKGBUILD
Deleted:
  kdeutils/trunk/fix-hibernate.patch
  kdeutils/trunk/klaptopdaemon.patch
  kdeutils/trunk/xmms-dynamic.patch

---------------------+
 PKGBUILD            |   55 ++++--------
 fix-hibernate.patch |   43 ---------
 klaptopdaemon.patch |   12 --
 xmms-dynamic.patch  |  226 --------------------------------------------------
 4 files changed, 21 insertions(+), 315 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-23 23:53:07 UTC (rev 6167)
+++ PKGBUILD	2008-07-23 23:53:45 UTC (rev 6168)
@@ -1,40 +1,27 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# $ Id: $
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdeutils
-pkgver=3.5.9
-kdever=3.5.9 # if minor 0, then without .0
-pkgrel=2
-pkgdesc="KDE General Utilities."
-arch=(i686 x86_64)
-url="http://www.kde.org"
-license=('GPL')
+pkgver=4.1.0
+pkgrel=1
+pkgdesc="KDE Utils is a compilation of various desktop utilities."
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
 groups=('kde')
-depends=('kdelibs>=3.5.9' 'libxss' 'libxtst' 'python>=2.5' 'gmp' 'net-snmp>=5.4' 'mtools' 'dosfstools' 'zip' 'unzip' 'unrar')
+depends=('kdepimlibs' 'libzip' 'python' 'libarchive' 'kdebase-workspace' 'gmp')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'pyqt')
+options=('docs')
+source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('80c1bd398620bb7e02acd31edf767eca')
 
-# 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 xmms-dynamic.patch klaptopdaemon.patch)
-
 build() {
-  # Source the QT and KDE profile
-  [ "$QTDIR" = "" ] && source /etc/profile.d/qt3.sh 
-  [ "$KDEDIR" = "" ] && source /etc/profile.d/kde.sh
-  cd $startdir/src/$pkgname-$pkgver/superkaramba/src
-  patch -Np0 -i ../../../xmms-dynamic.patch || return 1
-  # start building
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i ../klaptopdaemon.patch || return 1
-  make -f admin/Makefile.common
-  ./configure --prefix=/opt/kde --disable-debug --disable-dependency-tracking \
-  --enable-gcc-hidden-visibility --enable-final DO_NOT_COMPILE="ksim"
-  #        --enable-final # remove this if you build with < 512mb ram.
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+	cd $srcdir
+	mkdir build
+	cd build
+	cmake ../${pkgname}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	make
+	make DESTDIR=$pkgdir install
 }
-md5sums=('dbe5ddff57141f27778601df5571e182'
-         'b076e916c251d26384d53cffafa10afa'
-         'a4bb82591964e74c2e7c754e70ffa998')

Deleted: fix-hibernate.patch
===================================================================
--- fix-hibernate.patch	2008-07-23 23:53:07 UTC (rev 6167)
+++ fix-hibernate.patch	2008-07-23 23:53:45 UTC (rev 6168)
@@ -1,43 +0,0 @@
---- ./klaptopdaemon/portable.cpp.old	2007-05-14 11:40:45.000000000 +0400
-+++ ./klaptopdaemon/portable.cpp	2007-08-14 01:52:30.775790879 +0400
-@@ -690,15 +690,16 @@ has_acpi_sleep(int state) 
- 		mask = 0;
- 
- 		QFile p("/sys/power/state");
--		QFile f("/proc/acpi/sleep");
- 
- 		if (p.open(IO_ReadOnly)) {
-+			QTextStream stream(&p);
- 			QString l;
--			p.readLine(l,500);
-+			l = stream.readLine();
-+
- 			QStringList ll = QStringList::split(' ',l,false);
- 			for (QValueListIterator<QString> i = ll.begin(); i!=ll.end(); i++) {
- 				QString s = *i;
--				
-+
- 				if (s.compare("standby")==0)
- 				mask |= (1<<1);
- 				else if (s.compare("mem")==0)
-@@ -708,20 +709,6 @@ has_acpi_sleep(int state) 
- 			}
- 			p.close();
- 		}
--		else if (f.open(IO_ReadOnly)) {
--			QString l;
--			f.readLine(l, 500);
--			QStringList ll = QStringList::split(' ',l,false);
--			for (QValueListIterator<QString> i = ll.begin(); i!=ll.end(); i++) {
--				QString s = *i;
--				if (s[0] == 'S') {
--					int c = s[1].digitValue();
--					if (c >= 0 && c <= 9)
--						mask |= 1<<c;
--				}
--			}
--			f.close();
--		}
- 	}
- 	return((mask&acpi_sleep_enabled&(1<<state)) != 0);
- }

Deleted: klaptopdaemon.patch
===================================================================
--- klaptopdaemon.patch	2008-07-23 23:53:07 UTC (rev 6167)
+++ klaptopdaemon.patch	2008-07-23 23:53:45 UTC (rev 6168)
@@ -1,12 +0,0 @@
-diff -Naur kdeutils-3.5.7/klaptopdaemon/Makefile.am kdeutils-3.5.7-p/klaptopdaemon/Makefile.am
---- kdeutils-3.5.7/klaptopdaemon/Makefile.am	2007-05-14 09:40:45.000000000 +0200
-+++ kdeutils-3.5.7-p/klaptopdaemon/Makefile.am	2007-05-26 16:27:01.000000000 +0200
-@@ -9,7 +9,7 @@
-
- MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c
- kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel  
--kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version  -lXtst
-+kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_XEXT) $(LIB_XSS) -lXtst
- kded_klaptopdaemon_la_LIBADD   = $(LIB_KDEUI) $(LIB_XSS) libkcmlaptop.la
- 
- klaptop_acpi_helper_SOURCES = acpi_helper.cpp

Deleted: xmms-dynamic.patch
===================================================================
--- xmms-dynamic.patch	2008-07-23 23:53:07 UTC (rev 6167)
+++ xmms-dynamic.patch	2008-07-23 23:53:45 UTC (rev 6168)
@@ -1,226 +0,0 @@
-Index: xmmssensor.cpp
-===================================================================
---- xmmssensor.cpp	(Revision 508076)
-+++ xmmssensor.cpp	(Arbeitskopie)
-@@ -10,11 +10,123 @@
- #include "xmmssensor.h"
- 
- #ifdef HAVE_XMMS
--#include <xmmsctrl.h>
-+#include <qlibrary.h>
-+
-+class XMMSSensor::XMMS
-+{
-+public:
-+    XMMS() : libxmms( 0 )
-+    {
-+        libxmms = new QLibrary( "xmms.so.1" );
-+        if ( !libxmms->load() )
-+        {
-+            qDebug("xmms.so.1 not found");
-+            delete libxmms;
-+            libxmms = 0;
-+        }
-+
-+        if ( libxmms != 0 )
-+        {
-+            // resolve functions
-+            *(void**) (&xmms_remote_is_running) =
-+                    libxmms->resolve( "xmms_remote_is_running" );
-+
-+            *(void**) (&xmms_remote_is_playing) =
-+                    libxmms->resolve( "xmms_remote_is_playing" );
-+
-+            *(void**) (&xmms_remote_get_playlist_title) =
-+                    libxmms->resolve( "xmms_remote_get_playlist_title" );
-+
-+            *(void**) (&xmms_remote_get_playlist_time) =
-+                    libxmms->resolve( "xmms_remote_get_playlist_time" );
-+
-+            *(void**) (&xmms_remote_get_playlist_pos) =
-+                    libxmms->resolve( "xmms_remote_get_playlist_pos" );
-+
-+            *(void**) (&xmms_remote_get_output_time) =
-+                    libxmms->resolve( "xmms_remote_get_output_time" );
-+        }
-+    }
-+
-+    bool isInitialized() const
-+    {
-+        return libxmms != 0 &&
-+               xmms_remote_is_running != 0 &&
-+               xmms_remote_is_playing != 0 &&
-+               xmms_remote_get_playlist_title != 0 &&
-+               xmms_remote_get_playlist_time  != 0 &&
-+               xmms_remote_get_playlist_pos   != 0 &&
-+               xmms_remote_get_output_time    != 0;
-+    }
-+
-+    bool isRunning(int session)
-+    {
-+        if ( !isInitialized() ) return false;
-+
-+        return (*xmms_remote_is_running)(session);
-+    }
-+
-+    bool isPlaying(int session)
-+    {
-+        if ( !isInitialized() ) return false;
-+
-+        return (*xmms_remote_is_playing)(session);
-+    }
-+
-+    char* getPlaylistTitle(int session, int pos)
-+    {
-+        if ( !isInitialized() ) return "";
-+
-+        return (*xmms_remote_get_playlist_title)(session, pos);
-+    }
-+
-+    int getPlaylistTime(int session, int pos)
-+    {
-+        if ( !isInitialized() ) return 0;
-+
-+        return (*xmms_remote_get_playlist_time)(session, pos);
-+    }
-+
-+    int getPlaylistPos(int session)
-+    {
-+        if ( !isInitialized() ) return 0;
-+
-+        return (*xmms_remote_get_playlist_pos)(session);
-+    }
-+
-+    int getOutputTime(int session)
-+    {
-+        if ( !isInitialized() ) return 0;
-+
-+        return (*xmms_remote_get_output_time)(session);
-+    }
-+
-+private:
-+    QLibrary* libxmms;
-+
-+    bool (*xmms_remote_is_running)(int);
-+    bool (*xmms_remote_is_playing)(int);
-+
-+    char* (*xmms_remote_get_playlist_title)(int, int);
-+    int   (*xmms_remote_get_playlist_time)(int, int);
-+    int   (*xmms_remote_get_playlist_pos)(int);
-+    int   (*xmms_remote_get_output_time)(int);
-+};
-+
-+#else // No XMMS
-+
-+class XMMSSensor::XMMS
-+{
-+public:
-+    XMMS() {}
-+
-+    bool isInitialized() const { return false; }
-+};
- #endif // HAVE_XMMS
- 
-+
- XMMSSensor::XMMSSensor( int interval, const QString &encoding )
--    : Sensor( interval )
-+    : Sensor( interval ), xmms( 0 )
- {
-      if( !encoding.isEmpty() )
-     {
-@@ -25,9 +137,13 @@
-     else
-         codec = QTextCodec::codecForLocale();
- 
-+    xmms = new XMMS();
-+
- }
- XMMSSensor::~XMMSSensor()
--{}
-+{
-+    delete xmms;
-+}
- 
- void XMMSSensor::update()
- {
-@@ -43,21 +159,21 @@
-     int songLength = 0;
-     int currentTime = 0;
-     bool isPlaying = false;
--    bool isRunning = xmms_remote_is_running(0);
-+    bool isRunning = xmms->isRunning(0);
- 
-     if( isRunning )
-     {
--        isPlaying = xmms_remote_is_playing(0);
--        pos = xmms_remote_get_playlist_pos(0);
-+        isPlaying = xmms->isPlaying(0);
-+        pos = xmms->getPlaylistPos(0);
-         qDebug("unicode start");
--        title = codec->toUnicode( QCString( xmms_remote_get_playlist_title( 0, pos ) )  );
-+        title = codec->toUnicode( QCString( xmms->getPlaylistTitle( 0, pos ) )  );
-         qDebug("unicode end");
-         if( title.isEmpty() )
-             title = "XMMS";
- 
-         qDebug("Title: %s", title.ascii());
--        songLength = xmms_remote_get_playlist_time( 0, pos );
--        currentTime = xmms_remote_get_output_time( 0 );
-+        songLength = xmms->getPlaylistTime( 0, pos );
-+        currentTime = xmms->getOutputTime( 0 );
-     }
- #endif // HAVE_XMMS
- 
-@@ -144,6 +260,9 @@
- 
- }
- 
-+bool XMMSSensor::hasXMMS() const
-+{
-+    return xmms->isInitialized();
-+}
- 
--
- #include "xmmssensor.moc"
-Index: xmmssensor.h
-===================================================================
---- xmmssensor.h	(Revision 508076)
-+++ xmmssensor.h	(Arbeitskopie)
-@@ -28,10 +28,13 @@
-     ~XMMSSensor();
-     void update();
-     void setMaxValue( SensorParams *);
-+    bool hasXMMS() const;
- 
- private:
-     QTextCodec *codec;
- 
-+    class XMMS;
-+    XMMS *xmms;
- };
- 
- 
-Index: Makefile.am
-===================================================================
---- Makefile.am	(Revision 508076)
-+++ Makefile.am	(Arbeitskopie)
-@@ -1,5 +1,5 @@
- # set the include path for X, qt and KDE
--INCLUDES = $(all_includes) $(XMMS_INCLUDES) $(PYTHONINC)
-+INCLUDES = $(all_includes) $(PYTHONINC)
- 
- # these are the headers for your project
- noinst_HEADERS = karamba.h karambaapp.h karamba_python.h lineparser.h \
-@@ -40,9 +40,9 @@
- 
- # kde_cfg_DATA = superkaramba.kcfg
- 
--superkaramba_LDFLAGS = -Wl,-export-dynamic  $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(XMMS_LDFLAGS)
--#superkaramba_LDADD = -lkio $(LIB_KDEUI) $(XMMS_LDADD) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
--superkaramba_LDADD = -lkio $(LIB_KDEUI) $(XMMS_LIBS) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
-+superkaramba_LDFLAGS = -Wl,-export-dynamic  $(KDE_RPATH) $(all_libraries) $(PYTHONLIB)
-+#superkaramba_LDADD = -lkio $(LIB_KDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
-+superkaramba_LDADD = -lkio $(LIB_KDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
- 
- # this is where the desktop file will go
- shelldesktopdir = $(kde_appsdir)/Utilities





More information about the arch-commits mailing list