Merge pull request #918 from Duncaen/tomahawk

Tomahawk

common/shlibs

@@ -1894,3 +1894,32 @@ libgdict-1.0.so.6 gnome-dictionary-3.14.1_1
 libasignify.so.1 asignify-1.0_1
 libvte2_90.so.9 vte290-0.36.3_1
 libd0_blind_id.so.0 xonotic-0.8.0_1
+libechonest.so.2.3 libechonest-2.3.0_1
+libquazip.so.1 quazip-0.7.1_1
+libqtkeychain.so.0 qtkeychain-0.4.0_1
+libjreen.so.1 jreen-1.2.0_1
+libtelepathy-qt4.so.2 telepathy-qt-0.9.5_1
+libtelepathy-qt4-farstream.so.2 telepathy-qt-farstream-0.9.5_1
+libtomahawk_configstorage_telepathy.so tomahawk-0.8.2_1
+libtomahawk_account_google.so tomahawk-0.8.2_1
+libtomahawk_account_xmpp.so tomahawk-0.8.2_1
+libtomahawk_infoplugin_charts.so tomahawk-0.8.2_1
+libtomahawk_account_hatchet.so tomahawk-0.8.2_1
+libtomahawk_infoplugin_fdonotify.so tomahawk-0.8.2_1
+libtomahawk_infoplugin_hypem.so tomahawk-0.8.2_1
+libtomahawk_infoplugin_newreleases.so tomahawk-0.8.2_1
+libtomahawk.so.0.8.2 tomahawk-0.8.2_1
+libtomahawk_infoplugin_mpris.so tomahawk-0.8.2_1
+libtomahawk_viewpage_dashboard.so tomahawk-0.8.2_1
+libtomahawk-playdarapi.so.0.8.2 tomahawk-0.8.2_1
+libtomahawk_viewpage_whatsnew_0_8.so tomahawk-0.8.2_1
+libtomahawk_viewpage_newreleases.so tomahawk-0.8.2_1
+libtomahawk_infoplugin_musicbrainz.so tomahawk-0.8.2_1
+libtomahawk_infoplugin_echonest.so tomahawk-0.8.2_1
+libtomahawk_infoplugin_spotify.so tomahawk-0.8.2_1
+libtomahawk_account_zeroconf.so tomahawk-0.8.2_1
+libtomahawk_infoplugin_rovi.so tomahawk-0.8.2_1
+libtomahawk_infoplugin_musixmatch.so tomahawk-0.8.2_1
+libtomahawk_viewpage_charts.so tomahawk-0.8.2_1
+libtomahawk_infoplugin_discogs.so tomahawk-0.8.2_1
+libtomahawk-widgets.so.0.8.2 tomahawk-0.8.2_1

srcpkgs/jreen-devel

@@ -0,0 +1 @@
+jreen

srcpkgs/jreen/template

@@ -0,0 +1,23 @@
+# Template file for 'jreen'
+pkgname=jreen
+version=1.2.0
+revision=1
+build_style=cmake
+configure_args="-DJREEN_FORCE_QT4=yes"
+hostmakedepends="cmake pkg-config"
+makedepends="gsasl-devel speex-devel qt-devel zlib-devel"
+short_desc="Extensible XMPP library written in C++ using Qt"
+maintainer="Duncan Overbruck <mail@duncano.de>"
+license="GPL-2"
+homepage="http://qutim.org/jreen"
+distfiles="http://github.com/euroelessar/${pkgname}/archive/v${version}.tar.gz"
+checksum=cee3762015357bfd88f7f3eb71dd7f90ddf37fdff07c5cf99881fda051c5fe1b
+
+jreen-devel_package() {
+	depends="jreen>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.so
+	}
+}

srcpkgs/libechonest-devel

@@ -0,0 +1 @@
+libechonest

srcpkgs/libechonest/template

@@ -0,0 +1,22 @@
+# Template file for 'libechonest'
+pkgname=libechonest
+version=2.3.0
+revision=1
+build_style=cmake
+hostmakedepends="cmake qt-qmake"
+makedepends="qjson-devel boost-devel"
+short_desc="A C++/Qt wrapper around the wonderful echo nest api"
+maintainer="Duncan Overbruck <mail@duncano.de>"
+license="GPL-2"
+homepage="https://projects.kde.org/projects/playground/libs/libechonest"
+distfiles="http://files.lfranchi.com/${pkgname}-${version}.tar.bz2"
+checksum=79983ba72fbf9b112ebfb329b96b60eddf25d719ebe34eb70de01aa106ae2b44
+
+libechonest-devel_package() {
+	depends="libechonest>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.so
+	}
+}

