Date: Friday, June 10, 2016 @ 13:54:55 Author: jgc Revision: 269284 upgpkg: meld 3.16.0-2
Fix dark theme (FS#49170) Added: meld/trunk/fix-dark-style.patch Modified: meld/trunk/PKGBUILD ----------------------+ PKGBUILD | 9 ++++++--- fix-dark-style.patch | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-06-10 11:26:33 UTC (rev 269283) +++ PKGBUILD 2016-06-10 11:54:55 UTC (rev 269284) @@ -6,7 +6,7 @@ pkgname=meld pkgver=3.16.0 -pkgrel=1 +pkgrel=2 pkgdesc='Visual diff and merge tool' url='http://meldmerge.org/' license=(GPL) @@ -14,8 +14,10 @@ makedepends=(intltool itstool) depends=(python2-gobject python2-cairo gtksourceview3 gsettings-desktop-schemas) optdepends=('python2-dbus: open a new tab in an already running instance') -source=("https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz";) -sha1sums=('12cd5074ad23650776334cf3d1f2d803d5f2db97') +source=("https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz"; + fix-dark-style.patch) +sha1sums=('12cd5074ad23650776334cf3d1f2d803d5f2db97' + 'b0c0d299524fb0ee57c47a723a570fc057766a51') # Meld does not support Python 3. The build succeeds, but # the main executable checks the version and errors out. @@ -22,6 +24,7 @@ prepare() { cd $pkgname-$pkgver + patch -Np1 -i ../fix-dark-style.patch } build() { Added: fix-dark-style.patch =================================================================== --- fix-dark-style.patch (rev 0) +++ fix-dark-style.patch 2016-06-10 11:54:55 UTC (rev 269284) @@ -0,0 +1,25 @@ +From ff6f12bc870372b4409e9705c4b9f111e48b8c97 Mon Sep 17 00:00:00 2001 +From: Kai Willadsen <[email protected]> +Date: Sat, 14 May 2016 06:51:38 +1000 +Subject: data: Fix unknown-text in meld-dark style + +--- + data/styles/meld-dark.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/styles/meld-dark.xml b/data/styles/meld-dark.xml +index da89251..74c49e8 100644 +--- a/data/styles/meld-dark.xml ++++ b/data/styles/meld-dark.xml +@@ -11,7 +11,7 @@ + <style name="meld:error" background="#fce94f" foreground="#faad3d" line-background="#fdf8cd"/> + <style name="meld:inline" background="#3465a4"/> + <style name="meld:current-line-highlight" background="#111100"/> +- <style name="meld:unknown-text" background="#aaaaaa"/> ++ <style name="meld:unknown-text" foreground="#aaaaaa"/> + <style name="meld:syncpoint-outline" foreground="#bbbbbb"/> + <style name="meld:current-chunk-highlight" background="#rgba(255, 255, 255, 0.1)"/> + <style name="meld:dimmed" foreground="#999999"/> +-- +cgit v0.12 +
