Date: Saturday, December 1, 2018 @ 11:19:14
Author: arojas
Revision: 410685
PIE rebuild
Modified:
xnoise/trunk/PKGBUILD
xnoise/trunk/xnoise-compilation-fix.patch
------------------------------+
PKGBUILD | 4 -
xnoise-compilation-fix.patch | 100 +++++++++++++++++++++++++++++++++++++----
2 files changed, 93 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-12-01 10:33:49 UTC (rev 410684)
+++ PKGBUILD 2018-12-01 11:19:14 UTC (rev 410685)
@@ -3,7 +3,7 @@
pkgname=xnoise
pkgver=0.2.21
-pkgrel=4
+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/";
@@ -21,7 +21,7 @@
xnoise-compilation-fix.patch)
sha512sums=('SKIP'
'b47297bda23fc4dcd22bf44a84ad2c5e3b5ed0d648ef78a3bbe4de4d481c82e8ab0c52193dc8c4373e74cd389537faf66bd434cd8d695eeff4b2820c67bf1423'
-
'f2d11322d61465894f59e89cf55582c6f669ed2e8bc300b30a1a0f6f81eb587a0021ebeafabb0cee23ea883450066d96609d5dfc67b7eafc7dbddb55609a0775')
+
'fababde2f5ccd7c7074d8c7cd684ab36924e6781af05293736227c15d864f3fc726a50215ca84b5f4776e47cad54e1b5723932e98c042ad226c853b9efc2a5ad')
prepare() {
cd $pkgname
Modified: xnoise-compilation-fix.patch
===================================================================
--- xnoise-compilation-fix.patch 2018-12-01 10:33:49 UTC (rev 410684)
+++ xnoise-compilation-fix.patch 2018-12-01 11:19:14 UTC (rev 410685)
@@ -1,7 +1,6 @@
-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 @@
+@@ -65,7 +65,7 @@ public class Xnoise.Worker : Object {
public bool is_same_thread() {
@@ -10,10 +9,36 @@
}
public enum Priority {
-diff -ur a/libxnoise/Parameter/xnoise-parameter.vala
b/libxnoise/Parameter/xnoise-parameter.vala
+--- 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 @@
+@@ -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";
@@ -22,7 +47,7 @@
private static HashTable<string,double?> ht_double;
private static HashTable<string,string> ht_string;
private static bool inited = false;
-@@ -50,7 +50,7 @@
+@@ -50,7 +50,7 @@ public class Xnoise.Params : GLib.Object
if(inited == true)
return;
IParams_implementers = new GLib.List<IParams>();
@@ -31,7 +56,7 @@
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 @@
+@@ -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) {
@@ -52,10 +77,66 @@
return val;
else
return 0;
-diff -ur a/libxnoise/Utils/xnoise-utilities.vala
b/libxnoise/Utils/xnoise-utilities.vala
+--- 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
-@@ -253,7 +253,8 @@
+@@ -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");
@@ -65,7 +146,7 @@
}
catch(GLib.RegexError e) {
print("%s\n", e.message);
-@@ -312,7 +313,8 @@
+@@ -312,7 +311,8 @@ namespace Xnoise.Utilities {
public static string replace_underline_with_blank_encoded(string value) {
try {
GLib.Regex r = new GLib.Regex("_");
@@ -75,3 +156,4 @@
}
catch(GLib.RegexError e) {
print("%s\n", e.message);
+
