June 2013 - openSUSE Commits - openSUSE Mailing Lists

commit rakudo for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package rakudo for openSUSE:Factory checked in at 2013-06-28 18:57:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rakudo (Old) and /work/SRC/openSUSE:Factory/.rakudo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rakudo" Changes: -------- --- /work/SRC/openSUSE:Factory/rakudo/rakudo.changes 2013-01-17 15:56:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rakudo.new/rakudo.changes 2013-06-28 18:57:30.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 3 13:48:44 UTC 2013 - daxim(a)cpan.org + +- update to 2013.05 +<https://github.com/rakudo/rakudo/blob/nom/docs/announce/2013.05.md> + +------------------------------------------------------------------- Old: ---- rakudo-2012.12.tar.gz New: ---- rakudo-2013.05.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rakudo.spec ++++++ --- /var/tmp/diff_new_pack.tM1z5U/_old 2013-06-28 18:57:31.000000000 +0200 +++ /var/tmp/diff_new_pack.tM1z5U/_new 2013-06-28 18:57:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: rakudo -Version: 2012.12 +Version: 2013.05 Release: 0 Summary: Perl 6 implemenation that runs on Parrot License: Artistic-2.0 @@ -40,20 +40,23 @@ %build perl Configure.pl --with-nqp=/usr/bin/nqp make -# currently hangs on 32bit platforms :( -#make test + +%check +make test %install make install DESTDIR=$RPM_BUILD_ROOT -rm -rf $RPM_BUILD_ROOT/usr/share/doc +mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} +mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} $RPM_BUILD_ROOT%{_defaultdocdir} %files %defattr(-,root,root) -%doc CREDITS LICENSE README %{_bindir}/* %{_libdir}/parrot/*/dynext/* %{_libdir}/parrot/*/languages/nqp/lib/* %{_libdir}/parrot/*/languages/perl6 %doc %{_mandir}/man1/* +%dir %{_defaultdocdir}/%{name} +%doc %{_defaultdocdir}/%{name}/* %changelog ++++++ rakudo-2012.12.tar.gz -> rakudo-2013.05.tar.gz ++++++ ++++ 63983 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

commit qscintilla for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package qscintilla for openSUSE:Factory checked in at 2013-06-28 18:57:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qscintilla (Old) and /work/SRC/openSUSE:Factory/.qscintilla.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qscintilla" Changes: -------- python3-qscintilla.changes: same change --- /work/SRC/openSUSE:Factory/qscintilla/qscintilla.changes 2013-04-16 06:56:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qscintilla.new/qscintilla.changes 2013-06-28 18:57:06.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Jun 19 07:12:31 UTC 2013 - dmueller(a)suse.com + +- update to 2.7.2: + - The build script for the Python bindings now has a --pyqt argument for + specifying PyQt4 or PyQt5. + - The default EOL mode on OS/X is now EolUnix. + - Bug fixes. + +------------------------------------------------------------------- Old: ---- QScintilla-gpl-2.7.1.tar.gz New: ---- QScintilla-gpl-2.7.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.945Xaa/_old 2013-06-28 18:57:07.000000000 +0200 +++ /var/tmp/diff_new_pack.945Xaa/_new 2013-06-28 18:57:07.000000000 +0200 @@ -28,10 +28,10 @@ License: GPL-2.0+ Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 2.7.1 +Version: 2.7.2 Release: 0 %define scintilla_version %version -Source: http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/QScintilla… +Source: http://downloads.sourceforge.net/project/pyqt/QScintilla2/QScintilla-%{vers… %requires_ge python-qt4 %requires_ge python-sip %py_requires ++++++ python3-qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.945Xaa/_old 2013-06-28 18:57:07.000000000 +0200 +++ /var/tmp/diff_new_pack.945Xaa/_new 2013-06-28 18:57:07.000000000 +0200 @@ -22,10 +22,10 @@ License: GPL-2.0+ Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 2.7.1 +Version: 2.7.2 Release: 0 %define scintilla_version %version -Source: http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/QScintilla… +Source: http://downloads.sourceforge.net/project/pyqt/QScintilla2/QScintilla-%{vers… Requires: python3-qt4 >= %( echo `rpm -q --queryformat '%{VERSION}' python3-qt4`) BuildRequires: libqscintilla-devel ++++++ qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.945Xaa/_old 2013-06-28 18:57:07.000000000 +0200 +++ /var/tmp/diff_new_pack.945Xaa/_new 2013-06-28 18:57:07.000000000 +0200 @@ -24,10 +24,10 @@ License: GPL-2.0+ Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 2.7.1 +Version: 2.7.2 Release: 0 %define scintilla_version %version -Source: http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/QScintilla… +Source: http://downloads.sourceforge.net/project/pyqt/QScintilla2/QScintilla-%{vers… Patch: %name.diff %define debug_package_requires libqscintilla2-9 = %version-%release ++++++ QScintilla-gpl-2.7.1.tar.gz -> QScintilla-gpl-2.7.2.tar.gz ++++++ ++++ 9084 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

