[arch-commits] Commit in giggle/trunk (PKGBUILD gtksourceview3.7.patch)

[Jan Steffens]

    Date: Friday, April 12, 2013 @ 17:01:19
  Author: heftig
Revision: 88152

gtksourceview bump

Added:
  giggle/trunk/gtksourceview3.7.patch
Modified:
  giggle/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   31 ++++++++++++++++++++-----------
 gtksourceview3.7.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-12 14:36:35 UTC (rev 88151)
+++ PKGBUILD	2013-04-12 15:01:19 UTC (rev 88152)
@@ -4,28 +4,37 @@
 
 pkgname=giggle
 pkgver=0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Git repository viewer"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://live.gnome.org/giggle"
-license=('GPL')
-depends=('git' 'gtksourceview3' 'vte3')
-makedepends=('intltool' 'itstool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.7/$pkgname-$pkgver.tar.xz)
+license=(GPL)
+depends=(git gtksourceview3 vte3 desktop-file-utils hicolor-icon-theme)
+makedepends=(intltool itstool)
 options=(!libtool)
 install=giggle.install
-sha256sums=('ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59')
+source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.7/$pkgname-$pkgver.tar.xz
+        gtksourceview3.7.patch)
+sha256sums=('ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59'
+            'ca0b841d11bb5072741784dbeb72705eddf8e2bde780b8712355d5b66e456b37')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../gtksourceview3.7.patch
+}
+
 build() {
   cd $pkgname-$pkgver
-
-  ./configure \
-    --prefix=/usr
+  ./configure --prefix=/usr
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
-
   make DESTDIR="$pkgdir" install
 }

Added: gtksourceview3.7.patch
===================================================================
--- gtksourceview3.7.patch	                        (rev 0)
+++ gtksourceview3.7.patch	2013-04-12 15:01:19 UTC (rev 88152)
@@ -0,0 +1,36 @@
+From 9999a7ff573b7f3320c2065e8d0eaf0fea32a41b Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar at opensuse.org>
+Date: Wed, 03 Apr 2013 20:26:17 +0000
+Subject: Directly include gtksourcebuffer.h
+
+Until gtksourceview 3.7, it was included indirectly by gtksourceview.h.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=697220
+---
+diff --git a/src/giggle-diff-view.c b/src/giggle-diff-view.c
+index 3ded28d..ff6bbe3 100644
+--- a/src/giggle-diff-view.c
++++ b/src/giggle-diff-view.c
+@@ -29,6 +29,8 @@
+ #include <glib/gi18n.h>
+ #include <string.h>
+ 
++#include <gtksourceview/gtksourcebuffer.h>
++
+ typedef struct GiggleDiffViewPriv GiggleDiffViewPriv;
+ typedef struct GiggleDiffViewFile GiggleDiffViewFile;
+ typedef struct GiggleDiffViewHunk GiggleDiffViewHunk;
+diff --git a/src/giggle-view-file.c b/src/giggle-view-file.c
+index 130af4a..517858d 100644
+--- a/src/giggle-view-file.c
++++ b/src/giggle-view-file.c
+@@ -40,6 +40,7 @@
+ 
+ #include <gtksourceview/gtksourcelanguagemanager.h>
+ #include <gtksourceview/gtksourceview.h>
++#include <gtksourceview/gtksourcebuffer.h>
+ 
+ #define GIGGLE_TYPE_VIEW_FILE_SNAPSHOT            (giggle_view_file_snapshot_get_type ())
+ #define GIGGLE_VIEW_FILE_SNAPSHOT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIGGLE_TYPE_VIEW_FILE_SNAPSHOT, GiggleViewFileSnapshot))
+--
+cgit v0.9.1