[-- Attachment #1: Type: text/plain, Size: 383 bytes --] There is a new pull request by ndowens against master on the void-packages repository https://github.com/ndowens/void-packages sonic-vis https://github.com/void-linux/void-packages/pull/16407 sonic-visualiser: Fix build <QString> points to "qstring.h" which is not found, this corrects it A patch file from https://github.com/void-linux/void-packages/pull/16407.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-sonic-vis-16407.patch --] [-- Type: text/x-diff, Size: 1547 bytes --] From 37f366803d82b691ac6985dce8e72bde87ae9ec3 Mon Sep 17 00:00:00 2001 From: Nathan Owens <ndowens04@gmail.com> Date: Mon, 11 Nov 2019 23:04:48 -0600 Subject: [PATCH] sonic-visualiser: Fix build <QString> points to "qstring.h" which is not found, this corrects it --- .../patches/0001-Fix-header-file.patch | 12 ++++++++++++ srcpkgs/sonic-visualiser/template | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/sonic-visualiser/patches/0001-Fix-header-file.patch diff --git a/srcpkgs/sonic-visualiser/patches/0001-Fix-header-file.patch b/srcpkgs/sonic-visualiser/patches/0001-Fix-header-file.patch new file mode 100644 index 00000000000..cfc1d487529 --- /dev/null +++ b/srcpkgs/sonic-visualiser/patches/0001-Fix-header-file.patch @@ -0,0 +1,12 @@ +diff --git a/svcore/base/RangeMapper.h b/svcore/base/RangeMapper.h +index dd8ba94..4cdd924 100644 +--- svcore/base/RangeMapper.h ++++ svcore/base/RangeMapper.h + #ifndef SV_RANGE_MAPPER_H + #define SV_RANGE_MAPPER_H + +-#include <QString> ++#include <qt5/QtCore/qstring.h> + + #include "Debug.h" + #include <map> diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template index 66d6028c7ad..e882a341a48 100644 --- a/srcpkgs/sonic-visualiser/template +++ b/srcpkgs/sonic-visualiser/template @@ -1,7 +1,7 @@ # Template file for 'sonic-visualiser' pkgname=sonic-visualiser version=4.0 -revision=1 +revision=2 build_style=gnu-configure build_helper=qmake hostmakedepends="pkg-config capnproto-devel"
[-- Attachment #1: Type: text/plain, Size: 236 bytes --] New comment by ndowens on void-packages repository https://github.com/void-linux/void-packages/pull/16407#issuecomment-552740232 Comment: Found during testing of a pkg I updated. After fixing, I launched and loaded a music file fine.
[-- Attachment #1: Type: text/plain, Size: 230 bytes --] There's a merged pull request on the void-packages repository sonic-visualiser: Fix build https://github.com/void-linux/void-packages/pull/16407 Description: <QString> points to "qstring.h" which is not found, this corrects it
[-- Attachment #1: Type: text/plain, Size: 401 bytes --] There is a new pull request by newbluemoon against master on the void-packages repository https://github.com/newbluemoon/void-packages sonic-visualiser https://github.com/void-linux/void-packages/pull/21989 sonic-visualiser: fix build - deprecated warnings were treated as errors - remove unnecessary patch A patch file from https://github.com/void-linux/void-packages/pull/21989.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-sonic-visualiser-21989.patch --] [-- Type: text/x-diff, Size: 1743 bytes --] From c25a6ff6973985bbbc8495ffa9fe8fb0a80576fa Mon Sep 17 00:00:00 2001 From: newbluemoon <blaumolch@mailbox.org> Date: Fri, 15 May 2020 18:50:53 +0200 Subject: [PATCH] sonic-visualiser: fix build - deprecated warnings were treated as errors - remove unnecessary patch --- .../patches/0001-Fix-header-file.patch | 12 ------------ srcpkgs/sonic-visualiser/template | 2 ++ 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 srcpkgs/sonic-visualiser/patches/0001-Fix-header-file.patch diff --git a/srcpkgs/sonic-visualiser/patches/0001-Fix-header-file.patch b/srcpkgs/sonic-visualiser/patches/0001-Fix-header-file.patch deleted file mode 100644 index cfc1d487529..00000000000 --- a/srcpkgs/sonic-visualiser/patches/0001-Fix-header-file.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/svcore/base/RangeMapper.h b/svcore/base/RangeMapper.h -index dd8ba94..4cdd924 100644 ---- svcore/base/RangeMapper.h -+++ svcore/base/RangeMapper.h - #ifndef SV_RANGE_MAPPER_H - #define SV_RANGE_MAPPER_H - --#include <QString> -+#include <qt5/QtCore/qstring.h> - - #include "Debug.h" - #include <map> diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template index d0ac70c02fe..a80bd946a28 100644 --- a/srcpkgs/sonic-visualiser/template +++ b/srcpkgs/sonic-visualiser/template @@ -17,6 +17,8 @@ changelog="https://code.soundsoftware.ac.uk/projects/sonic-visualiser/repository distfiles="https://code.soundsoftware.ac.uk/attachments/download/2607/${pkgname}-${version}.tar.gz" checksum=e6e9dbec686c9dc94d32dff311eb0f6b44b63d3643285b3d8d908dfb9b22c790 +CXXFLAGS+=" -DQT_NO_DEPRECATED_WARNINGS" + if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" fi