srcpkgs/qca-ossl

@@ -0,0 +1 @@
+qca

srcpkgs/qca/patches/libressl.patch

@@ -0,0 +1,14 @@
+# upstream
+# http://quickgit.kde.org/?p=qca.git&a=commit&h=593de6855a4f4dc26cface3e96de8889f90cb4bb
+
+--- plugins/qca-ossl/qca-ossl.cpp	2015-01-24 00:38:42.000000000 +0100
++++ plugins/qca-ossl/qca-ossl.cpp	2015-01-24 00:38:27.000000000 +0100
+@@ -5801,7 +5801,7 @@
+ 	{
+ 		SessionInfo sessInfo;
+ 
+-		sessInfo.isCompressed = (0 != ssl->session->compress_meth);
++		sessInfo.isCompressed = (0 != SSL_SESSION_get_compress_id(ssl->session));
+ 
+ 		if (ssl->version == TLS1_VERSION)
+ 			sessInfo.version = TLS::TLS_v1;

srcpkgs/qca/template

@@ -1,11 +1,11 @@
 # Template file for 'qca'
 pkgname=qca
 version=2.1.0
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca/mkspecs"
+configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca/mkspecs -DWITH_ossl_PLUGIN=yes"
 hostmakedepends="cmake pkg-config"
-makedepends="nss-devel libgcrypt-devel qt-devel ca-certificates"
+makedepends="nss-devel libgcrypt-devel qt-devel ca-certificates libressl-devel"
 depends="ca-certificates"
 short_desc="Qt Cryptographic Architecture"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -14,6 +14,14 @@ homepage="http://delta.affinix.com/qca/"
 distfiles="http://delta.affinix.com/download/qca/2.0/${pkgname}-${version}.tar.gz"
 checksum=226dcd76138c3738cdc15863607a96b3758a4c3efd3c47295939bcea4e7a9284
 
+qca-ossl_package() {
+	depends="${sourcepkg}-${version}_${revision} libressl"
+	short_desc+=" - QCA OSSL plugin"
+	pkg_install() {
+		vmove usr/lib/qca/crypto/libqca-ossl.so
+	}
+}
+
 qca-devel_package() {
 	depends="qt-devel ${sourcepkg}-${version}_${revision}"
 	pkg_install() {

srcpkgs/qtkeychain-devel

@@ -0,0 +1 @@
+qtkeychain

srcpkgs/qtkeychain/template

@@ -0,0 +1,23 @@
+# Template file for 'qtkeychain'
+pkgname=qtkeychain
+version=0.4.0
+revision=1
+build_style=cmake
+hostmakedepends="cmake"
+makedepends="icu-devel qt-devel"
+short_desc="Platform-independent Qt API for storing passwords securely"
+maintainer="Duncan Overbruck <mail@duncano.de>"
+license="BSD"
+homepage="https://github.com/frankosterfeld/qtkeychain"
+distfiles="https://github.com/frankosterfeld/${pkgname}/archive/v${version}.tar.gz"
+checksum=a67dea6a2cc857afdb12f1e639aef63d1a9841a44e5640d9e71d0446f146b707
+
+qtkeychain-devel_package() {
+	depends="qtkeychain>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/*.so
+	}
+}

srcpkgs/quazip-devel

@@ -0,0 +1 @@
+quazip

srcpkgs/quazip/template

@@ -0,0 +1,29 @@
+# Template file for 'quazip'
+pkgname=quazip
+version=0.7.1
+revision=1
+hostmakedepends="qt-qmake"
+makedepends="qt-devel zlib-devel"
+short_desc="C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package"
+maintainer="Duncan Overbruck <mail@duncano.de>"
+license="LGPL-2.0"
+homepage="http://sourceforge.net/projects/quazip/"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=78c984103555c51e6f7ef52e3a2128e2beb9896871b2cc4d4dbd4d64bff132de
+
+do_configure() {
+	qmake PREFIX=/usr
+}
+
+do_install() {
+	make INSTALL_ROOT=${DESTDIR} install
+}
+
+quazip-devel_package() {
+	depends="quazip>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.so
+	}
+}

srcpkgs/telepathy-qt-devel

@@ -0,0 +1 @@
+telepathy-qt

srcpkgs/telepathy-qt-farstream

@@ -0,0 +1 @@
+telepathy-qt

srcpkgs/telepathy-qt/template

@@ -0,0 +1,32 @@
+# Template file for 'telepathy-qt'
+pkgname=telepathy-qt
+version=0.9.5
+revision=1
+build_style=cmake
+configure_args="-DENABLE_EXAMPLES=OFF -DENABLE_TESTS=OFF"
+hostmakedepends="cmake pkg-config"
+makedepends="qt-devel telepathy-farstream-devel telepathy-glib-devel gstreamer-devel"
+short_desc="Qt4 bindings for the Telepathy D-Bus protocol"
+maintainer="Duncan Overbruck <mail@duncano.de>"
+license="LGPL-2.1"
+homepage="http://telepathy.freedesktop.org/"
+distfiles="http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=93474858efe55bf45ee9352f88b852d4a24505939dc81a3a3c6fa5a686809c8e
+
+telepathy-qt-farstream_package() {
+	depends="telepathy-qt>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/lib/pkgconfig/TelepathyQt4Farstream.pc
+		vmove usr/lib/*-farstream.so.*
+	}
+}
+
+telepathy-qt-devel_package() {
+	depends="telepathy-qt>=${version}_${revision} telepathy-qt-farstream>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake/TelepathyQt4*
+		vmove usr/lib/*.so
+	}
+}

srcpkgs/tomahawk-devel

@@ -0,0 +1 @@
+tomahawk

srcpkgs/tomahawk/template

@@ -0,0 +1,38 @@
+# Template file for 'tomahawk'
+pkgname=tomahawk
+version=0.8.2
+revision=1
+build_style=cmake
+build_options="upower hatchet kde xmpp"
+desc_option_hatchet="Enable support for http://hatchet.is"
+desc_option_kde="Enable support for KDE"
+desc_option_xmpp="Enable support for XMPP"
+build_options_default=${build_options}
+configure_args="-DBUILD_RELEASE=ON \
+ $(vopt_if hatchet '-DBUILD_HATCHET=ON' '-DBUILD_HATCHET=OFF') \
+ -DBUILD_WITH_QT4=ON \
+ -DWITH_CRASHREPORTER=OFF
+ $(vopt_if kde '-DWITH_KDE4=ON' '-DWITH_KDE4=OFF') \
+ $(vopt_if upower '-DWITH_UPOWER=ON' '-DWITH_UPOWER=OFF')"
+hostmakedepends="cmake pkg-config"
+makedepends="boost-devel qt-devel qjson-devel taglib-devel sparsehash gnutls-devel
+ qca-devel Lucene++-devel attica-devel quazip-devel qtkeychain-devel
+ phonon-devel liblastfm-devel libechonest-devel libressl-devel
+ $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-devel)
+ $(vopt_if kde kde-baseapps-devel) $(vopt_if kde telepathy-qt-devel)"
+depends="virtual?phonon-backend qt-plugin-sqlite $(vopt_if xmpp qca-ossl)"
+short_desc="Multi-source social music player"
+maintainer="Duncan Overbruck <mail@duncano.de>"
+license="GPL-3"
+homepage="http://tomahawk-player.org/"
+distfiles="http://download.tomahawk-player.org/${pkgname}-${version}.tar.bz2"
+checksum=522d2ef873f8548990ac1fc736c11dd08c347687c77d63b520f55207f19db3ae
+
+tomahawk-devel_package() {
+	depends="tomahawk>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

srcpkgs/websocketpp/template

@@ -0,0 +1,12 @@
+# Template file for 'websocketpp'
+pkgname=websocketpp
+version=0.5.0
+revision=1
+build_style=cmake
+hostmakedepends="cmake"
+short_desc="C++/Boost Asio based websocket client/server library"
+maintainer="Duncan Overbruck <mail@duncano.de>"
+license="BSD"
+homepage="http://www.zaphoyd.com/websocketpp"
+distfiles="https://github.com/zaphoyd/websocketpp/archive/${version}.tar.gz"
+checksum=ab032d61f1d94fc4ebf3bb74297e520499d6fe56801084d3cc828455482e81d9