Hello community,
here is the log from the commit of package gnome-terminal for openSUSE:Factory
checked in at 2014-07-06 22:52:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-terminal (Old)
and /work/SRC/openSUSE:Factory/.gnome-terminal.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-terminal"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-terminal/gnome-terminal.changes
2014-05-20 14:25:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gnome-terminal.new/gnome-terminal.changes
2014-07-06 22:52:59.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Jun 30 21:47:14 UTC 2014 - zai...@opensuse.org
+
+- Update to version 3.12.3:
+ + Important bug fixes.
+ + Bug fixes.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
gnome-terminal-3.12.2.tar.xz
New:
----
gnome-terminal-3.12.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-terminal.spec ++++++
--- /var/tmp/diff_new_pack.oyiNzW/_old 2014-07-06 22:53:02.000000000 +0200
+++ /var/tmp/diff_new_pack.oyiNzW/_new 2014-07-06 22:53:02.000000000 +0200
@@ -17,7 +17,7 @@
Name: gnome-terminal
-Version: 3.12.2
+Version: 3.12.3
Release: 0
Summary: GNOME Terminal
License: GPL-3.0+ and LGPL-2.1+
@@ -42,7 +42,7 @@
BuildRequires: pkgconfig(gtk+-3.0) >= 3.9.9
BuildRequires: pkgconfig(libnautilus-extension) >= 3.0.0
BuildRequires: pkgconfig(uuid)
-BuildRequires: pkgconfig(vte-2.90) >= 0.36.0
+BuildRequires: pkgconfig(vte-2.90) >= 0.36.3
BuildRequires: pkgconfig(x11)
Recommends: %{name}-lang
Obsoletes: gnome-core
++++++ gnome-terminal-3.12.2.tar.xz -> gnome-terminal-3.12.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-terminal-3.12.2/ChangeLog
new/gnome-terminal-3.12.3/ChangeLog
--- old/gnome-terminal-3.12.2/ChangeLog 2014-05-12 20:43:07.000000000 +0200
+++ new/gnome-terminal-3.12.3/ChangeLog 2014-06-23 19:58:54.000000000 +0200
@@ -1,3 +1,141 @@
+commit f56823b0419b5ee2bf23b3d7b91f02c99ab1d0e3
+Author: Christian Persch <c...@gnome.org>
+Date: Mon Jun 23 19:56:00 2014 +0200
+
+ Version 3.12.3
+
+ NEWS | 11 +++++++++++
+ configure.ac | 2 +-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+commit 44059da4e216250b75fa90f6d0e65fd4aa4eab14
+Author: Egmont Koblinger <egm...@gmail.com>
+Date: Sun Jun 22 14:40:04 2014 +0200
+
+ app: Fix the close button after drag-n-drop
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=731998
+ (cherry picked from commit c4b333658f275b908eb85ce2d6d5a30de221a30c)
+
+ src/terminal-notebook.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+commit 2e5eeb62e7e71902916c65f612da93e2bf3f3088
+Author: Christian Persch <c...@gnome.org>
+Date: Sun Jun 22 14:38:40 2014 +0200
+
+ server: Use specific exit codes for specific error
+
+ This will make it easier to identify which error occurred when all the
client gets
+ is the exit code in the error message:
+
+ Error constructing proxy for
org.gnome.Terminal:/org/gnome/Terminal/Factory0: Error calling
StartServiceByName for org.gnome.Terminal:
GDBus.Error:org.freedesktop.DBus.Error.Spawn.ChildExited: Process
org.gnome.Terminal exited with status 1
+
+ (cherry picked from commit 4f746f763142f222f03ff575c336b4196e2a5ad4)
+
+ src/server.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+commit 887a6013468959f966e60bfc6303ef858194b232
+Author: Egmont Koblinger <egm...@gmail.com>
+Date: Fri Jun 20 16:57:44 2014 +0200
+
+ app: Make dropped tab active
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=730936
+ (cherry picked from commit abb2018a702adfc57831aea9ebb5c513b9c8bbbd)
+
+ src/terminal-window.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 1fda7a5659fb77a635d093546174e9c703ee2ac3
+Author: Egmont Koblinger <egm...@gmail.com>
+Date: Thu May 29 12:42:01 2014 +0200
+
+ app: Fix window size when a second tab is added by drag-n-drop
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=730850
+ (cherry picked from commit d3e593e4974303618305da4e0d20f0d5c10f83b0)
+
+ src/terminal-window.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+commit 1d71f91712cf338a8c1fbef9593bb147f47dd01e
+Author: Egmont Koblinger <egm...@gmail.com>
+Date: Mon Jun 2 23:49:21 2014 +0200
+
+ build: Resolve git merge conflict
+
+ src/terminal-app.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+commit f8713e156f9398fca1aecf9c00c20c0dcc69ac70
+Author: Egmont Koblinger <egm...@gmail.com>
+Date: Fri May 30 15:11:45 2014 +0200
+
+ app: Don't change the title on tab labels that no longer exist (take 2)
+
+ This fixes a potential crash when a tab is moved to another window,
+ and later the title of that terminal changes.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=730389
+ (cherry picked from commit f65261a0b5d03658be3acb439976fd8af6fa28ea)
+
+ src/terminal-tab-label.c | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+commit 9cfd123e8d2f9575299285afd95a5fa2eea51d1e
+Author: Christian Persch <c...@gnome.org>
+Date: Thu May 29 14:12:34 2014 +0200
+
+ Revert "app: Don't change the title on tab labels that no longer exist"
+
+ This reverts commit e2824de3fc3696dd14752501f15c484a3b398ff8.
+
+ src/terminal-tab-label.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+commit 438e70b61e0d01a3952b960392b9f567e2de6c9b
+Author: Christian Persch <c...@gnome.org>
+Date: Tue May 20 16:04:15 2014 +0200
+
+ app: Only allow valid charsets
+
+ Charsets must be [-_A-Za-z0-9] only.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=730390
+ (cherry picked from commit b0bdd4740f82daa6c2bb020738a857b8e8d2a6dd)
+
+ Conflicts:
+ src/terminal-app.c
+
+ src/terminal-app.c | 23 ++++++++++++++++++++++-
+ 1 file changed, 22 insertions(+), 1 deletion(-)
+
+commit e2824de3fc3696dd14752501f15c484a3b398ff8
+Author: Egmont Koblinger <egm...@gmail.com>
+Date: Wed May 28 12:16:41 2014 +0200
+
+ app: Don't change the title on tab labels that no longer exist
+
+ This fixes a potential crash when a tab is moved to another window,
+ and later the title of that terminal changes.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=730389
+ (cherry picked from commit 6c1ece7dab2a11b7e0c6561f89cf83510abb51bf)
+
+ src/terminal-tab-label.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 427d805b869b6e449d19c1a7b069e09055c885b0
+Author: Christian Persch <c...@gnome.org>
+Date: Mon May 12 20:49:43 2014 +0200
+
+ Post release version bump
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
commit 5d8544063ef3c37c9580f4fa2144e7549e699d77
Author: Carles Ferrando <carles.ferra...@gmail.com>
Date: Fri May 9 00:23:47 2014 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-terminal-3.12.2/Makefile.in
new/gnome-terminal-3.12.3/Makefile.in
--- old/gnome-terminal-3.12.2/Makefile.in 2014-05-12 20:40:55.000000000
+0200
+++ new/gnome-terminal-3.12.3/Makefile.in 2014-06-23 19:56:23.000000000
+0200
@@ -82,13 +82,14 @@
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/config.h.in $(srcdir)/gnome-terminal.desktop.in.in \
- AUTHORS COPYING ChangeLog NEWS config.guess config.sub \
+ AUTHORS COPYING ChangeLog NEWS config.guess config.sub depcomp \
install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-terminal-3.12.2/NEWS
new/gnome-terminal-3.12.3/NEWS
--- old/gnome-terminal-3.12.2/NEWS 2014-05-12 20:40:32.000000000 +0200
+++ new/gnome-terminal-3.12.3/NEWS 2014-06-23 19:55:52.000000000 +0200
@@ -1,3 +1,14 @@
+3.12.3
+======
+* Important bug fixes
+* Bug fixes
+* Translation updates
+
+3.12.2
+======
+* Bug fixes
+* Translation updates
+
3.12.1
======
* Fix shortcut key disabling (#728121)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-terminal-3.12.2/aclocal.m4
new/gnome-terminal-3.12.3/aclocal.m4
--- old/gnome-terminal-3.12.2/aclocal.m4 2014-05-12 20:40:51.000000000
+0200
+++ new/gnome-terminal-3.12.3/aclocal.m4 2014-06-23 19:56:20.000000000
+0200
@@ -1073,221 +1073,6 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 42 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
-
-case "$am__api_version" in
- 1.[01234])
- AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
- ;;
- *)
- ;;
-esac
-
-INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2
* 100 + $ 3; }'`
-INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{
print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-if test -n "$1"; then
- AC_MSG_CHECKING([for intltool >= $1])
- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge
"$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or
later.])
-fi
-
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z
"$INTLTOOL_EXTRACT"; then
- AC_MSG_ERROR([The intltool scripts were not found. Please install
intltool.])
-fi
-
-if test -z "$AM_DEFAULT_VERBOSITY"; then
- AM_DEFAULT_VERBOSITY=1
-fi
-AC_SUBST([AM_DEFAULT_VERBOSITY])
-
-INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
-INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
-INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;'
-AC_SUBST(INTLTOOL_V_MERGE)
-AC_SUBST(INTLTOOL__v_MERGE_)
-AC_SUBST(INTLTOOL__v_MERGE_0)
-
-INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
-intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
-intltool__v_merge_options_0='-q'
-AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
-AC_SUBST(intltool__v_merge_options_)
-AC_SUBST(intltool__v_merge_options_0)
-
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE)
; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x
-u --no-translations $< [$]@'
-else
- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE)
; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir
[$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x
-u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
-fi
- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
- AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
- AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
- IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
- AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
- AC_MSG_CHECKING([for XML::Parser])
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
- AC_MSG_RESULT([ok])
- else
- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
- fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[]],
- [[extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr]])],
- [DATADIRNAME=share],
- [case $host in
- *-*-solaris*)
- dnl On Solaris, if bind_textdomain_codeset is in libc,
- dnl GNU format message catalog is always supported,
- dnl since both are added to the libc all together.
- dnl Hence, we'd like to go with DATADIRNAME=share
- dnl in this case.
- AC_CHECK_FUNC(bind_textdomain_codeset,
- [DATADIRNAME=share], [DATADIRNAME=lib])
- ;;
- *)
- [DATADIRNAME=lib]
- ;;
- esac])
-fi
-AC_SUBST(DATADIRNAME)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be executed at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
- AC_CONFIG_COMMANDS([$1/stamp-it], [
- if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
- AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
- fi
- rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
- >"$1/stamp-it.tmp"
- [sed '/^#/d
- s/^[[].*] *//
- /^[ ]*$/d
- '"s|^| $ac_top_srcdir/|" \
- "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
- ]
- [sed '/^POTFILES =/,/[^\\]$/ {
- /^POTFILES =/!d
- r $1/POTFILES
- }
- ' "$1/Makefile.in" >"$1/Makefile"]
- rm -f "$1/Makefile.tmp"
- mv "$1/stamp-it.tmp" "$1/stamp-it"
- ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
-
# nls.m4 serial 5 (gettext-0.18)
dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
dnl Inc.
@@ -2311,6 +2096,7 @@
m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])])
])
+m4_include([m4/intltool.m4])
m4_include([m4/libtool.m4])
m4_include([m4/ltoptions.m4])
m4_include([m4/ltsugar.m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-terminal-3.12.2/configure
new/gnome-terminal-3.12.3/configure
--- old/gnome-terminal-3.12.2/configure 2014-05-12 20:40:52.000000000 +0200
+++ new/gnome-terminal-3.12.3/configure 2014-06-23 19:56:24.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GNOME Terminal 3.12.2.
+# Generated by GNU Autoconf 2.69 for GNOME Terminal 3.12.3.
#
# Report bugs to
<http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-terminal>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='GNOME Terminal'
PACKAGE_TARNAME='gnome-terminal'
-PACKAGE_VERSION='3.12.2'
-PACKAGE_STRING='GNOME Terminal 3.12.2'
+PACKAGE_VERSION='3.12.3'
+PACKAGE_STRING='GNOME Terminal 3.12.3'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-terminal'
PACKAGE_URL=''
@@ -1434,7 +1434,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GNOME Terminal 3.12.2 to adapt to many kinds of
systems.
+\`configure' configures GNOME Terminal 3.12.3 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1504,7 +1504,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNOME Terminal 3.12.2:";;
+ short | recursive ) echo "Configuration of GNOME Terminal 3.12.3:";;
esac
cat <<\_ACEOF
@@ -1660,7 +1660,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNOME Terminal configure 3.12.2
+GNOME Terminal configure 3.12.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2029,7 +2029,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNOME Terminal $as_me 3.12.2, which was
+It was created by GNOME Terminal $as_me 3.12.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2897,7 +2897,7 @@
# Define the identity of the package.
PACKAGE='gnome-terminal'
- VERSION='3.12.2'
+ VERSION='3.12.3'
cat >>confdefs.h <<_ACEOF
@@ -13107,7 +13107,7 @@
3.0) GTK_API_VERSION=3.0
GTK_REQUIRED=3.9.9
VTE_PC_VERSION=-2.90
- VTE_REQUIRED=0.36.1
+ VTE_REQUIRED=0.36.3
;;
esac
@@ -14653,7 +14653,7 @@
TERMINAL_MINOR_VERSION=12
-TERMINAL_MICRO_VERSION=2
+TERMINAL_MICRO_VERSION=3
TERMINAL_API_VERSION=0
@@ -15215,7 +15215,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNOME Terminal $as_me 3.12.2, which was
+This file was extended by GNOME Terminal $as_me 3.12.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15281,7 +15281,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GNOME Terminal config.status 3.12.2
+GNOME Terminal config.status 3.12.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-terminal-3.12.2/configure.ac
new/gnome-terminal-3.12.3/configure.ac
--- old/gnome-terminal-3.12.2/configure.ac 2014-05-12 20:40:32.000000000
+0200
+++ new/gnome-terminal-3.12.3/configure.ac 2014-06-23 19:54:44.000000000
+0200
@@ -1,6 +1,6 @@
m4_define([gt_version_major],[3])
m4_define([gt_version_minor],[12])
-m4_define([gt_version_micro],[2])
+m4_define([gt_version_micro],[3])
m4_define([gt_version_extra],[])
m4_define([gt_version],[gt_version_major().gt_version_minor().gt_version_micro()gt_version_extra])
@@ -56,7 +56,7 @@
3.0) GTK_API_VERSION=3.0
GTK_REQUIRED=3.9.9
VTE_PC_VERSION=-2.90
- VTE_REQUIRED=0.36.1
+ VTE_REQUIRED=0.36.3
;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-terminal-3.12.2/help/Makefile.in
new/gnome-terminal-3.12.3/help/Makefile.in
--- old/gnome-terminal-3.12.2/help/Makefile.in 2014-05-12 20:40:55.000000000
+0200
+++ new/gnome-terminal-3.12.3/help/Makefile.in 2014-06-23 19:56:23.000000000
+0200
@@ -80,10 +80,11 @@
subdir = help
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
Files old/gnome-terminal-3.12.2/help/hu/figures/gnome-terminal.png and
new/gnome-terminal-3.12.3/help/hu/figures/gnome-terminal.png differ
Files old/gnome-terminal-3.12.2/help/pt_BR/figures/gnome-terminal.png and
new/gnome-terminal-3.12.3/help/pt_BR/figures/gnome-terminal.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-terminal-3.12.2/m4/intltool.m4
new/gnome-terminal-3.12.3/m4/intltool.m4
--- old/gnome-terminal-3.12.2/m4/intltool.m4 1970-01-01 01:00:00.000000000
+0100
+++ new/gnome-terminal-3.12.3/m4/intltool.m4 2013-02-09 00:44:09.000000000
+0100
@@ -0,0 +1,237 @@
+## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
+## Copyright (C) 2001 Eazel, Inc.
+## Author: Maciej Stachowiak <m...@noisehavoc.org>
+## Kenneth Christiansen <kenn...@gnu.org>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+##
+## As a special exception to the GNU General Public License, if you
+## distribute this file as part of a program that contains a
+## configuration script generated by Autoconf, you may include it under
+## the same distribution terms that you use for the rest of that program.
+
+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+# serial 42 IT_PROG_INTLTOOL
+AC_DEFUN([IT_PROG_INTLTOOL], [
+AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_NLS])dnl
+
+case "$am__api_version" in
+ 1.[01234])
+ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+ ;;
+ *)
+ ;;
+esac
+
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2
* 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{
print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+if test -n "$1"; then
+ AC_MSG_CHECKING([for intltool >= $1])
+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge
"$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or
later.])
+fi
+
+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z
"$INTLTOOL_EXTRACT"; then
+ AC_MSG_ERROR([The intltool scripts were not found. Please install
intltool.])
+fi
+
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+ AM_DEFAULT_VERBOSITY=1
+fi
+AC_SUBST([AM_DEFAULT_VERBOSITY])
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;'
+AC_SUBST(INTLTOOL_V_MERGE)
+AC_SUBST(INTLTOOL__v_MERGE_)
+AC_SUBST(INTLTOOL__v_MERGE_0)
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
+AC_SUBST(intltool__v_merge_options_)
+AC_SUBST(intltool__v_merge_options_0)
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE)
; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x
-u --no-translations $< [$]@'
+else
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE)
; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir
[$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x
-u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
+fi
+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
+_IT_SUBST(INTLTOOL_KEYS_RULE)
+_IT_SUBST(INTLTOOL_PROP_RULE)
+_IT_SUBST(INTLTOOL_OAF_RULE)
+_IT_SUBST(INTLTOOL_PONG_RULE)
+_IT_SUBST(INTLTOOL_SERVER_RULE)
+_IT_SUBST(INTLTOOL_SHEET_RULE)
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
+_IT_SUBST(INTLTOOL_UI_RULE)
+_IT_SUBST(INTLTOOL_XAM_RULE)
+_IT_SUBST(INTLTOOL_KBD_RULE)
+_IT_SUBST(INTLTOOL_XML_RULE)
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+_IT_SUBST(INTLTOOL_CAVES_RULE)
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
+_IT_SUBST(INTLTOOL_THEME_RULE)
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
+_IT_SUBST(INTLTOOL_POLICY_RULE)
+
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
+AC_PATH_PROG(MSGFMT, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+
+AC_PATH_PROG(INTLTOOL_PERL, perl)
+if test -z "$INTLTOOL_PERL"; then
+ AC_MSG_ERROR([perl not found])
+fi
+AC_MSG_CHECKING([for perl >= 5.8.1])
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+else
+ IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
+ AC_MSG_RESULT([$IT_PERL_VERSION])
+fi
+if test "x$2" != "xno-xml"; then
+ AC_MSG_CHECKING([for XML::Parser])
+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+ AC_MSG_RESULT([ok])
+ else
+ AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+ fi
+fi
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[]],
+ [[extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr]])],
+ [DATADIRNAME=share],
+ [case $host in
+ *-*-solaris*)
+ dnl On Solaris, if bind_textdomain_codeset is in libc,
+ dnl GNU format message catalog is always supported,
+ dnl since both are added to the libc all together.
+ dnl Hence, we'd like to go with DATADIRNAME=share
+ dnl in this case.
+ AC_CHECK_FUNC(bind_textdomain_codeset,
+ [DATADIRNAME=share], [DATADIRNAME=lib])
+ ;;
+ *)
+ [DATADIRNAME=lib]
+ ;;
+ esac])
+fi
+AC_SUBST(DATADIRNAME)
+
+IT_PO_SUBDIR([po])
+
+])
+
+
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir "po" is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN([IT_PO_SUBDIR],
+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be executed at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE([
+ AC_CONFIG_COMMANDS([$1/stamp-it], [
+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
+ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
+ fi
+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+ >"$1/stamp-it.tmp"
+ [sed '/^#/d
+ s/^[[].*] *//
+ /^[ ]*$/d
+ '"s|^| $ac_top_srcdir/|" \
+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+ ]
+ [sed '/^POTFILES =/,/[^\\]$/ {
+ /^POTFILES =/!d
+ r $1/POTFILES
+ }
+ ' "$1/Makefile.in" >"$1/Makefile"]
+ rm -f "$1/Makefile.tmp"
+ mv "$1/stamp-it.tmp" "$1/stamp-it"
+ ])
+])dnl
+])
+
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+#
+AC_DEFUN([_IT_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
+# deprecated macros
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-terminal-3.12.2/src/Makefile.in
new/gnome-terminal-3.12.3/src/Makefile.in
--- old/gnome-terminal-3.12.2/src/Makefile.in 2014-05-12 20:40:55.000000000
+0200
+++ new/gnome-terminal-3.12.3/src/Makefile.in 2014-06-23 19:56:23.000000000
+0200
@@ -101,10 +101,11 @@
$(srcdir)/terminal-version.h.in $(top_srcdir)/depcomp \
$(am__dist_searchprovider_DATA_DIST)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-terminal-3.12.2/src/server.c
new/gnome-terminal-3.12.3/src/server.c
--- old/gnome-terminal-3.12.2/src/server.c 2014-05-12 20:40:31.000000000
+0200
+++ new/gnome-terminal-3.12.3/src/server.c 2014-06-22 14:41:25.000000000
+0200
@@ -64,6 +64,11 @@
{ NULL }
};
+enum {
+ _EXIT_FAILURE_WRONG_ID = 7,
+ _EXIT_FAILURE_NO_UTF8 = 8,
+};
+
int
main (int argc, char **argv)
{
@@ -77,7 +82,7 @@
geteuid () == 0 &&
getegid () == 0)) {
g_printerr ("Wrong euid/egid, exiting.\n");
- return EXIT_FAILURE;
+ return _EXIT_FAILURE_WRONG_ID;
}
setlocale (LC_ALL, "");
@@ -86,7 +91,7 @@
if (!g_get_charset (NULL)) {
g_printerr ("Non UTF-8 locale is not supported!\n");
- return EXIT_FAILURE;
+ return _EXIT_FAILURE_NO_UTF8;
}
#ifndef ENABLE_DISTRO_PACKAGING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-terminal-3.12.2/src/terminal-app.c
new/gnome-terminal-3.12.3/src/terminal-app.c
--- old/gnome-terminal-3.12.2/src/terminal-app.c 2014-05-12
20:40:32.000000000 +0200
+++ new/gnome-terminal-3.12.3/src/terminal-app.c 2014-06-23
19:54:22.000000000 +0200
@@ -632,6 +632,23 @@
return app->encodings;
}
+static const char *
+charset_validated (const char *charset)
+{
+ gsize i;
+
+ if (charset == NULL)
+ return "current";
+
+ for (i = 0; charset[i] != '\0'; i++) {
+ char c = charset[i];
+ if (!(g_ascii_isalnum(c) || c == '_' || c == '-'))
+ return "UTF-8";
+ }
+
+ return charset;
+}
+
/**
* terminal_app_ensure_encoding:
* @app:
@@ -642,7 +659,7 @@
* @charset is not a known charset, returns a #TerminalEncoding for a
* custom charset.
*
- * Returns: (transfer none): a #TerminalEncoding
+ * Returns: (transfer none): a #TerminalEncoding, or %NULL
*/
TerminalEncoding *
terminal_app_ensure_encoding (TerminalApp *app,
@@ -650,7 +667,7 @@
{
TerminalEncoding *encoding;
- encoding = g_hash_table_lookup (app->encodings, charset ? charset :
"current");
+ encoding = g_hash_table_lookup (app->encodings, charset_validated (charset));
if (encoding == NULL)
{
encoding = terminal_encoding_new (charset,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-terminal-3.12.2/src/terminal-notebook.c
new/gnome-terminal-3.12.3/src/terminal-notebook.c
--- old/gnome-terminal-3.12.2/src/terminal-notebook.c 2014-05-12
20:40:31.000000000 +0200
+++ new/gnome-terminal-3.12.3/src/terminal-notebook.c 2014-06-23
19:54:27.000000000 +0200
@@ -58,13 +58,21 @@
static void
close_button_clicked_cb (TerminalTabLabel *tab_label,
- TerminalNotebook *notebook)
+ gpointer user_data)
{
TerminalScreen *screen;
+ TerminalNotebook *notebook;
screen = terminal_tab_label_get_screen (tab_label);
- g_signal_emit_by_name (notebook, "screen-close-request", screen);
+ /* notebook is not passed as user_data because it can change during DND
+ * and the close button is not notified about that, see bug 731998.
+ */
+ notebook = TERMINAL_NOTEBOOK (gtk_widget_get_ancestor (GTK_WIDGET (screen),
+
TERMINAL_TYPE_NOTEBOOK));
+
+ if (notebook != NULL)
+ g_signal_emit_by_name (notebook, "screen-close-request", screen);
}
@@ -88,7 +96,7 @@
tab_label = terminal_tab_label_new (screen);
g_signal_connect (tab_label, "close-button-clicked",
- G_CALLBACK (close_button_clicked_cb), notebook);
+ G_CALLBACK (close_button_clicked_cb), NULL);
gtk_notebook_insert_page (gtk_notebook,
screen_container,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-terminal-3.12.2/src/terminal-tab-label.c
new/gnome-terminal-3.12.3/src/terminal-tab-label.c
--- old/gnome-terminal-3.12.2/src/terminal-tab-label.c 2014-05-12
20:40:32.000000000 +0200
+++ new/gnome-terminal-3.12.3/src/terminal-tab-label.c 2014-06-23
19:54:22.000000000 +0200
@@ -210,6 +210,23 @@
}
static void
+terminal_tab_label_dispose (GObject *object)
+{
+ TerminalTabLabel *tab_label = TERMINAL_TAB_LABEL (object);
+ TerminalTabLabelPrivate *priv = tab_label->priv;
+
+ if (priv->screen != NULL) {
+ g_signal_handlers_disconnect_by_func (priv->screen,
+ G_CALLBACK (sync_tab_label),
+ priv->label);
+ g_object_unref (priv->screen);
+ priv->screen = NULL;
+ }
+
+ G_OBJECT_CLASS (terminal_tab_label_parent_class)->dispose (object);
+}
+
+static void
terminal_tab_label_finalize (GObject *object)
{
// TerminalTabLabel *tab_label = TERMINAL_TAB_LABEL (object);
@@ -246,7 +263,7 @@
switch (prop_id) {
case PROP_SCREEN:
- priv->screen = g_value_get_object (value);
+ priv->screen = g_value_dup_object (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -261,6 +278,7 @@
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
gobject_class->constructor = terminal_tab_label_constructor;
+ gobject_class->dispose = terminal_tab_label_dispose;
gobject_class->finalize = terminal_tab_label_finalize;
gobject_class->get_property = terminal_tab_label_get_property;
gobject_class->set_property = terminal_tab_label_set_property;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-terminal-3.12.2/src/terminal-version.h
new/gnome-terminal-3.12.3/src/terminal-version.h
--- old/gnome-terminal-3.12.2/src/terminal-version.h 2014-05-12
20:41:29.000000000 +0200
+++ new/gnome-terminal-3.12.3/src/terminal-version.h 2014-06-23
19:56:36.000000000 +0200
@@ -24,7 +24,7 @@
#define TERMINAL_MAJOR_VERSION (3)
#define TERMINAL_MINOR_VERSION (12)
-#define TERMINAL_MICRO_VERSION (2)
+#define TERMINAL_MICRO_VERSION (3)
#define TERMINAL_CHECK_VERSION(major,minor,micro) \
(TERMINAL_MAJOR_VERSION > (major) || \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-terminal-3.12.2/src/terminal-window.c
new/gnome-terminal-3.12.3/src/terminal-window.c
--- old/gnome-terminal-3.12.2/src/terminal-window.c 2014-05-12
20:40:32.000000000 +0200
+++ new/gnome-terminal-3.12.3/src/terminal-window.c 2014-06-23
19:54:23.000000000 +0200
@@ -3118,6 +3118,7 @@
g_object_unref (screen_container);
terminal_window_add_screen (dest_window, screen, dest_position);
+ terminal_mdi_container_set_active_screen (dest_window->priv->mdi_container,
screen);
g_object_unref (screen);
}
@@ -3342,6 +3343,7 @@
TerminalWindow *window)
{
TerminalWindowPrivate *priv = window->priv;
+ int pages;
_terminal_debug_print (TERMINAL_DEBUG_MDI,
"[window %p] MDI: screen %p inserted\n",
@@ -3399,6 +3401,12 @@
gtk_window_present_with_time (GTK_WINDOW (window),
gtk_get_current_event_time ());
priv->present_on_insert = FALSE;
}
+
+ pages = terminal_mdi_container_get_n_screens (container);
+ if (pages == 2)
+ {
+ terminal_window_update_size (window);
+ }
}
static void
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
