From 276e550ff601210affc35ae94955493c7bdc5fca Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Thu, 27 Apr 2017 22:06:10 +0700 Subject: [PATCH] vala: Revert back to old source. The new source from github requires vala to be installed before we can build vala. Signed-off-by: Willy Sudiarto Raharjo --- deps/vala/patch_support-gtk318.diff | 50 ----------------------------- deps/vala/vala.SlackBuild | 5 ++- 2 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 deps/vala/patch_support-gtk318.diff diff --git a/deps/vala/patch_support-gtk318.diff b/deps/vala/patch_support-gtk318.diff deleted file mode 100644 index cace597..0000000 --- a/deps/vala/patch_support-gtk318.diff +++ /dev/null @@ -1,50 +0,0 @@ ---- vala-0.34.2/vapi/gtk+-3.0.vapi.orig 2016-09-27 22:44:37.000000000 +1000 -+++ vala-0.34.2/vapi/gtk+-3.0.vapi 2016-11-14 16:24:16.635334244 +1000 -@@ -840,6 +840,7 @@ - [CCode (has_construct_function = false, type = "GtkWidget*")] - public Button.with_mnemonic (string label); - public bool always_show_image { get; set construct; } -+ public bool focus_on_click { get; set; } - public Gtk.Widget image { get; set; } - public Gtk.PositionType image_position { get; set; } - public string label { get; set construct; } -@@ -1573,6 +1574,7 @@ - public Gtk.CellArea cell_area { owned get; construct; } - public int column_span_column { get; set; } - public int entry_text_column { get; set; } -+ public bool focus_on_click { get; set; } - public bool has_entry { get; construct; } - [NoAccessorMethod] - public bool has_frame { get; set; } -@@ -2080,6 +2082,7 @@ - [CCode (has_construct_function = false, type = "GtkWidget*")] - public FileChooserButton.with_dialog (Gtk.Dialog dialog); - public Gtk.FileChooser dialog { construct; } -+ public bool focus_on_click { get; set; } - public string title { get; set; } - public int width_chars { get; set; } - public virtual signal void file_set (); -@@ -6692,7 +6695,6 @@ - public unowned Gdk.Display get_display (); - public bool get_double_buffered (); - public int get_events (); -- public bool get_focus_on_click (); - public unowned Pango.FontMap? get_font_map (); - public unowned Cairo.FontOptions? get_font_options (); - public unowned Gdk.FrameClock? get_frame_clock (); -@@ -6859,7 +6861,6 @@ - public void set_direction (Gtk.TextDirection dir); - public void set_double_buffered (bool double_buffered); - public void set_events (int events); -- public void set_focus_on_click (bool focus_on_click); - public void set_font_map (Pango.FontMap? font_map); - public void set_font_options (Cairo.FontOptions? options); - public void set_halign (Gtk.Align align); -@@ -6927,7 +6928,6 @@ - public Gdk.EventMask events { get; set; } - [NoAccessorMethod] - public bool expand { get; set; } -- public bool focus_on_click { get; set; } - public Gtk.Align halign { get; set; } - [NoAccessorMethod] - public bool has_default { get; set; } diff --git a/deps/vala/vala.SlackBuild b/deps/vala/vala.SlackBuild index 8372efe..8f3b0a5 100644 --- a/deps/vala/vala.SlackBuild +++ b/deps/vala/vala.SlackBuild @@ -37,7 +37,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c https://github.com/GNOME/vala/archive/$VERSION/$PRGNAM-$VERSION.tar.gz +wget -c http://ftp.gnome.org/pub/GNOME/sources/$PRGNAM/0.36/$PRGNAM-$VERSION.tar.xz CWD=$(pwd) TMP=${TMP:-/tmp/msb} @@ -64,7 +64,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -73,7 +73,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \