Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=9670345ed2729c33d1995f15fd0def0dc9a3d3d1

commit 9670345ed2729c33d1995f15fd0def0dc9a3d3d1
Author: Melko <lorddarthfe...@gmail.com>
Date:   Sun Jan 23 13:32:05 2011 +0100

amarok-2.4.0-1-i686

* version bump

diff --git a/source/kde-extra/amarok/FrugalBuild 
b/source/kde-extra/amarok/FrugalBuild
index 2f5c029..5016bc7 100644
--- a/source/kde-extra/amarok/FrugalBuild
+++ b/source/kde-extra/amarok/FrugalBuild
@@ -2,22 +2,22 @@
# Maintainer: DeX77 <d...@dragonslave.de>

pkgname=amarok
-pkgver=2.3.2
+pkgver=2.4.0
pkgrel=1
pkgdesc="amaroK is a music player for Linux and Unix with an intuitive 
interface"
_F_cmakekde_final=OFF
Finclude kde
-depends=("kdelibs>=$_F_kde_ver" 'taglib-extras>=1.0' 'qtscriptgenerator' 
'libgpod' 'libmtp'\
-        'curl' 'liblastfm' 'loudmouth' 'libmysqld>=5.1.39' 
'libstrigiqtdbusclient' \
-       'mysql>=5.1.39' 'taglib>=1.6' 'qca' 'moodbar' 'openssl>=1.0.0')
-makedepends=("${makedepends[@]}" "kdelibs-compiletime>=$_F_kde_ver")
+depends=('libnepomuk' 'libkfile' 'libkutils' 'libplasma' 'taglib-extras' 
'libqtscript' 'liblastfm' \
+       'libkdewebkit' 'libofa' 'libmtp' 'libmysqlclient' 'libgpod' 'libaio' 
'loudmouth')
+makedepends=("${makedepends[@]}" "kdelibs-compiletime>=$_F_kde_ver" 
"docbook-xml" "mysql" "libkhtml" "libknotify" "libmysqld" "ksgmltools2")
groups=('kde-extra')
archs=('i686' 'x86_64')
url="http://amarok.kde.org/";
up2date="lynx -dump http://amarok.kde.org/wiki/Download:Source | grep 
url=stable | Flasttar |sed 's/_patched//'"
source=(ftp://ftp.kde.org/pub/kde/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.bz2
 \
-       binding_always_there.patch)
-sha1sums=('594d6d3ad57832fb80ba4387459356132d37ace2' \
-          '6f3295d51526e464e2006b23ef13584b08529aa9')
+       binding_always_there.patch embedded_database.patch)
+sha1sums=('d37ecda0fecdba88bb239f11c6d4ff885d7ac23f' \
+          '6f3295d51526e464e2006b23ef13584b08529aa9' \
+          'b60f19b1e6692e7f89a869ce91f38c27aaca35f5')

# optimization OK
diff --git a/source/kde-extra/amarok/embedded_database.patch 
b/source/kde-extra/amarok/embedded_database.patch
new file mode 100644
index 0000000..cd302af
--- /dev/null
+++ b/source/kde-extra/amarok/embedded_database.patch
@@ -0,0 +1,28 @@
+--- 
amarok-2.3.90/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
   2011-01-05 11:57:08.684157296 +0100
++++ 
a/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp    
   2011-01-07 15:31:59.409524333 +0100
+@@ -37,6 +37,7 @@
+     QString storagePath = storageLocation;
+     QString defaultsFile;
+     QString databaseDir;
++    QString myServerOpt;
+     if( storageLocation.isEmpty() )
+     {
+         storagePath = Amarok::saveLocation();
+@@ -82,7 +83,16 @@
+     }
+
+     setenv( "MYSQL_HOME", storagePath.toAscii().data(), 1 );
+-    if( mysql_server_init( 0 , 0, 0 ) != 0 )
++
++    myServerOpt = "--defaults-file=" + defaultsFile;
++
++    static char *server_options[] = \
++       { (char *)("Amarok"), myServerOpt.toLatin1().data(), NULL };
++    int num_elements = (sizeof(server_options) / sizeof(char *)) - 1;
++
++    static char *server_groups[] = { (char *)("embedded"), NULL };
++
++    if( mysql_library_init( num_elements , server_options, server_groups ) != 
0 )
+     {
+         error() << "MySQL library initialization failed.";
+         reportError( "init" );
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to