Hello community,
here is the log from the commit of package caribou for openSUSE:Factory checked in at 2013-12-02 09:38:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/caribou (Old)
and /work/SRC/openSUSE:Factory/.caribou.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caribou"
Changes:
--------
--- /work/SRC/openSUSE:Factory/caribou/caribou.changes 2013-09-23 14:20:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.caribou.new/caribou.changes 2013-12-02 09:38:26.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Nov 19 19:27:05 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 0.4.13:
+ + bgo#698746: Accessibility: "slow keys" breaks "screen keyboard"
+ feature.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
caribou-0.4.12.tar.xz
New:
----
caribou-0.4.13.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ caribou.spec ++++++
--- /var/tmp/diff_new_pack.d4Pls3/_old 2013-12-02 09:38:27.000000000 +0100
+++ /var/tmp/diff_new_pack.d4Pls3/_new 2013-12-02 09:38:27.000000000 +0100
@@ -17,7 +17,7 @@
Name: caribou
-Version: 0.4.12
+Version: 0.4.13
Release: 0
# FIXME: Stop hiding the .desktop file with %%suse_update_desktop_file -u if launching caribou finally works
Summary: On-screen Keyboard for GNOME
++++++ caribou-0.4.12.tar.xz -> caribou-0.4.13.tar.xz ++++++
++++ 2848 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/NEWS new/caribou-0.4.13/NEWS
--- old/caribou-0.4.12/NEWS 2013-08-21 16:04:57.000000000 +0200
+++ new/caribou-0.4.13/NEWS 2013-11-18 11:07:57.000000000 +0100
@@ -1,4 +1,10 @@
=============
+Version 0.4.13
+=============
+- Bug 698746: Accessibility : "slow keys" breaks "screen keyboard" feature
+- Translation updates (Slovak)
+
+=============
Version 0.4.12
=============
- Bug 705720: libcaribou: factor out X dependency
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/compile new/caribou-0.4.13/compile
--- old/caribou-0.4.12/compile 1970-01-01 01:00:00.000000000 +0100
+++ new/caribou-0.4.13/compile 2013-11-18 13:07:01.000000000 +0100
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey .
+#
+# 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, 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, see http://www.gnu.org/licenses/.
+
+# 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.
+
+# This file is maintained in Automake, please report
+# bugs to or send patches to
+# .
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" "" $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine/*)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv "$2"
+ set x "$@" -Fo"$file"
+ shift
+ ;;
+ *)
+ func_file_conv "$2"
+ set x "$@" -Fe"$file"
+ shift
+ ;;
+ esac
+ ;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -I*)
+ func_file_conv "${1#-I}" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -l*)
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
+ -L*)
+ func_cl_dashL "${1#-L}"
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs="$IFS"; IFS=','
+ for flag in $arg; do
+ IFS="$save_ifs"
+ linker_opts="$linker_opts $flag"
+ done
+ IFS="$save_ifs"
+ ;;
+ -Xlinker)
+ eat=1
+ linker_opts="$linker_opts $2"
+ ;;
+ -*)
+ set x "$@" "$1"
+ shift
+ ;;
+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+ func_file_conv "$1"
+ set x "$@" -Tp"$file"
+ shift
+ ;;
+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+ func_file_conv "$1" mingw
+ set x "$@" "$file"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+ done
+ if test -n "$linker_opts"; then
+ linker_opts="-link$linker_opts"
+ fi
+ exec "$@" $linker_opts
+ exit 1
+}
+
+eat=
+
+case $1 in
+ '')
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to .
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ # So we strip '-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no '-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # '.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/configure.ac new/caribou-0.4.13/configure.ac
--- old/caribou-0.4.12/configure.ac 2013-07-29 23:29:03.000000000 +0200
+++ new/caribou-0.4.13/configure.ac 2013-11-18 11:04:48.000000000 +0100
@@ -1,6 +1,6 @@
AC_PREREQ([2.63])
AC_INIT([caribou],
- [0.4.12],
+ [0.4.13],
[https://bugzilla.gnome.org/enter_bug.cgi?product=caribou],
[caribou])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/daemon/daemon.c new/caribou-0.4.13/daemon/daemon.c
--- old/caribou-0.4.12/daemon/daemon.c 2013-08-21 16:07:32.000000000 +0200
+++ new/caribou-0.4.13/daemon/daemon.c 2013-11-18 13:07:35.000000000 +0100
@@ -1,4 +1,4 @@
-/* daemon.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* daemon.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from daemon.vala, do not modify */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/caribou-1.0.vapi new/caribou-0.4.13/libcaribou/caribou-1.0.vapi
--- old/caribou-0.4.12/libcaribou/caribou-1.0.vapi 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/caribou-1.0.vapi 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* caribou-1.0.vapi generated by valac 0.21.1.7-1351, do not modify. */
+/* caribou-1.0.vapi generated by valac 0.22.0.45-383d, do not modify. */
namespace Caribou {
[CCode (cheader_filename = "caribou.h")]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/caribou-internals-1.0.vapi new/caribou-0.4.13/libcaribou/caribou-internals-1.0.vapi
--- old/caribou-0.4.12/libcaribou/caribou-internals-1.0.vapi 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/caribou-internals-1.0.vapi 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* caribou-internals-1.0.vapi generated by valac 0.21.1.7-1351, do not modify. */
+/* caribou-internals-1.0.vapi generated by valac 0.22.0.45-383d, do not modify. */
namespace Caribou {
[CCode (cheader_filename = "caribou-internals.h")]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/caribou-internals.h new/caribou-0.4.13/libcaribou/caribou-internals.h
--- old/caribou-0.4.12/libcaribou/caribou-internals.h 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/caribou-internals.h 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* caribou-internals.h generated by valac 0.21.1.7-1351, the Vala compiler, do not modify */
+/* caribou-internals.h generated by valac 0.22.0.45-383d, the Vala compiler, do not modify */
#ifndef __CARIBOU_INTERNALS_H__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/caribou.h new/caribou-0.4.13/libcaribou/caribou.h
--- old/caribou-0.4.12/libcaribou/caribou.h 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/caribou.h 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* caribou.h generated by valac 0.21.1.7-1351, the Vala compiler, do not modify */
+/* caribou.h generated by valac 0.22.0.45-383d, the Vala compiler, do not modify */
#ifndef __CARIBOU_H__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/column-model.c new/caribou-0.4.13/libcaribou/column-model.c
--- old/caribou-0.4.12/libcaribou/column-model.c 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/column-model.c 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* column-model.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* column-model.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from column-model.vala, do not modify */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/display-adapter.c new/caribou-0.4.13/libcaribou/display-adapter.c
--- old/caribou-0.4.12/libcaribou/display-adapter.c 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/display-adapter.c 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* display-adapter.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* display-adapter.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from display-adapter.vala, do not modify */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/group-model.c new/caribou-0.4.13/libcaribou/group-model.c
--- old/caribou-0.4.12/libcaribou/group-model.c 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/group-model.c 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* group-model.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* group-model.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from group-model.vala, do not modify */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/ikeyboard-object.c new/caribou-0.4.13/libcaribou/ikeyboard-object.c
--- old/caribou-0.4.12/libcaribou/ikeyboard-object.c 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/ikeyboard-object.c 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* ikeyboard-object.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* ikeyboard-object.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from ikeyboard-object.vala, do not modify */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/iscannable-group.c new/caribou-0.4.13/libcaribou/iscannable-group.c
--- old/caribou-0.4.12/libcaribou/iscannable-group.c 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/iscannable-group.c 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* iscannable-group.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* iscannable-group.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from iscannable-group.vala, do not modify */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/iscannable-item.c new/caribou-0.4.13/libcaribou/iscannable-item.c
--- old/caribou-0.4.12/libcaribou/iscannable-item.c 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/iscannable-item.c 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* iscannable-item.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* iscannable-item.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from iscannable-item.vala, do not modify */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/key-model.c new/caribou-0.4.13/libcaribou/key-model.c
--- old/caribou-0.4.12/libcaribou/key-model.c 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/key-model.c 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* key-model.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* key-model.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from key-model.vala, do not modify */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/keyboard-model.c new/caribou-0.4.13/libcaribou/keyboard-model.c
--- old/caribou-0.4.12/libcaribou/keyboard-model.c 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/keyboard-model.c 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* keyboard-model.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* keyboard-model.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from keyboard-model.vala, do not modify */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/keyboard-service.c new/caribou-0.4.13/libcaribou/keyboard-service.c
--- old/caribou-0.4.12/libcaribou/keyboard-service.c 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/keyboard-service.c 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* keyboard-service.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* keyboard-service.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from keyboard-service.vala, do not modify */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/level-model.c new/caribou-0.4.13/libcaribou/level-model.c
--- old/caribou-0.4.12/libcaribou/level-model.c 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/level-model.c 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* level-model.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* level-model.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from level-model.vala, do not modify */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/row-model.c new/caribou-0.4.13/libcaribou/row-model.c
--- old/caribou-0.4.12/libcaribou/row-model.c 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/row-model.c 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* row-model.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* row-model.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from row-model.vala, do not modify */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/scannable-group.c new/caribou-0.4.13/libcaribou/scannable-group.c
--- old/caribou-0.4.12/libcaribou/scannable-group.c 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/scannable-group.c 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* scannable-group.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* scannable-group.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from scannable-group.vala, do not modify */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/scanner.c new/caribou-0.4.13/libcaribou/scanner.c
--- old/caribou-0.4.12/libcaribou/scanner.c 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/scanner.c 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* scanner.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* scanner.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from scanner.vala, do not modify */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/xadapter.c new/caribou-0.4.13/libcaribou/xadapter.c
--- old/caribou-0.4.12/libcaribou/xadapter.c 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/xadapter.c 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* xadapter.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* xadapter.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from xadapter.vala, do not modify */
@@ -139,6 +139,7 @@
enum {
CARIBOU_XADAPTER_DUMMY_PROPERTY
};
+static gboolean caribou_xadapter_set_slowkeys_enabled (CaribouXAdapter* self, gboolean enable);
static GdkFilterReturn caribou_xadapter_x_event_filter (CaribouXAdapter* self, GdkXEvent* xevent, GdkEvent* event);
static CaribouKeyButtonCallback caribou_xadapter_key_button_handler_get_cb (CaribouXAdapterKeyButtonHandler* self, gpointer* result_target);
static void caribou_xadapter_xkl_state_changed (CaribouXAdapter* self, gint type, gint group, gboolean restore);
@@ -186,6 +187,71 @@
static gint _vala_array_length (gpointer array);
+static gboolean caribou_xadapter_set_slowkeys_enabled (CaribouXAdapter* self, gboolean enable) {
+ gboolean result = FALSE;
+ Display* _tmp0_ = NULL;
+ gint _tmp1_ = 0;
+ XkbDescRec* _tmp2_ = NULL;
+ gboolean previous = FALSE;
+ XkbDescRec* _tmp3_ = NULL;
+ XkbControlsRec* _tmp4_ = NULL;
+ guint _tmp5_ = 0U;
+ gint _tmp6_ = 0;
+ gboolean _tmp7_ = FALSE;
+ Display* _tmp20_ = NULL;
+ gint _tmp21_ = 0;
+ gint _tmp22_ = 0;
+ XkbDescRec* _tmp23_ = NULL;
+ g_return_val_if_fail (self != NULL, FALSE);
+ _tmp0_ = self->priv->xdisplay;
+ _tmp1_ = XkbAllControlsMask;
+ _tmp2_ = self->priv->xkbdesc;
+ XkbGetControls (_tmp0_, (guint) _tmp1_, _tmp2_);
+ _tmp3_ = self->priv->xkbdesc;
+ _tmp4_ = _tmp3_->ctrls;
+ _tmp5_ = _tmp4_->enabled_ctrls;
+ _tmp6_ = XkbSlowKeysMask;
+ previous = (_tmp5_ & _tmp6_) != ((guint) 0);
+ _tmp7_ = enable;
+ if (_tmp7_) {
+ XkbDescRec* _tmp8_ = NULL;
+ XkbControlsRec* _tmp9_ = NULL;
+ XkbDescRec* _tmp10_ = NULL;
+ XkbControlsRec* _tmp11_ = NULL;
+ guint _tmp12_ = 0U;
+ gint _tmp13_ = 0;
+ _tmp8_ = self->priv->xkbdesc;
+ _tmp9_ = _tmp8_->ctrls;
+ _tmp10_ = self->priv->xkbdesc;
+ _tmp11_ = _tmp10_->ctrls;
+ _tmp12_ = _tmp11_->enabled_ctrls;
+ _tmp13_ = XkbSlowKeysMask;
+ _tmp11_->enabled_ctrls = _tmp12_ | _tmp13_;
+ } else {
+ XkbDescRec* _tmp14_ = NULL;
+ XkbControlsRec* _tmp15_ = NULL;
+ XkbDescRec* _tmp16_ = NULL;
+ XkbControlsRec* _tmp17_ = NULL;
+ guint _tmp18_ = 0U;
+ gint _tmp19_ = 0;
+ _tmp14_ = self->priv->xkbdesc;
+ _tmp15_ = _tmp14_->ctrls;
+ _tmp16_ = self->priv->xkbdesc;
+ _tmp17_ = _tmp16_->ctrls;
+ _tmp18_ = _tmp17_->enabled_ctrls;
+ _tmp19_ = XkbSlowKeysMask;
+ _tmp17_->enabled_ctrls = _tmp18_ & (~_tmp19_);
+ }
+ _tmp20_ = self->priv->xdisplay;
+ _tmp21_ = XkbSlowKeysMask;
+ _tmp22_ = XkbControlsEnabledMask;
+ _tmp23_ = self->priv->xkbdesc;
+ XkbSetControls (_tmp20_, (guint) (_tmp21_ | _tmp22_), _tmp23_);
+ result = previous;
+ return result;
+}
+
+
static GdkFilterReturn caribou_xadapter_x_event_filter (CaribouXAdapter* self, GdkXEvent* xevent, GdkEvent* event) {
GdkFilterReturn result = 0;
void* pointer = NULL;
@@ -913,9 +979,11 @@
guint _tmp1_ = 0U;
guchar _tmp2_ = '\0';
guint _tmp3_ = 0U;
- Display* _tmp5_ = NULL;
- guchar _tmp6_ = '\0';
- Display* _tmp7_ = NULL;
+ gboolean enabled = FALSE;
+ gboolean _tmp5_ = FALSE;
+ Display* _tmp6_ = NULL;
+ guchar _tmp7_ = '\0';
+ Display* _tmp8_ = NULL;
self = (CaribouXAdapter*) base;
_tmp0_ = keyval;
_tmp2_ = caribou_xadapter_keycode_for_keyval (self, _tmp0_, &_tmp1_);
@@ -927,11 +995,14 @@
_tmp4_ = mask;
caribou_display_adapter_mod_latch ((CaribouDisplayAdapter*) self, _tmp4_);
}
- _tmp5_ = self->priv->xdisplay;
- _tmp6_ = keycode;
- XTestFakeKeyEvent (_tmp5_, (guint) _tmp6_, TRUE, CurrentTime);
- _tmp7_ = self->priv->xdisplay;
- XFlush (_tmp7_);
+ _tmp5_ = caribou_xadapter_set_slowkeys_enabled (self, FALSE);
+ enabled = _tmp5_;
+ _tmp6_ = self->priv->xdisplay;
+ _tmp7_ = keycode;
+ XTestFakeKeyEvent (_tmp6_, (guint) _tmp7_, TRUE, CurrentTime);
+ _tmp8_ = self->priv->xdisplay;
+ XFlush (_tmp8_);
+ caribou_xadapter_set_slowkeys_enabled (self, enabled);
}
@@ -1283,7 +1354,7 @@
if (!_tmp3_) {
guint _tmp4_ = 0U;
_tmp4_ = keyval;
- g_warning ("xadapter.vala:323: No good keycode for %d", (gint) _tmp4_);
+ g_warning ("xadapter.vala:343: No good keycode for %d", (gint) _tmp4_);
return;
}
_tmp5_ = func;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/xadapter.vala new/caribou-0.4.13/libcaribou/xadapter.vala
--- old/caribou-0.4.12/libcaribou/xadapter.vala 2013-08-09 17:52:50.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/xadapter.vala 2013-11-18 11:04:48.000000000 +0100
@@ -72,6 +72,24 @@
Xkb.free_keyboard(this.xkbdesc, Xkb.GBN_AllComponentsMask, true);
}
+ private bool set_slowkeys_enabled (bool enable) {
+ Xkb.get_controls (this.xdisplay, Xkb.AllControlsMask, this.xkbdesc);
+
+ var previous =
+ (this.xkbdesc.ctrls.enabled_ctrls & Xkb.SlowKeysMask) != 0;
+
+ if (enable)
+ this.xkbdesc.ctrls.enabled_ctrls |= Xkb.SlowKeysMask;
+ else
+ this.xkbdesc.ctrls.enabled_ctrls &= ~Xkb.SlowKeysMask;
+
+ Xkb.set_controls (this.xdisplay,
+ Xkb.SlowKeysMask | Xkb.ControlsEnabledMask,
+ this.xkbdesc);
+
+ return previous;
+ }
+
private Gdk.FilterReturn x_event_filter (Gdk.XEvent xevent, Gdk.Event event) {
// After the following commit, Vala changed the definition
// of Gdk.XEvent from struct to class:
@@ -246,8 +264,10 @@
if (mask != 0)
mod_latch (mask);
+ var enabled = set_slowkeys_enabled (false);
XTest.fake_key_event (this.xdisplay, keycode, true, X.CURRENT_TIME);
this.xdisplay.flush ();
+ set_slowkeys_enabled (enabled);
}
public override void keyval_release (uint keyval) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/libcaribou/xml-deserializer.c new/caribou-0.4.13/libcaribou/xml-deserializer.c
--- old/caribou-0.4.12/libcaribou/xml-deserializer.c 2013-08-21 16:07:17.000000000 +0200
+++ new/caribou-0.4.13/libcaribou/xml-deserializer.c 2013-11-18 13:07:24.000000000 +0100
@@ -1,4 +1,4 @@
-/* xml-deserializer.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* xml-deserializer.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from xml-deserializer.vala, do not modify */
@@ -646,10 +646,10 @@
continue;
}
_tmp11_ = iter;
- _tmp12_ = xmlGetProp (_tmp11_, "name");
+ _tmp12_ = (gchar*) xmlGetProp (_tmp11_, (xmlChar*) "name");
levelname = _tmp12_;
_tmp13_ = iter;
- _tmp14_ = xmlGetProp (_tmp13_, "mode");
+ _tmp14_ = (gchar*) xmlGetProp (_tmp13_, (xmlChar*) "mode");
mode = _tmp14_;
_tmp15_ = mode;
_tmp16_ = caribou_level_model_new (_tmp15_);
@@ -769,7 +769,7 @@
xmlNode* _tmp29_ = NULL;
_tmp25_ = row;
_tmp26_ = i;
- _tmp27_ = xmlGetProp (_tmp26_, "align");
+ _tmp27_ = (gchar*) xmlGetProp (_tmp26_, (xmlChar*) "align");
_tmp28_ = _tmp27_;
_tmp29_ = i;
caribou_xml_deserializer_load_column (_tmp25_, _tmp28_, _tmp29_);
@@ -778,7 +778,7 @@
}
_tmp30_ = row;
_tmp31_ = i2;
- _tmp32_ = xmlGetProp (_tmp31_, "align");
+ _tmp32_ = (gchar*) xmlGetProp (_tmp31_, (xmlChar*) "align");
_tmp33_ = _tmp32_;
_tmp34_ = i2;
caribou_xml_deserializer_load_column (_tmp30_, _tmp33_, _tmp34_);
@@ -888,12 +888,12 @@
_tmp1_ = _tmp0_->name;
_vala_assert (g_strcmp0 (_tmp1_, "key") == 0, "node->name == \"key\"");
_tmp2_ = node;
- _tmp3_ = xmlGetProp (_tmp2_, "name");
+ _tmp3_ = (gchar*) xmlGetProp (_tmp2_, (xmlChar*) "name");
name = _tmp3_;
_tmp4_ = name;
_vala_assert (_tmp4_ != NULL, "name != null");
_tmp5_ = node;
- _tmp6_ = xmlGetProp (_tmp5_, "text");
+ _tmp6_ = (gchar*) xmlGetProp (_tmp5_, (xmlChar*) "text");
text = _tmp6_;
_tmp7_ = name;
_tmp8_ = text;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/m4/intltool.m4 new/caribou-0.4.13/m4/intltool.m4
--- old/caribou-0.4.12/m4/intltool.m4 1970-01-01 01:00:00.000000000 +0100
+++ new/caribou-0.4.13/m4/intltool.m4 2013-11-18 13:06:53.000000000 +0100
@@ -0,0 +1,237 @@
+## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
+## Copyright (C) 2001 Eazel, Inc.
+## Author: Maciej Stachowiak
+## Kenneth Christiansen
+##
+## 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' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/m4/libtool.m4 new/caribou-0.4.13/m4/libtool.m4
--- old/caribou-0.4.12/m4/libtool.m4 2013-08-21 16:06:03.000000000 +0200
+++ new/caribou-0.4.13/m4/libtool.m4 2013-11-18 13:06:57.000000000 +0100
@@ -1324,7 +1324,14 @@
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
;;
ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
@@ -1688,7 +1695,8 @@
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -2512,17 +2520,6 @@
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -2639,7 +2636,7 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -2669,14 +2666,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2688,6 +2681,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3247,10 +3252,6 @@
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3289,11 +3290,11 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4041,7 +4042,7 @@
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4105,7 +4106,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4340,7 +4341,7 @@
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -4582,6 +4583,9 @@
;;
esac
;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4644,6 +4648,9 @@
openbsd*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4865,7 +4872,7 @@
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5042,6 +5049,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
+ _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -5346,7 +5354,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -6226,9 +6234,6 @@
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- gnu*)
- ;;
-
haiku*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6390,7 +6395,7 @@
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/modules/gtk2/caribou-gtk-module.c new/caribou-0.4.13/modules/gtk2/caribou-gtk-module.c
--- old/caribou-0.4.12/modules/gtk2/caribou-gtk-module.c 2013-08-21 16:07:29.000000000 +0200
+++ new/caribou-0.4.13/modules/gtk2/caribou-gtk-module.c 2013-11-18 13:07:33.000000000 +0100
@@ -1,4 +1,4 @@
-/* caribou-gtk-module.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* caribou-gtk-module.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from caribou-gtk-module.vala, do not modify */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/modules/gtk2/caribou-gtk-module.h new/caribou-0.4.13/modules/gtk2/caribou-gtk-module.h
--- old/caribou-0.4.12/modules/gtk2/caribou-gtk-module.h 2013-08-21 16:07:29.000000000 +0200
+++ new/caribou-0.4.13/modules/gtk2/caribou-gtk-module.h 2013-11-18 13:07:33.000000000 +0100
@@ -1,4 +1,4 @@
-/* caribou-gtk-module.h generated by valac 0.21.1.7-1351, the Vala compiler, do not modify */
+/* caribou-gtk-module.h generated by valac 0.22.0.45-383d, the Vala compiler, do not modify */
#ifndef __CARIBOU_GTK_MODULE_H__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/modules/gtk3/caribou-gtk-module.c new/caribou-0.4.13/modules/gtk3/caribou-gtk-module.c
--- old/caribou-0.4.12/modules/gtk3/caribou-gtk-module.c 2013-08-21 16:07:27.000000000 +0200
+++ new/caribou-0.4.13/modules/gtk3/caribou-gtk-module.c 2013-11-18 13:07:31.000000000 +0100
@@ -1,4 +1,4 @@
-/* caribou-gtk-module.c generated by valac 0.21.1.7-1351, the Vala compiler
+/* caribou-gtk-module.c generated by valac 0.22.0.45-383d, the Vala compiler
* generated from caribou-gtk-module.vala, do not modify */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/modules/gtk3/caribou-gtk-module.h new/caribou-0.4.13/modules/gtk3/caribou-gtk-module.h
--- old/caribou-0.4.12/modules/gtk3/caribou-gtk-module.h 2013-08-21 16:07:27.000000000 +0200
+++ new/caribou-0.4.13/modules/gtk3/caribou-gtk-module.h 2013-11-18 13:07:31.000000000 +0100
@@ -1,4 +1,4 @@
-/* caribou-gtk-module.h generated by valac 0.21.1.7-1351, the Vala compiler, do not modify */
+/* caribou-gtk-module.h generated by valac 0.22.0.45-383d, the Vala compiler, do not modify */
#ifndef __CARIBOU_GTK_MODULE_H__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/po/sk.po new/caribou-0.4.13/po/sk.po
--- old/caribou-0.4.12/po/sk.po 2012-10-10 10:09:49.000000000 +0200
+++ new/caribou-0.4.13/po/sk.po 2013-11-18 11:04:48.000000000 +0100
@@ -8,10 +8,11 @@
"Project-Id-Version: caribou\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=caribou&keywords=I18N+L10N&component=default\n"
-"POT-Creation-Date: 2011-10-09 20:42+0000\n"
-"PO-Revision-Date: 2011-12-14 12:15+0100\n"
+"POT-Creation-Date: 2013-08-21 14:12+0000\n"
+"PO-Revision-Date: 2013-09-17 20:31+0200\n"
"Last-Translator: Tomáš Virgl \n"
"Language-Team: Slovak \n"
+"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -177,35 +178,10 @@
msgid "Button 3"
msgstr "Tlačidlo 3"
-#: ../caribou/__init__.py:2
+#: ../caribou/__init__.py:8
msgid "Caribou"
msgstr "Caribou"
-#: ../caribou/daemon/main.py:34
-#, python-format
-msgid "Error starting %s"
-msgstr "Chyba spúšťania %s"
-
-#: ../caribou/daemon/main.py:45
-#, python-format
-msgid ""
-"In order to use %s, accessibility needs to be enabled. Do you want to enable "
-"it now?"
-msgstr ""
-"Aby ste mohli používať %s, podpora sprístupnenia musí byť povolená. Chcete ju "
-"teraz povoliť?"
-
-#: ../caribou/daemon/main.py:59
-#, python-format
-msgid "Accessibility has been enabled. Log out and back in again to use %s."
-msgstr ""
-"Podpora sprístupnenia bola povolená. Na používanie %s sa odhláste a opäť sa "
-"prihláste."
-
-#: ../caribou/daemon/main.py:156
-msgid "WARNING - Caribou: unhandled editable widget:"
-msgstr "VAROVANIE - Caribou: neobsluhovateľný upraviteľný widget:"
-
#: ../caribou/antler/antler_settings.py:5
msgid "Antler Preferences"
msgstr "Nastavenia Antler"
@@ -232,6 +208,9 @@
"it could range from a 'natural' look and feel good for composing simple "
"text, to a fullscale keyboard."
msgstr ""
+"Geometria klávesnice určuje jej tvar a zložitosť. Môže sa pohybovať v "
+"rozsahu od „prirodzenej“, ktorá je dobrá na písanie jednoduchého textu až po "
+"plnohodnotnú klávesnicu."
#. Translators: Keyboard type (similar to touch/tactile device)
#: ../caribou/antler/antler_settings.py:16
@@ -243,10 +222,12 @@
msgid "Full scale"
msgstr "Plná veľkosť"
+# MČ: pdľa kódu sa zdá, že je to typ klávesnice, prečo sa nazýva scan neviem, ale jej popis je tu: https://git.gnome.org/browse/caribou/tree/data/layouts/scan/us.xml
+# MČ: zdá sa, že ide o mriežku s abecedným usporiadaním kláves.
#. Translators: Keyboard type (scanned grid by rows/columns)
#: ../caribou/antler/antler_settings.py:20
msgid "Scan"
-msgstr ""
+msgstr "Sken"
#: ../caribou/antler/antler_settings.py:21
#: ../caribou/antler/antler_settings.py:22
@@ -278,3 +259,21 @@
#: ../caribou/antler/antler_settings.py:30
msgid "Maximum distance when keyboard is hidden"
msgstr "Maximálna vzdialenosť, ked je klávesnica skrytá"
+
+#~ msgid "Error starting %s"
+#~ msgstr "Chyba spúšťania %s"
+
+#~ msgid ""
+#~ "In order to use %s, accessibility needs to be enabled. Do you want to "
+#~ "enable it now?"
+#~ msgstr ""
+#~ "Aby ste mohli používať %s, podpora sprístupnenia musí byť povolená. "
+#~ "Chcete ju teraz povoliť?"
+
+#~ msgid "Accessibility has been enabled. Log out and back in again to use %s."
+#~ msgstr ""
+#~ "Podpora sprístupnenia bola povolená. Na používanie %s sa odhláste a opäť "
+#~ "sa prihláste."
+
+#~ msgid "WARNING - Caribou: unhandled editable widget:"
+#~ msgstr "VAROVANIE - Caribou: neobsluhovateľný upraviteľný widget:"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/caribou-0.4.12/vapi/external-libs.vapi new/caribou-0.4.13/vapi/external-libs.vapi
--- old/caribou-0.4.12/vapi/external-libs.vapi 2013-07-29 23:29:03.000000000 +0200
+++ new/caribou-0.4.13/vapi/external-libs.vapi 2013-11-18 11:04:48.000000000 +0100
@@ -6,6 +6,15 @@
[CCode (cname = "XkbGetKeyboard")]
public Desc get_keyboard (X.Display dpy, uint which, uint device_spec);
+ [CCode (cname = "XkbGetControls")]
+ public X.Status get_controls (X.Display dpy, uint which, Desc xkb);
+
+ [CCode (cname = "XkbSetControls")]
+ public void set_controls (X.Display dpy, uint which, Desc xkb);
+
+ [CCode (cname = "XkbGetMap")]
+ public Desc get_map (X.Display dpy, uint which, uint device_spec);
+
[CCode (cname = "XkbSetMap")]
public void set_map (X.Display dpy, uint which, Desc xkb);
@@ -92,6 +101,7 @@
[Compact]
[CCode (cname = "XkbControlsRec", free_function = "")]
public class Controls {
+ public uint enabled_ctrls;
}
[Compact]
@@ -238,6 +248,8 @@
public int ExtensionDeviceNotifyMask;
[CCode (cname = "XkbAllEventsMask")]
public int AllEventsMask;
+ [CCode (cname = "XkbAllControlsMask")]
+ public int AllControlsMask;
[CCode (cname = "XkbStateNotify")]
public int StateNotify;
@@ -256,4 +268,10 @@
[CCode (cname = "XkbKeyTypesMask")]
public int KeyTypesMask;
+
+ [CCode (cname = "XkbSlowKeysMask")]
+ public int SlowKeysMask;
+
+ [CCode (cname = "XkbControlsEnabledMask")]
+ public int ControlsEnabledMask;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org