cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add patches from upstream to unbreak with new vala.

Browse Source
This commit is contained in:
jasper 2012-08-29 14:11:55 +00:00
parent 6fce3c10e7
commit 217700dc5e
16 changed files with 587 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphics/shotwell/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2012/08/28 07:37:38 jasper Exp $
# $OpenBSD: Makefile,v 1.23 2012/08/29 14:11:55 jasper Exp $
# needs to allocate 512M
VMEM_WARNING = Yes
@ -6,6 +6,7 @@ VMEM_WARNING = Yes
COMMENT = digital photo organizer
DISTNAME = shotwell-0.12.3
REVISION = 0
CATEGORIES = graphics
MASTER_SITES = http://yorba.org/download/shotwell/stable/
HOMEPAGE = http://yorba.org/shotwell/

24
graphics/shotwell/patches/patch-src_Photo_vala Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-src_Photo_vala,v 1.1 2012/08/29 14:11:55 jasper Exp $
Do not access static members with instance references
http://redmine.yorba.org/projects/shotwell/repository/revisions/f5d5190a6eab8242cfd6843562e6781128f5645e
--- src/Photo.vala.orig Tue Aug 28 10:33:57 2012
+++ src/Photo.vala Tue Aug 28 10:34:57 2012
@@ -1748,13 +1748,13 @@ public abstract class Photo : PhotoSource, Dateable {
// Also makes sense to freeze the SourceCollection during this operation.
public static void set_many_editable_file(Gee.Map<Photo, File> map) throws DatabaseError {
- PhotoTable.get_instance().begin_transaction();
+ DatabaseTable.begin_transaction();
Gee.MapIterator<Photo, File> map_iter = map.map_iterator();
while (map_iter.next())
map_iter.get_key().set_editable_file(map_iter.get_value());
-
- PhotoTable.get_instance().commit_transaction();
+
+ DatabaseTable.commit_transaction();
}
// Returns the file generating pixbufs, that is, the baseline if present, the backing

16
graphics/shotwell/patches/patch-src_Printing_vala Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_Printing_vala,v 1.1 2012/08/29 14:11:55 jasper Exp $
Do not access static members with instance references
http://redmine.yorba.org/projects/shotwell/repository/revisions/f5d5190a6eab8242cfd6843562e6781128f5645e
--- src/Printing.vala.orig Tue Aug 28 10:36:49 2012
+++ src/Printing.vala Tue Aug 28 10:37:02 2012
@@ -1221,7 +1221,7 @@ public class PrintManager {
private void add_title_to_canvas(double x, double y, string title, PrintJob job, Gtk.PrintContext job_context) {
Cairo.Context dc = job_context.get_cairo_context();
double dpi = job.get_local_settings().get_content_ppi();
- var title_font_description = new Pango.FontDescription().from_string(job.get_local_settings().get_print_titles_font());
+ var title_font_description = Pango.FontDescription.from_string(job.get_local_settings().get_print_titles_font());
var title_layout = Pango.cairo_create_layout(dc);
Pango.Context context = title_layout.get_context();
Pango.cairo_context_set_resolution (context, dpi);

16
graphics/shotwell/patches/patch-src_searches_SearchBoolean_vala Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_searches_SearchBoolean_vala,v 1.1 2012/08/29 14:11:55 jasper Exp $
Do not access static members with instance references
http://redmine.yorba.org/projects/shotwell/repository/revisions/f5d5190a6eab8242cfd6843562e6781128f5645e
--- src/searches/SearchBoolean.vala.orig Tue Aug 28 10:35:24 2012
+++ src/searches/SearchBoolean.vala Tue Aug 28 10:35:52 2012
@@ -621,7 +621,7 @@ public class SearchConditionDate : SearchCondition {
DateTime date_one, DateTime date_two) {
this.search_type = search_type;
this.context = context;
- if (context != context.BETWEEN || date_two.compare(date_one) >= 1) {
+ if (context != Context.BETWEEN || date_two.compare(date_one) >= 1) {
this.date_one = date_one;
this.date_two = date_two;
} else {

30
graphics/shotwell/patches/patch-src_sidebar_Tree_vala Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-src_sidebar_Tree_vala,v 1.1 2012/08/29 14:11:55 jasper Exp $
Makes a minor modification to allow compilation by Vala 0.17.2; closes #5453.
http://redmine.yorba.org/projects/shotwell/repository/revisions/35f856338c65ce13878098c40cd913fcb453a5c4
--- src/sidebar/Tree.vala.orig Tue Aug 28 10:38:38 2012
+++ src/sidebar/Tree.vala Tue Aug 28 10:39:41 2012
@@ -548,9 +548,10 @@ public class Sidebar.Tree : Gtk.TreeView {
if (only_children)
return;
+
+ Gtk.TreeIter iter = wrapper.get_iter();
+ store.remove(ref iter);
- store.remove(wrapper.get_iter());
-
if (selected_wrapper == wrapper)
selected_wrapper = null;
@@ -641,7 +642,8 @@ public class Sidebar.Tree : Gtk.TreeView {
bool selected = (get_current_path().compare(wrapper.get_path()) == 0);
// remove from current position in tree
- store.remove(wrapper.get_iter());
+ Gtk.TreeIter iter = wrapper.get_iter();
+ store.remove(ref iter);
Sidebar.Entry? parent = branch.get_parent(entry);
assert(parent != null);

3
net/telepathy/folks/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.37 2012/04/18 17:22:40 jasper Exp $
# $OpenBSD: Makefile,v 1.38 2012/08/29 14:11:55 jasper Exp $
COMMENT-main= people aggregation library
COMMENT-tracker= (meta-)tracker backend for folks
GNOME_PROJECT= folks
GNOME_VERSION= 0.7.0
REVISION= 0
API_V= 33
PKGNAME-main= ${DISTNAME}

91
net/telepathy/folks/patches/patch-backends_telepathy_lib_tpf-logger_vala Normal file
View File

@ -0,0 +1,91 @@
$OpenBSD: patch-backends_telepathy_lib_tpf-logger_vala,v 1.1 2012/08/29 14:11:55 jasper Exp $
From 887aab26f35f9ac2e9bf1baa92004b4c3ccafd3e Mon Sep 17 00:00:00 2001
From: Erick Pérez Castellanos <erick.red@gmail.com>
Date: Thu, 09 Aug 2012 18:54:54 +0000
Subject: telepathy backend fixed to match last vala release.
--- backends/telepathy/lib/tpf-logger.vala.orig Thu Dec 15 19:30:56 2011
+++ backends/telepathy/lib/tpf-logger.vala Wed Aug 29 08:27:48 2012
@@ -78,16 +78,16 @@ internal class Logger : GLib.Object
{
bool retval = false;
- if (this._logger == null)
+ if (Logger._logger == null)
{
/* Create a logger proxy for favourites support */
var dbus_conn = yield Bus.get (BusType.SESSION);
- this._logger = yield dbus_conn.get_proxy<LoggerIface> (
+ Logger._logger = yield dbus_conn.get_proxy<LoggerIface> (
"org.freedesktop.Telepathy.Logger",
"/org/freedesktop/Telepathy/Logger");
/* Failure? */
- if (this._logger == null)
+ if (Logger._logger == null)
{
this.invalidated ();
return retval;
@@ -100,7 +100,7 @@ internal class Logger : GLib.Object
retval = true;
}
- this._logger.favourite_contacts_changed.connect ((ap, a, r) =>
+ Logger._logger.favourite_contacts_changed.connect ((ap, a, r) =>
{
if (ap != this._account_path)
return;
@@ -114,19 +114,19 @@ internal class Logger : GLib.Object
private void _logger_vanished (DBusConnection conn, string name)
{
/* The logger has vanished on the bus, so it and we are no longer valid */
- this._logger = null;
+ Logger._logger = null;
this.invalidated ();
}
public async string[] get_favourite_contacts () throws GLib.Error
{
/* Invalidated */
- if (this._logger == null)
+ if (Logger._logger == null)
return {};
/* Use an intermediate, since this._logger could disappear before this
* async function finishes */
- var logger = this._logger;
+ var logger = Logger._logger;
AccountFavourites[] favs = yield logger.get_favourite_contacts ();
foreach (AccountFavourites account in favs)
@@ -142,12 +142,12 @@ internal class Logger : GLib.Object
public async void add_favourite_contact (string id) throws GLib.Error
{
/* Invalidated */
- if (this._logger == null)
+ if (Logger._logger == null)
return;
/* Use an intermediate, since this._logger could disappear before this
* async function finishes */
- var logger = this._logger;
+ var logger = Logger._logger;
yield logger.add_favourite_contact (
new ObjectPath (this._account_path), id);
}
@@ -155,12 +155,12 @@ internal class Logger : GLib.Object
public async void remove_favourite_contact (string id) throws GLib.Error
{
/* Invalidated */
- if (this._logger == null)
+ if (Logger._logger == null)
return;
/* Use an intermediate, since this._logger could disappear before this
* async function finishes */
- var logger = this._logger;
+ var logger = Logger._logger;
yield logger.remove_favourite_contact (
new ObjectPath (this._account_path), id);
}

27
net/telepathy/folks/patches/patch-backends_telepathy_lib_tpf-persona-store-cache_vala Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-backends_telepathy_lib_tpf-persona-store-cache_vala,v 1.1 2012/08/29 14:11:55 jasper Exp $
From 887aab26f35f9ac2e9bf1baa92004b4c3ccafd3e Mon Sep 17 00:00:00 2001
From: Erick Pérez Castellanos <erick.red@gmail.com>
Date: Thu, 09 Aug 2012 18:54:54 +0000
Subject: telepathy backend fixed to match last vala release.
--- backends/telepathy/lib/tpf-persona-store-cache.vala.orig Thu Dec 15 19:30:56 2011
+++ backends/telepathy/lib/tpf-persona-store-cache.vala Wed Aug 29 08:27:48 2012
@@ -71,7 +71,7 @@ internal class Tpf.PersonaStoreCache : Folks.ObjectCac
// Maximum version?
if (object_version == uint8.MAX)
{
- object_version = this._FILE_FORMAT_VERSION;
+ object_version = PersonaStoreCache._FILE_FORMAT_VERSION;
}
if (object_version == 1)
@@ -134,7 +134,7 @@ internal class Tpf.PersonaStoreCache : Folks.ObjectCac
protected override uint8 get_serialised_object_version ()
{
- return this._FILE_FORMAT_VERSION;
+ return PersonaStoreCache._FILE_FORMAT_VERSION;
}
private Variant[] serialise_abstract_field_details (

27
net/telepathy/folks/patches/patch-backends_telepathy_lib_tpf-persona-store_vala Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-backends_telepathy_lib_tpf-persona-store_vala,v 1.1 2012/08/29 14:11:55 jasper Exp $
From 887aab26f35f9ac2e9bf1baa92004b4c3ccafd3e Mon Sep 17 00:00:00 2001
From: Erick Pérez Castellanos <erick.red@gmail.com>
Date: Thu, 09 Aug 2012 18:54:54 +0000
Subject: telepathy backend fixed to match last vala release.
--- backends/telepathy/lib/tpf-persona-store.vala.orig Tue Apr 17 13:47:11 2012
+++ backends/telepathy/lib/tpf-persona-store.vala Wed Aug 29 08:27:48 2012
@@ -409,7 +409,7 @@ public class Tpf.PersonaStore : Folks.PersonaStore
{
debug ("Removing store %s (%p)", this.id, this);
this._emit_personas_changed (null, this._persona_set);
- this._cache.clear_cache ();
+ this._cache.clear_cache.begin ();
this.removed ();
}
@@ -1327,7 +1327,7 @@ public class Tpf.PersonaStore : Folks.PersonaStore
_("Extended information may only be set on the user's Telepathy contact."));
}
- var info_list = this._contact_info_set_to_list (info_set);
+ var info_list = PersonaStore._contact_info_set_to_list (info_set);
if (this.account.connection != null)
{
GLib.Error? error = null;

27
net/telepathy/folks/patches/patch-backends_telepathy_lib_tpf-persona_vala Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-backends_telepathy_lib_tpf-persona_vala,v 1.1 2012/08/29 14:11:55 jasper Exp $
From 887aab26f35f9ac2e9bf1baa92004b4c3ccafd3e Mon Sep 17 00:00:00 2001
From: Erick Pérez Castellanos <erick.red@gmail.com>
Date: Thu, 09 Aug 2012 18:54:54 +0000
Subject: telepathy backend fixed to match last vala release.
--- backends/telepathy/lib/tpf-persona.vala.orig Tue Apr 17 13:17:03 2012
+++ backends/telepathy/lib/tpf-persona.vala Wed Aug 29 08:27:48 2012
@@ -247,7 +247,7 @@ public class Tpf.Persona : Folks.Persona,
*/
public override string[] linkable_properties
{
- get { return this._linkable_properties; }
+ get { return Tpf.Persona._linkable_properties; }
}
/**
@@ -652,7 +652,7 @@ public class Tpf.Persona : Folks.Persona,
unowned string id = contact.get_identifier ();
var connection = contact.connection;
var account = connection.get_account ();
- var uid = this.build_uid (store.type_id, store.id, id);
+ var uid = Folks.Persona.build_uid (store.type_id, store.id, id);
Object (contact: contact,
display_id: id,

10
x11/gnome/anjuta/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.67 2012/08/12 20:43:42 jasper Exp $
# $OpenBSD: Makefile,v 1.68 2012/08/29 14:11:55 jasper Exp $
SHARED_ONLY= Yes
@ -6,6 +6,7 @@ COMMENT= versatile IDE for GNOME
GNOME_PROJECT= anjuta
GNOME_VERSION= 3.4.4
REVISION= 0
SHARED_LIBS += anjuta-3 0.0 # 0.0
@ -38,7 +39,7 @@ WANTLIB += pcre pixman-1 png pthread pthread-stubs sasl2
WANTLIB += soup-2.4 sqlite3 ssl stdc++ svn_client-1 svn_delta-1
WANTLIB += svn_diff-1 svn_fs-1 svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1
WANTLIB += svn_ra-1 svn_ra_local-1 svn_ra_neon-1 svn_ra_svn-1
WANTLIB += svn_repos-1 svn_subr-1 svn_wc-1 util vala-0.16 vte2_90
WANTLIB += svn_repos-1 svn_subr-1 svn_wc-1 util vala-0.18 vte2_90
WANTLIB += webkitgtk-3.0 xcb xcb-render xcb-shm xml2 xslt z
WANTLIB += dbus-1 dbus-glib-1 javascriptcoregtk-3.0 magic
WANTLIB += gcrypt gda-5.0 gnome-keyring gpg-error
@ -80,6 +81,11 @@ CONFIGURE_ARGS+= --disable-static \
# adds dependency on libgnomeui
CONFIGURE_ARGS+= --disable-graphviz
# XXX: Remove when updating to the next release
AUTOCONF_VERSION= 2.68
CONFIGURE_STYLE= autoconf
######
pre-configure:
${SUBST_CMD} ${WRKSRC}/plugins/project-wizard/templates/pygtk.wiz.in \
${WRKSRC}/plugins/project-wizard/templates/python.wiz.in \

42
x11/gnome/anjuta/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,42 @@
$OpenBSD: patch-configure_ac,v 1.6 2012/08/29 14:11:55 jasper Exp $
From 63d60f62495a94d7743c0328315a91abb3703f31 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Fri, 22 Jun 2012 05:27:21 +0000
Subject: vala language support: update to Vala 0.18
--- configure.ac.orig Wed Aug 29 08:49:55 2012
+++ configure.ac Wed Aug 29 08:50:51 2012
@@ -52,9 +52,6 @@ LIBDEVHELP_REQUIRED=3.0.0
dnl Glade
GLADEUI_REQUIRED=3.11.0
-dnl Vala
-VALA14_REQUIRED=0.13.3
-
dnl Introspection
GI_REQUIRED=0.9.5
@@ -263,10 +260,10 @@ if test "$user_disabled_vala" = 1; then
else
AC_MSG_RESULT(no)
AC_MSG_CHECKING(if libvala is available)
- PKG_CHECK_EXISTS([ libvala-0.16 ],
- [ valaver="-0.16" ],
- [ PKG_CHECK_EXISTS([ libvala-0.14 >= $VALA14_REQUIRED ],
- [ valaver="-0.14" ],
+ PKG_CHECK_EXISTS([ libvala-0.18 ],
+ [ valaver="-0.18" ],
+ [ PKG_CHECK_EXISTS([ libvala-0.16 ],
+ [ valaver="-0.16" ],
[ valaver="" ])
])
if test "x$valaver" != "x"; then
@@ -277,7 +274,6 @@ else
else
AC_MSG_RESULT(no)
enable_vala="no"
- VALA_REQUIRED=$VALA14_REQUIRED
fi
AC_SUBST(LIBVALA)
fi

37
x11/gnome/anjuta/patches/patch-plugins_language-support-vala_locator_vala Normal file
View File

@ -0,0 +1,37 @@
$OpenBSD: patch-plugins_language-support-vala_locator_vala,v 1.1 2012/08/29 14:11:55 jasper Exp $
From 63d60f62495a94d7743c0328315a91abb3703f31 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Fri, 22 Jun 2012 05:27:21 +0000
Subject: vala language support: update to Vala 0.18
--- plugins/language-support-vala/locator.vala.orig Sat Jul 28 11:35:54 2012
+++ plugins/language-support-vala/locator.vala Wed Aug 29 08:51:33 2012
@@ -25,8 +25,13 @@ public class BlockLocator : Vala.CodeVisitor {
this.column = column;
}
public bool inside (Vala.SourceReference src) {
+#if VALA_0_18
+ var begin = Location (src.begin.line, src.begin.column);
+ var end = Location (src.end.line, src.end.column);
+#else
var begin = Location (src.first_line, src.first_column);
var end = Location (src.last_line, src.last_column);
+#endif
return begin.before (this) && this.before(end);
}
@@ -55,8 +60,13 @@ public class BlockLocator : Vala.CodeVisitor {
if (!location.inside (s.source_reference))
return false;
+#if VALA_0_18
+ var begin = Location (s.source_reference.begin.line, s.source_reference.begin.column);
+ var end = Location (s.source_reference.end.line, s.source_reference.end.column);
+#else
var begin = Location (s.source_reference.first_line, s.source_reference.first_column);
var end = Location (s.source_reference.last_line, s.source_reference.last_column);
+#endif
if (innermost == null || (innermost_begin.before(begin) && end.before(innermost_end))) {
innermost = s;

21
x11/gnome/anjuta/patches/patch-plugins_language-support-vala_provider_vala Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-plugins_language-support-vala_provider_vala,v 1.1 2012/08/29 14:11:55 jasper Exp $
From 63d60f62495a94d7743c0328315a91abb3703f31 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Fri, 22 Jun 2012 05:27:21 +0000
Subject: vala language support: update to Vala 0.18
--- plugins/language-support-vala/provider.vala.orig Sat Jul 28 11:35:54 2012
+++ plugins/language-support-vala/provider.vala Wed Aug 29 08:51:33 2012
@@ -69,7 +69,11 @@ public class ValaProvider : Object, IAnjuta.Provider {
var proposals = new GLib.List<IAnjuta.EditorAssistProposal?>();
foreach (var symbol in syms) {
if (symbol is Vala.LocalVariable
+#if VALA_0_18
+ && symbol.source_reference.begin.line > editor.get_lineno())
+#else
&& symbol.source_reference.first_line > editor.get_lineno())
+#endif
continue;
var prop = IAnjuta.EditorAssistProposal();

40
x11/gnome/anjuta/patches/patch-plugins_language-support-vala_report_vala Normal file
View File

@ -0,0 +1,40 @@
$OpenBSD: patch-plugins_language-support-vala_report_vala,v 1.1 2012/08/29 14:11:55 jasper Exp $
From 63d60f62495a94d7743c0328315a91abb3703f31 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Fri, 22 Jun 2012 05:27:21 +0000
Subject: vala language support: update to Vala 0.18
--- plugins/language-support-vala/report.vala.orig Sat Jul 28 11:35:54 2012
+++ plugins/language-support-vala/report.vala Wed Aug 29 08:51:33 2012
@@ -41,17 +41,30 @@ public class AnjutaReport : Vala.Report {
if (e.source.file.filename.has_suffix (((IAnjuta.Document)editor).get_filename ())) {
if (ind != null) {
/* begin_iter should be one cell before to select the first character */
+#if VALA_0_18
+ var begin_iter = editor.get_line_begin_position (e.source.begin.line);
+ for (var i = 1; i < e.source.begin.column; i++)
+ begin_iter.next ();
+ var end_iter = editor.get_line_begin_position (e.source.end.line);
+ for (var i = 0; i < e.source.end.column; i++)
+ end_iter.next ();
+#else
var begin_iter = editor.get_line_begin_position (e.source.first_line);
for (var i = 1; i < e.source.first_column; i++)
begin_iter.next ();
var end_iter = editor.get_line_begin_position (e.source.last_line);
for (var i = 0; i < e.source.last_column; i++)
end_iter.next ();
+#endif
ind.set(begin_iter, end_iter, e.error ? IAnjuta.IndicableIndicator.CRITICAL :
IAnjuta.IndicableIndicator.WARNING);
}
if (editor is IAnjuta.Markable) {
+#if VALA_0_18
+ mark.mark(e.source.begin.line, IAnjuta.MarkableMarker.MESSAGE, e.message);
+#else
mark.mark(e.source.first_line, IAnjuta.MarkableMarker.MESSAGE, e.message);
+#endif
}
}

177
x11/gnome/anjuta/patches/patch-plugins_symbol-db_anjuta-tags_ctags-visitor_vala Normal file
View File

@ -0,0 +1,177 @@
$OpenBSD: patch-plugins_symbol-db_anjuta-tags_ctags-visitor_vala,v 1.1 2012/08/29 14:11:55 jasper Exp $
From cc60d728285312f41e2b7fbe969bdf4f5729843f Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Fri, 22 Jun 2012 05:34:15 +0000
Subject: ctags vala support: update to Vala 0.18
--- plugins/symbol-db/anjuta-tags/ctags-visitor.vala.orig Sat Jul 28 11:35:54 2012
+++ plugins/symbol-db/anjuta-tags/ctags-visitor.vala Wed Aug 29 09:07:18 2012
@@ -157,7 +157,11 @@ public class CTagsVisitor : CodeVisitor {
public override void visit_class (Class cl) {
var entry = CTagsEntry();
+#if VALA_0_18
+ entry.line_number = cl.source_reference.begin.line;
+#else
entry.line_number = cl.source_reference.first_line;
+#endif
entry.name = cl.name;
entry.kind_name = "class";
entry.kind = 'c';
@@ -172,7 +176,11 @@ public class CTagsVisitor : CodeVisitor {
}
public override void visit_struct (Struct st) {
var entry = CTagsEntry();
+#if VALA_0_18
+ entry.line_number = st.source_reference.begin.line;
+#else
entry.line_number = st.source_reference.first_line;
+#endif
entry.name = st.name;
entry.kind_name = "struct";
entry.kind = 's';
@@ -186,7 +194,11 @@ public class CTagsVisitor : CodeVisitor {
public override void visit_interface (Interface iface) {
var entry = CTagsEntry();
+#if VALA_0_18
+ entry.line_number = iface.source_reference.begin.line;
+#else
entry.line_number = iface.source_reference.first_line;
+#endif
entry.name = iface.name;
entry.kind_name = "interface";
entry.kind = 'i';
@@ -202,7 +214,11 @@ public class CTagsVisitor : CodeVisitor {
public override void visit_enum (Vala.Enum en) {
var entry = CTagsEntry();
+#if VALA_0_18
+ entry.line_number = en.source_reference.begin.line;
+#else
entry.line_number = en.source_reference.first_line;
+#endif
entry.name = en.name;
entry.kind_name = "enum";
entry.kind = 'e';
@@ -216,7 +232,11 @@ public class CTagsVisitor : CodeVisitor {
public override void visit_error_domain (ErrorDomain edomain) {
var entry = CTagsEntry();
+#if VALA_0_18
+ entry.line_number = edomain.source_reference.begin.line;
+#else
entry.line_number = edomain.source_reference.first_line;
+#endif
entry.name = edomain.name;
entry.kind_name = "errordomain";
entry.kind = 'E';
@@ -231,7 +251,11 @@ public class CTagsVisitor : CodeVisitor {
public override void visit_enum_value (Vala.EnumValue ev) {
var entry = CTagsEntry();
+#if VALA_0_18
+ entry.line_number = ev.source_reference.begin.line;
+#else
entry.line_number = ev.source_reference.first_line;
+#endif
entry.name = ev.name;
entry.kind_name = "enumvalue";
entry.kind = 'v';
@@ -244,7 +268,11 @@ public class CTagsVisitor : CodeVisitor {
public override void visit_error_code (ErrorCode ecode) {
var entry = CTagsEntry();
+#if VALA_0_18
+ //entry.line_number = ecode.source_reference.begin.line;
+#else
//entry.line_number = ecode.source_reference.first_line;
+#endif
entry.name = ecode.name;
entry.kind_name = "errorcode";
entry.kind = 'r';
@@ -258,7 +286,11 @@ public class CTagsVisitor : CodeVisitor {
public override void visit_delegate (Delegate d) {
var entry = CTagsEntry();
+#if VALA_0_18
+ entry.line_number = d.source_reference.begin.line;
+#else
entry.line_number = d.source_reference.first_line;
+#endif
entry.name = d.name;
entry.kind_name = "delegate";
entry.kind = 'd';
@@ -273,7 +305,11 @@ public class CTagsVisitor : CodeVisitor {
public override void visit_signal (Vala.Signal sig) {
var entry = CTagsEntry();
+#if VALA_0_18
+ entry.line_number = sig.source_reference.begin.line;
+#else
entry.line_number = sig.source_reference.first_line;
+#endif
entry.name = sig.name;
entry.kind_name = "signal";
entry.kind = 'S';
@@ -289,7 +325,11 @@ public class CTagsVisitor : CodeVisitor {
public override void visit_field (Field f) {
var entry = CTagsEntry();
+#if VALA_0_18
+ entry.line_number = f.source_reference.begin.line;
+#else
entry.line_number = f.source_reference.first_line;
+#endif
entry.name = f.name;
entry.kind_name = "field";
entry.kind = 'f';
@@ -303,7 +343,11 @@ public class CTagsVisitor : CodeVisitor {
public override void visit_constant (Constant c) {
var entry = CTagsEntry();
+#if VALA_0_18
+ entry.line_number = c.source_reference.begin.line;
+#else
entry.line_number = c.source_reference.first_line;
+#endif
entry.name = c.name;
entry.kind_name = "field";
entry.kind = 'f';
@@ -317,7 +361,11 @@ public class CTagsVisitor : CodeVisitor {
public override void visit_property (Property prop) {
var entry = CTagsEntry();
+#if VALA_0_18
+ entry.line_number = prop.source_reference.begin.line;
+#else
entry.line_number = prop.source_reference.first_line;
+#endif
entry.name = prop.name;
entry.kind_name = "property";
entry.kind = 'p';
@@ -333,7 +381,11 @@ public class CTagsVisitor : CodeVisitor {
public override void visit_method (Method m) {
var entry = CTagsEntry();
+#if VALA_0_18
+ entry.line_number = m.source_reference.begin.line;
+#else
entry.line_number = m.source_reference.first_line;
+#endif
entry.name = m.name;
entry.kind_name = "method";
entry.kind = 'm';
@@ -350,7 +402,11 @@ public class CTagsVisitor : CodeVisitor {
public override void visit_local_variable (LocalVariable local) {
var entry = CTagsEntry();
+#if VALA_0_18
+ entry.line_number = local.source_reference.begin.line;
+#else
entry.line_number = local.source_reference.first_line;
+#endif
entry.name = local.name;
entry.kind_name = "local";
entry.kind = 'l';