Hello community, here is the log from the commit of package valencia for openSUSE:Factory checked in at 2012-10-31 07:04:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/valencia (Old) and /work/SRC/openSUSE:Factory/.valencia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "valencia", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/valencia/valencia.changes 2012-01-20 20:27:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.valencia.new/valencia.changes 2012-10-31 07:04:14.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Oct 23 17:24:39 UTC 2012 - [email protected] + +- Add valencia-vala-0.18.patch: Change Makefile to look for + libvala-0.18. Patch is only conditionally applied, when + pkg-config --exists libvala-0.18 succeeds. +- Add pkgconfig(libvala-0.18) BuildRequires on openSUSE > 12.2. +- Add valencia-gtk36.patch: Fix build with GTK+ 3.6, which has + VBox and HBox deprecated. + +------------------------------------------------------------------- New: ---- valencia-gtk36.patch valencia-vala-0.18.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ valencia.spec ++++++ --- /var/tmp/diff_new_pack.SIfy6t/_old 2012-10-31 07:04:15.000000000 +0100 +++ /var/tmp/diff_new_pack.SIfy6t/_new 2012-10-31 07:04:15.000000000 +0100 @@ -42,6 +42,10 @@ Patch1: valencia-gedit3.patch # PATCH-FIX-UPSTREAM valencia-vala-0.16.patch [email protected] -- Build against vala 0.15/0.16, taken from git (master branch, from 80815271 up to d6504e0c) Patch2: valencia-vala-0.16.patch +# PATCH-FIX-UPSTREAM valencia-vala-0.18.patch [email protected] -- Build with vala 0.17/0.18, taken from git (commit e8a0f500 and e75e9be0) +Patch3: valencia-vala-0.18.patch +# PATCH-FIX-UPSTREAM valencia-gtk36.patch [email protected] -- Fix build with gtk+ 3.6, taken from git 97087fc +Patch4: valencia-gtk36.patch BuildRequires: pkgconfig(gee-1.0) %if 0%{?favor_gtk2} BuildRequires: pkgconfig(gedit-2.20) @@ -56,6 +60,9 @@ BuildRequires: pkgconfig(gedit) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtksourceview-3.0) +%if 0%{?suse_version} > 1220 +BuildRequires: pkgconfig(libvala-0.18) +%else %if 0%{?suse_version} > 1210 BuildRequires: pkgconfig(libvala-0.16) %else @@ -65,10 +72,11 @@ BuildRequires: pkgconfig(libvala-0.12) %endif %endif +%endif BuildRequires: pkgconfig(vte-2.90) %endif -BuildRequires: vala BuildRequires: update-desktop-files +BuildRequires: vala BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -110,6 +118,10 @@ %patch2 -p1 %endif %endif +if pkg-config --exists libvala-0.18; then +%patch3 -p1 +fi +%patch4 -p1 %build export CFLAGS="%{optflags}" ++++++ valencia-gtk36.patch ++++++ diff --git a/browser.vala b/browser.vala index 0500e57..32bc625 100644 --- a/browser.vala +++ b/browser.vala @@ -12,7 +12,7 @@ class SymbolBrowser { Gtk.Entry find_entry; ListViewString list; - Gtk.VBox symbol_vbox; + Gtk.Box symbol_vbox; bool visible; @@ -29,7 +29,7 @@ class SymbolBrowser { list.row_activated.connect(on_list_activated); list.received_focus.connect(on_list_receive_focus); - symbol_vbox = new Gtk.VBox(false, 6); + symbol_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 6); symbol_vbox.pack_start(find_entry, false, false, 0); symbol_vbox.pack_start(list.scrolled_window, true, true, 0); symbol_vbox.show_all(); diff --git a/gtk_util.vala b/gtk_util.vala index fb1e74b..e57f47e 100644 --- a/gtk_util.vala +++ b/gtk_util.vala @@ -126,9 +126,10 @@ class Tooltip { window.set_transient_for(parent); window.set_destroy_with_parent(true); - Gdk.Color background; - Gdk.Color.parse("#FFFF99", out background); - window.modify_bg(Gtk.StateType.NORMAL, background); + Gdk.RGBA background = Gdk.RGBA(); + if (!background.parse("#FFFF99")) + error("can't parse color"); + window.override_background_color(Gtk.StateFlags.NORMAL, background); } public void show(string qualified_method_name, string prototype, int method_pos) { @@ -190,15 +191,14 @@ class ProgressBarDialog : Gtk.Window { public ProgressBarDialog(Gtk.Window parent_win, string text) { bar = new Gtk.ProgressBar(); - Gtk.VBox vbox = new Gtk.VBox(true, 0); - Gtk.HBox hbox = new Gtk.HBox(true, 0); + Gtk.Box vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0); + Gtk.Box hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0); - bar.set_text(text); bar.set_size_request(226, 25); set_size_request(250, 49); vbox.pack_start(bar, true, false, 0); - hbox.pack_start(vbox, true, false, 0); + hbox.pack_start(vbox, true, false, 0); add(hbox); set_title(text); diff --git a/settings.vala b/settings.vala index 12175de..afadaee 100644 --- a/settings.vala +++ b/settings.vala @@ -22,6 +22,7 @@ class ProjectSettingsDialog : Object { Gtk.Label build_command_label = new Gtk.Label("Build command:"); build_entry = new Gtk.Entry(); build_entry.activate.connect(on_entry_activated); + build_entry.hexpand = true; Gtk.Alignment align_build_label = new Gtk.Alignment(0.0f, 0.5f, 0.0f, 0.0f); align_build_label.add(build_command_label); @@ -29,26 +30,23 @@ class ProjectSettingsDialog : Object { Gtk.Label clean_command_label = new Gtk.Label("Clean command:"); clean_entry = new Gtk.Entry(); clean_entry.activate.connect(on_entry_activated); + clean_entry.hexpand = true; Gtk.Alignment align_clean_label = new Gtk.Alignment(0.0f, 0.5f, 0.0f, 0.0f); align_clean_label.add(clean_command_label); - Gtk.Table table = new Gtk.Table(2, 2, false); - table.set_col_spacings(12); - table.set_row_spacings(6); + Gtk.Grid grid = new Gtk.Grid(); + grid.set_column_spacing(12); + grid.set_row_spacing(6); - table.attach(align_build_label, 0, 1, 0, 1, - Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 0, 0); - table.attach(align_clean_label, 0, 1, 1, 2, - Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 0, 0); - table.attach(build_entry, 1, 2, 0, 1, Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND, - Gtk.AttachOptions.FILL, 0, 0); - table.attach(clean_entry, 1, 2, 1, 2, Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND, - Gtk.AttachOptions.FILL, 0, 0); + grid.attach(align_build_label, 0, 0, 1, 1); + grid.attach(align_clean_label, 0, 1, 1, 1); + grid.attach(build_entry, 1, 0, 1, 1); + grid.attach(clean_entry, 1, 1, 1, 1); Gtk.Alignment alignment_box = new Gtk.Alignment(0.5f, 0.5f, 1.0f, 1.0f); alignment_box.set_padding(5, 6, 6, 5); - alignment_box.add(table); + alignment_box.add(grid); dialog = new Gtk.Dialog.with_buttons("Settings", parent_win, Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT, diff --git a/valencia.vala b/valencia.vala index 71c9b3b..4356c8c 100644 --- a/valencia.vala +++ b/valencia.vala @@ -259,7 +259,7 @@ public class Instance : Peas.ExtensionBase, Gedit.WindowActivatable { output_view.set_editable(false); output_view.set_cursor_visible(false); Pango.FontDescription font = Pango.FontDescription.from_string("Monospace"); - output_view.modify_font(font); + output_view.override_font(font); output_view.button_press_event.connect(on_button_press); output_pane = new Gtk.ScrolledWindow(null, null); ++++++ valencia-vala-0.18.patch ++++++ Index: valencia-0.3.0/Makefile =================================================================== --- valencia-0.3.0.orig/Makefile +++ valencia-0.3.0/Makefile @@ -9,14 +9,14 @@ SOURCES = autocomplete.vala browser.vala scanner.vala settings.vala util.vala valencia.vala PACKAGES = --pkg gedit --pkg gee-1.0 --pkg gtk+-3.0 --pkg gtksourceview-3.0 \ - --pkg libpeas-1.0 --pkg libvala-0.16 --pkg vte-2.90 + --pkg libpeas-1.0 --pkg libvala-0.18 --pkg vte-2.90 PACKAGE_VERSIONS = \ gedit >= 2.91.0 \ gee-1.0 >= 0.1.3 \ gtksourceview-3.0 >= 3.0.0 \ gtk+-3.0 >= 3.0.0 \ - libvala-0.16 >= 0.15.0 \ + libvala-0.18 >= 0.17.0 \ vte-2.90 >= 0.27.90 OUTPUTS = libvalencia.so valencia.plugin Index: valencia-0.3.0/valencia.vala =================================================================== --- valencia-0.3.0.orig/valencia.vala +++ valencia-0.3.0/valencia.vala @@ -1280,7 +1280,7 @@ public class Instance : Peas.ExtensionBa } void on_run_child_exit() { - run_terminal.feed("\r\nThe program exited.\r\n", -1); + run_terminal.feed("\r\nThe program exited.\r\n".data); child_process_running = false; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
