Hello community, here is the log from the commit of package giggle for openSUSE:Factory checked in at 2014-10-11 19:26:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/giggle (Old) and /work/SRC/openSUSE:Factory/.giggle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "giggle" Changes: -------- --- /work/SRC/openSUSE:Factory/giggle/giggle.changes 2013-04-19 09:44:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.giggle.new/giggle.changes 2014-10-11 19:28:39.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Oct 10 18:22:13 UTC 2014 - zai...@opensuse.org + +- Add giggle-vte-2.91.patch: Fix build with vte-2.91 +- Replace pkgconfig(vte-2.90) for pkgconfig(vte-2.91), due to above + patch. + +------------------------------------------------------------------- New: ---- giggle-vte-2.91.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ giggle.spec ++++++ --- /var/tmp/diff_new_pack.rzg5lE/_old 2014-10-11 19:28:40.000000000 +0200 +++ /var/tmp/diff_new_pack.rzg5lE/_new 2014-10-11 19:28:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package giggle # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -26,6 +26,8 @@ Source: http://ftp.acc.umu.se/pub/GNOME/sources/giggle/0.7/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM giggle-gtksourceview38.patch bgo#697220 dims...@opensuse.org -- Fix build against gtksourceview 3.8 Patch0: giggle-gtksourceview38.patch +# PATCH-FIX-UPSTREAM giggle-vte-2.91.patch zai...@opensuse.org -- Fix build with vte-2.91. Patch from archlinux. +Patch1: giggle-vte-2.91.patch BuildRequires: gettext >= 0.18.1 BuildRequires: git-core >= 1.5 BuildRequires: intltool @@ -35,7 +37,7 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.30 BuildRequires: pkgconfig(gtk+-3.0) >= 3.0 BuildRequires: pkgconfig(gtksourceview-3.0) >= 3.0 -BuildRequires: pkgconfig(vte-2.90) >= 0.26 +BuildRequires: pkgconfig(vte-2.91) >= 0.26 Recommends: %{name}-lang Requires: git-core >= 1.5 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -65,6 +67,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 translation-update-upstream po giggle %build ++++++ giggle-vte-2.91.patch ++++++ diff -u -r giggle-0.7/configure.ac giggle-0.7-vte2.91/configure.ac --- giggle-0.7/configure.ac 2012-11-01 06:29:01.000000000 +0100 +++ giggle-0.7-vte2.91/configure.ac 2014-09-28 23:31:40.389429740 +0200 @@ -56,7 +56,7 @@ GTK_REQUIRED_VERSION=3.3.12 GTKSOURCE_REQUIRED_VERSION=3.0 EDS_REQUIRED_VERSION=3.2 -VTE_REQUIRED_VERSION=0.28 +VTE_REQUIRED_VERSION=0.38 PKG_CHECK_MODULES(GIGGLE, [ @@ -109,7 +109,7 @@ AS_IF([test "x$enable_terminal" = "xyes"], [ PKG_CHECK_MODULES([VTE], - [vte-2.90 >= $VTE_REQUIRED_VERSION], + [vte-2.91 >= $VTE_REQUIRED_VERSION], [have_vte=yes AC_DEFINE([HAVE_VTE], [1], [Use features from vte]) diff -u -r giggle-0.7/plugins/giggle-view-terminal.c giggle-0.7-vte2.91/plugins/giggle-view-terminal.c --- giggle-0.7/plugins/giggle-view-terminal.c 2012-11-01 06:29:01.000000000 +0100 +++ giggle-0.7-vte2.91/plugins/giggle-view-terminal.c 2014-09-28 23:46:07.965686517 +0200 @@ -186,15 +186,16 @@ real_argv[1] = NULL; spawn_flags = G_SPAWN_CHILD_INHERITS_STDIN | G_SPAWN_SEARCH_PATH | G_SPAWN_FILE_AND_ARGV_ZERO; - succes = vte_terminal_fork_command_full (VTE_TERMINAL (terminal), - pty_flags, - directory, - real_argv, - NULL, - spawn_flags, - NULL, NULL, - NULL, - &error); + succes = vte_terminal_spawn_sync (VTE_TERMINAL (terminal), + pty_flags, + directory, + real_argv, + NULL, + spawn_flags, + NULL, NULL, + NULL, + NULL, + &error); g_strfreev (real_argv); if (succes == FALSE) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