commit python-gobject for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package python-gobject for openSUSE:Factory checked in at 2013-06-28 18:56:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-gobject (Old) and /work/SRC/openSUSE:Factory/.python-gobject.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-gobject" Changes: -------- --- /work/SRC/openSUSE:Factory/python-gobject/python-gobject.changes 2013-06-05 13:08:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-gobject.new/python-gobject.changes 2013-06-28 18:56:55.000000000 +0200 @@ -1,0 +2,16 @@ +Tue May 28 19:55:29 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 3.9.2: + + examples/option.py: Port to GI and Python 3. + + Fix vfunc info search for classes with multiple inheritance + (bgo#700092). + + Fix closure argument conversion for enum and flag in args. + + Fix marshaling Python to FFI return value for enum and flags. + + Remove half implemented GC in PyGIBaseInfo, PyGIStruct, and + PyGIBoxed (bgo#677091). + + Replace usage of pyg_begin_allow_threads with + Py_BEGIN_ALLOW_THREADS (bgo#699440). + + Remove and deprecate API for setting of thread blocking + functions (bgo#699440). + +------------------------------------------------------------------- python3-gobject.changes: same change Old: ---- pygobject-3.9.1.tar.xz New: ---- pygobject-3.9.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-gobject.spec ++++++ --- /var/tmp/diff_new_pack.iQZ8da/_old 2013-06-28 18:56:56.000000000 +0200 +++ /var/tmp/diff_new_pack.iQZ8da/_new 2013-06-28 18:56:56.000000000 +0200 @@ -37,7 +37,7 @@ Summary: Python bindings for GObject License: LGPL-2.1+ Group: Development/Libraries/Python -Version: 3.9.1 +Version: 3.9.2 Release: 0 Url: http://ftp.gnome.org/pub/GNOME/sources/pygobject/ Source: http://download.gnome.org/sources/pygobject/3.9/%{_name}-%{version}.tar.xz python3-gobject.spec: same change ++++++ pygobject-3.9.1.tar.xz -> pygobject-3.9.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/ChangeLog new/pygobject-3.9.2/ChangeLog --- old/pygobject-3.9.1/ChangeLog 2013-04-30 20:49:31.000000000 +0200 +++ new/pygobject-3.9.2/ChangeLog 2013-05-28 17:54:49.000000000 +0200 @@ -1,3 +1,141 @@ +commit af8d048442b924c72a1d0ae868ee63ccf292759d +Author: Martin Pitt <martinpitt(a)gnome.org> +Date: Fri May 24 13:03:07 2013 +0200 + + examples/option.py: Port to GI and Python 3 + + examples/option.py | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +commit bef5939ca77f4d6939cd9229bd124dfe825b3bdb +Author: Simon Feltman <sfeltman(a)src.gnome.org> +Date: Sun May 12 18:58:06 2013 -0700 + + Fix vfunc info search for classes with multiple inheritance + + Ensure the search for vfunc GI info continues recursively even if the + current class being looked at does not contain GI info of type + InterfaceInfo. This more exhaustive search is needed for setups with + multiple sub-classes and multiple inheritance. + + https://bugzilla.gnome.org/show_bug.cgi?id=700092 + + gi/types.py | 12 +++++++----- + tests/test_gi.py | 1 - + 2 files changed, 7 insertions(+), 6 deletions(-) + +commit 5b8dff59baa1a3e524dac7877dd5b33dea52b026 +Author: Simon Feltman <sfeltman(a)src.gnome.org> +Date: Sun May 12 22:19:38 2013 -0700 + + Fix closure argument conversion for enum and flag in args + + Replace incorrect cast and assignment of double with uint for flags + and enums. + + gi/pygi-closure.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 065503d5e284dc89bacd79d0d9a72eb739882bf8 +Author: Simon Feltman <sfeltman(a)src.gnome.org> +Date: Sat May 11 21:47:54 2013 -0700 + + tests: Add tests for overriding vfunc implementations + + Add tests for overriding vfuncs for both single inheritance + and multiple inheritance with an interface (currently failing). + + https://bugzilla.gnome.org/show_bug.cgi?id=700092 + + tests/test_gi.py | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +commit c4e1112840004af264b4f2a052f333ea38f95cb6 +Author: Simon Feltman <sfeltman(a)src.gnome.org> +Date: Sat May 11 20:28:22 2013 -0700 + + Fix marshaling Python to FFI return value for enum and flags + + Add break to GI_TYPE_TAG_INTERFACE case. This was falling through + causing + assignment of arg.v_pointer to the ffi return arg. + + gi/pygi-closure.c | 1 + + 1 file changed, 1 insertion(+) + +commit a703217eaf4075e9720d4247351e1dfc4f553772 +Author: Simon Feltman <sfeltman(a)src.gnome.org> +Date: Fri Apr 19 06:37:24 2013 -0700 + + Remove half implemented GC in PyGIBaseInfo, PyGIStruct, and PyGIBoxed + + Remove half implemented GC tracking from PyGIBaseInfo as it was not + needed (the implemented was also missing usage of + PyObject_GC_New/Track). + Ensure weakref list for PyGIBaseInfo is initialized to NULL and + cleared + properly. + Remove invalid calls to PyObject_GC_UnTrack and PyObject_ClearWeakRefs + for both PyGIStruct and PyGIBoxed as these types were not being + advertised as GC aware with Py_TPFLAGS_HAVE_GC. + + https://bugzilla.gnome.org/show_bug.cgi?id=677091 + + gi/pygi-boxed.c | 4 ---- + gi/pygi-info.c | 20 +++++--------------- + gi/pygi-struct.c | 4 ---- + 3 files changed, 5 insertions(+), 23 deletions(-) + +commit 87e41db2e060acd689a2ac043bc1ac51007de6f3 +Author: Simon Feltman <sfeltman(a)src.gnome.org> +Date: Fri May 3 02:00:07 2013 -0700 + + Replace usage of pyg_begin_allow_threads with Py_BEGIN_ALLOW_THREADS + + Replace all usage of pyg[lib]_begin_allow_threads with direct usage + of Py_BEGIN_ALLOW_THREADS. + + https://bugzilla.gnome.org/show_bug.cgi?id=699440 + + gi/_glib/pyglib.h | 4 ---- + gi/_glib/pygoptioncontext.c | 4 ++-- + gi/_gobject/pygobject.c | 33 ++++++++++++++++----------------- + gi/gimodule.c | 4 ++-- + gi/pygi-invoke.c | 4 ++-- + 5 files changed, 22 insertions(+), 27 deletions(-) + +commit c9e95663d05de98a9abd3d1479554b1f09753382 +Author: Simon Feltman <sfeltman(a)src.gnome.org> +Date: Thu May 2 03:57:05 2013 -0700 + + Remove and deprecate API for setting of thread blocking functions + + Remove pyglib_set_thread_block_funcs and deprecate + pyg_set_thread_block_funcs. + The thread block function APIs are no longer be neccessary because + PyGObject + can use the Python C API directly when working with threads. + + https://bugzilla.gnome.org/show_bug.cgi?id=699440 + + gi/_glib/pyglib.c | 41 ----------------------------------- + gi/_glib/pyglib.h | 9 ++++---- + gi/_gobject/gobjectmodule.c | 25 ++++++++------------- + gi/_gobject/pygobject-private.h | 33 ---------------------------- + gi/_gobject/pygobject.h | 48 + ++++++++++++++++++++--------------------- + gi/gimodule.c | 15 +++++++------ + 6 files changed, 46 insertions(+), 125 deletions(-) + +commit 05498a5732582a5ed1944bd1383af154ca5fc4e6 +Author: Martin Pitt <martinpitt(a)gnome.org> +Date: Tue Apr 30 11:51:05 2013 -0700 + + configure.ac: Post-release bump to 3.9.2 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 902bb6685fd9c90c7d81127861a152b0fab4b107 Author: Martin Pitt <martinpitt(a)gnome.org> Date: Tue Apr 30 11:49:03 2013 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/NEWS new/pygobject-3.9.2/NEWS --- old/pygobject-3.9.1/NEWS 2013-04-30 20:48:10.000000000 +0200 +++ new/pygobject-3.9.2/NEWS 2013-05-28 17:54:12.000000000 +0200 @@ -1,3 +1,18 @@ +3.9.2 28-May-2013 + - examples/option.py: Port to GI and Python 3 (Martin Pitt) + - Fix vfunc info search for classes with multiple inheritance + (Simon Feltman) (#700092) + - Fix closure argument conversion for enum and flag in args + (Simon Feltman) + - Fix marshaling Python to FFI return value for enum and flags + (Simon Feltman) + - Remove half implemented GC in PyGIBaseInfo, PyGIStruct, and PyGIBoxed + (Simon Feltman) (#677091) + - Replace usage of pyg_begin_allow_threads with Py_BEGIN_ALLOW_THREADS + (Simon Feltman) (#699440) + - Remove and deprecate API for setting of thread blocking functions + (Simon Feltman) (#699440) + 3.9.1 30-Apr-2013 - gtk-demo: Wrap description strings at 80 characters (Simon Feltman) (#698547) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/PKG-INFO new/pygobject-3.9.2/PKG-INFO --- old/pygobject-3.9.1/PKG-INFO 2013-04-30 20:41:57.000000000 +0200 +++ new/pygobject-3.9.2/PKG-INFO 2013-05-15 08:00:52.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: PyGObject -Version: 3.9.1 +Version: 3.9.2 Summary: Python bindings for GObject Home-page: http://www.pygtk.org/ Author: James Henstridge @@ -8,7 +8,7 @@ Maintainer: Johan Dahlin Maintainer-email: johan(a)gnome.org License: GNU LGPL -Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.9/pygobject-3.9.1.tar.gz +Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.9/pygobject-3.9.2.tar.gz Description: Python bindings for GLib and GObject Platform: POSIX, Windows Classifier: Development Status :: 5 - Production/Stable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/aclocal.m4 new/pygobject-3.9.2/aclocal.m4 --- old/pygobject-3.9.1/aclocal.m4 2013-04-30 20:41:47.000000000 +0200 +++ new/pygobject-3.9.2/aclocal.m4 2013-05-15 08:00:38.000000000 +0200 @@ -1780,7 +1780,7 @@ # Use recursive makes in order to ignore errors during check check-code-coverage: -ifdef CODE_COVERAGE_ENABLED +ifeq ($(CODE_COVERAGE_ENABLED),yes) -$(MAKE) $(AM_MAKEFLAGS) -k check $(MAKE) $(AM_MAKEFLAGS) code-coverage-capture else @@ -1789,7 +1789,7 @@ # Capture code coverage data code-coverage-capture: code-coverage-capture-hook -ifdef CODE_COVERAGE_ENABLED +ifeq ($(CODE_COVERAGE_ENABLED),yes) $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS) $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp @@ -1802,11 +1802,13 @@ # Hook rule executed before code-coverage-capture, overridable by the user code-coverage-capture-hook: +ifeq ($(CODE_COVERAGE_ENABLED),yes) clean: code-coverage-clean code-coverage-clean: -$(LCOV) --directory $(top_builddir) -z -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY) -find . -name "*.gcda" -o -name "*.gcov" -delete +endif GITIGNOREFILES ?= GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/configure new/pygobject-3.9.2/configure --- old/pygobject-3.9.1/configure 2013-04-30 20:41:48.000000000 +0200 +++ new/pygobject-3.9.2/configure 2013-05-15 08:00:39.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pygobject 3.9.1. +# Generated by GNU Autoconf 2.69 for pygobject 3.9.2. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='pygobject' PACKAGE_TARNAME='pygobject' -PACKAGE_VERSION='3.9.1' -PACKAGE_STRING='pygobject 3.9.1' +PACKAGE_VERSION='3.9.2' +PACKAGE_STRING='pygobject 3.9.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject' PACKAGE_URL='https://live.gnome.org/PyGObject/' @@ -1395,7 +1395,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 pygobject 3.9.1 to adapt to many kinds of systems. +\`configure' configures pygobject 3.9.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1465,7 +1465,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pygobject 3.9.1:";; + short | recursive ) echo "Configuration of pygobject 3.9.2:";; esac cat <<\_ACEOF @@ -1600,7 +1600,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pygobject configure 3.9.1 +pygobject configure 3.9.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1878,7 +1878,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pygobject $as_me 3.9.1, which was +It was created by pygobject $as_me 3.9.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2242,9 +2242,9 @@ PYGOBJECT_MINOR_VERSION=9 -$as_echo "#define PYGOBJECT_MICRO_VERSION 1" >>confdefs.h +$as_echo "#define PYGOBJECT_MICRO_VERSION 2" >>confdefs.h -PYGOBJECT_MICRO_VERSION=1 +PYGOBJECT_MICRO_VERSION=2 ac_config_headers="$ac_config_headers config.h" @@ -2755,7 +2755,7 @@ # Define the identity of the package. PACKAGE='pygobject' - VERSION='3.9.1' + VERSION='3.9.2' cat >>confdefs.h <<_ACEOF @@ -14532,7 +14532,7 @@ # Use recursive makes in order to ignore errors during check check-code-coverage: -ifdef CODE_COVERAGE_ENABLED +ifeq ($(CODE_COVERAGE_ENABLED),yes) -$(MAKE) $(AM_MAKEFLAGS) -k check $(MAKE) $(AM_MAKEFLAGS) code-coverage-capture else @@ -14541,7 +14541,7 @@ # Capture code coverage data code-coverage-capture: code-coverage-capture-hook -ifdef CODE_COVERAGE_ENABLED +ifeq ($(CODE_COVERAGE_ENABLED),yes) $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS) $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp @@ -14554,11 +14554,13 @@ # Hook rule executed before code-coverage-capture, overridable by the user code-coverage-capture-hook: +ifeq ($(CODE_COVERAGE_ENABLED),yes) clean: code-coverage-clean code-coverage-clean: -$(LCOV) --directory $(top_builddir) -z -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY) -find . -name "*.gcda" -o -name "*.gcov" -delete +endif GITIGNOREFILES ?= GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) @@ -15267,7 +15269,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pygobject $as_me 3.9.1, which was +This file was extended by pygobject $as_me 3.9.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15334,7 +15336,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pygobject config.status 3.9.1 +pygobject config.status 3.9.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/pygobject-3.9.1/configure.ac new/pygobject-3.9.2/configure.ac --- old/pygobject-3.9.1/configure.ac 2013-04-28 15:09:22.000000000 +0200 +++ new/pygobject-3.9.2/configure.ac 2013-05-13 17:36:19.000000000 +0200 @@ -18,7 +18,7 @@ dnl the pygobject version number m4_define(pygobject_major_version, 3) m4_define(pygobject_minor_version, 9) -m4_define(pygobject_micro_version, 1) +m4_define(pygobject_micro_version, 2) m4_define(pygobject_version, pygobject_major_version.pygobject_minor_version.pygobject_micro_version) dnl versions of packages we require ... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/examples/option.py new/pygobject-3.9.2/examples/option.py --- old/pygobject-3.9.1/examples/option.py 2013-02-19 16:01:47.000000000 +0100 +++ new/pygobject-3.9.2/examples/option.py 2013-05-24 13:02:49.000000000 +0200 @@ -1,28 +1,28 @@ #!/usr/bin/env python -# gnome-python/pygobject/examples/option.py -from gobject.option import OptionGroup, OptionParser, make_option +from gi.repository import GLib -group = OptionGroup("example", "OptionGroup Example", "Shows all example options", - option_list=[make_option("--example", - action="store_true", - dest="example", - help="An example option."), - ]) - -parser = OptionParser("NAMES ...", - description="A simple gobject.option example.", - option_list=[make_option("--file", "-f", - type="filename", - action="store", - dest="file", - help="A filename option"), - # ... - ]) +group = GLib.option.OptionGroup( + "example", "OptionGroup Example", "Shows all example options", + option_list=[GLib.option.make_option("--example", + action="store_true", + dest="example", + help="An example option."), + ]) + +parser = GLib.option.OptionParser( + "NAMES ...", description="A simple gobject.option example.", + option_list=[GLib.option.make_option("--file", "-f", + type="filename", + action="store", + dest="file", + help="A filename option"), + # ... + ]) parser.add_option_group(group) parser.parse_args() -print "group: example ", group.values.example -print "parser: file", parser.values.file +print("group: example " + str(group.values.example)) +print("parser: file " + str(parser.values.file)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/gi/_glib/pyglib.c new/pygobject-3.9.2/gi/_glib/pyglib.c --- old/pygobject-3.9.1/gi/_glib/pyglib.c 2013-04-28 15:09:23.000000000 +0200 +++ new/pygobject-3.9.2/gi/_glib/pyglib.c 2013-05-13 17:36:19.000000000 +0200 @@ -77,47 +77,6 @@ } /** - * pyglib_block_threads: - * - */ -void -pyglib_block_threads(void) -{ - g_return_if_fail (_PyGLib_API != NULL); - - if (_PyGLib_API->block_threads != NULL) - (* _PyGLib_API->block_threads)(); -} - -/** - * pyglib_unblock_threads: - * - */ -void -pyglib_unblock_threads(void) -{ - g_return_if_fail (_PyGLib_API != NULL); - if (_PyGLib_API->unblock_threads != NULL) - (* _PyGLib_API->unblock_threads)(); -} - -/** - * pyglib_set_thread_block_funcs: - * - * hooks to register handlers for getting GDK threads to cooperate - * with python threading - */ -void -pyglib_set_thread_block_funcs (PyGLibThreadBlockFunc block_threads_func, - PyGLibThreadBlockFunc unblock_threads_func) -{ - g_return_if_fail (_PyGLib_API != NULL); - - _PyGLib_API->block_threads = block_threads_func; - _PyGLib_API->unblock_threads = unblock_threads_func; -} - -/** * pyglib_error_marshal: * @error: a pointer to the GError. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/gi/_glib/pyglib.h new/pygobject-3.9.2/gi/_glib/pyglib.h --- old/pygobject-3.9.1/gi/_glib/pyglib.h 2013-04-28 15:09:23.000000000 +0200 +++ new/pygobject-3.9.2/gi/_glib/pyglib.h 2013-05-13 17:36:19.000000000 +0200 @@ -37,24 +37,21 @@ #ifdef DISABLE_THREADING # define pyglib_gil_state_ensure() PyGILState_LOCKED # define pyglib_gil_state_release(state) state -# define pyglib_begin_allow_threads G_STMT_START { -# define pyglib_end_allow_threads } G_STMT_END #else # define pyglib_gil_state_ensure PyGILState_Ensure # define pyglib_gil_state_release PyGILState_Release -# define pyglib_begin_allow_threads Py_BEGIN_ALLOW_THREADS -# define pyglib_end_allow_threads Py_END_ALLOW_THREADS #endif +/* Deprecated, only available for API compatibility. */ +#define pyg_set_thread_block_funcs(a, b) +#define pyglib_block_threads() +#define pyglib_unblock_threads() + gboolean pyglib_error_check(GError **error); PyObject *pyglib_error_marshal (GError **error); gboolean pyglib_gerror_exception_check(GError **error); PyObject *pyglib_register_exception_for_domain(gchar *name, gint error_domain); -void pyglib_set_thread_block_funcs(PyGLibThreadBlockFunc block_threads_func, - PyGLibThreadBlockFunc unblock_threads_func); -void pyglib_block_threads(void); -void pyglib_unblock_threads(void); PyObject * pyglib_option_context_new(GOptionContext *context); PyObject * pyglib_option_group_new(GOptionGroup *group); GOptionGroup * pyglib_option_group_transfer_group(PyObject *self); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/gi/_glib/pygoptioncontext.c new/pygobject-3.9.2/gi/_glib/pygoptioncontext.c --- old/pygobject-3.9.1/gi/_glib/pygoptioncontext.c 2013-02-19 16:01:47.000000000 +0100 +++ new/pygobject-3.9.2/gi/_glib/pygoptioncontext.c 2013-05-13 17:36:19.000000000 +0200 @@ -130,10 +130,10 @@ g_assert(argv_length <= G_MAXINT); argv_length_int = argv_length; - pyglib_begin_allow_threads; + Py_BEGIN_ALLOW_THREADS; result = g_option_context_parse(self->context, &argv_length_int, &argv_content, &error); - pyglib_end_allow_threads; + Py_END_ALLOW_THREADS; argv_length = argv_length_int; if (!result) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/gi/_gobject/gobjectmodule.c new/pygobject-3.9.2/gi/_gobject/gobjectmodule.c --- old/pygobject-3.9.1/gi/_gobject/gobjectmodule.c 2013-04-28 15:09:23.000000000 +0200 +++ new/pygobject-3.9.2/gi/_gobject/gobjectmodule.c 2013-05-13 17:36:19.000000000 +0200 @@ -48,24 +48,17 @@ /** * pyg_set_thread_block_funcs: - * @block_threads_func: a function to block Python threads. - * @unblock_threads_func: a function to unblock Python threads. - * - * an interface to allow pygtk to add hooks to handle threading - * similar to the old PyGTK 0.6.x releases. May not work quite right - * anymore. + * Deprecated, only available for ABI compatibility. */ static void -pyg_set_thread_block_funcs (PyGThreadBlockFunc block_threads_func, - PyGThreadBlockFunc unblock_threads_func) +_pyg_set_thread_block_funcs (PyGThreadBlockFunc block_threads_func, + PyGThreadBlockFunc unblock_threads_func) { - g_return_if_fail(pygobject_api_functions.block_threads == NULL && - pygobject_api_functions.unblock_threads == NULL); - - pygobject_api_functions.block_threads = block_threads_func; - pygobject_api_functions.unblock_threads = unblock_threads_func; - pyglib_set_thread_block_funcs(block_threads_func, - unblock_threads_func); + PyGILState_STATE state = pyglib_gil_state_ensure (); + PyErr_Warn (PyExc_DeprecationWarning, + "Using pyg_set_thread_block_funcs is not longer needed. " + "PyGObject always uses Py_BLOCK/UNBLOCK_THREADS."); + pyglib_gil_state_release (state); } /** @@ -2031,7 +2024,7 @@ pyg_error_check, - pyg_set_thread_block_funcs, + _pyg_set_thread_block_funcs, (PyGThreadBlockFunc)0, /* block_threads */ (PyGThreadBlockFunc)0, /* unblock_threads */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/gi/_gobject/pygobject-private.h new/pygobject-3.9.2/gi/_gobject/pygobject-private.h --- old/pygobject-3.9.1/gi/_gobject/pygobject-private.h 2013-04-28 15:09:23.000000000 +0200 +++ new/pygobject-3.9.2/gi/_gobject/pygobject-private.h 2013-05-13 17:36:19.000000000 +0200 @@ -21,39 +21,6 @@ /* from gobjectmodule.c */ extern struct _PyGObject_Functions pygobject_api_functions; -#define pyg_block_threads() G_STMT_START { \ - if (pygobject_api_functions.block_threads != NULL) \ - (* pygobject_api_functions.block_threads)(); \ - } G_STMT_END -#define pyg_unblock_threads() G_STMT_START { \ - if (pygobject_api_functions.unblock_threads != NULL) \ - (* pygobject_api_functions.unblock_threads)(); \ - } G_STMT_END - -#define pyg_threads_enabled (pygobject_api_functions.threads_enabled) - -#ifdef DISABLE_THREADING -#define pyg_gil_state_ensure() 0 -#define pyg_gil_state_release(state) G_STMT_START { \ - } G_STMT_END - -#else -#define pyg_gil_state_ensure() (pygobject_api_functions.threads_enabled? (PyGILState_Ensure()) : 0) -#define pyg_gil_state_release(state) G_STMT_START { \ - if (pygobject_api_functions.threads_enabled) \ - PyGILState_Release(state); \ - } G_STMT_END -#endif - -#define pyg_begin_allow_threads \ - G_STMT_START { \ - PyThreadState *_save = NULL; \ - if (pygobject_api_functions.threads_enabled) \ - _save = PyEval_SaveThread(); -#define pyg_end_allow_threads \ - if (pygobject_api_functions.threads_enabled) \ - PyEval_RestoreThread(_save); \ - } G_STMT_END #ifndef Py_CLEAR /* since Python 2.4 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/gi/_gobject/pygobject.c new/pygobject-3.9.2/gi/_gobject/pygobject.c --- old/pygobject-3.9.1/gi/_gobject/pygobject.c 2013-04-28 15:09:23.000000000 +0200 +++ new/pygobject-3.9.2/gi/_gobject/pygobject.c 2013-05-13 17:36:19.000000000 +0200 @@ -88,10 +88,9 @@ if (Py_IsInitialized()) { state = pyglib_gil_state_ensure(); Py_DECREF(data->type); - /* We cannot use pyg_begin_allow_threads here because this is inside + /* We cannot use Py_BEGIN_ALLOW_THREADS here because this is inside * a branch. */ - if (pyg_threads_enabled) - _save = PyEval_SaveThread(); + Py_UNBLOCK_THREADS; /* Modifies _save */ } tmp = closures = data->closures; @@ -114,8 +113,7 @@ g_free(data); if (Py_IsInitialized()) { - if (pyg_threads_enabled) - PyEval_RestoreThread(_save); + Py_BLOCK_THREADS; /* Restores _save */ pyglib_gil_state_release(state); } } @@ -309,10 +307,11 @@ /* The GType is implemented in Python, or we failed to read it via gi: * do a straightforward read. */ + Py_BEGIN_ALLOW_THREADS; g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(pspec)); - pyg_begin_allow_threads; g_object_get_property(self->pygobject->obj, pspec->name, &value); - pyg_end_allow_threads; + Py_END_ALLOW_THREADS; + ret = pyg_param_gvalue_as_pyobject(&value, TRUE, pspec); g_value_unset(&value); @@ -352,12 +351,11 @@ return FALSE; } - pyg_begin_allow_threads; + Py_BEGIN_ALLOW_THREADS; g_object_set_property(obj, pspec->name, &value); - pyg_end_allow_threads; - g_value_unset(&value); - + Py_END_ALLOW_THREADS; + return TRUE; } @@ -1183,9 +1181,9 @@ g_object_remove_toggle_ref(self->obj, pyg_toggle_notify, self); self->private_flags.flags &= ~PYGOBJECT_USING_TOGGLE_REF; } else { - pyg_begin_allow_threads; + Py_BEGIN_ALLOW_THREADS; g_object_unref(self->obj); - pyg_end_allow_threads; + Py_END_ALLOW_THREADS; } self->obj = NULL; } @@ -1320,9 +1318,10 @@ return NULL; } g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(pspec)); - pyg_begin_allow_threads; + Py_BEGIN_ALLOW_THREADS; g_object_get_property(self->obj, param_name, &value); - pyg_end_allow_threads; + Py_END_ALLOW_THREADS; + ret = pyg_param_gvalue_as_pyobject(&value, TRUE, pspec); g_value_unset(&value); return ret; @@ -1372,9 +1371,9 @@ } g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(pspec)); - pyg_begin_allow_threads; + Py_BEGIN_ALLOW_THREADS; g_object_get_property(self->obj, property_name, &value); - pyg_end_allow_threads; + Py_END_ALLOW_THREADS; item = pyg_value_as_pyobject(&value, TRUE); PyTuple_SetItem(tuple, i, item); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/gi/_gobject/pygobject.h new/pygobject-3.9.2/gi/_gobject/pygobject.h --- old/pygobject-3.9.1/gi/_gobject/pygobject.h 2013-04-28 15:09:23.000000000 +0200 +++ new/pygobject-3.9.2/gi/_gobject/pygobject.h 2013-05-13 17:36:19.000000000 +0200 @@ -140,6 +140,7 @@ PyGThreadBlockFunc unblock_threads_func); PyGThreadBlockFunc block_threads; PyGThreadBlockFunc unblock_threads; + PyTypeObject *paramspec_type; PyObject *(* paramspec_new)(GParamSpec *spec); GParamSpec *(*paramspec_get)(PyObject *tuple); @@ -196,6 +197,28 @@ PyTypeObject *object_type; }; + +#ifdef DISABLE_THREADING +# define pyg_threads_enabled FALSE +# define pyg_gil_state_ensure() 0 +# define pyg_gil_state_release(state) +# define pyg_begin_allow_threads G_STMT_START { +# define pyg_end_allow_threads } G_STMT_END +#else +# define pyg_threads_enabled TRUE +# define pyg_gil_state_ensure PyGILState_Ensure +# define pyg_gil_state_release PyGILState_Release +# define pyg_begin_allow_threads Py_BEGIN_ALLOW_THREADS +# define pyg_end_allow_threads Py_END_ALLOW_THREADS +#endif + +/* Deprecated, only available for API compatibility. */ +#define pyg_enable_threads() +#define pyg_set_thread_block_funcs(a, b) +#define pyg_block_threads() +#define pyg_unblock_threads() + + #ifndef _INSIDE_PYGOBJECT_ #if defined(NO_IMPORT) || defined(NO_IMPORT_PYGOBJECT) @@ -233,7 +256,6 @@ #define pyg_flags_add_constants (_PyGObject_API->flags_add_constants) #define pyg_constant_strip_prefix (_PyGObject_API->constant_strip_prefix) #define pyg_error_check (_PyGObject_API->error_check) -#define pyg_set_thread_block_funcs (_PyGObject_API->set_thread_block_funcs) #define PyGParamSpec_Type (*_PyGObject_API->paramspec_type) #define pyg_param_spec_new (_PyGObject_API->paramspec_new) #define pyg_param_spec_from_object (_PyGObject_API->paramspec_get) @@ -247,9 +269,6 @@ #define PyGFlags_Type (*_PyGObject_API->flags_type) #define pyg_flags_add (_PyGObject_API->flags_add) #define pyg_flags_from_gtype (_PyGObject_API->flags_from_gtype) -#define pyg_enable_threads (_PyGObject_API->enable_threads) -#define pyg_gil_state_ensure (_PyGObject_API->gil_state_ensure) -#define pyg_gil_state_release (_PyGObject_API->gil_state_release) #define pyg_register_class_init (_PyGObject_API->register_class_init) #define pyg_register_interface_info (_PyGObject_API->register_interface_info) #define pyg_add_warning_redirection (_PyGObject_API->add_warning_redirection) @@ -257,27 +276,6 @@ #define pyg_gerror_exception_check (_PyGObject_API->gerror_exception_check) #define pyg_option_group_new (_PyGObject_API->option_group_new) -#define pyg_block_threads() G_STMT_START { \ - if (_PyGObject_API->block_threads != NULL) \ - (* _PyGObject_API->block_threads)(); \ - } G_STMT_END -#define pyg_unblock_threads() G_STMT_START { \ - if (_PyGObject_API->unblock_threads != NULL) \ - (* _PyGObject_API->unblock_threads)(); \ - } G_STMT_END - -#define pyg_threads_enabled (_PyGObject_API->threads_enabled) - -#define pyg_begin_allow_threads \ - G_STMT_START { \ - PyThreadState *_save = NULL; \ - if (_PyGObject_API->threads_enabled) \ - _save = PyEval_SaveThread(); -#define pyg_end_allow_threads \ - if (_PyGObject_API->threads_enabled) \ - PyEval_RestoreThread(_save); \ - } G_STMT_END - /** * pygobject_init: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/gi/gimodule.c new/pygobject-3.9.2/gi/gimodule.c --- old/pygobject-3.9.1/gi/gimodule.c 2013-02-28 11:41:54.000000000 +0100 +++ new/pygobject-3.9.2/gi/gimodule.c 2013-05-13 17:36:19.000000000 +0200 @@ -534,6 +534,7 @@ gsize total_read = 0; GError* error = NULL; GIOStatus status = G_IO_STATUS_NORMAL; + GIOChannel *iochannel = NULL; if (!PyArg_ParseTuple (args, "Oi:pyg_channel_read", &py_iochannel, &max_count)) { return NULL; @@ -545,7 +546,9 @@ if (max_count == 0) return PYGLIB_PyBytes_FromString(""); - + + iochannel = pyg_boxed_get (py_iochannel, GIOChannel); + while (status == G_IO_STATUS_NORMAL && (max_count == -1 || total_read < max_count)) { gsize single_read; @@ -572,11 +575,11 @@ buf = PYGLIB_PyBytes_AsString(ret_obj) + total_read; - pyglib_unblock_threads(); - status = g_io_channel_read_chars(pyg_boxed_get (py_iochannel, GIOChannel), - buf, buf_size, &single_read, &error); - pyglib_block_threads(); - if (pyglib_error_check(&error)) + Py_BEGIN_ALLOW_THREADS; + status = g_io_channel_read_chars (iochannel, buf, buf_size, &single_read, &error); + Py_END_ALLOW_THREADS; + + if (pyglib_error_check(&error)) goto failure; total_read += single_read; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/gi/pygi-boxed.c new/pygobject-3.9.2/gi/pygi-boxed.c --- old/pygobject-3.9.1/gi/pygi-boxed.c 2013-02-28 11:34:01.000000000 +0100 +++ new/pygobject-3.9.2/gi/pygi-boxed.c 2013-05-13 17:36:19.000000000 +0200 @@ -32,10 +32,6 @@ { GType g_type; - PyObject_GC_UnTrack ( (PyObject *) self); - - PyObject_ClearWeakRefs ( (PyObject *) self); - if ( ( (PyGBoxed *) self)->free_on_dealloc) { if (self->slice_allocated) { g_slice_free1 (self->size, ( (PyGBoxed *) self)->boxed); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/gi/pygi-closure.c new/pygobject-3.9.2/gi/pygi-closure.c --- old/pygobject-3.9.1/gi/pygi-closure.c 2013-03-18 13:24:54.000000000 +0100 +++ new/pygobject-3.9.2/gi/pygi-closure.c 2013-05-13 17:25:17.000000000 +0200 @@ -99,6 +99,7 @@ } g_base_info_unref (interface_info); + break; } default: *(ffi_arg *) retval = (ffi_arg) arg.v_pointer; @@ -271,7 +272,7 @@ break; } else if (interface_type == GI_INFO_TYPE_ENUM || interface_type == GI_INFO_TYPE_FLAGS) { - g_args[i].v_double = * (double *) args[i]; + g_args[i].v_uint = * (guint *) args[i]; g_base_info_unref (interface); break; } else if (interface_type == GI_INFO_TYPE_STRUCT || diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/gi/pygi-info.c new/pygobject-3.9.2/gi/pygi-info.c --- old/pygobject-3.9.1/gi/pygi-info.c 2013-04-28 15:09:23.000000000 +0200 +++ new/pygobject-3.9.2/gi/pygi-info.c 2013-05-13 17:36:19.000000000 +0200 @@ -32,9 +32,8 @@ static void _base_info_dealloc (PyGIBaseInfo *self) { - PyObject_GC_UnTrack ( (PyObject *) self); - - PyObject_ClearWeakRefs ( (PyObject *) self); + if (self->inst_weakreflist != NULL) + PyObject_ClearWeakRefs ( (PyObject *) self); g_base_info_unref (self->info); @@ -43,14 +42,6 @@ Py_TYPE( (PyObject *) self)->tp_free ( (PyObject *) self); } -static int -_base_info_traverse (PyGIBaseInfo *self, - visitproc visit, - void *arg) -{ - return 0; -} - static PyObject * _base_info_repr (PyGIBaseInfo *self) { @@ -256,6 +247,8 @@ } self->info = g_base_info_ref (info); + self->inst_weakreflist = NULL; + self->cache = NULL; return (PyObject *) self; } @@ -1746,10 +1739,7 @@ PyGIBaseInfo_Type.tp_dealloc = (destructor) _base_info_dealloc; PyGIBaseInfo_Type.tp_repr = (reprfunc) _base_info_repr; - PyGIBaseInfo_Type.tp_flags = (Py_TPFLAGS_DEFAULT | - Py_TPFLAGS_BASETYPE | - Py_TPFLAGS_HAVE_GC); - PyGIBaseInfo_Type.tp_traverse = (traverseproc) _base_info_traverse; + PyGIBaseInfo_Type.tp_flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE); PyGIBaseInfo_Type.tp_weaklistoffset = offsetof(PyGIBaseInfo, inst_weakreflist); PyGIBaseInfo_Type.tp_methods = _PyGIBaseInfo_methods; PyGIBaseInfo_Type.tp_richcompare = (richcmpfunc)_base_info_richcompare; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/gi/pygi-invoke.c new/pygobject-3.9.2/gi/pygi-invoke.c --- old/pygobject-3.9.1/gi/pygi-invoke.c 2013-02-28 11:15:59.000000000 +0100 +++ new/pygobject-3.9.2/gi/pygi-invoke.c 2013-05-13 17:36:19.000000000 +0200 @@ -37,7 +37,7 @@ error = NULL; - pyg_begin_allow_threads; + Py_BEGIN_ALLOW_THREADS; /* FIXME: use this for now but we can streamline the calls */ if (cache->function_type == PYGI_FUNCTION_TYPE_VFUNC) @@ -68,7 +68,7 @@ cache->n_to_py_args, &state->return_arg, &error); - pyg_end_allow_threads; + Py_END_ALLOW_THREADS; if (!retval) { g_assert (error != NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/gi/pygi-struct.c new/pygobject-3.9.2/gi/pygi-struct.c --- old/pygobject-3.9.1/gi/pygi-struct.c 2013-02-19 16:01:47.000000000 +0100 +++ new/pygobject-3.9.2/gi/pygi-struct.c 2013-05-13 17:36:19.000000000 +0200 @@ -34,10 +34,6 @@ (PyObject *) self, &PyGIStructInfo_Type); - PyObject_GC_UnTrack ( (PyObject *) self); - - PyObject_ClearWeakRefs ( (PyObject *) self); - if (info != NULL && g_struct_info_is_foreign ( (GIStructInfo *) info)) { pygi_struct_foreign_release (info, ( (PyGPointer *) self)->pointer); } else if (self->free_on_dealloc) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/gi/types.py new/pygobject-3.9.2/gi/types.py --- old/pygobject-3.9.1/gi/types.py 2013-02-19 16:01:47.000000000 +0100 +++ new/pygobject-3.9.2/gi/types.py 2013-05-13 17:25:17.000000000 +0200 @@ -245,14 +245,16 @@ # Skip bases without __info__ (static _gobject._gobject.GObject) if base is GInterface or\ not issubclass(base, GInterface) or\ - not hasattr(base, '__info__') or\ - not isinstance(base.__info__, InterfaceInfo): + not hasattr(base, '__info__'): continue - for vfunc in base.__info__.get_vfuncs(): - if vfunc.get_name() == vfunc_name: - return vfunc + # Only look at this classes vfuncs if it is an interface. + if isinstance(base.__info__, InterfaceInfo): + for vfunc in base.__info__.get_vfuncs(): + if vfunc.get_name() == vfunc_name: + return vfunc + # Recurse into the parent classes vfunc = find_vfunc_info_in_interface(base.__bases__, vfunc_name) if vfunc is not None: return vfunc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.9.1/tests/test_gi.py new/pygobject-3.9.2/tests/test_gi.py --- old/pygobject-3.9.1/tests/test_gi.py 2013-04-28 15:09:23.000000000 +0200 +++ new/pygobject-3.9.2/tests/test_gi.py 2013-05-13 17:36:19.000000000 +0200 @@ -2056,6 +2056,9 @@ def do_method_with_default_implementation(self, int8): self.val = int8 + def do_vfunc_return_value_only(self): + return 2121 + class Interface3Impl(GObject.Object, GIMarshallingTests.Interface3): def __init__(self): GObject.Object.__init__(self) @@ -2129,6 +2132,10 @@ object_.method_with_default_implementation(87) self.assertEqual(object_.val, 87) + def test_subobject_child_vfunc(self): + object_ = self.SubObject(int=1) + self.assertEqual(object_.vfunc_return_value_only(), 2121) + def test_dynamic_module(self): from gi.module import DynamicModule self.assertTrue(isinstance(GObject, DynamicModule)) @@ -2270,6 +2277,21 @@ GIMarshallingTests.test_interface_test_int8_in(instance, 42) self.assertEqual(instance.val, 42) + def test_subclass_override(self): + class TestInterfaceImplD(TestInterfaces.TestInterfaceImpl): + val2 = None + + def do_test_int8_in(self, int8): + self.val2 = int8 + + instance = TestInterfaceImplD() + self.assertEqual(instance.val, None) + self.assertEqual(instance.val2, None) + + GIMarshallingTests.test_interface_test_int8_in(instance, 42) + self.assertEqual(instance.val, None) + self.assertEqual(instance.val2, 42) + def test_mro(self): # there was a problem with Python bailing out because of # http://en.wikipedia.org/wiki/Diamond_problem with interfaces, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-atspi for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package python-atspi for openSUSE:Factory checked in at 2013-06-28 18:56:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-atspi (Old) and /work/SRC/openSUSE:Factory/.python-atspi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-atspi" Changes: -------- --- /work/SRC/openSUSE:Factory/python-atspi/python-atspi.changes 2013-04-22 14:16:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-atspi.new/python-atspi.changes 2013-06-28 18:56:08.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Jun 21 19:21:27 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 2.9.3: + + Add some examples (bgo#701063). + + Removed setting of AT_SPI_CLIENT, as it is no longer used as of + at-spi2-core 2.9.3. + +------------------------------------------------------------------- +Tue May 28 19:55:10 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 2.9.2: + + Update for libatspi API changes (bgo#700243). + +------------------------------------------------------------------- python3-atspi.changes: same change Old: ---- pyatspi-2.8.0.tar.xz New: ---- pyatspi-2.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-atspi.spec ++++++ --- /var/tmp/diff_new_pack.PJzjR5/_old 2013-06-28 18:56:09.000000000 +0200 +++ /var/tmp/diff_new_pack.PJzjR5/_new 2013-06-28 18:56:09.000000000 +0200 @@ -36,13 +36,13 @@ Name: python-atspi %define _name pyatspi -Version: 2.8.0 +Version: 2.9.3 Release: 0 Summary: Assistive Technology Service Provider Interface - Python bindings License: LGPL-2.0 Group: Development/Libraries/Python Url: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/pyatspi/2.8/%{_name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/pyatspi/2.9/%{_name}-%{version}.tar.xz BuildRequires: fdupes # Needed to have typelib() Requires. BuildRequires: gobject-introspection python3-atspi.spec: same change ++++++ pyatspi-2.8.0.tar.xz -> pyatspi-2.9.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-2.8.0/NEWS new/pyatspi-2.9.3/NEWS --- old/pyatspi-2.8.0/NEWS 2013-03-04 22:58:57.000000000 +0100 +++ new/pyatspi-2.9.3/NEWS 2013-06-17 23:04:19.000000000 +0200 @@ -1,3 +1,14 @@ +What's new in pyatspi 2.9.3: + +* Add some examples (Magdalen Berns, BGO#701063). + +* Removed setting of AT_SPI_CLIENT, as it is no longer used as of + at-spi2-core 2.9.3. + +What's new in pyatspi 2.9.2: + +* Update for libatspi API changes (BGO#700243). + What's new in pyatspi 2.7.91: * Add objectLocale property (BGO#694368). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-2.8.0/aclocal.m4 new/pyatspi-2.9.3/aclocal.m4 --- old/pyatspi-2.8.0/aclocal.m4 2013-03-25 23:24:42.000000000 +0100 +++ new/pyatspi-2.9.3/aclocal.m4 2013-06-17 23:32:43.000000000 +0200 @@ -8634,7 +8634,8 @@ # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -8680,7 +8681,8 @@ pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -8728,9 +8730,9 @@ AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -8764,6 +8766,46 @@ fi[]dnl ])# PKG_CHECK_MODULES + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + # Copyright (C) 2002-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-2.8.0/configure new/pyatspi-2.9.3/configure --- old/pyatspi-2.8.0/configure 2013-03-25 23:24:44.000000000 +0100 +++ new/pyatspi-2.9.3/configure 2013-06-17 23:32:44.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pyatspi 2.8.0. +# Generated by GNU Autoconf 2.69 for pyatspi 2.9.3. # # Report bugs to <accessibility-atspi(a)lists.linux-foundation.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='pyatspi' PACKAGE_TARNAME='pyatspi' -PACKAGE_VERSION='2.8.0' -PACKAGE_STRING='pyatspi 2.8.0' +PACKAGE_VERSION='2.9.3' +PACKAGE_STRING='pyatspi 2.9.3' PACKAGE_BUGREPORT='accessibility-atspi(a)lists.linux-foundation.org' PACKAGE_URL='' @@ -1376,7 +1376,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 pyatspi 2.8.0 to adapt to many kinds of systems. +\`configure' configures pyatspi 2.9.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1450,7 +1450,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pyatspi 2.8.0:";; + short | recursive ) echo "Configuration of pyatspi 2.9.3:";; esac cat <<\_ACEOF @@ -1592,7 +1592,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pyatspi configure 2.8.0 +pyatspi configure 2.9.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1870,7 +1870,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pyatspi $as_me 2.8.0, which was +It was created by pyatspi $as_me 2.9.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2717,7 +2717,7 @@ # Define the identity of the package. PACKAGE='pyatspi' - VERSION='2.8.0' + VERSION='2.9.3' cat >>confdefs.h <<_ACEOF @@ -11569,6 +11569,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -11759,6 +11760,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -11775,6 +11777,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -11794,9 +11797,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 1.0" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 1.0" 2>&1` else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 1.0" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 1.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DBUS_PKG_ERRORS" >&5 @@ -11851,6 +11854,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -11867,6 +11871,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -11886,9 +11891,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 @@ -11943,6 +11948,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.7.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -11959,6 +11965,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_GLIB_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.7.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -11978,9 +11985,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= 0.7.0" 2>&1` + DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-glib-1 >= 0.7.0" 2>&1` else - DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= 0.7.0" 2>&1` + DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-glib-1 >= 0.7.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DBUS_GLIB_PKG_ERRORS" >&5 @@ -12035,6 +12042,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GOBJ_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= 2.0.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12051,6 +12059,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GOBJ_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= 2.0.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12070,9 +12079,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GOBJ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-2.0 >= 2.0.0" 2>&1` + GOBJ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gobject-2.0 >= 2.0.0" 2>&1` else - GOBJ_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-2.0 >= 2.0.0" 2>&1` + GOBJ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gobject-2.0 >= 2.0.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GOBJ_PKG_ERRORS" >&5 @@ -12127,6 +12136,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 >= 2.0.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12143,6 +12153,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= 2.0.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12162,9 +12173,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmodule-2.0 >= 2.0.0" 2>&1` + GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0 >= 2.0.0" 2>&1` else - GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmodule-2.0 >= 2.0.0" 2>&1` + GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0 >= 2.0.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GMODULE_PKG_ERRORS" >&5 @@ -12219,6 +12230,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIB_XML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.0.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12235,6 +12247,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIB_XML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.0.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12254,9 +12267,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIB_XML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= 2.0.0" 2>&1` + LIB_XML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0 >= 2.0.0" 2>&1` else - LIB_XML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= 2.0.0" 2>&1` + LIB_XML_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0 >= 2.0.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIB_XML_PKG_ERRORS" >&5 @@ -12311,6 +12324,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ATK_CFLAGS=`$PKG_CONFIG --cflags "atk >= 2.1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12327,6 +12341,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ATK_LIBS=`$PKG_CONFIG --libs "atk >= 2.1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12346,9 +12361,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ATK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "atk >= 2.1.0" 2>&1` + ATK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "atk >= 2.1.0" 2>&1` else - ATK_PKG_ERRORS=`$PKG_CONFIG --print-errors "atk >= 2.1.0" 2>&1` + ATK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "atk >= 2.1.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$ATK_PKG_ERRORS" >&5 @@ -12403,6 +12418,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12419,6 +12435,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12438,9 +12455,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.10.0" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.10.0" 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.10.0" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.10.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 @@ -12496,6 +12513,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PYGOBJ_CFLAGS=`$PKG_CONFIG --cflags "pygobject-3.0 >= 2.90.1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12512,6 +12530,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PYGOBJ_LIBS=`$PKG_CONFIG --libs "pygobject-3.0 >= 2.90.1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12531,9 +12550,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PYGOBJ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pygobject-3.0 >= 2.90.1" 2>&1` + PYGOBJ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygobject-3.0 >= 2.90.1" 2>&1` else - PYGOBJ_PKG_ERRORS=`$PKG_CONFIG --print-errors "pygobject-3.0 >= 2.90.1" 2>&1` + PYGOBJ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygobject-3.0 >= 2.90.1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PYGOBJ_PKG_ERRORS" >&5 @@ -13809,7 +13828,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pyatspi $as_me 2.8.0, which was +This file was extended by pyatspi $as_me 2.9.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13875,7 +13894,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pyatspi config.status 2.8.0 +pyatspi config.status 2.9.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-2.8.0/configure.ac new/pyatspi-2.9.3/configure.ac --- old/pyatspi-2.8.0/configure.ac 2013-03-25 23:24:13.000000000 +0100 +++ new/pyatspi-2.9.3/configure.ac 2013-06-17 23:32:39.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([pyatspi], [2.8.0], [accessibility-atspi(a)lists.linux-foundation.org]) +AC_INIT([pyatspi], [2.9.3], [accessibility-atspi(a)lists.linux-foundation.org]) AC_CONFIG_AUX_DIR(config) # The version of python used is determined by the executable pointed to by the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-2.8.0/examples/Makefile.am new/pyatspi-2.9.3/examples/Makefile.am --- old/pyatspi-2.8.0/examples/Makefile.am 2013-02-26 01:45:36.000000000 +0100 +++ new/pyatspi-2.9.3/examples/Makefile.am 2013-06-10 16:38:36.000000000 +0200 @@ -1,5 +1,8 @@ noinst_SCRIPTS = magFocusTracker.py -EXTRA_DIST = magFocusTracker.py +EXTRA_DIST = magFocusTracker.py \ + caret.py \ + runningappcheck.py \ + keypress.py pyatspidir=$(bindir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-2.8.0/examples/Makefile.in new/pyatspi-2.9.3/examples/Makefile.in --- old/pyatspi-2.8.0/examples/Makefile.in 2013-03-25 23:24:43.000000000 +0100 +++ new/pyatspi-2.9.3/examples/Makefile.in 2013-06-17 23:32:44.000000000 +0200 @@ -225,7 +225,11 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_SCRIPTS = magFocusTracker.py -EXTRA_DIST = magFocusTracker.py +EXTRA_DIST = magFocusTracker.py \ + caret.py \ + runningappcheck.py \ + keypress.py + pyatspidir = $(bindir) all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-2.8.0/examples/caret.py new/pyatspi-2.9.3/examples/caret.py --- old/pyatspi-2.8.0/examples/caret.py 1970-01-01 01:00:00.000000000 +0100 +++ new/pyatspi-2.9.3/examples/caret.py 2013-06-03 18:50:01.000000000 +0200 @@ -0,0 +1,43 @@ +#!/usr/bin/python +# +# caret.py +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., Franklin Street, Fifth Floor, +# Boston MA 02110-1301 USA. +# +# This example demonstrates how the pyatspi2 text interface can be used. + +import pyatspi + +def on_caret_move(event): + if event.source and event.source.getRole() == pyatspi.ROLE_TERMINAL: + return + + print_text_at_offset(event.source, event.detail1) + +def print_text_at_offset(obj, offset): + try: + text = obj.queryText() + except: + return + else: + char, char_start_offset, char_end_offset = text.getTextAtOffset(offset, pyatspi.TEXT_BOUNDARY_CHAR) + word, word_start_offset, word_end_offset = text.getTextAtOffset(offset, pyatspi.TEXT_BOUNDARY_WORD_START) + sentence, sentence_start_offset, sentence_end_offset = text.getTextAtOffset(offset, pyatspi.TEXT_BOUNDARY_SENTENCE_START) + line, line_start_offset, line_end_offset = text.getTextAtOffset(offset,pyatspi.TEXT_BOUNDARY_LINE_START) + print("\n\nChar:%s \nWord:%s \nSentence:%s Line:%s " % (char, word, sentence, line)) + +pyatspi.Registry.registerEventListener(on_caret_move, "object:text-caret-moved") +pyatspi.Registry.start() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-2.8.0/examples/keypress.py new/pyatspi-2.9.3/examples/keypress.py --- old/pyatspi-2.8.0/examples/keypress.py 1970-01-01 01:00:00.000000000 +0100 +++ new/pyatspi-2.9.3/examples/keypress.py 2013-06-10 16:38:09.000000000 +0200 @@ -0,0 +1,56 @@ +#!/usr/bin/python +# +# keypress.py +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., Franklin Street, Fifth Floor, +# Boston MA 02110-1301 USA. +# +# An pyatspi2 example to demonstate a client listener for +# Keypresses and releases in pyatspi2 + +import pyatspi + +# Callback to print the active window on key press amd filter out the key release +def on_key_input(event): + + if event.type == pyatspi.KEY_RELEASED_EVENT: + return False + if event.event_string=='F4': + pyatspi.Registry.stop() + return True + if event.event_string =='F3': + print_tree(0, active_window()) + return True + help_message() + +def active_window(): + desktop = pyatspi.Registry.getDesktop(0) + for app in desktop: + for window in app: + if window.getState().contains(pyatspi.STATE_ACTIVE): + return window + +# Print hierarchy tree. +def print_tree(level,root): + print ('%s-> %s' % (' ' * level, root)) + for tree in root: + print_tree(level+1, tree) + +def help_message(): + print('Press F3 to print the accessible hierarchy for the active window.\nPress F4 to exit.') + +help_message() +pyatspi.Registry.registerKeystrokeListener(on_key_input, kind=(pyatspi.KEY_PRESSED_EVENT, pyatspi.KEY_RELEASED_EVENT)) +pyatspi.Registry.start() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-2.8.0/examples/runningappcheck.py new/pyatspi-2.9.3/examples/runningappcheck.py --- old/pyatspi-2.8.0/examples/runningappcheck.py 1970-01-01 01:00:00.000000000 +0100 +++ new/pyatspi-2.9.3/examples/runningappcheck.py 2013-06-05 18:33:31.000000000 +0200 @@ -0,0 +1,47 @@ +#!/usr/bin/python +# +# runningappcheck.py +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., Franklin Street, Fifth Floor, +# Boston MA 02110-1301 USA. +# +# A pyatspi2 example to demonstrate how to find the number of accessible +# applications currently running on the desktop. + +import pyatspi + +def on_key_input(event): + if event.type == pyatspi.KEY_RELEASED_EVENT: + return False + if event.event_string=='F4': + pyatspi.Registry.stop() + return True + if event.event_string =='F5': + name_apps() + return True + help_message() + +def name_apps(): + desktop = pyatspi.Registry.getDesktop(0) + print ('there are %s running applications' % (desktop.childCount)) + for app in desktop: + print app.name + +def help_message(): + print('Press F5 to print the running apps.\nPress F4 to exit.') + +help_message() +pyatspi.Registry.registerKeystrokeListener(on_key_input, kind=(pyatspi.KEY_PRESSED_EVENT, pyatspi.KEY_RELEASED_EVENT)) +pyatspi.Registry.start() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-2.8.0/pyatspi/Accessibility.py new/pyatspi-2.9.3/pyatspi/Accessibility.py --- old/pyatspi-2.8.0/pyatspi/Accessibility.py 2013-02-28 16:24:03.000000000 +0100 +++ new/pyatspi-2.9.3/pyatspi/Accessibility.py 2013-05-14 18:29:48.000000000 +0200 @@ -138,18 +138,18 @@ Atspi.Accessible.toolkitVersion = property(fget=Atspi.Accessible.get_toolkit_version) Atspi.Accessible.atspiVersion = property(fget=Atspi.Accessible.get_atspi_version) -Atspi.Accessible.queryAction = lambda x: Action(getInterface(Atspi.Accessible.get_action, x)) -Atspi.Accessible.queryCollection = lambda x: Collection(getInterface(Atspi.Accessible.get_collection, x)) -Atspi.Accessible.queryComponent = lambda x: Component(getInterface(Atspi.Accessible.get_component, x)) -Atspi.Accessible.queryDocument = lambda x: Document(getInterface(Atspi.Accessible.get_document, x)) -Atspi.Accessible.queryEditableText = lambda x: EditableText(getInterface(Atspi.Accessible.get_editable_text, x)) +Atspi.Accessible.queryAction = lambda x: Action(getInterface(Atspi.Accessible.get_action_iface, x)) +Atspi.Accessible.queryCollection = lambda x: Collection(getInterface(Atspi.Accessible.get_collection_iface, x)) +Atspi.Accessible.queryComponent = lambda x: Component(getInterface(Atspi.Accessible.get_component_iface, x)) +Atspi.Accessible.queryDocument = lambda x: Document(getInterface(Atspi.Accessible.get_document_iface, x)) +Atspi.Accessible.queryEditableText = lambda x: EditableText(getInterface(Atspi.Accessible.get_editable_text_iface, x)) Atspi.Accessible.queryHyperlink = lambda x: getInterface(Atspi.Accessible.get_hyperlink, x) -Atspi.Accessible.queryHypertext = lambda x: Hypertext(getInterface(Atspi.Accessible.get_hypertext, x)) -Atspi.Accessible.queryImage = lambda x: Image(getInterface(Atspi.Accessible.get_image, x)) -Atspi.Accessible.querySelection = lambda x: Selection(getInterface(Atspi.Accessible.get_selection, x)) -Atspi.Accessible.queryTable = lambda x: Table(getInterface(Atspi.Accessible.get_table, x)) -Atspi.Accessible.queryText = lambda x: Text(getInterface(Atspi.Accessible.get_text, x)) -Atspi.Accessible.queryValue = lambda x: Value(getInterface(Atspi.Accessible.get_value, x)) +Atspi.Accessible.queryHypertext = lambda x: Hypertext(getInterface(Atspi.Accessible.get_hypertext_iface, x)) +Atspi.Accessible.queryImage = lambda x: Image(getInterface(Atspi.Accessible.get_image_iface, x)) +Atspi.Accessible.querySelection = lambda x: Selection(getInterface(Atspi.Accessible.get_selection_iface, x)) +Atspi.Accessible.queryTable = lambda x: Table(getInterface(Atspi.Accessible.get_table_iface, x)) +Atspi.Accessible.queryText = lambda x: Text(getInterface(Atspi.Accessible.get_text_iface, x)) +Atspi.Accessible.queryValue = lambda x: Value(getInterface(Atspi.Accessible.get_value_iface, x)) # Doing this here since otherwise we'd have import recursion interface.queryAction = lambda x: Action(getInterface(Atspi.Accessible.get_action, x.obj)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-2.8.0/pyatspi/action.py new/pyatspi-2.9.3/pyatspi/action.py --- old/pyatspi-2.8.0/pyatspi/action.py 2013-01-07 23:57:16.000000000 +0100 +++ new/pyatspi-2.9.3/pyatspi/action.py 2013-05-22 23:26:40.000000000 +0200 @@ -66,7 +66,7 @@ @return : a string containing the description of the specified action. """ - return Atspi.Action.get_description(self.obj, index) + return Atspi.Action.get_action_description(self.obj, index) def getKeyBinding(self, index): """ @@ -89,7 +89,7 @@ rather than the result of invoking the action. @return : a string containing the name of the specified action. """ - return Atspi.Action.get_name(self.obj, index) + return Atspi.Action.get_action_name(self.obj, index) def getLocalizedName(self, index): """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-2.8.0/pyatspi/document.py new/pyatspi-2.9.3/pyatspi/document.py --- old/pyatspi-2.8.0/pyatspi/document.py 2013-01-07 23:57:16.000000000 +0100 +++ new/pyatspi-2.9.3/pyatspi/document.py 2013-05-22 23:26:40.000000000 +0200 @@ -45,7 +45,7 @@ attribute, or an empty string if the attribute is unspecified for the object. """ - return Atspi.Document.get_attribute_value(self.obj, key) + return Atspi.Document.get_document_attribute_value(self.obj, key) def getAttributes(self): """ @@ -55,7 +55,7 @@ @return an AttributeSet containing the attributes of the document, as name-value pairs. """ - ret = Atspi.Document.get_attributes(self.obj) + ret = Atspi.Document.get_document_attributes(self.obj) return [key + ':' + value for key, value in ret.items()] def getLocale(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-2.8.0/pyatspi/registry.py new/pyatspi-2.9.3/pyatspi/registry.py --- old/pyatspi-2.8.0/pyatspi/registry.py 2013-02-28 18:03:50.000000000 +0100 +++ new/pyatspi-2.9.3/pyatspi/registry.py 2013-06-17 22:32:07.000000000 +0200 @@ -111,9 +111,6 @@ self.has_implementations = True - # TODO: Move to libatspi - _os.environ["AT_SPI_CLIENT"] = "1" - self.async = False # not fully supported yet self.started = False self.event_listeners = dict() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyatspi-2.8.0/pyatspi/text.py new/pyatspi-2.9.3/pyatspi/text.py --- old/pyatspi-2.8.0/pyatspi/text.py 2013-01-07 23:57:16.000000000 +0100 +++ new/pyatspi-2.9.3/pyatspi/text.py 2013-05-22 23:26:40.000000000 +0200 @@ -190,7 +190,7 @@ @return the value of attribute (name-value pair) corresponding to "name", if defined. """ - return Atspi.Text.get_attribute_value(self.obj, offset, attributeName) + return Atspi.Text.get_text_attribute_value(self.obj, offset, attributeName) def getAttributes(self, offset): """ @@ -198,7 +198,7 @@ @return the attributes at offset, as a semicolon-delimited set of colon-delimited name-value pairs. """ - [attrs, startOffset, endOffset] = Atspi.Text.get_attributes(self.obj, offset) + [attrs, startOffset, endOffset] = Atspi.Text.get_text_attributes(self.obj, offset) arr = [key + ':' + value for key, value in attrs.items()] str = ';'.join (arr) return [str, startOffset, endOffset] -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package python for openSUSE:Factory checked in at 2013-06-28 18:55:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python (Old) and /work/SRC/openSUSE:Factory/.python.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python" Changes: -------- --- /work/SRC/openSUSE:Factory/python/python-base.changes 2013-06-25 06:57:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python.new/python-base.changes 2013-06-28 18:55:56.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 5 15:17:51 UTC 2013 - schwab(a)suse.de + +- Disable test_asyncore in QEmu build +- Reenable testsuite on arm + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python/python.changes 2013-06-25 06:57:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python.new/python.changes 2013-06-28 18:55:56.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 5 15:19:14 UTC 2013 - schwab(a)suse.de + +- Reenable testsuite on arm + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-base.spec ++++++ --- /var/tmp/diff_new_pack.fXTTjw/_old 2013-06-28 18:55:58.000000000 +0200 +++ /var/tmp/diff_new_pack.fXTTjw/_new 2013-06-28 18:55:58.000000000 +0200 @@ -169,7 +169,7 @@ # on hppa, the threading of glibc is quite broken. The tests just stop # at some point, and the machine does not build anything more until a # timeout several hours later. -%ifnarch hppa %arm +%ifnarch hppa # test_file(2k) fails in autobuild env - "stdin.seek(-1)" wrongly succeeds. probably an issue with autobuild's stdin # test_urllib2 relies on being able to resolve local address, which is notoriously impossible in autobuild EXCLUDE="-x test_urllib2 -x test_file -x test_file2k" @@ -183,6 +183,10 @@ %endif # test_unicode fails in Factory EXCLUDE="$EXCLUDE -x test_unicode" +%if 0%{?qemu_user_space_build} +# test_asyncore fails because of unimplemented sockopt +EXCLUDE="$EXCLUDE -x test_asyncore" +%endif # Limit virtual memory to avoid spurious failures if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then ulimit -v 10000000 || : ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.fXTTjw/_old 2013-06-28 18:55:58.000000000 +0200 +++ /var/tmp/diff_new_pack.fXTTjw/_new 2013-06-28 18:55:58.000000000 +0200 @@ -209,7 +209,7 @@ # on hppa, the threading of glibc is quite broken. The tests just stop # at some point, and the machine does not build anything more until a # timeout several hours later. -%ifnarch hppa %arm +%ifnarch hppa # Limit virtual memory to avoid spurious failures if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then ulimit -v 10000000 || : -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit procps for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package procps for openSUSE:Factory checked in at 2013-06-28 18:55:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/procps (Old) and /work/SRC/openSUSE:Factory/.procps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "procps" Changes: -------- --- /work/SRC/openSUSE:Factory/procps/procps.changes 2013-06-05 13:35:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.procps.new/procps.changes 2013-06-28 18:55:43.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Jun 26 14:17:34 UTC 2013 - werner(a)suse.de + +- Add tow upstream patches + 0001-top-trade-two-groff_mdoc-macros-for-groff-equivalent.patch + 0002-library-for-atexit-support-fix-fileutils-for-EPIPE.patch + +------------------------------------------------------------------- +Fri Jun 21 11:45:19 UTC 2013 - werner(a)suse.de + +- Add upstream patch to use pecific libnuma.so.1 shared libray for + top instead of the devel version libnuma.so + +------------------------------------------------------------------- New: ---- 0001-top-add-the-major-version-to-dlopen-of-libnuma-sonam.patch 0001-top-trade-two-groff_mdoc-macros-for-groff-equivalent.patch 0002-library-for-atexit-support-fix-fileutils-for-EPIPE.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procps.spec ++++++ --- /var/tmp/diff_new_pack.xTBZle/_old 2013-06-28 18:55:44.000000000 +0200 +++ /var/tmp/diff_new_pack.xTBZle/_new 2013-06-28 18:55:44.000000000 +0200 @@ -71,6 +71,12 @@ Patch19: procps-v3.3.4-large_pcpu.patch Patch20: procps-ng-3.3.8-tinfo.dif Patch21: procps-v3.3.3-pwdx.patch +# PATCH-FIX-UPSTREAM -- Add the major version to dlopen of libnuma +Patch22: 0001-top-add-the-major-version-to-dlopen-of-libnuma-sonam.patch +# PATCH-FIX-UPSTREAM -- Use common mdoc nroff macros +Patch23: 0001-top-trade-two-groff_mdoc-macros-for-groff-equivalent.patch +# PATCH-FIX-UPSTREAM -- Let libproc support EPIPE in close_stream +Patch24: 0002-library-for-atexit-support-fix-fileutils-for-EPIPE.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -136,6 +142,9 @@ %patch19 %patch20 %patch21 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 %build test -s .tarball-version || echo %{version} > .tarball-version ++++++ 0001-top-add-the-major-version-to-dlopen-of-libnuma-sonam.patch ++++++ >From a6dfe2648a39d5fed8de0361aecf0e035ad80222 Mon Sep 17 00:00:00 2001 From: Jim Warner <james.warner(a)comcast.net> Date: Thu, 6 Jun 2013 00:00:00 -0500 Subject: [PATCH] top: add the major version to dlopen of libnuma soname When the plug-in approach to NUMA support was added, I carelessly employed the compile-time linker convention for naming the library. Technically this then required the 'devel' package for NUMA support to be present for the unqualified soname symlink to be available. Either that or one must have manually created such a symlink. This commit adds the missing major version to dlopen() of libnuma.so.1 so simply having a more likely package such as 'numactl' will enable both '2' & '3' commands. References(s): http://www.freelists.org/post/procps/top-NUMA-node-CPU-utilization-support,… . initial dlopen support commit edba932a7e9b950dd91bc486e107788e977a5186 Signed-off-by: Jim Warner <james.warner(a)comcast.net> --- top/top.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/top/top.c b/top/top.c index c1853ee..1d38c0f 100644 --- a/top/top.c +++ b/top/top.c @@ -3246,7 +3246,7 @@ static void before (char *me) { #if defined(PRETEND_NUMA) || defined(PRETEND8CPUS) Numa_node_tot = Numa_max_node() + 1; #else - Libnuma_handle = dlopen("libnuma.so", RTLD_LAZY); + Libnuma_handle = dlopen("libnuma.so.1", RTLD_LAZY); if (Libnuma_handle) { Numa_max_node = dlsym(Libnuma_handle, "numa_max_node"); Numa_node_of_cpu = dlsym(Libnuma_handle, "numa_node_of_cpu"); -- 1.8.1.2 ++++++ 0001-top-trade-two-groff_mdoc-macros-for-groff-equivalent.patch ++++++ >From 2c19223cf286a9f47fd95e557b1644ed44625b9a Mon Sep 17 00:00:00 2001 From: Jim Warner <james.warner(a)comcast.net> Date: Thu, 20 Jun 2013 00:00:00 -0500 Subject: [PATCH 1/2] top: trade two groff_mdoc macros for groff equivalents The .Bd and .Ed macros, from the mdoc collection, have caused a few raised eyebrows (lintian, doclifter, etc) in the past. With this commit, we will trade their use for the standard existing groff .nf & .fi equivalents. Signed-off-by: Jim Warner <james.warner(a)comcast.net> --- top/top.1 | 155 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 78 insertions(+), 77 deletions(-) diff --git a/top/top.1 b/top/top.1 index 53ebaf2..0a753a8 100644 --- a/top/top.1 +++ b/top/top.1 @@ -118,7 +118,7 @@ display and used when reading and writing a \*(CF. .\" ---------------------------------------------------------------------- The remaining Table of Contents -.Bd -literal +.nf 1. COMMAND\-LINE Options 2. SUMMARY Display a. UPTIME and LOAD Averages @@ -152,7 +152,7 @@ The remaining Table of Contents c. The Big Bird Window d. The Ol' Switcheroo 8. BUGS, 9. HISTORY Former top, 10. AUTHOR, 11. SEE Also -.Ed +.fi .\" ...................................................................... .SS Operation @@ -181,19 +181,19 @@ Following any re-size operation, if a \*(We screen is corrupted, appears incomplete or disordered, simply typing something innocuous like a punctuation character or cursor motion key will usually restore it. In extreme cases, the following sequence almost certainly will: -.Bd -literal -compact +.nf \fIkey/cmd objective \fR ^Z \fBsuspend\fR \*(We fg \fBresume\fR \*(We <Left> force a screen \fBredraw\fR (if necessary) -.Ed +.fi But if the display is still corrupted, there is one more step you could try. Insert this command after \*(We has been suspended but before resuming it. -.Bd -literal -compact +.nf \fIkey/cmd objective \fR reset restore your \fBterminal settings\fR -.Ed +.fi \*(NT the width of \*(We's display will be limited to \*(WX positions. Displaying all fields requires \*(WF characters. @@ -208,7 +208,7 @@ Lastly, some of \*(We's screens or functions require the use of cursor motion keys like the standard \*(KAs plus the Home, End, PgUp and PgDn keys. If your terminal or emulator does not provide those keys, the following combinations are accepted as alternatives: -.Bd -literal -compact +.nf \fI key equivalent-key-combinations \fR Up alt +\fB \\\fR or alt +\fB k \fR Down alt +\fB /\fR or alt +\fB j \fR @@ -218,14 +218,14 @@ combinations are accepted as alternatives: PgDn alt +\fB Down\fR or alt + ctrl +\fB j \fR Home alt +\fB Left\fR or alt + ctrl +\fB h \fR End alt +\fB Right\fR or alt + ctrl +\fB l \fR -.Ed +.fi The \fBUp\fR and \fBDown\fR \*(KAs have special significance when prompted for line input terminated with the <Enter> key. Those keys, or their aliases, can be used to retrieve previous input lines which can then be edited and re-input. And there are four additional keys available with line oriented input. -.Bd -literal -compact +.nf \fI key special-significance \fR Up recall \fBolder\fR strings for re-editing Down recall \fBnewer\fR strings or \fBerase\fR entire line @@ -233,7 +233,7 @@ And there are four additional keys available with line oriented input. Delete character \fBremoved\fR at cursor, moving others left Home jump to \fBbeginning\fR of input line End jump to \fBend\fR of input line -.Ed +.fi .\" ...................................................................... .SS Startup Defaults @@ -243,7 +243,7 @@ Even so, items shown with an \*(AK could be overridden through the command-line. All are explained in detail in the sections that follow. -.Bd -literal +.nf \fIGlobal-defaults\fR 'A' - Alt display Off (full-screen) * 'd' - Delay time 3.0 seconds @@ -270,7 +270,7 @@ All are explained in detail in the sections that follow. 'x' - Column hilite Off (no, sort field) 'y' - Row hilite On\ \ (yes, running tasks) 'z' - color/mono Off (no, colors) -.Ed +.fi .\" ---------------------------------------------------------------------- .SH 1. COMMAND-LINE Options @@ -417,12 +417,12 @@ these provisions. .SS 2a. UPTIME and LOAD Averages .\" ---------------------------------------------------------------------- This portion consists of a single line containing: -.Bd -literal -compact +.nf \fBprogram\fR or\fB window\fR name, depending on display mode current time and length of time since last boot total number of users system load avg over the last 1, 5 and 15 minutes -.Ed +.fi .\" ...................................................................... .SS 2b. TASK and CPU States @@ -434,14 +434,14 @@ state percentages. Line 1 shows total\fB tasks\fR or\fB threads\fR, depending on the state of the Threads-mode toggle. That total is further classified as: -.Bd -literal -compact +.nf running; sleeping; stopped; zombie -.Ed +.fi Line 2 shows \*(PU state percentages based on the interval since the last refresh. Where two labels are shown below, those for more recent kernel versions are shown first. -.Bd -literal -compact +.nf \fBus\fR,\fB user\fR : time running un-niced user processes \fBsy\fR,\fB system\fR : time running kernel processes \fBni\fR,\fB nice\fR : time running niced user processes @@ -449,7 +449,7 @@ kernel versions are shown first. \fBhi\fR : time spent servicing hardware interrupts \fBsi\fR : time spent servicing software interrupts \fBst\fR : time stolen from this vm by the hypervisor -.Ed +.fi .\" ...................................................................... .SS 2c. MEMORY Usage @@ -459,24 +459,24 @@ through exbibytes (EiB) depending on the scaling factor enforced with the 'E' \*(CI. Line 1 reflects \*(MP, classified as: -.Bd -literal -compact +.nf total, used, free and buffers -.Ed +.fi Line 2 reflects mostly \*(MV, classified as: -.Bd -literal -compact +.nf total, used, free and cached (which is \*(MP) -.Ed +.fi This table may help in interpreting the scaled values displayed: -.Bd -literal -compact +.nf KiB = kibibyte = 1024 bytes MiB = mebibyte = 1024 KiB = 1,048,576 bytes GiB = gibibyte = 1024 MiB = 1,073,741,824 bytes TiB = tebibyte = 1024 GiB = 1,099,511,627,776 bytes PiB = pebibyte = 1024 TiB = 1,125,899,906,842,624 bytes EiB = exbibyte = 1024 PiB = 1,152,921,504,606,846,976 bytes -.Ed +.fi .\" ---------------------------------------------------------------------- .SH 3. FIELDS / Columns @@ -893,7 +893,7 @@ Listed below is a brief index of commands within categories. Some commands appear more than once \*(Em their meaning or scope may vary depending on the context in which they are issued. -.Bd -literal +.nf 4a.\fI Global-Commands \fR <Ent/Sp> ?, =, 0, A, B, d, E, e, g, h, H, I, k, q, r, s, W, X, Y, Z @@ -912,7 +912,7 @@ depending on the context in which they are issued. C, Up, Dn, Left, Right, PgUp, PgDn, Home, End 5d.\fI Searching-in-a-Window \fR L, & -.Ed +.fi .\" ...................................................................... .SS 4a. GLOBAL Commands @@ -1053,10 +1053,10 @@ However, you can send any signal, via number or name. If you wish to abort the kill process, do one of the following depending on your progress: -.Bd -literal +.nf 1) at the pid prompt, type an invalid number 2) at the signal prompt, type 0 (or any invalid signal) -.Ed +.fi .TP 7 \ \ \ \fBq\fR\ \ :\fIQuit \fR @@ -1077,10 +1077,10 @@ and are prevented from lowering it. If you wish to abort the renice process, do one of the following depending on your progress: -.Bd -literal +.nf 1) at the pid prompt, type an invalid number 2) at the nice prompt, type <Enter> with no input -.Ed +.fi .TP 7 \ \ \ \fBW\fR\ \ :\fIWrite-the-Configuration-File \fR @@ -1097,14 +1097,14 @@ by a '+' in the last position. This \*(CI can be used to alter the widths of the following fields: -.Bd -literal +.nf \fI field default field default field default \fR GID 5 GROUP 8 WCHAN 10 RUID 5 RUSER 8 SUID 5 SUSER 8 UID 5 USER 8 TTY 8 -.Ed +.fi You will be prompted for the amount to be added to the default widths shown above. @@ -1137,7 +1137,7 @@ particular file or command. They are familiar to anyone who has used the pager 'less' and are summarized here for future reference. -.Bd -literal +.nf \fI key function \fR '=' alternate status\-line, file or pipeline '/' find, equivalent to 'L' locate @@ -1146,7 +1146,7 @@ summarized here for future reference. 'b' scroll up, equivalent to <PgUp> 'g' first line, equivalent to <Home> 'G' last line, equivalent to <End> -.Ed +.fi .TP 7 \ \ \ \fBZ\fR\ \ :\fIChange-Color-Mapping \fR @@ -1391,14 +1391,14 @@ simply decrease the size of the \*(TD(s) above it. For compatibility, this \*(We supports most of the former \*(We sort keys. Since this is primarily a service to former \*(We users, these commands do not appear on any help screen. -.Bd -literal -compact +.nf \fI command sorted-field supported \fR A start time (non-display) \fB No \fR M %MEM Yes N PID Yes P %CPU Yes T TIME+ Yes -.Ed +.fi Before using any of the following sort provisions, \*(We suggests that you temporarily turn on column highlighting using the 'x' \*(CI. @@ -1452,7 +1452,7 @@ in all four windows before returning to the \*(We display. .P The following \*(CIs are available. -.Bd -literal -compact +.nf \fB4\fR upper case letters to select a\fB target \fR \fB8\fR numbers to select a\fB color \fR normal toggles available \fR @@ -1463,7 +1463,7 @@ The following \*(CIs are available. 'a'/'w' :apply, then go to next/prior <Enter> :apply and exit 'q' :abandon current changes and exit -.Ed +.fi If you use 'a' or 'w' to cycle the targeted window, you will have applied the color scheme that was displayed when you left that window. @@ -1577,11 +1577,11 @@ It does not require that the window name be visible .IP "*" 3 The \*(CIs shown with an \*(AK have use beyond \*(AM. -.Bd -literal -compact +.nf '=', 'A', 'g' are always available 'a', 'w' act the same with color mapping \ and fields management -.Ed +.fi .\" ...................................................................... .SS 5c. SCROLLING a Window @@ -1641,10 +1641,10 @@ line is not otherwise being used. That message will take one of two forms depending on whether or not a variable width column has also been scrolled. -.Bd -literal +.nf \fBscroll coordinates: y = n/n (tasks), x = n/n (fields)\fR \fRscroll coordinates: y = n/n (tasks), x = n/n (fields)\fB + nn\fR -.Ed +.fi The coordinates shown as \fBn\fR/\fBn\fR are relative to the upper left corner of the \*(CW. @@ -1806,12 +1806,12 @@ When prompted for selection criteria, the data you provide must take one of two forms. There are 3 required pieces of information, with a 4th as optional. These examples use spaces for clarity but your input generally would not. -.Bd -literal +.nf #1 \fB#2\fR #3 ( required ) Field\-Name ? include\-if\-value \fB!\fR Field\-Name ? \fBexclude\fR\-if\-value #4 ( optional ) -.Ed +.fi Items #1, #3 and #4 should be self\-explanatory. Item \fB#2\fR represents both a required \fIdelimiter\fR and the \fIoperator\fR @@ -1843,25 +1843,26 @@ See the 'j', 'J' and 'e' \*(CIs for additional information. .P These \fBGROUP\fR filters could produce the exact same results or the second one might not display anything at all, just a blank \*(TW. -.Bd -literal +.nf GROUP=root ( only the same results when ) GROUP=ROOT ( invoked via lower case 'o' ) -.Ed +.fi Either of these \fBRES\fR filters might yield inconsistent and/or misleading results, depending on the current memory scaling factor. Or both filters could produce the exact same results. +.nf RES>9999 ( only the same results when ) !RES<10000 ( memory scaling is at 'KiB' ) -.Ed +.fi This \fBnMin\fR filter illustrates a problem unique to scalable fields. This particular field can display a maximum of 4 digits, beyond which values are automatically scaled to KiB or above. So while amounts greater than 9999 exist, they will appear as 2.6m, 197k, etc. -.Bd -literal +.nf nMin>9999 ( always a blank \*(TW ) -.Ed +.fi .RE .B Potential Solutions @@ -1877,16 +1878,16 @@ Assuming field \fBnTH\fR is displayed, the first filter will result in only multi-threaded processes being shown. It also reminds us that a trailing space is part of every displayed field. The second filter achieves the exact same results with less typing. -.Bd -literal +.nf !nTH=' 1 ' ( ' for clarity only ) nTH>1 ( same with less i/p ) -.Ed +.fi With Forest View mode active and the \fBCOMMAND\fR column in view, this filter effectively collapses child processes so that just 3 levels are shown. -.Bd -literal +.nf !COMMAND=' `- ' ( ' for clarity only ) -.Ed +.fi The final two filters appear as in response to the status request key (^O). In reality, each filter would have required separate input. @@ -1894,10 +1895,10 @@ The \fBPR\fR example shows the two concurrent filters necessary to display tasks with priorities of 20 or more, since some might be negative. Then by exploiting trailing spaces, the \fBnMin\fR series of filters could achieve the failed '9999' objective discussed above. -.Bd -literal +.nf 'PR>20' + '!PR=-' ( 2 for right result ) '!nMin=0 ' + '!nMin=1 ' + '!nMin=2 ' + '!nMin=3 ' ... -.Ed +.fi .RE \*(NT When 'Other Filtering' is active, \*(We turns column highlighting @@ -1917,11 +1918,11 @@ is shown to an ordinary user. More importantly, it will limit what ordinary users are allowed to do when \*(We is running. They will not be able to issue the following commands. -.Bd -literal -compact +.nf k Kill a task r Renice a task d or s Change delay/sleep interval -.Ed +.fi The system \*(CF is\fB not\fR created by \*(We. Rather, you create this file manually and place it in the \fI/etc \fR @@ -1930,10 +1931,10 @@ Its name must be 'toprc' and must have no leading '.' (period). It must have only two lines. Here is an example of the contents of\fI /etc/toprc\fR: -.Bd -literal -compact +.nf s # line 1: 'secure' mode switch 5.0 # line 2: 'delay'\ \ interval in seconds -.Ed +.fi .\" ...................................................................... .SS 6b. PERSONAL Configuration File @@ -1942,7 +1943,7 @@ This file is written as '$HOME/.your\-name\-4\-\*(We' + 'rc'. Use the 'W' \*(CI to create it or update it. Here is the general layout: -.Bd -literal -compact +.nf global # line 1: the program name/alias notation " # line 2: id,altscr,irixps,delay,curwin per ea # line a: winname,fieldscur @@ -1952,7 +1953,7 @@ Here is the general layout: " # any remaining lines are devoted to the " # generalized 'inspect' provisions " # discussed below -.Ed +.fi If the $HOME variable is not present, \*(We will try to write the personal \*(CF to the current directory, subject to permissions. @@ -1980,11 +1981,11 @@ of content. Otherwise they consist of the following 3 elements, each of which\fI must\fR be separated by a tab character (thus 2 '\\t' total): -.Bd -literal -compact +.nf .type: literal 'file' or 'pipe' .name: selection shown on the Inspect screen .fmts: string representing a path or command -.Ed +.fi The two types of Inspect entries are\fI not\fR interchangeable. Those designated '\fBfile\fR' will be accessed using fopen and @@ -1996,31 +1997,31 @@ If the file or pipeline represented in your '.fmts' deals with the specific PID input or accepted when prompted, then the format string must also contain the '\fB%d\fR' specifier, as these examples illustrate. -.Bd -literal -compact +.nf .fmts= /proc/\fI%d\fR/numa_maps .fmts= lsof -P -p\fI %d\fR -.Ed +.fi For '\fBpipe\fR' type entries only, you may also wish to redirect stderr to stdout for a more comprehensive result. Thus the format string becomes: -.Bd -literal -compact +.nf .fmts= pmap -x %d\fI 2>&1\fR -.Ed +.fi Here are examples of both types of Inspect entries as they might appear in the rcfile. The first entry will be ignored due to the initial '#' character. For clarity, the pseudo tab depictions (^I) are surrounded by an extra space but the actual tabs would not be. -.Bd -literal -compact +.nf # pipe ^I Sockets ^I lsof -n -P -i 2>&1 pipe ^I Open Files ^I lsof -P -p %d 2>&1 file ^I NUMA Info ^I /proc/%d/numa_maps pipe ^I Log ^I tail -n100 /var/log/syslog | sort -Mr -.Ed +.fi Except for the commented entry above, these next examples show what could be echoed to achieve similar results, assuming the rcfile name was '.toprc'. @@ -2028,11 +2029,11 @@ However, due to the embedded tab characters, each of these lines should be preceded by '\fB/bin/echo \-e\fR', not just a simple an 'echo', to enable backslash interpretation regardless of which shell you use. -.Bd -literal -compact +.nf "pipe\\tOpen Files\\tlsof -P -p %d 2>&1" >> ~/.toprc "file\\tNUMA Info\\t/proc/%d/numa_maps" >> ~/.toprc "pipe\\tLog\\ttail -n200 /var/log/syslog | sort -Mr" >> ~/.toprc -.Ed +.fi \fBCaution\fR: If any inspect entry you create produces output with unprintable characters @@ -2041,12 +2042,12 @@ depending on their value. This applies to tab characters as well, which will show as '^I'. If you want a truer representation, any embedded tabs should be expanded. -.Bd -literal -compact +.nf # next would have contained '\\t' ... # file ^I <your_name> ^I /proc/%d/status # but this will eliminate embedded '\\t' ... pipe ^I <your_name> ^I cat /proc/%d/status | expand - -.Ed +.fi The above example takes what could have been a 'file' entry but employs a 'pipe' instead so as to expand the embedded tabs. @@ -2063,11 +2064,11 @@ That does not affect operation other than to make some selections invisible. However, if some choices are lost to truncation but you want to see more options, there is an easy solution hinted at below. -.Bd -literal -compact +.nf Inspection Pause at pid ... Use: left/right then <Enter> ... Options: help 1 2 3 4 5 6 7 8 9 10 11 ... -.Ed +.fi The entries in the \*(We rcfile would have a number for the '.name' element and the 'help' entry would identify a shell script you've written explaining what @@ -2099,7 +2100,7 @@ seconds or less. For this experiment, under x-windows open an xterm and maximize it. Then do the following: -.Bd -literal -compact +.nf . provide a scheduling boost and tiny delay via: nice -n -10 \*(We -d.09 . keep sorted column highlighting \*F so as to @@ -2108,7 +2109,7 @@ Then do the following: . try various sort columns (TIME/MEM work well), and normal or reverse sorts to bring the most active processes into view -.Ed +.fi What you'll see is a very busy Linux doing what he's always done for you, but there was no program available to illustrate this. -- 1.8.1.2 ++++++ 0002-library-for-atexit-support-fix-fileutils-for-EPIPE.patch ++++++ >From b1f06bdcc9e02f7dbaf1161ad6231c45ea3f9d88 Mon Sep 17 00:00:00 2001 From: Jim Warner <james.warner(a)comcast.net> Date: Tue, 25 Jun 2013 00:00:00 -0500 Subject: [PATCH 2/2] library: for atexit() support, fix fileutils for EPIPE When fileutils with stream error checking was borrowed from GNU lib, an omission was also propagated where an errno of EPIPE wouldn't be preserved in close_stream() making a test for EPIPE in close_stdout() meaningless. This patch corrects such oversight so that an errno of EPIPE no longer produces 'write error' at program end. ( gnulib provides for optionally ignoring EPIPE, but ) ( if a program chooses to ignore it, then their code ) ( appears to suffer from this close_stream oversight ) Reference(s): . original fileutilis addition commit c7cf98b0e03780f78abe5275c6fb282f71a2369f . bugzilla report https://bugzilla.redhat.com/show_bug.cgi?id=976199 --- lib/fileutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fileutils.c b/lib/fileutils.c index a9ef2ff..1ade3d8 100644 --- a/lib/fileutils.c +++ b/lib/fileutils.c @@ -24,7 +24,7 @@ int close_stream(FILE * stream) const int prev_fail = (ferror(stream) != 0); const int fclose_fail = (fclose(stream) != 0); if (prev_fail || (fclose_fail && (some_pending || errno != EBADF))) { - if (!fclose_fail) + if (!fclose_fail && errno != EPIPE) errno = 0; return EOF; } -- 1.8.1.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit plymouth for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2013-06-28 18:55:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plymouth" Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2013-06-18 10:35:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2013-06-28 18:55:29.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 27 19:39:15 UTC 2013 - crrodriguez(a)opensuse.org + +- Require pigz instead of gzip +- ensure plugin requires are versioned. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.ZhoXWT/_old 2013-06-28 18:55:30.000000000 +0200 +++ /var/tmp/diff_new_pack.ZhoXWT/_new 2013-06-28 18:55:30.000000000 +0200 @@ -165,11 +165,11 @@ %package scripts Summary: Plymouth related scripts Group: System/Base +Requires: %{name} = %{version} Requires: coreutils Requires: cpio Requires: findutils -Requires: gzip -Requires: plymouth +Requires: pigz Requires(post): mkinitrd %description scripts @@ -232,7 +232,7 @@ Requires: libply-splash-core2 = %{version} Requires: libply-splash-graphics2 = %{version} Requires: libply2 = %{version} -Requires: plymouth-plugin-label +Requires: plymouth-plugin-label = %{version} %description plugin-two-step This package contains the "two-step" boot splash plugin for @@ -257,7 +257,7 @@ Summary: Plymouth "Fade-In" theme Group: System/Base Requires: %{name}-plugin-fade-throbber = %{version} -Requires: plymouth-plugin-label +Requires: plymouth-plugin-label = %{version} Requires(post): %{name}-scripts BuildArch: noarch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Module-Build for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package perl-Module-Build for openSUSE:Factory checked in at 2013-06-28 18:55:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Module-Build (Old) and /work/SRC/openSUSE:Factory/.perl-Module-Build.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Module-Build" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Module-Build/perl-Module-Build.changes 2013-06-14 16:46:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Module-Build.new/perl-Module-Build.changes 2013-06-28 18:55:22.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Jun 27 09:28:27 UTC 2013 - coolo(a)suse.com + +- add more of the required modules + +------------------------------------------------------------------- +Tue Jun 27 09:07:21 UTC 2013 - lnt-sysadmin(a)lists.lrz.de + +- added perl(Module::Metadata) as dependency + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Module-Build.spec ++++++ --- /var/tmp/diff_new_pack.QPchmR/_old 2013-06-28 18:55:23.000000000 +0200 +++ /var/tmp/diff_new_pack.QPchmR/_new 2013-06-28 18:55:23.000000000 +0200 @@ -92,11 +92,18 @@ # not mentioned in Build.PL BuildRequires: perl(PAR::Dist) >= 0.17 Requires: perl(PAR::Dist) >= 0.17 -BuildRequires: perl(CPAN::Meta) +BuildRequires: perl(CPAN::Meta) >= 2.110420 +Requires: perl(CPAN::Meta) >= 2.110420 BuildRequires: perl(Module::Metadata) >= 1.000002 +Requires: perl(Module::Metadata) >= 1.000002 BuildRequires: perl(Perl::OSType) >= 1 Requires: perl(Perl::OSType) >= 1 +BuildRequires: perl(ExtUtils::CBuilder) >= 0.27 BuildRequires: perl(version) >= 0.87 +Requires: perl(ExtUtils::CBuilder) >= 0.27 +BuildRequires: perl(ExtUtils::ParseXS) >= 2.21 +Requires: perl(ExtUtils::ParseXS) >= 2.21 + ################################################## %description @@ -110,10 +117,6 @@ only prerequisites are modules that are included with perl 5.6.0, and it works fine on perl 5.005 if you can install a few additional modules. -Authors: --------- - Ken Williams <kwilliams(a)cpan.org> - %prep %setup -q -n %{cpan_name}-%{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-DBD-CSV for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package perl-DBD-CSV for openSUSE:Factory checked in at 2013-06-28 18:55:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-DBD-CSV (Old) and /work/SRC/openSUSE:Factory/.perl-DBD-CSV.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-DBD-CSV" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-DBD-CSV/perl-DBD-CSV.changes 2012-05-22 08:17:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-DBD-CSV.new/perl-DBD-CSV.changes 2013-06-28 18:55:11.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Jun 17 07:54:57 UTC 2013 - coolo(a)suse.com + +- updated to 0.38 + * Fixed RT#80078, resulting in getline calls on undef (Benjamin Booth) + * Require latest DBI and SQL::Statement + * Updated copyright to 2013 + * Fixes for DBI-1.623 (Jens Rehsack) + * Add line/record number and position in error messages + * Improved documentation (including mje's contribution) + * Tested under 5.16.0 (installed) + +------------------------------------------------------------------- Old: ---- DBD-CSV-0.34.tgz New: ---- DBD-CSV-0.38.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-DBD-CSV.spec ++++++ --- /var/tmp/diff_new_pack.etFZ6t/_old 2013-06-28 18:55:12.000000000 +0200 +++ /var/tmp/diff_new_pack.etFZ6t/_new 2013-06-28 18:55:12.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-DBD-CSV # -# 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 @@ -17,11 +17,11 @@ Name: perl-DBD-CSV -Version: 0.34 +Version: 0.38 Release: 0 %define cpan_name DBD-CSV Summary: DBI driver for CSV files -License: GPL-1.0+ or Artistic-1.0 +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/DBD-CSV/ Source: http://www.cpan.org/authors/id/H/HM/HMBRAND/%{cpan_name}-%{version}.tgz @@ -29,17 +29,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(DBD::File) >= 0.4 -BuildRequires: perl(DBI) >= 1.614 -BuildRequires: perl(SQL::Statement) >= 1.33 +BuildRequires: perl(DBD::File) >= 0.41 +BuildRequires: perl(DBI) >= 1.623 +BuildRequires: perl(SQL::Statement) >= 1.402 BuildRequires: perl(Test::More) >= 0.90 -BuildRequires: perl(Text::CSV_XS) >= 0.71 +BuildRequires: perl(Text::CSV_XS) >= 0.94 #BuildRequires: perl(DBD::CSV) -Requires: perl(DBD::File) >= 0.4 -Requires: perl(DBI) >= 1.614 -Requires: perl(SQL::Statement) >= 1.33 +Requires: perl(DBD::File) >= 0.41 +Requires: perl(DBI) >= 1.623 +Requires: perl(SQL::Statement) >= 1.402 Requires: perl(Test::More) >= 0.9 -Requires: perl(Text::CSV_XS) >= 0.71 +Requires: perl(Text::CSV_XS) >= 0.94 +Recommends: perl(Test::More) >= 0.98 %{perl_requires} %description ++++++ DBD-CSV-0.34.tgz -> DBD-CSV-0.38.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-CSV-0.34/ChangeLog new/DBD-CSV-0.38/ChangeLog --- old/DBD-CSV-0.34/ChangeLog 2012-05-12 16:50:07.000000000 +0200 +++ new/DBD-CSV-0.38/ChangeLog 2013-01-09 20:30:30.000000000 +0100 @@ -1,3 +1,19 @@ +0.38 - 2013-01-09, H.Merijn Brand + * + +0.37 - 2013-01-09, H.Merijn Brand + * Fixed RT#80078, resulting in getline calls on undef (Benjamin Booth) + * Require latest DBI and SQL::Statement + * Updated copyright to 2013 + * Fixes for DBI-1.623 (Jens Rehsack) + +0.36 - 2012-08-22, H.Merijn Brand + * Add line/record number and position in error messages + +0.35 - 2012-05-24, H.Merijn Brand + * Improved documentation (including mje's contribution) + * Tested under 5.16.0 (installed) + 0.34 - 2012-05-12, H.Merijn Brand * Updated copyright to 2012 * Require 5.8.1, as DBI does diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-CSV-0.34/MANIFEST new/DBD-CSV-0.38/MANIFEST --- old/DBD-CSV-0.34/MANIFEST 2012-05-12 16:54:56.000000000 +0200 +++ new/DBD-CSV-0.38/MANIFEST 2013-01-09 22:06:51.000000000 +0100 @@ -28,6 +28,7 @@ t/72_csv-schema.t t/73_csv-case.t t/80_rt.t +t/85_error.t t/lib.pl examples/passwd.pl META.yml Module YAML meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-CSV-0.34/META.json new/DBD-CSV-0.38/META.json --- old/DBD-CSV-0.34/META.json 2012-05-12 16:54:57.000000000 +0200 +++ new/DBD-CSV-0.38/META.json 2013-01-09 22:06:51.000000000 +0100 @@ -1,55 +1,72 @@ { "resources" : { - "repository" : "http://repo.or.cz/w/DBD-CSV.git", - "license" : "http://dev.perl.org/licenses/" + "repository" : { + "web" : "http://repo.or.cz/w/DBD-CSV.git", + "url" : "http://repo.or.cz/r/DBD-CSV.git", + "type" : "git" + }, + "license" : [ + "http://dev.perl.org/licenses/" + ] }, - "installdirs" : "site", - "test_requires" : { - "Test::More" : "0.90", - "Test::Harness" : "0", - "charnames" : "0", - "Cwd" : "0", - "Encode" : "0" + "meta-spec" : { + "version" : "2", + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec" }, - "distribution_type" : "module", + "generated_by" : "Author", + "version" : "0.38", + "name" : "DBD-CSV", + "x_installdirs" : "site", "author" : [ "Jochen Wiedmann", "Jeff Zucker", "H.Merijn Brand <h.m.brand(a)xs4all.nl>", - "Jens Rehsack" + "Jens Rehsack <rehsack(a)cpan.org>" ], - "requires" : { - "perl" : "5.008001", - "Text::CSV_XS" : "0.71", - "SQL::Statement" : "1.33", - "DBD::File" : "0.40", - "DBI" : "1.614" - }, - "recommends" : { - "Test::More" : "0.98", - "perl" : "5.014002", - "Text::CSV_XS" : "0.88", - "DBI" : "1.620" - }, - "generated_by" : "Author", - "meta-spec" : { - "version" : "2.0", - "url" : "https://metacpan.org/module/CPAN::Meta::Spec?#meta-spec" - }, - "version" : "0.34", - "name" : "DBD-CSV", - "license" : "perl", - "build_requires" : { - "Config" : "0" + "dynamic_config" : 1, + "license" : [ + "perl_5" + ], + "prereqs" : { + "test" : { + "requires" : { + "Test::Harness" : "0", + "Test::More" : "0.90", + "charnames" : "0", + "Encode" : "0", + "Cwd" : "0" + } + }, + "runtime" : { + "requires" : { + "perl" : "5.008001", + "Text::CSV_XS" : "0.94", + "SQL::Statement" : "1.402", + "DBI" : "1.623", + "DBD::File" : "0.41" + }, + "recommends" : { + "perl" : "5.016002", + "Test::More" : "0.98" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "build" : { + "requires" : { + "Config" : "0" + } + } }, "provides" : { "DBD::CSV" : { - "version" : "0.34", + "version" : "0.38", "file" : "lib/DBD/CSV.pm" } }, "abstract" : "DBI driver for CSV files", - "configure_requires" : { - "ExtUtils::MakeMaker" : "0" - } + "release_status" : "stable" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-CSV-0.34/META.yml new/DBD-CSV-0.38/META.yml --- old/DBD-CSV-0.34/META.yml 2012-05-12 16:54:57.000000000 +0200 +++ new/DBD-CSV-0.38/META.yml 2013-01-09 22:06:51.000000000 +0100 @@ -1,44 +1,41 @@ ---- #YAML:1.0 -name: DBD-CSV -version: 0.34 -abstract: DBI driver for CSV files -license: perl -author: - - Jochen Wiedmann - - Jeff Zucker - - H.Merijn Brand <h.m.brand(a)xs4all.nl> - - Jens Rehsack -generated_by: Author -distribution_type: module -provides: - DBD::CSV: - file: lib/DBD/CSV.pm - version: 0.34 -requires: - perl: 5.008001 - DBI: 1.614 - DBD::File: 0.40 - SQL::Statement: 1.33 - Text::CSV_XS: 0.71 -configure_requires: - ExtUtils::MakeMaker: 0 -build_requires: - Config: 0 -test_requires: - Test::Harness: 0 - Test::More: 0.90 - Encode: 0 - Cwd: 0 - charnames: 0 -recommends: - perl: 5.014002 - DBI: 1.620 - Text::CSV_XS: 0.88 - Test::More: 0.98 -installdirs: site -resources: - license: http://dev.perl.org/licenses/ - repository: http://repo.or.cz/w/DBD-CSV.git -meta-spec: - version: 1.4 - url: http://module-build.sourceforge.net/META-spec-v1.4.html +--- +abstract: DBI driver for CSV files +author: + - Jochen Wiedmann + - Jeff Zucker + - H.Merijn Brand <h.m.brand(a)xs4all.nl> + - Jens Rehsack <rehsack(a)cpan.org> +build_requires: + Config: 0 + Cwd: 0 + Encode: 0 + Test::Harness: 0 + Test::More: '0.90' + charnames: 0 +configure_requires: + ExtUtils::MakeMaker: 0 +dynamic_config: 1 +generated_by: Author +license: perl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: '1.4' +name: DBD-CSV +provides: + DBD::CSV: + file: lib/DBD/CSV.pm + version: '0.38' +recommends: + Test::More: '0.98' + perl: '5.016002' +requires: + DBD::File: '0.41' + DBI: '1.623' + SQL::Statement: '1.402' + Text::CSV_XS: '0.94' + perl: '5.008001' +resources: + license: http://dev.perl.org/licenses/ + repository: http://repo.or.cz/r/DBD-CSV.git +version: '0.38' +x_installdirs: site diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-CSV-0.34/Makefile.PL new/DBD-CSV-0.38/Makefile.PL --- old/DBD-CSV-0.34/Makefile.PL 2012-01-11 09:01:43.000000000 +0100 +++ new/DBD-CSV-0.38/Makefile.PL 2013-01-09 22:06:32.000000000 +0100 @@ -1,6 +1,6 @@ # -*- perl -*- -# Copyright (c) 2009-2012 H.Merijn Brand +# Copyright (c) 2009-2013 H.Merijn Brand require 5.008001; @@ -33,10 +33,10 @@ AUTHOR => "H.Merijn Brand <h.merijn\(a)xs4all.nl>", VERSION_FROM => "lib/DBD/CSV.pm", PREREQ_PM => { - "DBI" => 1.614, - "DBD::File" => 0.40, - "Text::CSV_XS" => 0.71, - "SQL::Statement" => 1.33, + "DBI" => 1.623, + "DBD::File" => 0.41, + "Text::CSV_XS" => 0.94, + "SQL::Statement" => 1.402, "Test::More" => 0.90, "Encode" => 0, "charnames" => 0, @@ -48,6 +48,9 @@ valgrind.log ) }, + macro => { + TARFLAGS => "--format=ustar -c -v -f", + }, ); $ExtUtils::MakeMaker::VERSION > 6.30 and $wm{LICENSE} = "perl"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-CSV-0.34/README new/DBD-CSV-0.38/README --- old/DBD-CSV-0.34/README 2012-04-29 11:11:48.000000000 +0200 +++ new/DBD-CSV-0.38/README 2013-01-02 23:51:05.000000000 +0100 @@ -14,7 +14,7 @@ reflect code quality or stability. Copying - Copyright (C) 2009-2012 by H.Merijn Brand + Copyright (C) 2009-2013 by H.Merijn Brand Copyright (C) 2004-2009 by Jeff Zucker Copyright (C) 1998-2004 by Jochen Wiedmann diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-CSV-0.34/lib/Bundle/DBD/CSV.pm new/DBD-CSV-0.38/lib/Bundle/DBD/CSV.pm --- old/DBD-CSV-0.34/lib/Bundle/DBD/CSV.pm 2012-04-29 11:05:33.000000000 +0200 +++ new/DBD-CSV-0.38/lib/Bundle/DBD/CSV.pm 2013-01-09 20:31:00.000000000 +0100 @@ -5,7 +5,7 @@ use strict; use warnings; -our $VERSION = "1.05"; +our $VERSION = "1.07"; 1; @@ -21,15 +21,15 @@ =head1 CONTENTS -DBI 1.620 +DBI 1.623 -Text::CSV_XS 0.88 +Text::CSV_XS 0.94 -SQL::Statement 1.33 +SQL::Statement 1.402 -DBD::File 0.40 +DBD::File 0.41 -DBD::CSV 0.34 +DBD::CSV 0.38 =head1 DESCRIPTION @@ -44,7 +44,7 @@ =head1 COPYRIGHT AND LICENSE -Copyright (C) 2009-2012 by H.Merijn Brand +Copyright (C) 2009-2013 by H.Merijn Brand Copyright (C) 2004-2009 by Jeff Zucker Copyright (C) 1998-2004 by Jochen Wiedmann diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-CSV-0.34/lib/DBD/CSV.pm new/DBD-CSV-0.38/lib/DBD/CSV.pm --- old/DBD-CSV-0.34/lib/DBD/CSV.pm 2012-04-29 11:01:22.000000000 +0200 +++ new/DBD-CSV-0.38/lib/DBD/CSV.pm 2013-01-09 20:30:47.000000000 +0100 @@ -19,11 +19,12 @@ use strict; -use vars qw( @ISA $VERSION $drh $err $errstr $sqlstate ); +use vars qw( @ISA $VERSION $ATTRIBUTION $drh $err $errstr $sqlstate ); @ISA = qw( DBD::File ); -$VERSION = "0.34"; +$VERSION = "0.38"; +$ATTRIBUTION = "DBD::CSV $DBD::CSV::VERSION by H.Merijn Brand"; $err = 0; # holds error code for DBI::err $errstr = ""; # holds error string for DBI::errstr @@ -61,19 +62,16 @@ Text::CSV_XS::NV (), # SQL_DOUBLE ); -@DBD::CSV::dr::ISA = qw( DBD::File::dr ); +our @ISA = qw( DBD::File::dr ); -$DBD::CSV::dr::imp_data_size = 0; -$DBD::CSV::dr::data_sources_attr = undef; - -$DBD::CSV::ATTRIBUTION = "DBD::CSV $DBD::CSV::VERSION by H.Merijn Brand"; +our $imp_data_size = 0; +our $data_sources_attr = undef; sub connect { my ($drh, $dbname, $user, $auth, $attr) = @_; my $dbh = $drh->DBD::File::dr::connect ($dbname, $user, $auth, $attr); - $dbh->{f_meta} ||= {}; - $dbh->{Active} = 1; + $dbh->{Active} = 1; $dbh; } # connect @@ -83,9 +81,8 @@ use strict; -$DBD::CSV::db::imp_data_size = 0; - -@DBD::CSV::db::ISA = qw( DBD::File::db ); +our $imp_data_size = 0; +our @ISA = qw( DBD::File::db ); sub set_versions { @@ -94,31 +91,6 @@ return $this->SUPER::set_versions (); } # set_versions -if ($DBD::File::VERSION <= 0.38) { - # Map csv_tables to f_meta. - # Not absolutely needed, but otherwise I have to write two test suites - *STORE = sub { - my ($self, @attr) = @_; - @attr && $attr[0] eq "csv_tables" and $attr[0] = "f_meta"; - $self->SUPER::STORE (@attr); - }; # STORE - - *FETCH = sub { - my ($self, @attr) = @_; - @attr && $attr[0] eq "csv_tables" and $attr[0] = "f_meta"; - $self->SUPER::FETCH (@attr); - }; # FETCH - - *DBI::db::csv_versions = *csv_versions = sub { - join "\n", - "DBD::CSV $DBD::CSV::VERSION using Text::CSV_XS-$Text::CSV_XS::VERSION", - " DBD::File $DBD::File::VERSION", - "DBI $DBI::VERSION", - "OS $^O", - "Perl $]"; - }; # csv_versions - } - my %csv_xs_attr; sub init_valid_attributes @@ -172,148 +144,22 @@ use strict; -$DBD::CSV::st::imp_data_size = 0; - -@DBD::CSV::st::ISA = qw(DBD::File::st); - -$DBD::File::VERSION <= 0.38 and *FETCH = sub { - my ($sth, $attr) = @_; - - my ($struct, @coldefs, @colnames); - - # Being a bit dirty here, as SQL::Statement::Structure does not offer - # me an interface to the data I want - $struct = $sth->{f_stmt}{struct} || {}; - @coldefs = @{ $struct->{column_defs} || [] }; - @colnames = map { $_->{name} || $_->{value} } @coldefs; - - # dangerous: this accesses the table_defs information from last CREATE TABLE statement - $attr eq "TYPE" and # 12 = VARCHAR, TYPE should be numeric - return [ map { $struct->{table_defs}{columns}{$_}{data_type} || 12 } - @colnames ]; - - $attr eq "PRECISION" and - return [ map { $struct->{table_defs}{columns}{$_}{data_length} || 0 } - @colnames ]; - - $attr eq "NULLABLE" and - return [ map { ( grep m/^NOT NULL$/ => - @{ $struct->{table_defs}{columns}{$_}{constraints} || [] } - ) ? 0 : 1 } - @colnames ]; - - return $sth->SUPER::FETCH ($attr); - }; # FETCH +our $imp_data_size = 0; +our @ISA = qw(DBD::File::st); package DBD::CSV::Statement; use strict; -use DBD::File; use Carp; -@DBD::CSV::Statement::ISA = qw(DBD::File::Statement); - -# open_table (0 is used up to and including DBI-1.1611 -# Later versions use open_file (see DBD::CSV::Table) - -$DBD::File::VERSION <= 0.38 and *open_table = sub { - my ($self, $data, $table, $createMode, $lockMode) = @_; - - my $dbh = $data->{Database}; - my $tables = $dbh->{f_meta}; - $tables->{$table} ||= {}; - my $meta = $tables->{$table} || {}; - my $csv_in = $meta->{csv_in} || $dbh->{csv_csv_in}; - unless ($csv_in) { - my %opts = ( binary => 1, auto_diag => 1 ); - - # Allow specific Text::CSV_XS options - foreach my $key (grep m/^csv_/ => keys %$dbh) { - (my $attr = $key) =~ s/csv_//; - $attr =~ m{^(?: eol | sep | quote | escape # Handled below - | tables | sql_parser_object # Not for Text::CSV_XS - | sponge_driver | version # internal - )$}x and next; - $opts{$attr} = $dbh->{$key}; - } - delete $opts{null} and - $opts{blank_is_undef} = $opts{always_quote} = 1; - - my $class = $meta->{class} || $dbh->{csv_class} || "Text::CSV_XS"; - my $eol = $meta->{eol} || $dbh->{csv_eol} || "\r\n"; - $eol =~ m/^\A(?:[\r\n]|\r\n)\Z/ or $opts{eol} = $eol; - for ([ "sep", ',' ], - [ "quote", '"' ], - [ "escape", '"' ], - ) { - my ($attr, $def) = ($_->[0]."_char", $_->[1]); - $opts{$attr} = - exists $meta->{$attr} ? $meta->{$attr} : - exists $dbh->{"csv_$attr"} ? $dbh->{"csv_$attr"} : $def; - } - $meta->{csv_in} = $class->new (\%opts) or - $class->error_diag; - $opts{eol} = $eol; - $meta->{csv_out} = $class->new (\%opts) or - $class->error_diag; - } - my $file = $meta->{file} || $table; - my $tbl = $self->SUPER::open_table ($data, $file, $createMode, $lockMode); - if ($tbl && $tbl->{fh}) { - $tbl->{csv_csv_in} = $meta->{csv_in}; - $tbl->{csv_csv_out} = $meta->{csv_out}; - if (my $types = $meta->{types}) { - # The 'types' array contains DBI types, but we need types - # suitable for Text::CSV_XS. - my $t = []; - for (@{$types}) { - $_ = $_ - ? $DBD::CSV::dr::CSV_TYPES[$_ + 6] || Text::CSV_XS::PV () - : Text::CSV_XS::PV (); - push @$t, $_; - } - $tbl->{types} = $t; - } - if ( !$createMode and - !$self->{ignore_missing_table} and $self->{command} ne "DROP") { - my $array; - my $skipRows = exists $meta->{skip_rows} - ? $meta->{skip_rows} - : exists $meta->{col_names} ? 0 : 1; - if ($skipRows--) { - $array = $tbl->fetch_row ($data) or croak "Missing first row"; - unless ($self->{raw_header}) { - s/\W/_/g for @$array; - } - $tbl->{col_names} = $array; - while ($skipRows--) { - $tbl->fetch_row ($data); - } - } - $tbl->{first_row_pos} = $tbl->{fh}->tell (); - exists $meta->{col_names} and - $array = $tbl->{col_names} = $meta->{col_names}; - if (!$tbl->{col_names} || !@{$tbl->{col_names}}) { - # No column names given; fetch first row and create default - # names. - my $ar = $tbl->{cached_row} = $tbl->fetch_row ($data); - $array = $tbl->{col_names}; - push @$array, map { "col$_" } 0 .. $#$ar; - } - my $i = 0; - $tbl->{col_nums}{$_} = $i++ for @$array; - } - } - $tbl; - }; # open_table +our @ISA = qw(DBD::File::Statement); package DBD::CSV::Table; use strict; -use DBD::File; use Carp; -@DBD::CSV::Table::ISA = qw(DBD::File::Table); +our @ISA = qw(DBD::File::Table); sub bootstrap_table_meta { @@ -383,12 +229,11 @@ $class->SUPER::table_meta_attr_changed ($meta, $attr, $value); } # table_meta_attr_changed -$DBD::File::VERSION > 0.38 and *open_file = sub { +sub open_data { my ($self, $meta, $attrs, $flags) = @_; $self->SUPER::open_file ($meta, $attrs, $flags); - my $tbl = $meta; - if ($tbl && $tbl->{fh}) { + if ($meta && $meta->{fh}) { $attrs->{csv_csv_in} = $meta->{csv_in}; $attrs->{csv_csv_out} = $meta->{csv_out}; if (my $types = $meta->{types}) { @@ -402,7 +247,7 @@ : Text::CSV_XS::PV (); push @$t, $_; } - $tbl->{types} = $t; + $meta->{types} = $t; } if (!$flags->{createMode}) { my $array; @@ -414,32 +259,48 @@ defined $meta->{skip_rows} or $meta->{skip_rows} = $skipRows; if ($skipRows--) { - $array = $attrs->{csv_csv_in}->getline ($tbl->{fh}) or + $array = $attrs->{csv_csv_in}->getline ($meta->{fh}) or croak "Missing first row due to ".$attrs->{csv_csv_in}->error_diag; unless ($meta->{raw_header}) { s/\W/_/g for @$array; } - $tbl->{col_names} = $array; + defined $meta->{col_names} or + $meta->{col_names} = $array; while ($skipRows--) { - $tbl->{csv_csv_in}->getline ($tbl->{fh}); + $attrs->{csv_csv_in}->getline ($meta->{fh}); } } - $tbl->{first_row_pos} = $tbl->{fh}->tell (); + # lockMode is set 1 for DELETE, INSERT or UPDATE + # no other case need seeking + $flags->{lockMode} and # $meta->{fh}->can ("tell") and + $meta->{first_row_pos} = $meta->{fh}->tell (); exists $meta->{col_names} and - $array = $tbl->{col_names} = $meta->{col_names}; - if (!$tbl->{col_names} || !@{$tbl->{col_names}}) { + $array = $meta->{col_names}; + if (!$meta->{col_names} || !@{$meta->{col_names}}) { # No column names given; fetch first row and create default # names. - my $ar = $tbl->{cached_row} = - $tbl->{csv_csv_in}->getline ($tbl->{fh}); - $array = $tbl->{col_names}; + my $ar = $meta->{cached_row} = + $attrs->{csv_csv_in}->getline ($meta->{fh}); + $array = $meta->{col_names}; push @$array, map { "col$_" } 0 .. $#$ar; } - my $i = 0; - $tbl->{col_nums}{$_} = $i++ for @$array; # XXX not necessary for DBI > 1.611 } } - }; # open_file + } # open_file + +no warnings 'once'; +$DBI::VERSION < 1.623 and + *open_file = \&open_data; +use warnings; + +sub _csv_diag +{ + my @diag = $_[0]->error_diag; + for (2, 3) { + defined $diag[$_] or $diag[$_] = "?"; + } + return @diag; + } # _csv_diag sub fetch_row { @@ -448,7 +309,7 @@ exists $self->{cached_row} and return $self->{row} = delete $self->{cached_row}; - my $tbl = $DBD::File::VERSION <= 0.38 ? $self : $self->{meta}; + my $tbl = $self->{meta}; my $csv = $self->{csv_csv_in} or return do { $data->set_err ($DBI::stderr, "Fetch from undefined handle"); undef }; @@ -458,9 +319,9 @@ unless ($fields) { $csv->eof and return; - my @diag = $csv->error_diag; - my $file = $DBD::File::VERSION <= 0.38 ? $self->{file} : $tbl->{f_fqfn}; - croak "Error $diag[0] while reading file $file: $diag[1]"; + my @diag = _csv_diag ($csv); + my $file = $tbl->{f_fqfn}; + croak "Error $diag[0] while reading file $file: $diag[1] \@ line $diag[3] pos $diag[2]"; } @$fields < @{$tbl->{col_names}} and push @$fields, (undef) x (@{$tbl->{col_names}} - @$fields); @@ -470,18 +331,21 @@ sub push_row { my ($self, $data, $fields) = @_; - my $tbl = $DBD::File::VERSION <= 0.38 ? $self : $self->{meta}; + my $tbl = $self->{meta}; my $csv = $self->{csv_csv_out}; my $fh = $tbl->{fh}; unless ($csv->print ($fh, $fields)) { - my @diag = $csv->error_diag; - my $file = $DBD::File::VERSION <= 0.38 ? $self->{file} : $tbl->{f_fqfn}; - croak "Error $diag[0] while writing file $file: $diag[1]"; + my @diag = _csv_diag ($csv); + my $file = $tbl->{f_fqfn}; + return do { $data->set_err ($DBI::stderr, "Error $diag[0] while writing file $file: $diag[1] \@ line $diag[3] pos $diag[2]"); undef }; } 1; } # push_row + +no warnings 'once'; *push_names = \&push_row; +use warnings; 1; @@ -545,17 +409,20 @@ =over 4 =item DBI +X<DBI> The DBI (Database independent interface for Perl), version 1.00 or a later release =item DBD::File +X<DBD::File> This is the base class for DBD::CSV, and it is part of the DBI distribution. As DBD::CSV requires version 0.38 or newer for DBD::File it effectively requires DBI version 1.611 or newer. =item SQL::Statement +X<SQL::Statement> A simple SQL engine. This module defines all of the SQL syntax for DBD::CSV, new SQL support is added with each release so you should @@ -567,8 +434,9 @@ that the test suite does not test in this mode! =item Text::CSV_XS +X<Text::CSV_XS> -This module is used for writing rows to or reading rows from CSV files. +This module is used to read and write rows in a CSV file. =back @@ -609,12 +477,14 @@ =head2 Supported SQL Syntax -All SQL processing for DBD::CSV is done by the L<SQL::Statement> module. +All SQL processing for DBD::CSV is done by SQL::Statement. See +L<SQL::Statement> for more specific information about its feature set. Features include joins, aliases, built-in and user-defined functions, and more. See L<SQL::Statement::Syntax> for a description of the SQL syntax supported in DBD::CSV. -Table names are case insensitive unless quoted. +Table- and column-names are case insensitive unless quoted. Column names +will be sanitized unless L</raw_header> is true; =head1 Using DBD::CSV with DBI @@ -680,7 +550,7 @@ Using attributes in the DSN is easier to use when the DSN is derived from an outside source (environment variable, database entry, or configure file), -whereas using all entries in the attribute hash is easier to read and to +whereas specifying entries in the attribute hash is easier to read and to maintain. =head2 Creating and dropping tables @@ -708,7 +578,7 @@ =head2 Inserting, fetching and modifying data The following examples insert some data in a table and fetch it back: -First all data in the string: +First, an example where the column data is concatenated in the SQL string: $dbh->do ("INSERT INTO $table VALUES (1, ". $dbh->quote ("foobar") . ")"); @@ -716,18 +586,18 @@ Note the use of the quote method for escaping the word "foobar". Any string must be escaped, even if it does not contain binary data. -Next an example using parameters: +Next, an example using parameters: $dbh->do ("INSERT INTO $table VALUES (?, ?)", undef, 2, "It's a string!"); -Note that you don't need to use the quote method here, this is done -automatically for you. This version is particularly well designed for +Note that you don't need to quote column data passed as parameters. +This version is particularly well designed for loops. Whenever performance is an issue, I recommend using this method. You might wonder about the C<undef>. Don't wonder, just take it as it -is. :-) It's an attribute argument that I have never ever used and -will be parsed to the prepare method as a second argument. +is. :-) It's an attribute argument that I have never used and will be +passed to the prepare method as the second argument. To retrieve data, you can use the following: @@ -779,8 +649,9 @@ =head2 Error handling -In the above examples we have never cared about return codes. Of course, -this cannot be recommended. Instead we should have written (for example): +In the above examples we have never cared about return codes. Of +course, this is not recommended. Instead we should have written (for +example): my $sth = $dbh->prepare ("SELECT * FROM $table WHERE id = ?") or die "prepare: " . $dbh->errstr (); @@ -836,30 +707,38 @@ =over 4 =item AutoCommit +X<AutoCommit> Always on =item ChopBlanks +X<ChopBlanks> Works =item NUM_OF_FIELDS +X<NUM_OF_FIELDS> Valid after C<$sth-E<gt>execute> =item NUM_OF_PARAMS +X<NUM_OF_PARAMS> Valid after C<$sth-E<gt>prepare> =item NAME +X<NAME> =item NAME_lc +X<NAME_lc> =item NAME_uc +X<NAME_uc> Valid after C<$sth-E<gt>execute>; undef for Non-Select statements. =item NULLABLE +X<NULLABLE> Not really working. Always returns an array ref of one's, as DBD::CSV does not verify input data. Valid after C<$sth-E<gt>execute>; undef for @@ -879,19 +758,24 @@ In addition to the DBI attributes, you can use the following dbh attributes: +=head2 DBD::File attributes + =over 4 =item f_dir +X<f_dir> This attribute is used for setting the directory where CSV files are -opened. Usually you set it in the dbh, it defaults to the current -directory ("."). However, it is overwritable in the statement handles. +opened. Usually you set it in the dbh and it defaults to the current +directory ("."). However, it may be overridden in statement handles. =item f_ext +X<f_ext> This attribute is used for setting the file extension. =item f_schema +X<f_schema> This attribute allows you to set the database schema name. The default is to use the owner of C<f_dir>. C<undef> is allowed, but not in the DSN part. @@ -903,52 +787,69 @@ }) or die $DBI::errstr; =item f_encoding +X<f_encoding> -This attribute allows you to set the encoding of the data. With CSV, it is -not possible to set (and remember) the encoding on a per-field basis, but -DBD::File now allows to set the encoding of the underlying file. If this -attribute is not set, or undef is passed, the file will be seen as binary. +This attribute allows you to set the encoding of the data. With CSV, it is not +possible to set (and remember) the encoding on a column basis, but DBD::File +now allows the encoding to be set on the underlying file. If this attribute is +not set, or undef is passed, the file will be seen as binary. =item f_lock +X<f_lock> -With this attribute, you can force locking mode (if locking is supported -at all) for opening tables. By default, tables are opened with a shared -lock for reading, and with an exclusive lock for writing. The supported -modes are: +With this attribute you can specify a locking mode to be used (if locking is +supported at all) for opening tables. By default, tables are opened with a +shared lock for reading, and with an exclusive lock for writing. The +supported modes are: =over 2 =item 0 +X<0> Force no locking at all. =item 1 +X<1> Only shared locks will be used. =item 2 +X<2> Only exclusive locks will be used. =back +=back + But see L<DBD::File/"KNOWN BUGS">. +=head2 Text::CSV_XS specific attributes + +=over 4 + =item csv_eol +X<csv_eol> =item csv_sep_char +X<csv_sep_char> =item csv_quote_char +X<csv_quote_char> =item csv_escape_char +X<csv_escape_char> =item csv_class +X<csv_class> =item csv_csv +X<csv_csv> The attributes I<csv_eol>, I<csv_sep_char>, I<csv_quote_char> and I<csv_escape_char> are corresponding to the respective attributes of the -Text::CSV_XS object. You want to set these attributes if you have unusual +Text::CSV_XS object. You may want to set these attributes if you have unusual CSV files like F</etc/passwd> or MS Excel generated CSV files with a semicolon as separator. Defaults are "\015\012", ';', '"' and '"', respectively. @@ -988,6 +889,7 @@ the I<csv_tables> attribute. =item csv_null +X<csv_null> With this option set, all new statement handles will set C<always_quote> and C<blank_is_undef> in the CSV parser and writer, so it knows how to @@ -999,16 +901,18 @@ $dbh->{csv_null} = 1; =item csv_tables +X<csv_tables> This hash ref is used for storing table dependent metadata. For any table it contains an element with the table name as key and another hash ref with the following attributes: =item csv_* +X<csv_*> All other attributes that start with C<csv_> and are not described above -will be passed to C<Text::CSV_XS> (without the C<csv_> prefix). these -extra options are most likely to be only useful for reading (select) +will be passed to C<Text::CSV_XS> (without the C<csv_> prefix). These +extra options are only likely to be useful for reading (select) handles. Examples: $dbh->{csv_allow_whitespace} = 1; @@ -1017,33 +921,46 @@ See the C<Text::CSV_XS> documentation for the full list and the documentation. +=back + +=head2 Driver specific attributes + =over 4 =item file +X<file> The tables file name; defaults to "$dbh->{f_dir}/$table" =item eol +X<eol> =item sep_char +X<sep_char> =item quote_char +X<quote_char> =item escape_char +X<escape_char> =item class +X<class> =item csv +X<csv> These correspond to the attributes I<csv_eol>, I<csv_sep_char>, I<csv_quote_char>, I<csv_escape_char>, I<csv_class> and I<csv_csv>. -The difference is that they work on a per-table base. +The difference is that they work on a per-table basis. =item col_names +X<col_names> =item skip_first_row +X<skip_first_row> By default DBD::CSV assumes that column names are stored in the first row of the CSV file and sanitizes them (see C<raw_header> below). If this is @@ -1056,23 +973,24 @@ C<col0>, C<col1>, ... =item raw_header +X<raw_header> Due to the SQL standard, field names cannot contain special characters -like a dot (C<.>). Following the approach of mdb_tools, all these tokens -are translated to an underscore (C<_>) when reading the first line of the -CSV file, so all field names are `sanitized'. If you do not want this to -happen, set C<raw_header> to a true value. DBD::CSV cannot guarantee that -any part in the toolchain will work if field names have those characters, +like a dot (C<.>) or a space (C< >) unless the column names are quoted. +Following the approach of mdb_tools, all these tokens are translated to an +underscore (C<_>) when reading the first line of the CSV file, so all field +names are 'sanitized'. If you do not want this to happen, set C<raw_header> +to a true value and the entries in the first line of the CSV data will be +used verbatim for column headers and field names. DBD::CSV cannot guarantee +that any part in the toolchain will work if field names have those characters, and the chances are high that the SQL statements will fail. =back -=back - It's strongly recommended to check the attributes supported by L<DBD::File/Metadata>. -Example: Suggest you want to use F</etc/passwd> as a CSV file. :-) +Example: Suppose you want to use /etc/passwd as a CSV file. :-) There simplest way is: use DBI; @@ -1089,7 +1007,7 @@ $sth = $dbh->prepare ("SELECT * FROM passwd"); Another possibility where you leave all the defaults as they are and -overwrite them on a per table base: +override them on a per table basis: require DBI; my $dbh = DBI->connect ("dbi:CSV:"); @@ -1111,6 +1029,7 @@ =over 4 =item data_sources +X<data_sources> The C<data_sources> method returns a list of sub-directories of the current directory in the form "dbi:CSV:directory=$dirname". @@ -1121,6 +1040,7 @@ my @list = $drh->data_sources (f_dir => "/usr/local/csv_data"); =item list_tables +X<list_tables> This method returns a list of file names inside $dbh->{directory}. Example: @@ -1141,9 +1061,9 @@ =item * The module is using flock () internally. However, this function is not -available on platforms. Using flock () is disabled on MacOS and Windows -95: There's no locking at all (perhaps not so important on these -operating systems, as they are for single users anyways). +available on some platforms. Use of flock () is disabled on MacOS and +Windows 95: There's no locking at all (perhaps not so important on +these operating systems, as they are for single users anyways). =back @@ -1152,6 +1072,7 @@ =over 4 =item Tests +X<Tests> Aim for a full 100% code coverage @@ -1168,28 +1089,34 @@ that is useful. =item RT +X<RT> Attack all open DBD::CSV bugs in RT =item CPAN::Forum +X<CPAN::Forum> Attack all items in http://www.cpanforum.com/dist/DBD-CSV =item Documentation +X<Documentation> Expand on error-handling, and document all possible errors. Use Text::CSV_XS::error_diag () wherever possible. =item Debugging +X<Debugging> Implement and document dbd_verbose. =item Data dictionary +X<Data dictionary> Investigate the possibility to store the data dictionary in a file like .sys$columns that can store the field attributes (type, key, nullable). =item Examples +X<Examples> Make more real-life examples from the docs in examples/ @@ -1222,7 +1149,7 @@ =head1 COPYRIGHT AND LICENSE -Copyright (C) 2009-2012 by H.Merijn Brand +Copyright (C) 2009-2013 by H.Merijn Brand Copyright (C) 2004-2009 by Jeff Zucker Copyright (C) 1998-2004 by Jochen Wiedmann diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-CSV-0.34/t/50_chopblanks.t new/DBD-CSV-0.38/t/50_chopblanks.t --- old/DBD-CSV-0.34/t/50_chopblanks.t 2010-08-06 13:42:23.000000000 +0200 +++ new/DBD-CSV-0.38/t/50_chopblanks.t 2012-11-13 08:48:57.000000000 +0100 @@ -38,8 +38,8 @@ $sth->{ChopBlanks} = 0; ok (1, "ChopBlanks 0"); ok ($sth->execute ($row->[0]), "execute"); - ok (my $r = $sth->fetch, "fetch"); - is_deeply ($r, $row, "content"); + ok (my $r = $sth->fetch, "fetch ($row->[0]:1)"); + is_deeply ($r, $row, "content ($row->[0]:1)"); $sth->{ChopBlanks} = 1; ok (1, "ChopBlanks 1"); @@ -48,8 +48,8 @@ if ($DBD::File::VERSION <= 0.38) { s/\s+$// for @$row; # Bug fixed in new DBI } - ok ($r = $sth->fetch, "fetch"); - is_deeply ($r, $row, "content"); + ok ($r = $sth->fetch, "fetch ($row->[0]:2)"); + is_deeply ($r, $row, "content ($row->[0]:2)"); } ok ($sti->finish, "finish sti"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-CSV-0.34/t/80_rt.t new/DBD-CSV-0.38/t/80_rt.t --- old/DBD-CSV-0.34/t/80_rt.t 2010-09-16 08:33:30.000000000 +0200 +++ new/DBD-CSV-0.38/t/80_rt.t 2012-10-11 09:18:31.000000000 +0200 @@ -261,6 +261,35 @@ ok ($dbh->do ("drop table RT$rt"), "drop"); ok ($dbh->disconnect, "disconnect"); } + +{ $rt = 80078; + ok ($rt, "RT-$rt - $desc{$rt}"); + my @lines = @{$input{$rt}}; + + my $tbl = "rt$rt"; + open my $fh, ">", "output/$tbl"; + print $fh @lines; + close $fh; + + ok (my $dbh = Connect ({ + csv_sep_char => "\t", + csv_quote_char => undef, + csv_escape_char => "\\", + csv_allow_loose_escapes => 1, + RaiseError => 1, + PrintError => 1, + }), "connect"); + $dbh->{csv_tables}{$tbl}{col_names} = []; + ok (my $sth = $dbh->prepare ("select * from $tbl"), "prepare"); + eval { + ok ($sth->execute, "execute"); + ok (!$@, "no error"); + }; + + ok ($dbh->do ("drop table $tbl"), "drop"); + ok ($dbh->disconnect, "disconnect"); + } + done_testing (); __END__ @@ -299,3 +328,6 @@ "HEADER1";"HEADER2" Volki;Bolki Zolki;Solki +�80078� - bug in DBD::CSV causes select to fail +a b c d +e f g h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-CSV-0.34/t/85_error.t new/DBD-CSV-0.38/t/85_error.t --- old/DBD-CSV-0.34/t/85_error.t 1970-01-01 01:00:00.000000000 +0100 +++ new/DBD-CSV-0.38/t/85_error.t 2012-08-24 20:43:15.000000000 +0200 @@ -0,0 +1,44 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use Test::More; + +BEGIN { use_ok ("DBI") } +do "t/lib.pl"; + +my @tbl_def = ( + [ "id", "INTEGER", 4, 0 ], + [ "name", "CHAR", 64, 0 ], + ); + +unlink glob "output/*"; + +ok (my $dbh = Connect (), "connect"); + +ok (my $tbl = FindNewTable ($dbh), "find new test table"); + +like (my $def = TableDefinition ($tbl, @tbl_def), + qr{^create table $tbl}i, "table definition"); +ok ($dbh->do ($def), "create table"); +my $tbl_file = DbFile ($tbl); +ok (-s $tbl_file, "file exists"); +ok ($dbh->disconnect, "disconnect"); + +ok (-f $tbl_file, "file still there"); +open my $fh, ">>", $tbl_file; +print $fh qq{1, "p0wnd",",""",0\n}; # Very bad content +close $fh; + +ok ($dbh = Connect (), "connect"); +{ local $dbh->{PrintError} = 0; + local $dbh->{RaiseError} = 0; + ok (my $sth = $dbh->prepare ("select * from $tbl"), "prepare"); + is ($sth->execute, undef, "execute should fail"); + # It is safe to regex on this text, as it is NOT local dependant + like ($dbh->errstr, qr{\w+ \@ line [0-9?]+ pos [0-9?]+}, "error message"); + }; +ok ($dbh->do ("drop table $tbl"), "drop"); +ok ($dbh->disconnect, "disconnect"); + +done_testing (); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pango for openSUSE:Factory
by root＠hilbert.suse.de 28 Jun '13

