commit valencia for openSUSE:Factory
Hello community,
here is the log from the commit of package valencia for openSUSE:Factory
checked in at 2013-08-27 21:12:30
Comparing /work/SRC/openSUSE:Factory/valencia (Old)
and /work/SRC/openSUSE:Factory/.valencia.new (New)
Package is valencia
Changes:
--- /work/SRC/openSUSE:Factory/valencia/valencia.changes2013-04-08
14:59:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.valencia.new/valencia.changes 2013-08-27
21:22:43.0 +0200
@@ -1,0 +2,7 @@
+Sun Aug 25 21:16:59 UTC 2013 - zai...@opensuse.org
+
+- Adapt valencia-vala-0_20.patch to allow building with vala 0.22.
+- Exchange pkgconfig(libvala-0.20) for pkgconfig(libvala-0.22)
+ BuildRequires.
+
+---
Other differences:
--
++ valencia.spec ++
--- /var/tmp/diff_new_pack.JARsms/_old 2013-08-27 21:22:43.0 +0200
+++ /var/tmp/diff_new_pack.JARsms/_new 2013-08-27 21:22:43.0 +0200
@@ -46,7 +46,7 @@
BuildRequires: pkgconfig(gee-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(gtksourceview-3.0)
-BuildRequires: pkgconfig(libvala-0.20)
+BuildRequires: pkgconfig(libvala-0.22)
BuildRequires: pkgconfig(vte-2.90)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++ valencia-vala-0_20.patch ++
--- /var/tmp/diff_new_pack.JARsms/_old 2013-08-27 21:22:43.0 +0200
+++ /var/tmp/diff_new_pack.JARsms/_new 2013-08-27 21:22:43.0 +0200
@@ -6,14 +6,14 @@
VALAC_VERSION := `$(VALAC) --version | awk '{print $$2}'`
MIN_VALAC_VERSION := 0.17.1
-MAX_VALAC_VERSION := 0.19.0
-+MAX_VALAC_VERSION := 0.21.0
++MAX_VALAC_VERSION := 0.23.0
SOURCES = autocomplete.vala browser.vala expression.vala gtk_util.vala
parser.vala program.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.18 --pkg vte-2.90
-+ --pkg libpeas-1.0 --pkg libvala-0.20 --pkg vte-2.90
++ --pkg libpeas-1.0 --pkg libvala-0.22 --pkg vte-2.90
PACKAGE_VERSIONS = \
gedit = 2.91.0 \
@@ -21,7 +21,7 @@
gtksourceview-3.0 = 3.0.0 \
gtk+-3.0 = 3.0.0 \
-libvala-0.18 = 0.17.1 \
-+libvala-0.20 = 0.17.1 \
++libvala-0.22 = 0.17.1 \
vte-2.90 = 0.27.90
OUTPUTS = libvalencia.so valencia.plugin
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit valencia for openSUSE:Factory
Hello community,
here is the log from the commit of package valencia for openSUSE:Factory
checked in at 2013-04-08 14:59:30
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.changes2012-10-31
07:04:14.0 +0100
+++ /work/SRC/openSUSE:Factory/.valencia.new/valencia.changes 2013-04-08
14:59:31.0 +0200
@@ -1,0 +2,18 @@
+Sat Apr 6 16:37:20 UTC 2013 - dims...@opensuse.org
+
+- Update to version 0.4.0:
+ + Improved parsing.
+ + Many, many bugs fixed.
+ + Updated to run on GTK+3 / gedit-3.
+ + Updated to compile with latest version of Vala (0.17.1 to
+0.18.1 required).
+- Add valencia-gedit-3_7.patch: Fix building against gedit 3.7.
+- Add valencia-vala-0_20.patch: Allow building with vala 0.20.
+- Drop no longer needed patches:
+ + valencia-vala-0.16.patch
+ + valencia-vala-0.18.patch
+ + valencia-fix-build.patch
+ + valencia-gedit3.patch
+ + valencia-gtk36.patch
+
+---
Old:
valencia-0.3.0.tar.bz2
valencia-fix-build.patch
valencia-gedit3.patch
valencia-gtk36.patch
valencia-vala-0.16.patch
valencia-vala-0.18.patch
New:
valencia-0.4.0.tar.xz
valencia-gedit-3_7.patch
valencia-vala-0_20.patch
Other differences:
--
++ valencia.spec ++
--- /var/tmp/diff_new_pack.y0WEcw/_old 2013-04-08 14:59:39.0 +0200
+++ /var/tmp/diff_new_pack.y0WEcw/_new 2013-04-08 14:59:39.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package valencia
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,10 +24,10 @@
Name: valencia
%if 0%{?favor_gtk2}
-Version:0.3.0
+Version:0.4.0
Release:0
%else
-Version:0.3.0_git20110905
+Version:0.4.0
Release:0
%endif
%define _version 0.3.0
@@ -35,48 +35,19 @@
License:LGPL-2.1+
Group: Development/Tools/IDE
Url:http://yorba.org/valencia/
-Source: %{name}-%{_version}.tar.bz2
-# PATCH-FIX-UPSTREAM valencia-fix-build.patch vu...@opensuse.org -- Fix build,
taken from svn
-Patch0: valencia-fix-build.patch
-# PATCH-FIX-UPSTREAM valencia-gedit3.patch vu...@opensuse.org -- Build against
GNOME 3, taken from git (gedit-3 branch, up to 80815271)
-Patch1: valencia-gedit3.patch
-# PATCH-FIX-UPSTREAM valencia-vala-0.16.patch vu...@opensuse.org -- 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 dims...@opensuse.org -- 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 dims...@opensuse.org -- Fix build
with gtk+ 3.6, taken from git 97087fc
-Patch4: valencia-gtk36.patch
+Source:
http://yorba.org/download/valencia/0.4/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM valencia-vala-0_20.patch
http://redmine.yorba.org/issues/6505 dims...@opensuse.org -- Allow building
with Vala 0.20
+Patch0: valencia-vala-0_20.patch
+# PATCH-FIX-UPSTREAM valencia-gedit-3_7.patch
http://redmine.yorba.org/issues/6505 dims...@opensuse.org -- Fix build with
gedit = 3.7.2
+Patch1: valencia-gedit-3_7.patch
+BuildRequires: update-desktop-files
+BuildRequires: vala
+BuildRequires: pkgconfig(gedit) = 3.7.2
BuildRequires: pkgconfig(gee-1.0)
-%if 0%{?favor_gtk2}
-BuildRequires: pkgconfig(gedit-2.20)
-BuildRequires: pkgconfig(gtk+-2.0)
-%if 0%{?suse_version} = 1130
-BuildRequires: pkgconfig(vala-1.0)
-%else
-BuildRequires: pkgconfig(vala-0.10)
-%endif
-BuildRequires: pkgconfig(vte)
-%else
-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
-%if 0%{?suse_version} 1140
-BuildRequires: pkgconfig(libvala-0.14)
-%else
-BuildRequires: pkgconfig(libvala-0.12)
-%endif
-%endif
-%endif
+BuildRequires: pkgconfig(libvala-0.20)
BuildRequires: pkgconfig(vte-2.90)
-%endif
-BuildRequires: update-desktop-files
-BuildRequires: vala
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -89,8 +60,8 @@
%package -n gedit-plugin-valencia
commit valencia for openSUSE:Factory
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.changes2012-01-20
20:27:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.valencia.new/valencia.changes 2012-10-31
07:04:14.0 +0100
@@ -1,0 +2,10 @@
+Tue Oct 23 17:24:39 UTC 2012 - dims...@opensuse.org
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.SIfy6t/_new 2012-10-31 07:04:15.0 +0100
@@ -42,6 +42,10 @@
Patch1: valencia-gedit3.patch
# PATCH-FIX-UPSTREAM valencia-vala-0.16.patch vu...@opensuse.org -- 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 dims...@opensuse.org -- 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 dims...@opensuse.org -- 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(#99, out background);
-window.modify_bg(Gtk.StateType.NORMAL, background);
+Gdk.RGBA background = Gdk.RGBA();
+if (!background.parse(#99))
+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);
commit valencia for openSUSE:Factory
Hello community,
here is the log from the commit of package valencia for openSUSE:Factory
checked in at 2012-01-20 20:25:50
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.changes2011-09-23
12:49:42.0 +0200
+++ /work/SRC/openSUSE:Factory/.valencia.new/valencia.changes 2012-01-20
20:27:27.0 +0100
@@ -1,0 +2,12 @@
+Thu Jan 19 14:07:10 UTC 2012 - vu...@opensuse.org
+
+- Fix build with vala 0.16:
+ + Add valencia-vala-0.16.patch: fixes from git.
+ + On Factory/12.2 or later, use pkgconfig(libvala-0.16)
+BuildRequires, instead of using an earlier version.
+ + Only apply this patch on Factory/12.2 or later, where we have
+vala 0.15/0.16.
+ + Change the sed hack for vala 0.14 support in %prep to only be
+used for 12.1.
+
+---
New:
valencia-vala-0.16.patch
Other differences:
--
++ valencia.spec ++
--- /var/tmp/diff_new_pack.1hke4p/_old 2012-01-20 20:27:41.0 +0100
+++ /var/tmp/diff_new_pack.1hke4p/_new 2012-01-20 20:27:41.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package valencia
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,21 +25,23 @@
Name: valencia
%if 0%{?favor_gtk2}
Version:0.3.0
-Release:11
+Release:0
%else
Version:0.3.0_git20110905
-Release:11
+Release:0
%endif
%define _version 0.3.0
-License:LGPL-2.1+
Summary:GEdit plugin to use GEdit as a lightweight IDE for Vala
-Url:http://yorba.org/valencia/
+License:LGPL-2.1+
Group: Development/Tools/IDE
+Url:http://yorba.org/valencia/
Source: %{name}-%{_version}.tar.bz2
# PATCH-FIX-UPSTREAM valencia-fix-build.patch vu...@opensuse.org -- Fix build,
taken from svn
Patch0: valencia-fix-build.patch
# PATCH-FIX-UPSTREAM valencia-gedit3.patch vu...@opensuse.org -- Build against
GNOME 3, taken from git (gedit-3 branch, up to 80815271)
Patch1: valencia-gedit3.patch
+# PATCH-FIX-UPSTREAM valencia-vala-0.16.patch vu...@opensuse.org -- Build
against vala 0.15/0.16, taken from git (master branch, from 80815271 up to
d6504e0c)
+Patch2: valencia-vala-0.16.patch
BuildRequires: pkgconfig(gee-1.0)
%if 0%{?favor_gtk2}
BuildRequires: pkgconfig(gedit-2.20)
@@ -54,10 +56,14 @@
BuildRequires: pkgconfig(gedit)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(gtksourceview-3.0)
-%if 0%{?suse_version} = 1140
-BuildRequires: pkgconfig(libvala-0.12)
+%if 0%{?suse_version} 1210
+BuildRequires: pkgconfig(libvala-0.16)
%else
+%if 0%{?suse_version} 1140
BuildRequires: pkgconfig(libvala-0.14)
+%else
+BuildRequires: pkgconfig(libvala-0.12)
+%endif
%endif
BuildRequires: pkgconfig(vte-2.90)
%endif
@@ -73,7 +79,6 @@
suggestions by invoking autocomplete in the appropriate context.
%package -n gedit-plugin-valencia
-License:LGPL-2.1+
Summary:GEdit plugin to use GEdit as a lightweight IDE for Vala
Group: Development/Tools/IDE
Provides: %{name} = %{version}
@@ -97,10 +102,13 @@
%patch0 -p3
%else
%patch1 -p1
-%if ! 0%{?suse_version} = 1140
+%if 0%{?suse_version} == 1210
grep -q libvala-0.12 Makefile
sed -i s/libvala-0.12/libvala-0.14/g Makefile
%endif
+%if 0%{?suse_version} 1210
+%patch2 -p1
+%endif
%endif
%build
++ valencia-vala-0.16.patch ++
1467 lines (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit valencia for openSUSE:Factory
Hello community,
here is the log from the commit of package valencia for openSUSE:Factory
checked in at 2011-12-06 19:11:15
Comparing /work/SRC/openSUSE:Factory/valencia (Old)
and /work/SRC/openSUSE:Factory/.valencia.new (New)
Package is valencia, Maintainer is
Changes:
Other differences:
--
++ valencia.spec ++
--- /var/tmp/diff_new_pack.clMtU0/_old 2011-12-06 19:45:43.0 +0100
+++ /var/tmp/diff_new_pack.clMtU0/_new 2011-12-06 19:45:43.0 +0100
@@ -31,7 +31,7 @@
Release:11
%endif
%define _version 0.3.0
-License:LGPLv2.1+
+License:LGPL-2.1+
Summary:GEdit plugin to use GEdit as a lightweight IDE for Vala
Url:http://yorba.org/valencia/
Group: Development/Tools/IDE
@@ -73,7 +73,7 @@
suggestions by invoking autocomplete in the appropriate context.
%package -n gedit-plugin-valencia
-License:LGPLv2.1+
+License:LGPL-2.1+
Summary:GEdit plugin to use GEdit as a lightweight IDE for Vala
Group: Development/Tools/IDE
Provides: %{name} = %{version}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit valencia for openSUSE:Factory
Hello community, here is the log from the commit of package valencia for openSUSE:Factory checked in at Mon Sep 19 18:06:53 CEST 2011. --- GNOME/valencia/valencia.changes 2011-09-05 13:27:27.0 +0200 +++ valencia/valencia.changes 2011-09-19 12:18:20.0 +0200 @@ -1,0 +2,6 @@ +Mon Sep 19 10:17:48 UTC 2011 - vu...@opensuse.org + +- Fix automatic change that broke spec file: Release was missing + when favor_gtk2 is not true. + +--- Package does not exist at destination yet. Using Fallback GNOME/valencia Destination is valencia calling whatdependson for head-i586 Other differences: -- ++ valencia.spec ++ --- /var/tmp/diff_new_pack.KmQKq9/_old 2011-09-19 18:06:49.0 +0200 +++ /var/tmp/diff_new_pack.KmQKq9/_new 2011-09-19 18:06:49.0 +0200 @@ -28,7 +28,7 @@ Release:11 %else Version:0.3.0_git20110905 - +Release:11 %endif %define _version 0.3.0 License:LGPLv2.1+ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit valencia for openSUSE:Factory
Hello community,
here is the log from the commit of package valencia for openSUSE:Factory
checked in at Fri Sep 9 11:56:53 CEST 2011.
--- GNOME/valencia/valencia.changes 2011-02-12 20:27:47.0 +0100
+++ /mounts/work_src_done/STABLE/valencia/valencia.changes 2011-09-05
13:27:27.0 +0200
@@ -1,0 +2,16 @@
+Mon Sep 5 11:08:01 UTC 2011 - vu...@opensuse.org
+
+- Fix build against GNOME 3:
+ + Use favor_gtk2 to switch between gtk2 and gtk3 builds.
+ + Add valencia-gedit3.patch: build against GNOME 3, taken from
+git.
+ + Replace GNOME 2 pkgconfig() BuildRequires with GNOME 3
+pkgconfig() BuildRequires:
+ - Old: gedit-2.20, gtk+-2.0, vala-1.0/vala-0.10, vte
+ - New: gedit, gtk+-3.0, gtksourceview-3.0,
+ libvala-0.12/libvala-0.14, vte-2.90
+ + Add sed hack to use libvala-0.14 instead of libvala-0.12 on
+12.1 and later.
+ + Install files in the right directory for gedit plugins.
+
+---
calling whatdependson for head-i586
New:
valencia-gedit3.patch
Other differences:
--
++ valencia.spec ++
--- /var/tmp/diff_new_pack.hDYKTL/_old 2011-09-09 11:56:45.0 +0200
+++ /var/tmp/diff_new_pack.hDYKTL/_new 2011-09-09 11:56:45.0 +0200
@@ -16,19 +16,33 @@
#
+%if 0%{?favor_gtk2}
+%define gedit_plugindir %{_libdir}/gedit-2/plugins
+%else
+%define gedit_plugindir %{_libdir}/gedit/plugins
+%endif
Name: valencia
+%if 0%{?favor_gtk2}
Version:0.3.0
-Release:5
+Release:11
+%else
+Version:0.3.0_git20110905
+
+%endif
+%define _version 0.3.0
License:LGPLv2.1+
Summary:GEdit plugin to use GEdit as a lightweight IDE for Vala
Url:http://yorba.org/valencia/
Group: Development/Tools/IDE
-Source: %{name}-%{version}.tar.bz2
+Source: %{name}-%{_version}.tar.bz2
# PATCH-FIX-UPSTREAM valencia-fix-build.patch vu...@opensuse.org -- Fix build,
taken from svn
Patch0: valencia-fix-build.patch
-BuildRequires: pkgconfig(gedit-2.20)
+# PATCH-FIX-UPSTREAM valencia-gedit3.patch vu...@opensuse.org -- Build against
GNOME 3, taken from git (gedit-3 branch, up to 80815271)
+Patch1: valencia-gedit3.patch
BuildRequires: pkgconfig(gee-1.0)
+%if 0%{?favor_gtk2}
+BuildRequires: pkgconfig(gedit-2.20)
BuildRequires: pkgconfig(gtk+-2.0)
%if 0%{?suse_version} = 1130
BuildRequires: pkgconfig(vala-1.0)
@@ -36,6 +50,17 @@
BuildRequires: pkgconfig(vala-0.10)
%endif
BuildRequires: pkgconfig(vte)
+%else
+BuildRequires: pkgconfig(gedit)
+BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(gtksourceview-3.0)
+%if 0%{?suse_version} = 1140
+BuildRequires: pkgconfig(libvala-0.12)
+%else
+BuildRequires: pkgconfig(libvala-0.14)
+%endif
+BuildRequires: pkgconfig(vte-2.90)
+%endif
BuildRequires: vala
BuildRequires: update-desktop-files
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -62,21 +87,29 @@
suggestions by invoking autocomplete in the appropriate context.
%prep
-%setup -q
-%if ! 0%{?suse_version} = 1130
+%setup -q -n %{name}-%{_version}
+%if 0%{?favor_gtk2}
+%if 0%{?suse_version} 1130
# vala-1.0 is now vala-0.10 = remove hack when fixed in new upstream version
(build will fail)
grep -q vala-1.0 Makefile
sed -i s/vala-1.0/vala-0.10/g Makefile
%endif
%patch0 -p3
+%else
+%patch1 -p1
+%if ! 0%{?suse_version} = 1140
+grep -q libvala-0.12 Makefile
+sed -i s/libvala-0.12/libvala-0.14/g Makefile
+%endif
+%endif
%build
export CFLAGS=%{optflags}
%__make %{?jobs:-j%{jobs}}
%install
-install -D libvalencia.so %{buildroot}%{_libdir}/gedit-2/plugins/libvalencia.so
-install -D valencia.gedit-plugin
%{buildroot}%{_libdir}/gedit-2/plugins/valencia.gedit-plugin
+install -D libvalencia.so %{buildroot}%{gedit_plugindir}/libvalencia.so
+install -D valencia.gedit-plugin
%{buildroot}%{gedit_plugindir}/valencia.gedit-plugin
install -D valencia.png
%{buildroot}%{_datadir}/icons/hicolor/128x128/apps/valencia.png
%clean
@@ -97,8 +130,8 @@
%files -n gedit-plugin-valencia
%defattr(-,root,root)
%doc AUTHORS COPYING NEWS README THANKS
-%{_libdir}/gedit-2/plugins/libvalencia.so
-%{_libdir}/gedit-2/plugins/valencia.gedit-plugin
+%{gedit_plugindir}/libvalencia.so
+%{gedit_plugindir}/valencia.gedit-plugin
%{_datadir}/icons/hicolor/128x128/apps/valencia.png
%changelog
++ valencia-gedit3.patch ++
3279 lines (skipped)
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
