openSUSE Commits
Threads by month
- ----- 2024 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
June 2013
- 1 participants
- 1952 discussions
Hello community,
here is the log from the commit of package zeitgeist for openSUSE:Factory checked in at 2013-06-25 07:39:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zeitgeist (Old)
and /work/SRC/openSUSE:Factory/.zeitgeist.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zeitgeist"
Changes:
--------
--- /work/SRC/openSUSE:Factory/zeitgeist/zeitgeist.changes 2013-04-26 15:54:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.zeitgeist.new/zeitgeist.changes 2013-06-25 14:47:50.000000000 +0200
@@ -1,0 +2,21 @@
+Sat Jun 22 10:11:35 UTC 2013 - zaitor(a)opensuse.org
+
+- Update to version 0.9.14:
+ + Libzeitgeist: Fix managing and tracking registered Monitors.
+
+-------------------------------------------------------------------
+Thu May 30 07:10:02 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 0.9.13:
+ + Engine:
+ - Adjust resetting of statement to proper sequence.
+ - Add custom memory PRAGMA to improve memory consumption.
+ + Libzeitgeist:
+ - Add default memory PRAGMA to be used by clients.
+ + FTS:
+ - Improve FTS memory consumption.
+ + Overall:
+ - Fix compilation breaks for --enable-datahub
+ --disable-downloads-monitor.
+
+-------------------------------------------------------------------
Old:
----
zeitgeist-0.9.12.tar.xz
New:
----
zeitgeist-0.9.14.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zeitgeist.spec ++++++
--- /var/tmp/diff_new_pack.GDawby/_old 2013-06-25 14:47:51.000000000 +0200
+++ /var/tmp/diff_new_pack.GDawby/_new 2013-06-25 14:47:51.000000000 +0200
@@ -18,7 +18,7 @@
Name: zeitgeist
-Version: 0.9.12
+Version: 0.9.14
Release: 0
Summary: Zeitgeist Engine
License: LGPL-2.1+ and GPL-2.0+
++++++ zeitgeist-0.9.12.tar.xz -> zeitgeist-0.9.14.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/AUTHORS new/zeitgeist-0.9.14/AUTHORS
--- old/zeitgeist-0.9.12/AUTHORS 2013-03-19 07:01:48.000000000 +0100
+++ new/zeitgeist-0.9.14/AUTHORS 2013-06-17 08:40:08.000000000 +0200
@@ -2,6 +2,7 @@
Michael Hruby <michal.mhr(a)gmail.com>
Seif Lotfy <seif(a)lotfy.com>
Siegfried-Angel Gevatter Pujals <siegfried(a)gevatter.com>
+ Rico Tzschichholz <ricotz(a)ubuntu.com>
Contributors:
Christian Dywan <christian(a)twotoasts.de>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/NEWS new/zeitgeist-0.9.14/NEWS
--- old/zeitgeist-0.9.12/NEWS 2013-04-12 23:51:28.000000000 +0200
+++ new/zeitgeist-0.9.14/NEWS 2013-06-18 04:41:31.000000000 +0200
@@ -1,3 +1,28 @@
+2013-xx-xx: Zeitgeist 0.9.14 (1.0 Beta 6) "Diamond"
+---------------------------------------------------------------
+
+Libzeitgeist:
+ - Fix managing and tracking registered Monitors
+
+
+2013-05-29: Zeitgeist 0.9.13 (1.0 Beta 5) "Silence is Gold"
+---------------------------------------------------------------
+
+Engine:
+ - Adjust resetting of statement to proper sequence
+ - Add custom memory PRAGMA to improve memory consumption
+
+Libzeitgeist:
+ - Add default memory PRAGMA to be used by clients
+
+FTS:
+ - Improve FTS memory consumption
+
+Overall:
+ - Fix compilation breaks for --enable-datahub --disable-downloads-monitor
+
+This release is the fifth beta which will lead to zeitgeist 1.0
+
2013-04-12: Zeitgeist 0.9.12 (1.0 Beta 4) "Happy Go Lucky"
---------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/configure new/zeitgeist-0.9.14/configure
--- old/zeitgeist-0.9.12/configure 2013-04-13 10:09:27.000000000 +0200
+++ new/zeitgeist-0.9.14/configure 2013-06-18 04:43:42.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for zeitgeist 0.9.12.
+# Generated by GNU Autoconf 2.69 for zeitgeist 0.9.14.
#
# Report bugs to <dev(a)lists.zeitgeist-project.com>.
#
@@ -650,8 +650,8 @@
# Identity of this package.
PACKAGE_NAME='zeitgeist'
PACKAGE_TARNAME='zeitgeist'
-PACKAGE_VERSION='0.9.12'
-PACKAGE_STRING='zeitgeist 0.9.12'
+PACKAGE_VERSION='0.9.14'
+PACKAGE_STRING='zeitgeist 0.9.14'
PACKAGE_BUGREPORT='dev(a)lists.zeitgeist-project.com'
PACKAGE_URL=''
@@ -1512,7 +1512,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 zeitgeist 0.9.12 to adapt to many kinds of systems.
+\`configure' configures zeitgeist 0.9.14 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1582,7 +1582,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of zeitgeist 0.9.12:";;
+ short | recursive ) echo "Configuration of zeitgeist 0.9.14:";;
esac
cat <<\_ACEOF
@@ -1730,7 +1730,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-zeitgeist configure 0.9.12
+zeitgeist configure 0.9.14
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2220,7 +2220,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by zeitgeist $as_me 0.9.12, which was
+It was created by zeitgeist $as_me 0.9.14, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3039,7 +3039,7 @@
# Define the identity of the package.
PACKAGE='zeitgeist'
- VERSION='0.9.12'
+ VERSION='0.9.14'
cat >>confdefs.h <<_ACEOF
@@ -15687,11 +15687,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Vala compiler found. You will not be able to compile .vala source files." >&5
$as_echo "$as_me: WARNING: No Vala compiler found. You will not be able to compile .vala source files." >&2;}
else
- if test -n "0.18.0"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking $VALAC is at least version 0.18.0" >&5
-$as_echo_n "checking $VALAC is at least version 0.18.0... " >&6; }
+ if test -n "0.20.0"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking $VALAC is at least version 0.20.0" >&5
+$as_echo_n "checking $VALAC is at least version 0.20.0... " >&6; }
am__vala_version=`$VALAC --version | sed 's/Vala *//'`
- as_arg_v1=0.18.0
+ as_arg_v1=0.20.0
as_arg_v2="$am__vala_version"
awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
case $? in #(
@@ -15704,7 +15704,7 @@
2) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- as_fn_error $? "Vala 0.18.0 not found." "$LINENO" 5 ;; #(
+ as_fn_error $? "Vala 0.20.0 not found." "$LINENO" 5 ;; #(
*) :
;;
esac
@@ -17784,6 +17784,10 @@
$as_echo "#define DOWNLOADS_MONITOR_ENABLED 1" >>confdefs.h
+else
+
+$as_echo "#define DOWNLOADS_MONITOR_ENABLED 0" >>confdefs.h
+
fi
if test "x$enable_downloads_monitor" = "xyes" -a "x$enable_datahub" = "xyes"; then
DOWNLOADS_MONITOR_ENABLED_TRUE=
@@ -18786,7 +18790,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by zeitgeist $as_me 0.9.12, which was
+This file was extended by zeitgeist $as_me 0.9.14, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18852,7 +18856,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-zeitgeist config.status 0.9.12
+zeitgeist config.status 0.9.14
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/zeitgeist-0.9.12/configure.ac new/zeitgeist-0.9.14/configure.ac
--- old/zeitgeist-0.9.12/configure.ac 2013-04-13 10:09:15.000000000 +0200
+++ new/zeitgeist-0.9.14/configure.ac 2013-06-17 08:40:08.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([zeitgeist], [0.9.12], [dev(a)lists.zeitgeist-project.com], [zeitgeist])
+AC_INIT([zeitgeist], [0.9.14], [dev(a)lists.zeitgeist-project.com], [zeitgeist])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS(config.h)
@@ -13,7 +13,7 @@
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AM_PROG_VALAC([0.18.0])
+AM_PROG_VALAC([0.20.0])
AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No Vala compiler found."])])
AM_SILENT_RULES([yes])
@@ -189,6 +189,8 @@
if test "x$enable_downloads_monitor" = "xyes" -a "x$enable_datahub" = "xyes"; then
AC_DEFINE([DOWNLOADS_MONITOR_ENABLED], [1], [Is the XDG_DOWNLOAD_DIRECTORY file monitor enabled?])
+else
+ AC_DEFINE([DOWNLOADS_MONITOR_ENABLED], [0], [Is the XDG_DOWNLOAD_DIRECTORY file monitor enabled?])
fi
AM_CONDITIONAL(DOWNLOADS_MONITOR_ENABLED, test "x$enable_downloads_monitor" = "xyes" -a "x$enable_datahub" = "xyes")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/ccomments/log.c new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/ccomments/log.c
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/ccomments/log.c 2013-04-12 23:53:45.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/ccomments/log.c 2013-06-18 04:44:37.000000000 +0200
@@ -243,22 +243,9 @@
* zeitgeist_log_remove_monitor:
* @self: the <link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> instance
* @monitor: (in) (transfer full): . A <link linkend="ZeitgeistMonitor"><type>ZeitgeistMonitor</type></link> to report back inserts and deletes
- * @_callback_: (scope async): callback to call when the request is satisfied
- * @_user_data_: (closure): the data to pass to @_callback_ function
- *
- * Remove a monitor from Zeitgeist engine that calls back when events matching event_templates are logged.
- *
- * <emphasis>See also</emphasis>: <link linkend="zeitgeist-log-remove-monitor-finish"><function>zeitgeist_log_remove_monitor_finish()</function></link>
- */
-/**
- * zeitgeist_log_remove_monitor_finish:
- * @self: the <link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> instance
- * @_res_: a <link linkend="GAsyncResult"><type>GAsyncResult</type></link>
* @error: location to store the error occuring, or %NULL to ignore
*
* Remove a monitor from Zeitgeist engine that calls back when events matching event_templates are logged.
- *
- * <emphasis>See also</emphasis>: <link linkend="zeitgeist-log-remove-monitor"><function>zeitgeist_log_remove_monitor()</function></link>
*/
/**
* zeitgeist_log_get_version:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ZeitgeistLog.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ZeitgeistLog.html
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ZeitgeistLog.html 2013-04-12 23:53:51.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ZeitgeistLog.html 2013-06-18 04:44:47.000000000 +0200
@@ -131,10 +131,6 @@
<em class="parameter"><code><a href="../glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
<span class="returnvalue">void</span> <a class="link" href="ZeitgeistLog.html#zeitgeist-log-remove-monitor" title="zeitgeist_log_remove_monitor ()">zeitgeist_log_remove_monitor</a> (<em class="parameter"><code><a class="link" href="ZeitgeistLog.html" title="ZeitgeistLog"><span class="type">ZeitgeistLog</span></a> *self</code></em>,
<em class="parameter"><code><a class="link" href="ZeitgeistMonitor.html" title="ZeitgeistMonitor"><span class="type">ZeitgeistMonitor</span></a> *monitor</code></em>,
- <em class="parameter"><code><a href="../gio/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> _callback_</code></em>,
- <em class="parameter"><code><a href="../glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> _user_data_</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="ZeitgeistLog.html#zeitgeist-log-remove-monitor-finish" title="zeitgeist_log_remove_monitor_finish ()">zeitgeist_log_remove_monitor_finish</a> (<em class="parameter"><code><a class="link" href="ZeitgeistLog.html" title="ZeitgeistLog"><span class="type">ZeitgeistLog</span></a> *self</code></em>,
- <em class="parameter"><code><a href="../gio/GAsyncResult.html"><span class="type">GAsyncResult</span></a> *_res_</code></em>,
<em class="parameter"><code><a href="../glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
<span class="returnvalue">void</span> <a class="link" href="ZeitgeistLog.html#zeitgeist-log-get-version" title="zeitgeist_log_get_version ()">zeitgeist_log_get_version</a> (<em class="parameter"><code><a class="link" href="ZeitgeistLog.html" title="ZeitgeistLog"><span class="type">ZeitgeistLog</span></a> *self</code></em>,
<em class="parameter"><code><a href="../glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> *major</code></em>,
@@ -998,14 +994,10 @@
<a name="zeitgeist-log-remove-monitor"></a><h3>zeitgeist_log_remove_monitor ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span> zeitgeist_log_remove_monitor (<em class="parameter"><code><a class="link" href="ZeitgeistLog.html" title="ZeitgeistLog"><span class="type">ZeitgeistLog</span></a> *self</code></em>,
<em class="parameter"><code><a class="link" href="ZeitgeistMonitor.html" title="ZeitgeistMonitor"><span class="type">ZeitgeistMonitor</span></a> *monitor</code></em>,
- <em class="parameter"><code><a href="../gio/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> _callback_</code></em>,
- <em class="parameter"><code><a href="../glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> _user_data_</code></em>);</pre>
+ <em class="parameter"><code><a href="../glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
<p>
Remove a monitor from Zeitgeist engine that calls back when events matching event_templates are logged.
</p>
-<p>
-<span class="emphasis"><em>See also</em></span>: <a class="link" href="ZeitgeistLog.html#zeitgeist-log-remove-monitor-finish" title="zeitgeist_log_remove_monitor_finish ()"><code class="function"><a class="link" href="ZeitgeistLog.html#zeitgeist-log-remove-monitor-finish" title="zeitgeist_log_remove_monitor_finish ()"><code class="function">zeitgeist_log_remove_monitor_finish()</code></a></code></a>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -1019,43 +1011,6 @@
</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>_callback_</code></em> :</span></p></td>
-<td>callback to call when the request is satisfied. <span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>_user_data_</code></em> :</span></p></td>
-<td>the data to pass to <em class="parameter"><code>_callback_</code></em> function. <span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="zeitgeist-log-remove-monitor-finish"></a><h3>zeitgeist_log_remove_monitor_finish ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> zeitgeist_log_remove_monitor_finish (<em class="parameter"><code><a class="link" href="ZeitgeistLog.html" title="ZeitgeistLog"><span class="type">ZeitgeistLog</span></a> *self</code></em>,
- <em class="parameter"><code><a href="../gio/GAsyncResult.html"><span class="type">GAsyncResult</span></a> *_res_</code></em>,
- <em class="parameter"><code><a href="../glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>
-Remove a monitor from Zeitgeist engine that calls back when events matching event_templates are logged.
-</p>
-<p>
-<span class="emphasis"><em>See also</em></span>: <a class="link" href="ZeitgeistLog.html#zeitgeist-log-remove-monitor" title="zeitgeist_log_remove_monitor ()"><code class="function"><a class="link" href="ZeitgeistLog.html#zeitgeist-log-remove-monitor" title="zeitgeist_log_remove_monitor ()"><code class="function">zeitgeist_log_remove_monitor()</code></a></code></a>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
-<td>the <a class="link" href="ZeitgeistLog.html" title="ZeitgeistLog"><span class="type">ZeitgeistLog</span></a> instance</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>_res_</code></em> :</span></p></td>
-<td>a <a href="../gio/GAsyncResult.html"><span class="type">GAsyncResult</span></a>
-</td>
-</tr>
-<tr>
<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
<td>location to store the error occuring, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore</td>
</tr>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/api-index-full.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/api-index-full.html
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/api-index-full.html 2013-04-12 23:53:51.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/api-index-full.html 2013-06-18 04:44:47.000000000 +0200
@@ -727,10 +727,6 @@
</dt>
<dd></dd>
<dt>
-<a class="link" href="ZeitgeistLog.html#zeitgeist-log-remove-monitor-finish" title="zeitgeist_log_remove_monitor_finish ()">zeitgeist_log_remove_monitor_finish</a>, function in <a class="link" href="ZeitgeistLog.html" title="ZeitgeistLog">ZeitgeistLog</a>
-</dt>
-<dd></dd>
-<dt>
<a class="link" href="zeitgeist-2.0-mimetype.html#zeitgeist-manifestation-for-uri" title="zeitgeist_manifestation_for_uri ()">zeitgeist_manifestation_for_uri</a>, function in <a class="link" href="zeitgeist-2.0-mimetype.html" title="mimetype">mimetype</a>
</dt>
<dd></dd>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch01.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch01.html
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch01.html 2013-04-12 23:53:51.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch01.html 2013-06-18 04:44:47.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp2006560"></a>Classes</h2></div></div></div>
+<a name="idp2474384"></a>Classes</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="ZeitgeistEvent.html">ZeitgeistEvent</a></span><span class="refpurpose"> — Event objects abstract Zeitgeist events</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch02.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch02.html
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch02.html 2013-04-12 23:53:51.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch02.html 2013-06-18 04:44:47.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp1946816"></a>Utility Functions</h2></div></div></div>
+<a name="idp119088"></a>Utility Functions</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="zeitgeist-2.0-mimetype.html">mimetype</a></span><span class="refpurpose"></span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch03.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch03.html
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch03.html 2013-04-12 23:53:51.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch03.html 2013-06-18 04:44:47.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp2730048"></a>Enumerations and Macros</h2></div></div></div>
+<a name="idp121472"></a>Enumerations and Macros</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="zeitgeist-2.0-enumerations.html">enumerations</a></span><span class="refpurpose"></span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch04.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch04.html
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch04.html 2013-04-12 23:53:51.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch04.html 2013-06-18 04:44:47.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp3368496"></a>API for Zeitgeist Extensions</h2></div></div></div>
+<a name="idp41104"></a>API for Zeitgeist Extensions</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="ZeitgeistIndex.html">ZeitgeistIndex</a></span><span class="refpurpose"> — Query the Zeitgeist Full Text Search Extension</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch05.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch05.html
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch05.html 2013-04-12 23:53:51.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch05.html 2013-06-18 04:44:47.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp4340624"></a>Zeitgeist D-Bus API Reference</h2></div></div></div>
+<a name="idp43520"></a>Zeitgeist D-Bus API Reference</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="docs-org-gnome-zeitgeist-Index.html">org.gnome.zeitgeist.Index</a></span><span class="refpurpose"></span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/index.sgml new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/index.sgml
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/index.sgml 2013-04-12 23:53:50.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/index.sgml 2013-06-18 04:44:45.000000000 +0200
@@ -73,7 +73,6 @@
<ANCHOR id="zeitgeist-log-quit-finish" href="zeitgeist-2.0/ZeitgeistLog.html#zeitgeist-log-quit-finish">
<ANCHOR id="zeitgeist-log-install-monitor" href="zeitgeist-2.0/ZeitgeistLog.html#zeitgeist-log-install-monitor">
<ANCHOR id="zeitgeist-log-remove-monitor" href="zeitgeist-2.0/ZeitgeistLog.html#zeitgeist-log-remove-monitor">
-<ANCHOR id="zeitgeist-log-remove-monitor-finish" href="zeitgeist-2.0/ZeitgeistLog.html#zeitgeist-log-remove-monitor-finish">
<ANCHOR id="zeitgeist-log-get-version" href="zeitgeist-2.0/ZeitgeistLog.html#zeitgeist-log-get-version">
<ANCHOR id="zeitgeist-log-get-extensions" href="zeitgeist-2.0/ZeitgeistLog.html#zeitgeist-log-get-extensions">
<ANCHOR id="zeitgeist-log-datapath" href="zeitgeist-2.0/ZeitgeistLog.html#zeitgeist-log-datapath">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/zeitgeist-2.0.devhelp2 new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/zeitgeist-2.0.devhelp2
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/zeitgeist-2.0.devhelp2 2013-04-12 23:53:51.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/zeitgeist-2.0.devhelp2 2013-06-18 04:44:45.000000000 +0200
@@ -98,7 +98,6 @@
<keyword type="function" name="zeitgeist_log_quit_finish ()" link="ZeitgeistLog.html#zeitgeist-log-quit-finish"/>
<keyword type="function" name="zeitgeist_log_install_monitor ()" link="ZeitgeistLog.html#zeitgeist-log-install-monitor"/>
<keyword type="function" name="zeitgeist_log_remove_monitor ()" link="ZeitgeistLog.html#zeitgeist-log-remove-monitor"/>
- <keyword type="function" name="zeitgeist_log_remove_monitor_finish ()" link="ZeitgeistLog.html#zeitgeist-log-remove-monitor-finish"/>
<keyword type="function" name="zeitgeist_log_get_version ()" link="ZeitgeistLog.html#zeitgeist-log-get-version"/>
<keyword type="function" name="zeitgeist_log_get_extensions ()" link="ZeitgeistLog.html#zeitgeist-log-get-extensions"/>
<keyword type="function" name="zeitgeist_log_datapath ()" link="ZeitgeistLog.html#zeitgeist-log-datapath"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/xml/api-index-full.xml new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/xml/api-index-full.xml
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/xml/api-index-full.xml 2013-04-12 23:53:45.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/xml/api-index-full.xml 2013-06-18 04:44:38.000000000 +0200
@@ -181,7 +181,6 @@
<indexentry><primaryie linkends="zeitgeist-log-quit"><link linkend="zeitgeist-log-quit">zeitgeist_log_quit</link>, function in <link linkend="ZeitgeistLog">ZeitgeistLog</link></primaryie></indexentry>
<indexentry><primaryie linkends="zeitgeist-log-quit-finish"><link linkend="zeitgeist-log-quit-finish">zeitgeist_log_quit_finish</link>, function in <link linkend="ZeitgeistLog">ZeitgeistLog</link></primaryie></indexentry>
<indexentry><primaryie linkends="zeitgeist-log-remove-monitor"><link linkend="zeitgeist-log-remove-monitor">zeitgeist_log_remove_monitor</link>, function in <link linkend="ZeitgeistLog">ZeitgeistLog</link></primaryie></indexentry>
-<indexentry><primaryie linkends="zeitgeist-log-remove-monitor-finish"><link linkend="zeitgeist-log-remove-monitor-finish">zeitgeist_log_remove_monitor_finish</link>, function in <link linkend="ZeitgeistLog">ZeitgeistLog</link></primaryie></indexentry>
<indexentry><primaryie linkends="zeitgeist-manifestation-for-uri"><link linkend="zeitgeist-manifestation-for-uri">zeitgeist_manifestation_for_uri</link>, function in <link linkend="zeitgeist-2.0-mimetype">mimetype</link></primaryie></indexentry>
<indexentry><primaryie linkends="zeitgeist-monitor-get-event-templates"><link linkend="zeitgeist-monitor-get-event-templates">zeitgeist_monitor_get_event_templates</link>, function in <link linkend="ZeitgeistMonitor">ZeitgeistMonitor</link></primaryie></indexentry>
<indexentry><primaryie linkends="zeitgeist-monitor-get-path"><link linkend="zeitgeist-monitor-get-path">zeitgeist_monitor_get_path</link>, function in <link linkend="ZeitgeistMonitor">ZeitgeistMonitor</link></primaryie></indexentry>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/xml/log.xml new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/xml/log.xml
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/xml/log.xml 2013-04-12 23:53:45.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/xml/log.xml 2013-06-18 04:44:38.000000000 +0200
@@ -112,10 +112,6 @@
<parameter><link linkend="GError"><type>GError</type></link> **error</parameter>);
<link linkend="void"><returnvalue>void</returnvalue></link> <link linkend="zeitgeist-log-remove-monitor">zeitgeist_log_remove_monitor</link> (<parameter><link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> *self</parameter>,
<parameter><link linkend="ZeitgeistMonitor"><type>ZeitgeistMonitor</type></link> *monitor</parameter>,
- <parameter><link linkend="GAsyncReadyCallback"><type>GAsyncReadyCallback</type></link> _callback_</parameter>,
- <parameter><link linkend="gpointer"><type>gpointer</type></link> _user_data_</parameter>);
-<link linkend="void"><returnvalue>void</returnvalue></link> <link linkend="zeitgeist-log-remove-monitor-finish">zeitgeist_log_remove_monitor_finish</link> (<parameter><link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> *self</parameter>,
- <parameter><link linkend="GAsyncResult"><type>GAsyncResult</type></link> *_res_</parameter>,
<parameter><link linkend="GError"><type>GError</type></link> **error</parameter>);
<link linkend="void"><returnvalue>void</returnvalue></link> <link linkend="zeitgeist-log-get-version">zeitgeist_log_get_version</link> (<parameter><link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> *self</parameter>,
<parameter><link linkend="gint"><type>gint</type></link> *major</parameter>,
@@ -627,39 +623,14 @@
<indexterm zone="zeitgeist-log-remove-monitor"><primary>zeitgeist_log_remove_monitor</primary></indexterm>
<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> zeitgeist_log_remove_monitor (<parameter><link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> *self</parameter>,
<parameter><link linkend="ZeitgeistMonitor"><type>ZeitgeistMonitor</type></link> *monitor</parameter>,
- <parameter><link linkend="GAsyncReadyCallback"><type>GAsyncReadyCallback</type></link> _callback_</parameter>,
- <parameter><link linkend="gpointer"><type>gpointer</type></link> _user_data_</parameter>);</programlisting>
+ <parameter><link linkend="GError"><type>GError</type></link> **error</parameter>);</programlisting>
<para>
Remove a monitor from Zeitgeist engine that calls back when events matching event_templates are logged.
-</para>
-<para>
-<emphasis>See also</emphasis>: <link linkend="zeitgeist-log-remove-monitor-finish"><function><link linkend="zeitgeist-log-remove-monitor-finish"><function>zeitgeist_log_remove_monitor_finish()</function></link></function></link>
</para><variablelist role="params">
<varlistentry><term><parameter>self</parameter> :</term>
<listitem><simpara>the <link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> instance</simpara></listitem></varlistentry>
<varlistentry><term><parameter>monitor</parameter> :</term>
<listitem><simpara> . A <link linkend="ZeitgeistMonitor"><type>ZeitgeistMonitor</type></link> to report back inserts and deletes. <emphasis role="annotation">[<acronym>in</acronym>][<acronym>transfer full</acronym>]</emphasis></simpara></listitem></varlistentry>
-<varlistentry><term><parameter>_callback_</parameter> :</term>
-<listitem><simpara>callback to call when the request is satisfied. <emphasis role="annotation">[<acronym>scope async</acronym>]</emphasis></simpara></listitem></varlistentry>
-<varlistentry><term><parameter>_user_data_</parameter> :</term>
-<listitem><simpara>the data to pass to <parameter>_callback_</parameter> function. <emphasis role="annotation">[<acronym>closure</acronym>]</emphasis></simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="zeitgeist-log-remove-monitor-finish" role="function">
-<title>zeitgeist_log_remove_monitor_finish ()</title>
-<indexterm zone="zeitgeist-log-remove-monitor-finish"><primary>zeitgeist_log_remove_monitor_finish</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> zeitgeist_log_remove_monitor_finish (<parameter><link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> *self</parameter>,
- <parameter><link linkend="GAsyncResult"><type>GAsyncResult</type></link> *_res_</parameter>,
- <parameter><link linkend="GError"><type>GError</type></link> **error</parameter>);</programlisting>
-<para>
-Remove a monitor from Zeitgeist engine that calls back when events matching event_templates are logged.
-</para>
-<para>
-<emphasis>See also</emphasis>: <link linkend="zeitgeist-log-remove-monitor"><function><link linkend="zeitgeist-log-remove-monitor"><function>zeitgeist_log_remove_monitor()</function></link></function></link>
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter> :</term>
-<listitem><simpara>the <link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> instance</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>_res_</parameter> :</term>
-<listitem><simpara>a <link linkend="GAsyncResult"><type>GAsyncResult</type></link></simpara></listitem></varlistentry>
<varlistentry><term><parameter>error</parameter> :</term>
<listitem><simpara>location to store the error occuring, or <link linkend="NULL:CAPS"><literal>NULL</literal></link> to ignore</simpara></listitem></varlistentry>
</variablelist></refsect2>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/zeitgeist-2.0-decl-list.txt new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/zeitgeist-2.0-decl-list.txt
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/zeitgeist-2.0-decl-list.txt 2013-04-12 23:53:45.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/zeitgeist-2.0-decl-list.txt 2013-06-18 04:44:37.000000000 +0200
@@ -75,7 +75,6 @@
zeitgeist_log_quit
zeitgeist_log_quit_finish
zeitgeist_log_remove_monitor
-zeitgeist_log_remove_monitor_finish
zeitgeist_monitor_construct
zeitgeist_monitor_get_event_templates
zeitgeist_monitor_get_path
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/zeitgeist-2.0-decl.txt new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/zeitgeist-2.0-decl.txt
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/zeitgeist-2.0-decl.txt 2013-04-12 23:53:45.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/zeitgeist-2.0-decl.txt 2013-06-18 04:44:37.000000000 +0200
@@ -2263,12 +2263,7 @@
<FUNCTION>
<NAME>zeitgeist_log_remove_monitor</NAME>
<RETURNS>void </RETURNS>
-ZeitgeistLog* self, ZeitgeistMonitor* monitor, GAsyncReadyCallback _callback_, gpointer _user_data_
-</FUNCTION>
-<FUNCTION>
-<NAME>zeitgeist_log_remove_monitor_finish</NAME>
-<RETURNS>void </RETURNS>
-ZeitgeistLog* self, GAsyncResult* _res_, GError** error
+ZeitgeistLog* self, ZeitgeistMonitor* monitor, GError** error
</FUNCTION>
<FUNCTION>
<NAME>zeitgeist_log_get_version</NAME>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/zeitgeist-2.0-sections.txt new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/zeitgeist-2.0-sections.txt
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/zeitgeist-2.0-sections.txt 2013-04-12 23:53:45.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/zeitgeist-2.0-sections.txt 2013-06-18 04:44:37.000000000 +0200
@@ -429,7 +429,6 @@
zeitgeist_log_quit_finish
zeitgeist_log_install_monitor
zeitgeist_log_remove_monitor
-zeitgeist_log_remove_monitor_finish
zeitgeist_log_get_version
zeitgeist_log_get_extensions
zeitgeist_log_datapath
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/zeitgeist-2.0-undocumented.txt new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/zeitgeist-2.0-undocumented.txt
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/zeitgeist-2.0-undocumented.txt 2013-04-12 23:53:45.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/zeitgeist-2.0-undocumented.txt 2013-06-18 04:44:38.000000000 +0200
@@ -1,5 +1,5 @@
78% symbol docs coverage.
-371 symbols documented.
+370 symbols documented.
16 symbols incomplete.
106 not documented.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_vala/zeitgeist-2.0/Zeitgeist.Log.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_vala/zeitgeist-2.0/Zeitgeist.Log.html
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_vala/zeitgeist-2.0/Zeitgeist.Log.html 2013-04-12 23:53:43.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_vala/zeitgeist-2.0/Zeitgeist.Log.html 2013-06-18 04:44:35.000000000 +0200
@@ -164,7 +164,7 @@
matching event_templates are logged. The matching is done exactly as in the find_* family of methods and in Event.matches_template.
Furthermore matched events must also have timestamps lying in time_range.</span>
</div></li>
- <li class="method"><span class="leaf_code_definition"><span class="main_keyword">public</span> <span class="main_keyword">async</span> <span class="main_keyword">void</span> <b><a href="Zeitgeist.Log.remove_monitor.html" class="method">remove_monitor</a></b> (<span class="main_keyword">owned</span> <span class="main_type"><a href="Zeitgeist.Monitor.html" class="class">Monitor</a></span> monitor) <span class="main_keyword">throws</span> <span class="main_type"><code>Error</code></span>
+ <li class="method"><span class="leaf_code_definition"><span class="main_keyword">public</span> <span class="main_keyword">void</span> <b><a href="Zeitgeist.Log.remove_monitor.html" class="method">remove_monitor</a></b> (<span class="main_keyword">owned</span> <span class="main_type"><a href="Zeitgeist.Monitor.html" class="class">Monitor</a></span> monitor) <span class="main_keyword">throws</span> <span class="main_type"><code>Error</code></span>
</span>
<div class="leaf_brief_description"><span class="brief_description">Remove a monitor from Zeitgeist engine that calls back when events
matching event_templates are logged.</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_vala/zeitgeist-2.0/Zeitgeist.Log.remove_monitor.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_vala/zeitgeist-2.0/Zeitgeist.Log.remove_monitor.html
--- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_vala/zeitgeist-2.0/Zeitgeist.Log.remove_monitor.html 2013-04-12 23:53:43.000000000 +0200
+++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_vala/zeitgeist-2.0/Zeitgeist.Log.remove_monitor.html 2013-06-18 04:44:35.000000000 +0200
@@ -51,7 +51,7 @@
<h1 class="main_title">remove_monitor</h1>
<hr class="main_hr"/>
<h2 class="main_title">Description:</h2>
- <div class="main_code_definition"><span class="main_keyword">public</span> <span class="main_keyword">async</span> <span class="main_keyword">void</span> <b><span css="method">remove_monitor</span></b> (<span class="main_keyword">owned</span> <span class="main_type"><a href="Zeitgeist.Monitor.html" class="class">Monitor</a></span> monitor) <span class="main_keyword">throws</span> <span class="main_type"><code>Error</code></span>
+ <div class="main_code_definition"><span class="main_keyword">public</span> <span class="main_keyword">void</span> <b><span css="method">remove_monitor</span></b> (<span class="main_keyword">owned</span> <span class="main_type"><a href="Zeitgeist.Monitor.html" class="class">Monitor</a></span> monitor) <span class="main_keyword">throws</span> <span class="main_type"><code>Error</code></span>
</div>
<div class="description">
<p>Remove a monitor from Zeitgeist engine that calls back when events matching event_templates are logged.</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/examples/vala/monitor-events.c new/zeitgeist-0.9.14/examples/vala/monitor-events.c
--- old/zeitgeist-0.9.12/examples/vala/monitor-events.c 2013-04-12 23:53:38.000000000 +0200
+++ new/zeitgeist-0.9.14/examples/vala/monitor-events.c 2013-06-17 08:42:42.000000000 +0200
@@ -8,15 +8,26 @@
#include "zeitgeist.h"
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+typedef struct _Block1Data Block1Data;
#define _g_ptr_array_unref0(var) ((var == NULL) ? NULL : (var = (g_ptr_array_unref (var), NULL)))
#define _g_main_loop_unref0(var) ((var == NULL) ? NULL : (var = (g_main_loop_unref (var), NULL)))
+struct _Block1Data {
+ int _ref_count_;
+ ZeitgeistMonitor* monitor;
+ ZeitgeistLog* log;
+};
+
void on_events_inserted (ZeitgeistTimeRange* tr, ZeitgeistResultSet* events);
gint _vala_main (void);
+static Block1Data* block1_data_ref (Block1Data* _data1_);
+static void block1_data_unref (void * _userdata_);
static void _g_object_unref0_ (gpointer var);
static void _on_events_inserted_zeitgeist_monitor_events_inserted (ZeitgeistMonitor* _sender, ZeitgeistTimeRange* time_range, ZeitgeistResultSet* events, gpointer self);
+static gboolean __lambda2_ (Block1Data* _data1_);
+static gboolean ___lambda2__gsource_func (gpointer self);
static gpointer _g_object_ref0 (gpointer self) {
@@ -108,6 +119,23 @@
}
+static Block1Data* block1_data_ref (Block1Data* _data1_) {
+ g_atomic_int_inc (&_data1_->_ref_count_);
+ return _data1_;
+}
+
+
+static void block1_data_unref (void * _userdata_) {
+ Block1Data* _data1_;
+ _data1_ = (Block1Data*) _userdata_;
+ if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
+ _g_object_unref0 (_data1_->log);
+ _g_object_unref0 (_data1_->monitor);
+ g_slice_free (Block1Data, _data1_);
+ }
+}
+
+
static void _g_object_unref0_ (gpointer var) {
(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
}
@@ -123,8 +151,32 @@
}
+static gboolean __lambda2_ (Block1Data* _data1_) {
+ gboolean result = FALSE;
+ ZeitgeistMonitor* _tmp0_;
+ GError * _inner_error_ = NULL;
+ _tmp0_ = _g_object_ref0 (_data1_->monitor);
+ zeitgeist_log_remove_monitor (_data1_->log, _tmp0_, &_inner_error_);
+ if (_inner_error_ != NULL) {
+ g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+ g_clear_error (&_inner_error_);
+ return FALSE;
+ }
+ result = FALSE;
+ return result;
+}
+
+
+static gboolean ___lambda2__gsource_func (gpointer self) {
+ gboolean result;
+ result = __lambda2_ (self);
+ return result;
+}
+
+
gint _vala_main (void) {
gint result = 0;
+ Block1Data* _data1_;
GMainLoop* _tmp0_;
GMainLoop* loop;
ZeitgeistTimeRange* _tmp1_;
@@ -133,10 +185,10 @@
GPtrArray* template;
GPtrArray* _tmp3_;
ZeitgeistMonitor* _tmp4_;
- ZeitgeistMonitor* monitor;
ZeitgeistLog* _tmp5_;
- ZeitgeistLog* log;
GError * _inner_error_ = NULL;
+ _data1_ = g_slice_new0 (Block1Data);
+ _data1_->_ref_count_ = 1;
_tmp0_ = g_main_loop_new (NULL, FALSE);
loop = _tmp0_;
_tmp1_ = zeitgeist_time_range_new_anytime ();
@@ -145,28 +197,29 @@
template = _tmp2_;
_tmp3_ = _g_ptr_array_ref0 (template);
_tmp4_ = zeitgeist_monitor_new (time_range, _tmp3_);
- monitor = _tmp4_;
+ _data1_->monitor = _tmp4_;
_tmp5_ = zeitgeist_log_new ();
- log = _tmp5_;
- g_signal_connect (monitor, "events-inserted", (GCallback) _on_events_inserted_zeitgeist_monitor_events_inserted, NULL);
- zeitgeist_log_install_monitor (log, monitor, &_inner_error_);
+ _data1_->log = _tmp5_;
+ g_signal_connect (_data1_->monitor, "events-inserted", (GCallback) _on_events_inserted_zeitgeist_monitor_events_inserted, NULL);
+ zeitgeist_log_install_monitor (_data1_->log, _data1_->monitor, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (log);
- _g_object_unref0 (monitor);
_g_ptr_array_unref0 (template);
_g_object_unref0 (time_range);
_g_main_loop_unref0 (loop);
+ block1_data_unref (_data1_);
+ _data1_ = NULL;
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
g_clear_error (&_inner_error_);
return 0;
}
+ g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 2000, ___lambda2__gsource_func, block1_data_ref (_data1_), block1_data_unref);
g_main_loop_run (loop);
result = 0;
- _g_object_unref0 (log);
- _g_object_unref0 (monitor);
_g_ptr_array_unref0 (template);
_g_object_unref0 (time_range);
_g_main_loop_unref0 (loop);
+ block1_data_unref (_data1_);
+ _data1_ = NULL;
return result;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/examples/vala/monitor-events.vala new/zeitgeist-0.9.14/examples/vala/monitor-events.vala
--- old/zeitgeist-0.9.12/examples/vala/monitor-events.vala 2013-03-19 07:01:48.000000000 +0100
+++ new/zeitgeist-0.9.14/examples/vala/monitor-events.vala 2013-06-17 08:40:08.000000000 +0200
@@ -26,6 +26,11 @@
//monitor.events_deleted.connect (on_events_deleted);
log.install_monitor (monitor);
+ Timeout.add (2000, () =>
+ {
+ log.remove_monitor (monitor);
+ return false;
+ });
loop.run ();
return 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/extensions/fts++/indexer.cpp new/zeitgeist-0.9.14/extensions/fts++/indexer.cpp
--- old/zeitgeist-0.9.12/extensions/fts++/indexer.cpp 2013-03-19 07:01:48.000000000 +0100
+++ new/zeitgeist-0.9.14/extensions/fts++/indexer.cpp 2013-06-17 08:40:08.000000000 +0200
@@ -1081,6 +1081,7 @@
}
}
+ g_ptr_array_set_free_func (results, g_object_unref);
g_ptr_array_unref (results);
// construct custom where clause which combines the original template
@@ -1234,6 +1235,8 @@
ZEITGEIST_ENGINE_ERROR,
ZEITGEIST_ENGINE_ERROR_DATABASE_ERROR,
"Internal database error");
+ g_ptr_array_set_free_func (results, g_object_unref);
+ g_ptr_array_unref (results);
return NULL;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/extensions/fts++/zeitgeist-fts.vala new/zeitgeist-0.9.14/extensions/fts++/zeitgeist-fts.vala
--- old/zeitgeist-0.9.12/extensions/fts++/zeitgeist-fts.vala 2013-03-19 07:01:48.000000000 +0100
+++ new/zeitgeist-0.9.14/extensions/fts++/zeitgeist-fts.vala 2013-06-17 08:40:08.000000000 +0200
@@ -66,6 +66,7 @@
public FtsDaemon () throws EngineError
{
engine = new DbReader ();
+ engine.database.set_cache_size (16);
indexer = new Indexer (engine);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/libzeitgeist/db-reader.vala new/zeitgeist-0.9.14/libzeitgeist/db-reader.vala
--- old/zeitgeist-0.9.12/libzeitgeist/db-reader.vala 2013-04-12 12:45:03.000000000 +0200
+++ new/zeitgeist-0.9.14/libzeitgeist/db-reader.vala 2013-06-17 08:40:08.000000000 +0200
@@ -67,6 +67,8 @@
// FIXME: propagate this properly?
critical ("TableLookup initialization failed: %s", err.message);
}
+
+ database.set_cache_size (128);
}
protected Event get_event_from_row (Sqlite.Statement stmt, uint32 event_id)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/libzeitgeist/log.vala new/zeitgeist-0.9.14/libzeitgeist/log.vala
--- old/zeitgeist-0.9.12/libzeitgeist/log.vala 2013-04-12 12:45:03.000000000 +0200
+++ new/zeitgeist-0.9.14/libzeitgeist/log.vala 2013-06-17 08:40:08.000000000 +0200
@@ -166,6 +166,12 @@
protected override void on_connection_lost ()
{
+ // Reset the monitor's registration id (0 = not registered)
+ foreach (unowned Monitor monitor in monitors.get_keys ())
+ {
+ monitors.replace (monitor, 0);
+ }
+
dbreader = null;
}
@@ -546,7 +552,7 @@
{
uint registration_id = conn.register_object<RemoteMonitor> (
monitor.get_path (), monitor);
- monitors.insert (monitor, registration_id);
+ monitors.replace (monitor, registration_id);
}
catch (GLib.IOError err)
{
@@ -566,13 +572,11 @@
*
* @param monitor A {@link Monitor} to report back inserts and deletes
*/
- public async void remove_monitor (owned Monitor monitor) throws Error
+ public void remove_monitor (owned Monitor monitor) throws Error
{
- yield wait_for_proxy ();
-
try
{
- yield proxy.remove_monitor (monitor.get_path ());
+ proxy.remove_monitor.begin (monitor.get_path ());
}
catch (IOError err)
{
@@ -588,6 +592,8 @@
var connection = ((DBusProxy) proxy).get_connection ();
connection.unregister_object (registration_id);
}
+
+ monitors.remove (monitor);
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/libzeitgeist/sql-schema.vala new/zeitgeist-0.9.14/libzeitgeist/sql-schema.vala
--- old/zeitgeist-0.9.12/libzeitgeist/sql-schema.vala 2013-03-19 07:01:48.000000000 +0100
+++ new/zeitgeist-0.9.14/libzeitgeist/sql-schema.vala 2013-06-17 08:40:08.000000000 +0200
@@ -5,6 +5,7 @@
* Copyright © 2011-2012 Canonical Ltd.
* By Michal Hruby <michal.hruby(a)canonical.com>
* By Siegfried-A. Gevatter <siegfried.gevatter(a)collabora.co.uk>
+ * Copyright © 2013 Seif Lotfy <seif(a)lotfy.com>
*
* Based upon a Python implementation (2009-2011) by:
* Markus Korn <thekorn(a)gmx.net>
@@ -36,7 +37,7 @@
{
public const string CORE_SCHEMA = "core";
- public const int CORE_SCHEMA_VERSION = 9;
+ public const int CORE_SCHEMA_VERSION = 10;
private const string DATABASE_CREATION = "database_creation";
@@ -59,7 +60,7 @@
Timestamp.from_now ());
exec_query (database, schema_sql);
}
- else if (schema_version >= 3 && schema_version <= 8)
+ else if (schema_version >= 3 && schema_version <= 9)
{
backup_database ();
@@ -271,6 +272,8 @@
exec_query (database, "PRAGMA journal_mode = WAL");
exec_query (database, "PRAGMA synchronous = NORMAL");
exec_query (database, "PRAGMA locking_mode = NORMAL");
+ exec_query (database, "PRAGMA default_cache_size = 50");
+ exec_query (database, "PRAGMA wal_autocheckpoint = 10");
}
public static void create_schema (Sqlite.Database database)
@@ -649,7 +652,7 @@
* @param database the database on which to run the query
* @param sql the SQL query to run
*/
- private static void exec_query (Sqlite.Database database,
+ public static void exec_query (Sqlite.Database database,
string sql) throws EngineError
{
int rc = database.exec (sql);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/libzeitgeist/sql.vala new/zeitgeist-0.9.14/libzeitgeist/sql.vala
--- old/zeitgeist-0.9.12/libzeitgeist/sql.vala 2013-03-19 07:01:48.000000000 +0100
+++ new/zeitgeist-0.9.14/libzeitgeist/sql.vala 2013-06-17 08:40:08.000000000 +0200
@@ -452,6 +452,11 @@
return false;
}
+ public void set_cache_size (int size) {
+ DatabaseSchema.exec_query (database,
+ "PRAGMA cache_size = %i".printf (size));
+ }
+
protected void update_callback (Sqlite.Action action,
string dbname, string table, int64 rowid)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/src/engine.vala new/zeitgeist-0.9.14/src/engine.vala
--- old/zeitgeist-0.9.12/src/engine.vala 2013-03-19 07:01:48.000000000 +0100
+++ new/zeitgeist-0.9.14/src/engine.vala 2013-06-17 08:40:08.000000000 +0200
@@ -63,6 +63,7 @@
construct
{
extension_store = new ExtensionStore (this);
+ database.set_cache_size (24);
}
public string[] get_extension_names ()
@@ -292,23 +293,19 @@
int rc;
unowned Sqlite.Statement insert_stmt = database.event_insertion_stmt;
- // We need to call reset here (even if we do so again in the subjects
- // loop) since calling .bind_* after a .step() invocation is illegal.
- insert_stmt.reset ();
-
- insert_stmt.bind_int64 (1, event.id);
- insert_stmt.bind_int64 (2, event.timestamp);
- bind_cached_reference (insert_stmt, 3, interpretations_table,
- event.interpretation);
- bind_cached_reference (insert_stmt, 4, manifestations_table,
- event.manifestation);
- bind_cached_reference (insert_stmt, 5, actors_table, event.actor);
- insert_stmt.bind_text (6, event.origin);
- insert_stmt.bind_int64 (7, payload_id);
-
- for (int i = 0; i < event.num_subjects(); ++i)
+ for (int i = 0; i < event.num_subjects (); ++i)
{
- insert_stmt.reset();
+ insert_stmt.reset ();
+
+ insert_stmt.bind_int64 (1, event.id);
+ insert_stmt.bind_int64 (2, event.timestamp);
+ bind_cached_reference (insert_stmt, 3, interpretations_table,
+ event.interpretation);
+ bind_cached_reference (insert_stmt, 4, manifestations_table,
+ event.manifestation);
+ bind_cached_reference (insert_stmt, 5, actors_table, event.actor);
+ insert_stmt.bind_text (6, event.origin);
+ insert_stmt.bind_int64 (7, payload_id);
unowned Subject subject = event.subjects[i];
@@ -326,7 +323,7 @@
// FIXME: Consider a storages_table table. Too dangerous?
insert_stmt.bind_text (16, subject.storage);
- if ((rc = insert_stmt.step()) != Sqlite.DONE) {
+ if ((rc = insert_stmt.step ()) != Sqlite.DONE) {
if (rc != Sqlite.CONSTRAINT)
{
database.assert_not_corrupt (rc);
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-python-bindings for openSUSE:Factory checked in at 2013-06-25 07:39:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-python-bindings (Old)
and /work/SRC/openSUSE:Factory/.yast2-python-bindings.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-python-bindings"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-python-bindings/yast2-python-bindings.changes 2013-02-28 10:24:18.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-python-bindings.new/yast2-python-bindings.changes 2013-06-25 14:47:45.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Jun 11 16:39:52 UTC 2013 - jmatejek(a)suse.com
+
+- install to correct python directory (fixes file conflict with
+ python-base)
+- 2.20.2
+
+-------------------------------------------------------------------
@@ -117 +123,0 @@
-
Old:
----
yast2-python-bindings-2.20.1.tar.bz2
New:
----
yast2-python-bindings-2.20.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-python-bindings.spec ++++++
--- /var/tmp/diff_new_pack.73SALT/_old 2013-06-25 14:47:45.000000000 +0200
+++ /var/tmp/diff_new_pack.73SALT/_new 2013-06-25 14:47:45.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-python-bindings
-Version: 2.20.1
+Version: 2.20.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -74,7 +74,7 @@
done
rm $RPM_BUILD_ROOT/%{_libdir}/YaST2/plugin/libpy2lang_python.la
-rm $RPM_BUILD_ROOT/%{_libdir}/python/site-packages/libYCP.la
+rm $RPM_BUILD_ROOT/%{python_sitearch}/libYCP.la
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -86,7 +86,7 @@
# libYCP goes elsewhere
# %dir %{_libdir}/python
-%{_libdir}/python/site-packages
+%{python_sitearch}/*
%doc %{_prefix}/share/doc/packages/yast2-python-bindings
%changelog
++++++ yast2-python-bindings-2.20.1.tar.bz2 -> yast2-python-bindings-2.20.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-python-bindings-2.20.1/Makefile.am new/yast2-python-bindings-2.20.2/Makefile.am
--- old/yast2-python-bindings-2.20.1/Makefile.am 2013-02-11 17:34:58.000000000 +0100
+++ new/yast2-python-bindings-2.20.2/Makefile.am 2013-06-21 17:46:43.000000000 +0200
@@ -158,19 +158,14 @@
TAGVERSION = $(Y2TOOL) tagversion
-check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
- if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\
- else \
- cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\
+# check if there is no modified files and all commits were pushed
+check-up-to-date:
+ if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \
+ (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \
fi
check-tagversion:
- @if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\
- else \
- cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \
- fi >/dev/null; \
+ cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \
[ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false )
check-parse-old:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-python-bindings-2.20.1/Makefile.in new/yast2-python-bindings-2.20.2/Makefile.in
--- old/yast2-python-bindings-2.20.1/Makefile.in 2013-02-11 17:35:10.000000000 +0100
+++ new/yast2-python-bindings-2.20.2/Makefile.in 2013-06-21 17:46:55.000000000 +0200
@@ -1066,19 +1066,14 @@
package: check-up-to-date check-tagversion check-textdomain package-local
-check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
- if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\
- else \
- cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\
+# check if there is no modified files and all commits were pushed
+check-up-to-date:
+ if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \
+ (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \
fi
check-tagversion:
- @if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\
- else \
- cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \
- fi >/dev/null; \
+ cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \
[ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false )
check-parse-old:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-python-bindings-2.20.1/VERSION new/yast2-python-bindings-2.20.2/VERSION
--- old/yast2-python-bindings-2.20.1/VERSION 2013-01-22 11:49:25.000000000 +0100
+++ new/yast2-python-bindings-2.20.2/VERSION 2013-06-14 17:10:53.000000000 +0200
@@ -1 +1 @@
-2.20.1
+2.20.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-python-bindings-2.20.1/configure new/yast2-python-bindings-2.20.2/configure
--- old/yast2-python-bindings-2.20.1/configure 2013-02-11 17:35:09.000000000 +0100
+++ new/yast2-python-bindings-2.20.2/configure 2013-06-21 17:46:53.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2-python-bindings 2.20.1.
+# Generated by GNU Autoconf 2.69 for yast2-python-bindings 2.20.2.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-python-bindings'
PACKAGE_TARNAME='yast2-python-bindings'
-PACKAGE_VERSION='2.20.1'
-PACKAGE_STRING='yast2-python-bindings 2.20.1'
+PACKAGE_VERSION='2.20.2'
+PACKAGE_STRING='yast2-python-bindings 2.20.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1377,7 +1377,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 yast2-python-bindings 2.20.1 to adapt to many kinds of systems.
+\`configure' configures yast2-python-bindings 2.20.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1449,7 +1449,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-python-bindings 2.20.1:";;
+ short | recursive ) echo "Configuration of yast2-python-bindings 2.20.2:";;
esac
cat <<\_ACEOF
@@ -1567,7 +1567,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-python-bindings configure 2.20.1
+yast2-python-bindings configure 2.20.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2020,7 +2020,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-python-bindings $as_me 2.20.1, which was
+It was created by yast2-python-bindings $as_me 2.20.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2959,7 +2959,7 @@
# Define the identity of the package.
PACKAGE='yast2-python-bindings'
- VERSION='2.20.1'
+ VERSION='2.20.2'
cat >>confdefs.h <<_ACEOF
@@ -3082,7 +3082,7 @@
-VERSION="2.20.1"
+VERSION="2.20.2"
RPMNAME="yast2-python-bindings"
MAINTAINER="YaST2 Maintainers <yast2-maintainers(a)suse.de>"
@@ -16073,7 +16073,7 @@
CFLAGS="${CFLAGS} ${PYTHON_CFLAGS}"
CXXFLAGS="${CXXFLAGS} ${PYTHON_CFLAGS}"
-PYTHON_VENDORARCH=${libdir}/python
+PYTHON_VENDORARCH=${libdir}/python`python -c 'import sys; print sys.version[:3]'`
eval yast2dir4python='"'$yast2dir'"'
@@ -16624,7 +16624,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-python-bindings $as_me 2.20.1, which was
+This file was extended by yast2-python-bindings $as_me 2.20.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16690,7 +16690,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-python-bindings config.status 2.20.1
+yast2-python-bindings config.status 2.20.2
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/yast2-python-bindings-2.20.1/configure.in new/yast2-python-bindings-2.20.2/configure.in
--- old/yast2-python-bindings-2.20.1/configure.in 2013-02-11 17:34:58.000000000 +0100
+++ new/yast2-python-bindings-2.20.2/configure.in 2013-06-21 17:46:43.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-python-bindings
dnl
-dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-python-bindings, 2.20.1, http://bugs.opensuse.org/, yast2-python-bindings)
+AC_INIT(yast2-python-bindings, 2.20.2, http://bugs.opensuse.org/, yast2-python-bindings)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.20.1"
+VERSION="2.20.2"
RPMNAME="yast2-python-bindings"
MAINTAINER="YaST2 Maintainers <yast2-maintainers(a)suse.de>"
@@ -186,7 +186,7 @@
CFLAGS="${CFLAGS} ${PYTHON_CFLAGS}"
CXXFLAGS="${CXXFLAGS} ${PYTHON_CFLAGS}"
-PYTHON_VENDORARCH=${libdir}/python
+PYTHON_VENDORARCH=${libdir}/python`python -c 'import sys; print sys.version@<:@:3@:>@'`
AC_SUBST(PYTHON_VENDORARCH)
eval yast2dir4python='"'$yast2dir'"'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-python-bindings-2.20.1/configure.in.in new/yast2-python-bindings-2.20.2/configure.in.in
--- old/yast2-python-bindings-2.20.1/configure.in.in 2013-01-22 11:49:25.000000000 +0100
+++ new/yast2-python-bindings-2.20.2/configure.in.in 2013-06-18 23:30:54.000000000 +0200
@@ -29,7 +29,7 @@
CXXFLAGS="${CXXFLAGS} ${PYTHON_CFLAGS}"
## Where to install modules
-PYTHON_VENDORARCH=${libdir}/python
+PYTHON_VENDORARCH=${libdir}/python`python -c 'import sys; print sys.version@<:@:3@:>@'`
AC_SUBST(PYTHON_VENDORARCH)
## make a literal of yast2dir so that it can be used in python instead
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xrefresh for openSUSE:Factory checked in at 2013-06-25 07:39:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xrefresh (Old)
and /work/SRC/openSUSE:Factory/.xrefresh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xrefresh"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xrefresh/xrefresh.changes 2012-05-08 12:08:10.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xrefresh.new/xrefresh.changes 2013-06-25 14:47:35.000000000 +0200
@@ -1,0 +2,19 @@
+Tue May 21 19:59:25 UTC 2013 - zaitor(a)opensuse.org
+
+- Update to version 1.0.5:
+ + Use strcasecmp if available, instead of downcasing string
+ before strcmp.
+ + Fix implicit sign conversion & integer size truncation
+ warnings.
+ + Combine usage message strings.
+ + Mark Syntax() with _X_NORETURN to silence gcc warning.
+ + Add const qualifiers to structs for mapping strings to values.
+ + Add const qualifiers to fix gcc -Wwrite-strings warnings.
+ + Properly fallback on CWBackPixmap = None when failing to parse
+ or allocate a solid color.
+ + Fix allocateded typo in comment.
+ + config: move man pages into their own directory.
+ + man: remove trailing spaces and tabs.
+- Add pkgconfig(xproto) BuildRequires: configure now checks for it.
+
+-------------------------------------------------------------------
Old:
----
xrefresh-1.0.4.tar.bz2
New:
----
xrefresh-1.0.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xrefresh.spec ++++++
--- /var/tmp/diff_new_pack.X3QivA/_old 2013-06-25 14:47:36.000000000 +0200
+++ /var/tmp/diff_new_pack.X3QivA/_new 2013-06-25 14:47:36.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xrefresh
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,19 +15,21 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: xrefresh
-Version: 1.0.4
+Version: 1.0.5
Release: 0
-License: MIT
Summary: Utility to refresh all or part of an X screen
-Url: http://xorg.freedesktop.org/
+License: MIT
Group: System/X11/Utilities
+Url: http://xorg.freedesktop.org/
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.…
Source1: xrefresh.desktop
BuildRequires: pkg-config
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xorg-macros) >= 1.8
+BuildRequires: pkgconfig(xproto) >= 7.0.17
# This was part of the xorg-x11 package up to version 7.6
Conflicts: xorg-x11 <= 7.6
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ xrefresh-1.0.4.tar.bz2 -> xrefresh-1.0.5.tar.bz2 ++++++
++++ 17669 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/xrefresh-1.0.4/ChangeLog new/xrefresh-1.0.5/ChangeLog
--- old/xrefresh-1.0.4/ChangeLog 2010-11-11 04:47:16.000000000 +0100
+++ new/xrefresh-1.0.5/ChangeLog 2013-05-18 03:20:35.000000000 +0200
@@ -1,3 +1,114 @@
+commit 2c08f5dee8b3f2d2da9db8e3c1d4593a66db401e
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri May 17 18:20:13 2013 -0700
+
+ xrefresh 1.0.5
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 1a26cd81c08c008f8252ca03211705ce4951bab2
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Jan 13 09:09:19 2013 -0800
+
+ Use strcasecmp if available, instead of downcasing string before strcmp
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 865c7c3da3a827cff080a763613d02729e9d4e33
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Jan 13 08:37:49 2013 -0800
+
+ Fix implicit sign conversion & integer size truncation warnings
+
+ xrefresh.c:125:14: warning: implicit conversion loses integer precision:
+ 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32]
+ arglen = strlen (arg);
+ ~ ^~~~~~~~~~~~
+ xrefresh.c:126:12: warning: implicit conversion loses integer precision:
+ 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32]
+ slen = strlen (s);
+ ~ ^~~~~~~~~~
+ xrefresh.c:132:26: warning: implicit conversion changes signedness: 'int' to
+ 'size_t' (aka 'unsigned long') [-Wsign-conversion]
+ if (strncmp (arg, s, slen) == 0) return (True);
+ ~~~~~~~ ^~~~
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 4fa0dd48d6c9fcd54276a66c221fdafda2395c02
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Apr 16 17:22:16 2012 -0700
+
+ Combine usage message strings
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit c0b077a85fb2e624ec87fb8bec906ce30bc473e4
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Apr 16 17:18:35 2012 -0700
+
+ Mark Syntax() with _X_NORETURN to silence gcc warning
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit d944df52b7b2c5c9e6789b0ff7bb390108613c6c
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Apr 16 17:10:23 2012 -0700
+
+ Add const qualifiers to structs for mapping strings to values
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 71c97a091a511d403fdb8587d0e1240ec3913820
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Apr 16 17:04:35 2012 -0700
+
+ Add const qualifiers to fix gcc -Wwrite-strings warnings
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit cde30320d98b95f7c0cec5bed906b7107124f8fa
+Author: Jeremy Huddleston <jeremyhu(a)apple.com>
+Date: Sun May 8 16:52:55 2011 -0700
+
+ Properly fallback on CWBackPixmap = None when failing to parse or allocate a solid color
+
+ xrefresh.c:319:3: warning: Value stored to 'action' is never read
+ action = doNone;
+ ^ ~~~~~~
+
+ Found-by: clang static analyzer
+ Signed-off-by: Jeremy Huddleston <jeremyhu(a)apple.com>
+
+commit 289e8d27a8417ca94fd2063a44b84338ff499a3e
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri Jan 28 20:53:06 2011 -0800
+
+ Fix allocateded typo in comment
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 18f7dcdd9fb30b784b3d99cb91d9f5c80cc19f44
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Wed Jan 19 10:06:57 2011 -0500
+
+ config: move man pages into their own directory
+
+ Use services provided by XORG_MANPAGE_SECTIONS.
+ Use standard Makefile for man pages.
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+
+commit d604128cf39507dc80a46449a15050f2a066d50f
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Jan 13 11:15:48 2011 -0500
+
+ man: remove trailing spaces and tabs
+
+ Using s/[ \t]*$//
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+
commit 631be2568befbd4aee98a3cd4849403554db79d7
Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
Date: Wed Nov 10 19:46:37 2010 -0800
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/xrefresh-1.0.4/Makefile.am new/xrefresh-1.0.5/Makefile.am
--- old/xrefresh-1.0.4/Makefile.am 2010-11-10 01:34:32.000000000 +0100
+++ new/xrefresh-1.0.5/Makefile.am 2013-05-18 03:20:19.000000000 +0200
@@ -19,6 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
+SUBDIRS = man
bin_PROGRAMS = xrefresh
AM_CFLAGS = $(CWARNFLAGS) $(XREFRESH_CFLAGS)
@@ -27,24 +28,7 @@
xrefresh_SOURCES = \
xrefresh.c
-appman_PRE = \
- xrefresh.man
-
-
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST = $(appman_PRE)
MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(APP_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
.PHONY: ChangeLog INSTALL
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/xrefresh-1.0.4/config.h.in new/xrefresh-1.0.5/config.h.in
--- old/xrefresh-1.0.4/config.h.in 2010-11-11 04:47:08.000000000 +0100
+++ new/xrefresh-1.0.5/config.h.in 2013-05-18 03:20:24.000000000 +0200
@@ -12,6 +12,9 @@
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
@@ -60,5 +63,37 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
+/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
/* Version number of package */
#undef VERSION
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+ this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
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/xrefresh-1.0.4/configure.ac new/xrefresh-1.0.5/configure.ac
--- old/xrefresh-1.0.4/configure.ac 2010-11-11 04:45:46.000000000 +0100
+++ new/xrefresh-1.0.5/configure.ac 2013-05-18 03:20:19.000000000 +0200
@@ -23,10 +23,11 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xrefresh], [1.0.4],
+AC_INIT([xrefresh], [1.0.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xrefresh])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
+AC_USE_SYSTEM_EXTENSIONS
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
@@ -38,7 +39,12 @@
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
+AC_CHECK_FUNCS([strcasecmp])
+
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XREFRESH, x11)
+PKG_CHECK_MODULES(XREFRESH, [x11 xproto >= 7.0.17])
-AC_OUTPUT([Makefile])
+AC_CONFIG_FILES([
+ Makefile
+ man/Makefile])
+AC_OUTPUT
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/xrefresh-1.0.4/man/Makefile.am new/xrefresh-1.0.5/man/Makefile.am
--- old/xrefresh-1.0.4/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/xrefresh-1.0.5/man/Makefile.am 2013-05-18 03:20:19.000000000 +0200
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = xrefresh.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(APP_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
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/xrefresh-1.0.4/man/xrefresh.man new/xrefresh-1.0.5/man/xrefresh.man
--- old/xrefresh-1.0.4/man/xrefresh.man 1970-01-01 01:00:00.000000000 +0100
+++ new/xrefresh-1.0.5/man/xrefresh.man 2013-05-18 03:20:19.000000000 +0200
@@ -0,0 +1,101 @@
+.\" Copyright 1988, 1998 The Open Group
+.\"
+.\" Permission to use, copy, modify, distribute, and sell this software and its
+.\" documentation for any purpose is hereby granted without fee, provided that
+.\" the above copyright notice appear in all copies and that both that
+.\" copyright notice and this permission notice appear in supporting
+.\" documentation.
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+.\" OTHER DEALINGS IN THE SOFTWARE.
+.\"
+.\" Except as contained in this notice, the name of The Open Group shall
+.\" not be used in advertising or otherwise to promote the sale, use or
+.\" other dealings in this Software without prior written authorization
+.\" from The Open Group.
+.\"
+.TH XREFRESH 1 __xorgversion__
+.SH NAME
+xrefresh - refresh all or part of an X screen
+.SH SYNOPSIS
+.B "xrefresh"
+[-option ...]
+.SH DESCRIPTION
+.PP
+.I Xrefresh
+is a simple X program that causes all or part of your screen to be repainted.
+This is useful when system messages have messed up your screen.
+.I Xrefresh
+maps a window on top of the desired area of the screen and then immediately
+unmaps it,
+causing refresh events to be sent to all applications. By default,
+a window with no background is used, causing all applications to repaint
+``smoothly.''
+However, the various options can be used to indicate that a solid background
+(of any color) or the root window background should be used instead.
+.SH ARGUMENTS
+.PP
+.TP 10
+.B \-white
+Use a white background. The screen just appears to flash quickly, and then
+repaint.
+.PP
+.TP 10
+.B \-black
+Use a black background (in effect, turning off all of the electron guns to
+the tube). This can be somewhat disorienting as everything goes black for
+a moment.
+.PP
+.TP 10
+.B \-solid \fIcolor\fP
+Use a solid background of the specified color. Try green.
+.PP
+.TP 10
+.B \-root
+Use the root window background.
+.PP
+.TP 10
+.B \-none
+This is the default. All of the windows simply repaint.
+.PP
+.TP 10
+.B \-geometry \fIWxH+X+Y\fP
+Specifies the portion of the screen to be repainted; see \fIX(__miscmansuffix__)\fP.
+.PP
+.TP 10
+.B \-display \fIdisplay\fP
+This argument allows you to specify the server and screen to
+refresh; see \fIX(__miscmansuffix__)\fP.
+.SH X DEFAULTS
+The
+.I xrefresh
+program uses the routine
+.I XGetDefault(__libmansuffix__)
+to read defaults, so its resource names are all capitalized.
+.PP
+.TP 8
+.B Black\fP, \fBWhite\fP, \fBSolid\fP, \fBNone\fP, \fBRoot\fP
+Determines what sort of window background to use.
+.PP
+.TP 8
+.B Geometry
+Determines the area to refresh. Not very useful.
+.SH ENVIRONMENT
+.PP
+.TP 8
+DISPLAY - To get default host and display number.
+.SH SEE ALSO
+X(__miscmansuffix__)
+.SH BUGS
+.PP
+It should have just one default type for the background.
+.SH AUTHORS
+Jim Gettys, Digital Equipment Corp., MIT Project Athena
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/xrefresh-1.0.4/missing new/xrefresh-1.0.5/missing
--- old/xrefresh-1.0.4/missing 2010-11-11 04:47:08.000000000 +0100
+++ new/xrefresh-1.0.5/missing 2013-05-18 03:20:25.000000000 +0200
@@ -1,11 +1,10 @@
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# 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
@@ -26,69 +25,40 @@
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <bug-automake(a)gnu.org>."
exit $?
@@ -100,272 +70,141 @@
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
- ;;
-esac
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'automa4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
+ ;;
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
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/xrefresh-1.0.4/xrefresh.c new/xrefresh-1.0.5/xrefresh.c
--- old/xrefresh-1.0.4/xrefresh.c 2010-11-10 01:34:45.000000000 +0100
+++ new/xrefresh-1.0.5/xrefresh.c 2013-05-18 03:20:19.000000000 +0200
@@ -50,31 +50,38 @@
* screen.
*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <stdio.h>
#include <errno.h>
#include <X11/Xos.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-#include <ctype.h>
#include <stdlib.h>
+#ifndef HAVE_STRCASECMP
+# include <ctype.h>
+#endif
+
static Window win;
static char *ProgramName;
-static void
+static void _X_NORETURN
Syntax(void)
{
- fprintf (stderr, "usage: %s [-options] [geometry] [display]\n\n",
- ProgramName);
- fprintf (stderr, "where the available options are:\n");
- fprintf (stderr, " -display host:dpy or -d\n");
- fprintf (stderr, " -geometry WxH+X+Y or -g spec\n");
- fprintf (stderr, " -black use BlackPixel\n");
- fprintf (stderr, " -white use WhitePixel\n");
- fprintf (stderr, " -solid colorname use the color indicated\n");
- fprintf (stderr, " -root use the root background\n");
- fprintf (stderr, " -none no background in window\n");
+ fprintf (stderr, "usage: %s [-options] [geometry] [display]\n\n%s",
+ ProgramName,
+ "where the available options are:\n"
+ " -display host:dpy or -d\n"
+ " -geometry WxH+X+Y or -g spec\n"
+ " -black use BlackPixel\n"
+ " -white use WhitePixel\n"
+ " -solid colorname use the color indicated\n"
+ " -root use the root background\n"
+ " -none no background in window\n");
fprintf (stderr, "\nThe default is: %s -none\n\n", ProgramName);
exit (1);
}
@@ -87,22 +94,29 @@
static int
parse_boolean_option(char *option)
{
- static struct _booltable {
- char *name;
+ static const struct _booltable {
+ const char *name;
int value;
} booltable[] = {
{ "off", 0 }, { "n", 0 }, { "no", 0 }, { "false", 0 },
{ "on", 1 }, { "y", 1 }, { "yes", 1 }, { "true", 1 },
{ NULL, -1 }};
- register struct _booltable *t;
+ register const struct _booltable *t;
+
+#ifndef HAVE_STRCASECMP
register char *cp;
for (cp = option; *cp; cp++) {
if (isascii (*cp) && isupper (*cp)) *cp = tolower (*cp);
}
+#endif
for (t = booltable; t->name; t++) {
+#ifdef HAVE_STRCASECMP
+ if (strcasecmp (option, t->name) == 0) return (t->value);
+#else
if (strcmp (option, t->name) == 0) return (t->value);
+#endif
}
return (-1);
}
@@ -114,10 +128,10 @@
*/
static Bool
-isabbreviation(char *arg, char *s, int minslen)
+isabbreviation(const char *arg, char *s, size_t minslen)
{
- int arglen;
- int slen;
+ size_t arglen;
+ size_t slen;
/* exact match */
if (strcmp (arg, s) == 0) return (True);
@@ -138,8 +152,8 @@
enum e_action {doDefault, doBlack, doWhite, doSolid, doNone, doRoot};
-static struct s_pair {
- char *resource_name;
+static const struct s_pair {
+ const char *resource_name;
enum e_action action;
} pair_table[] = {
{ "Black", doBlack },
@@ -225,7 +239,7 @@
}
action = doSolid;
} else {
- struct s_pair *pp;
+ const struct s_pair *pp;
for (pp = pair_table; pp->resource_name != NULL; pp++) {
def = XGetDefault (dpy, ProgramName, pp->resource_name);
@@ -316,7 +330,8 @@
} else {
fprintf (stderr,"%s: unable to allocate color '%s'.\n",
ProgramName, solidcolor);
- action = doNone;
+ xswa.background_pixmap = None;
+ mask |= CWBackPixmap;
}
break;
case doDefault:
@@ -342,7 +357,7 @@
* backing store; or do a ClearArea generating exposures on all windows
*/
XMapWindow (dpy, win);
- /* the following will free the color that we might have allocateded */
+ /* the following will free the color that we might have allocated */
XCloseDisplay (dpy);
exit (0);
}
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/xrefresh-1.0.4/xrefresh.man new/xrefresh-1.0.5/xrefresh.man
--- old/xrefresh-1.0.4/xrefresh.man 2010-11-10 02:01:05.000000000 +0100
+++ new/xrefresh-1.0.5/xrefresh.man 1970-01-01 01:00:00.000000000 +0100
@@ -1,101 +0,0 @@
-.\" Copyright 1988, 1998 The Open Group
-.\"
-.\" Permission to use, copy, modify, distribute, and sell this software and its
-.\" documentation for any purpose is hereby granted without fee, provided that
-.\" the above copyright notice appear in all copies and that both that
-.\" copyright notice and this permission notice appear in supporting
-.\" documentation.
-.\"
-.\" The above copyright notice and this permission notice shall be included
-.\" in all copies or substantial portions of the Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-.\" OTHER DEALINGS IN THE SOFTWARE.
-.\"
-.\" Except as contained in this notice, the name of The Open Group shall
-.\" not be used in advertising or otherwise to promote the sale, use or
-.\" other dealings in this Software without prior written authorization
-.\" from The Open Group.
-.\"
-.TH XREFRESH 1 __xorgversion__
-.SH NAME
-xrefresh - refresh all or part of an X screen
-.SH SYNOPSIS
-.B "xrefresh"
-[-option ...]
-.SH DESCRIPTION
-.PP
-.I Xrefresh
-is a simple X program that causes all or part of your screen to be repainted.
-This is useful when system messages have messed up your screen.
-.I Xrefresh
-maps a window on top of the desired area of the screen and then immediately
-unmaps it,
-causing refresh events to be sent to all applications. By default,
-a window with no background is used, causing all applications to repaint
-``smoothly.''
-However, the various options can be used to indicate that a solid background
-(of any color) or the root window background should be used instead.
-.SH ARGUMENTS
-.PP
-.TP 10
-.B \-white
-Use a white background. The screen just appears to flash quickly, and then
-repaint.
-.PP
-.TP 10
-.B \-black
-Use a black background (in effect, turning off all of the electron guns to
-the tube). This can be somewhat disorienting as everything goes black for
-a moment.
-.PP
-.TP 10
-.B \-solid \fIcolor\fP
-Use a solid background of the specified color. Try green.
-.PP
-.TP 10
-.B \-root
-Use the root window background.
-.PP
-.TP 10
-.B \-none
-This is the default. All of the windows simply repaint.
-.PP
-.TP 10
-.B \-geometry \fIWxH+X+Y\fP
-Specifies the portion of the screen to be repainted; see \fIX(__miscmansuffix__)\fP.
-.PP
-.TP 10
-.B \-display \fIdisplay\fP
-This argument allows you to specify the server and screen to
-refresh; see \fIX(__miscmansuffix__)\fP.
-.SH X DEFAULTS
-The
-.I xrefresh
-program uses the routine
-.I XGetDefault(__libmansuffix__)
-to read defaults, so its resource names are all capitalized.
-.PP
-.TP 8
-.B Black\fP, \fBWhite\fP, \fBSolid\fP, \fBNone\fP, \fBRoot\fP
-Determines what sort of window background to use.
-.PP
-.TP 8
-.B Geometry
-Determines the area to refresh. Not very useful.
-.SH ENVIRONMENT
-.PP
-.TP 8
-DISPLAY - To get default host and display number.
-.SH SEE ALSO
-X(__miscmansuffix__)
-.SH BUGS
-.PP
-It should have just one default type for the background.
-.SH AUTHORS
-Jim Gettys, Digital Equipment Corp., MIT Project Athena
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xfontsel for openSUSE:Factory checked in at 2013-06-25 07:38:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfontsel (Old)
and /work/SRC/openSUSE:Factory/.xfontsel.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfontsel"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xfontsel/xfontsel.changes 2012-05-08 12:05:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xfontsel.new/xfontsel.changes 2013-06-25 14:47:28.000000000 +0200
@@ -1,0 +2,10 @@
+Sun Jun 23 17:58:30 UTC 2013 - zaitor(a)opensuse.org
+
+- Update to version 1.0.5:
+ + Use C99 struct initializer for parseRec in GetFontNames().
+ + When font fails to load, grey out text instead of unmapping
+ text widget.
+ + Prevent memory leak in GetFontNames if no fonts are matched.
+ + Combine usage message strings.
+
+-------------------------------------------------------------------
Old:
----
xfontsel-1.0.4.tar.bz2
New:
----
xfontsel-1.0.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfontsel.spec ++++++
--- /var/tmp/diff_new_pack.oXesfW/_old 2013-06-25 14:47:29.000000000 +0200
+++ /var/tmp/diff_new_pack.oXesfW/_new 2013-06-25 14:47:29.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xfontsel
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,13 +15,14 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: xfontsel
-Version: 1.0.4
-Release: 1
-License: MIT
+Version: 1.0.5
+Release: 0
Summary: Utility to display X11 font names
-Url: http://xorg.freedesktop.org/
+License: MIT
Group: System/X11/Utilities
+Url: http://xorg.freedesktop.org/
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.…
BuildRequires: pkg-config
BuildRequires: pkgconfig(x11)
++++++ xfontsel-1.0.4.tar.bz2 -> xfontsel-1.0.5.tar.bz2 ++++++
++++ 5902 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/xfontsel-1.0.4/ChangeLog new/xfontsel-1.0.5/ChangeLog
--- old/xfontsel-1.0.4/ChangeLog 2012-03-23 06:31:15.000000000 +0100
+++ new/xfontsel-1.0.5/ChangeLog 2013-05-18 03:01:12.000000000 +0200
@@ -1,3 +1,64 @@
+commit f8aaa4ffae00fd97a393d2589f9c9579b5bac5ad
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri May 17 18:00:41 2013 -0700
+
+ xfontsel 1.0.5
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 8de6cf335b27e89866d9b443f7f44f33ace8fad9
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri Jan 25 13:42:28 2013 -0800
+
+ Use C99 struct initializer for parseRec in GetFontNames()
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit afc3ec190b28caa4b470ca6617db7d9f009f586e
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sat Jan 19 18:24:21 2013 -0800
+
+ When font fails to load, grey out text instead of unmapping text widget
+
+ Before if you selected a pattern that couldn't load, such as a strange
+ encoding, the text widget would simply stop updating, giving the user
+ no feedback that they weren't seeing the selected font, and leaving
+ repaint turds from menus in the text area. Now we are more clear that
+ something is wrong, and clean up when menus overlap the text.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 1c6e89d9dda4d41709abfed4522fd801799bfd30
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sat Jan 19 17:13:28 2013 -0800
+
+ Remove extraneous braces left from commit 1d6970a838d4ed42a
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit bc51dd4cdf617ba44ed1231d411eb8d63616e371
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sat May 26 22:58:14 2012 -0700
+
+ Prevent memory leak in GetFontNames if no fonts are matched
+
+ Defer creating ParseRec until after we check for numFonts = 0 and return.
+
+ Fixes error found by Parfait 0.5.0.2 bug checking tool:
+ Memory leak of pointer '<unknown>' allocated with XtMalloc(40)
+ at line 466 of app/xfontsel/xfontsel.c in function 'GetFontNames'.
+ pointer allocated at line 447 with XtMalloc(40).
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 4faa8afa1856a015a63efb12a466b5fd060c1af5
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sat Apr 14 01:08:43 2012 -0700
+
+ Combine usage message strings
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
commit 67309809fee4ea1b7b4334d6245788ddea626dcf
Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
Date: Thu Mar 22 22:30:31 2012 -0700
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/xfontsel-1.0.4/configure.ac new/xfontsel-1.0.5/configure.ac
--- old/xfontsel-1.0.4/configure.ac 2012-03-23 06:30:42.000000000 +0100
+++ new/xfontsel-1.0.5/configure.ac 2013-05-18 03:00:51.000000000 +0200
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
-AC_INIT([xfontsel], [1.0.4],
+AC_INIT([xfontsel], [1.0.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xfontsel])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
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/xfontsel-1.0.4/missing new/xfontsel-1.0.5/missing
--- old/xfontsel-1.0.4/missing 2012-03-23 06:30:52.000000000 +0100
+++ new/xfontsel-1.0.5/missing 2013-05-18 03:00:57.000000000 +0200
@@ -1,11 +1,10 @@
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# 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
@@ -26,69 +25,40 @@
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <bug-automake(a)gnu.org>."
exit $?
@@ -100,272 +70,141 @@
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
- ;;
-esac
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'automa4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
+ ;;
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
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/xfontsel-1.0.4/xfontsel.c new/xfontsel-1.0.5/xfontsel.c
--- old/xfontsel-1.0.4/xfontsel.c 2012-03-23 06:30:42.000000000 +0100
+++ new/xfontsel-1.0.5/xfontsel.c 2013-05-18 03:00:51.000000000 +0200
@@ -148,27 +148,18 @@
{"-scaled", "scaledFonts", XrmoptionNoArg, "True"},
};
-static void Syntax(char *call)
+static void Syntax(const char *call)
{
- fprintf (stderr, "usage: %s [-options ...] -fn font\n\n", call);
- fprintf (stderr, "where options include:\n");
- fprintf (stderr,
- " -display dpy X server to contact\n");
- fprintf (stderr,
- " -geometry geom size and location of window\n");
- fprintf (stderr,
- " -pattern fontspec font name pattern to match against\n");
- fprintf (stderr,
- " -print print selected font name on exit\n");
- fprintf (stderr,
- " -sample string sample text to use for 1-byte fonts\n");
- fprintf (stderr,
- " -sample16 string sample text to use for 2-byte fonts\n");
- fprintf (stderr,
- " -sampleUCS string sample text to use for ISO10646 fonts\n");
- fprintf (stderr,
+ fprintf (stderr, "usage: %s [-options ...] -fn font\n\n%s\n", call,
+ "where options include:\n"
+ " -display dpy X server to contact\n"
+ " -geometry geom size and location of window\n"
+ " -pattern fontspec font name pattern to match against\n"
+ " -print print selected font name on exit\n"
+ " -sample string sample text to use for 1-byte fonts\n"
+ " -sample16 string sample text to use for 2-byte fonts\n"
+ " -sampleUCS string sample text to use for ISO10646 fonts\n"
" -scaled use scaled instances of fonts\n");
- fprintf (stderr, "\n");
exit (1);
}
@@ -341,10 +332,8 @@
viewPort =
XtCreateManagedWidget("viewPort",viewportWidgetClass,pane,NZ);
- {
- sampleText =
- XtCreateManagedWidget("sampleText",ucsLabelWidgetClass,viewPort,NZ);
- }
+ sampleText =
+ XtCreateManagedWidget("sampleText",ucsLabelWidgetClass,viewPort,NZ);
}
XtRealizeWidget(topLevel);
@@ -453,14 +442,13 @@
void GetFontNames(XtPointer closure)
{
Display *dpy = (Display*)closure;
- ParseRec *parseRec = XtNew(ParseRec);
+ ParseRec *parseRec;
int f, field, count;
String *fontNames;
Boolean *b;
int work_priority = 0;
- fontNames = parseRec->fontNames =
- XListFonts(dpy, AppRes.pattern, 32767, &numFonts);
+ fontNames = XListFonts(dpy, AppRes.pattern, 32767, &numFonts);
fonts = (FontValues*)XtMalloc( numFonts*sizeof(FontValues) );
fontInSet = (Boolean*)XtMalloc( numFonts*sizeof(Boolean) );
@@ -474,11 +462,16 @@
SetNoFonts();
return;
}
+ count = matchingFontCount = numFonts;
numBadFonts = 0;
- parseRec->fonts = fonts;
- parseRec->num_fonts = count = matchingFontCount = numFonts;
- parseRec->fieldValues = fieldValues;
- parseRec->start = 0;
+ parseRec = XtNew(ParseRec);
+ *parseRec = (ParseRec) {
+ .fontNames = fontNames,
+ .num_fonts = count,
+ .start = 0,
+ .fonts = fonts,
+ .fieldValues = fieldValues
+ };
/* this is bogus; the task should be responsible for quantizing...*/
while (count > PARSE_QUANTUM) {
ParseRec *prevRec = parseRec;
@@ -1122,7 +1115,7 @@
XFontStruct *font = XLoadQueryFont(dpy, currentFontNameString);
String sample_text;
if (font == NULL)
- XtUnmapWidget(mapWidget);
+ XtSetSensitive(mapWidget, False);
else {
int nargs = 1;
Arg args[3];
@@ -1147,6 +1140,7 @@
nargs = 3;
}
XtSetValues( sampleText, args, nargs );
+ XtSetSensitive(mapWidget, True);
XtMapWidget(mapWidget);
if (sampleFont) XFreeFont( dpy, sampleFont );
sampleFont = font;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xfce4-panel-plugin-xkb for openSUSE:Factory checked in at 2013-06-25 07:38:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-panel-plugin-xkb (Old)
and /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-xkb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-panel-plugin-xkb"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xfce4-panel-plugin-xkb/xfce4-panel-plugin-xkb.changes 2012-05-08 06:53:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-xkb.new/xfce4-panel-plugin-xkb.changes 2013-06-25 14:47:25.000000000 +0200
@@ -1,0 +2,24 @@
+Thu Jun 20 19:04:28 UTC 2013 - gber(a)opensuse.org
+
+- update to version 0.5.6
+ - don't reset xkb settings on panel's save signal
+ - check that current group number is sensible
+ - fix crash in xkb_util_normalize_group_name
+ - window title reflects if layout is added/edited
+ - don't overwrite XKB options we don't control
+ - disable Edit layout button if no layout is selected
+ - fix compiler warning
+ - use nicer looking flag dimensions in tooltips
+
+-------------------------------------------------------------------
+Tue May 14 08:09:47 UTC 2013 - gber(a)opensuse.org
+
+- update to version 0.5.5
+ - several crashes fixed
+ - text labels are scaled to the size of text area
+ - kazakh flag added
+ - panel 4.10 compatibility
+ - reset xkb config when new keyboard is detected (configs should
+ no longer be lost, or at least not as often as before)
+
+-------------------------------------------------------------------
Old:
----
xfce4-xkb-plugin-0.5.4.3.tar.bz2
New:
----
xfce4-xkb-plugin-0.5.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-panel-plugin-xkb.spec ++++++
--- /var/tmp/diff_new_pack.ZFpu68/_old 2013-06-25 14:47:26.000000000 +0200
+++ /var/tmp/diff_new_pack.ZFpu68/_new 2013-06-25 14:47:26.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xfce4-panel-plugin-xkb
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
%define plugin_name xfce4-xkb-plugin
Name: xfce4-panel-plugin-xkb
-Version: 0.5.4.3
+Version: 0.5.6
Release: 0
Summary: XKB Layout Switcher Plugin for the Xfce Panel
License: GPL-2.0+
++++++ xfce4-xkb-plugin-0.5.4.3.tar.bz2 -> xfce4-xkb-plugin-0.5.6.tar.bz2 ++++++
++++ 34272 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xf86-video-intel for openSUSE:Factory checked in at 2013-06-25 07:38:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-intel (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-intel.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-intel"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-intel/xf86-video-intel.changes 2013-06-07 07:08:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xf86-video-intel.new/xf86-video-intel.changes 2013-06-25 14:47:20.000000000 +0200
@@ -1,0 +2,23 @@
+Sun Jun 23 14:38:45 UTC 2013 - tobias.johannes.klausmann(a)mni.thm.de
+
+- Update to version 2.21.10:
+ Fixes missing support for Xv (with the textured video adaptor) on
+ Haswell, and an old bug with wide monitors on various generation. Along
+ with a few other regression fixes and performance tweaks for various
+ corner cases.
+ + Do not lose track of fast pageflips across mode changes
+ [regression from 2.20.8]
+ + Fix listing of Visuals for Xv
+ [regression from 2.21.8]
+ https://bugs.freedesktop.org/show_bug.cgi?id=65479
+ + Improve coherency of concurrent CPU accesses to a pixmap
+ https://bugs.freedesktop.org/show_bug.cgi?id=61628
+ + Set sampler swizzling for textured video on Haswell
+ https://bugs.freedesktop.org/show_bug.cgi?id=65699
+ + Apply scanout stride limits
+ https://bugs.freedesktop.org/show_bug.cgi?id=65099
+ + Undo the self-copy for cloned pixmaps for loimpress's animations
+ [regression from 2.21.7]
+ https://bugs.freedesktop.org/show_bug.cgi?id=65665
+
+-------------------------------------------------------------------
Old:
----
xf86-video-intel-2.21.9.tar.bz2
New:
----
xf86-video-intel-2.21.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-video-intel.spec ++++++
--- /var/tmp/diff_new_pack.6yHLtd/_old 2013-06-25 14:47:20.000000000 +0200
+++ /var/tmp/diff_new_pack.6yHLtd/_new 2013-06-25 14:47:20.000000000 +0200
@@ -19,7 +19,7 @@
%define glamor 1
Name: xf86-video-intel
-Version: 2.21.9
+Version: 2.21.10
Release: 0
Summary: Intel video driver for the Xorg X server
License: MIT
++++++ xf86-video-intel-2.21.9.tar.bz2 -> xf86-video-intel-2.21.10.tar.bz2 ++++++
++++ 11152 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xf86-input-wacom for openSUSE:Factory checked in at 2013-06-25 07:38:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-input-wacom (Old)
and /work/SRC/openSUSE:Factory/.xf86-input-wacom.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-wacom"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-input-wacom/xf86-input-wacom.changes 2013-03-24 21:51:58.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xf86-input-wacom.new/xf86-input-wacom.changes 2013-06-25 14:47:18.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Jun 20 09:32:12 UTC 2013 - fcrozat(a)suse.com
+
+- Update to version 0.21.0:
+ + Handle DEVICE_ABORT on input ABI 19.1
+ + Add support for touchscreens direct touch devices
+ + Add support for Fujitsu Lifebook T902
+- Remove U_Consolidate-calls-to-wcmEvent-into-one-statement.patch
+ and U_Consolidate-calls-to-wcmEvent-into-one-statement.patch
+ (merged).
+- Simplify wacom udev rules (based on Fedora)
+
+-------------------------------------------------------------------
Old:
----
U_Consolidate-calls-to-wcmEvent-into-one-statement.patch
U_Resume-button-events-for-pucks.patch
xf86-input-wacom-0.20.0.tar.bz2
New:
----
xf86-input-wacom-0.21.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-input-wacom.spec ++++++
--- /var/tmp/diff_new_pack.gziSK5/_old 2013-06-25 14:47:18.000000000 +0200
+++ /var/tmp/diff_new_pack.gziSK5/_new 2013-06-25 14:47:18.000000000 +0200
@@ -23,7 +23,7 @@
%endif
Name: xf86-input-wacom
-Version: 0.20.0
+Version: 0.21.0
Release: 0
Summary: Wacom input driver for the Xorg X server
License: GPL-2.0+
@@ -31,8 +31,6 @@
Url: http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Xf86-input…
Source0: http://downloads.sourceforge.net/project/linuxwacom/xf86-input-wacom/%{name…
Source1: 65-xorg-wacom.rules
-Patch0: U_Consolidate-calls-to-wcmEvent-into-one-statement.patch
-Patch1: U_Resume-button-events-for-pucks.patch
BuildRequires: pkg-config
# For directory ownership
BuildRequires: udev
@@ -75,8 +73,6 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
%configure --with-xorg-conf-dir=/etc/X11/xorg.conf.d
++++++ 65-xorg-wacom.rules ++++++
--- /var/tmp/diff_new_pack.gziSK5/_old 2013-06-25 14:47:18.000000000 +0200
+++ /var/tmp/diff_new_pack.gziSK5/_new 2013-06-25 14:47:18.000000000 +0200
@@ -1,4 +1,13 @@
-ACTION=="add|change", SUBSYSTEM=="pnp", ATTR{id}=="WACf*", ENV{NAME}="Serial Wacom Tablet"
-ACTION=="add|change", SUBSYSTEM=="pnp", ATTR{id}=="FUJ*", ENV{NAME}="Serial Wacom Tablet"
-ACTION=="add|change", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{x11_driver}="wacom"
-ACTION=="add|change", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{x11_driver}="wacom"
+ACTION!="add|change", GOTO="wacom_end"
+
+# Match all serial wacom tablets with a serial ID starting with WACf
+# Notes: We assign NAME though we shouldn't, but currently the server requires it
+# We assign the lot to subsystem pnp too because server reads NAME from
+# the parent device. Once all that's fixed, as simple SUBSYSTEM="tty"
+# will do and the ENV{NAME} can be removed.
+SUBSYSTEM=="tty|pnp", ATTR{id}=="WACf*", ENV{NAME}="Serial Wacom Tablet"
+SUBSYSTEM=="tty|pnp", ATTR{id}=="FUJ*", ENV{NAME}="Serial Wacom Tablet"
+SUBSYSTEMS=="tty|pnp", ATTRS{id}=="WACf*", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{x11_driver}="wacom", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}"
+SUBSYSTEMS=="tty|pnp", ATTRS{id}=="FUJ*", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{x11_driver}="wacom", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}"
+
+LABEL="wacom_end"
++++++ xf86-input-wacom-0.20.0.tar.bz2 -> xf86-input-wacom-0.21.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/ChangeLog new/xf86-input-wacom-0.21.0/ChangeLog
--- old/xf86-input-wacom-0.20.0/ChangeLog 2013-03-04 18:46:48.000000000 +0100
+++ new/xf86-input-wacom-0.21.0/ChangeLog 2013-04-29 22:18:17.000000000 +0200
@@ -1,3 +1,147 @@
+commit 5c6bd8d45ca2358d42fdd028112e724c691774ba
+Author: Jason Gerecke <killertofu(a)gmail.com>
+Date: Fri Apr 19 18:14:59 2013 -0700
+
+ wacom 0.20.99.1
+
+ Signed-off-by: Jason Gerecke <killertofu(a)gmail.com>
+
+commit 8d804cdf31bfbf9ec46ee15ab1a58e63f770c2b8
+Author: Jason Gerecke <killertofu(a)gmail.com>
+Date: Thu Apr 18 14:51:37 2013 -0700
+
+ Fix const warnings in wcmSetActionProperty
+
+ CC wcmXCommand.lo
+ ../../src/wcmXCommand.c: In function 'wcmSetActionProperty':
+ ../../src/wcmXCommand.c:460:23: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
+ case BadMatch: msg = "BadMatch"; break;
+ ^
+ ../../src/wcmXCommand.c:461:23: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
+ case BadValue: msg = "BadValue"; break;
+ ^
+ ../../src/wcmXCommand.c:462:17: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
+ default: msg = "UNKNOWN"; break;
+ ^
+ Signed-off-by: Jason Gerecke <killertofu(a)gmail.com>
+
+commit 135e6f60df1398f2c5145535f68e06703ccd77b4
+Author: Jason Gerecke <killertofu(a)gmail.com>
+Date: Thu Apr 18 14:47:17 2013 -0700
+
+ Remove unused variable
+
+ src/wcmUSB.c:451:14: warning: unused variable 'private' [-Wunused-variable]
+ wcmUSBData* private = common->private;
+
+ Signed-off-by: Jason Gerecke <killertofu(a)gmail.com>
+
+commit dfe4d23ef30db20e726605599c1c6bed2aa20a3a
+Author: Peter Hutterer <peter.hutterer(a)who-t.net>
+Date: Tue Mar 26 11:39:55 2013 +1000
+
+ Correct comment for Sample and Suppress property
+
+ The data in the property is actually the other way round. Oops.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit ad952fe2800c875b2f0b4663358d454d793ce57f
+Author: Ping Cheng <pinglinux(a)gmail.com>
+Date: Fri Mar 8 17:04:42 2013 -0800
+
+ add support for 0x10d
+
+ It is a Wacom device found in Fujitsu Lifebook T902.
+
+ Signed-off-by: Stephan Frank <sfrank(a)cs.tu-berlin.de>
+ Acked-by: Ping Cheng <pingc(a)wacom.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+ Reviewed-by: Jason Gerecke <killertofu(a)gmail.com>
+
+commit 7a1aadb24b6573809d7324f2549bed749ad1a7f2
+Author: Ping Cheng <pinglinux(a)gmail.com>
+Date: Thu Mar 7 14:11:30 2013 -0800
+
+ Resume button events for pucks
+
+ wcmBTNChannel was statically assigned to PAD_CHANNEL by commit 1f9bf45b, which
+ excluded button events for CURSOR tools. This patch allows usbParseBTNEvent
+ to process button events for both CURSOR and PAD tools.
+
+ wcmBTNChannel is removed from wcmUSBData since we do not need it anymore.
+
+ Signed-off-by: Ping Cheng <pingc(a)wacom.com>
+ Reviewed-by: Jason Gerecke <killertofu(a)gmail.com>
+
+commit c3b4e869924291ee1ec72a2f02fc1986873efe92
+Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com>
+Date: Mon Mar 4 18:33:03 2013 +0100
+
+ Make touchscreens (WCM_LCD) direct touch devices
+
+ Tested with a tablet pc, allowing finger scrolling in GTK3.
+
+ Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+ Tested-by: Jason Gerecke <killertofu(a)gmail.com>
+
+commit 9077b12cd6ef7a9772aaea00b52baad64471e4e4
+Author: Ping Cheng <pinglinux(a)gmail.com>
+Date: Tue Mar 5 16:46:27 2013 -0800
+
+ Consolidate calls to wcmEvent into one statement
+
+ The extra wcmEvent call was to deal with generic PAD events received
+ without motion events in the same packet. Those PAD events would be
+ filtered out by the device type retrieving code later.
+
+ Signed-off-by: Ping Cheng <pingc(a)wacom.com>
+ Acked-by: Chris Bagwell <chris(a)cnpbagwell.com>
+ Reviewed-by: Jason Gerecke <killertofu(a)gmail.com>
+
+commit db17462c0e85f880647f23a0e8bbfd4d20a38303
+Author: Ping Cheng <pinglinux(a)gmail.com>
+Date: Tue Mar 5 16:45:45 2013 -0800
+
+ Clean up device_type initialization for tool on tablet
+
+ usbInitToolType retrieves device type from the kernel when tool
+ is on the tablet at X server startup. No need to do it again later.
+
+ Since kernel does not have a specific device type for PAD, we have
+ to check the actual events to set its type.
+
+ Signed-off-by: Ping Cheng <pingc(a)wacom.com>
+ Acked-by: Chris Bagwell <chris(a)cnpbagwell.com>
+ Reviewed-by: Jason Gerecke <killertofu(a)gmail.com>
+
+commit 6f9826217f50df8e315d3a7d694a4daf62f32c38
+Author: Ping Cheng <pinglinux(a)gmail.com>
+Date: Tue Mar 5 16:44:52 2013 -0800
+
+ Update MAX_CHANNELS definition
+
+ Make room to report pen and touch events simultaneously
+
+ Signed-off-by: Ping Cheng <pingc(a)wacom.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+ Reviewed-by: Jason Gerecke <killertofu(a)gmail.com>
+
+commit 1bca5eefa22afcce1ebe33812e7d17872ceeafca
+Author: Peter Hutterer <peter.hutterer(a)who-t.net>
+Date: Tue Mar 5 09:41:47 2013 +1000
+
+ Handle DEVICE_ABORT on input ABI 19.1
+
+ And do nothing.
+
+ USB devices are handled by the kernel, so we don't need to reset the HW.
+ ISDV4 devices don't get reset on normal shutdown anyway, so we don't need to
+ do anything here either.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
commit ab53739dafee0e0f4a534220501bd067193ff109
Author: Jason Gerecke <killertofu(a)gmail.com>
Date: Mon Mar 4 09:46:17 2013 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/configure new/xf86-input-wacom-0.21.0/configure
--- old/xf86-input-wacom-0.20.0/configure 2013-03-04 18:46:35.000000000 +0100
+++ new/xf86-input-wacom-0.21.0/configure 2013-04-29 21:59:13.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xf86-input-wacom 0.20.0.
+# Generated by GNU Autoconf 2.69 for xf86-input-wacom 0.21.0.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -651,8 +651,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-input-wacom'
PACKAGE_TARNAME='xf86-input-wacom'
-PACKAGE_VERSION='0.20.0'
-PACKAGE_STRING='xf86-input-wacom 0.20.0'
+PACKAGE_VERSION='0.21.0'
+PACKAGE_STRING='xf86-input-wacom 0.21.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -1432,7 +1432,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 xf86-input-wacom 0.20.0 to adapt to many kinds of systems.
+\`configure' configures xf86-input-wacom 0.21.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1503,7 +1503,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-wacom 0.20.0:";;
+ short | recursive ) echo "Configuration of xf86-input-wacom 0.21.0:";;
esac
cat <<\_ACEOF
@@ -1640,7 +1640,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-wacom configure 0.20.0
+xf86-input-wacom configure 0.21.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2055,7 +2055,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-wacom $as_me 0.20.0, which was
+It was created by xf86-input-wacom $as_me 0.21.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2924,7 +2924,7 @@
# Define the identity of the package.
PACKAGE='xf86-input-wacom'
- VERSION='0.20.0'
+ VERSION='0.21.0'
cat >>confdefs.h <<_ACEOF
@@ -19060,7 +19060,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-wacom $as_me 0.20.0, which was
+This file was extended by xf86-input-wacom $as_me 0.21.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19126,7 +19126,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xf86-input-wacom config.status 0.20.0
+xf86-input-wacom config.status 0.21.0
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/xf86-input-wacom-0.20.0/configure.ac new/xf86-input-wacom-0.21.0/configure.ac
--- old/xf86-input-wacom-0.20.0/configure.ac 2013-03-04 18:45:49.000000000 +0100
+++ new/xf86-input-wacom-0.21.0/configure.ac 2013-04-29 21:59:05.000000000 +0200
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-wacom],
- [0.20.0],
+ [0.21.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-wacom])
AC_CONFIG_MACRO_DIR([m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/include/wacom-properties.h new/xf86-input-wacom-0.21.0/include/wacom-properties.h
--- old/xf86-input-wacom-0.20.0/include/wacom-properties.h 2012-10-16 21:09:58.000000000 +0200
+++ new/xf86-input-wacom-0.21.0/include/wacom-properties.h 2013-04-18 23:45:21.000000000 +0200
@@ -72,7 +72,7 @@
/* 32 bit, 1 value */
#define WACOM_PROP_PRESSURE_THRESHOLD "Wacom Pressure Threshold"
-/* 32 bit, 2 values, sample, suppress */
+/* 32 bit, 2 values, suppress, sample */
#define WACOM_PROP_SAMPLE "Wacom Sample and Suppress"
/* BOOL, 1 value */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/src/wcmUSB.c new/xf86-input-wacom-0.21.0/src/wcmUSB.c
--- old/xf86-input-wacom-0.20.0/src/wcmUSB.c 2013-02-26 18:26:42.000000000 +0100
+++ new/xf86-input-wacom-0.21.0/src/wcmUSB.c 2013-04-20 03:16:52.000000000 +0200
@@ -1,6 +1,6 @@
/*
* Copyright 1995-2002 by Frederic Lepied, France. <Lepied(a)XFree86.org>
- * Copyright 2002-2010 by Ping Cheng, Wacom. <pingc(a)wacom.com>
+ * Copyright 2002-2013 by Ping Cheng, Wacom. <pingc(a)wacom.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -32,7 +32,6 @@
typedef struct {
int wcmLastToolSerial;
- int wcmBTNChannel;
int wcmDeviceType;
Bool wcmPenTouch;
Bool wcmUseMT;
@@ -292,6 +291,7 @@
{ WACOM_VENDOR_ID, 0xEF, 100000, 100000, &usbTabletPC }, /* TabletPC 0xEF */
{ WACOM_VENDOR_ID, 0x100,100000, 100000, &usbTabletPC }, /* TabletPC 0x100 */
{ WACOM_VENDOR_ID, 0x101,100000, 100000, &usbTabletPC }, /* TabletPC 0x101 */
+ { WACOM_VENDOR_ID, 0x10D,100000, 100000, &usbTabletPC }, /* TabletPC 0x10D */
{ WACOM_VENDOR_ID, 0x4001,100000, 100000, &usbTabletPC }, /* TabletPC 0x4001 */
/* IDs from Waltop's driver, available http://www.waltop.com.tw/download.asp?lv=0&id=2.
@@ -448,7 +448,6 @@
{
WacomDevicePtr priv = (WacomDevicePtr)pInfo->private;
WacomCommonPtr common = priv->common;
- wcmUSBData* private = common->private;
WacomDeviceState *ds;
int channel = PAD_CHANNEL;
@@ -460,8 +459,6 @@
ds->device_type = PAD_ID;
ds->device_id = PAD_DEVICE_ID;
ds->serial_num = channel;
-
- private->wcmBTNChannel = channel;
}
int usbWcmGetRanges(InputInfoPtr pInfo)
@@ -1223,25 +1220,6 @@
(&common->wcmChannel[private->wcmMTChannel])->dirty |= change;
}
-static struct
-{
- unsigned long device_type;
- unsigned long tool_key;
-} wcmTypeToKey [] =
-{
- { STYLUS_ID, BTN_TOOL_PEN },
- { STYLUS_ID, BTN_TOOL_PENCIL },
- { STYLUS_ID, BTN_TOOL_BRUSH },
- { STYLUS_ID, BTN_TOOL_AIRBRUSH },
- { ERASER_ID, BTN_TOOL_RUBBER },
- { CURSOR_ID, BTN_TOOL_MOUSE },
- { CURSOR_ID, BTN_TOOL_LENS },
- { TOUCH_ID, BTN_TOOL_DOUBLETAP },
- { TOUCH_ID, BTN_TOOL_TRIPLETAP },
- { PAD_ID, BTN_FORWARD },
- { PAD_ID, BTN_0 }
-};
-
static void usbParseKeyEvent(WacomCommonPtr common,
struct input_event *event, int channel_number)
{
@@ -1434,6 +1412,8 @@
}
if (nkeys >= usbdata->npadkeys)
change = 0;
+ else if (!ds->device_type) /* expresskey pressed at startup */
+ ds->device_type = PAD_ID;
}
channel->dirty |= change;
@@ -1625,9 +1605,9 @@
ds = &common->wcmChannel[channel].work;
dslast = common->wcmChannel[channel].valid.state;
- /* no device type? tool was on the tablet at startup, force type and
- proximity */
+ /* no device type? */
if (!ds->device_type && private->wcmDeviceType) {
+ /* tool was on tablet at startup, force type and proximity */
ds->device_type = private->wcmDeviceType;
ds->proximity = 1;
}
@@ -1668,56 +1648,15 @@
}
else if (event->type == EV_KEY)
{
- usbParseKeyEvent(common, event, channel);
- usbParseBTNEvent(common, event, private->wcmBTNChannel);
+ /* Button events can be from puck or expresskeys */
+ int btn_channel = (ds->device_type == CURSOR_ID) ?
+ channel : PAD_CHANNEL;
- /* send PAD events now for generic devices. Otherwise,
- * they are filtered out when there are no motion events.
- */
- if ((common->wcmProtocolLevel == WCM_PROTOCOL_GENERIC)
- && (common->wcmChannel[private->wcmBTNChannel].dirty))
- {
- DBG(10, common, "Dirty flag set on channel %d; "
- "sending event.\n", private->wcmBTNChannel);
- common->wcmChannel[private->wcmBTNChannel].dirty = FALSE;
- wcmEvent(common, private->wcmBTNChannel,
- &common->wcmChannel[private->wcmBTNChannel].work);
- }
+ usbParseKeyEvent(common, event, channel);
+ usbParseBTNEvent(common, event, btn_channel);
}
} /* next event */
- /* device type unknown? Tool may be on the tablet when X starts. */
- if (!ds->device_type && !dslast.proximity)
- {
- unsigned long keys[NBITS(KEY_MAX)] = { 0 };
- int rc;
-
- if (!ds->proximity) {
- DBG(3, common, "Unknown out-of-prox device leaving prox. Ignoring.\n");
- return;
- }
-
- /* Retrieve the type by asking a resend from the kernel */
- rc = ioctl(common->fd, EVIOCGKEY(sizeof(keys)), keys);
- if (rc == -1)
- {
- LogMessageVerbSigSafe(X_ERROR, 0,
- "%s: failed to retrieve key bits\n",
- pInfo->name);
- return;
- }
-
- for (i = 0; i < ARRAY_SIZE(wcmTypeToKey); i++)
- {
- if (ISBITSET(keys, wcmTypeToKey[i].tool_key))
- {
- ds->device_type = wcmTypeToKey[i].device_type;
- ds->proximity = 1;
- break;
- }
- }
- }
-
/* DTF720 and DTF720a don't support eraser */
if (((common->tablet_id == 0xC0) || (common->tablet_id == 0xC2)) &&
(ds->device_type == ERASER_ID))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/src/wcmValidateDevice.c new/xf86-input-wacom-0.21.0/src/wcmValidateDevice.c
--- old/xf86-input-wacom-0.20.0/src/wcmValidateDevice.c 2013-02-26 18:16:41.000000000 +0100
+++ new/xf86-input-wacom-0.21.0/src/wcmValidateDevice.c 2013-04-18 23:45:21.000000000 +0200
@@ -269,6 +269,7 @@
case 0x100: /* TPC with MT */
case 0x101: /* TPC with MT */
+ case 0x10D: /* TPC with MT */
case 0x4001: /* TPC with MT */
case 0xE2: /* TPC with 2FGT */
case 0xE3: /* TPC with 2FGT */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/src/wcmXCommand.c new/xf86-input-wacom-0.21.0/src/wcmXCommand.c
--- old/xf86-input-wacom-0.20.0/src/wcmXCommand.c 2013-02-26 18:37:27.000000000 +0100
+++ new/xf86-input-wacom-0.21.0/src/wcmXCommand.c 2013-04-20 03:16:52.000000000 +0200
@@ -455,7 +455,7 @@
rc = wcmCheckActionProperty(priv, property, prop);
if (rc != Success) {
- char *msg = NULL;
+ const char *msg = NULL;
switch (rc) {
case BadMatch: msg = "BadMatch"; break;
case BadValue: msg = "BadValue"; break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/src/xf86Wacom.c new/xf86-input-wacom-0.21.0/src/xf86Wacom.c
--- old/xf86-input-wacom-0.20.0/src/xf86Wacom.c 2013-02-26 18:16:41.000000000 +0100
+++ new/xf86-input-wacom-0.21.0/src/xf86Wacom.c 2013-04-18 23:45:21.000000000 +0200
@@ -422,7 +422,10 @@
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 16
if (IsTouch(priv)) {
- if (!InitTouchClassDeviceStruct(pInfo->dev, common->wcmMaxContacts, XIDependentTouch, 2)) {
+ if (!InitTouchClassDeviceStruct(pInfo->dev, common->wcmMaxContacts,
+ TabletHasFeature(common, WCM_LCD) ? XIDirectTouch : XIDependentTouch,
+ 2))
+ {
xf86Msg(X_ERROR, "Unable to init touch class device struct!\n");
return FALSE;
}
@@ -858,7 +861,10 @@
}
pWcm->public.on = FALSE;
break;
-
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 100 + GET_ABI_MINOR(ABI_XINPUT_VERSION) >= 1901
+ case DEVICE_ABORT:
+ break;
+#endif
default:
xf86Msg(X_ERROR, "%s: invalid mode=%d. This is an X server bug.\n",
pInfo->name, what);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/src/xf86WacomDefs.h new/xf86-input-wacom-0.21.0/src/xf86WacomDefs.h
--- old/xf86-input-wacom-0.20.0/src/xf86WacomDefs.h 2013-02-26 18:26:42.000000000 +0100
+++ new/xf86-input-wacom-0.21.0/src/xf86WacomDefs.h 2013-04-18 23:45:21.000000000 +0200
@@ -1,6 +1,6 @@
/*
* Copyright 1995-2002 by Frederic Lepied, France. <Lepied(a)XFree86.org>
- * Copyright 2002-2010 by Ping Cheng, Wacom. <pingc(a)wacom.com>
+ * Copyright 2002-2013 by Ping Cheng, Wacom. <pingc(a)wacom.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -397,9 +397,9 @@
#define TILT_REQUEST_FLAG 1
#define TILT_ENABLED_FLAG 2
-#define MAX_CHANNELS 17
+#define MAX_FINGERS 16
+#define MAX_CHANNELS (MAX_FINGERS+2) /* one channel for stylus/mouse. The other one for pad */
#define PAD_CHANNEL (MAX_CHANNELS-1)
-#define MAX_FINGERS (MAX_CHANNELS-1)
typedef struct {
int wcmZoomDistance; /* minimum distance for a zoom touch gesture */
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xdpyinfo for openSUSE:Factory checked in at 2013-06-25 07:38:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdpyinfo (Old)
and /work/SRC/openSUSE:Factory/.xdpyinfo.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdpyinfo"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xdpyinfo/xdpyinfo.changes 2012-05-08 12:02:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xdpyinfo.new/xdpyinfo.changes 2013-06-25 14:47:15.000000000 +0200
@@ -1,0 +2,18 @@
+Sun Jun 23 18:07:41 UTC 2013 - zaitor(a)opensuse.org
+
+- Update to version 1.3.1:
+ + Mark num_known_extensions as a const, since the size is fixed
+ at compile time.
+ + Convert sprintf calls to snprintf.
+ + Rename i & count in inner loop to avoid shadowing same named
+ vars in outer loop.
+ + Add xrandr to SEE ALSO section of man page.
+ + Add -version option to print version number.
+ + Combine usage messages into a single string.
+ + Declare 'len' as size_t to avoid unneccessary back-and-forth
+ conversions, fixes clang warnings.
+ + Mark usage() as _X_NORETURN.
+ + Include Xwindows.h on WIN32 to avoid type clashes.
+ + Add pkgconfig(xproto) BuildRequires: new dependency.
+
+-------------------------------------------------------------------
Old:
----
xdpyinfo-1.3.0.tar.bz2
New:
----
xdpyinfo-1.3.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdpyinfo.spec ++++++
--- /var/tmp/diff_new_pack.vC4KEb/_old 2013-06-25 14:47:16.000000000 +0200
+++ /var/tmp/diff_new_pack.vC4KEb/_new 2013-06-25 14:47:16.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xdpyinfo
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,13 +15,14 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: xdpyinfo
-Version: 1.3.0
-Release: 1
-License: MIT
+Version: 1.3.1
+Release: 0
Summary: Utility to display information about an X server
-Url: http://xorg.freedesktop.org/
+License: MIT
Group: System/X11/Utilities
+Url: http://xorg.freedesktop.org/
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.…
BuildRequires: pkg-config
BuildRequires: pkgconfig(dmx)
@@ -33,6 +34,7 @@
BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xinerama)
BuildRequires: pkgconfig(xorg-macros) >= 1.8
+BuildRequires: pkgconfig(xproto) >= 7.0.17
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xtst)
BuildRequires: pkgconfig(xxf86dga)
++++++ xdpyinfo-1.3.0.tar.bz2 -> xdpyinfo-1.3.1.tar.bz2 ++++++
++++ 12394 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/xdpyinfo-1.3.0/ChangeLog new/xdpyinfo-1.3.1/ChangeLog
--- old/xdpyinfo-1.3.0/ChangeLog 2011-10-22 06:35:12.000000000 +0200
+++ new/xdpyinfo-1.3.1/ChangeLog 2013-05-21 03:49:49.000000000 +0200
@@ -1,3 +1,105 @@
+commit b980cacaa342cbbaa3012f06ffc2c9a9c21d33ee
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon May 20 18:48:42 2013 -0700
+
+ xdpyinfo 1.3.1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit fa36071570461e73b57583e490d794334b038f48
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Feb 10 19:50:21 2013 -0800
+
+ Mark num_known_extensions as a const, since the size is fixed at compile time
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 57a45f3b7bb745a082e459d965bee2b11e3bd7b6
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Feb 10 19:29:05 2013 -0800
+
+ Convert sprintf calls to snprintf
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit f08b3613b2fd6995da264ea0a39c6d48dd28bf97
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Feb 10 19:10:57 2013 -0800
+
+ Rename i & count in inner loop to avoid shadowing same named vars in outer loop
+
+ xdpyinfo.c: In function `print_dmx_info':
+ xdpyinfo.c:1282: warning: declaration of 'count' shadows a previous local
+ xdpyinfo.c:1231: warning: shadowed declaration is here
+ xdpyinfo.c:1282: warning: declaration of 'i' shadows a previous local
+ xdpyinfo.c:1232: warning: shadowed declaration is here
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 97db6f80f06b753c84de0276db093205ee34b0b0
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Jan 21 23:15:04 2013 -0800
+
+ Add xrandr to SEE ALSO section of man page
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 1b9a3d5459f61abf6285df81e4a75cb472e2a40c
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Jan 21 23:13:03 2013 -0800
+
+ Add -version option to print version number
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 27c57ec56abbd175c7a3ea7c50d85e91e1940c87
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Jan 21 23:08:43 2013 -0800
+
+ Combine usage messages into a single string
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit f407231c855bc0349d0f8543a9dfe9dff4b2508b
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Jan 21 23:03:48 2013 -0800
+
+ Declare 'len' as size_t to avoid unneccessary back-and-forth conversions
+
+ Fixes clang warnings:
+
+ xdpyinfo.c:1463:12: warning: implicit conversion loses integer precision: 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32]
+ int len = strlen(arg);
+ ~~~ ^~~~~~~~~~~
+ xdpyinfo.c:1465:32: warning: implicit conversion changes signedness: 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion]
+ if (!strncmp("-display", arg, len)) {
+ ~~~~~~~ ^~~
+ xdpyinfo.c:1468:47: warning: implicit conversion changes signedness: 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion]
+ } else if (!strncmp("-queryExtensions", arg, len)) {
+ ~~~~~~~ ^~~
+ xdpyinfo.c:1470:35: warning: implicit conversion changes signedness: 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion]
+ } else if (!strncmp("-ext", arg, len)) {
+ ~~~~~~~ ^~~
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit ee596f7f67b203d04974fce16deadfcd122d0441
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Jan 21 23:02:57 2013 -0800
+
+ Mark usage() as _X_NORETURN
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 5509502647a997959ec056fec23d471b73eddb5f
+Author: Jon TURNEY <jon.turney(a)dronecode.org.uk>
+Date: Wed Jan 4 18:21:51 2012 +0000
+
+ Include Xwindows.h on WIN32 to avoid type clashes
+
+ Signed-off-by: Jon TURNEY <jon.turney(a)dronecode.org.uk>
+ Reviewed-by: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net>
+
commit 02376118fb58c05067054be3f2e469f461f81757
Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
Date: Fri Oct 21 21:34:32 2011 -0700
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/xdpyinfo-1.3.0/configure.ac new/xdpyinfo-1.3.1/configure.ac
--- old/xdpyinfo-1.3.0/configure.ac 2011-10-22 06:34:21.000000000 +0200
+++ new/xdpyinfo-1.3.1/configure.ac 2013-05-21 03:49:03.000000000 +0200
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
-AC_INIT([xdpyinfo], [1.3.0],
+AC_INIT([xdpyinfo], [1.3.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xdpyinfo])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -36,7 +36,7 @@
AC_CONFIG_HEADERS([config.h])
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XDPYINFO, xext x11 xtst x11-xcb xcb)
+PKG_CHECK_MODULES(XDPYINFO, [xext x11 xtst x11-xcb xcb xproto >= 7.0.17])
# This is used below to allow <X11/Xlib.h> to be found
PKG_CHECK_MODULES(DPY_X11, x11)
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/xdpyinfo-1.3.0/man/xdpyinfo.man new/xdpyinfo-1.3.1/man/xdpyinfo.man
--- old/xdpyinfo-1.3.0/man/xdpyinfo.man 2011-09-29 05:41:43.000000000 +0200
+++ new/xdpyinfo-1.3.1/man/xdpyinfo.man 2013-05-21 03:49:03.000000000 +0200
@@ -30,6 +30,7 @@
[\-display \fIdisplayname\fP]
[\-queryExtensions]
[\-ext \fIextension-name\fP]
+[-version]
.SH DESCRIPTION
.PP
.I Xdpyinfo
@@ -49,6 +50,9 @@
\fB\-ext\fP \fIextensionName\fP option. If \fIextensionName\fP is
\fBall\fP, information about all extensions supported by both \fIxdpyinfo\fP
and the server is displayed.
+.PP
+If \fB-version\fP is specified, xdpyinfo prints its version and exits, without
+contacting the X server.
.SH ENVIRONMENT
.PP
.TP 8
@@ -59,6 +63,7 @@
.IR xprop (__appmansuffix__),
.IR xrdb (__appmansuffix__),
.IR xwininfo (__appmansuffix__),
+.IR xrandr (__appmansuffix__),
.IR xdriinfo (__appmansuffix__),
.IR xvinfo (__appmansuffix__),
.IR glxinfo (__appmansuffix__)
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/xdpyinfo-1.3.0/missing new/xdpyinfo-1.3.1/missing
--- old/xdpyinfo-1.3.0/missing 2011-10-22 06:34:57.000000000 +0200
+++ new/xdpyinfo-1.3.1/missing 2013-05-21 03:49:11.000000000 +0200
@@ -1,11 +1,10 @@
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# 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
@@ -26,69 +25,40 @@
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <bug-automake(a)gnu.org>."
exit $?
@@ -100,272 +70,141 @@
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
- ;;
-esac
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'automa4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
+ ;;
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
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/xdpyinfo-1.3.0/xdpyinfo.c new/xdpyinfo-1.3.1/xdpyinfo.c
--- old/xdpyinfo-1.3.0/xdpyinfo.c 2011-09-29 05:51:46.000000000 +0200
+++ new/xdpyinfo-1.3.1/xdpyinfo.c 2013-05-21 03:49:03.000000000 +0200
@@ -78,6 +78,10 @@
#endif
+#ifdef WIN32
+#include <X11/Xwindows.h>
+#endif
+
#include <X11/Xlib-xcb.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -332,7 +336,8 @@
case LSBFirst: cp = "LSBFirst"; break;
case MSBFirst: cp = "MSBFirst"; break;
default:
- sprintf (dummybuf, "unknown order %d", BitmapBitOrder (dpy));
+ snprintf (dummybuf, sizeof(dummybuf),
+ "unknown order %d", BitmapBitOrder (dpy));
cp = dummybuf;
break;
}
@@ -343,7 +348,8 @@
case LSBFirst: cp = "LSBFirst"; break;
case MSBFirst: cp = "MSBFirst"; break;
default:
- sprintf (dummybuf, "unknown order %d", ImageByteOrder (dpy));
+ snprintf (dummybuf, sizeof(dummybuf),
+ "unknown order %d", ImageByteOrder (dpy));
cp = dummybuf;
break;
}
@@ -417,7 +423,7 @@
case TrueColor: class = "TrueColor"; break;
case DirectColor: class = "DirectColor"; break;
default:
- sprintf (errorbuf, "unknown class %d", vip->class);
+ snprintf (errorbuf, sizeof(errorbuf), "unknown class %d", vip->class);
class = errorbuf;
break;
}
@@ -1275,15 +1281,15 @@
if (ext
&& ext != (XExtensionVersion *)NoSuchExtension) {
- int count, i;
+ int dcount, d;
XDeviceInfo *devInfo = XListInputDevices(backend,
- &count);
+ &dcount);
if (devInfo) {
- for (i = 0; i < count; i++) {
+ for (d = 0; d < dcount; d++) {
if ((unsigned)iinfo.physicalId
- == devInfo[i].id
- && devInfo[i].name) {
- backendname = strdup(devInfo[i].name);
+ == devInfo[d].id
+ && devInfo[d].name) {
+ backendname = strdup(devInfo[d].name);
break;
}
}
@@ -1369,7 +1375,7 @@
/* add new extensions here */
};
-static int num_known_extensions = sizeof known_extensions / sizeof known_extensions[0];
+static const int num_known_extensions = sizeof known_extensions / sizeof known_extensions[0];
static void
print_known_extensions(FILE *f)
@@ -1432,14 +1438,15 @@
}
}
-static void
+static void _X_NORETURN
usage(void)
{
- fprintf (stderr, "usage: %s [options]\n", ProgramName);
- fprintf (stderr, "-display displayname\tserver to query\n");
- fprintf (stderr, "-queryExtensions\tprint info returned by XQueryExtension\n");
- fprintf (stderr, "-ext all\t\tprint detailed info for all supported extensions\n");
- fprintf (stderr, "-ext extension-name\tprint detailed info for extension-name if one of:\n ");
+ fprintf (stderr, "usage: %s [options]\n%s", ProgramName,
+ "-display displayname\tserver to query\n"
+ "-version\t\tprint program version and exit\n"
+ "-queryExtensions\tprint info returned by XQueryExtension\n"
+ "-ext all\t\tprint detailed info for all supported extensions\n"
+ "-ext extension-name\tprint detailed info for extension-name if one of:\n ");
print_known_extensions(stderr);
fprintf (stderr, "\n");
exit (1);
@@ -1456,7 +1463,7 @@
for (i = 1; i < argc; i++) {
char *arg = argv[i];
- int len = strlen(arg);
+ size_t len = strlen(arg);
if (!strncmp("-display", arg, len)) {
if (++i >= argc) usage ();
@@ -1466,6 +1473,9 @@
} else if (!strncmp("-ext", arg, len)) {
if (++i >= argc) usage ();
mark_extension_for_printing(argv[i]);
+ } else if (!strncmp("-version", arg, len)) {
+ printf("%s\n", PACKAGE_STRING);
+ exit (0);
} else
usage ();
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package vte for openSUSE:Factory checked in at 2013-06-25 09:36:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vte (Old)
and /work/SRC/openSUSE:Factory/.vte.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vte"
Changes:
--------
--- /work/SRC/openSUSE:Factory/vte/vte.changes 2013-05-16 11:43:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vte.new/vte.changes 2013-06-25 14:47:05.000000000 +0200
@@ -1,0 +2,10 @@
+Sat Jun 15 18:01:01 UTC 2013 - zaitor(a)opensuse.org
+
+- Update to version 0.34.6:
+ + vte.sh bugfix.
+ + Add new flag for vte_terminal_fork_command_full() to not copy
+ the parent environment.
+ + Allow the empty string to OSC 6 and OSC 7 to unset a previously
+ set value.
+
+-------------------------------------------------------------------
Old:
----
vte-0.34.5.tar.xz
New:
----
vte-0.34.6.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vte.spec ++++++
--- /var/tmp/diff_new_pack.4mGIyp/_old 2013-06-25 14:47:05.000000000 +0200
+++ /var/tmp/diff_new_pack.4mGIyp/_new 2013-06-25 14:47:05.000000000 +0200
@@ -24,7 +24,7 @@
Name: vte
%define _name vte
Url: http://www.gnome.org
-Version: 0.34.5
+Version: 0.34.6
Release: 0
Summary: Terminal Emulator Library
License: LGPL-2.0 and GPL-2.0+
++++++ vte-0.34.5.tar.xz -> vte-0.34.6.tar.xz ++++++
++++ 21794 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package vcdimager for openSUSE:Factory checked in at 2013-06-25 09:36:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vcdimager (Old)
and /work/SRC/openSUSE:Factory/.vcdimager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vcdimager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/vcdimager/vcdimager.changes 2013-03-04 17:34:18.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.vcdimager.new/vcdimager.changes 2013-06-25 14:47:01.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jun 21 04:05:02 UTC 2013 - crrodriguez(a)opensuse.org
+
+- Build with large file support in 32 bit archs
+- remove leftover debug statement in the spec file
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vcdimager.spec ++++++
--- /var/tmp/diff_new_pack.LYwIcA/_old 2013-06-25 14:47:01.000000000 +0200
+++ /var/tmp/diff_new_pack.LYwIcA/_new 2013-06-25 14:47:01.000000000 +0200
@@ -132,6 +132,7 @@
sed -i 's/AM_PROG_CC_STDC/AC_PROG_CC/' configure.ac
%build
+export CFLAGS="%optflags $(getconf LFS_CFLAGS) -D_GNU_SOURCE"
./autogen.sh
%configure --enable-maintainer-mode --enable-static=no --enable-shared=yes --with-pic
make %{?_smp_mflags}
@@ -141,7 +142,6 @@
%if 1 == 0
rm -f %{buildroot}%{_libdir}/*.la
%endif
-grep -r -E '^#include[ \t]+[<"][^>"]+[">]' %{buildroot}%{_includedir} | awk -F: '{print $2}'
%fdupes -s %{buildroot}%{_mandir}
%check
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0