summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrealgagu2019-01-27 16:08:38 -0500
committerfrealgagu2019-01-27 16:08:38 -0500
commitd40e3de606138ee166e06939e8274c45e20ad691 (patch)
tree0c7532680764bcc0793f29f8f8262f9932307f60
parent6817e9cd491834a57c8690bdd5c509f20920bb01 (diff)
downloadaur-d40e3de606138ee166e06939e8274c45e20ad691.tar.gz
Removing libssh-gnutls dependency. Adding patch to found mariadb.
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD19
-rw-r--r--amarok_mariadb.patch22
3 files changed, 41 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 07ea873e675..164d408e49d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = amarok
pkgdesc = The powerful music player for KDE
- pkgver = 2.9.0.r351.0362c32b7a
+ pkgver = 2.9.0.r354.2351bcd67b
pkgrel = 1
url = http://amarok.kde.org/
arch = x86_64
@@ -25,7 +25,6 @@ pkgbase = amarok
depends = libmtp
depends = libmygpo-qt5
depends = libofa
- depends = libssh-gnutls
depends = mariadb
depends = phonon-qt5
depends = qt5-webengine
@@ -33,8 +32,10 @@ pkgbase = amarok
depends = threadweaver
optdepends = ifuse: support for Apple iPod Touch and iPhone
optdepends = loudmouth: backend needed by mp3tunes for syncing
- source = amarok-2.9.0.r351.0362c32b7a.tar.gz::https://github.com/KDE/amarok/archive/eb9706eaee14e07d894cf2ad442268a6f62d915a.tar.gz
- sha256sums = 83e1039a98e8185d3c4c81fcb296f4e35a1e31df2c993df961f8579399a63da4
+ source = amarok-2.9.0.r354.2351bcd67b.tar.gz::https://github.com/KDE/amarok/archive/2351bcd67b33d43449283e50b1dbc7de012a2414.tar.gz
+ source = amarok_mariadb.patch
+ sha256sums = 6ff5156f1753d3f17a7f61773704b790be626cd5919da19e6c00697f0cb3c5fd
+ sha256sums = 029937d925993fa0b3cbe460f6d0c8f9fd624fc8dffff22acbbd3da600720dab
pkgname = amarok
diff --git a/PKGBUILD b/PKGBUILD
index 70f83a370ba..46438d97dce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,25 +5,34 @@
# Contributor: damir <damir@archlinux.org>
pkgname=amarok
-pkgver=2.9.0.r351.0362c32b7a
+pkgver=2.9.0.r354.2351bcd67b
pkgrel=1
pkgdesc="The powerful music player for KDE"
arch=("x86_64")
url="http://${pkgname}.kde.org/"
license=("FDL" "GPL2" "LGPL2.1")
-depends=("kcmutils" "kdnssd" "kirigami2" "knewstuff" "ktexteditor" "libgpod" "liblastfm-qt5" "libmtp" "libmygpo-qt5" "libofa" "libssh-gnutls" "mariadb" "phonon-qt5" "qt5-webengine" "taglib-extras" "threadweaver")
+depends=("kcmutils" "kdnssd" "kirigami2" "knewstuff" "ktexteditor" "libgpod" "liblastfm-qt5" "libmtp" "libmygpo-qt5" "libofa" "mariadb" "phonon-qt5" "qt5-webengine" "taglib-extras" "threadweaver")
makedepends=("extra-cmake-modules" "gdk-pixbuf2" "git" "knotifyconfig" "libgpod" "libmtp" "libmygpo-qt5" "loudmouth")
optdepends=("ifuse: support for Apple iPod Touch and iPhone"
"loudmouth: backend needed by mp3tunes for syncing")
-_commit="eb9706eaee14e07d894cf2ad442268a6f62d915a"
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/KDE/${pkgname}/archive/${_commit}.tar.gz")
-sha256sums=("83e1039a98e8185d3c4c81fcb296f4e35a1e31df2c993df961f8579399a63da4")
+_commit="2351bcd67b33d43449283e50b1dbc7de012a2414"
+source=(
+ "${pkgname}-${pkgver}.tar.gz::https://github.com/KDE/${pkgname}/archive/${_commit}.tar.gz"
+ "${pkgname}_mariadb.patch"
+)
+sha256sums=(
+ "6ff5156f1753d3f17a7f61773704b790be626cd5919da19e6c00697f0cb3c5fd"
+ "029937d925993fa0b3cbe460f6d0c8f9fd624fc8dffff22acbbd3da600720dab"
+)
#git describe --long --tags 2> /dev/null | sed "s/^[A-Za-z\.\-]*//;s/\([^-]*-\)g/r\1/;s/-/./g"
#source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"{,.sig})
#validpgpkeys=("D81C0CB38EB725EF6691C385BB463350D6EF31EF") # Heiko Becker <heirecka@exherbo.org>
prepare() {
+ cd "${srcdir}/${pkgname}-${_commit}"
+ patch -Np1 -i "${srcdir}/amarok_mariadb.patch"
+
mkdir -p "${srcdir}/${pkgname}-${_commit}/build"
}
diff --git a/amarok_mariadb.patch b/amarok_mariadb.patch
new file mode 100644
index 00000000000..1789d17c1de
--- /dev/null
+++ b/amarok_mariadb.patch
@@ -0,0 +1,22 @@
+diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
+index 7aab8ab..a6a59dc 100644
+--- a/cmake/modules/FindMySQL.cmake
++++ b/cmake/modules/FindMySQL.cmake
+@@ -42,7 +42,16 @@ if(MYSQLCONFIG_EXECUTABLE)
+ # At least on OpenSUSE --libmysql-libs doesn't exist, so we just use
+ # MYSQL_LIBRARIES for that. We'll see if that's enough when testing
+ # below.
+- set(MYSQL_EMBEDDED_LIBRARIES ${MYSQL_LIBRARIES})
++ # mysql-config removed --libmysql-libs, but amarok need libmysqld other
++ # than libmysqlclient to run mysql embedded server.
++ find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld libmysqld
++ PATHS
++ $ENV{MYSQL_DIR}/libmysql_r/.libs
++ $ENV{MYSQL_DIR}/lib
++ $ENV{MYSQL_DIR}/lib/mysql
++ PATH_SUFFIXES
++ mysql
++ )
+ else()
+ set(MYSQL_EMBEDDED_LIBRARIES ${MC_MYSQL_EMBEDDED_LIBRARIES})
+ endif()