From 80911acac0d002ea4dc97173f2f6f77c85cf3ab2 Mon Sep 17 00:00:00 2001 From: Spencer Hill Date: Fri, 11 Dec 2015 17:34:53 -0500 Subject: [PATCH] qtox: update to 1.2. --- srcpkgs/qtox/patches/fixcomp.patch | 28 ---------------------------- srcpkgs/qtox/template | 24 ++++++++++++++++-------- 2 files changed, 16 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/qtox/patches/fixcomp.patch diff --git a/srcpkgs/qtox/patches/fixcomp.patch b/srcpkgs/qtox/patches/fixcomp.patch deleted file mode 100644 index 7b3cff94b6..0000000000 --- a/srcpkgs/qtox/patches/fixcomp.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 31f7ded7687c443b8e4570a9364340aace022dea Mon Sep 17 00:00:00 2001 -From: tux3 -Date: Fri, 5 Jun 2015 03:07:42 +0200 -Subject: [PATCH] Fix #1794 - ---- - src/video/videomode.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git src/video/videomode.h src/video/videomode.h -index ec2ffb9..0cbe52f 100644 ---- src/video/videomode.h -+++ src/video/videomode.h -@@ -8,12 +8,12 @@ struct VideoMode - unsigned short FPS; ///< Max frames per second supported by the device at this resolution - - /// All zeros means a default/unspecified mode -- operator bool() -+ operator bool() const - { - return width || height || FPS; - } - -- bool operator==(const VideoMode& other) -+ bool operator==(const VideoMode& other) const - { - return width == other.width - && height == other.height diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template index 692a44097e..d0c9e97526 100644 --- a/srcpkgs/qtox/template +++ b/srcpkgs/qtox/template @@ -1,21 +1,29 @@ # Template file for 'qtox' pkgname="qtox" reverts="20150325_2" -version="1.1" -revision=6 +version="1.2" +revision=1 build_style=qmake short_desc="QT-based TOX instant messenger client" -maintainer="Stefan Mühlinghaus " +maintainer="Spencer Hill " license="GPL-3" -homepage="https://wiki.tox.im/QTox" +homepage="https://wiki.tox.chat/clients/qtox" hostmakedepends="qt5-qmake" -makedepends="toxcore-devel-git filteraudio-devel-git ffmpeg-devel qt5-svg-devel - qt5-tools-devel libopencv-devel libopenal-devel libsodium-devel - libXScrnSaver-devel gdk-pixbuf-devel gtk+-devel libvpx-devel qrencode-devel" +makedepends="toxcore-devel-git filteraudio-devel-git ffmpeg-devel qt5-svg-devel qt5-tools-devel libopencv-devel libopenal-devel libsodium-devel libXScrnSaver-devel gdk-pixbuf-devel gtk+-devel libvpx-devel qrencode-devel" distfiles="https://github.com/tux3/qTox/archive/v${version}.tar.gz" -checksum=0507b0708295cd5eabe750b3e9e2c92a7970c554262d7714f6cbad26b17b718a +checksum=f6d4aafa1ffa5cdadb1fbee1f5bce41cd8a638e510c42726ba665524e8320d54 wrksrc="qTox-${version}" +pre_configure() { + case "$XBPS_TARGET_MACHINE" in + *-musl) + configure_args+=" ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND=NO ENABLE_SYSTRAY_UNITY_BACKEND=NO ENABLE_SYSTRAY_GTK_BACKEND=NO" + ;; + *) + ;; + esac +} + do_install() { vbin qtox vinstall qTox.desktop 644 usr/share/applications