On Sun, Feb 16, 2014 at 12:22:10AM +0100, Daniel Svensson wrote:
[...]
> If you by "no releases" mean download from the release page at
> https://github.com/Abraca/Abraca/releases then sure.
What I meant was that the download link was pointed to the master
branch instead of giving a link to an explicit tagged version.
This seems like a common trend for github hosted projects in my
impression.
> I should probably
> drop a maintenance release of Abraca just to freshen up the deps. It's
> currently somewhat stalled due to me spending time on XMMS2 core
> features that will be used by Abraca later.
For your convenience I looked up the needed commits and backported
them to make the current debian package build with valac 0.20.
Please see attachments which should be ready to drop into debian/patches/,
update debian/patches/series and then change debian/control to read
valac (>= 0.20) instead of valac-0.14....
(I've only build-tested it... no runtime testing at all.)
Regards,
Andreas Henriksson
>From 695d9dcb8044cdfb1a3b10b02b3710147c5a8e30 Mon Sep 17 00:00:00 2001
From: Erik Massop <e.mas...@hccnet.nl>
Date: Wed, 16 May 2012 01:03:42 +0200
Subject: [PATCH] OTHER: Gdk.Pixbuf.from_inline no longer takes length
---
SConstruct | 2 +-
src/main_window.vala | 4 ++--
src/stock.vala | 16 ++++++++--------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/SConstruct b/SConstruct
index 3ddf197..bbcb328 100644
--- a/SConstruct
+++ b/SConstruct
@@ -5,7 +5,7 @@ env.VariantDir('build', '.')
env.Append(VALAPKGPATH = ['vapi'])
conf = env.Configure('build/build-config.h')
-conf.CheckVala('0.11.5')
+conf.CheckVala('0.16.0')
conf.CheckCCompiler()
conf.CheckPkgConfig()
conf.CheckApp('msgfmt')
diff --git a/src/main_window.vala b/src/main_window.vala
index 0de2b6a..3b93127 100644
--- a/src/main_window.vala
+++ b/src/main_window.vala
@@ -34,7 +34,7 @@ namespace Abraca {
create_widgets(client);
try {
- set_icon(new Gdk.Pixbuf.from_inline (-1, Resources.abraca_32, false));
+ set_icon(new Gdk.Pixbuf.from_inline (Resources.abraca_32, false));
} catch (GLib.Error e) {
GLib.assert_not_reached ();
}
@@ -301,7 +301,7 @@ namespace Abraca {
var about = about_builder.get_object("abraca_about") as Gtk.AboutDialog;
try {
- about.set_logo(new Gdk.Pixbuf.from_inline (-1, Resources.abraca_192, false));
+ about.set_logo(new Gdk.Pixbuf.from_inline (Resources.abraca_192, false));
} catch (GLib.Error e) {
GLib.assert_not_reached ();
}
diff --git a/src/stock.vala b/src/stock.vala
index edebb4c..f7d0ed2 100644
--- a/src/stock.vala
+++ b/src/stock.vala
@@ -34,7 +34,7 @@ namespace Abraca {
set = new Gtk.IconSet();
source = new Gtk.IconSource();
- source.set_pixbuf(new Gdk.Pixbuf.from_inline(-1, Resources.abraca_equalizer, false));
+ source.set_pixbuf(new Gdk.Pixbuf.from_inline(Resources.abraca_equalizer, false));
set.add_source(source);
factory.add(STOCK_EQUALIZER, set);
@@ -44,11 +44,11 @@ namespace Abraca {
set = new Gtk.IconSet();
source = new Gtk.IconSource();
- source.set_pixbuf(new Gdk.Pixbuf.from_inline(-1, Resources.abraca_collection_24, false));
+ source.set_pixbuf(new Gdk.Pixbuf.from_inline(Resources.abraca_collection_24, false));
set.add_source(source);
source = new Gtk.IconSource();
- source.set_pixbuf(new Gdk.Pixbuf.from_inline(-1, Resources.abraca_collection_16, false));
+ source.set_pixbuf(new Gdk.Pixbuf.from_inline(Resources.abraca_collection_16, false));
source.set_size(Gtk.IconSize.MENU);
source.set_size_wildcarded(false);
set.add_source(source);
@@ -60,11 +60,11 @@ namespace Abraca {
set = new Gtk.IconSet();
source = new Gtk.IconSource();
- source.set_pixbuf(new Gdk.Pixbuf.from_inline(-1, Resources.abraca_playlist_24, false));
+ source.set_pixbuf(new Gdk.Pixbuf.from_inline(Resources.abraca_playlist_24, false));
set.add_source(source);
source = new Gtk.IconSource();
- source.set_pixbuf(new Gdk.Pixbuf.from_inline(-1, Resources.abraca_playlist_16, false));
+ source.set_pixbuf(new Gdk.Pixbuf.from_inline(Resources.abraca_playlist_16, false));
source.set_size(Gtk.IconSize.MENU);
source.set_size_wildcarded(false);
set.add_source(source);
@@ -73,9 +73,9 @@ namespace Abraca {
/* Other icons */
- factory.add(STOCK_RATED, new Gtk.IconSet.from_pixbuf(new Gdk.Pixbuf.from_inline(-1, Resources.abraca_rating_rated, false)));
- factory.add(STOCK_UNRATED, new Gtk.IconSet.from_pixbuf(new Gdk.Pixbuf.from_inline(-1, Resources.abraca_rating_unrated, false)));
- factory.add(STOCK_FAVORITE, new Gtk.IconSet.from_pixbuf(new Gdk.Pixbuf.from_inline(-1, Resources.abraca_favorite, false)));
+ factory.add(STOCK_RATED, new Gtk.IconSet.from_pixbuf(new Gdk.Pixbuf.from_inline(Resources.abraca_rating_rated, false)));
+ factory.add(STOCK_UNRATED, new Gtk.IconSet.from_pixbuf(new Gdk.Pixbuf.from_inline(Resources.abraca_rating_unrated, false)));
+ factory.add(STOCK_FAVORITE, new Gtk.IconSet.from_pixbuf(new Gdk.Pixbuf.from_inline(Resources.abraca_favorite, false)));
return factory;
}
--
1.8.5.1
>From 7dd33dfaa9cba3f9bed9ef64fdd792bee1dd5703 Mon Sep 17 00:00:00 2001
From: Daniel Svensson <dsvens...@gmail.com>
Date: Fri, 5 Oct 2012 15:20:27 +0200
Subject: [PATCH] OTHER: valac 0.18 compatibility.
---
SConstruct | 2 +-
src/components/collections/collections_model.vala | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/SConstruct b/SConstruct
index 9e55127..9a8ac16 100644
--- a/SConstruct
+++ b/SConstruct
@@ -5,7 +5,7 @@ env.VariantDir('build', '.')
env.Append(VALAPKGPATH = ['vapi'])
conf = env.Configure('build/build-config.h')
-conf.CheckVala('0.16.0')
+conf.CheckVala('0.18.0')
conf.CheckCCompiler()
conf.CheckPkgConfig()
conf.CheckApp('msgfmt')
diff --git a/src/components/collections/collections_model.vala b/src/components/collections/collections_model.vala
index 4e19fd9..5661916 100644
--- a/src/components/collections/collections_model.vala
+++ b/src/components/collections/collections_model.vala
@@ -157,7 +157,7 @@ namespace Abraca {
*/
public void remove_temporary_playlist ()
{
- remove(_temporary_playlist_iter);
+ remove(ref _temporary_playlist_iter);
has_temporary_playlist = false;
}
@@ -201,7 +201,7 @@ namespace Abraca {
parts = name.split("-", 2);
if (parts[0] == _("New Playlist")) {
if (parts[1] != null) {
- current = parts[1].to_int();
+ current = int.parse(parts[1]);
} else {
current = 0;
}
@@ -258,7 +258,7 @@ namespace Abraca {
}
while (iter_children(out child, parent)) {
- remove(child);
+ remove(ref child);
}
int pos = iter_n_children(parent);
@@ -433,7 +433,7 @@ namespace Abraca {
get(iter, Column.Name, out current);
if (name == current) {
- remove(iter);
+ remove(ref iter);
break;
}
} while (iter_next(ref iter));
--
1.8.5.1
>From ee77aa4a262ac38858ca0680d6b327c512c41d2d Mon Sep 17 00:00:00 2001
From: Daniel Svensson <dsvens...@gmail.com>
Date: Wed, 26 Jun 2013 01:50:18 +0200
Subject: [PATCH] OTHER: Fix vala 0.20 incompatibilities.
---
src/abraca-filter-model.vala | 2 +-
src/abraca-playlist-model.vala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/abraca-filter-model.vala b/src/abraca-filter-model.vala
index aa02412..da0303b 100644
--- a/src/components/filter/filter_model.vala
+++ b/src/components/filter/filter_model.vala
@@ -117,7 +117,7 @@ namespace Abraca {
* When GTK asks for the value of a column, check if the row
* has been resolved or not, otherwise resolve it.
*/
- public void get_value (Gtk.TreeIter iter, int column, ref GLib.Value val)
+ public void get_value (Gtk.TreeIter iter, int column, out GLib.Value val)
{
GLib.Value tmp1;
diff --git a/src/abraca-playlist-model.vala b/src/abraca-playlist-model.vala
index 3dcfb48..382c369 100644
--- a/src/components/playlist/playlist_model.vala
+++ b/src/components/playlist/playlist_model.vala
@@ -85,7 +85,7 @@ namespace Abraca {
* When GTK asks for the value of a column, check if the row
* has been resolved or not, otherwise resolve it.
*/
- public void get_value(Gtk.TreeIter iter, int column, ref GLib.Value val) {
+ public void get_value(Gtk.TreeIter iter, int column, out GLib.Value val) {
GLib.Value status;
base.get_value(iter, Column.STATUS, out status);
--
1.8.5.1