28 Jun '13

Hello community, here is the log from the commit of package pango for openSUSE:Factory checked in at 2013-06-28 18:54:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pango (Old) and /work/SRC/openSUSE:Factory/.pango.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pango" Changes: -------- --- /work/SRC/openSUSE:Factory/pango/pango.changes 2013-05-16 11:22:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pango.new/pango.changes 2013-06-28 18:54:58.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Jun 22 13:44:01 UTC 2013 - zaitor(a)opensuse.org + +- Update to version 1.35.0: + + Requires cairo 1.12.10. + + Add a --with-cairo option. + + Handle invalid utf8 better (bgo#700577). + + Install some tests. + + Don't change fonts for space (bgo#701652). + +------------------------------------------------------------------- Old: ---- pango-1.34.1.tar.xz New: ---- pango-1.35.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pango.spec ++++++ --- /var/tmp/diff_new_pack.bSMkgS/_old 2013-06-28 18:54:59.000000000 +0200 +++ /var/tmp/diff_new_pack.bSMkgS/_new 2013-06-28 18:54:59.000000000 +0200 @@ -20,20 +20,20 @@ %define pango_binary_version 1.8.0 Name: pango -Version: 1.34.1 +Version: 1.35.0 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1+ Group: System/Libraries Url: http://www.pango.org/ -Source: http://download.gnome.org/sources/pango/1.34/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/pango/1.35/%{name}-%{version}.tar.xz Source1: README.SuSE Source2: macros.pango Source99: baselibs.conf BuildRequires: gcc-c++ BuildRequires: gtk-doc BuildRequires: pkg-config -BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(cairo) >= 1.12.10 BuildRequires: pkgconfig(fontconfig) >= 2.10.91 BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(glib-2.0) >= 2.33.12 ++++++ pango-1.34.1.tar.xz -> pango-1.35.0.tar.xz ++++++ ++++ 3872 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/pango-1.34.1/ChangeLog new/pango-1.35.0/ChangeLog --- old/pango-1.34.1/ChangeLog 2013-05-13 18:45:13.000000000 +0200 +++ new/pango-1.35.0/ChangeLog 2013-06-21 15:11:08.000000000 +0200 @@ -1,3 +1,99 @@ +commit 8ac9fc7faeff8908448e9da09a43873e2e0fe376 +Author: Matthias Clasen <mclasen(a)redhat.com> +Date: Fri Jun 7 21:10:44 2013 -0400 + + Avoid hard-dep on bleeding-edge GLib + + If new test api is not available, do without it. In this + case, the tests won't work installed, but they should still + work uninstalled and in distcheck. + + tests/Makefile.am | 1 + + tests/testboundaries.c | 5 +++++ + tests/testboundaries_ucd.c | 16 ++++++++++++++++ + 3 files changed, 22 insertions(+) + +commit d489ad061d70526fc5f5cdae2273e9deabea6a17 +Author: Behdad Esfahbod <behdad(a)behdad.org> +Date: Thu Jun 6 19:57:55 2013 -0400 + + Don't change fonts just for space characters + + Back in the days we used to always use the font from surrounding runs + for any space characters. I changed that when I found that rendering + MathML results in hexboxes when a font doesn't have the space + characters + needed... + + Forward to these days: HarfBuzz will silently compatibility-decompose + any space character to the ASCII space. And looks like it's important + for Mongolian to not break runs around NNBSP. As such, go back + to never + choosing a font just for space characters. + + Seems to work, though more testing is needed. + + Bug 701652 - wrong shaped classic Mongolian word suffixes + + pango/pango-context.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit e17b595e3bacfb7333bab6fcd1c62d05e7228936 +Author: Matthias Clasen <mclasen(a)redhat.com> +Date: Fri May 31 18:02:03 2013 -0400 + + Make tests installable + + This ensures that tests are run continuously on ostree.gnome.org. + + configure.ac | 13 +++++++++- + tests/Makefile.am | 34 +++++++++++++++++++----- + tests/test-ot-tags.c | 8 +++--- + tests/testboundaries.c | 26 ++++++++++--------- + tests/testboundaries_ucd.c | 65 + +++++++++++++++++++++++++++++++++------------- + tests/testcolor.c | 23 +++++++++------- + tests/testiter.c | 17 ++++++++---- + tests/testscript.c | 6 ++--- + 8 files changed, 133 insertions(+), 59 deletions(-) + +commit 6c16dfe8ad012a2551d0270a0325574e9ce3cef7 +Author: Behdad Esfahbod <behdad(a)behdad.org> +Date: Mon May 27 17:24:04 2013 -0400 + + Bug 700577 - Support invalid UTF-8 chars in + pango_find_paragraph_boundary() + + pango/break.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fe8d5ce6975bda30839413f71ab3e192a582300b +Author: Colin Walters <walters(a)verbum.org> +Date: Fri May 24 18:04:49 2013 +0100 + + build: Add --with(out)-cairo configure option + + Some builders (e.g. GNOME and jhbuild) hard depend on pangocairo, + and we really don't want to emit a build of pango without support + for it. So jhbuild can specify --with-cairo, and we'll get + a hard error. + + configure.ac | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 49712d6381f25fe3785694fea7804988c1067a24 +Author: Behdad Esfahbod <behdad(a)behdad.org> +Date: Wed May 15 14:40:45 2013 -0400 + + Require cairo >= 1.12.10 + + Needed for threadsafety bug fixes. + + Bug 700247 - test-pangocairo-threads segfaults + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 0e3dfe8b6ce6f9ddd68ba150906d1d711ad1433c Author: Matthias Clasen <mclasen(a)redhat.com> Date: Mon May 13 11:34:10 2013 -0400 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/pango-1.34.1/INSTALL new/pango-1.35.0/INSTALL --- old/pango-1.34.1/INSTALL 2013-05-13 17:34:49.000000000 +0200 +++ new/pango-1.35.0/INSTALL 2013-06-21 15:00:48.000000000 +0200 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, 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/pango-1.34.1/NEWS new/pango-1.35.0/NEWS --- old/pango-1.34.1/NEWS 2013-05-13 17:34:06.000000000 +0200 +++ new/pango-1.35.0/NEWS 2013-06-21 15:00:08.000000000 +0200 @@ -1,3 +1,11 @@ +Overview of changes between 1.34 and 1.35.0 +=========================================== +- Requires cairo 1.12.10 +- Add a --with-cairo option +- Handle invalid utf8 better (#700577) +- Install some tests +- Don't change fonts for space (#701652) + Overview of changes between 1.34.0 and 1.34.1 ============================================= - 96238 - PangoAttrFilterFunc vs pango_attr_list_filter docs 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/pango-1.34.1/config.h.win32 new/pango-1.35.0/config.h.win32 --- old/pango-1.34.1/config.h.win32 2013-05-13 17:35:03.000000000 +0200 +++ new/pango-1.35.0/config.h.win32 2013-06-21 15:00:55.000000000 +0200 @@ -121,7 +121,7 @@ #define PACKAGE_NAME "pango" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pango 1.34.1" +#define PACKAGE_STRING "pango 1.35.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pango" @@ -130,22 +130,22 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.34.1" +#define PACKAGE_VERSION "1.35.0" /* PANGO binary age */ -#define PANGO_BINARY_AGE 3401 +#define PANGO_BINARY_AGE 3500 /* PANGO interface age */ -#define PANGO_INTERFACE_AGE 1 +#define PANGO_INTERFACE_AGE 0 /* PANGO major version */ #define PANGO_VERSION_MAJOR 1 /* PANGO micro version */ -#define PANGO_VERSION_MICRO 1 +#define PANGO_VERSION_MICRO 0 /* PANGO minor version */ -#define PANGO_VERSION_MINOR 34 +#define PANGO_VERSION_MINOR 35 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -154,4 +154,4 @@ /* #undef USE_LA_MODULES */ /* Version number of package */ -#define VERSION "1.34.1" +#define VERSION "1.35.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/pango-1.34.1/configure.ac new/pango-1.35.0/configure.ac --- old/pango-1.34.1/configure.ac 2013-05-13 17:31:52.000000000 +0200 +++ new/pango-1.35.0/configure.ac 2013-06-21 14:55:47.000000000 +0200 @@ -21,8 +21,8 @@ dnl The triplet m4_define([pango_version_major], [1]) -m4_define([pango_version_minor], [34]) -m4_define([pango_version_micro], [1]) +m4_define([pango_version_minor], [35]) +m4_define([pango_version_micro], [0]) m4_define([pango_version], [pango_version_major.pango_version_minor.pango_version_micro]) @@ -353,9 +353,14 @@ have_cairo_freetype=false have_cairo_win32=false have_cairo_quartz=false -cairo_required=1.7.6 +cairo_required=1.12.10 -PKG_CHECK_MODULES(CAIRO, cairo >= $cairo_required, have_cairo=true, AC_MSG_RESULT([no])) +AC_ARG_WITH(cairo, + AS_HELP_STRING([--without-cairo], [Do not use cairo]), + :, with_cairo=auto) +AS_IF([test x$with_cairo != xno], [ + PKG_CHECK_MODULES(CAIRO, cairo >= $cairo_required, have_cairo=true, AC_MSG_RESULT([no])) +]) if $have_cairo ; then pango_save_libs=$LIBS @@ -397,6 +402,9 @@ if $have_cairo ; then AC_MSG_RESULT([$cairo_font_backends]) else + if test x${with_cairo} != xauto; then + AC_MSG_ERROR([cairo support requested, but not present]) + fi AC_MSG_RESULT([none]) AC_MSG_NOTICE([Disabling cairo support]) fi @@ -670,6 +678,17 @@ fi dnl ******************************************************** +dnl * Installed test * +dnl ******************************************************** + +AC_ARG_ENABLE(installed_tests, + AS_HELP_STRING([--enable-installed-tests], + [Install test programs (default: no)]),, + [enable_installed_tests=no]) +AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes) + + +dnl ******************************************************** dnl * See whether we need to load our modules as .la files * dnl ******************************************************** 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/pango-1.34.1/docs/html/index.html new/pango-1.35.0/docs/html/index.html --- old/pango-1.34.1/docs/html/index.html 2013-05-13 18:45:22.000000000 +0200 +++ new/pango-1.35.0/docs/html/index.html 2013-06-21 15:11:10.000000000 +0200 @@ -14,7 +14,7 @@ <div class="titlepage"> <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Pango Reference Manual</p></th></tr></table></div> -<div><p class="releaseinfo">for Pango 1.34.1 +<div><p class="releaseinfo">for Pango 1.35.0 </p></div> </div> <hr> 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/pango-1.34.1/docs/html/pango-Fonts.html new/pango-1.35.0/docs/html/pango-Fonts.html --- old/pango-1.34.1/docs/html/pango-Fonts.html 2013-05-13 18:45:22.000000000 +0200 +++ new/pango-1.35.0/docs/html/pango-Fonts.html 2013-06-21 15:11:10.000000000 +0200 @@ -2774,7 +2774,7 @@ If you are using Pango as part of a higher-level system, that system may have it's own way of create a <a class="link" href="pango-Text-Processing.html#PangoContext"><span class="type">PangoContext</span></a>. For instance, the GTK+ toolkit has, among others, -<a href="http://library.gnome.org/devel/gdk3/gdk2-Pango-Interaction.html#gdk-pango-c…"><code class="function">gdk_pango_context_get_for_screen()</code></a>, and +<a href="http://developer.gnome.org/gdk2/gdk3-Pango-Interaction.html#gdk-pango-conte…"><code class="function">gdk_pango_context_get_for_screen()</code></a>, and <a href="http://developer.gnome.org/gtk2/GtkWidget.html#gtk-widget-get-pango-context"><code class="function">gtk_widget_get_pango_context()</code></a>. Use those instead. </p> <div class="variablelist"><table border="0" class="variablelist"> 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/pango-1.34.1/docs/html/pango-Scripts-and-Languages.html new/pango-1.35.0/docs/html/pango-Scripts-and-Languages.html --- old/pango-1.34.1/docs/html/pango-Scripts-and-Languages.html 2013-05-13 18:45:22.000000000 +0200 +++ new/pango-1.35.0/docs/html/pango-Scripts-and-Languages.html 2013-06-21 15:11:10.000000000 +0200 @@ -1160,7 +1160,7 @@ <p> Your application should call <code class="literal">setlocale(LC_ALL, "");</code> for the user settings to take effect. Gtk+ does this in its initialization -functions automatically (by calling <a href="http://library.gnome.org/devel/gtk3/gtk2-General.html#gtk-set-locale"><code class="function">gtk_set_locale()</code></a>). +functions automatically (by calling <code class="function">gtk_set_locale()</code>). See <code class="literal">man setlocale</code> for more details. </p> <div class="variablelist"><table border="0" class="variablelist"> 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/pango-1.34.1/docs/html/pango-Text-Processing.html new/pango-1.35.0/docs/html/pango-Text-Processing.html --- old/pango-1.34.1/docs/html/pango-Text-Processing.html 2013-05-13 18:45:22.000000000 +0200 +++ new/pango-1.35.0/docs/html/pango-Text-Processing.html 2013-06-21 15:11:10.000000000 +0200 @@ -563,7 +563,7 @@ If you are using Pango as part of a higher-level system, that system may have it's own way of create a <a class="link" href="pango-Text-Processing.html#PangoContext"><span class="type">PangoContext</span></a>. For instance, the GTK+ toolkit has, among others, -<a href="http://library.gnome.org/devel/gdk3/gdk2-Pango-Interaction.html#gdk-pango-c…"><code class="function">gdk_pango_context_get_for_screen()</code></a>, and +<a href="http://developer.gnome.org/gdk2/gdk3-Pango-Interaction.html#gdk-pango-conte…"><code class="function">gdk_pango_context_get_for_screen()</code></a>, and <a href="http://developer.gnome.org/gtk2/GtkWidget.html#gtk-widget-get-pango-context"><code class="function">gtk_widget_get_pango_context()</code></a>. Use those instead. </p> <div class="variablelist"><table border="0" class="variablelist"> 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/pango-1.34.1/docs/html/pango-Version-Checking.html new/pango-1.35.0/docs/html/pango-Version-Checking.html --- old/pango-1.34.1/docs/html/pango-Version-Checking.html 2013-05-13 18:45:22.000000000 +0200 +++ new/pango-1.35.0/docs/html/pango-Version-Checking.html 2013-06-21 15:11:10.000000000 +0200 @@ -117,7 +117,7 @@ <hr> <div class="refsect2"> <a name="PANGO-VERSION-MINOR:CAPS"></a><h3>PANGO_VERSION_MINOR</h3> -<pre class="programlisting">#define PANGO_VERSION_MINOR 34 +<pre class="programlisting">#define PANGO_VERSION_MINOR 35 </pre> <p> The minor component of the version of Pango available at compile-time. @@ -126,7 +126,7 @@ <hr> <div class="refsect2"> <a name="PANGO-VERSION-MICRO:CAPS"></a><h3>PANGO_VERSION_MICRO</h3> -<pre class="programlisting">#define PANGO_VERSION_MICRO 1 +<pre class="programlisting">#define PANGO_VERSION_MICRO 0 </pre> <p> The micro component of the version of Pango available at compile-time. @@ -135,7 +135,7 @@ <hr> <div class="refsect2"> <a name="PANGO-VERSION-STRING:CAPS"></a><h3>PANGO_VERSION_STRING</h3> -<pre class="programlisting">#define PANGO_VERSION_STRING "1.34.1" +<pre class="programlisting">#define PANGO_VERSION_STRING "1.35.0" </pre> <p> A string literal containing the version of Pango available at compile-time. 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/pango-1.34.1/docs/pango-querymodules.1 new/pango-1.35.0/docs/pango-querymodules.1 --- old/pango-1.34.1/docs/pango-querymodules.1 2013-05-13 17:35:58.000000000 +0200 +++ new/pango-1.35.0/docs/pango-querymodules.1 2013-06-21 15:01:51.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: pango-querymodules .\" Author: Owen Taylor .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 05/13/2013 +.\" Date: 06/21/2013 .\" Manual: User Commands .\" Source: Pango .\" Language: English .\" -.TH "PANGO\-QUERYMODULES" "1" "05/13/2013" "Pango" "User Commands" +.TH "PANGO\-QUERYMODULES" "1" "06/21/2013" "Pango" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- 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/pango-1.34.1/docs/version.xml new/pango-1.35.0/docs/version.xml --- old/pango-1.34.1/docs/version.xml 2013-05-13 17:35:03.000000000 +0200 +++ new/pango-1.35.0/docs/version.xml 2013-06-21 15:00:55.000000000 +0200 @@ -1 +1 @@ -1.34.1 +1.35.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/pango-1.34.1/gtk-doc.make new/pango-1.35.0/gtk-doc.make --- old/pango-1.34.1/gtk-doc.make 2013-05-07 16:35:55.000000000 +0200 +++ new/pango-1.35.0/gtk-doc.make 2013-05-27 19:50:19.000000000 +0200 @@ -84,7 +84,7 @@ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ 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/pango-1.34.1/pango/break.c new/pango-1.35.0/pango/break.c --- old/pango-1.34.1/pango/break.c 2013-05-07 16:45:33.000000000 +0200 +++ new/pango-1.35.0/pango/break.c 2013-06-01 00:03:53.000000000 +0200 @@ -1747,7 +1747,7 @@ prev_sep = 0; - while (p != end) + while (p < end) { if (prev_sep == '\n' || prev_sep == PARAGRAPH_SEPARATOR_STRING[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/pango-1.34.1/pango/pango-context.c new/pango-1.35.0/pango/pango-context.c --- old/pango-1.34.1/pango/pango-context.c 2013-01-03 14:12:47.000000000 +0100 +++ new/pango-1.35.0/pango/pango-context.c 2013-06-08 02:59:54.000000000 +0200 @@ -1447,17 +1447,17 @@ PangoFont *font; /* We don't want space characters to affect font selection; in general, - * it's always wrong to select a font just to render a space. But until - * we have a better solution, choosing a font for spaces seems to work - * better. However, all fonts are assumed to cover ASCII space, so that - * one is an exception. See bug #355987. + * it's always wrong to select a font just to render a space. + * We assume that all fonts have the ASCII space, and for other space + * characters if they don't, HarfBuzz will compatibility-decompose them + * to ASCII space... + * See bugs #355987 and #701652. * * The exception of PrivateUse and Unassigned characters is necessary * to be able to render any of them. (for private or being encoded * scripts, etc.) (Recent glib returns true in isprint for PrivateUse.) */ - if (wc == 0x0020 || - G_UNLIKELY (!g_unichar_isprint (wc) && + if (G_UNLIKELY (!g_unichar_isgraph (wc) && g_unichar_type (wc) != G_UNICODE_PRIVATE_USE && g_unichar_type (wc) != G_UNICODE_UNASSIGNED)) { 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/pango-1.34.1/pango/pango-features.h new/pango-1.35.0/pango/pango-features.h --- old/pango-1.34.1/pango/pango-features.h 2013-05-13 17:35:05.000000000 +0200 +++ new/pango-1.35.0/pango/pango-features.h 2013-06-21 15:00:55.000000000 +0200 @@ -3,10 +3,10 @@ #define PANGO_FEATURES_H #define PANGO_VERSION_MAJOR 1 -#define PANGO_VERSION_MINOR 34 -#define PANGO_VERSION_MICRO 1 +#define PANGO_VERSION_MINOR 35 +#define PANGO_VERSION_MICRO 0 -#define PANGO_VERSION_STRING "1.34.1" +#define PANGO_VERSION_STRING "1.35.0" #endif 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/pango-1.34.1/pango/pango.rc new/pango-1.35.0/pango/pango.rc --- old/pango-1.34.1/pango/pango.rc 2013-05-13 17:35:02.000000000 +0200 +++ new/pango-1.35.0/pango/pango.rc 2013-06-21 15:00:54.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,34,1,0 - PRODUCTVERSION 1,34,1,0 + FILEVERSION 1,35,0,0 + PRODUCTVERSION 1,35,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "Pango" - VALUE "FileVersion", "1.34.1.0" + VALUE "FileVersion", "1.35.0.0" VALUE "InternalName", "pango-1.0-0" VALUE "LegalCopyright", "Copyright � 1999 Red Hat Software." VALUE "OriginalFilename", "pango-1.0-0.dll" VALUE "ProductName", "Pango" - VALUE "ProductVersion", "1.34.1" + VALUE "ProductVersion", "1.35.0" END END BLOCK "VarFileInfo" 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/pango-1.34.1/pango/pangocairo.rc new/pango-1.35.0/pango/pangocairo.rc --- old/pango-1.34.1/pango/pangocairo.rc 2013-05-13 17:35:02.000000000 +0200 +++ new/pango-1.35.0/pango/pangocairo.rc 2013-06-21 15:00:54.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,34,1,0 - PRODUCTVERSION 1,34,1,0 + FILEVERSION 1,35,0,0 + PRODUCTVERSION 1,35,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoCairo" - VALUE "FileVersion", "1.34.1.0" + VALUE "FileVersion", "1.35.0.0" VALUE "InternalName", "pangocairo-1.0-0" VALUE "LegalCopyright", "Copyright � 2010 Red Hat Software." VALUE "OriginalFilename", "pangocairo-1.0-0.dll" VALUE "ProductName", "PangoCairo" - VALUE "ProductVersion", "1.34.1" + VALUE "ProductVersion", "1.35.0" END END BLOCK "VarFileInfo" 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/pango-1.34.1/pango/pangoft2.rc new/pango-1.35.0/pango/pangoft2.rc --- old/pango-1.34.1/pango/pangoft2.rc 2013-05-13 17:35:02.000000000 +0200 +++ new/pango-1.35.0/pango/pangoft2.rc 2013-06-21 15:00:54.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,34,1,0 - PRODUCTVERSION 1,34,1,0 + FILEVERSION 1,35,0,0 + PRODUCTVERSION 1,35,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoFT2" - VALUE "FileVersion", "1.34.1.0" + VALUE "FileVersion", "1.35.0.0" VALUE "InternalName", "pangoft2-1.0-0" VALUE "LegalCopyright", "Copyright � 1999 Red Hat Software. Copyright � 2000 Tor Lillqvist" VALUE "OriginalFilename", "pangoft2-1.0-0.dll" VALUE "ProductName", "PangoFT2" - VALUE "ProductVersion", "1.34.1" + VALUE "ProductVersion", "1.35.0" END END BLOCK "VarFileInfo" 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/pango-1.34.1/pango/pangowin32.rc new/pango-1.35.0/pango/pangowin32.rc --- old/pango-1.34.1/pango/pangowin32.rc 2013-05-13 17:35:02.000000000 +0200 +++ new/pango-1.35.0/pango/pangowin32.rc 2013-06-21 15:00:54.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,34,1,0 - PRODUCTVERSION 1,34,1,0 + FILEVERSION 1,35,0,0 + PRODUCTVERSION 1,35,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoWin32" - VALUE "FileVersion", "1.34.1.0" + VALUE "FileVersion", "1.35.0.0" VALUE "InternalName", "pangowin32-1.0-0" VALUE "LegalCopyright", "Copyright � 1999 Red Hat Software. Copyright � 2000 Tor Lillqvist" VALUE "OriginalFilename", "pangowin32-1.0-0.dll" VALUE "ProductName", "PangoWin32" - VALUE "ProductVersion", "1.34.1" + VALUE "ProductVersion", "1.35.0" END END BLOCK "VarFileInfo" 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/pango-1.34.1/pango/pangoxft.rc new/pango-1.35.0/pango/pangoxft.rc --- old/pango-1.34.1/pango/pangoxft.rc 2013-05-13 17:35:02.000000000 +0200 +++ new/pango-1.35.0/pango/pangoxft.rc 2013-06-21 15:00:54.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,34,1,0 - PRODUCTVERSION 1,34,1,0 + FILEVERSION 1,35,0,0 + PRODUCTVERSION 1,35,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "Pangoxft" - VALUE "FileVersion", "1.34.1.0" + VALUE "FileVersion", "1.35.0.0" VALUE "InternalName", "pangoxft-1.0-0" VALUE "LegalCopyright", "Copyright � 1999 Red Hat Software." VALUE "OriginalFilename", "pangoxft-1.0-0.dll" VALUE "ProductName", "Pangoxft" - VALUE "ProductVersion", "1.34.1" + VALUE "ProductVersion", "1.35.0" END END BLOCK "VarFileInfo" 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/pango-1.34.1/pango-view/pango-view.1.in new/pango-1.35.0/pango-view/pango-view.1.in --- old/pango-1.34.1/pango-view/pango-view.1.in 2013-05-13 17:35:55.000000000 +0200 +++ new/pango-1.35.0/pango-view/pango-view.1.in 2013-06-21 15:01:49.000000000 +0200 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.1. -.TH PANGO-VIEW "1" "May 2013" "pango-view (pango) 1.34.1" "User Commands" +.TH PANGO-VIEW "1" "June 2013" "pango-view (pango) 1.35.0" "User Commands" .SH NAME pango-view \- Pango text viewer .SH DESCRIPTION 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/pango-1.34.1/tests/Makefile.am new/pango-1.35.0/tests/Makefile.am --- old/pango-1.34.1/tests/Makefile.am 2013-01-10 12:20:09.000000000 +0100 +++ new/pango-1.35.0/tests/Makefile.am 2013-06-08 03:06:32.000000000 +0200 @@ -7,7 +7,8 @@ CLEANFILES = pangorc DISTCLEANFILES = all-unicode.txt -INCLUDES = \ +AM_CPPFLAGS = \ + -DSRCDIR=\"$(srcdir)\" \ -I$(top_srcdir) \ $(PANGO_DEBUG_FLAGS) \ $(GLIB_CFLAGS) \ @@ -17,23 +18,23 @@ $(X_CFLAGS) if HAVE_XFT -INCLUDES += -DHAVE_X +AM_CPPFLAGS += -DHAVE_X endif if HAVE_XFT -INCLUDES += -DHAVE_XFT +AM_CPPFLAGS += -DHAVE_XFT endif if HAVE_FREETYPE -INCLUDES += -DHAVE_FREETYPE +AM_CPPFLAGS += -DHAVE_FREETYPE endif if HAVE_WIN32 -INCLUDES += -DHAVE_WIN32 +AM_CPPFLAGS += -DHAVE_WIN32 endif if CROSS_COMPILING -TESTS= +TESTS = else -TESTS=$(check_PROGRAMS) +TESTS = $(check_PROGRAMS) endif TESTS_ENVIRONMENT = \ @@ -78,4 +79,24 @@ noinst_PROGRAMS = $(check_PROGRAMS) gen-all-unicode dump-boundaries +if BUILDOPT_INSTALL_TESTS +insttestdir=$(pkglibexecdir)/installed-tests +insttest_PROGRAMS = $(check_PROGRAMS) + +testdatadir = $(insttestdir) +testdata_DATA = \ + all-unicode.txt \ + boundaries.utf8 \ + GraphemeBreakTest.txt + +testmetadir = $(datadir)/installed-tests/$(PACKAGE) +testmeta_DATA = $(check_PROGRAMS:=.test) + +%.test: %$(EXEEXT) Makefile + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ + echo 'Exec=$(pkglibexecdir)/installed-tests/$<' >> $@.tmp; \ + mv $@.tmp $@) +endif + -include $(top_srcdir)/git.mk 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/pango-1.34.1/tests/test-ot-tags.c new/pango-1.35.0/tests/test-ot-tags.c --- old/pango-1.34.1/tests/test-ot-tags.c 2013-01-08 03:07:01.000000000 +0100 +++ new/pango-1.35.0/tests/test-ot-tags.c 2013-06-01 00:03:53.000000000 +0200 @@ -124,12 +124,12 @@ int main (int argc, char **argv) { - g_setenv ("PANGO_RC_FILE", "./pangorc", TRUE); + g_test_init (&argc, &argv, NULL); - test_script_tags (); - test_language_tags (); + g_test_add_func ("/tags/script", test_script_tags); + g_test_add_func ("/tags/language", test_language_tags); - return 0; + return g_test_run (); } G_GNUC_END_IGNORE_DEPRECATIONS 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/pango-1.34.1/tests/testboundaries.c new/pango-1.35.0/tests/testboundaries.c --- old/pango-1.34.1/tests/testboundaries.c 2013-03-05 02:24:34.000000000 +0100 +++ new/pango-1.35.0/tests/testboundaries.c 2013-06-08 03:07:19.000000000 +0200 @@ -24,6 +24,7 @@ #include <stdio.h> #include <unistd.h> +#include <glib.h> #include <pango/pango.h> #define CHFORMAT "%0#6x" @@ -311,20 +312,18 @@ g_free (attrs); } -int -main (int argc, char *argv[]) +static void +test_boundaries (void) { gchar *text; - const gchar *srcdir; const gchar *filename; +#if GLIB_CHECK_VERSION(2, 37, 2) + filename = g_test_get_filename (G_TEST_DIST, "boundaries.utf8", NULL); +#else + filename = SRCDIR "/boundaries.utf8"; +#endif - g_setenv ("PANGO_RC_FILE", "./pangorc", TRUE); - - srcdir = getenv ("srcdir"); - if (!srcdir) - srcdir = "."; - - filename = g_strdup_printf ("%s/boundaries.utf8", srcdir); + g_print ("sample file: %s\n", filename); if (!g_file_get_contents (filename, &text, NULL, NULL)) fail ("Couldn't open sample text file"); @@ -334,7 +333,15 @@ g_free (text); printf ("testboundaries passed\n"); +} + +int +main (int argc, char *argv[]) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/text/boundaries", test_boundaries); - return 0; + return g_test_run (); } 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/pango-1.34.1/tests/testboundaries_ucd.c new/pango-1.35.0/tests/testboundaries_ucd.c --- old/pango-1.34.1/tests/testboundaries_ucd.c 2012-12-07 03:43:25.000000000 +0100 +++ new/pango-1.35.0/tests/testboundaries_ucd.c 2013-06-08 03:09:44.000000000 +0200 @@ -215,7 +215,7 @@ } static void -do_test (gchar *filename, +do_test (const gchar *filename, AttrBits bits, gboolean fixup_broken_linebreaktest) { @@ -322,43 +322,88 @@ g_io_channel_unref (channel); if (error) g_error_free (error); - g_free (filename); + + g_assert (!failed); } -gint -main (gint argc, - gchar **argv) +static void +test_grapheme_break (void) { - gchar *srcdir; - gchar *filename; + const gchar *filename; AttrBits bits; - setlocale (LC_ALL, ""); - - srcdir = getenv ("srcdir"); - if (!srcdir) - srcdir = "."; - - filename = g_strdup_printf ("%s/GraphemeBreakTest.txt", srcdir); +#if GLIB_CHECK_VERSION(2, 37, 2) + filename = g_test_get_filename (G_TEST_DIST, "GraphemeBreakTest.txt", NULL); +#else + filename = SRCDIR "/GraphemeBreakTest.txt"; +#endif bits.bits = 0; bits.attr.is_cursor_position = 1; do_test (filename, bits, FALSE); +} - filename = g_strdup_printf ("%s/WordBreakTest.txt", srcdir); +static void +test_word_break (void) +{ + const gchar *filename; + AttrBits bits; + +#if GLIB_CHECK_VERSION(2, 37, 2) + filename = g_test_get_filename (G_TEST_DIST, "WordBreakTest.txt", NULL); +#else + filename = SRCDIR "/WordBreakTest.txt"; +#endif bits.bits = 0; bits.attr.is_word_boundary = 1; do_test (filename, bits, FALSE); +} - filename = g_strdup_printf ("%s/SentenceBreakTest.txt", srcdir); +static void +test_sentence_break (void) +{ + const gchar *filename; + AttrBits bits; + +#if GLIB_CHECK_VERSION(2, 37, 2) + filename = g_test_get_filename (G_TEST_DIST, "SentenceBreakTest.txt", NULL); +#else + filename = SRCDIR "/SentenceBreakTest.txt"; +#endif bits.bits = 0; bits.attr.is_sentence_boundary = 1; do_test (filename, bits, FALSE); +} + +static void +test_line_break (void) +{ + const gchar *filename; + AttrBits bits; - filename = g_strdup_printf ("%s/LineBreakTest.txt", srcdir); +#if GLIB_CHECK_VERSION(2, 37, 2) + filename = g_test_get_filename (G_TEST_DIST, "LineBreakTest.txt", NULL); +#else + filename = SRCDIR "/LineBreakTest.txt"; +#endif bits.bits = 0; bits.attr.is_line_break = 1; bits.attr.is_mandatory_break = 1; do_test (filename, bits, TRUE); +} + + +gint +main (gint argc, + gchar **argv) +{ + setlocale (LC_ALL, ""); + + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/text/break/grapheme", test_grapheme_break); + g_test_add_func ("/text/break/word", test_word_break); + g_test_add_func ("/text/break/sentence", test_sentence_break); + g_test_add_func ("/text/break/line", test_line_break); - exit (failed); + return g_test_run (); } 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/pango-1.34.1/tests/testcolor.c new/pango-1.35.0/tests/testcolor.c --- old/pango-1.34.1/tests/testcolor.c 2011-08-16 03:11:08.000000000 +0200 +++ new/pango-1.35.0/tests/testcolor.c 2013-06-01 00:03:53.000000000 +0200 @@ -30,7 +30,7 @@ guint16 blue; } ColorSpec; -static gboolean test_color (ColorSpec *spec) +static gboolean test_one_color (ColorSpec *spec) { PangoColor color; gboolean accepted; @@ -78,17 +78,22 @@ { NULL, 0, 0, 0, 0 } }; -int -main (int argc, char *argv[]) +static void +test_color (void) { - gboolean success; ColorSpec *spec; - g_setenv ("PANGO_RC_FILE", "./pangorc", TRUE); - - success = TRUE; for (spec = specs; spec->spec; spec++) - success &= test_color (spec); + g_assert (test_one_color (spec)); + +} + +int +main (int argc, char *argv[]) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/color/parse", test_color); - return !success; + return g_test_run (); } 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/pango-1.34.1/tests/testiter.c new/pango-1.35.0/tests/testiter.c --- old/pango-1.34.1/tests/testiter.c 2013-01-08 03:07:02.000000000 +0100 +++ new/pango-1.35.0/tests/testiter.c 2013-06-01 00:03:53.000000000 +0200 @@ -207,16 +207,14 @@ pango_layout_iter_free (iter); } -int -main (int argc, char *argv[]) +static void +test_layout_iter (void) { const char **ptext; PangoFontMap *fontmap; PangoContext *context; PangoLayout *layout; - g_setenv ("PANGO_RC_FILE", "./pangorc", TRUE); - fontmap = pango_cairo_font_map_get_default (); context = pango_font_map_create_context (fontmap); @@ -236,5 +234,14 @@ } g_object_unref (layout); - return 0; +} + +int +main (int argc, char *argv[]) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/layout/iter", test_layout_iter); + + return g_test_run (); } 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/pango-1.34.1/tests/testscript.c new/pango-1.35.0/tests/testscript.c --- old/pango-1.34.1/tests/testscript.c 2011-08-16 03:11:08.000000000 +0200 +++ new/pango-1.35.0/tests/testscript.c 2013-06-01 00:03:53.000000000 +0200 @@ -222,9 +222,9 @@ int main (int argc, char **argv) { - g_setenv ("PANGO_RC_FILE", "./pangorc", TRUE); + g_test_init (&argc, &argv, NULL); - test_script_iter (); + g_test_add_func ("/script/iter", test_script_iter); - return 0; + return g_test_run (); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0