public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/krita/, media-gfx/krita/files/
Date: Thu, 27 Oct 2016 19:42:00 +0000 (UTC)	[thread overview]
Message-ID: <1477597311.dee51a1b9f5e7511897a22a122a2fba4edb7ed82.kensington@gentoo> (raw)

commit:     dee51a1b9f5e7511897a22a122a2fba4edb7ed82
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 27 19:41:40 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 19:41:51 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dee51a1b

media-gfx/krita: drop breeze collision patch

Upstream-commit: f50c5949365e333e9762b635722251a8406b3f81

Package-Manager: portage-2.3.2

 .../krita/files/krita-3.0.1-breeze-collisions.patch      | 16 ----------------
 media-gfx/krita/krita-9999.ebuild                        |  1 -
 2 files changed, 17 deletions(-)

diff --git a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
deleted file mode 100644
index 890f825..0000000
--- a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid installing files that collide with kde-plasma/breeze.
-
-Gentoo-bug: 594594
-KDE-bug: 368093
-
---- a/krita/data/themes/CMakeLists.txt
-+++ b/krita/data/themes/CMakeLists.txt
-@@ -1,8 +1,6 @@
- ########### install files ###############
- 
- install(FILES
--BreezeDark.colors
--BreezeHighContrast.colors
- BreezeLight.colors
- KritaNeutral.colors
- KritaBlender.colors

diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index 33d11a2..8ee6353 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -72,7 +72,6 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-breeze-collisions.patch"
 	"${FILESDIR}/${PN}-3.0.1-vc-cxxflags.patch"
 )
 


             reply	other threads:[~2016-10-27 19:42 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-27 19:42 Michael Palimaka [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-13 22:17 [gentoo-commits] proj/kde:master commit in: media-gfx/krita/, media-gfx/krita/files/ Andreas Sturmlechner
2024-11-25 22:52 Andreas Sturmlechner
2021-03-26 21:18 Andreas Sturmlechner
2020-07-12 22:55 Andreas Sturmlechner
2020-07-12 22:55 Andreas Sturmlechner
2016-09-22 11:38 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1477597311.dee51a1b9f5e7511897a22a122a2fba4edb7ed82.kensington@gentoo \
    --to=kensington@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox