commit:     2c3b96cbfff0a8a13524e780a4e09ad66e7e4464
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 17:00:19 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Jun 18 17:02:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c3b96cb

x11-misc/birdtray: bump to 1.8.1 + fix Qt 5.15 support

We hoped upstream would release 1.8.2 shortly after they fixed the issue
but alas, no dice.

Closes: https://bugs.gentoo.org/726472
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 x11-misc/birdtray/Manifest                          |  2 +-
 ...{birdtray-1.8.0.ebuild => birdtray-1.8.1.ebuild} |  4 ++++
 x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch  | 21 +++++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/x11-misc/birdtray/Manifest b/x11-misc/birdtray/Manifest
index 096f0ef9a06..d2f52ad1eaf 100644
--- a/x11-misc/birdtray/Manifest
+++ b/x11-misc/birdtray/Manifest
@@ -1,2 +1,2 @@
 DIST birdtray-1.7.0.tar.gz 398153 BLAKE2B 
87e583ab55b828213f5da97a61c3fc710b381b46ab688f02b6d1c4d01a2577451375d7366f0406cf685f1366497204e985de7905b1635161e252c11b9456da61
 SHA512 
3c2940a3a0e405d3fce1cd0411437ffa56f76c458e42ea059de1bd3fca802621643be39c1a0df3fc3fb0deac2aa53f7631c4bee191efd4b48e591dd05b30a6ab
-DIST birdtray-1.8.0.tar.gz 737802 BLAKE2B 
b3c52c4380a7d88cb7ab7abdc08979c03f1429564dfb568743c3698f6b7cc630b482181e0f3049fb3fc6e871cea23bf3e400e77ec17da7724f300bbb12f992c4
 SHA512 
6596b5e8c06b414b18b3256c3194d868ed42aab88486fa174b644d48640c15d2e33b198962e91e5b74e501c33f345cf3e160176a6928c789013076cce91a6eba
+DIST birdtray-1.8.1.tar.gz 767821 BLAKE2B 
343fb902381396df2a9d49b619a6eaea620447276ee1c6261b8bb9667ea40d945da37522e1ddeac529d032549f3ca3288d6b780ff95b6adbc98a1dbea8fdeb10
 SHA512 
464bdaf1820cecb0bb9b41721389f24ce447c65e25f857998c4de5d3fb2aa53f03223938974e9bbdbfd4d719fb6aaecdf8a27c6e2ab7075b451bc8e73d8f07e7

diff --git a/x11-misc/birdtray/birdtray-1.8.0.ebuild 
b/x11-misc/birdtray/birdtray-1.8.1.ebuild
similarity index 94%
rename from x11-misc/birdtray/birdtray-1.8.0.ebuild
rename to x11-misc/birdtray/birdtray-1.8.1.ebuild
index 4820733d2bc..bb684e4e058 100644
--- a/x11-misc/birdtray/birdtray-1.8.0.ebuild
+++ b/x11-misc/birdtray/birdtray-1.8.1.ebuild
@@ -29,6 +29,10 @@ RDEPEND="dev-db/sqlite:=
 
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+       "${FILESDIR}"/${P}_qt515.patch
+)
+
 pkg_postinst() {
        xdg_icon_cache_update
 }

diff --git a/x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch 
b/x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch
new file mode 100644
index 00000000000..a7384f02a6d
--- /dev/null
+++ b/x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch
@@ -0,0 +1,21 @@
+From 38b333b5ff9318ae136d719c5fdd4c790c294833 Mon Sep 17 00:00:00 2001
+From: George Yunaev <gyun...@ulduzsoft.com>
+Date: Sun, 31 May 2020 13:36:14 -0700
+Subject: [PATCH] Fixed compilation on Qt 5.15 - fixes #375
+
+---
+ src/trayicon.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/trayicon.cpp b/src/trayicon.cpp
+index 210c5da..72d80d2 100644
+--- a/src/trayicon.cpp
++++ b/src/trayicon.cpp
+@@ -3,6 +3,7 @@
+ #include <QPainter>
+ #include <QProcess>
+ #include <QMessageBox>
++#include <QPainterPath>
+ #include <QtNetwork/QNetworkSession>
+ 
+ #include "trayicon.h"

Reply via email to