[packages/giggle] - updated to 0.7 - added patch to build with gtksourceview > 3.6
kiesiu
kiesiu at pld-linux.org
Sat Apr 6 13:05:11 CEST 2013
commit 0d79739d1c9434bcafed6eda222c8634d0dedf6c
Author: Łukasz Kieś <kiesiu at pld-linux.org>
Date: Sat Apr 6 13:04:25 2013 +0200
- updated to 0.7
- added patch to build with gtksourceview > 3.6
giggle.spec | 16 +++++++++-------
gtksourceview-3.8.patch | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 7 deletions(-)
---
diff --git a/giggle.spec b/giggle.spec
index fc9edff..9b3d739 100644
--- a/giggle.spec
+++ b/giggle.spec
@@ -5,20 +5,21 @@
Summary: Graphical frontend for git
Summary(pl.UTF-8): Graficzna nakładka na git
Name: giggle
-Version: 0.6.1
+Version: 0.7
Release: 1
License: GPL v2
Group: X11/Development/Tools
-Source0: http://ftp.gnome.org/pub/GNOME/sources/giggle/0.6/%{name}-%{version}.tar.xz
-# Source0-md5: dd80ffa12f10a1c687bd3e730a14ca8b
+Source0: http://ftp.gnome.org/pub/GNOME/sources/giggle/0.7/%{name}-%{version}.tar.xz
+# Source0-md5: f5e756c13d9b59843c05b648901b9f28
URL: http://live.gnome.org/giggle
+Patch0: gtksourceview-3.8.patch
BuildRequires: autoconf >= 2.64
BuildRequires: automake >= 1.11
-BuildRequires: evolution-data-server-devel
+BuildRequires: evolution-data-server-devel >= 3.2
BuildRequires: gettext-devel >= 0.17
BuildRequires: git-core >= 1.4.4.3
-BuildRequires: glib2-devel >= 1:2.18
-BuildRequires: gtk+3-devel >= 3.0.0
+BuildRequires: glib2-devel >= 1:2.30
+BuildRequires: gtk+3-devel >= 3.3.12
BuildRequires: gtksourceview3-devel >= 3.0.0
BuildRequires: intltool >= 0.41.0
BuildRequires: itstool
@@ -26,7 +27,7 @@ BuildRequires: libtool >= 2.2.6
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.311
BuildRequires: tar >= 1:1.22
-BuildRequires: vte-devel >= 0.26
+BuildRequires: vte-devel >= 0.28
BuildRequires: xz
BuildRequires: yelp-tools
Requires(post,postun): /sbin/ldconfig
@@ -61,6 +62,7 @@ Pliki programistyczne libgiggle.
%prep
%setup -q
+%patch0 -p1
%build
%{__intltoolize}
diff --git a/gtksourceview-3.8.patch b/gtksourceview-3.8.patch
new file mode 100644
index 0000000..db31c48
--- /dev/null
+++ b/gtksourceview-3.8.patch
@@ -0,0 +1,37 @@
+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
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/giggle.git/commitdiff/0d79739d1c9434bcafed6eda222c8634d0dedf6c
More information about the pld-cvs-commit
mailing list