diff options
author | Michael Palimaka <kensington@gentoo.org> | 2014-06-26 15:31:45 +0000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2014-06-26 15:31:45 +0000 |
commit | 87adbcd1de3278ca35260e633b5637a0a2375aec (patch) | |
tree | a5ac2d78bfc7386b9a8461132a6903bc3ab1f6a3 /kde-base | |
parent | Remove old. (diff) | |
download | gentoo-2-87adbcd1de3278ca35260e633b5637a0a2375aec.tar.gz gentoo-2-87adbcd1de3278ca35260e633b5637a0a2375aec.tar.bz2 gentoo-2-87adbcd1de3278ca35260e633b5637a0a2375aec.zip |
Backport patch from upstream fixing issue with comic installation wrt bug #511556.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Diffstat (limited to 'kde-base')
3 files changed, 100 insertions, 1 deletions
diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog index 79c7f7905ec0..035335c71d50 100644 --- a/kde-base/kdeplasma-addons/ChangeLog +++ b/kde-base/kdeplasma-addons/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-base/kdeplasma-addons # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.257 2014/06/19 13:32:21 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.258 2014/06/26 15:31:45 kensington Exp $ + +*kdeplasma-addons-4.13.2-r1 (26 Jun 2014) + + 26 Jun 2014; Michael Palimaka <kensington@gentoo.org> + +files/kdeplasma-addons-4.13.2-comics.patch, + +kdeplasma-addons-4.13.2-r1.ebuild: + Backport patch from upstream fixing issue with comic installation wrt bug + #511556. 19 Jun 2014; Chris Reffett <creffett@gentoo.org> -kdeplasma-addons-4.13.1.ebuild: diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.13.2-comics.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.13.2-comics.patch new file mode 100644 index 000000000000..620e82b10982 --- /dev/null +++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.13.2-comics.patch @@ -0,0 +1,28 @@ +From 250ad26b897ad15259dc9dc96481c5396b501c86 Mon Sep 17 00:00:00 2001 +From: "David E. Narvaez" <david.narvaez@computer.org> +Date: Fri, 6 Jun 2014 07:51:13 -0400 +Subject: [PATCH] Fix Comic Strip Installation + +Use the plasmapkg option to install instead of the one to upgrade. + +BUG: 325028 +REVIEW: 118583 +--- + applets/comic/comic.knsrc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/applets/comic/comic.knsrc b/applets/comic/comic.knsrc +index e7a78b9..e9ddbf7 100644 +--- a/applets/comic/comic.knsrc ++++ b/applets/comic/comic.knsrc +@@ -3,6 +3,6 @@ ProvidersUrl=http://download.kde.org/ocs/providers.xml + Categories=Plasma Comic + TargetDir=plasma/comics + Uncompress=never +-InstallationCommand=plasmapkg -t comic -u %f ++InstallationCommand=plasmapkg -t comic -i %f + UninstallCommand=plasmapkg -t comic -r %f + +-- +1.8.5.5 + diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.13.2-r1.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.13.2-r1.ebuild new file mode 100644 index 000000000000..e38f76bde9db --- /dev/null +++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.13.2-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.13.2-r1.ebuild,v 1.1 2014/06/26 15:31:45 kensington Exp $ + +EAPI=5 + +inherit kde4-base + +DESCRIPTION="Extra Plasma applets and engines" +LICENSE="GPL-2 LGPL-2" +KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="attica debug desktopglobe exif fcitx ibus json +kdepim nepomuk oauth +qalculate qwt scim" + +RESTRICT=test +# tests hang + +# krunner is only needed to generate dbus interface for lancelot +COMMON_DEPEND=" + app-crypt/qca:2 + app-crypt/qca-ossl:2 + $(add_kdebase_dep kdelibs 'nepomuk?') + $(add_kdebase_dep krunner '' 4.11) + $(add_kdebase_dep plasma-workspace 'nepomuk?' 4.11) + x11-misc/shared-mime-info + attica? ( dev-libs/libattica ) + desktopglobe? ( $(add_kdebase_dep marble) ) + exif? ( $(add_kdebase_dep libkexiv2) ) + fcitx? ( app-i18n/fcitx[dbus(+)] ) + ibus? ( app-i18n/ibus ) + json? ( dev-libs/qjson ) + kdepim? ( $(add_kdebase_dep kdepimlibs) ) + oauth? ( dev-libs/qoauth ) + qalculate? ( sci-libs/libqalculate ) + qwt? ( x11-libs/qwt:5 ) + scim? ( app-i18n/scim ) +" +DEPEND="${COMMON_DEPEND} + dev-cpp/eigen:2 +" +RDEPEND="${COMMON_DEPEND} +" + +PATCHES=( "${FILESDIR}/${P}-comics.patch" ) + +src_configure() { + mycmakeargs=( + -DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/" + $(cmake-utils_use_with attica LibAttica) + $(cmake-utils_use_with desktopglobe Marble) + $(cmake-utils_use_with exif Kexiv2) + $(cmake-utils_use_build ibus) + $(cmake-utils_use_with json QJSON) + $(cmake-utils_use_with kdepim KdepimLibs) + $(cmake-utils_use_with nepomuk) + $(cmake-utils_use_with oauth QtOAuth) + $(cmake-utils_use_with qalculate) + $(cmake-utils_use_with qwt) + $(cmake-utils_use_build scim) + ) + + kde4-base_src_configure +} |