From cfd60410dbe078447078acb13a6a1f160db1dbcc Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 16 Apr 2013 13:43:45 +0200 Subject: [PATCH] giggle: disable eds plugin (broken for now); fix build. --- srcpkgs/giggle/patches/gtksourceview3.7.patch | 36 +++++++++++++++++++ srcpkgs/giggle/template | 5 ++- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/giggle/patches/gtksourceview3.7.patch diff --git a/srcpkgs/giggle/patches/gtksourceview3.7.patch b/srcpkgs/giggle/patches/gtksourceview3.7.patch new file mode 100644 index 00000000000..4dee3850a67 --- /dev/null +++ b/srcpkgs/giggle/patches/gtksourceview3.7.patch @@ -0,0 +1,36 @@ +From 9999a7ff573b7f3320c2065e8d0eaf0fea32a41b Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +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 + #include + ++#include ++ + 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 + #include ++#include + + #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 diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template index 08e77175117..6387d9145a3 100644 --- a/srcpkgs/giggle/template +++ b/srcpkgs/giggle/template @@ -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 " @@ -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"