[gentoo-commits] repo/gentoo:master commit in: x11-libs/snorenotify/files/, x11-libs/snorenotify/

[Michael Palimaka]

commit: 4a8511fec889cf4f2b17568bf991bb90c7c6c8c4
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Mar 12 04:37:52 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Mar 12 04:38:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a8511fe

x11-libs/snorenotify: backport patch from upstream adding missing include

Closes: https://bugs.gentoo.org/587898
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/snorenotify-0.7.0-include.patch| 20 
 x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild |  7 +--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/x11-libs/snorenotify/files/snorenotify-0.7.0-include.patch 
b/x11-libs/snorenotify/files/snorenotify-0.7.0-include.patch
new file mode 100644
index 000..ee99e26ed47
--- /dev/null
+++ b/x11-libs/snorenotify/files/snorenotify-0.7.0-include.patch
@@ -0,0 +1,20 @@
+Bug: https://bugs.gentoo.org/587898
+
+commit 96fd4a7914e8daf924829606dc25f9e4767401dd
+Author: Hannah von Reth 
+Date:   Mon Nov 21 08:57:00 2016 +0100
+
+[WIP] Support to build with static Qt and static plugins
+
+diff --git a/src/libsnore/notification/icon.cpp 
b/src/libsnore/notification/icon.cpp
+index b95ceb4..5c7c139 100644
+--- a/src/libsnore/notification/icon.cpp
 b/src/libsnore/notification/icon.cpp
+@@ -25,6 +25,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ using namespace Snore;
+ 

diff --git a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild 
b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
index ad78029107e..2fece7ed49e 100644
--- a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
+++ b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,10 @@ DEPEND="${RDEPEND}
test? ( dev-qt/qttest:5 )
 "
 
-PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+PATCHES=(
+   "${FILESDIR}/${P}-desktop.patch"
+   "${FILESDIR}/${P}-include.patch"
+)
 
 src_configure() {
local mycmakeargs=(

[gentoo-commits] repo/gentoo:master commit in: x11-libs/snorenotify/files/, x11-libs/snorenotify/

[Johannes Huber]

commit: 86f0ca57171bf6e3a9be0709608daa33acd30d39
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Jul 15 06:00:28 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Jul 15 06:00:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86f0ca57

x11-libs/snorenotify: Fix desktop files

Revision bump adds upstream patch spotted by Coacher
.

Gentoo-bug: 588756

Package-Manager: portage-2.3.0

 .../files/snorenotify-0.7.0-desktop.patch  | 41 +++
 x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild   | 59 ++
 2 files changed, 100 insertions(+)

diff --git a/x11-libs/snorenotify/files/snorenotify-0.7.0-desktop.patch 
b/x11-libs/snorenotify/files/snorenotify-0.7.0-desktop.patch
new file mode 100644
index 000..914288d
--- /dev/null
+++ b/x11-libs/snorenotify/files/snorenotify-0.7.0-desktop.patch
@@ -0,0 +1,41 @@
+From 897a64b18f8727c951dac8ca91ebf43f2c18f908 Mon Sep 17 00:00:00 2001
+From: Javier Llorente 
+Date: Sat, 13 Feb 2016 12:20:03 +0100
+Subject: [PATCH] Fix desktop categories, remove version (see
+ desktop-entry-spec), add a newline at eof
+
+---
+ src/daemon/snorenotify.desktop.in | 3 +--
+ src/settings/snoresettings.desktop.in | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/daemon/snorenotify.desktop.in 
b/src/daemon/snorenotify.desktop.in
+index 83f0e3f..9fc1876 100644
+--- a/src/daemon/snorenotify.desktop.in
 b/src/daemon/snorenotify.desktop.in
+@@ -1,8 +1,7 @@
+ [Desktop Entry]
+ Type=Application
+-Version=@SNORE_VERSION_MAJOR@.@SNORE_VERSION_MINOR@.@SNORE_VERSION_PATCH@
+ Name=SnoreNotify
+ Comment=A daemon redirecting desktop notifications to one or multiple 
additional backends.
+ Icon=snore
+ Exec=snorenotify
+-Categories=Qt;System;
+\ No newline at end of file
++Categories=Qt;Settings;Qt;Utility;DesktopSettings;
+diff --git a/src/settings/snoresettings.desktop.in 
b/src/settings/snoresettings.desktop.in
+index 823bb2d..497d119 100644
+--- a/src/settings/snoresettings.desktop.in
 b/src/settings/snoresettings.desktop.in
+@@ -1,8 +1,7 @@
+ [Desktop Entry]
+ Type=Application
+-Version=@SNORE_VERSION_MAJOR@.@SNORE_VERSION_MINOR@.@SNORE_VERSION_PATCH@
+ Name=SnoreSettings
+ Comment=Settings client for applications using libsnore.
+ Icon=snore
+ Exec=snoresettings
+-Categories=Qt;System;
+\ No newline at end of file
++Categories=Qt;Settings;Qt;Utility;DesktopSettings;

diff --git a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild 
b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
new file mode 100644
index 000..f57f17e
--- /dev/null
+++ b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils virtualx
+
+DESCRIPTION="Multi platform Qt notification framework"
+HOMEPAGE="https://techbase.kde.org/Projects/Snorenotify;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="sound test"
+
+RDEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtwebsockets:5
+   dev-qt/qtwidgets:5
+   sound? ( dev-qt/qtmultimedia:5 )
+"
+DEPEND="${RDEPEND}
+   dev-qt/linguist-tools:5
+   kde-frameworks/extra-cmake-modules
+   test? ( dev-qt/qttest:5 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package sound Qt5Multimedia)
+   $(cmake-utils_use_find_package test Qt5Test)
+   )
+
+   cmake-utils_src_configure
+}
+
+src_test() {
+   virtx cmake-utils_src_test
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+}