Gentoo Archives: gentoo-commits

From: Alexandre Rostovtsev <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: net-wireless/gnome-bluetooth/files/, net-wireless/gnome-bluetooth/
Date: Thu, 27 Sep 2012 21:39:33
Message-Id: 1348781930.0c24012b4c1f45c3b2e6ee7613f9b6b8abf273ba.tetromino@gentoo
1 commit: 0c24012b4c1f45c3b2e6ee7613f9b6b8abf273ba
2 Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 27 21:38:50 2012 +0000
4 Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 27 21:38:50 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0c24012b
7
8 net-wireless/gnome-bluetooth: [QA] .desktop file issues
9
10 ---
11 .../gnome-bluetooth-3.6.0-desktop-files.patch | 43 ++++++++++++++++++++
12 .../gnome-bluetooth/gnome-bluetooth-3.6.0.ebuild | 3 +
13 2 files changed, 46 insertions(+), 0 deletions(-)
14
15 diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-3.6.0-desktop-files.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-3.6.0-desktop-files.patch
16 new file mode 100644
17 index 0000000..a9dc84b
18 --- /dev/null
19 +++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-3.6.0-desktop-files.patch
20 @@ -0,0 +1,43 @@
21 +From 33c8c10af27a132735485a3be32249102259517a Mon Sep 17 00:00:00 2001
22 +From: Alexandre Rostovtsev <tetromino@g.o>
23 +Date: Thu, 27 Sep 2012 17:23:13 -0400
24 +Subject: [PATCH] .desktop files require a main category
25 +
26 +Otherwise, they do not validate with desktop-file-validate from
27 +desktop-file-utils-0.20
28 +
29 +https://bugzilla.gnome.org/show_bug.cgi?id=685002
30 +---
31 + sendto/bluetooth-sendto.desktop.in.in | 2 +-
32 + wizard/bluetooth-wizard.desktop.in.in | 2 +-
33 + 2 files changed, 2 insertions(+), 2 deletions(-)
34 +
35 +diff --git a/sendto/bluetooth-sendto.desktop.in.in b/sendto/bluetooth-sendto.desktop.in.in
36 +index 5365927..810de89 100644
37 +--- a/sendto/bluetooth-sendto.desktop.in.in
38 ++++ b/sendto/bluetooth-sendto.desktop.in.in
39 +@@ -5,7 +5,7 @@ Icon=bluetooth
40 + Exec=bluetooth-sendto
41 + Terminal=false
42 + Type=Application
43 +-Categories=GTK;GNOME;
44 ++Categories=GTK;GNOME;Utility;FileTools;
45 + StartupNotify=true
46 + NoDisplay=true
47 + X-GNOME-Bugzilla-Bugzilla=GNOME
48 +diff --git a/wizard/bluetooth-wizard.desktop.in.in b/wizard/bluetooth-wizard.desktop.in.in
49 +index b331639..d18a8ff 100644
50 +--- a/wizard/bluetooth-wizard.desktop.in.in
51 ++++ b/wizard/bluetooth-wizard.desktop.in.in
52 +@@ -5,7 +5,7 @@ Icon=bluetooth
53 + Exec=bluetooth-wizard
54 + Terminal=false
55 + Type=Application
56 +-Categories=GTK;GNOME;
57 ++Categories=GTK;GNOME;Settings;HardwareSettings;
58 + StartupNotify=true
59 + NoDisplay=true
60 + X-GNOME-Bugzilla-Bugzilla=GNOME
61 +--
62 +1.7.12
63 +
64
65 diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.0.ebuild
66 index 08dbdfc..aede591 100644
67 --- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.0.ebuild
68 +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.0.ebuild
69 @@ -74,6 +74,9 @@ pkg_setup() {
70 }
71
72 src_prepare() {
73 + # https://bugzilla.gnome.org/show_bug.cgi?id=685002
74 + epatch "${FILESDIR}/${PN}-3.6.0-desktop-files.patch"
75 +
76 # Regenerate gdbus-codegen files to allow using any glib version; bug #436236
77 if [[ ${PV} != 9999 ]]; then
78 rm -v lib/bluetooth-client-glue.{c,h} || die