[arch-commits] Commit in xnoise/trunk (3 files)
Felix Yan
fyan at archlinux.org
Tue Dec 15 06:02:34 UTC 2015
Date: Tuesday, December 15, 2015 @ 07:02:34
Author: fyan
Revision: 153346
upgpkg: xnoise 0.2.21-3
- add patches from opensuse to fix build
- FS#47379 remove dependency on gnome-icon-theme
Added:
xnoise/trunk/xnoise-ListStore.patch
xnoise/trunk/xnoise-compilation-fix.patch
Modified:
xnoise/trunk/PKGBUILD
------------------------------+
PKGBUILD | 20 ++-
xnoise-ListStore.patch | 211 +++++++++++++++++++++++++++++++++++++++++
xnoise-compilation-fix.patch | 77 ++++++++++++++
3 files changed, 303 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-12-15 04:12:05 UTC (rev 153345)
+++ PKGBUILD 2015-12-15 06:02:34 UTC (rev 153346)
@@ -4,12 +4,12 @@
pkgname=xnoise
pkgver=0.2.21
-pkgrel=2
+pkgrel=3
pkgdesc="Media player with a slick GUI, great speed and lots of features."
arch=('i686' 'x86_64')
url="http://www.xnoise-media-player.com/"
license=('GPL2')
-depends=('desktop-file-utils' 'gnome-icon-theme' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo>=0.2' 'librsvg')
+depends=('desktop-file-utils' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo>=0.2' 'librsvg')
optdepends=('gst-plugins-base: Basic media codecs'
'gst-plugins-bad: Extra media codecs'
'gst-plugins-ugly: Extra media codecs'
@@ -17,8 +17,20 @@
'gvfs: Needed for fetching album art')
makedepends=('vala' 'intltool' 'git' 'gnome-common')
install=$pkgname.install
-source=("git+https://bitbucket.org/shuerhaaken/xnoise.git#tag=$pkgver")
+source=("git+https://bitbucket.org/shuerhaaken/xnoise.git#tag=$pkgver"
+ xnoise-ListStore.patch
+ xnoise-compilation-fix.patch)
+sha512sums=('SKIP'
+ 'b47297bda23fc4dcd22bf44a84ad2c5e3b5ed0d648ef78a3bbe4de4d481c82e8ab0c52193dc8c4373e74cd389537faf66bd434cd8d695eeff4b2820c67bf1423'
+ 'f2d11322d61465894f59e89cf55582c6f669ed2e8bc300b30a1a0f6f81eb587a0021ebeafabb0cee23ea883450066d96609d5dfc67b7eafc7dbddb55609a0775')
+prepare() {
+ cd $pkgname
+ # Patches from openSUSE. Thanks!
+ patch -p1 -i ../xnoise-ListStore.patch
+ patch -p1 -i ../xnoise-compilation-fix.patch
+}
+
build() {
cd $pkgname
@@ -33,5 +45,3 @@
# Remove obsolete files
rm -rf "$pkgdir/usr/include" "$pkgdir/usr/share/vala"
}
-
-sha512sums=('SKIP')
Added: xnoise-ListStore.patch
===================================================================
--- xnoise-ListStore.patch (rev 0)
+++ xnoise-ListStore.patch 2015-12-15 06:02:34 UTC (rev 153346)
@@ -0,0 +1,211 @@
+Index: xnoise-0.2.21/libxnoise/MainWindow/xnoise-main-window.vala
+===================================================================
+--- xnoise-0.2.21.orig/libxnoise/MainWindow/xnoise-main-window.vala
++++ xnoise-0.2.21/libxnoise/MainWindow/xnoise-main-window.vala
+@@ -1239,7 +1239,7 @@ public class Xnoise.MainWindow : Gtk.Win
+
+ private void on_remove_all_button_clicked() {
+ global.position_reference = null;
+- var store = (ListStore)trackList.get_model();
++ var store = (Gtk.ListStore)trackList.get_model();
+ store.clear();
+ }
+
+@@ -1821,7 +1821,7 @@ public class Xnoise.MainWindow : Gtk.Win
+ tbx.pack_start(removeAllButton, false, false, 0);
+ removeAllButton.clicked.connect( () => {
+ global.position_reference = null;
+- var store = (ListStore)tlm;
++ var store = (Gtk.ListStore)tlm;
+ store.clear();
+ });
+ var posjumper = new Gtk.Button();
+@@ -1848,7 +1848,7 @@ public class Xnoise.MainWindow : Gtk.Win
+ if(global.position_reference == null || !global.position_reference.valid())
+ return;
+ TreePath path = global.position_reference.get_path();
+- var store = (ListStore)tlm;
++ var store = (Gtk.ListStore)tlm;
+ TreeIter iter;
+ store.get_iter(out iter, path);
+ tl.set_focus_on_iter(ref iter);
+@@ -2285,7 +2285,7 @@ public class Xnoise.MainWindow : Gtk.Win
+ }
+
+ private class Xnoise.SideBarHeadline : Gtk.TreeView {
+- private ListStore store;
++ private Gtk.ListStore store;
+ private string headline = "";
+
+ public SideBarHeadline(string headline = "") {
+@@ -2334,7 +2334,7 @@ private class Xnoise.SideBarHeadline : G
+ }
+
+ private void setup_widgets() {
+- store = new ListStore(Column.N_COUNT, typeof(string), typeof(int));
++ store = new Gtk.ListStore(Column.N_COUNT, typeof(string), typeof(int));
+
+ var renderer = new CustomCellRendererHeadline();
+ var column = new TreeViewColumn();
+Index: xnoise-0.2.21/libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.vala
+===================================================================
+--- xnoise-0.2.21.orig/libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.vala
++++ xnoise-0.2.21/libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.vala
+@@ -47,7 +47,7 @@ private class Xnoise.AddMediaWidget : Gt
+ }
+
+ private const string XNOISEICON = "xnoise";
+- private ListStore listmodel;
++ private Gtk.ListStore listmodel;
+ private TreeView tv;
+
+ public Gtk.Builder builder;
+@@ -108,7 +108,7 @@ private class Xnoise.AddMediaWidget : Gt
+ tv.headers_visible = false;
+ tv.get_selection().set_mode(SelectionMode.MULTIPLE);
+
+- listmodel = new ListStore(Column.COL_COUNT,
++ listmodel = new Gtk.ListStore(Column.COL_COUNT,
+ typeof(Gdk.Pixbuf),
+ typeof(string),
+ typeof(Item?),
+Index: xnoise-0.2.21/libxnoise/ExtraWidgets/AlbumArtView/xnoise-albumart-view.vala
+===================================================================
+--- xnoise-0.2.21.orig/libxnoise/ExtraWidgets/AlbumArtView/xnoise-albumart-view.vala
++++ xnoise-0.2.21/libxnoise/ExtraWidgets/AlbumArtView/xnoise-albumart-view.vala
+@@ -187,7 +187,7 @@ private class Xnoise.AlbumArtView : Gtk.
+ if(global.position_reference == null || !global.position_reference.valid())
+ return false;
+ TreePath p = global.position_reference.get_path();
+- var store = (ListStore)tlm;
++ var store = (Gtk.ListStore)tlm;
+ TreeIter it;
+ store.get_iter(out it, p);
+ tl.set_focus_on_iter(ref it);
+Index: xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-first-start-widget.vala
+===================================================================
+--- xnoise-0.2.21.orig/libxnoise/ExtraWidgets/xnoise-first-start-widget.vala
++++ xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-first-start-widget.vala
+@@ -102,7 +102,7 @@ private class Xnoise.FirstStartWidget :
+ }
+
+ private TreeView tv;
+- private ListStore listmodel;
++ private Gtk.ListStore listmodel;
+ private Box infobox;
+ private Box waitbox;
+ private Box bigbox;
+@@ -176,7 +176,7 @@ private class Xnoise.FirstStartWidget :
+ }
+
+ imported_box.pack_start(tv, false, false, 0);
+- listmodel = new ListStore(Column.COL_COUNT, typeof(Gdk.Pixbuf), typeof(string));
++ listmodel = new Gtk.ListStore(Column.COL_COUNT, typeof(Gdk.Pixbuf), typeof(string));
+
+ var column = new TreeViewColumn();
+ var rendererpb = new CellRendererPixbuf();
+Index: xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-tree-media-selector.vala
+===================================================================
+--- xnoise-0.2.21.orig/libxnoise/ExtraWidgets/xnoise-tree-media-selector.vala
++++ xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-tree-media-selector.vala
+@@ -36,7 +36,7 @@ using Gtk;
+ private class Xnoise.TreeMediaSelector : TreeView, MediaSelector {
+
+ private unowned MediaSoureWidget msw;
+- private ListStore store;
++ private Gtk.ListStore store;
+ private bool mouse_over = false;
+ private int row_height = 24;
+
+@@ -63,7 +63,7 @@ private class Xnoise.TreeMediaSelector :
+ this.headers_visible = false;
+ this.set_enable_search(false);
+ this.get_selection().set_mode(SelectionMode.SINGLE);
+- this.store = new ListStore(Column.N_COLUMNS,
++ this.store = new Gtk.ListStore(Column.N_COLUMNS,
+ typeof(string), //icon
+ typeof(string), //vis_text
+ typeof(int), //weight
+@@ -216,7 +216,7 @@ private class Xnoise.TreeMediaSelector :
+ });
+ if(path != null) {
+ this.model.foreach( (mo,px,iy) => {
+- ListStore mx = (ListStore)mo;
++ Gtk.ListStore mx = (Gtk.ListStore)mo;
+ mx.set(iy,
+ Column.SELECTION_STATE, false,
+ Column.SELECTION_ICON, null
+@@ -225,7 +225,7 @@ private class Xnoise.TreeMediaSelector :
+ });
+ TreeIter it;
+ this.model.get_iter(out it, path);
+- ((ListStore)this.model).set(it,
++ ((Gtk.ListStore)this.model).set(it,
+ Column.SELECTION_STATE, true,
+ Column.SELECTION_ICON, icon_repo.selected_collection_icon
+ );
+@@ -251,9 +251,9 @@ private class Xnoise.TreeMediaSelector :
+ return true;
+
+ TreeIter it;
+- ListStore m = (ListStore)this.get_model();
++ Gtk.ListStore m = (Gtk.ListStore)this.get_model();
+ m.foreach( (mo,p,iy) => {
+- ListStore mx = (ListStore)mo;
++ Gtk.ListStore mx = (Gtk.ListStore)mo;
+ mx.set(iy,
+ Column.SELECTION_STATE, false,
+ Column.SELECTION_ICON, null
+@@ -289,7 +289,7 @@ private class Xnoise.TreeMediaSelector :
+ TreeIter iter;
+ this.model.get_iter(out iter, treepath);
+ m.foreach( (mo,p,iy) => {
+- ListStore mx = (ListStore)mo;
++ Gtk.ListStore mx = (Gtk.ListStore)mo;
+ mx.set(iy,
+ Column.SELECTION_STATE, false,
+ Column.SELECTION_ICON, null
+@@ -297,7 +297,7 @@ private class Xnoise.TreeMediaSelector :
+ return false;
+ });
+ this.set_cursor(treepath, null,false);
+- ListStore mx = (ListStore)this.model;
++ Gtk.ListStore mx = (Gtk.ListStore)this.model;
+ string? name;
+ mx.get(iter, Column.NAME, out name);
+ mx.set(iter,
+Index: xnoise-0.2.21/libxnoise/TrackList/xnoise-tracklist-model.vala
+===================================================================
+--- xnoise-0.2.21.orig/libxnoise/TrackList/xnoise-tracklist-model.vala
++++ xnoise-0.2.21/libxnoise/TrackList/xnoise-tracklist-model.vala
+@@ -37,7 +37,7 @@ using Xnoise.Resources;
+ using Xnoise.Utilities;
+ using Xnoise.TagAccess;
+
+-public class Xnoise.TrackListModel : ListStore, TreeModel {
++public class Xnoise.TrackListModel : Gtk.ListStore, TreeModel {
+
+ private Main xn;
+ private IconTheme icon_theme;
+Index: xnoise-0.2.21/libxnoise/DockableMedia/VideoListing/xnoise-treeview-videos-model.vala
+===================================================================
+--- xnoise-0.2.21.orig/libxnoise/DockableMedia/VideoListing/xnoise-treeview-videos-model.vala
++++ xnoise-0.2.21/libxnoise/DockableMedia/VideoListing/xnoise-treeview-videos-model.vala
+@@ -108,7 +108,7 @@ private class Xnoise.TreeViewVideosModel
+
+ public void remove_all() {
+ view.set_model(null);
+- assert(this is ListStore);
++ assert(this is Gtk.ListStore);
+ this.clear();
+ view.set_model(this);
+ }
+@@ -116,7 +116,7 @@ private class Xnoise.TreeViewVideosModel
+ public void filter() {
+ //print("filter\n");
+ view.set_model(null);
+- assert(this is ListStore);
++ assert(this is Gtk.ListStore);
+ this.clear();
+ this.populate();
+ }
Added: xnoise-compilation-fix.patch
===================================================================
--- xnoise-compilation-fix.patch (rev 0)
+++ xnoise-compilation-fix.patch 2015-12-15 06:02:34 UTC (rev 153346)
@@ -0,0 +1,77 @@
+diff -ur a/libxnoise/BackgroundWorker/xnoise-worker.vala b/libxnoise/BackgroundWorker/xnoise-worker.vala
+--- a/libxnoise/BackgroundWorker/xnoise-worker.vala
++++ b/libxnoise/BackgroundWorker/xnoise-worker.vala
+@@ -65,7 +65,7 @@
+
+
+ public bool is_same_thread() {
+- return (void*)Thread.self<int>() == (void*)_thread;
++ return Thread.self<void*>() == (void*)_thread;
+ }
+
+ public enum Priority {
+diff -ur a/libxnoise/Parameter/xnoise-parameter.vala b/libxnoise/Parameter/xnoise-parameter.vala
+--- a/libxnoise/Parameter/xnoise-parameter.vala
++++ b/libxnoise/Parameter/xnoise-parameter.vala
+@@ -37,7 +37,7 @@
+ private static const string settings_int = "settings_int";
+ private static const string settings_double = "settings_double";
+ private static const string settings_string = "settings_string";
+- private static HashTable<string,int> ht_int;
++ private static HashTable<string,int?> ht_int;
+ private static HashTable<string,double?> ht_double;
+ private static HashTable<string,string> ht_string;
+ private static bool inited = false;
+@@ -50,7 +50,7 @@
+ if(inited == true)
+ return;
+ IParams_implementers = new GLib.List<IParams>();
+- ht_int = new GLib.HashTable<string,int>(str_hash, str_equal);
++ ht_int = new GLib.HashTable<string,int?>(str_hash, str_equal);
+ ht_double = new GLib.HashTable<string,double?>(str_hash, str_equal);
+ ht_string = new GLib.HashTable<string,string>(str_hash, str_equal);
+ read_all_parameters_from_file();
+@@ -133,16 +133,16 @@
+ // GETTERS FOR THE HASH TABLE
+ //Type bool
+ public static bool get_bool_value(string key) {
+- int val = ht_int.lookup(key);
+- if(val!=0)
++ int? val = ht_int.lookup(key);
++ if(val!=null)
+ return true;
+ else
+ return false;
+ }
+ //Type int
+ public static int get_int_value(string key) {
+- int val = ht_int.lookup(key);
+- if(val!=0)
++ int? val = ht_int.lookup(key);
++ if(val!=null)
+ return val;
+ else
+ return 0;
+diff -ur a/libxnoise/Utils/xnoise-utilities.vala b/libxnoise/Utils/xnoise-utilities.vala
+--- a/libxnoise/Utils/xnoise-utilities.vala
++++ b/libxnoise/Utils/xnoise-utilities.vala
+@@ -253,7 +253,8 @@
+
+ try {
+ GLib.Regex r = new GLib.Regex("\n");
+- return (owned)r.replace(val, -1, 0, " ");
++ string result = r.replace(val, -1, 0, " ");
++ return (owned)result;
+ }
+ catch(GLib.RegexError e) {
+ print("%s\n", e.message);
+@@ -312,7 +313,8 @@
+ public static string replace_underline_with_blank_encoded(string value) {
+ try {
+ GLib.Regex r = new GLib.Regex("_");
+- return (owned)r.replace(value, -1, 0, "%20");
++ string result = r.replace(value, -1, 0, "%20");
++ return (owned)result;
+ }
+ catch(GLib.RegexError e) {
+ print("%s\n", e.message);
More information about the arch-commits
mailing list