Skip to content

Commit 8a229d1

Browse files
committed
fix define variables
1 parent 19347ef commit 8a229d1

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

CMakeLists.txt

+6-5
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,16 @@ else()
125125
endif()
126126
# gtk+-3.0
127127
pkg_check_modules(GTK3.0 REQUIRED "gtk+-3.0 >= 3.10")
128-
message(STATUS "gtk version : ${GTK3.0_VERSION}")
129-
if((${GTK3.0_VERSION} GREATER 3.12) OR (${GTK3.0_VERSION} EQUAL 3.12))
130-
message(STATUS "SourceGutter is deprecated. Use get_window (WindowType type) on view directly.")
131-
list(APPEND definitions "GTK_3_12")
132-
endif()
133128
compare_version_strings("3.10" "${GTK3.0_VERSION}" gtkres)
134129
if(gtkres LESS 1)
135130
list(APPEND definitions "GTK_3_10")
136131
endif()
132+
#gtksourceview-3.0
133+
pkg_check_modules(GTKSV3.0 REQUIRED "gtksourceview-3.0 >= 3.10")
134+
if((${GTKSV3.0_VERSION} GREATER 3.12) OR (${GTKSV3.0_VERSION} EQUAL 3.12))
135+
message(STATUS "SourceGutter is deprecated. Use get_window (WindowType type) on view directly.")
136+
list(APPEND definitions "GTK_SOURCE_VIEW_3_12")
137+
endif()
137138
# gdl-3.0
138139
set(gdl_workarround OFF)
139140
pkg_check_modules(GDL3.0 REQUIRED "gdl-3.0 >= 3.3.91")

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ Discussion and support on IRC channel [#valama](http://webchat.freenode.net/?cha
1212

1313
### Requirements
1414
* cmake (>= 2.8.4)
15-
* valac (>= 0.17)
15+
* valac (>= 0.20), valac-0.24 or valac-0.26 is recommended
1616
* pkg-config
1717
* gobject-2.0
1818
* glib-2.0
1919
* gio-2.0
2020
* gladeui-2.0 (for glade files)
2121
* gee-0.8 (>= 0.10.5)
22-
* at least libvala-0.22 (recommended) or libvala-0.20 or libvala-0.18
22+
* at least libvala-0.22 (recommended) or libvala-0.20
2323
* gdk-3.0
2424
* gdl-3.0 (>= 3.5.5 is recommended)
25-
* gtk+-3.0 (>= 3.4)
26-
* gtksourceview-3.0
25+
* gtk+-3.0 (>= 3.6)
26+
* gtksourceview-3.0, 3.12 is recommended for new features in SourceView
2727
* clutter-gtk-1.0
2828
* libxml-2.0
2929
* gthread-2.0
@@ -35,7 +35,7 @@ On Debian based systems install following packages:
3535

3636
sudo apt-get install build-essential valac-0.20 libvala-0.20-dev cmake pkg-config libgtksourceview-3.0-dev libgee-0.8-dev libxml2-dev libgdl-3-dev libgladeui-dev libclutter-gtk-1.0-dev intltool gnome-icon-theme-symbolic librsvg2-bin
3737

38-
On Ubuntu versions under Raring, you have to include the [Vala Team PPA](https://launchpad.net/~vala-team/+archive/ppa) first.
38+
For a newer vala version, you have to include the [Vala Team PPA](https://launchpad.net/~vala-team/+archive/ppa) first.
3939

4040
On Fedora based systems install following packages:
4141

src/ui/super_source_view.vala

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public class SuperSourceView : SourceView {
149149
view.get_line_yrange (iter, out y, out height);
150150
view.buffer_to_window_coords (TextWindowType.WIDGET, 0, y, out wx, out wy);
151151
var gutter_width =
152-
#if GTK_3_12
152+
#if GTK_SOURCE_VIEW_3_12
153153
this.view.get_window (TextWindowType.LEFT).get_width();
154154
#else
155155
this.view.get_gutter (TextWindowType.LEFT).get_window().get_width();

0 commit comments

Comments
 (0)