From b7bd30b7c7bdb4c9ad00777ca7a2b72ffba48696 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 22 Apr 2020 16:14:17 +0200 Subject: [PATCH] qtox: update to 1.17.0. --- srcpkgs/qtox/patches/Werror.patch | 13 ------------- srcpkgs/qtox/template | 28 +++++++++++++--------------- 2 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 srcpkgs/qtox/patches/Werror.patch diff --git a/srcpkgs/qtox/patches/Werror.patch b/srcpkgs/qtox/patches/Werror.patch deleted file mode 100644 index deae5b5a4db..00000000000 --- a/srcpkgs/qtox/patches/Werror.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://github.com/qTox/qTox/issues/4699 -https://github.com/qTox/qTox/issues/4707 - ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -53,7 +53,6 @@ - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE -fPIC") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-overflow") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-aliasing") --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") - - if (NOT WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all") diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template index 8663afb5fcf..8ca92ca56a7 100644 --- a/srcpkgs/qtox/template +++ b/srcpkgs/qtox/template @@ -1,15 +1,16 @@ # Template file for 'qtox' pkgname=qtox -version=1.16.3 -revision=3 +version=1.17.0 +revision=1 wrksrc="qTox-${version}" build_style=cmake -hostmakedepends="pkg-config qt5-host-tools qt5-qmake qt5-tools" -makedepends="ffmpeg-devel filter_audio-devel gtk+-devel libXScrnSaver-devel - libexif-devel libopenal-devel libsodium-devel libvpx-devel opus-devel - qrencode-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql - qt5-plugin-sqlite qt5-plugin-tds qt5-svg-devel qt5-tools-devel sqlcipher-devel - toxcore-devel" +configure_args="-DUPDATE_CHECK=OFF + $(vopt_if snorenotify -DDESKTOP_NOTIFICATIONS=ON)" +hostmakedepends="pkg-config qt5-host-tools qt5-devel" +makedepends="ffmpeg-devel libexif-devel libopenal-devel libsodium-devel + libvpx-devel opus-devel qrencode-devel qt5-svg-devel sonnet-devel + sqlcipher-devel toxcore-devel + $(vopt_if snorenotify snorenotify-devel)" depends="qt5-plugin-sqlite" short_desc="QT-based TOX instant messenger client" maintainer="Spencer Hill " @@ -17,14 +18,11 @@ license="GPL-3.0-or-later" homepage="https://wiki.tox.chat/clients/qtox" changelog="https://raw.githubusercontent.com/qTox/qTox/master/CHANGELOG.md" distfiles="https://github.com/qTox/qTox/archive/v${version}.tar.gz" -checksum=b842e2e7cbfa356da32dd7afc7628d55ce35d046ed72a468b211ab9ef863c382 +checksum=1936b65854b3e16e2d620a62469b5033fdd4ea006ee061c2afcec7a028eab0e7 + +build_options="snorenotify" +build_options_default="snorenotify" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" fi - -pre_configure() { - if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - sed -i 's/${ALL_LIBRARIES})/atomic \0/' CMakeLists.txt - fi -}