From 08477c57c3a54e14807770b03d9058e4685930b5 Mon Sep 17 00:00:00 2001 From: cr6git Date: Tue, 9 Jan 2018 08:51:26 +0100 Subject: [PATCH] Cutegram: update aseman-qt-tools to 1.0.0, fix cross compilation Closes: #10608 [via git-merge-pr] --- srcpkgs/Cutegram/template | 19 ++++++++++++------- srcpkgs/TelegramQML/template | 10 ++++++++-- srcpkgs/libqtelegram-ae/template | 8 ++++++-- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/srcpkgs/Cutegram/template b/srcpkgs/Cutegram/template index 442442706d..7363f5ec75 100644 --- a/srcpkgs/Cutegram/template +++ b/srcpkgs/Cutegram/template @@ -1,15 +1,15 @@ # Template file for 'Cutegram' pkgname=Cutegram version=2.7.1 -revision=1 -_qt_tools_rev=91bf14b790c749bcaaddb09a8124ef6415a93906 +revision=2 +_qt_tools_rev=1.0.0 create_wrksrc=yes build_wrksrc=$pkgname-${version}-stable build_style=qmake configure_args="QMAKE_CFLAGS_ISYSTEM=" hostmakedepends="qt5-qmake" -makedepends="qt5-devel qt5-multimedia-devel qt5-webkit-devel qt5-declarative-devel - libqtelegram-ae-devel TelegramQML-devel" +makedepends="qt5-multimedia-devel qt5-webkit-devel qt5-declarative-devel + qtkeychain-qt5-devel pulseaudio-devel libqtelegram-ae-devel TelegramQML-devel" depends="qt5-graphicaleffects qt5-quickcontrols qt5-plugin-sqlite" short_desc="Qt5 Telegram desktop client" maintainer="Duncaen " @@ -17,11 +17,16 @@ license="GPL-3" homepage="http://aseman.co/cutegram" distfiles=" https://github.com/Aseman-Land/$pkgname/archive/v${version}-stable.tar.gz - https://github.com/Aseman-Land/aseman-qt-tools/archive/${_qt_tools_rev}.tar.gz" + https://github.com/Aseman-Land/aseman-qt-tools/archive/v${_qt_tools_rev}-stable.tar.gz" checksum="f1cfc6bd3a1d33c2348f23ea43d923419b33576059791a071f2780db11059cf4 - 825169f519d44276413b363c0721258b6ec89c5d278060bbb858c06b80381591" + 44ad93a205921ed920b7dbcca1ae4d8150d001b06d6f8f01e46da02cc607ece2" + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-multimedia-devel qt5-webkit-devel qt5-declarative-devel + qtkeychain-qt5-devel pulseaudio-devel libqtelegram-ae-devel TelegramQML-devel" +fi post_extract() { rm -rf "${build_wrksrc}/Cutegram/asemantools" - ln -sf "${wrksrc}/aseman-qt-tools-${_qt_tools_rev}" "${build_wrksrc}/Cutegram/asemantools" + ln -sf "${wrksrc}/aseman-qt-tools-${_qt_tools_rev}-stable" "${build_wrksrc}/Cutegram/asemantools" } diff --git a/srcpkgs/TelegramQML/template b/srcpkgs/TelegramQML/template index 75e34cc332..2225dc954d 100644 --- a/srcpkgs/TelegramQML/template +++ b/srcpkgs/TelegramQML/template @@ -1,12 +1,13 @@ # Template file for 'TelegramQML' pkgname=TelegramQML version=0.9.2 -revision=1 +revision=2 wrksrc=${pkgname}-${version} build_style=qmake configure_args="BUILD_MODE+=lib QMAKE_CFLAGS_ISYSTEM=" hostmakedepends="qt5-qmake" -makedepends="qt5-devel qt5-declarative-devel qt5-multimedia-devel libqtelegram-ae-devel" +makedepends="qt5-declarative-devel qt5-multimedia-devel libqtelegram-ae-devel + pulseaudio-devel" short_desc="Telegram API tools for QtQml and Qml" maintainer="Duncaen " license="GPL-3" @@ -14,6 +15,11 @@ homepage="https://github.com/Aseman-Land/TelegramQML" distfiles="https://github.com/Aseman-Land/$pkgname/archive/v${version}.tar.gz" checksum=16d6429fe180531af167dc44bcc799e82b08c9cfa88f1f635155dfcef2558397 +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-declarative-devel qt5-multimedia-devel libqtelegram-ae-devel + pulseaudio-devel" +fi + pre_configure() { sed -i 's,$$LIB_PATH,,' telegramqml.pro } diff --git a/srcpkgs/libqtelegram-ae/template b/srcpkgs/libqtelegram-ae/template index 2b698eece2..2f11c28246 100644 --- a/srcpkgs/libqtelegram-ae/template +++ b/srcpkgs/libqtelegram-ae/template @@ -2,13 +2,13 @@ pkgname=libqtelegram-ae reverts=10.0.0_1 version=6.1 -revision=5 +revision=6 wrksrc=${pkgname/-ae/-aseman-edition}-${version}-stable build_style=qmake # See https://github.com/Aseman-Land/libqtelegram-aseman-edition/issues/44 configure_args="QMAKE_CFLAGS_ISYSTEM=" hostmakedepends="qt5-qmake" -makedepends="qt5-devel qt5-multimedia-devel pulseaudio-devel" +makedepends="qt5-multimedia-devel pulseaudio-devel" short_desc="A libqtelegram fork by Aseman Team" maintainer="Duncaen " license="GPL-3" @@ -16,6 +16,10 @@ homepage="https://github.com/Aseman-Land/libqtelegram-aseman-edition" distfiles="https://github.com/Aseman-Land/libqtelegram-aseman-edition/archive/v${version}-stable.tar.gz" checksum=ffc1f85a7b0cdd16149c89722f33c43de9fa3db15271d0ff26734ba35e0a02c0 +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-multimedia-devel pulseaudio-devel" +fi + pre_configure() { sed -i 's,$$LIB_PATH,,' libqtelegram-ae.pro }