[arch-commits] Commit in xnoise/repos/community-x86_64 (8 files)
Antonio Rojas
arojas at archlinux.org
Sat Dec 1 11:19:40 UTC 2018
Date: Saturday, December 1, 2018 @ 11:19:39
Author: arojas
Revision: 410686
archrelease: copy trunk to community-x86_64
Added:
xnoise/repos/community-x86_64/PKGBUILD
(from rev 410685, xnoise/trunk/PKGBUILD)
xnoise/repos/community-x86_64/xnoise-ListStore.patch
(from rev 410685, xnoise/trunk/xnoise-ListStore.patch)
xnoise/repos/community-x86_64/xnoise-compilation-fix.patch
(from rev 410685, xnoise/trunk/xnoise-compilation-fix.patch)
xnoise/repos/community-x86_64/xnoise.install
(from rev 410685, xnoise/trunk/xnoise.install)
Deleted:
xnoise/repos/community-x86_64/PKGBUILD
xnoise/repos/community-x86_64/xnoise-ListStore.patch
xnoise/repos/community-x86_64/xnoise-compilation-fix.patch
xnoise/repos/community-x86_64/xnoise.install
------------------------------+
PKGBUILD | 93 ++++-----
xnoise-ListStore.patch | 422 ++++++++++++++++++++---------------------
xnoise-compilation-fix.patch | 236 +++++++++++++++-------
xnoise.install | 6
4 files changed, 419 insertions(+), 338 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-12-01 11:19:14 UTC (rev 410685)
+++ PKGBUILD 2018-12-01 11:19:39 UTC (rev 410686)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
-# Contributor: archtux <antonio dot arias99999 at gmail dot com>
-
-pkgname=xnoise
-pkgver=0.2.21
-pkgrel=4
-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' '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'
- 'gst-libav: Extra media codecs'
- '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"
- 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
-
- ./autogen.sh --prefix=/usr
- make
-}
-
-package() {
- cd $pkgname
- make DESTDIR="$pkgdir" install
-
- # Remove obsolete files
- rm -rf "$pkgdir/usr/include" "$pkgdir/usr/share/vala"
-}
Copied: xnoise/repos/community-x86_64/PKGBUILD (from rev 410685, xnoise/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-12-01 11:19:39 UTC (rev 410686)
@@ -0,0 +1,46 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: archtux <antonio dot arias99999 at gmail dot com>
+
+pkgname=xnoise
+pkgver=0.2.21
+pkgrel=5
+pkgdesc="Media player with a slick GUI, great speed and lots of features."
+arch=('x86_64')
+url="http://www.xnoise-media-player.com/"
+license=('GPL2')
+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'
+ 'gst-libav: Extra media codecs'
+ '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"
+ xnoise-ListStore.patch
+ xnoise-compilation-fix.patch)
+sha512sums=('SKIP'
+ 'b47297bda23fc4dcd22bf44a84ad2c5e3b5ed0d648ef78a3bbe4de4d481c82e8ab0c52193dc8c4373e74cd389537faf66bd434cd8d695eeff4b2820c67bf1423'
+ 'fababde2f5ccd7c7074d8c7cd684ab36924e6781af05293736227c15d864f3fc726a50215ca84b5f4776e47cad54e1b5723932e98c042ad226c853b9efc2a5ad')
+
+prepare() {
+ cd $pkgname
+ # Patches from openSUSE. Thanks!
+ patch -p1 -i ../xnoise-ListStore.patch
+ patch -p1 -i ../xnoise-compilation-fix.patch
+}
+
+build() {
+ cd $pkgname
+
+ ./autogen.sh --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+
+ # Remove obsolete files
+ rm -rf "$pkgdir/usr/include" "$pkgdir/usr/share/vala"
+}
Deleted: xnoise-ListStore.patch
===================================================================
--- xnoise-ListStore.patch 2018-12-01 11:19:14 UTC (rev 410685)
+++ xnoise-ListStore.patch 2018-12-01 11:19:39 UTC (rev 410686)
@@ -1,211 +0,0 @@
-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();
- }
Copied: xnoise/repos/community-x86_64/xnoise-ListStore.patch (from rev 410685, xnoise/trunk/xnoise-ListStore.patch)
===================================================================
--- xnoise-ListStore.patch (rev 0)
+++ xnoise-ListStore.patch 2018-12-01 11:19:39 UTC (rev 410686)
@@ -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();
+ }
Deleted: xnoise-compilation-fix.patch
===================================================================
--- xnoise-compilation-fix.patch 2018-12-01 11:19:14 UTC (rev 410685)
+++ xnoise-compilation-fix.patch 2018-12-01 11:19:39 UTC (rev 410686)
@@ -1,77 +0,0 @@
-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);
Copied: xnoise/repos/community-x86_64/xnoise-compilation-fix.patch (from rev 410685, xnoise/trunk/xnoise-compilation-fix.patch)
===================================================================
--- xnoise-compilation-fix.patch (rev 0)
+++ xnoise-compilation-fix.patch 2018-12-01 11:19:39 UTC (rev 410686)
@@ -0,0 +1,159 @@
+--- a/libxnoise/BackgroundWorker/xnoise-worker.vala
++++ b/libxnoise/BackgroundWorker/xnoise-worker.vala
+@@ -65,7 +65,7 @@ public class Xnoise.Worker : Object {
+
+
+ public bool is_same_thread() {
+- return (void*)Thread.self<int>() == (void*)_thread;
++ return Thread.self<void*>() == (void*)_thread;
+ }
+
+ public enum Priority {
+--- a/libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.vala
++++ b/libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.vala
+@@ -199,8 +199,8 @@ private class Xnoise.AddMediaWidget : Gt
+ }
+
+ private void update_item_list() {
+- Gtk.Invisible w = new Gtk.Invisible();
+- Gdk.Pixbuf folder_icon = w.render_icon_pixbuf(Gtk.STOCK_DIRECTORY, IconSize.MENU);
++ Gtk.IconTheme icon_theme = Gtk.IconTheme.get_default();
++ Gdk.Pixbuf folder_icon = icon_theme.load_icon("folder", 16, 0);
+ listmodel.clear();
+ GLib.List<Item?> list = media_importer.get_media_folder_list();
+ foreach(Item? i in list) {
+--- a/libxnoise/ExtraWidgets/xnoise-tree-media-selector.vala
++++ b/libxnoise/ExtraWidgets/xnoise-tree-media-selector.vala
+@@ -404,7 +404,11 @@ private class Xnoise.TreeMediaSelector :
+ Value v;
+ this.store.get_value(iter, Column.NAME, out v);
+ if(v.get_string() == name) {
++#if VALA_0_36
++ this.store.remove(ref iter);
++#else
+ this.store.remove(iter);
++#endif
+ return true;
+ }
+ return false;
+--- a/libxnoise/Parameter/xnoise-parameter.vala
++++ b/libxnoise/Parameter/xnoise-parameter.vala
+@@ -37,7 +37,7 @@ public class Xnoise.Params : GLib.Object
+ 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 @@ public class Xnoise.Params : GLib.Object
+ 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 @@ public class Xnoise.Params : GLib.Object
+ // 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;
+--- a/libxnoise/Player/xnoise-gst-player.vala
++++ b/libxnoise/Player/xnoise-gst-player.vala
+@@ -907,7 +907,7 @@ public class Xnoise.GstPlayer : GLib.Obj
+ if(!Gst.Video.is_video_overlay_prepare_window_handle_message(msg))
+ return;
+ var imagesink =(Gst.Video.Overlay)(msg.src);
+- imagesink.set_property("force-aspect-ratio", true);
++ ((GLib.Object)(imagesink)).set_property("force-aspect-ratio", true);
+ imagesink.set_window_handle((uint*)(Gdk.X11Window.get_xid(videoscreen.get_window())));
+ }
+
+--- a/libxnoise/TrackList/xnoise-tracklist.vala
++++ b/libxnoise/TrackList/xnoise-tracklist.vala
+@@ -1101,7 +1101,11 @@ public class Xnoise.TrackList : TreeView
+ removed_playing_title = true;
+ global.position_reference = null;
+ }
++#if VALA_0_36
++ this.tracklistmodel.remove(ref it);
++#else
+ this.tracklistmodel.remove(it);
++#endif
+ }
+ TreeIter iter;
+ if(path_2.prev() && removed_playing_title) {
+@@ -1131,7 +1135,11 @@ public class Xnoise.TrackList : TreeView
+ global.position_reference = null;
+ //global.reset_position_reference(); // set to null without *_changed signal
+ }
++#if VALA_0_36
++ tracklistmodel.remove(ref iter);
++#else
+ tracklistmodel.remove(iter);
++#endif
+ }
+ if(path_2.prev() && removed_playing_title) {
+ tracklistmodel.get_iter(out iter, path_2);
+--- a/libxnoise/Utils/xnoise-utilities.vala
++++ b/libxnoise/Utils/xnoise-utilities.vala
+@@ -95,8 +95,7 @@ namespace Xnoise.Utilities {
+ print("Failed to get xnoise directories! \n");
+ var msg = new Gtk.MessageDialog(null, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR,
+ Gtk.ButtonsType.OK,
+- "Failed to get xnoise directories! \n",
+- null);
++ "Failed to get xnoise directories! \n");
+ msg.run();
+ return false;
+ }
+@@ -131,8 +130,7 @@ namespace Xnoise.Utilities {
+ print("Failed to get xnoise directories! \n");
+ var msg = new Gtk.MessageDialog(null, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR,
+ Gtk.ButtonsType.OK,
+- "Failed to get xnoise directories! \n",
+- null);
++ "Failed to get xnoise directories! \n");
+ msg.run();
+ return false;
+ }
+@@ -253,7 +251,8 @@ namespace Xnoise.Utilities {
+
+ 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 +311,8 @@ namespace Xnoise.Utilities {
+ 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);
+
Deleted: xnoise.install
===================================================================
--- xnoise.install 2018-12-01 11:19:14 UTC (rev 410685)
+++ xnoise.install 2018-12-01 11:19:39 UTC (rev 410686)
@@ -1,3 +0,0 @@
-post_install() {
- echo 'You will need to install a gst decoder, either gst-plugins-base (with good/bad/ugly as needed) or gst-libav.'
-}
Copied: xnoise/repos/community-x86_64/xnoise.install (from rev 410685, xnoise/trunk/xnoise.install)
===================================================================
--- xnoise.install (rev 0)
+++ xnoise.install 2018-12-01 11:19:39 UTC (rev 410686)
@@ -0,0 +1,3 @@
+post_install() {
+ echo 'You will need to install a gst decoder, either gst-plugins-base (with good/bad/ugly as needed) or gst-libav.'
+}
More information about the arch-commits
mailing list