Mailinglist Archive: opensuse-commit (926 mails)
| < Previous | Next > |
commit sobby for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 08 Dec 2009 12:14:41 +0100
- Message-id: <20091208111441.BA92120245@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package sobby for openSUSE:Factory
checked in at Tue Dec 8 12:14:41 CET 2009.
--------
--- GNOME/sobby/sobby.changes 2008-09-12 16:14:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/sobby/sobby.changes 2009-11-30
18:01:29.000000000 +0100
@@ -1,0 +2,10 @@
+Mon Nov 30 17:55:44 CET 2009 - dimstar@xxxxxxxxxxxx
+
+- Update to version 0.4.6:
+ + Allow to configure both autosaving facilities (file and
+ directory)
+ + Initial files are added without directory names in their
+ document title
+ + Create sockets non-blocking on *nix systems.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
sobby-0.4.5.tar.bz2
New:
----
sobby-0.4.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sobby.spec ++++++
--- /var/tmp/diff_new_pack.2ggWis/_old 2009-12-08 12:13:52.000000000 +0100
+++ /var/tmp/diff_new_pack.2ggWis/_new 2009-12-08 12:13:52.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package sobby (Version 0.4.5)
+# spec file for package sobby (Version 0.4.6)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,10 +26,10 @@
BuildRequires: libxml++-devel
BuildRequires: obby-devel
BuildRequires: pkg-config
-License: GPL v2 or later
+License: GPLv2+
Group: System/GUI/GNOME
AutoReqProv: on
-Version: 0.4.5
+Version: 0.4.6
Release: 1
Summary: Stand-alone obby server
Source: %{name}-%{version}.tar.bz2
++++++ sobby-0.4.5.tar.bz2 -> sobby-0.4.6.tar.bz2 ++++++
++++ 9435 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/sobby-0.4.5/ChangeLog new/sobby-0.4.6/ChangeLog
--- old/sobby-0.4.5/ChangeLog 2008-09-11 15:17:40.000000000 +0200
+++ new/sobby-0.4.6/ChangeLog 2009-11-15 13:57:27.000000000 +0100
@@ -1,3 +1,18 @@
+2009-11-15 Philipp Kern <phil@xxxxxxxx>
+
+ * configure.ac:
+ * NEWS: bump version to 0.4.6 and document the changes
+
+2009-05-29 Philipp Kern <phil@xxxxxxxx>
+
+ * src/gselector.cpp: Set sockets to non-blocking when adding them to
+ the selector.
+
+2008-10-04 Armin Burgmeier <armin@xxxxxxxx>
+
+ * src/server.cpp: Allow setting both autosavers, only use basename as
+ document title for initial files.
+
2008-09-11 Philipp Kern <phil@xxxxxxxx>
* configure.ac:
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/sobby-0.4.5/INSTALL new/sobby-0.4.6/INSTALL
--- old/sobby-0.4.5/INSTALL 2008-02-10 03:55:24.000000000 +0100
+++ new/sobby-0.4.6/INSTALL 2009-08-14 11:32:22.000000000 +0200
@@ -2,15 +2,15 @@
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-This file is free documentation; the Free Software Foundation gives
+ This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
-Briefly, the shell commands `./configure; make; make install' should
+ Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
@@ -73,9 +73,9 @@
Compilers and Options
=====================
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
@@ -88,7 +88,7 @@
Compiling For Multiple Architectures
====================================
-You can compile the package for more than one kind of computer at the
+ You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
@@ -100,10 +100,24 @@
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
Installation Names
==================
-By default, `make install' installs the package's commands under
+ By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
@@ -126,7 +140,7 @@
Optional Features
=================
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -138,14 +152,46 @@
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
Specifying the System Type
==========================
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -153,7 +199,8 @@
where SYSTEM can have one of these forms:
- OS KERNEL-OS
+ OS
+ KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
@@ -171,9 +218,9 @@
Sharing Defaults
================
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -182,7 +229,7 @@
Defining Variables
==================
-Variables not defined in a site shell script can be set in the
+ Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -201,11 +248,19 @@
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
- Print a summary of the options to `configure', and exit.
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
`--version'
`-V'
@@ -232,6 +287,16 @@
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
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/sobby-0.4.5/NEWS new/sobby-0.4.6/NEWS
--- old/sobby-0.4.5/NEWS 2008-09-11 15:18:31.000000000 +0200
+++ new/sobby-0.4.6/NEWS 2009-11-15 13:56:51.000000000 +0100
@@ -1,6 +1,11 @@
sobby
=====
+Version 0.4.6:
+ * Allow to configure both autosaving facilities (file and directory).
+ * Initial files are added without directory names in their document title.
+ * Create sockets non-blocking on *nix systems.
+
Version 0.4.5:
* Run autosave on SIGUSR1 and SIGTERM if an autosave file is specified,
even if autosave interval is 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/sobby-0.4.5/configure.ac new/sobby-0.4.6/configure.ac
--- old/sobby-0.4.5/configure.ac 2008-09-11 15:14:03.000000000 +0200
+++ new/sobby-0.4.6/configure.ac 2009-11-15 13:56:57.000000000 +0100
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([sobby], [0.4.5], [crew@xxxxxxxx])
+AC_INIT([sobby], [0.4.6], [crew@xxxxxxxx])
AM_INIT_AUTOMAKE(1.9 check-news)
AM_MAINTAINER_MODE
AC_CONFIG_SRCDIR([inc/server.hpp])
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/sobby-0.4.5/inc/features.hpp.in new/sobby-0.4.6/inc/features.hpp.in
--- old/sobby-0.4.5/inc/features.hpp.in 2008-09-11 15:19:34.000000000 +0200
+++ new/sobby-0.4.6/inc/features.hpp.in 2009-11-15 13:57:57.000000000 +0100
@@ -15,6 +15,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
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/sobby-0.4.5/missing new/sobby-0.4.6/missing
--- old/sobby-0.4.5/missing 2008-02-10 03:55:24.000000000 +0100
+++ new/sobby-0.4.6/missing 2009-08-14 11:32:22.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@xxxxxxxxxxxxxxxx>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+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@xxxxxxx>."
exit $?
;;
@@ -106,15 +107,22 @@
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).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ 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
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ 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
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ 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
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ 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
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/sobby-0.4.5/src/gselector.cpp new/sobby-0.4.6/src/gselector.cpp
--- old/sobby-0.4.5/src/gselector.cpp 2008-09-11 15:12:43.000000000 +0200
+++ new/sobby-0.4.6/src/gselector.cpp 2009-11-15 13:46:45.000000000 +0100
@@ -18,6 +18,10 @@
#include "gselector.hpp"
+#ifndef _WIN32
+# include <fcntl.h>
+#endif
+
namespace
{
inline Glib::IOCondition gcond(net6::io_condition cond)
@@ -72,6 +76,13 @@
{
net6::socket::socket_type fd = sock.cobj();
+#ifndef _WIN32
+ // Put the socket unconditionally into non-blocking mode.
+ int current_flags = fcntl(fd, F_GETFL);
+ if(fcntl(fd, F_SETFL, current_flags | O_NONBLOCK) == -1)
+ throw net6::error(net6::error::SYSTEM);
+#endif
+
sel.io_chan =
#ifdef _WIN32
Glib::IOChannel::create_from_win32_socket(fd);
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/sobby-0.4.5/src/server.cpp new/sobby-0.4.6/src/server.cpp
--- old/sobby-0.4.5/src/server.cpp 2008-09-11 15:12:43.000000000 +0200
+++ new/sobby-0.4.6/src/server.cpp 2009-11-15 13:46:45.000000000 +0100
@@ -18,6 +18,7 @@
#include <iostream>
#include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
#include <glibmm/optionentry.h>
#include <glibmm/optiongroup.h>
#include <glibmm/optioncontext.h>
@@ -426,14 +427,14 @@
throw
std::runtime_error(errstring.str());
}
- m_server->document_create(argv[i], "UTF-8",
content);
+
m_server->document_create(Glib::path_get_basename(argv[i]), "UTF-8", content);
}
}
}
m_server->set_global_password(password);
- if(autosave_folder.empty())
+ if(!autosave_file.empty())
{
m_autosaver.reset(
new AutoSaver(
@@ -447,7 +448,8 @@
m_autosaver->error_event().connect(
sigc::mem_fun(*this, &Server::on_autosave_error) );
}
- else
+
+ if(!autosave_folder.empty())
{
if(!Glib::file_test(autosave_folder, Glib::FILE_TEST_IS_DIR))
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |