[arch-commits] Commit in meld/trunk (PKGBUILD fix-dark-style.patch)

[Jan Steffens]

    Date: Sunday, June 19, 2016 @ 01:39:12
  Author: heftig
Revision: 270191

3.16.1-1

Modified:
  meld/trunk/PKGBUILD
Deleted:
  meld/trunk/fix-dark-style.patch

----------------------+
 PKGBUILD             |   11 ++++-------
 fix-dark-style.patch |   25 -------------------------
 2 files changed, 4 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-18 19:33:03 UTC (rev 270190)
+++ PKGBUILD	2016-06-19 01:39:12 UTC (rev 270191)
@@ -5,8 +5,8 @@
 # Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=meld
-pkgver=3.16.0
-pkgrel=2
+pkgver=3.16.1
+pkgrel=1
 pkgdesc='Visual diff and merge tool'
 url='http://meldmerge.org/'
 license=(GPL)
@@ -14,10 +14,8 @@
 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"
-	fix-dark-style.patch)
-sha1sums=('12cd5074ad23650776334cf3d1f2d803d5f2db97'
-          'b0c0d299524fb0ee57c47a723a570fc057766a51')
+source=("https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz")
+sha1sums=('fe003ba49433a735713bf93f06994e480b45384d')
 
 # Meld does not support Python 3. The build succeeds, but
 # the main executable checks the version and errors out.
@@ -24,7 +22,6 @@
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../fix-dark-style.patch
 }
 
 build() {

Deleted: fix-dark-style.patch
===================================================================
--- fix-dark-style.patch	2016-06-18 19:33:03 UTC (rev 270190)
+++ fix-dark-style.patch	2016-06-19 01:39:12 UTC (rev 270191)
@@ -1,25 +0,0 @@
-From ff6f12bc870372b4409e9705c4b9f111e48b8c97 Mon Sep 17 00:00:00 2001
-From: Kai Willadsen <kai.willadsen at gmail.com>
-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
-