Unbreak with new gtksourceview.

This commit is contained in:
ajacoutot 2013-03-30 12:07:28 +00:00
parent de1ef60f4c
commit f9cc2e77f7
11 changed files with 193 additions and 12 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.95 2013/03/28 21:32:03 jasper Exp $
# $OpenBSD: Makefile,v 1.96 2013/03/30 12:07:28 ajacoutot Exp $
COMMENT= lightweight GNOME text editor
GNOME_PROJECT= gedit
GNOME_VERSION= 3.6.2
REVISION= 2
REVISION= 3
CATEGORIES= editors
@ -13,16 +13,15 @@ HOMEPAGE= http://projects.gnome.org/gedit/
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0
WANTLIB += c cairo cairo-gobject drm enchant expat ffi fontconfig
WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
WANTLIB += c cairo cairo-gobject dbus-1 enchant expat ffi fontconfig
WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 girepository-1.0
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3
WANTLIB += gtksourceview-3.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre peas-1.0 peas-gtk-1.0 pixman-1 png pthread pthread-stubs
WANTLIB += stdc++ xcb xcb-render xcb-shm xml2 z
WANTLIB += atk-bridge-2.0 atspi dbus-1 harfbuzz icudata icule
WANTLIB += icuuc zeitgeist-1.0
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
WANTLIB += gtk-3 gtksourceview-3.0 harfbuzz icudata icule icuuc
WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre peas-1.0
WANTLIB += peas-gtk-1.0 pixman-1 png pthread pthread-stubs stdc++
WANTLIB += xcb xcb-render xcb-shm xml2 z zeitgeist-1.0
MODULES= devel/dconf \
devel/gettext \
@ -38,7 +37,9 @@ LIB_DEPENDS= devel/libpeas>=1.1.4p1 \
x11/gtksourceview3
RUN_DEPENDS= devel/gsettings-desktop-schemas \
x11/gnome/gvfs # --enable-gvfs-metadata
devel/iso-codes \
x11/gnome/gvfs #--enable-gvfs-metadata
# Icon 'user-bookmarks-symbolic' not present in theme
RUN_DEPENDS += x11/gnome/icon-theme-symbolic

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-gedit_gedit-app_c,v 1.1 2013/03/30 12:07:28 ajacoutot Exp $
From 2dd7cf29f92c22f12eccb42626abe3a1522053f4 Mon Sep 17 00:00:00 2001
From: Sébastien Wilmet <swilmet@gnome.org>
Date: Sun, 10 Feb 2013 17:05:10 +0000
Subject: Include the main header of gsv: gtksourceview/gtksource.h
--- gedit/gedit-app.c.orig Sat Nov 3 11:48:18 2012
+++ gedit/gedit-app.c Sat Mar 30 12:41:53 2013
@@ -37,7 +37,7 @@
#include <glib/gi18n.h>
#include <libpeas/peas-extension-set.h>
-#include <gtksourceview/gtksourcestyleschememanager.h>
+#include <gtksourceview/gtksource.h>
#include "gedit-app.h"
#include "gedit-commands.h"

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-gedit_gedit-document_h,v 1.1 2013/03/30 12:07:28 ajacoutot Exp $
From 2dd7cf29f92c22f12eccb42626abe3a1522053f4 Mon Sep 17 00:00:00 2001
From: Sébastien Wilmet <swilmet@gnome.org>
Date: Sun, 10 Feb 2013 17:05:10 +0000
Subject: Include the main header of gsv: gtksourceview/gtksource.h
--- gedit/gedit-document.h.orig Mon Oct 31 23:50:38 2011
+++ gedit/gedit-document.h Sat Mar 30 12:41:53 2013
@@ -35,7 +35,7 @@
#include <gio/gio.h>
#include <gtk/gtk.h>
-#include <gtksourceview/gtksourcebuffer.h>
+#include <gtksourceview/gtksource.h>
#include <gedit/gedit-encodings.h>

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-gedit_gedit-preferences-dialog_c,v 1.1 2013/03/30 12:07:28 ajacoutot Exp $
From 2dd7cf29f92c22f12eccb42626abe3a1522053f4 Mon Sep 17 00:00:00 2001
From: Sébastien Wilmet <swilmet@gnome.org>
Date: Sun, 10 Feb 2013 17:05:10 +0000
Subject: Include the main header of gsv: gtksourceview/gtksource.h
--- gedit/gedit-preferences-dialog.c.orig Sat Nov 3 11:48:19 2012
+++ gedit/gedit-preferences-dialog.c Sat Mar 30 12:41:53 2013
@@ -40,7 +40,7 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <libpeas-gtk/peas-gtk-plugin-manager.h>
-#include <gtksourceview/gtksourcestyleschememanager.h>
+#include <gtksourceview/gtksource.h>
#include "gedit-preferences-dialog.h"
#include "gedit-utils.h"

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-gedit_gedit-print-job_c,v 1.1 2013/03/30 12:07:28 ajacoutot Exp $
From 2dd7cf29f92c22f12eccb42626abe3a1522053f4 Mon Sep 17 00:00:00 2001
From: Sébastien Wilmet <swilmet@gnome.org>
Date: Sun, 10 Feb 2013 17:05:10 +0000
Subject: Include the main header of gsv: gtksourceview/gtksource.h
--- gedit/gedit-print-job.c.orig Sat Nov 3 11:48:19 2012
+++ gedit/gedit-print-job.c Sat Mar 30 12:41:53 2013
@@ -34,7 +34,7 @@
#endif
#include <glib/gi18n.h>
-#include <gtksourceview/gtksourceprintcompositor.h>
+#include <gtksourceview/gtksource.h>
#include "gedit-print-job.h"
#include "gedit-debug.h"

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-gedit_gedit-settings_c,v 1.1 2013/03/30 12:07:28 ajacoutot Exp $
From 2dd7cf29f92c22f12eccb42626abe3a1522053f4 Mon Sep 17 00:00:00 2001
From: Sébastien Wilmet <swilmet@gnome.org>
Date: Sun, 10 Feb 2013 17:05:10 +0000
Subject: Include the main header of gsv: gtksourceview/gtksource.h
--- gedit/gedit-settings.c.orig Sun Nov 11 11:26:13 2012
+++ gedit/gedit-settings.c Sat Mar 30 12:41:53 2013
@@ -23,7 +23,7 @@
#include <string.h>
-#include <gtksourceview/gtksourcestyleschememanager.h>
+#include <gtksourceview/gtksource.h>
#include "gedit-settings.h"
#include "gedit-app.h"

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-gedit_gedit-utils_h,v 1.1 2013/03/30 12:07:28 ajacoutot Exp $
From 2dd7cf29f92c22f12eccb42626abe3a1522053f4 Mon Sep 17 00:00:00 2001
From: Sébastien Wilmet <swilmet@gnome.org>
Date: Sun, 10 Feb 2013 17:05:10 +0000
Subject: Include the main header of gsv: gtksourceview/gtksource.h
--- gedit/gedit-utils.h.orig Mon Oct 31 23:50:38 2011
+++ gedit/gedit-utils.h Sat Mar 30 12:41:53 2013
@@ -38,7 +38,7 @@
#include <atk/atk.h>
#include <gedit/gedit-encodings.h>
#include <gedit/gedit-document.h>
-#include <gtksourceview/gtksourceview.h>
+#include <gtksourceview/gtksource.h>
G_BEGIN_DECLS

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-gedit_gedit-view_h,v 1.1 2013/03/30 12:07:28 ajacoutot Exp $
From 2dd7cf29f92c22f12eccb42626abe3a1522053f4 Mon Sep 17 00:00:00 2001
From: Sébastien Wilmet <swilmet@gnome.org>
Date: Sun, 10 Feb 2013 17:05:10 +0000
Subject: Include the main header of gsv: gtksourceview/gtksource.h
--- gedit/gedit-view.h.orig Mon Oct 31 23:50:38 2011
+++ gedit/gedit-view.h Sat Mar 30 12:41:53 2013
@@ -34,7 +34,7 @@
#include <gtk/gtk.h>
#include <gedit/gedit-document.h>
-#include <gtksourceview/gtksourceview.h>
+#include <gtksourceview/gtksource.h>
G_BEGIN_DECLS

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-plugins_modelines_modeline-parser_c,v 1.1 2013/03/30 12:07:28 ajacoutot Exp $
From 922f73a49adff557ddb89ad8857ba55049ad87f4 Mon Sep 17 00:00:00 2001
From: Seif Lotfy <seif@lotfy.com>
Date: Sun, 25 Nov 2012 21:06:17 +0000
Subject: Add missing gtksourcelanguage.h imports
--- plugins/modelines/modeline-parser.c.orig Sat Nov 3 11:48:20 2012
+++ plugins/modelines/modeline-parser.c Sat Mar 30 12:49:37 2013
@@ -22,7 +22,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-#include <gtksourceview/gtksourcelanguagemanager.h>
+#include <gtksourceview/gtksource.h>
#include <gedit/gedit-debug.h>
#include <gedit/gedit-document.h>
#include <gedit/gedit-settings.h>

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-plugins_modelines_modeline-parser_h,v 1.1 2013/03/30 12:07:28 ajacoutot Exp $
From 2dd7cf29f92c22f12eccb42626abe3a1522053f4 Mon Sep 17 00:00:00 2001
From: Sébastien Wilmet <swilmet@gnome.org>
Date: Sun, 10 Feb 2013 17:05:10 +0000
Subject: Include the main header of gsv: gtksourceview/gtksource.h
--- plugins/modelines/modeline-parser.h.orig Sat Nov 3 11:48:20 2012
+++ plugins/modelines/modeline-parser.h Sat Mar 30 12:41:53 2013
@@ -23,7 +23,7 @@
#define __MODELINE_PARSER_H__
#include <glib.h>
-#include <gtksourceview/gtksourceview.h>
+#include <gtksourceview/gtksource.h>
G_BEGIN_DECLS

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-plugins_spell_gedit-spell-utils_c,v 1.1 2013/03/30 12:07:28 ajacoutot Exp $
From 2dd7cf29f92c22f12eccb42626abe3a1522053f4 Mon Sep 17 00:00:00 2001
From: Sébastien Wilmet <swilmet@gnome.org>
Date: Sun, 10 Feb 2013 17:05:10 +0000
Subject: Include the main header of gsv: gtksourceview/gtksource.h
--- plugins/spell/gedit-spell-utils.c.orig Mon Oct 31 23:50:38 2011
+++ plugins/spell/gedit-spell-utils.c Sat Mar 30 12:41:53 2013
@@ -23,7 +23,7 @@
#include <string.h>
#include "gedit-spell-utils.h"
-#include <gtksourceview/gtksourcebuffer.h>
+#include <gtksourceview/gtksource.h>
gboolean
gedit_spell_utils_is_digit (const char *text, gssize length)