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

update to anjuta-3.8.2

Browse Source 
* add a patch from upstream git to re-enable vala support
This commit is contained in:
jasper 2013-05-14 07:23:43 +00:00
parent 9a7b487924
commit cad02a84c0
8 changed files with 320 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x11/gnome/anjuta/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.86 2013/04/17 13:37:27 jasper Exp $
# $OpenBSD: Makefile,v 1.87 2013/05/14 07:23:43 jasper Exp $
SHARED_ONLY= Yes
COMMENT= versatile IDE for GNOME
GNOME_PROJECT= anjuta
GNOME_VERSION= 3.8.1
GNOME_VERSION= 3.8.2
SHARED_LIBS += anjuta-3 0.0 # 0.0
@ -33,7 +33,7 @@ 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 vte2_90 webkitgtk-3.0
WANTLIB += webp xcb xcb-render xcb-shm xml2 xslt z
WANTLIB += webp xcb xcb-render xcb-shm xml2 xslt z vala-0.20
WANTLIB += ${MODPY_WANTLIB}
MODULES= devel/dconf \
@ -51,6 +51,7 @@ LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
devel/glade \
devel/subversion \
devel/vte3 \
lang/vala>=0.20.0 \
textproc/icu4c \
x11/gnome/devhelp \
x11/gnome/gdl \
@ -64,8 +65,7 @@ LIBTOOL_FLAGS= --tag=disable-static
MODGNOME_DESKTOP_FILE= Yes
MODGNOME_ICON_CACHE= Yes
# XXX: Re-enable on update if/when vala 0.20 is supported
MODGNOME_TOOLS= gi yelp #vala
MODGNOME_TOOLS= gi yelp vala
YACC= bison -y

4
x11/gnome/anjuta/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnome/anjuta-3.8.1.tar.xz) = 712KUDLUwgJeGHC+8ET6Al8BCWqG+PIm6xeGiKlgxbk=
SIZE (gnome/anjuta-3.8.1.tar.xz) = 5180820
SHA256 (gnome/anjuta-3.8.2.tar.xz) = CWIDopTgp9jXBI+nSBBJXVkNMvlren8BTzTlMvqhx24=
SIZE (gnome/anjuta-3.8.2.tar.xz) = 5400692

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

