giggle: disable eds plugin (broken for now); fix build.

This commit is contained in:
Juan RP 2013-04-16 13:43:45 +02:00
parent 4a4a7cbbe0
commit cfd60410db
2 changed files with 38 additions and 3 deletions

View File

@ -0,0 +1,36 @@
From 9999a7ff573b7f3320c2065e8d0eaf0fea32a41b Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@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
--- src/giggle-diff-view.c
+++ 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
--- src/giggle-view-file.c
+++ 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

View File

@ -1,7 +1,7 @@
# Template file for 'giggle'
pkgname=giggle
version=0.6.1
revision=4
revision=5
homepage="http://live.gnome.org/giggle"
short_desc="Git repository viewer"
maintainer="Juan RP <xtraeme@gmail.com>"
@ -13,9 +13,8 @@ long_desc="
(think of gitk on GTK+)."
build_style=gnu-configure
configure_args="--enable-evolution-data-server"
hostmakedepends="pkg-config itstool intltool"
makedepends="gtksourceview-devel vte3-devel evolution-data-server-devel"
makedepends="gtksourceview-devel>=3.8 vte3-devel"
# Required by glib-2.32.
CFLAGS="-lgmodule-2.0"