[gnome-calculator/wip/chergert/gsv-4] build: port to GtkSourceView 4
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calculator/wip/chergert/gsv-4] build: port to GtkSourceView 4
- Date: Thu, 27 Sep 2018 07:47:52 +0000 (UTC)
commit a7e90aa179beb0fce9c892841dd75ad8198a5c72
Author: Christian Hergert <chergert redhat com>
Date: Thu Sep 27 00:47:02 2018 -0700
build: port to GtkSourceView 4
.gitlab-ci.yml | 4 ++--
meson.build | 2 +-
org.gnome.Calculator.json | 5 ++---
snap/snapcraft.yaml | 2 +-
src/math-display.vala | 2 +-
5 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0835b0ee..4ecbd503 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,12 +2,12 @@
image: ubuntu:rolling
before_script:
- apt-get update
- - apt-get install -q -y --no-install-recommends meson valac gcc gettext itstool libgtk-3-dev
libgtksourceview-3.0-dev libmpc-dev libmpfr-dev libsoup2.4-dev libxml2-dev
+ - apt-get install -q -y --no-install-recommends meson valac gcc gettext itstool libgtk-3-dev
libgtksourceview-4-dev libmpc-dev libmpfr-dev libsoup2.4-dev libxml2-dev
.before_script_template: &fedora_before_script
image: fedora:latest
before_script:
- - dnf install -y meson vala itstool gtk3-devel gtksourceview3-devel libmpc-devel mpfr-devel
libsoup-devel libxml2-devel
+ - dnf install -y meson vala itstool gtk3-devel gtksourceview4-devel libmpc-devel mpfr-devel
libsoup-devel libxml2-devel
.build_template: &meson_build
stage: build
diff --git a/meson.build b/meson.build
index 924fcad9..c0bbf77f 100644
--- a/meson.build
+++ b/meson.build
@@ -26,7 +26,7 @@ glib = dependency('glib-2.0', version: '>= ' + glib_min_version)
gmodule_export = dependency('gmodule-export-2.0')
gobject = dependency('gobject-2.0', version: '>= ' + glib_min_version)
gtk = dependency('gtk+-3.0', version: '>= 3.19.3')
-gtksourceview = dependency('gtksourceview-3.0', version: '>= 3.15.1')
+gtksourceview = dependency('gtksourceview-4', version: '>= 4.0.2')
libsoup = dependency('libsoup-2.4', version: '>= 2.42')
libxml = dependency('libxml-2.0')
diff --git a/org.gnome.Calculator.json b/org.gnome.Calculator.json
index cc2bca1d..b5826475 100644
--- a/org.gnome.Calculator.json
+++ b/org.gnome.Calculator.json
@@ -26,7 +26,7 @@
"/man", "/share/man", "/share/gtk-doc",
"/share/vala", "*.la", "*.a",
"/bin/gcalccmd",
- "/lib/girepository-1.0", "/share/info", "/share/gtksourceview-3.0",
+ "/lib/girepository-1.0", "/share/info", "/share/gtksourceview-4",
"/share/doc", "/share/gir-1.0"
],
"modules": [
@@ -58,8 +58,7 @@
"sources": [
{
"type": "git",
- "url": "https://gitlab.gnome.org/GNOME/gtksourceview.git",
- "branch": "gnome-3-24"
+ "url": "https://gitlab.gnome.org/GNOME/gtksourceview.git"
}
]
},
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 81778234..22ab7a31 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -80,7 +80,7 @@ parts:
- intltool
- libglib2.0-dev
- libgtk-3-dev
- - libgtksourceview-3.0-dev
+ - libgtksourceview-4-dev
- libxml2-dev
- libsoup2.4-dev
- libmpc-dev
diff --git a/src/math-display.vala b/src/math-display.vala
index 56403cea..21d8cd70 100644
--- a/src/math-display.vala
+++ b/src/math-display.vala
@@ -442,7 +442,7 @@ public class CompletionProvider : GLib.Object, Gtk.SourceCompletionProvider
public virtual Gtk.SourceCompletionItem create_proposal (string label, string text, string details)
{
- var proposal = Gtk.SourceCompletionItem.new2 ();
+ var proposal = new Gtk.SourceCompletionItem ();
proposal.label = label;
proposal.text = text;
proposal.info = details;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]