Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=e499ce6f7ae4ea4f89844e0942b0d32779c5dfe1
commit e499ce6f7ae4ea4f89844e0942b0d32779c5dfe1
Author: Melko <me...@frugalware.org>
Date: Sun Aug 14 18:37:21 2011 +0200
amarok-2.4.3-1-i686
* version bump
* remove dropped patch
diff --git a/source/kde-extra/amarok/FrugalBuild
b/source/kde-extra/amarok/FrugalBuild
index dd0df0b..aae9983 100644
--- a/source/kde-extra/amarok/FrugalBuild
+++ b/source/kde-extra/amarok/FrugalBuild
@@ -2,12 +2,11 @@
# Maintainer: Melko <lorddarthfe...@gmail.com>
pkgname=amarok
-pkgver=2.4.1
+pkgver=2.4.3
pkgrel=1
pkgdesc="amaroK is a music player for Linux and Unix with an intuitive
interface"
-_F_cmakekde_final=OFF
Finclude kde
-depends=('libnepomuk' 'libkfile' 'libkutils' 'libplasma' 'taglib-extras'
'libqtscript' 'liblastfm' \
+depends=('libkfile' 'libkutils' 'libplasma' 'taglib-extras' 'liblastfm' \
'libkdewebkit' 'libofa' 'libmtp' 'libmysqlclient' 'libgpod' 'libaio'
'loudmouth' 'libqtdeclarative')
makedepends=("${makedepends[@]}" "kdelibs-compiletime>=$_F_kde_ver"
"docbook-xml" "docbook-xsl" "mysql" "libkhtml" "libknotify" "libmysqld"
"ksgmltools2")
groups=('kde-extra')
@@ -16,7 +15,7 @@ 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=('1b1180e7799ff1314ee5a6409a612ede37ce8394' \
+sha1sums=('8a46fca6a550a4ca403a9be7f595728c819641c4' \
'6f3295d51526e464e2006b23ef13584b08529aa9')
# optimization OK
diff --git a/source/kde-extra/amarok/embedded_database.patch
b/source/kde-extra/amarok/embedded_database.patch
deleted file mode 100644
index cd302af..0000000
--- a/source/kde-extra/amarok/embedded_database.patch
+++ /dev/null
@@ -1,28 +0,0 @@
----
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
