[gentoo-commits] repo/gentoo:master commit in: x11-misc/birdtray/, x11-misc/birdtray/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/birdtray/, x11-misc/birdtray/files/

[Marek Szuba]

commit:     ab82fb36dce56d31663833d1e4d77ed31b940b42
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 17 22:07:25 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Apr 17 22:18:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab82fb36

x11-misc/birdtray: remove deprecated category from the .desktop file

"Application" is not listed in the current Desktop Menu Specification.
Will be addressed by upstream if/when PR #315 has been merged so leave
the live ebuild be.

Revbump to propagate this and the previous commit to users, the latter
being more important of the two.

See-also: https://github.com/gyunaev/birdtray/pull/315
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../birdtray/{birdtray-1.7.0.ebuild => birdtray-1.7.0-r1.ebuild} | 4 ++++
 .../files/birdtray-1.7.0-desktop_file_deprecated_category.patch  | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/x11-misc/birdtray/birdtray-1.7.0.ebuild b/x11-misc/birdtray/birdtray-1.7.0-r1.ebuild
similarity index 90%
rename from x11-misc/birdtray/birdtray-1.7.0.ebuild
rename to x11-misc/birdtray/birdtray-1.7.0-r1.ebuild
index 27005bff4ed..39890d9c3e5 100644
--- a/x11-misc/birdtray/birdtray-1.7.0.ebuild
+++ b/x11-misc/birdtray/birdtray-1.7.0-r1.ebuild
@@ -30,6 +30,10 @@ RDEPEND="dev-db/sqlite:=
 
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.0-desktop_file_deprecated_category.patch
+)
+
 pkg_postinst() {
 	xdg_icon_cache_update
 }

diff --git a/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch b/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch
new file mode 100644
index 00000000000..104b24bf8de
--- /dev/null
+++ b/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch
@@ -0,0 +1,9 @@
+--- a/src/res/com.ulduzsoft.Birdtray.desktop
++++ b/src/res/com.ulduzsoft.Birdtray.desktop
+@@ -28,5 +28,5 @@
+ X-MultipleArgs=false
+ Type=Application
+ Icon=com.ulduzsoft.Birdtray
+-Categories=Application;Network;Email;
++Categories=Network;Email;
+ StartupNotify=true

[gentoo-commits] repo/gentoo:master commit in: x11-misc/birdtray/, x11-misc/birdtray/files/

[Agostino Sarubbo]

commit:     45d37ba161c99c28a2159e8445de506088a0e700
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 07:41:07 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 07:41:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45d37ba1

x11-misc/birdtray: remove old

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 x11-misc/birdtray/Manifest                         |  1 -
 x11-misc/birdtray/birdtray-1.8.1.ebuild            | 44 ----------------------
 x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch | 21 -----------
 3 files changed, 66 deletions(-)

diff --git a/x11-misc/birdtray/Manifest b/x11-misc/birdtray/Manifest
index 660fe3b4aa7..627878d6b05 100644
--- a/x11-misc/birdtray/Manifest
+++ b/x11-misc/birdtray/Manifest
@@ -1,2 +1 @@
-DIST birdtray-1.8.1.tar.gz 767821 BLAKE2B 343fb902381396df2a9d49b619a6eaea620447276ee1c6261b8bb9667ea40d945da37522e1ddeac529d032549f3ca3288d6b780ff95b6adbc98a1dbea8fdeb10 SHA512 464bdaf1820cecb0bb9b41721389f24ce447c65e25f857998c4de5d3fb2aa53f03223938974e9bbdbfd4d719fb6aaecdf8a27c6e2ab7075b451bc8e73d8f07e7
 DIST birdtray-1.9.0.tar.gz 810297 BLAKE2B acc6593116fa735311f62405406192ad43e8af6481eac1d09298f846f5fab9a0dff575caefe9490d0a183c464fab763515e20e5725649fe4a800e575f712067b SHA512 898bfcebc7ba4b738e3ab41539c4de48871ebccf431bb1b12464e7f2956bad95af6158742c64ec5923d63889e777c98c75db31121d926e26f3dfe1b34d9f8b4a

diff --git a/x11-misc/birdtray/birdtray-1.8.1.ebuild b/x11-misc/birdtray/birdtray-1.8.1.ebuild
deleted file mode 100644
index a527d5b67e1..00000000000
--- a/x11-misc/birdtray/birdtray-1.8.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="A new mail system tray notification icon for Thunderbird"
-HOMEPAGE="https://github.com/gyunaev/birdtray"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gyunaev/birdtray.git"
-else
-	SRC_URI="https://github.com/gyunaev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="dev-db/sqlite:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11"
-
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}"/${P}_qt515.patch
-)
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	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
deleted file mode 100644
index a7384f02a6d..00000000000
--- a/x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 38b333b5ff9318ae136d719c5fdd4c790c294833 Mon Sep 17 00:00:00 2001
-From: George Yunaev <gyunaev@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"