@ -0,0 +1,33 @@
$OpenBSD: patch-configure_ac,v 1.10 2013/05/14 07:23:43 jasper Exp $
From 8d179e29235fba369b41552043d60292e540f432 Mon Sep 17 00:00:00 2001
From: Sébastien Granjoux <seb.sfo@free.fr>
Date: Sun, 12 May 2013 08:46:23 +0000
Subject: bgo #698158: anjuta-3.8.1 fails to build with vala-0.20
--- configure.ac.orig Tue May 14 09:09:42 2013
+++ configure.ac Tue May 14 09:10:11 2013
@@ -285,10 +285,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.18 ],
- [ valaver="-0.18" ],
- [ PKG_CHECK_EXISTS([ libvala-0.16 ],
- [ valaver="-0.16" ],
+ PKG_CHECK_EXISTS([ libvala-0.20 ],
+ [ valaver="-0.20" ],
+ [ PKG_CHECK_EXISTS([ libvala-0.18 ],
+ [ valaver="-0.18" ],
[ valaver="" ])
])
if test "x$valaver" != "x"; then
@@ -299,7 +299,7 @@ else
else
AC_MSG_RESULT(no)
enable_vala="no"
- VALA_REQUIRED=0.16.0
+ VALA_REQUIRED=0.18.0
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.3 2013/05/14 07:23:43 jasper Exp $
From 8d179e29235fba369b41552043d60292e540f432 Mon Sep 17 00:00:00 2001
From: Sébastien Granjoux <seb.sfo@free.fr>
Date: Sun, 12 May 2013 08:46:23 +0000
Subject: bgo #698158: anjuta-3.8.1 fails to build with vala-0.20
--- plugins/language-support-vala/locator.vala.orig Wed Sep 26 22:53:47 2012
+++ plugins/language-support-vala/locator.vala Tue May 14 09:10:11 2013
@@ -25,13 +25,8 @@ 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);
}
@@ -60,13 +55,8 @@ 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.3 2013/05/14 07:23:43 jasper Exp $
From 8d179e29235fba369b41552043d60292e540f432 Mon Sep 17 00:00:00 2001
From: Sébastien Granjoux <seb.sfo@free.fr>
Date: Sun, 12 May 2013 08:46:23 +0000
Subject: bgo #698158: anjuta-3.8.1 fails to build with vala-0.20
--- plugins/language-support-vala/provider.vala.orig Wed Sep 26 22:53:47 2012
+++ plugins/language-support-vala/provider.vala Tue May 14 09:10:11 2013
@@ -69,11 +69,7 @@ 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.3 2013/05/14 07:23:43 jasper Exp $
From 8d179e29235fba369b41552043d60292e540f432 Mon Sep 17 00:00:00 2001
From: Sébastien Granjoux <seb.sfo@free.fr>
Date: Sun, 12 May 2013 08:46:23 +0000
Subject: bgo #698158: anjuta-3.8.1 fails to build with vala-0.20
--- plugins/language-support-vala/report.vala.orig Wed Sep 26 22:53:47 2012
+++ plugins/language-support-vala/report.vala Tue May 14 09:10:11 2013
@@ -41,30 +41,17 @@ 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.3 2013/05/14 07:23:43 jasper Exp $
From 8d179e29235fba369b41552043d60292e540f432 Mon Sep 17 00:00:00 2001
From: Sébastien Granjoux <seb.sfo@free.fr>
Date: Sun, 12 May 2013 08:46:23 +0000
Subject: bgo #698158: anjuta-3.8.1 fails to build with vala-0.20
--- plugins/symbol-db/anjuta-tags/ctags-visitor.vala.orig Wed Sep 26 22:53:47 2012
+++ plugins/symbol-db/anjuta-tags/ctags-visitor.vala Tue May 14 09:10:11 2013
@@ -157,11 +157,7 @@ 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';
@@ -176,11 +172,7 @@ 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';
@@ -194,11 +186,7 @@ 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';
@@ -214,11 +202,7 @@ 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';
@@ -232,11 +216,7 @@ 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';
@@ -251,11 +231,7 @@ 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';
@@ -268,11 +244,7 @@ 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';
@@ -286,11 +258,7 @@ 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';
@@ -305,11 +273,7 @@ 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';
@@ -325,11 +289,7 @@ 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';
@@ -343,11 +303,7 @@ 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';
@@ -361,11 +317,7 @@ 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';
@@ -381,11 +333,7 @@ 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';
@@ -402,11 +350,7 @@ 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';

6
x11/gnome/anjuta/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.30 2013/04/17 13:37:27 jasper Exp $
@comment $OpenBSD: PLIST,v 1.31 2013/05/14 07:23:43 jasper Exp $
@conflict gnome-build-*
@pkgpath x11/gnome/build
@bin bin/anjuta
@ -151,6 +151,7 @@ lib/anjuta/anjuta-starter.plugin
lib/anjuta/anjuta-subversion.plugin
lib/anjuta/anjuta-terminal.plugin
lib/anjuta/anjuta-tools.plugin
lib/anjuta/anjuta-vala.plugin
lib/anjuta/dir-project.plugin
lib/anjuta/file-manager.plugin
lib/anjuta/git.plugin
@ -173,6 +174,7 @@ lib/anjuta/libanjuta-indentation-python-style.so
lib/anjuta/libanjuta-jhbuild.so
lib/anjuta/libanjuta-language-cpp-java.so
lib/anjuta/libanjuta-language-support-python.so
lib/anjuta/libanjuta-language-vala.so
lib/anjuta/libanjuta-loader.so
lib/anjuta/libanjuta-message-view.so
lib/anjuta/libanjuta-parser-cxx.so
@ -245,6 +247,7 @@ share/anjuta/glade/anjuta-subversion.ui
share/anjuta/glade/anjuta-symbol-db.ui
share/anjuta/glade/anjuta-terminal-plugin.ui
share/anjuta/glade/anjuta-tools.ui
share/anjuta/glade/anjuta-vala.ui
share/anjuta/glade/applogo.png
share/anjuta/glade/appwizard.png
share/anjuta/glade/file-manager.ui
@ -2300,6 +2303,7 @@ share/pixmaps/anjuta/anjuta-terminal-plugin-48.png
share/pixmaps/anjuta/anjuta-terminal-plugin.svg
share/pixmaps/anjuta/anjuta-tools-plugin-48.png
share/pixmaps/anjuta/anjuta-tools-plugin.svg
share/pixmaps/anjuta/anjuta-vala.png
share/pixmaps/anjuta/anjuta-watch-16.png
share/pixmaps/anjuta/anjuta-watch-24.png
share/pixmaps/anjuta/anjuta-watch.svg