| 1 |
zmedico 09/05/01 06:15:26 |
| 2 |
|
| 3 |
Modified: calibre-0.5.9-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
01 May 2009; Zac Medico <zmedico@g.o> calibre-0.5.9-r2.ebuild: |
| 6 |
Tweak xdg-desktop-menu usage to avoid sandbox violation in |
| 7 |
/usr/share/gnome/apps. |
| 8 |
(Portage version: 2.1.6.11_p13577/cvs/Linux i686) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 app-text/calibre/calibre-0.5.9-r2.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.5.9-r2.ebuild?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.5.9-r2.ebuild?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.5.9-r2.ebuild?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: calibre-0.5.9-r2.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.5.9-r2.ebuild,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- calibre-0.5.9-r2.ebuild 29 Apr 2009 07:22:48 -0000 1.1 |
| 24 |
+++ calibre-0.5.9-r2.ebuild 1 May 2009 06:15:26 -0000 1.2 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2009 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.5.9-r2.ebuild,v 1.1 2009/04/29 07:22:48 zmedico Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.5.9-r2.ebuild,v 1.2 2009/05/01 06:15:26 zmedico Exp $ |
| 30 |
|
| 31 |
EAPI=2 |
| 32 |
NEED_PYTHON=2.6 |
| 33 |
@@ -58,6 +58,12 @@ |
| 34 |
# For help2man to succeed, we need to tell it the path to the tools. |
| 35 |
sed -i -e "s:\('help2man',\) \(prog\):\1 \'PYTHONPATH=\"${D}$(python_get_sitedir)\" \' + \'${D}usr/bin/\' + \2:" \ |
| 36 |
src/calibre/linux.py || die "sed'ing in the IMAGE path failed" |
| 37 |
+ # Avoid sandbox violation in /usr/share/gnome/apps when linux.py |
| 38 |
+ # calls xdg-desktop-menu (bug #258938). This also prevents |
| 39 |
+ # "${D}"/usr/share/applications/{mimeinfo.cache,defaults.list} |
| 40 |
+ # from being installed (we don't want them anyway). |
| 41 |
+ sed -i -e "s:xdg-desktop-menu install:xdg-desktop-menu install --mode user:" \ |
| 42 |
+ src/calibre/linux.py || die "sed'ing in the IMAGE path failed" |
| 43 |
distutils_src_prepare |
| 44 |
} |
| 45 |
|
| 46 |
@@ -89,14 +95,17 @@ |
| 47 |
|
| 48 |
chmod +x "${T}/kde-config" |
| 49 |
|
| 50 |
- # Sandbox violation when linux.py calls xdg-desktop-menu (bug #258938). |
| 51 |
- addpredict /usr/share/gnome/apps |
| 52 |
PATH="${T}:${PATH}" KDEDIRS="${D}/usr" XDG_DATA_DIRS="${D}/usr/share" DESTDIR="${D}" PYTHONPATH="${S}/build/lib" \ |
| 53 |
python "${S}"/src/${PN}/linux.py \ |
| 54 |
--use-destdir --do-not-reload-udev-hal \ |
| 55 |
--group-file="${ROOT}"/etc/group --dont-check-root \ |
| 56 |
|| die "post-installation failed." |
| 57 |
|
| 58 |
+ # The menu entries end up here due to '--mode user' being added to |
| 59 |
+ # xdg-desktop-menu options in src_prepare. |
| 60 |
+ domenu "$HOME"/.local/share/applications/*.desktop || \ |
| 61 |
+ die "failed to install .desktop menu files" |
| 62 |
+ |
| 63 |
# Move the bash-completion file and properly install it. |
| 64 |
mv "${D}"/etc/bash_completion.d/calibre "${S}/" \ |
| 65 |
|| die "cannot move the bash-completion file" |
| 66 |
@@ -104,8 +113,7 @@ |
| 67 |
find "${D}"/etc -type d -empty -delete |
| 68 |
|
| 69 |
# Removing junk. |
| 70 |
- rm -r "${D}"/usr/share/applications/{mimeinfo.cache,defaults.list} \ |
| 71 |
- "${D}"/usr/share/mime/{subclasses,XMLnamespaces,globs{,2},mime.cache,magic,aliases,{generic-,}icons} \ |
| 72 |
+ rm -r "${D}"/usr/share/mime/{subclasses,XMLnamespaces,globs{,2},mime.cache,magic,aliases,{generic-,}icons} \ |
| 73 |
"${D}"/usr/share/{applnk,desktop-directories} \ |
| 74 |
"${D}$(python_get_sitedir)"/pyPdf |
| 75 |
} |
| 76 |
|
| 77 |
|
| 78 |
|
| 79 |
1.17 app-text/calibre/ChangeLog |
| 80 |
|
| 81 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?rev=1.17&view=markup |
| 82 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?rev=1.17&content-type=text/plain |
| 83 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?r1=1.16&r2=1.17 |
| 84 |
|
| 85 |
Index: ChangeLog |
| 86 |
=================================================================== |
| 87 |
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v |
| 88 |
retrieving revision 1.16 |
| 89 |
retrieving revision 1.17 |
| 90 |
diff -u -r1.16 -r1.17 |
| 91 |
--- ChangeLog 29 Apr 2009 07:22:48 -0000 1.16 |
| 92 |
+++ ChangeLog 1 May 2009 06:15:26 -0000 1.17 |
| 93 |
@@ -1,6 +1,10 @@ |
| 94 |
# ChangeLog for app-text/calibre |
| 95 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 96 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.16 2009/04/29 07:22:48 zmedico Exp $ |
| 97 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.17 2009/05/01 06:15:26 zmedico Exp $ |
| 98 |
+ |
| 99 |
+ 01 May 2009; Zac Medico <zmedico@g.o> calibre-0.5.9-r2.ebuild: |
| 100 |
+ Tweak xdg-desktop-menu usage to avoid sandbox violation in |
| 101 |
+ /usr/share/gnome/apps. |
| 102 |
|
| 103 |
*calibre-0.5.9-r2 (29 Apr 2009) |
Archives