January 2016 - openSUSE Commits - openSUSE Mailing Lists

commit libosmo-abis for openSUSE:Factory
by root＠hilbert.suse.de 01 Jan '16

01 Jan '16

Hello community, here is the log from the commit of package libosmo-abis for openSUSE:Factory checked in at 2016-01-01 19:48:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libosmo-abis (Old) and /work/SRC/openSUSE:Factory/.libosmo-abis.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libosmo-abis" Changes: -------- --- /work/SRC/openSUSE:Factory/libosmo-abis/libosmo-abis.changes 2015-04-07 09:29:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libosmo-abis.new/libosmo-abis.changes 2016-01-01 19:51:15.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Dec 23 17:34:54 UTC 2015 - jengelh(a)inai.de + +- Update to new upstream release 0.3.2.3 +* ortp: Guard the jitter stats with a version check +* ortp: Export statistics for the bts or similar +* export lapd_tei_alloc for libosmo-netif + +------------------------------------------------------------------- Old: ---- libosmo-abis-0.3.1.tar.xz New: ---- libosmo-abis-0.3.2.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libosmo-abis.spec ++++++ --- /var/tmp/diff_new_pack.3QKQsa/_old 2016-01-01 19:51:16.000000000 +0100 +++ /var/tmp/diff_new_pack.3QKQsa/_new 2016-01-01 19:51:16.000000000 +0100 @@ -17,15 +17,15 @@ Name: libosmo-abis -Version: 0.3.1 +Version: 0.3.2.3 Release: 0 Summary: Osmocom library for A-bis interface between BTS and BSC License: AGPL-3.0+ and GPL-2.0+ -Group: Development/Libraries/C and C++ +Group: Productivity/Telephony/Utilities Url: http://openbsc.osmocom.org/trac/wiki/libosmo-abis #Git-Clone: git://git.osmocom.org/libosmo-abis -#Snapshot: 0.3.1 +#Snapshot: 0.3.2-1-g86fc3c8 Source: %name-%version.tar.xz Patch1: osmo-talloc.diff Patch2: 0001-build-resolve-compiler-warnings.patch @@ -46,12 +46,12 @@ BSC. This interface allows control of the radio equipment and radio frequency allocation in the BTS. -%package -n libosmoabis4 +%package -n libosmoabis5 Summary: Osmocom A-bis interface core library License: AGPL-3.0+ Group: System/Libraries -%description -n libosmoabis4 +%description -n libosmoabis5 In the GSM system architecture, A-bis is a Base Station System-internal interface linking the Base Transceiver Stations (BTS) and Base Station Controller (BSC). This interface allows control of @@ -61,7 +61,7 @@ Summary: Development files for the Osmocom A-bis core library License: AGPL-3.0+ Group: Development/Libraries/C and C++ -Requires: libosmoabis4 = %version +Requires: libosmoabis5 = %version Requires: libosmocore-devel >= 0.3.0 Requires: libosmogsm-devel >= 0.3.10 @@ -73,12 +73,12 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmoabis. -%package -n libosmotrau0 +%package -n libosmotrau1 Summary: Osmocom TRAU (E1/RTP) library License: GPL-2.0+ Group: System/Libraries -%description -n libosmotrau0 +%description -n libosmotrau1 The Transcoder Rate Adaptor Unit enables the use of lower rates (32, 16 or 8 kbps) over the A-bis interface instead of the 64 kbps ISDN rate for which the Mobile Switching Center (MSC) is designed. @@ -87,7 +87,7 @@ Summary: Development files for the Osmocom TRAU (E1/RTP) library License: GPL-2.0+ Group: Development/Libraries/C and C++ -Requires: libosmotrau0 = %version +Requires: libosmotrau1 = %version %description -n libosmotrau-devel The Transcoder Rate Adaptor Unit enables the use of lower bitrates @@ -115,14 +115,14 @@ %check make %{?_smp_mflags} check -%post -n libosmoabis4 -p /sbin/ldconfig -%postun -n libosmoabis4 -p /sbin/ldconfig -%post -n libosmotrau0 -p /sbin/ldconfig -%postun -n libosmotrau0 -p /sbin/ldconfig +%post -n libosmoabis5 -p /sbin/ldconfig +%postun -n libosmoabis5 -p /sbin/ldconfig +%post -n libosmotrau1 -p /sbin/ldconfig +%postun -n libosmotrau1 -p /sbin/ldconfig -%files -n libosmoabis4 +%files -n libosmoabis5 %defattr(-,root,root) -%_libdir/libosmoabis.so.4* +%_libdir/libosmoabis.so.5* %files -n libosmoabis-devel %defattr(-,root,root) @@ -132,9 +132,9 @@ %_libdir/libosmoabis.so %_libdir/pkgconfig/libosmoabis.pc -%files -n libosmotrau0 +%files -n libosmotrau1 %defattr(-,root,root) -%_libdir/libosmotrau.so.0* +%_libdir/libosmotrau.so.1* %files -n libosmotrau-devel %defattr(-,root,root) ++++++ 0001-build-resolve-compiler-warnings.patch ++++++ --- /var/tmp/diff_new_pack.3QKQsa/_old 2016-01-01 19:51:16.000000000 +0100 +++ /var/tmp/diff_new_pack.3QKQsa/_new 2016-01-01 19:51:16.000000000 +0100 @@ -1,4 +1,4 @@ -From 025e2dd7129483300efe8dd02f8e1198c92aaad5 Mon Sep 17 00:00:00 2001 +From 34ce619dc89fa82f55cc2ebba85e3435d04d2531 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <jengelh(a)inai.de> Date: Thu, 2 Apr 2015 14:25:43 +0200 Subject: [PATCH] build: resolve compiler warnings @@ -23,7 +23,7 @@ 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c -index fedc977..55fce87 100644 +index 65ec269..f605af9 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -326,16 +326,16 @@ struct osmo_rtp_socket *osmo_rtp_socket_create(void *talloc_ctx, unsigned int fl @@ -48,5 +48,5 @@ /* initialize according to the RFC */ rtp_session_set_seq_number(rs->sess, random()); -- -2.1.4 +2.4.3 ++++++ libosmo-abis-0.3.1.tar.xz -> libosmo-abis-0.3.2.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/configure.ac new/libosmo-abis/configure.ac --- old/libosmo-abis/configure.ac 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/configure.ac 2015-12-23 18:32:12.000000000 +0100 @@ -2,7 +2,7 @@ m4_esyscmd([./git-version-gen .tarball-version]), [openbsc(a)lists.osmocom.org]) -AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6 subdir-objects]) AC_CONFIG_TESTDIR(tests) dnl kernel style compile messages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/changelog new/libosmo-abis/debian/changelog --- old/libosmo-abis/debian/changelog 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/debian/changelog 2015-12-23 18:32:12.000000000 +0100 @@ -1,4 +1,10 @@ -libosmo-abis (0.3.1) UNRELEASED; urgency=medium +libosmo-abis (0.3.2) UNRELEASED; urgency=medium + + * Bump so version to re-link libosmovty + + -- Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Tue, 03 Nov 2015 09:42:01 +0100 + +libosmo-abis (0.3.1) unstable; urgency=medium * New upstream release of libosmo-abis diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/compat new/libosmo-abis/debian/compat --- old/libosmo-abis/debian/compat 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/debian/compat 2015-12-23 18:32:12.000000000 +0100 @@ -1 +1 @@ -7 +9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/control new/libosmo-abis/debian/control --- old/libosmo-abis/debian/control 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/debian/control 2015-12-23 18:32:12.000000000 +0100 @@ -2,8 +2,8 @@ Section: libs Priority: optional Maintainer: Harald Welte <laforge(a)gnumonks.org> -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, libosmocore-dev (>= 0.6.4), pkg-config, libortp-dev -Standards-Version: 3.9.0 +Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, libosmocore-dev (>= 0.6.4), pkg-config, libortp-dev +Standards-Version: 3.9.6 Homepage: http://openbsc.osmocom.org/trac/wiki/libosmo-abis Vcs-Git: git://git.osmocom.org/libosmo-abis.git Vcs-Browser: http://git.osmocom.org/gitweb?p=libosmo-abis.git;a=summary @@ -11,32 +11,37 @@ Package: libosmo-abis Section: oldlibs Architecture: any -Depends: libosmoabis4, libosmotrau0, ${misc:Depends} +Depends: libosmoabis5 (= ${binary:Version}), libosmotrau1 (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same Description: Legacy package for libosmo-abis libosmo-abis is an empty package helping in the transition to one package per DSO. -Package: libosmoabis4 +Package: libosmoabis5 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: GSM A-bis handling -Package: libosmotrau0 +Package: libosmotrau1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: GSM trau handling Package: libosmo-abis-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, libosmotrau0, libosmoabis4 +Depends: ${misc:Depends}, libosmotrau1 (= ${binary:Version}), libosmoabis5 (= ${binary:Version}) +Multi-Arch: same Description: Development headers for A-bis interface. Package: libosmo-abis-dbg Section: debug Architecture: any Priority: extra -Depends: libosmoabis4 (= ${binary:Version}), libosmotrau0 (= ${binary:Version}), ${misc:Depends} +Depends: libosmoabis5 (= ${binary:Version}), libosmotrau1 (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same Description: Debug symbols for A-bis interface. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/libosmo-abis-dev.install new/libosmo-abis/debian/libosmo-abis-dev.install --- old/libosmo-abis/debian/libosmo-abis-dev.install 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/debian/libosmo-abis-dev.install 2015-12-23 18:32:12.000000000 +0100 @@ -1,5 +1,5 @@ usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/lib*.la -usr/lib/pkgconfig/* +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/lib*.la +usr/lib/*/pkgconfig/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/libosmoabis4.install new/libosmo-abis/debian/libosmoabis4.install --- old/libosmo-abis/debian/libosmoabis4.install 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/debian/libosmoabis4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/libosmoabis.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/libosmoabis5.install new/libosmo-abis/debian/libosmoabis5.install --- old/libosmo-abis/debian/libosmoabis5.install 1970-01-01 01:00:00.000000000 +0100 +++ new/libosmo-abis/debian/libosmoabis5.install 2015-12-23 18:32:12.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libosmoabis.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/libosmotrau0.install new/libosmo-abis/debian/libosmotrau0.install --- old/libosmo-abis/debian/libosmotrau0.install 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/debian/libosmotrau0.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/libosmotrau.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/libosmotrau1.install new/libosmo-abis/debian/libosmotrau1.install --- old/libosmo-abis/debian/libosmotrau1.install 1970-01-01 01:00:00.000000000 +0100 +++ new/libosmo-abis/debian/libosmotrau1.install 2015-12-23 18:32:12.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libosmotrau.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/rules new/libosmo-abis/debian/rules --- old/libosmo-abis/debian/rules 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/debian/rules 2015-12-23 18:32:12.000000000 +0100 @@ -4,11 +4,11 @@ DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1) VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g') -export DH_VERBOSE=1 +#export DH_VERBOSE=1 export DEB_BUILD_HARDENING=1 %: - dh --with autoreconf $@ --fail-missing + dh $@ --with autoreconf --fail-missing override_dh_strip: dh_strip --dbg-package=libosmo-abis-dbg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/include/osmocom/abis/lapd.h new/libosmo-abis/include/osmocom/abis/lapd.h --- old/libosmo-abis/include/osmocom/abis/lapd.h 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/include/osmocom/abis/lapd.h 2015-12-23 18:41:55.000000000 +0100 @@ -50,6 +50,8 @@ __LAPD_ERR_MAX }; +struct lapd_tei *lapd_tei_alloc(struct lapd_instance *li, uint8_t tei); + int lapd_receive(struct lapd_instance *li, struct msgb *msg, int *error); void lapd_transmit(struct lapd_instance *li, uint8_t tei, uint8_t sapi, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/include/osmocom/trau/osmo_ortp.h new/libosmo-abis/include/osmocom/trau/osmo_ortp.h --- old/libosmo-abis/include/osmocom/trau/osmo_ortp.h 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/include/osmocom/trau/osmo_ortp.h 2015-12-23 18:32:12.000000000 +0100 @@ -79,4 +79,10 @@ int subsys, int level, const char *pfx); +void osmo_rtp_socket_stats(struct osmo_rtp_socket *rs, + uint32_t *sent_packets, uint32_t *sent_octets, + uint32_t *recv_packets, uint32_t *recv_octets, + uint32_t *recv_lost, uint32_t *last_jitter); + + #endif /* _OSMO_ORTP_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/src/Makefile.am new/libosmo-abis/src/Makefile.am --- old/libosmo-abis/src/Makefile.am 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/src/Makefile.am 2015-12-23 18:32:12.000000000 +0100 @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -ABIS_LIBVERSION=4:0:0 -TRAU_LIBVERSION=0:0:0 +ABIS_LIBVERSION=5:0:0 +TRAU_LIBVERSION=1:0:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/src/subchan_demux.c new/libosmo-abis/src/subchan_demux.c --- old/libosmo-abis/src/subchan_demux.c 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/src/subchan_demux.c 2015-12-23 18:32:12.000000000 +0100 @@ -44,7 +44,6 @@ } #define SYNC_HDR_BITS 16 -static const uint8_t nullbytes[SYNC_HDR_BITS]; /* check if we have just completed the 16 bit zero + 1 bit one sync * header, in accordance with GSM TS 08.60 Chapter 4.8.1 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/src/trau/osmo_ortp.c new/libosmo-abis/src/trau/osmo_ortp.c --- old/libosmo-abis/src/trau/osmo_ortp.c 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/src/trau/osmo_ortp.c 2015-12-23 18:32:32.000000000 +0100 @@ -546,3 +546,32 @@ stats->packet_recv, stats->hw_recv, stats->outoftime, stats->cum_packet_loss, stats->discarded); } + +void osmo_rtp_socket_stats(struct osmo_rtp_socket *rs, + uint32_t *sent_packets, uint32_t *sent_octets, + uint32_t *recv_packets, uint32_t *recv_octets, + uint32_t *recv_lost, uint32_t *last_jitter) +{ + const rtp_stats_t *stats; + + *sent_packets = *sent_octets = *recv_packets = *recv_octets = 0; + *recv_lost = *last_jitter = 0; + + stats = rtp_session_get_stats(rs->sess); + if (stats) { + /* truncate from 64bit to 32bit here */ + *sent_packets = stats->packet_sent; + *sent_octets = stats->sent; + *recv_packets = stats->packet_recv; + *recv_octets = stats->recv; + *recv_lost = stats->cum_packet_loss; + } + +#if HAVE_ORTP_021 + const jitter_stats_t *jitter; + + jitter = rtp_session_get_jitter_stats(rs->sess); + if (jitter) + *last_jitter = jitter->jitter; +#endif +}

1 0

commit libinfinity for openSUSE:Factory
by root＠hilbert.suse.de 01 Jan '16

01 Jan '16

Hello community, here is the log from the commit of package libinfinity for openSUSE:Factory checked in at 2016-01-01 19:48:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libinfinity (Old) and /work/SRC/openSUSE:Factory/.libinfinity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libinfinity" Changes: -------- --- /work/SRC/openSUSE:Factory/libinfinity/libinfinity.changes 2015-05-15 10:06:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libinfinity.new/libinfinity.changes 2016-01-01 19:51:13.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Dec 30 15:49:54 UTC 2015 - netzheimer(a)yahoo.de + +- Update to version 0.6.7: + + Fix crash when library is linked against glib 2.46 or newer. + + Fixes potential crashes in some other uncommon situations. + +------------------------------------------------------------------- Old: ---- libinfinity-0.6.6.tar.gz New: ---- libinfinity-0.6.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libinfinity.spec ++++++ --- /var/tmp/diff_new_pack.uuaz6e/_old 2016-01-01 19:51:14.000000000 +0100 +++ /var/tmp/diff_new_pack.uuaz6e/_new 2016-01-01 19:51:14.000000000 +0100 @@ -20,7 +20,7 @@ Summary: Implementation of the Infinote collaborative editing protocol License: LGPL-2.1+ Group: Development/Libraries/GNOME -Version: 0.6.6 +Version: 0.6.7 Release: 0 %define _version 0.6 Url: http://gobby.0x539.de/ ++++++ libinfinity-0.6.6.tar.gz -> libinfinity-0.6.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinfinity-0.6.6/ChangeLog new/libinfinity-0.6.7/ChangeLog --- old/libinfinity-0.6.6/ChangeLog 2015-05-13 02:57:57.000000000 +0200 +++ new/libinfinity-0.6.7/ChangeLog 2015-10-14 01:34:53.000000000 +0200 @@ -1,6 +1,115 @@ +commit a7bdd262474898d180285129f5aed3e87b04461a +Author: Armin Burgmeier <armin(a)arbur.net> +Date: Tue Oct 13 19:34:35 2015 -0400 + + Release libinfinity 0.6.7 + + NEWS | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit d447fc406c0ceb2766f69ffec28f017baa7ed7a9 +Author: Armin Burgmeier <armin(a)arbur.net> +Date: Mon Oct 12 19:51:50 2015 -0400 + + InfTextChunk: fix segment lookup for offset=0 (#10) + + This used to work with glib 2.42, but it seems that the semantics of + g_sequence_search() have changed with respect to what item is returned + when the comparison function returns 0. The behavior in that case is not + documented. Fix this by passing a different comparison function that + never returns 0, so that there is no ambiguity in which segment is + returned. + + libinftext/inf-text-chunk.c | 29 ++++++++++++++++++++++++++++- + 1 file changed, 28 insertions(+), 1 deletion(-) + +commit 3fb2be4fb355ed44541d6da486dc73c5dd739ca3 +Author: Armin Burgmeier <armin(a)arbur.net> +Date: Mon Oct 12 19:51:40 2015 -0400 + + Fix integrity check in inf_text_chunk_get_byte_index_utf8() + + libinftext/inf-text-chunk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4fc1227317eea35b87e10686daf467642c9abe1e +Author: Armin Burgmeier <armin(a)arbur.net> +Date: Tue Jun 9 21:20:23 2015 -0400 + + Fix uninitialized variable when suggesting a SASL mechanism + + libinfinity/common/inf-xmpp-connection.c | 1 + + 1 file changed, 1 insertion(+) + +commit 28dd0736c7618861dd9a23e8793e4db865ce6a5e +Author: Armin Burgmeier <armin(a)arbur.net> +Date: Sun Jun 7 21:27:23 2015 -0400 + + InfXmppConnection: Fix strncmp invocation when suggesting SASL mechanism + + libinfinity/common/inf-xmpp-connection.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4dfaf22925dbe12008627d0a604b179fd6e4b7b4 +Author: Armin Burgmeier <armin(a)arbur.net> +Date: Wed May 27 22:21:22 2015 -0400 + + Fix g_free / g_slice_free mismatch + + libinfinity/server/infd-directory.c | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +commit d17398a0f850a79ffbe78c10bbe8ebfd0cd5e63c +Author: Armin Burgmeier <armin(a)arbur.net> +Date: Wed May 27 21:12:28 2015 -0400 + + InfdDirectory: Fix error reply to client when session proxy cannot + be created + + libinfinity/server/infd-directory.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 822b227c662e5fcaab3c1bdfdf224eebaefe7728 +Author: Armin Burgmeier <armin(a)arbur.net> +Date: Sat May 23 14:39:59 2015 -0400 + + Fix session becoming inconsistent with active local users during + subscription + + When the server sends the vector time of local users during subscription, + it now sends the last send vector instead of the real value of the + user time, + so that subsequent state vector diffs are consistent for the newly joined + client. + + Conflicts: + libinfinity/adopted/inf-adopted-session.c + + libinfinity/adopted/inf-adopted-session.c | 34 ++++++++++++++++++++++++++++- + 1 file changed, 33 insertions(+), 1 deletion(-) + +commit cf4588011a5023af36d6393f1f724a11742b84f1 +Author: Armin Burgmeier <armin(a)arbur.net> +Date: Fri May 22 19:22:26 2015 -0400 + + Fix a possible crash when removing a browser entry + + libinfgtk/inf-gtk-browser-store.c | 5 +++++ + libinfgtk/inf-gtk-browser-view.c | 11 +++++++++++ + 2 files changed, 16 insertions(+) + +commit 4522baf6a975f38e6874c90695b00af0d2854dfc +Author: Armin Burgmeier <armin(a)arbur.net> +Date: Tue May 12 20:58:49 2015 -0400 + + Post-release bump to 0.6.7 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit a5bc24e87714d3c3fa75711c5d06b9b8e4c81d53 Author: Armin Burgmeier <armin(a)arbur.net> -Date: Tue May 12 20:12:52 2015 -0400 +Date: Tue May 12 20:12:52 2015 -0400 Release libinfinity 0.6.6 @@ -9,7 +118,7 @@ commit 3862714b942fe626308f06e01730df7b48921faf Author: Armin Burgmeier <armin(a)arbur.net> -Date: Tue May 12 20:55:41 2015 -0400 +Date: Tue May 12 20:55:41 2015 -0400 Fix make distcheck for recent automake versions @@ -22,7 +131,7 @@ commit 06fa9455c687a67e4fc2c2f201817c64c73a3fcf Author: Armin Burgmeier <armin(a)arbur.net> -Date: Mon May 11 22:59:34 2015 -0400 +Date: Mon May 11 22:59:34 2015 -0400 Fix expired certificate validation (gobby #61) @@ -31,7 +140,7 @@ commit 244c7e8d69b98330ac7a285922c6fcb0a167ae20 Author: Armin Burgmeier <armin(a)arbur.net> -Date: Tue May 5 20:45:45 2015 -0400 +Date: Tue May 5 20:45:45 2015 -0400 Update caret position when only updating fixline state @@ -45,7 +154,7 @@ commit fb0c8532694476f3f624f66eb12becf851147e27 Author: Armin Burgmeier <armin(a)arbur.net> -Date: Mon May 4 20:31:12 2015 -0400 +Date: Mon May 4 20:31:12 2015 -0400 fixline buffer: Fix crash when iterating backwards through empty base buffer @@ -55,7 +164,7 @@ commit da06a82642c1d2d0d5a44f1ea3f62ad0b2b22c9a Author: Armin Burgmeier <armin(a)arbur.net> -Date: Sun May 3 17:07:46 2015 -0400 +Date: Sun May 3 17:07:46 2015 -0400 Fix insert/erase notifications in InfTextFixlineBuffer @@ -69,7 +178,7 @@ commit 9b009160dd658fe9272d69025a8225b02eafb8de Author: Armin Burgmeier <armin(a)arbur.net> -Date: Thu Apr 30 21:37:23 2015 -0400 +Date: Thu Apr 30 21:37:23 2015 -0400 Fix create_end_iter() implementation in InfTextFixlineBuffer @@ -78,7 +187,7 @@ commit 8990cf98ab43f3aca6a7bf12e9608b0e2e9b5c70 Author: Armin Burgmeier <armin(a)arbur.net> -Date: Fri Apr 3 13:04:24 2015 -0400 +Date: Fri Apr 3 13:04:24 2015 -0400 Fix a crash when the server explicitly changes client account to default @@ -87,7 +196,7 @@ commit 0ce00121225662125b2ae4e48ff5d9f712e86a70 Author: Armin Burgmeier <armin(a)arbur.net> -Date: Sat Jan 17 20:33:25 2015 -0500 +Date: Sat Jan 17 20:33:25 2015 -0500 Post-release bump to 0.6.6 @@ -96,7 +205,7 @@ commit 1a0ff8091afdfe831d317d10c377a8a025ea259d Author: Armin Burgmeier <armin(a)arbur.net> -Date: Sat Jan 17 20:19:38 2015 -0500 +Date: Sat Jan 17 20:19:38 2015 -0500 Release libinfinity 0.6.5 @@ -105,7 +214,7 @@ commit 7b4efd3ec7fcf7ca44550d7b29e8448cd8fb5f44 Author: Armin Burgmeier <armin(a)arbur.net> -Date: Wed Jan 14 15:28:16 2015 -0500 +Date: Wed Jan 14 15:28:16 2015 -0500 Check whether we need -lresolv for res_query() (gobby #23) @@ -117,7 +226,7 @@ commit 66432aa0b9b48906db8c258cc70dec4c012787d5 Author: Armin Burgmeier <armin(a)arbur.net> -Date: Tue Jan 6 16:48:10 2015 +0100 +Date: Tue Jan 6 16:48:10 2015 +0100 Fix a crash when sending unsubscribe message causes connection failure @@ -126,7 +235,7 @@ commit 70913b5b64a85b9d5e0870b73cafff0f9c0aed55 Author: Armin Burgmeier <armin(a)arbur.net> -Date: Tue Jan 6 14:13:38 2015 +0100 +Date: Tue Jan 6 14:13:38 2015 +0100 InfdDirectory: Fail add-subdirectory request if name already exists @@ -135,7 +244,7 @@ commit 4fd9cadf82d2ee24d9c966ad30c64db3aa83696f Author: Armin Burgmeier <armin(a)arbur.net> -Date: Tue Jan 6 13:30:37 2015 +0100 +Date: Tue Jan 6 13:30:37 2015 +0100 Fix assertion failure when directory without storage is disposed @@ -144,7 +253,7 @@ commit 0ea3d867cdedad32483fe7507a41680ab7e704ef Author: Armin Burgmeier <armin(a)arbur.net> -Date: Tue Oct 28 13:39:53 2014 -0400 +Date: Tue Oct 28 13:39:53 2014 -0400 Fix a memory leak in the plugin manager diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinfinity-0.6.6/NEWS new/libinfinity-0.6.7/NEWS --- old/libinfinity-0.6.6/NEWS 2015-05-13 02:57:32.000000000 +0200 +++ new/libinfinity-0.6.7/NEWS 2015-10-14 01:34:32.000000000 +0200 @@ -1,3 +1,11 @@ +libinfinity 0.6.7: + * Fix a possible crash when an entry is removed from the document + browser. + * Fix a possible crash in infinoted when access control lists are + enabled. + * Fix an assertion failure when operating with text documents and + using glib 2.46 or newer. + libinfinity 0.6.6: * Fix certificates being only verified for expiration and other criteria such as weak algorithms if the CA is not trusted. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinfinity-0.6.6/configure new/libinfinity-0.6.7/configure --- old/libinfinity-0.6.6/configure 2015-05-13 02:14:48.000000000 +0200 +++ new/libinfinity-0.6.7/configure 2015-10-14 01:34:48.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libinfinity 0.6.6. +# Generated by GNU Autoconf 2.69 for libinfinity 0.6.7. # # Report bugs to <armin(a)arbur.net>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libinfinity' PACKAGE_TARNAME='libinfinity' -PACKAGE_VERSION='0.6.6' -PACKAGE_STRING='libinfinity 0.6.6' +PACKAGE_VERSION='0.6.7' +PACKAGE_STRING='libinfinity 0.6.7' PACKAGE_BUGREPORT='armin(a)arbur.net' PACKAGE_URL='' @@ -1416,7 +1416,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 libinfinity 0.6.6 to adapt to many kinds of systems. +\`configure' configures libinfinity 0.6.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1486,7 +1486,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libinfinity 0.6.6:";; + short | recursive ) echo "Configuration of libinfinity 0.6.7:";; esac cat <<\_ACEOF @@ -1641,7 +1641,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libinfinity configure 0.6.6 +libinfinity configure 0.6.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2010,7 +2010,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libinfinity $as_me 0.6.6, which was +It was created by libinfinity $as_me 0.6.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2873,7 +2873,7 @@ # Define the identity of the package. PACKAGE='libinfinity' - VERSION='0.6.6' + VERSION='0.6.7' cat >>confdefs.h <<_ACEOF @@ -3117,7 +3117,7 @@ ac_config_headers="$ac_config_headers config.h libinfinity/inf-config.h" -LIBINFINITY_VERSION=0.6.6 +LIBINFINITY_VERSION=0.6.7 LIBINFINITY_API_VERSION=0.6 LIBINFINITY_LIBTOOL_VERSION=0:0:0 @@ -16210,7 +16210,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libinfinity $as_me 0.6.6, which was +This file was extended by libinfinity $as_me 0.6.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16276,7 +16276,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libinfinity config.status 0.6.6 +libinfinity config.status 0.6.7 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/libinfinity-0.6.6/configure.ac new/libinfinity-0.6.7/configure.ac --- old/libinfinity-0.6.6/configure.ac 2015-05-12 05:05:50.000000000 +0200 +++ new/libinfinity-0.6.7/configure.ac 2015-10-14 01:21:06.000000000 +0200 @@ -1,4 +1,4 @@ -m4_define([libinfinity_version], [0.6.6]) +m4_define([libinfinity_version], [0.6.7]) m4_define([libinfinity_api_version], [0.6]) m4_define([libinfinity_libtool_version], [0:0:0]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinfinity-0.6.6/docs/reference/libinfgtk/html/index.html new/libinfinity-0.6.7/docs/reference/libinfgtk/html/index.html --- old/libinfinity-0.6.6/docs/reference/libinfgtk/html/index.html 2015-05-13 02:57:58.000000000 +0200 +++ new/libinfinity-0.6.7/docs/reference/libinfgtk/html/index.html 2015-10-14 01:35:21.000000000 +0200 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libinfgtk-0.6 Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for libinfgtk 0.6.6. + for libinfgtk 0.6.7. The latest version of this documentation can be found on-line at <a class="ulink" href="http://infinote.0x539.de/libinfinity/API/libinfgtk/index.html" target="_top">http://infinote.0x539.de/libinfinity/API/libinfgtk/</a>. </p></div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinfinity-0.6.6/docs/reference/libinfinity/html/index.html new/libinfinity-0.6.7/docs/reference/libinfinity/html/index.html --- old/libinfinity-0.6.6/docs/reference/libinfinity/html/index.html 2015-05-13 02:57:58.000000000 +0200 +++ new/libinfinity-0.6.7/docs/reference/libinfinity/html/index.html 2015-10-14 01:35:16.000000000 +0200 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libinfinity-0.6 Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for libinfinity 0.6.6. + for libinfinity 0.6.7. The latest version of this documentation can be found on-line at <a class="ulink" href="http://infinote.0x539.de/libinfinity/API/libinfinity/index.html" target="_top">http://infinote.0x539.de/libinfinity/API/libinfinity/</a>. </p></div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinfinity-0.6.6/docs/reference/libinfinoted-plugin-manager/html/index.html new/libinfinity-0.6.7/docs/reference/libinfinoted-plugin-manager/html/index.html --- old/libinfinity-0.6.6/docs/reference/libinfinoted-plugin-manager/html/index.html 2015-05-13 02:57:59.000000000 +0200 +++ new/libinfinity-0.6.7/docs/reference/libinfinoted-plugin-manager/html/index.html 2015-10-14 01:35:25.000000000 +0200 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libinfinoted-plugin-manager-0.6 Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for libinfinoted-plugin-manager 0.6.6. + for libinfinoted-plugin-manager 0.6.7. The latest version of this documentation can be found on-line at <a class="ulink" href="http://infinote.0x539.de/libinfinity/API/libinftext/index.html" target="_top">http://infinote.0x539.de/libinfinity/API/libinfinoted-plugin-manager/</a>. </p></div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinfinity-0.6.6/docs/reference/libinftext/html/index.html new/libinfinity-0.6.7/docs/reference/libinftext/html/index.html --- old/libinfinity-0.6.6/docs/reference/libinftext/html/index.html 2015-05-13 02:57:58.000000000 +0200 +++ new/libinfinity-0.6.7/docs/reference/libinftext/html/index.html 2015-10-14 01:35:19.000000000 +0200 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libinftext-0.6 Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for libinftext 0.6.6. + for libinftext 0.6.7. The latest version of this documentation can be found on-line at <a class="ulink" href="http://infinote.0x539.de/libinfinity/API/libinftext/index.html" target="_top">http://infinote.0x539.de/libinfinity/API/libinftext/</a>. </p></div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinfinity-0.6.6/docs/reference/libinftextgtk/html/index.html new/libinfinity-0.6.7/docs/reference/libinftextgtk/html/index.html --- old/libinfinity-0.6.6/docs/reference/libinftextgtk/html/index.html 2015-05-13 02:57:58.000000000 +0200 +++ new/libinfinity-0.6.7/docs/reference/libinftextgtk/html/index.html 2015-10-14 01:35:23.000000000 +0200 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libinftextgtk-0.6 Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for libinftextgtk 0.6.6. + for libinftextgtk 0.6.7. The latest version of this documentation can be found on-line at <a class="ulink" href="http://infinote.0x539.de/libinfinity/API/libinftextgtk/index.html" target="_top">http://infinote.0x539.de/libinfinity/API/libinftextgtk/</a>. </p></div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinfinity-0.6.6/docs/reference/version.xml new/libinfinity-0.6.7/docs/reference/version.xml --- old/libinfinity-0.6.6/docs/reference/version.xml 2015-05-13 02:51:15.000000000 +0200 +++ new/libinfinity-0.6.7/docs/reference/version.xml 2015-10-13 02:11:50.000000000 +0200 @@ -1 +1 @@ -0.6.6 \ No newline at end of file +0.6.7 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinfinity-0.6.6/libinfgtk/inf-gtk-browser-store.c new/libinfinity-0.6.7/libinfgtk/inf-gtk-browser-store.c --- old/libinfinity-0.6.6/libinfgtk/inf-gtk-browser-store.c 2015-02-25 02:50:00.000000000 +0100 +++ new/libinfinity-0.6.7/libinfgtk/inf-gtk-browser-store.c 2015-10-13 01:55:48.000000000 +0200 @@ -520,6 +520,11 @@ /* Note we need to reset the browser before we unlink because * inf_gtk_browser_store_item_set_browser() requires item still being * linked for change notifications. */ + /* TODO: This is a bit cumbersome. A better way might be to be able for + * the iter parameter to be NULL to indicate that an entry with + * its browser has been deleted. However, this would still need to do + * lots of the unregistration that is now happening in + * inf_gtk_browser_store_item_set_browser(). */ if(item->browser != NULL) { inf_gtk_browser_store_item_set_browser(store, item, path, NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinfinity-0.6.6/libinfgtk/inf-gtk-browser-view.c new/libinfinity-0.6.7/libinfgtk/inf-gtk-browser-view.c --- old/libinfinity-0.6.6/libinfgtk/inf-gtk-browser-view.c 2015-02-25 02:50:00.000000000 +0100 +++ new/libinfinity-0.6.7/libinfgtk/inf-gtk-browser-view.c 2015-10-13 01:55:48.000000000 +0200 @@ -2073,6 +2073,12 @@ switch(status) { + case INF_GTK_BROWSER_MODEL_INVALID: + /* This can happen when the cell data func is called between the + * resetting of an item and its removal from the tree. But in any case + * it will be removed soon, so no need to do anything here. */ + stock_id = NULL; + break; case INF_GTK_BROWSER_MODEL_DISCONNECTED: case INF_GTK_BROWSER_MODEL_DISCOVERED: case INF_GTK_BROWSER_MODEL_RESOLVING: @@ -2326,6 +2332,11 @@ switch(status) { + case INF_GTK_BROWSER_MODEL_INVALID: + /* This can happen when the cell data func is called between the + * resetting of an item and its removal from the tree. But in any case + * it will be removed soon, so no need to do anything here. */ + break; case INF_GTK_BROWSER_MODEL_DISCOVERED: case INF_GTK_BROWSER_MODEL_DISCONNECTED: g_object_set( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinfinity-0.6.6/libinfinity/adopted/inf-adopted-session.c new/libinfinity-0.6.7/libinfinity/adopted/inf-adopted-session.c --- old/libinfinity-0.6.6/libinfinity/adopted/inf-adopted-session.c 2015-02-25 02:50:00.000000000 +0100 +++ new/libinfinity-0.6.7/libinfinity/adopted/inf-adopted-session.c 2015-10-13 01:55:48.000000000 +0200 @@ -1397,10 +1397,16 @@ guint n_params, xmlNodePtr xml) { + InfAdoptedSessionPrivate* priv; const GParameter* time; InfAdoptedStateVector* vector; gchar* time_string; + const GParameter* id_param; + guint id; + GSList* item; + InfAdoptedSessionLocalUser* local_user; + INF_SESSION_CLASS(parent_class)->set_xml_user_props( session, params, @@ -1408,10 +1414,36 @@ xml ); + priv = INF_ADOPTED_SESSION_PRIVATE(INF_ADOPTED_SESSION(session)); + time = inf_session_lookup_user_property(params, n_params, "vector"); if(time != NULL) { - vector = (InfAdoptedStateVector*)g_value_get_boxed(&time->value); + /* If this is a local user, use last_send_vector instead of the user's + * vector, so that subsequent differential updates are consistent. */ + vector = NULL; + id_param = inf_session_lookup_user_property(params, n_params, "id"); + + if(id_param != NULL) + { + id = g_value_get_uint(&id_param->value); + for(item = priv->local_users; item != NULL; item = item->next) + { + local_user = (InfAdoptedSessionLocalUser*)item->data; + if(inf_user_get_id(INF_USER(local_user->user)) == id) + { + vector = local_user->last_send_vector; + break; + } + } + } + + if(vector == NULL) + { + /* remote user, or a user join request */ + vector = (InfAdoptedStateVector*)g_value_get_boxed(&time->value); + } + time_string = inf_adopted_state_vector_to_string(vector); inf_xml_util_set_attribute(xml, "time", time_string); g_free(time_string); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinfinity-0.6.6/libinfinity/common/inf-xmpp-connection.c new/libinfinity-0.6.7/libinfinity/common/inf-xmpp-connection.c --- old/libinfinity-0.6.6/libinfinity/common/inf-xmpp-connection.c 2015-04-03 17:31:30.000000000 +0200 +++ new/libinfinity-0.6.7/libinfinity/common/inf-xmpp-connection.c 2015-10-14 01:21:06.000000000 +0200 @@ -2203,6 +2203,7 @@ gboolean has_mechanism; priv = INF_XMPP_CONNECTION_PRIVATE(xmpp); + suggestion = NULL; if(priv->sasl_own_context != NULL) { @@ -2219,7 +2220,7 @@ } if(strncmp(iter, "ANONYMOUS", - MAX((size_t) (end - iter), sizeof("ANONYMOUS") - 1) == 0)) + MAX((size_t) (end - iter), sizeof("ANONYMOUS") - 1)) == 0) { suggestion = "ANONYMOUS"; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinfinity-0.6.6/libinfinity/server/infd-directory.c new/libinfinity-0.6.7/libinfinity/server/infd-directory.c --- old/libinfinity-0.6.6/libinfinity/server/infd-directory.c 2015-04-03 19:37:42.000000000 +0200 +++ new/libinfinity-0.6.7/libinfinity/server/infd-directory.c 2015-10-13 01:55:48.000000000 +0200 @@ -2701,6 +2701,7 @@ InfdDirectoryPrivate* priv; InfdDirectoryTransientAccount* transient; InfAclAccount* result; + InfAclAccount* result_copy; guint i; priv = INFD_DIRECTORY_PRIVATE(directory); @@ -2735,8 +2736,21 @@ return NULL; } - if(transient_index != NULL) *transient_index = priv->n_transient_accounts; - return result; + if(transient_index != NULL) + *transient_index = priv->n_transient_accounts; + + /* Note that the return value that we got from + * infd_account_storage_lookup_accounts() is actually an array, and + * therefore needs to be freed with inf_acl_account_array_free(). However, + * we only return a single account that we want to be freed with + * inf_acl_account_free(). Therefore, we are making a copy here -- note + * that the two free functions are in fact different if GSlice is enabled, + * since an array of InfAclAccounts in allocated with g_malloc, while a + * single InfAclAccount is allocated with GSlice. */ + result_copy = inf_acl_account_copy(result); + inf_acl_account_array_free(result, 1); + + return result_copy; } static InfAclAccountId @@ -5979,9 +5993,9 @@ /* Only if we have already a proxy we could not have a request here */ g_assert(request != NULL); inf_request_fail(INF_REQUEST(request), local_error); - g_error_free(local_error); g_object_unref(request); g_free(seq); + g_propagate_error(error, local_error); return FALSE; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinfinity-0.6.6/libinftext/inf-text-chunk.c new/libinfinity-0.6.7/libinftext/inf-text-chunk.c --- old/libinfinity-0.6.6/libinftext/inf-text-chunk.c 2015-02-25 02:50:00.000000000 +0100 +++ new/libinfinity-0.6.7/libinftext/inf-text-chunk.c 2015-10-14 01:21:06.000000000 +0200 @@ -90,7 +90,7 @@ guint offset) { #ifdef CHUNK_CHECK_INTEGRITY - g_assert(offset <= g_utf8_strlen(self, bytes)); + g_assert(offset <= g_utf8_strlen(text, bytes)); #endif return g_utf8_offset_to_pointer(text, offset) - text; @@ -181,6 +181,33 @@ return 1; } +/* This is a special comparison function which is only used + * in inf_text_chunk_get_segment. It makes sure that when two segments + * have the same offset, the second one gets sorted behind. This ensures + * that the first segment in the sequence is never returned, since it + * always has offset 0, which is a precondition for the algorithm + * in inf_text_chunk_get_segment. See also libinfinity github issue #10. */ +static int +inf_text_chunk_segment_cmp_for_get_segment(gconstpointer first, + gconstpointer second, + gpointer userdata) +{ + const InfTextChunkSegment* first_segment; + const InfTextChunkSegment* second_segment; + + first_segment = (const InfTextChunkSegment*)first; + second_segment = (const InfTextChunkSegment*)second; + + g_return_val_if_fail(second != NULL && first != NULL, 0); + + if (first_segment->offset < second_segment->offset) + return -1; + else if (first_segment->offset == second_segment->offset) + return -1; + else + return 1; +} + static guint inf_text_chunk_next_offset(InfTextChunk* self, GSequenceIter* iter) @@ -247,7 +274,7 @@ iter = g_sequence_search( self->segments, &key, - inf_text_chunk_segment_cmp, + inf_text_chunk_segment_cmp_for_get_segment, NULL ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libinfinity-0.6.6/po/libinfinity-0.6.pot new/libinfinity-0.6.7/po/libinfinity-0.6.pot --- old/libinfinity-0.6.6/po/libinfinity-0.6.pot 2015-05-13 02:57:28.000000000 +0200 +++ new/libinfinity-0.6.7/po/libinfinity-0.6.pot 2015-10-14 01:35:25.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-08-27 01:11+0200\n" +"POT-Creation-Date: 2015-10-13 19:35-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -180,87 +180,87 @@ msgid "Need a pam service to authenticate users." msgstr "" -#: ../infinoted/infinoted-options.c:238 +#: ../infinoted/infinoted-options.c:241 msgid "WARNING: Requiring password through unencrypted connection." msgstr "" -#: ../infinoted/infinoted-options.c:249 +#: ../infinoted/infinoted-options.c:252 msgid "" "Creating a new private key also requires creating a new certificate signed " "with it." msgstr "" -#: ../infinoted/infinoted-options.c:263 +#: ../infinoted/infinoted-options.c:266 msgid "" "No private key file given. If you don't have a suitable key file, either " "create one using the --create-key command line argument, or disable TLS by " "setting the security policy to \"no-tls\"." msgstr "" -#: ../infinoted/infinoted-options.c:278 +#: ../infinoted/infinoted-options.c:281 msgid "" "No certificate file given. If you don't have a suitable certificate file, " "either create one using the --create-certificate command line agument, or " "disable TLS via by setting the security policy to \"no-tls\"." msgstr "" -#: ../infinoted/infinoted-options.c:322 +#: ../infinoted/infinoted-options.c:325 #, c-format msgid "Error reading configuration file \"%s\": " msgstr "" -#: ../infinoted/infinoted-options.c:380 ../infinoted/infinoted-options.c:424 -#: ../infinoted/infinoted-options.c:498 +#: ../infinoted/infinoted-options.c:383 ../infinoted/infinoted-options.c:427 +#: ../infinoted/infinoted-options.c:501 #, c-format msgid "The option \"%s\" can only be given once" msgstr "" -#: ../infinoted/infinoted-options.c:409 +#: ../infinoted/infinoted-options.c:412 #, c-format msgid "\"%s\" cannot be interpreted as a boolean value" msgstr "" -#: ../infinoted/infinoted-options.c:439 +#: ../infinoted/infinoted-options.c:442 #, c-format msgid "\"%s\" is not a number" msgstr "" -#: ../infinoted/infinoted-options.c:451 +#: ../infinoted/infinoted-options.c:454 #, c-format msgid "Could not read the number \"%s\": %s" msgstr "" -#: ../infinoted/infinoted-options.c:464 +#: ../infinoted/infinoted-options.c:467 #, c-format msgid "Number \"%s\" is too small" msgstr "" -#: ../infinoted/infinoted-options.c:476 +#: ../infinoted/infinoted-options.c:479 #, c-format msgid "Number \"%s\" is too large" msgstr "" -#: ../infinoted/infinoted-options.c:686 +#: ../infinoted/infinoted-options.c:689 msgid "Configuration file to load, instead of the default configuration file" msgstr "" -#: ../infinoted/infinoted-options.c:688 +#: ../infinoted/infinoted-options.c:691 msgid "CONFIG-FILE" msgstr "" -#: ../infinoted/infinoted-options.c:692 +#: ../infinoted/infinoted-options.c:695 msgid "" "Creates a new random private key. The new key will be stored at the given " "location for the server's private key." msgstr "" -#: ../infinoted/infinoted-options.c:698 +#: ../infinoted/infinoted-options.c:701 msgid "" "Creates a new self-signed certificate signed with the given private key. The " "certificate is stored at the given location for the server's certificate." msgstr "" -#: ../infinoted/infinoted-options.c:705 +#: ../infinoted/infinoted-options.c:708 msgid "" "Allows one to override configuration entries for plugins from the command " "line. The syntax is --plugin-parameter=plugin:key:value, where plugin is the " @@ -268,35 +268,35 @@ "the parameter which to override and value is the new value of the parameter" msgstr "" -#: ../infinoted/infinoted-options.c:710 +#: ../infinoted/infinoted-options.c:713 msgid "PLUGIN:PARAMETER:VALUE" msgstr "" -#: ../infinoted/infinoted-options.c:715 +#: ../infinoted/infinoted-options.c:718 msgid "Daemonize the server, i.e. run it in the background" msgstr "" -#: ../infinoted/infinoted-options.c:719 +#: ../infinoted/infinoted-options.c:722 msgid "Kill a running daemon and exit" msgstr "" -#: ../infinoted/infinoted-options.c:724 +#: ../infinoted/infinoted-options.c:727 msgid "Display version information and exit" msgstr "" -#: ../infinoted/infinoted-options.c:783 +#: ../infinoted/infinoted-options.c:786 msgid "Infinoted Options" msgstr "" -#: ../infinoted/infinoted-options.c:784 +#: ../infinoted/infinoted-options.c:787 msgid "Main Program Options" msgstr "" -#: ../infinoted/infinoted-options.c:793 +#: ../infinoted/infinoted-options.c:796 msgid "infinote dedicated server" msgstr "" -#: ../infinoted/infinoted-options.c:828 +#: ../infinoted/infinoted-options.c:831 msgid "Could not kill daemon" msgstr "" @@ -358,27 +358,27 @@ msgid "Unloaded plugin \"%s\" from \"%s\"" msgstr "" -#: ../infinoted/infinoted-run.c:353 +#: ../infinoted/infinoted-run.c:370 #, c-format msgid "Failed to generate Diffie-Hellman parameters: %s" msgstr "" -#: ../infinoted/infinoted-run.c:373 +#: ../infinoted/infinoted-run.c:390 #, c-format msgid "IPv6 Server running on port %u" msgstr "" -#: ../infinoted/infinoted-run.c:396 +#: ../infinoted/infinoted-run.c:413 #, c-format msgid "IPv4 Server running on port %u" msgstr "" -#: ../infinoted/infinoted-run.c:417 +#: ../infinoted/infinoted-run.c:434 #, c-format msgid "Failed to start server: %s" msgstr "" -#: ../infinoted/infinoted-run.c:435 +#: ../infinoted/infinoted-run.c:452 msgid "Infinoted shutting down..." msgstr "" @@ -412,27 +412,27 @@ msgid "Generating self-signed certificate..." msgstr "" -#: ../infinoted/infinoted-startup.c:318 +#: ../infinoted/infinoted-startup.c:321 #, c-format msgid "User %s failed to log in from %s: PAM authentication failed" msgstr "" -#: ../infinoted/infinoted-startup.c:338 +#: ../infinoted/infinoted-startup.c:341 #, c-format msgid "User %s failed to log in from %s: PAM user not allowed" msgstr "" -#: ../infinoted/infinoted-startup.c:358 +#: ../infinoted/infinoted-startup.c:361 #, c-format msgid "User %s logged in from %s via PAM" msgstr "" -#: ../infinoted/infinoted-startup.c:374 +#: ../infinoted/infinoted-startup.c:392 #, c-format msgid "User %s logged in from %s via password" msgstr "" -#: ../infinoted/infinoted-startup.c:385 +#: ../infinoted/infinoted-startup.c:403 #, c-format msgid "User %s failed to log in from %s: wrong password" msgstr "" @@ -627,11 +627,11 @@ "standard tools that operate on normal UTF-8 encoded text files" msgstr "" -#: ../infinoted/plugins/infinoted-plugin-document-stream.c:663 +#: ../infinoted/plugins/infinoted-plugin-document-stream.c:668 msgid "Not a text or chat node" msgstr "" -#: ../infinoted/plugins/infinoted-plugin-document-stream.c:1482 +#: ../infinoted/plugins/infinoted-plugin-document-stream.c:1501 msgid "Allows streaming of document changes to external programs" msgstr "" @@ -873,27 +873,27 @@ msgid "Create New Account" msgstr "" -#: ../libinfgtk/inf-gtk-browser-store.c:676 +#: ../libinfgtk/inf-gtk-browser-store.c:681 msgid "Disconnected" msgstr "" -#: ../libinfgtk/inf-gtk-browser-view.c:2216 +#: ../libinfgtk/inf-gtk-browser-view.c:2222 msgid "Exploring..." msgstr "" -#: ../libinfgtk/inf-gtk-browser-view.c:2255 +#: ../libinfgtk/inf-gtk-browser-view.c:2261 msgid "Synchronizing..." msgstr "" -#: ../libinfgtk/inf-gtk-browser-view.c:2333 +#: ../libinfgtk/inf-gtk-browser-view.c:2344 msgid "Not connected" msgstr "" -#: ../libinfgtk/inf-gtk-browser-view.c:2344 +#: ../libinfgtk/inf-gtk-browser-view.c:2355 msgid "Connecting..." msgstr "" -#: ../libinfgtk/inf-gtk-browser-view.c:2354 +#: ../libinfgtk/inf-gtk-browser-view.c:2365 msgid "Connected" msgstr "" @@ -976,20 +976,20 @@ msgid "Failed to write file with known hosts \"%s\": %s" msgstr "" -#: ../libinfgtk/inf-gtk-certificate-manager.c:577 +#: ../libinfgtk/inf-gtk-certificate-manager.c:572 #, c-format msgid "Failed to add certificate to list of known hosts: %s" msgstr "" -#: ../libinfgtk/inf-gtk-certificate-manager.c:847 +#: ../libinfgtk/inf-gtk-certificate-manager.c:845 msgid "_Cancel connection" msgstr "" -#: ../libinfgtk/inf-gtk-certificate-manager.c:858 +#: ../libinfgtk/inf-gtk-certificate-manager.c:856 msgid "C_ontinue connection" msgstr "" -#: ../libinfgtk/inf-gtk-certificate-manager.c:865 +#: ../libinfgtk/inf-gtk-certificate-manager.c:863 #, c-format msgid "" "Do you want to continue the connection to host \"%s\"? If you choose to " @@ -1175,11 +1175,11 @@ "received request \"%s\"" msgstr "" -#: ../libinfinity/adopted/inf-adopted-session.c:1462 +#: ../libinfinity/adopted/inf-adopted-session.c:1494 msgid "'time' attribute in user message is missing" msgstr "" -#: ../libinfinity/adopted/inf-adopted-session.c:1949 +#: ../libinfinity/adopted/inf-adopted-session.c:1981 msgid "Operation for request missing" msgstr "" @@ -1366,44 +1366,44 @@ "available, but it did not do so." msgstr "" -#: ../libinfinity/client/infc-browser.c:4433 +#: ../libinfinity/client/infc-browser.c:4434 msgid "No certificate request has been made" msgstr "" -#: ../libinfinity/client/infc-browser.c:4461 -#: ../libinfinity/client/infc-browser.c:4492 +#: ../libinfinity/client/infc-browser.c:4462 +#: ../libinfinity/client/infc-browser.c:4493 msgid "No certificate provided" msgstr "" -#: ../libinfinity/client/infc-browser.c:4511 +#: ../libinfinity/client/infc-browser.c:4512 msgid "Cannot verify the certificate without server certificate" msgstr "" -#: ../libinfinity/client/infc-browser.c:4561 +#: ../libinfinity/client/infc-browser.c:4562 #, c-format msgid "Server sent an invalid certificate (%s)" msgstr "" -#: ../libinfinity/client/infc-browser.c:4669 -#: ../libinfinity/server/infd-directory.c:3265 +#: ../libinfinity/client/infc-browser.c:4670 +#: ../libinfinity/server/infd-directory.c:3280 msgid "The default account cannot be removed" msgstr "" -#: ../libinfinity/client/infc-browser.c:4822 +#: ../libinfinity/client/infc-browser.c:4823 #, c-format msgid "" "The request contains a sequence number refering to a request of type '%s', " "but a request of either 'query-acl' or 'set-acl' was expected." msgstr "" -#: ../libinfinity/client/infc-browser.c:4997 -#: ../libinfinity/client/infc-session-proxy.c:519 +#: ../libinfinity/client/infc-browser.c:4998 +#: ../libinfinity/client/infc-session-proxy.c:523 #, c-format msgid "Error comes from unknown error domain '%s' (code %u)" msgstr "" -#: ../libinfinity/client/infc-browser.c:5244 -#: ../libinfinity/client/infc-session-proxy.c:985 +#: ../libinfinity/client/infc-browser.c:5245 +#: ../libinfinity/client/infc-session-proxy.c:989 #, c-format msgid "Server reply could not be processed: %s" msgstr "" @@ -1439,11 +1439,11 @@ msgid "The request does not contain a sequence number, but one is required" msgstr "" -#: ../libinfinity/client/infc-session-proxy.c:662 +#: ../libinfinity/client/infc-session-proxy.c:666 msgid "Request does not contain required attribute 'id'" msgstr "" -#: ../libinfinity/client/infc-session-proxy.c:680 +#: ../libinfinity/client/infc-session-proxy.c:684 #: ../libinfinity/common/inf-session.c:753 #, c-format msgid "No such user with ID %u" @@ -1657,7 +1657,7 @@ msgstr "" #: ../libinfinity/common/inf-error.c:184 -#: ../libinfinity/server/infd-directory.c:5801 +#: ../libinfinity/server/infd-directory.c:5839 msgid "The root node cannot be removed" msgstr "" @@ -1674,7 +1674,7 @@ msgstr "" #: ../libinfinity/common/inf-error.c:192 -#: ../libinfinity/server/infd-directory.c:6068 +#: ../libinfinity/server/infd-directory.c:6106 msgid "The requesting connection is not subscribed to the session" msgstr "" @@ -1802,11 +1802,11 @@ msgid "The certificate is invalid" msgstr "" -#: ../libinfinity/common/inf-name-resolver.c:205 +#: ../libinfinity/common/inf-name-resolver.c:207 msgid "The reply from the DNS server is incomplete" msgstr "" -#: ../libinfinity/common/inf-name-resolver.c:744 +#: ../libinfinity/common/inf-name-resolver.c:746 #, c-format msgid "" "Failure during SRV record lookup: %s\n" @@ -2151,63 +2151,63 @@ msgid "An unknown authentication error has occured" msgstr "" -#: ../libinfinity/common/inf-xmpp-connection.c:1271 +#: ../libinfinity/common/inf-xmpp-connection.c:1272 msgid "The server did not provide a certificate" msgstr "" -#: ../libinfinity/common/inf-xmpp-connection.c:2085 +#: ../libinfinity/common/inf-xmpp-connection.c:2086 msgid "Stream is not yet secured with TLS" msgstr "" -#: ../libinfinity/common/inf-xmpp-connection.c:2152 +#: ../libinfinity/common/inf-xmpp-connection.c:2153 msgid "Stream is not yet authorized" msgstr "" -#: ../libinfinity/common/inf-xmpp-connection.c:2280 +#: ../libinfinity/common/inf-xmpp-connection.c:2282 msgid "The server does not offer a suitable authentication mechanism" msgstr "" -#: ../libinfinity/common/inf-xmpp-connection.c:2325 +#: ../libinfinity/common/inf-xmpp-connection.c:2327 msgid "The server does not support transport layer security (TLS)" msgstr "" -#: ../libinfinity/common/inf-xmpp-connection.c:2348 +#: ../libinfinity/common/inf-xmpp-connection.c:2350 msgid "The server requires transport layer security (TLS)" msgstr "" -#: ../libinfinity/common/inf-xmpp-connection.c:2382 +#: ../libinfinity/common/inf-xmpp-connection.c:2384 msgid "The server does not provide any authentication mechanism" msgstr "" -#: ../libinfinity/common/inf-xmpp-connection.c:2440 +#: ../libinfinity/common/inf-xmpp-connection.c:2442 msgid "The server cannot perform the TLS handshake" msgstr "" #. XML Warning from <IP Address>: <Warning Text> -#: ../libinfinity/common/inf-xmpp-connection.c:2923 +#: ../libinfinity/common/inf-xmpp-connection.c:2925 #, c-format msgid "XML warning from %s: %s\n" msgstr "" #. The server sent something which is not XML -#: ../libinfinity/common/inf-xmpp-connection.c:2967 +#: ../libinfinity/common/inf-xmpp-connection.c:2969 msgid "Remote site is not an XMPP server" msgstr "" -#: ../libinfinity/common/inf-xmpp-connection.c:4583 +#: ../libinfinity/common/inf-xmpp-connection.c:4587 msgid "The server certificate is not trusted" msgstr "" -#: ../libinfinity/common/inf-xmpp-connection.c:4591 +#: ../libinfinity/common/inf-xmpp-connection.c:4595 #, c-format msgid "The server certificate is not trusted: %s" msgstr "" -#: ../libinfinity/common/inf-xmpp-connection.c:4603 +#: ../libinfinity/common/inf-xmpp-connection.c:4607 msgid "The client certificate is not trusted" msgstr "" -#: ../libinfinity/common/inf-xmpp-connection.c:4611 +#: ../libinfinity/common/inf-xmpp-connection.c:4615 #, c-format msgid "The client certificate is not trusted: %s" msgstr "" @@ -2241,7 +2241,7 @@ msgstr "" #: ../libinfinity/server/infd-chat-filesystem-format.c:145 -#: ../libinfinity/server/infd-filesystem-storage.c:249 +#: ../libinfinity/server/infd-filesystem-storage.c:259 #: ../libinftext/inf-text-filesystem-format.c:368 #, c-format msgid "Error parsing XML in file \"%s\": [%d]: %s" @@ -2294,7 +2294,7 @@ "start the server." msgstr "" -#: ../libinfinity/server/infd-directory.c:2055 +#: ../libinfinity/server/infd-directory.c:2056 #, c-format msgid "" "Could not write session \"%s\" to storage: %s\n" @@ -2302,25 +2302,25 @@ "All changes since the document das been saved are lost." msgstr "" -#: ../libinfinity/server/infd-directory.c:2857 +#: ../libinfinity/server/infd-directory.c:2872 msgid "Server does not support issuing certificates" msgstr "" -#: ../libinfinity/server/infd-directory.c:2971 +#: ../libinfinity/server/infd-directory.c:2986 msgid "The certificate request has no common name set" msgstr "" -#: ../libinfinity/server/infd-directory.c:3026 +#: ../libinfinity/server/infd-directory.c:3041 #, c-format msgid "There is already a transient account with name \"%s\"" msgstr "" -#: ../libinfinity/server/infd-directory.c:3090 +#: ../libinfinity/server/infd-directory.c:3105 msgid "This server does not support creating accounts" msgstr "" -#: ../libinfinity/server/infd-directory.c:3292 -#: ../libinfinity/server/infd-directory.c:11182 +#: ../libinfinity/server/infd-directory.c:3307 +#: ../libinfinity/server/infd-directory.c:11223 #: ../libinfinity/server/infd-filesystem-account-storage.c:1268 #: ../libinfinity/server/infd-filesystem-account-storage.c:1450 #: ../libinfinity/server/infd-filesystem-account-storage.c:1564 @@ -2328,11 +2328,11 @@ msgid "There is no such account with ID \"%s\"" msgstr "" -#: ../libinfinity/server/infd-directory.c:3349 +#: ../libinfinity/server/infd-directory.c:3364 msgid "This server does not support removing accounts" msgstr "" -#: ../libinfinity/server/infd-directory.c:3690 +#: ../libinfinity/server/infd-directory.c:3705 #, c-format msgid "" "Session \"%s\" could not be saved: %s\n" @@ -2340,122 +2340,122 @@ "server is shut down." msgstr "" -#: ../libinfinity/server/infd-directory.c:4202 +#: ../libinfinity/server/infd-directory.c:4217 #, c-format msgid "Name \"%s\" is an invalid name: contains non-printable characters" msgstr "" -#: ../libinfinity/server/infd-directory.c:4220 +#: ../libinfinity/server/infd-directory.c:4235 #, c-format msgid "Name \"%s\" is an invalid name: contains only space characters" msgstr "" -#: ../libinfinity/server/infd-directory.c:4233 +#: ../libinfinity/server/infd-directory.c:4248 #, c-format msgid "Name \"%s\" is an invalid name: contains \"/\"" msgstr "" -#: ../libinfinity/server/infd-directory.c:4248 +#: ../libinfinity/server/infd-directory.c:4263 #, c-format msgid "A node with name \"%s\" exists already" msgstr "" -#: ../libinfinity/server/infd-directory.c:5069 +#: ../libinfinity/server/infd-directory.c:5107 #: ../libinfinity/server/infd-session-proxy.c:418 msgid "Permission denied" msgstr "" -#: ../libinfinity/server/infd-directory.c:5216 +#: ../libinfinity/server/infd-directory.c:5254 #, c-format msgid "Failed to look up account: %s. Logging out user..." msgstr "" -#: ../libinfinity/server/infd-directory.c:5287 +#: ../libinfinity/server/infd-directory.c:5325 msgid "No subscription request for the server chat" msgstr "" -#: ../libinfinity/server/infd-directory.c:5306 +#: ../libinfinity/server/infd-directory.c:5344 #, c-format msgid "No subscription request with ID %u" msgstr "" -#: ../libinfinity/server/infd-directory.c:5374 +#: ../libinfinity/server/infd-directory.c:5412 #, c-format msgid "Node with ID \"%u\" is not a subdirectory node" msgstr "" -#: ../libinfinity/server/infd-directory.c:5386 +#: ../libinfinity/server/infd-directory.c:5424 #, c-format msgid "Node with ID \"%u\" has unsupported type \"%s\"" msgstr "" -#: ../libinfinity/server/infd-directory.c:5397 +#: ../libinfinity/server/infd-directory.c:5435 #, c-format msgid "Node with ID \"%u\" is not a leaf node" msgstr "" -#: ../libinfinity/server/infd-directory.c:6042 -#: ../libinfinity/server/infd-directory.c:11267 +#: ../libinfinity/server/infd-directory.c:6080 +#: ../libinfinity/server/infd-directory.c:11308 msgid "No background storage available" msgstr "" -#: ../libinfinity/server/infd-directory.c:6167 +#: ../libinfinity/server/infd-directory.c:6205 msgid "The chat is disabled" msgstr "" -#: ../libinfinity/server/infd-directory.c:6277 +#: ../libinfinity/server/infd-directory.c:6315 msgid "No certificate request provided" msgstr "" -#: ../libinfinity/server/infd-directory.c:6809 +#: ../libinfinity/server/infd-directory.c:6847 msgid "The ACL for this node has already been queried" msgstr "" -#: ../libinfinity/server/infd-directory.c:6897 +#: ../libinfinity/server/infd-directory.c:6935 msgid "The ACL for this node has not been queried yet" msgstr "" -#: ../libinfinity/server/infd-directory.c:6924 +#: ../libinfinity/server/infd-directory.c:6962 msgid "The set-acl request does not have any ACL provided" msgstr "" -#: ../libinfinity/server/infd-directory.c:6941 -#: ../libinfinity/server/infd-directory.c:10322 +#: ../libinfinity/server/infd-directory.c:6979 +#: ../libinfinity/server/infd-directory.c:10363 msgid "This server does not support the requested permissions" msgstr "" -#: ../libinfinity/server/infd-directory.c:7209 +#: ../libinfinity/server/infd-directory.c:7247 msgid "The node to be subscribed to has been removed" msgstr "" -#: ../libinfinity/server/infd-directory.c:7331 -#: ../libinfinity/server/infd-directory.c:7447 +#: ../libinfinity/server/infd-directory.c:7369 +#: ../libinfinity/server/infd-directory.c:7485 msgid "The parent node of the node to be added has been removed" msgstr "" -#: ../libinfinity/server/infd-directory.c:7532 +#: ../libinfinity/server/infd-directory.c:7570 msgid "Client did not acknowledge initial subscription" msgstr "" -#: ../libinfinity/server/infd-directory.c:7854 +#: ../libinfinity/server/infd-directory.c:7892 #, c-format msgid "Failed to explore the root directory of the new storage: %s" msgstr "" -#: ../libinfinity/server/infd-directory.c:7945 +#: ../libinfinity/server/infd-directory.c:7983 #, c-format msgid "" "Failed to lookup account IDs on account storage change: %s. Demoting clients " "to default account." msgstr "" -#: ../libinfinity/server/infd-directory.c:8025 +#: ../libinfinity/server/infd-directory.c:8063 #, c-format msgid "Failed to obtain account list from account storage: %s" msgstr "" -#: ../libinfinity/server/infd-directory.c:8157 -#: ../libinfinity/server/infd-directory.c:8242 +#: ../libinfinity/server/infd-directory.c:8195 +#: ../libinfinity/server/infd-directory.c:8280 #, c-format msgid "Failed to look up accounts in new account storage: %s" msgstr "" @@ -2528,23 +2528,27 @@ msgid "The certificate with DN=%s is already in use by another account" msgstr "" -#: ../libinfinity/server/infd-filesystem-storage.c:79 +#: ../libinfinity/server/infd-filesystem-storage.c:74 +msgid "The path does not start with \"/\"" +msgstr "" + +#: ../libinfinity/server/infd-filesystem-storage.c:89 msgid "The path contains invalid components" msgstr "" -#: ../libinfinity/server/infd-filesystem-storage.c:109 +#: ../libinfinity/server/infd-filesystem-storage.c:119 #, c-format msgid "Failed to convert root directory to filename encoding: %s" msgstr "" -#: ../libinfinity/server/infd-filesystem-storage.c:120 +#: ../libinfinity/server/infd-filesystem-storage.c:130 #, c-format msgid "" "Failed to create root directory: %s\n" "Subsequent storage operations will most likely fail\n" msgstr "" -#: ../libinfinity/server/infd-filesystem-storage.c:264 +#: ../libinfinity/server/infd-filesystem-storage.c:274 #, c-format msgid "Error processing file \"%s\": Toplevel tag is not \"%s\"" msgstr ""

1 0

commit python3-twine for openSUSE:Factory
by root＠hilbert.suse.de 01 Jan '16

01 Jan '16

Hello community, here is the log from the commit of package python3-twine for openSUSE:Factory checked in at 2016-01-01 19:48:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-twine (Old) and /work/SRC/openSUSE:Factory/.python3-twine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-twine" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-twine/python3-twine.changes 2015-11-05 11:35:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-twine.new/python3-twine.changes 2016-01-01 19:51:12.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 29 19:37:02 UTC 2015 - arun(a)gmx.de + +- update to version 1.6.5: + * Bump requests-toolbelt version to ensure we avoid ConnectionErrors + +------------------------------------------------------------------- Old: ---- twine-1.6.4.tar.gz New: ---- twine-1.6.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-twine.spec ++++++ --- /var/tmp/diff_new_pack.AQk3fg/_old 2016-01-01 19:51:13.000000000 +0100 +++ /var/tmp/diff_new_pack.AQk3fg/_new 2016-01-01 19:51:13.000000000 +0100 @@ -17,7 +17,7 @@ Name: python3-twine -Version: 1.6.4 +Version: 1.6.5 Release: 0 Summary: Collection of utilities for interacting with PyPI License: Apache-2.0 ++++++ twine-1.6.4.tar.gz -> twine-1.6.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.6.4/PKG-INFO new/twine-1.6.5/PKG-INFO --- old/twine-1.6.4/PKG-INFO 2015-10-28 04:10:17.000000000 +0100 +++ new/twine-1.6.5/PKG-INFO 2015-12-17 00:36:32.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: twine -Version: 1.6.4 +Version: 1.6.5 Summary: Collection of utilities for interacting with PyPI Home-page: https://github.com/pypa/twine Author: Donald Stufft and individual contributors diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.6.4/docs/changelog.rst new/twine-1.6.5/docs/changelog.rst --- old/twine-1.6.4/docs/changelog.rst 2015-10-28 04:09:50.000000000 +0100 +++ new/twine-1.6.5/docs/changelog.rst 2015-12-17 00:34:22.000000000 +0100 @@ -4,6 +4,11 @@ Changelog ========= +* :release:`1.6.5 <2015-12-16>` + + * :bug:`155` Bump requests-toolbelt version to ensure we avoid + ConnectionErrors + * :release:`1.6.4 <2015-10-27>` * :bug:`145` Paths with hyphens in them break the Wheel regular expression. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.6.4/setup.py new/twine-1.6.5/setup.py --- old/twine-1.6.4/setup.py 2015-09-17 03:33:30.000000000 +0200 +++ new/twine-1.6.5/setup.py 2015-12-17 00:32:09.000000000 +0100 @@ -21,7 +21,7 @@ install_requires = [ "pkginfo >= 1.0", "requests >= 2.3.0", - "requests-toolbelt >= 0.4.0", + "requests-toolbelt >= 0.5.1", "setuptools >= 0.7.0", ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.6.4/twine/__init__.py new/twine-1.6.5/twine/__init__.py --- old/twine-1.6.4/twine/__init__.py 2015-10-28 04:09:50.000000000 +0100 +++ new/twine-1.6.5/twine/__init__.py 2015-12-17 00:34:33.000000000 +0100 @@ -23,7 +23,7 @@ __summary__ = "Collection of utilities for interacting with PyPI" __uri__ = "https://github.com/pypa/twine" -__version__ = "1.6.4" +__version__ = "1.6.5" __author__ = "Donald Stufft and individual contributors" __email__ = "donald(a)stufft.io" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.6.4/twine.egg-info/PKG-INFO new/twine-1.6.5/twine.egg-info/PKG-INFO --- old/twine-1.6.4/twine.egg-info/PKG-INFO 2015-10-28 04:10:16.000000000 +0100 +++ new/twine-1.6.5/twine.egg-info/PKG-INFO 2015-12-17 00:36:32.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: twine -Version: 1.6.4 +Version: 1.6.5 Summary: Collection of utilities for interacting with PyPI Home-page: https://github.com/pypa/twine Author: Donald Stufft and individual contributors diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.6.4/twine.egg-info/requires.txt new/twine-1.6.5/twine.egg-info/requires.txt --- old/twine-1.6.4/twine.egg-info/requires.txt 2015-10-28 04:10:16.000000000 +0100 +++ new/twine-1.6.5/twine.egg-info/requires.txt 2015-12-17 00:36:32.000000000 +0100 @@ -1,4 +1,4 @@ pkginfo >= 1.0 requests >= 2.3.0 -requests-toolbelt >= 0.4.0 +requests-toolbelt >= 0.5.1 setuptools >= 0.7.0

1 0

commit x-tile for openSUSE:Factory
by root＠hilbert.suse.de 01 Jan '16

01 Jan '16

Hello community, here is the log from the commit of package x-tile for openSUSE:Factory checked in at 2016-01-01 19:48:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/x-tile (Old) and /work/SRC/openSUSE:Factory/.x-tile.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "x-tile" Changes: -------- --- /work/SRC/openSUSE:Factory/x-tile/x-tile.changes 2012-09-25 14:17:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.x-tile.new/x-tile.changes 2016-01-01 19:51:11.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Dec 30 15:03:11 UTC 2015 - netzheimer(a)yahoo.de + +- Update to version 2.5.1: + + Support for python 2.7.10. + + Bugfix: atom.io crashing x-tile. + +------------------------------------------------------------------- Old: ---- x-tile-2.5.tar.xz New: ---- x-tile-2.5.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x-tile.spec ++++++ --- /var/tmp/diff_new_pack.a0pXGO/_old 2016-01-01 19:51:12.000000000 +0100 +++ /var/tmp/diff_new_pack.a0pXGO/_new 2016-01-01 19:51:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package x-tile # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX 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,7 +17,7 @@ Name: x-tile -Version: 2.5 +Version: 2.5.1 Release: 0 Summary: Panel applet for tiling windows License: GPL-2.0+ ++++++ x-tile-2.5.tar.xz -> x-tile-2.5.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x-tile-2.5/debian/changelog new/x-tile-2.5.1/debian/changelog --- old/x-tile-2.5/debian/changelog 2012-09-10 16:23:08.000000000 +0200 +++ new/x-tile-2.5.1/debian/changelog 2015-11-15 21:54:19.000000000 +0100 @@ -1,4 +1,4 @@ -x-tile (2.5-1) stable; urgency=low +x-tile (2.5.1-1) stable; urgency=low * Fellow upstream. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x-tile-2.5/glade/x-tile.glade new/x-tile-2.5.1/glade/x-tile.glade --- old/x-tile-2.5/glade/x-tile.glade 2012-09-18 12:24:49.000000000 +0200 +++ new/x-tile-2.5.1/glade/x-tile.glade 2015-11-15 21:57:20.000000000 +0100 @@ -14,7 +14,7 @@ <property name="type_hint">dialog</property> <property name="transient_for">window</property> <property name="program_name">X Tile</property> - <property name="copyright" translatable="yes">Copyright © 2009-2012 + <property name="copyright" translatable="no">Copyright © 2009-2015 Giuseppe Penone <giuspen(a)gmail.com> Chris Camacho <codifies(a)gmail.com></property> <property name="comments" translatable="yes">Tile the Windows Upon your X Desktop</property> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x-tile-2.5/glade/x-tile.glade.h new/x-tile-2.5.1/glade/x-tile.glade.h --- old/x-tile-2.5/glade/x-tile.glade.h 2012-07-12 12:08:36.000000000 +0200 +++ new/x-tile-2.5.1/glade/x-tile.glade.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -char *s = N_("About X Tile"); -char *s = N_("Copyright © 2009-2012\n" - "Giuseppe Penone <giuspen(a)gmail.com>\n" - "Chris Camacho <chris_camacho(a)yahoo.com>"); -char *s = N_("Tile the Windows Upon your X Desktop"); -char *s = N_("http://www.giuspen.com/x-tile/"); -char *s = N_("\n" - "This program is free software; you can redistribute it and/or modify\n" - "it under the terms of the GNU General Public License as published by\n" - "the Free Software Foundation; either version 2 of the License, or\n" - "(at your option) any later version.\n" - "\n" - "This program is distributed in the hope that it will be useful,\n" - "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "GNU General Public License for more details.\n" - "\n" - "You should have received a copy of the GNU General Public License\n" - "along with this program; if not, write to the Free Software\n" - "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n" - "MA 02110-1301, USA."); -char *s = N_("Chinese Simplified (zh_CN) Khiyuan Fan <Fan.Khiyuan(a)gmail.com>\n" - "Chinese Traditional (zh_TW) Yan-ren Tsai <elleryq(a)gmail.com>\n" - "Czech (cs) Pavel Fric <fripohled(a)blogspot.com\n" - "Spanish (es_AR) MeloPixel <melopixel(a)gmail.com>\n" - "French (fr) Ludovic Troisi <axalis(a)cegetel.net>\n" - "German (de) Jöran Zeller <joeran(a)zeller.ws>\n" - "Italian (it) Giuseppe Penone <giuspen(a)gmail.com>\n" - "Polish (pl) Dominik Wójt <domin144(a)o2.pl>\n" - "Russian (ru) Andriy Kovtun <kovtunos(a)yandex.ru>"); -char *s = N_("Preferences"); -char *s = N_(" Language "); -char *s = N_("Do Not List Minimized Windows"); -char *s = N_("Only Current Workspace"); -char *s = N_("Enable System Tray Docking"); -char *s = N_("Start Minimized in the System Tray"); -char *s = N_("Show Toolbar"); -char *s = N_("Override Monitor 1 Tiling Area"); -char *s = N_("X"); -char *s = N_("Y"); -char *s = N_("Position"); -char *s = N_("Width"); -char *s = N_("Height"); -char *s = N_("Size"); -char *s = N_("Override Monitor 2 Tiling Area"); -char *s = N_("Close"); -char *s = N_("Cancel"); -char *s = N_("OK"); -char *s = N_("<b>Custom Tiling Layout</b>"); -char *s = N_("1) Tile Some Windows Manually"); -char *s = N_("2) Select Them in the X Tile Windows List"); -char *s = N_("3) Click the Update Button"); -char *s = N_("Update"); -char *s = N_("Rows to Filter"); -char *s = N_("Add an Application Filter"); -char *s = N_("Remove an Application Filter"); -char *s = N_("Add Row"); -char *s = N_("Rows to be Selected by Default"); -char *s = N_("X Tile"); -char *s = N_("Set Destination Workspace"); -char *s = N_("Exit After Tile"); Files old/x-tile-2.5/linux/x-tile.1.gz and new/x-tile-2.5.1/linux/x-tile.1.gz differ Files old/x-tile-2.5/locale/cs/LC_MESSAGES/x-tile.mo and new/x-tile-2.5.1/locale/cs/LC_MESSAGES/x-tile.mo differ Files old/x-tile-2.5/locale/de/LC_MESSAGES/x-tile.mo and new/x-tile-2.5.1/locale/de/LC_MESSAGES/x-tile.mo differ Files old/x-tile-2.5/locale/es_AR/LC_MESSAGES/x-tile.mo and new/x-tile-2.5.1/locale/es_AR/LC_MESSAGES/x-tile.mo differ Files old/x-tile-2.5/locale/fr/LC_MESSAGES/x-tile.mo and new/x-tile-2.5.1/locale/fr/LC_MESSAGES/x-tile.mo differ Files old/x-tile-2.5/locale/it/LC_MESSAGES/x-tile.mo and new/x-tile-2.5.1/locale/it/LC_MESSAGES/x-tile.mo differ Files old/x-tile-2.5/locale/pl/LC_MESSAGES/x-tile.mo and new/x-tile-2.5.1/locale/pl/LC_MESSAGES/x-tile.mo differ Files old/x-tile-2.5/locale/ru/LC_MESSAGES/x-tile.mo and new/x-tile-2.5.1/locale/ru/LC_MESSAGES/x-tile.mo differ Files old/x-tile-2.5/locale/zh_CN/LC_MESSAGES/x-tile.mo and new/x-tile-2.5.1/locale/zh_CN/LC_MESSAGES/x-tile.mo differ Files old/x-tile-2.5/locale/zh_TW/LC_MESSAGES/x-tile.mo and new/x-tile-2.5.1/locale/zh_TW/LC_MESSAGES/x-tile.mo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x-tile-2.5/modules/cons.py new/x-tile-2.5.1/modules/cons.py --- old/x-tile-2.5/modules/cons.py 2012-09-18 12:24:49.000000000 +0200 +++ new/x-tile-2.5.1/modules/cons.py 2015-11-15 21:54:35.000000000 +0100 @@ -2,7 +2,7 @@ # # cons.py # -# Copyright 2009-2012 +# Copyright 2009-2015 # Giuseppe Penone <giuspen(a)gmail.com>, # Chris Camacho (chris_c) <codifies(a)gmail.com>. # @@ -28,7 +28,7 @@ APP_NAME = "x-tile" -VERSION = "2.5" +VERSION = "2.5.1" if os.path.isdir("glade"): GLADE_PATH = os.path.join(os.getcwd(), "glade/") LOCALE_PATH = "locale/" Files old/x-tile-2.5/modules/cons.pyc and new/x-tile-2.5.1/modules/cons.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x-tile-2.5/modules/core.py new/x-tile-2.5.1/modules/core.py --- old/x-tile-2.5/modules/core.py 2012-09-18 12:30:42.000000000 +0200 +++ new/x-tile-2.5.1/modules/core.py 2015-11-15 22:41:13.000000000 +0100 @@ -2,7 +2,7 @@ # # core.py # -# Copyright 2009-2012 +# Copyright 2009-2015 # Giuseppe Penone <giuspen(a)gmail.com>, # Chris Camacho (chris_c) <codifies(a)gmail.com>. # Files old/x-tile-2.5/modules/core.pyc and new/x-tile-2.5.1/modules/core.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x-tile-2.5/modules/globs.py new/x-tile-2.5.1/modules/globs.py --- old/x-tile-2.5/modules/globs.py 2012-09-10 16:23:08.000000000 +0200 +++ new/x-tile-2.5.1/modules/globs.py 2015-11-13 10:10:06.000000000 +0100 @@ -2,7 +2,7 @@ # # globs.py # -# Copyright 2009-2012 +# Copyright 2009-2015 # Giuseppe Penone <giuspen(a)gmail.com>, # Chris Camacho (chris_c) <codifies(a)gmail.com>. # @@ -100,7 +100,8 @@ support.glob = self # x11 reference to xlib library display and root window globals self.x11 = ctypes.CDLL(ctypes.util.find_library("X11")) - self.disp = self.x11.XOpenDisplay(0) + self.x11.XOpenDisplay.restype = ctypes.c_void_p + self.disp = ctypes.c_void_p(self.x11.XOpenDisplay(0)) self.root = self.x11.XDefaultRootWindow(self.disp) # property atoms for moveresize # assigned once here so they are not recreated Files old/x-tile-2.5/modules/globs.pyc and new/x-tile-2.5.1/modules/globs.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x-tile-2.5/modules/support.py new/x-tile-2.5.1/modules/support.py --- old/x-tile-2.5/modules/support.py 2012-09-18 12:24:49.000000000 +0200 +++ new/x-tile-2.5.1/modules/support.py 2015-11-15 22:47:38.000000000 +0100 @@ -2,7 +2,7 @@ # # support.py # -# Copyright 2009-2012 +# Copyright 2009-2015 # Giuseppe Penone <giuspen(a)gmail.com>, # Chris Camacho (chris_c) <codifies(a)gmail.com>. # @@ -134,9 +134,13 @@ """ this returns a gtk.gdk.pixbuf of the windows icon converts argb into rgba in the process """ get_property("_NET_WM_ICON", win, glob.XA_CARDINAL) - if not glob.ret_pointer : return None + if not glob.ret_pointer: + return None w = glob.ret_pointer[0] h = glob.ret_pointer[1] + #print w,h + if w > 48 or h > 48: + return None s = w*h buff = "" i = 0 @@ -310,6 +314,7 @@ """Get Screen Index""" xwa = globs.XWindowAttributes() glob.x11.XGetWindowAttributes(glob.disp, glob.root,ctypes.byref(xwa)) + glob.x11.XScreenNumberOfScreen.argtypes = [ctypes.c_void_p] screen_index = glob.x11.XScreenNumberOfScreen(xwa.screen) return screen_index Files old/x-tile-2.5/modules/support.pyc and new/x-tile-2.5.1/modules/support.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x-tile-2.5/modules/tilings.py new/x-tile-2.5.1/modules/tilings.py --- old/x-tile-2.5/modules/tilings.py 2012-07-16 13:47:43.000000000 +0200 +++ new/x-tile-2.5.1/modules/tilings.py 2015-07-15 01:10:34.000000000 +0200 @@ -2,7 +2,7 @@ # # core.py # -# Copyright 2009-2012 +# Copyright 2009-2015 # Giuseppe Penone <giuspen(a)gmail.com>, # Chris Camacho (chris_c) <codifies(a)gmail.com>. # Files old/x-tile-2.5/modules/tilings.pyc and new/x-tile-2.5.1/modules/tilings.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x-tile-2.5/x-tile new/x-tile-2.5.1/x-tile --- old/x-tile-2.5/x-tile 2012-09-18 12:24:49.000000000 +0200 +++ new/x-tile-2.5.1/x-tile 2015-11-15 22:27:21.000000000 +0100 @@ -1,10 +1,10 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # -*- coding: UTF-8 -*- """X Tile main module""" # x-tile # -# Copyright 2009-2011 +# Copyright 2009-2015 # Giuseppe Penone <giuspen(a)gmail.com>, # Chris Camacho (chris_c) <codifies(a)gmail.com>. #

1 0

commit golang-org-x-crypto for openSUSE:Factory
by root＠hilbert.suse.de 01 Jan '16

01 Jan '16

Hello community, here is the log from the commit of package golang-org-x-crypto for openSUSE:Factory checked in at 2016-01-01 19:48:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/golang-org-x-crypto (Old) and /work/SRC/openSUSE:Factory/.golang-org-x-crypto.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "golang-org-x-crypto" Changes: -------- --- /work/SRC/openSUSE:Factory/golang-org-x-crypto/golang-org-x-crypto.changes 2015-09-08 17:46:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.golang-org-x-crypto.new/golang-org-x-crypto.changes 2016-01-01 19:51:10.000000000 +0100 @@ -1,0 +2,16 @@ +Sat Dec 26 11:23:42 UTC 2015 - matwey.kornilov(a)gmail.com + +- Update to version 1.5.2+git20151215.f18420e: + + x/crypto/pkcs12: deal with short byte array in PBKDF + + otr: smpFailureError processing tlvTypeSMP3 prevents sending tlvTypeSMP4 + + x/crypto/openpgp/packet: fix message for errors resulting from an unknown cipher. + + crypto/ssh: fix typo in error string. + + x/crypto/otr: clear key slots when handshaking. + + x/crypto/otr: make errors fatal. + + x/crypto/otr: update libotr test code for version 4. + + x/crypto/otr: reformat the libotr test harness with clang-format. + + x/crypto/ssh: run go fmt + + x/crypto/ssh/agent: Fix keyring removing the wrong key(s) +- Removed crypto-fix-ssh.patch: has been upstreamed + +------------------------------------------------------------------- Old: ---- crypto-0.0.0+git20150711.f6a608d.tar.xz crypto-fix-ssh.patch New: ---- _servicedata crypto-1.5.2+git20151215.f18420e.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ golang-org-x-crypto.spec ++++++ --- /var/tmp/diff_new_pack.xTRuUn/_old 2016-01-01 19:51:10.000000000 +0100 +++ /var/tmp/diff_new_pack.xTRuUn/_new 2016-01-01 19:51:10.000000000 +0100 @@ -17,14 +17,13 @@ Name: golang-org-x-crypto -Version: 0.0.0+git20150711.f6a608d +Version: 1.5.2+git20151215.f18420e Release: 0 Summary: Go supplementary cryptography libraries License: BSD-3-Clause Group: Development/Languages/Other Url: https://github.com/golang/crypto Source: crypto-%{version}.tar.xz -Patch0: crypto-fix-ssh.patch BuildRequires: golang-packaging BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,7 +40,6 @@ %prep %setup -q -n crypto-%{version} -%patch0 -p1 %build %goprep golang.org/x/crypto ++++++ _service ++++++ --- /var/tmp/diff_new_pack.xTRuUn/_old 2016-01-01 19:51:11.000000000 +0100 +++ /var/tmp/diff_new_pack.xTRuUn/_new 2016-01-01 19:51:11.000000000 +0100 @@ -1,16 +1,19 @@ <services> - <service name="tar_scm" mode="localonly"> + <service mode="disabled" name="tar_scm"> <param name="url">https://github.com/golang/crypto.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">0.0.0+git%cd.%h</param> + <param name="versionformat">1.5.2+git%cd.%h</param> <param name="revision">master</param> - </service> - <service name="recompress" mode="localonly"> + <param name="changesgenerate">enable</param></service> + <service mode="disabled" name="recompress"> <param name="file">crypto-*.tar</param> <param name="compression">xz</param> </service> - <service name="set_version" mode="localonly"> + <service name="refresh_patches" mode="disabled"> + <param name="changesgenerate">enable</param> + </service> + <service mode="disabled" name="set_version"> <param name="basename">crypto</param> </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/golang/crypto.git</param> <param name="changesrevision">f18420efc3b4f8e9f3d51f6bd2476e92c46260e9</param></service></servicedata>++++++ crypto-0.0.0+git20150711.f6a608d.tar.xz -> crypto-1.5.2+git20151215.f18420e.tar.xz ++++++ ++++ 4899 lines of diff (skipped)

1 0

commit golang-org-x-text for openSUSE:Factory
by root＠hilbert.suse.de 01 Jan '16

01 Jan '16

Hello community, here is the log from the commit of package golang-org-x-text for openSUSE:Factory checked in at 2016-01-01 19:48:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/golang-org-x-text (Old) and /work/SRC/openSUSE:Factory/.golang-org-x-text.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "golang-org-x-text" Changes: -------- --- /work/SRC/openSUSE:Factory/golang-org-x-text/golang-org-x-text.changes 2015-07-24 09:58:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.golang-org-x-text.new/golang-org-x-text.changes 2016-01-01 19:51:07.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Dec 28 17:56:28 UTC 2015 - matwey.kornilov(a)gmail.com + +- Update to version 1.5.2+git20151217.cf49866: + + : added bidi and htmlindex packages to gen.go + + encoding/charmap: don't map U+FFFD in encoder + + : upgrade to CLDR 28 and necessary adjustments + + encoding: encoders return errors on out-of-repertoire runes + + encoding: added Replacement identifier and htmlindex tests + + : added .gitignore + + display: remove package + + : run long tests after a generated package + + display: remove completely + + encoding/htmlindex: use UTF-8 encoding + +------------------------------------------------------------------- Old: ---- text-1.4.2+git20150710.7c0e16d.tar.xz New: ---- _servicedata text-1.5.2+git20151217.cf49866.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ golang-org-x-text.spec ++++++ --- /var/tmp/diff_new_pack.K3J0JR/_old 2016-01-01 19:51:08.000000000 +0100 +++ /var/tmp/diff_new_pack.K3J0JR/_new 2016-01-01 19:51:08.000000000 +0100 @@ -17,7 +17,7 @@ Name: golang-org-x-text -Version: 1.4.2+git20150710.7c0e16d +Version: 1.5.2+git20151217.cf49866 Release: 0 Summary: Go text processing support License: BSD-3-Clause ++++++ _service ++++++ --- /var/tmp/diff_new_pack.K3J0JR/_old 2016-01-01 19:51:08.000000000 +0100 +++ /var/tmp/diff_new_pack.K3J0JR/_new 2016-01-01 19:51:08.000000000 +0100 @@ -1,16 +1,17 @@ <services> - <service name="tar_scm" mode="localonly"> + <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/golang/text/</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">1.4.2+git%cd.%h</param> + <param name="versionformat">1.5.2+git%cd.%h</param> <param name="revision">master</param> + <param name="changesgenerate">enable</param> </service> - <service name="recompress" mode="localonly"> + <service name="recompress" mode="disabled"> <param name="file">text-*.tar</param> <param name="compression">xz</param> </service> - <service name="set_version" mode="localonly"> + <service name="set_version" mode="disabled"> <param name="basename">text</param> </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/golang/text/</param> <param name="changesrevision">cf4986612c83df6c55578ba198316d1684a9a287</param></service></servicedata>++++++ text-1.4.2+git20150710.7c0e16d.tar.xz -> text-1.5.2+git20151217.cf49866.tar.xz ++++++ ++++ 110422 lines of diff (skipped)

1 0

commit golang-org-x-net for openSUSE:Factory
by root＠hilbert.suse.de 01 Jan '16

01 Jan '16

Hello community, here is the log from the commit of package golang-org-x-net for openSUSE:Factory checked in at 2016-01-01 19:48:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/golang-org-x-net (Old) and /work/SRC/openSUSE:Factory/.golang-org-x-net.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "golang-org-x-net" Changes: -------- --- /work/SRC/openSUSE:Factory/golang-org-x-net/golang-org-x-net.changes 2015-07-24 09:58:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.golang-org-x-net.new/golang-org-x-net.changes 2016-01-01 19:51:06.000000000 +0100 @@ -1,0 +2,21 @@ +Tue Dec 29 18:19:16 UTC 2015 - matwey.kornilov(a)gmail.com + +- Update to version 1.5.2+git20151229.0cb26f7: + + http2: move HEADERS/CONTINUATION order checking into Framer + +------------------------------------------------------------------- +Mon Dec 28 17:47:54 UTC 2015 - matwey.kornilov(a)gmail.com + +- Update to version 1.5.2+git20151224.5d0a0f8: + + http2: add server-side trailer support + + http2: add support for Transport reading trailers from the server + + html/charset: use x/text/encoding/htmlindex + + html/charset: handle unsupported code points for encoding + + http2: send client trailers + + http2: make Transport's Response.Body.Close not wait for buffered data + + html/charset: verify correct UTF-8 behavior + + http2: reset DebugGoroutines after testing it + + http2: fix readFrames goroutine spin between ConnectionError and conn close + + http2: fix typo and simplify truncation of text in test + +------------------------------------------------------------------- Old: ---- net-1.4.2+git20150629.d9558e5.tar.xz New: ---- _servicedata net-1.5.2+git20151229.0cb26f7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ golang-org-x-net.spec ++++++ --- /var/tmp/diff_new_pack.XE1Gt0/_old 2016-01-01 19:51:07.000000000 +0100 +++ /var/tmp/diff_new_pack.XE1Gt0/_new 2016-01-01 19:51:07.000000000 +0100 @@ -18,7 +18,7 @@ Name: golang-org-x-net -Version: 1.4.2+git20150629.d9558e5 +Version: 1.5.2+git20151229.0cb26f7 Release: 0 Summary: Additional go.networking libraries License: BSD-3-Clause @@ -26,8 +26,9 @@ Url: https://github.com/golang/net Source: net-%{version}.tar.xz BuildRequires: golang-packaging -BuildRequires: golang(golang.org/x/text) BuildRequires: xz +BuildRequires: golang(golang.org/x/crypto/ssh/terminal) +BuildRequires: golang(golang.org/x/text) Provides: go-go.net = %{version} Obsoletes: go-go.net < %{version} Provides: go-net = %{version} @@ -44,6 +45,8 @@ %prep %setup -q -n net-%{version} +# Drop h2demo examples +rm -rf http2/h2demo %build %goprep golang.org/x/net @@ -57,6 +60,7 @@ %defattr(-,root,root,-) %doc LICENSE %{go_contribdir}/* +%{_bindir}/h2i %files source %defattr(-,root,root,-) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.XE1Gt0/_old 2016-01-01 19:51:07.000000000 +0100 +++ /var/tmp/diff_new_pack.XE1Gt0/_new 2016-01-01 19:51:07.000000000 +0100 @@ -1,16 +1,17 @@ <services> - <service name="tar_scm" mode="localonly"> + <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/golang/net/</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">1.4.2+git%cd.%h</param> + <param name="versionformat">1.5.2+git%cd.%h</param> <param name="revision">master</param> + <param name="changesgenerate">enable</param> </service> - <service name="recompress" mode="localonly"> + <service name="recompress" mode="disabled"> <param name="file">net-*.tar</param> <param name="compression">xz</param> </service> - <service name="set_version" mode="localonly"> + <service name="set_version" mode="disabled"> <param name="basename">net</param> </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/golang/net/</param> <param name="changesrevision">0cb26f788dd4625d1956c6fd97ffc4c90669d129</param></service></servicedata>++++++ net-1.4.2+git20150629.d9558e5.tar.xz -> net-1.5.2+git20151229.0cb26f7.tar.xz ++++++ ++++ 53935 lines of diff (skipped)

1 0

commit QMPlay2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Jan '16

01 Jan '16

Hello community, here is the log from the commit of package QMPlay2 for openSUSE:Factory checked in at 2016-01-01 19:48:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/QMPlay2 (Old) and /work/SRC/openSUSE:Factory/.QMPlay2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "QMPlay2" Changes: -------- --- /work/SRC/openSUSE:Factory/QMPlay2/QMPlay2.changes 2015-12-21 12:07:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.QMPlay2.new/QMPlay2.changes 2016-01-01 19:51:04.000000000 +0100 @@ -1,0 +2,16 @@ +Mon Dec 28 19:28:38 UTC 2015 - dap.darkness(a)gmail.com + +- Update to 15.12.25: + * KF5 Breeze style fixes in full screen; + * OpenGL 2 bugfix. +- New requirements recommended by upstream. +- Removed QMPlay2-Qt51.diff. + +------------------------------------------------------------------- +Tue Dec 22 18:30:12 UTC 2015 - dap.darkness(a)gmail.com + +- Added QMPlay2-Qt51.diff to fix openSUSE 13.1' default Qt 5.1 + build issue. +- Fixed translations absence. + +------------------------------------------------------------------- Old: ---- QMPlay2-src-15.12.06.tar.xz New: ---- QMPlay2-src-15.12.25.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ QMPlay2.spec ++++++ --- /var/tmp/diff_new_pack.1MWu0j/_old 2016-01-01 19:51:05.000000000 +0100 +++ /var/tmp/diff_new_pack.1MWu0j/_new 2016-01-01 19:51:05.000000000 +0100 @@ -17,7 +17,7 @@ Name: QMPlay2 -Version: 15.12.06 +Version: 15.12.25 Release: 0 Summary: A Qt based media player, streamer and downloader License: LGPL-3.0+ @@ -26,6 +26,9 @@ Source: http://kent.dl.sourceforge.net/project/zaps166/QMPlay2/QMPlay2-src-%{versio… BuildRequires: libXv-devel +%if 0%{?suse_version} > 1310 +BuildRequires: libqt5-linguist +%endif BuildRequires: portaudio-devel BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Network) @@ -39,7 +42,9 @@ BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libcddb) BuildRequires: pkgconfig(libcdio) +BuildRequires: pkgconfig(libgme) BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libsidplayfp) BuildRequires: pkgconfig(libswresample) BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(libva) ++++++ QMPlay2-src-15.12.06.tar.xz -> QMPlay2-src-15.12.25.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-15.12.06/ChangeLog new/QMPlay2-src-15.12.25/ChangeLog --- old/QMPlay2-src-15.12.06/ChangeLog 2015-12-06 20:42:38.000000000 +0100 +++ new/QMPlay2-src-15.12.25/ChangeLog 2015-12-25 22:11:25.000000000 +0100 @@ -1,3 +1,8 @@ +Changes in QMPlay2 build 15.12.25: + - KF5 Breeze style fixes in full screen, + - Qt5 <= 5.2 compilation fixes, + - OpenGL 2 bugfix, + Changes in QMPlay2 build 15.12.06: - support for HEVC, VP8 and VP9 decoding in VA-API (depending on FFmpeg version), - setting priorities of decoders and A/V outputs is now more convenient, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-15.12.06/README.md new/QMPlay2-src-15.12.25/README.md --- old/QMPlay2-src-15.12.06/README.md 2015-12-05 22:57:36.000000000 +0100 +++ new/QMPlay2-src-15.12.25/README.md 2015-12-06 23:46:39.000000000 +0100 @@ -1,4 +1,4 @@ -#QMPlay2 - QT Media Player 2 +#QMPlay2 - Qt Media Player 2 >QMPlay2 is a video and audio player. It can play all formats supported by FFmpeg, libmodplug (including J2B and SFX). It also supports Audio CD, raw files, Rayman 2 music and chiptunes. It contains YouTube and Prostopleer browser. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-15.12.06/src/gui/Main.cpp new/QMPlay2-src-15.12.25/src/gui/Main.cpp --- old/QMPlay2-src-15.12.06/src/gui/Main.cpp 2015-12-04 02:16:58.000000000 +0100 +++ new/QMPlay2-src-15.12.25/src/gui/Main.cpp 2015-12-25 18:33:56.000000000 +0100 @@ -55,7 +55,7 @@ defaultModules << "OpenGL 2" << "DirectDraw"; #elif defined Q_OS_ANDROID if ( type == "videoWriters" ) - defaultModules << "QPainter"; + defaultModules << "QPainter" << "OpenGL 2"; #endif QStringList availableModules; const QString moduleType = type.mid( 0, typeLen ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-15.12.06/src/gui/VideoDock.cpp new/QMPlay2-src-15.12.25/src/gui/VideoDock.cpp --- old/QMPlay2-src-15.12.06/src/gui/VideoDock.cpp 2015-12-03 01:20:08.000000000 +0100 +++ new/QMPlay2-src-15.12.25/src/gui/VideoDock.cpp 2015-12-25 22:10:31.000000000 +0100 @@ -7,6 +7,7 @@ #include <Functions.hpp> #include <SubsDec.hpp> +#include <QApplication> #include <QMouseEvent> #include <QFileInfo> #include <QMimeData> @@ -60,6 +61,9 @@ connect( &iDW, SIGNAL( resized( int, int ) ), this, SLOT( resizedIDW( int, int ) ) ); connect( this, SIGNAL( visibilityChanged( bool ) ), this, SLOT( visibilityChanged( bool ) ) ); connect( &QMPlay2Core, SIGNAL( dockVideo( QWidget * ) ), &iDW, SLOT( setWidget( QWidget * ) ) ); + + if ( ( isBreeze = qApp->style()->objectName() == "breeze" ) ) + setStyle( &commonStyle ); } void VideoDock::fullScreen( bool b ) @@ -72,7 +76,8 @@ setFeatures( DockWidget::NoDockWidgetFeatures ); setFloating( false ); - setStyle( &commonStyle ); + if ( !isBreeze ) + setStyle( &commonStyle ); } else { @@ -91,7 +96,8 @@ setFeatures( DockWidget::AllDockWidgetFeatures ); setFloating( is_floating ); - setStyle( NULL ); + if ( !isBreeze ) + setStyle( NULL ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-15.12.06/src/gui/VideoDock.hpp new/QMPlay2-src-15.12.25/src/gui/VideoDock.hpp --- old/QMPlay2-src-15.12.06/src/gui/VideoDock.hpp 2015-10-17 20:25:48.000000000 +0200 +++ new/QMPlay2-src-15.12.25/src/gui/VideoDock.hpp 2015-12-25 22:10:23.000000000 +0100 @@ -47,7 +47,7 @@ QMenu *popupMenu; QCommonStyle commonStyle; int pixels; - bool canPopup, is_floating; + bool canPopup, is_floating, isBreeze; double touchZoom; private slots: void popup( const QPoint & ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-15.12.06/src/gui/VideoThr.cpp new/QMPlay2-src-15.12.25/src/gui/VideoThr.cpp --- old/QMPlay2-src-15.12.06/src/gui/VideoThr.cpp 2015-11-29 15:58:40.000000000 +0100 +++ new/QMPlay2-src-15.12.25/src/gui/VideoThr.cpp 2015-12-23 01:05:53.000000000 +0100 @@ -476,6 +476,9 @@ } #if defined(Q_WS_X11) || defined(X11_EXTRAS) + #ifdef X11_EXTRAS + #include <QGuiApplication> + #endif #include <QX11Info> #include <X11/Xlib.h> #endif @@ -483,7 +486,7 @@ void VideoThr::write_slot( const QByteArray &frame ) { #ifdef X11_EXTRAS - if ( QX11Info::isPlatformX11() ) + if ( QGuiApplication::platformName() == "xcb" ) #endif #if defined(Q_WS_X11) || defined(X11_EXTRAS) XResetScreenSaver( QX11Info::display() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-15.12.06/src/modules/OpenGL2/OpenGL2Writer.cpp new/QMPlay2-src-15.12.25/src/modules/OpenGL2/OpenGL2Writer.cpp --- old/QMPlay2-src-15.12.06/src/modules/OpenGL2/OpenGL2Writer.cpp 2015-12-02 21:30:24.000000000 +0100 +++ new/QMPlay2-src-15.12.25/src/modules/OpenGL2/OpenGL2Writer.cpp 2015-12-25 19:36:48.000000000 +0100 @@ -3,12 +3,10 @@ #include <QMPlay2_OSD.hpp> #include <Functions.hpp> -#ifndef USE_NEW_OPENGL_API - #include <QGLShaderProgram> -#else - #include <QOpenGLShaderProgram> +#ifdef USE_NEW_OPENGL_API #include <QOpenGLContext> #endif + #include <QPainter> #if !defined OPENGL_ES2 && !defined Q_OS_MAC @@ -131,12 +129,13 @@ Drawable::Drawable( OpenGL2Writer &writer ) : #endif isOK( true ), paused( false ), - shaderProgramYCbCr( NULL ), shaderProgramOSD( NULL ), #ifndef OPENGL_ES2 + supportsShaders( false ), canCreateNonPowerOfTwoTextures( false ), glActiveTexture( NULL ), #endif writer( writer ), - hasImage( false ) + hasImage( false ), + texCoordYCbCrLoc( -1 ), positionYCbCrLoc( -1 ), texCoordOSDLoc( -1 ), positionOSDLoc( -1 ) { grabGesture( Qt::PinchGesture ); setMouseTracking( true ); @@ -160,15 +159,41 @@ } #ifndef USE_NEW_OPENGL_API -bool Drawable::init() +bool Drawable::testGL() { makeCurrent(); if ( ( isOK = isValid() ) ) - glInit(); + { +#ifndef OPENGL_ES2 + initGLProc(); + if ( !canCreateNonPowerOfTwoTextures || !supportsShaders || !glActiveTexture ) + { + showOpenGLMissingFeaturesMessage(); + isOK = false; + } + /* Reset variables */ + supportsShaders = canCreateNonPowerOfTwoTextures = false; + glActiveTexture = NULL; +#endif + } doneCurrent(); return isOK; } #endif + +#ifndef OPENGL_ES2 +void Drawable::initGLProc() +{ + const char *glExtensions = ( const char * )glGetString( GL_EXTENSIONS ); + if ( glExtensions ) + { + supportsShaders = !!strstr( glExtensions, "GL_ARB_vertex_shader" ) && !!strstr( glExtensions, "GL_ARB_fragment_shader" ) && !!strstr( glExtensions, "GL_ARB_shader_objects" ); + canCreateNonPowerOfTwoTextures = !!strstr( glExtensions, "GL_ARB_texture_non_power_of_two" ); + } + glActiveTexture = ( GLActiveTexture )context()->getProcAddress( "glActiveTexture" ); +} +#endif + void Drawable::clr() { hasImage = false; @@ -199,6 +224,23 @@ } #endif +#ifndef OPENGL_ES2 +void Drawable::showOpenGLMissingFeaturesMessage() +{ + fprintf + ( + stderr, + "GL_ARB_texture_non_power_of_two : %s\n" + "Vertex & fragment shader: %s\n" + "glActiveTexture: %s\n", + canCreateNonPowerOfTwoTextures ? "yes" : "no", + supportsShaders ? "yes" : "no", + glActiveTexture ? "yes" : "no" + ); + QMPlay2Core.logError( "OpenGL 2 :: " + tr( "Sterownik musi obsługiwać multiteksturowanie, shadery oraz tekstury o dowolnym rozmiarze" ), true, true ); +} +#endif + void Drawable::initializeGL() { int glMajor = 0, glMinor = 0; @@ -223,65 +265,39 @@ glVer = "2"; #ifndef OPENGL_ES2 - bool supportsShaders = false, canCreateNonPowerOfTwoTextures = false; - const char *glExtensions = ( const char * )glGetString( GL_EXTENSIONS ); - if ( glExtensions ) + initGLProc(); +#ifndef USE_NEW_OPENGL_API + if ( !glActiveTexture ) //Be sure that "glActiveTexture" has valid pointer (don't check "supportsShaders" here)! +#else + if ( !glActiveTexture || !canCreateNonPowerOfTwoTextures || !supportsShaders ) //"testGL()" doesn't work with "USE_NEW_OPENGL_API", so check features here! +#endif { - supportsShaders = !!strstr( glExtensions, "GL_ARB_vertex_shader" ) && !!strstr( glExtensions, "GL_ARB_fragment_shader" ) && !!strstr( glExtensions, "GL_ARB_shader_objects" ); - canCreateNonPowerOfTwoTextures = !!strstr( glExtensions, "GL_ARB_texture_non_power_of_two" ); - } - glActiveTexture = ( GLActiveTexture )context()->getProcAddress( "glActiveTexture" ); - - if - ( - !canCreateNonPowerOfTwoTextures || - !supportsShaders || - !glActiveTexture - ) - { - /* - * If shader programs are already exists, new context was created without shaders support... - * So the GPU/driver supports this feature and this is workaround for this strange behaviour. - */ - if ( shaderProgramYCbCr && shaderProgramOSD && !supportsShaders ) - fprintf( stderr, "Shaders are already created and now they are not supported... Initialization is ignored.\n" ); - else - { - fprintf - ( - stderr, - "GL_ARB_texture_non_power_of_two : %s\n" - "Vertex & fragment shader: %s\n" - "glActiveTexture: %s\n", - canCreateNonPowerOfTwoTextures ? "yes" : "no", - supportsShaders ? "yes" : "no", - glActiveTexture ? "yes" : "no" - ); - QMPlay2Core.logError( "OpenGL 2 :: " + tr( "Sterownik musi obsługiwać multiteksturowanie, shadery oraz tekstury o dowolnym rozmiarze" ), true, true ); - isOK = false; - } + showOpenGLMissingFeaturesMessage(); + isOK = false; return; } #endif - delete shaderProgramYCbCr; - delete shaderProgramOSD; - shaderProgramYCbCr = new QGLShaderProgram( this ); - shaderProgramOSD = new QGLShaderProgram( this ); - - /* YCbCr shader, use hue only when OpenGL/OpenGL|ES version >= 3.0, because it can be slow on old hardware and/or buggy drivers and may increase CPU usage! */ - shaderProgramYCbCr->addShaderFromSourceCode( QGLShader::Vertex, QString( vShaderYCbCrSrc ).arg( precisionStr ) ); - shaderProgramYCbCr->addShaderFromSourceCode( QGLShader::Fragment, QString( fShaderYCbCrSrc ).arg( precisionStr ).arg( (glMajor * 10 + glMinor >= 30) ? fShaderYCbCrHueSrc : "" ) ); - if ( shaderProgramYCbCr->bind() ) - { - texCoordYCbCrLoc = shaderProgramYCbCr->attributeLocation( "aTexCoord" ); - positionYCbCrLoc = shaderProgramYCbCr->attributeLocation( "vPosition" ); - - shaderProgramYCbCr->setUniformValue( "Ytex", 0 ); - shaderProgramYCbCr->setUniformValue( "Utex", 1 ); - shaderProgramYCbCr->setUniformValue( "Vtex", 2 ); - - shaderProgramYCbCr->release(); + /* YCbCr shader */ + if ( shaderProgramYCbCr.shaders().isEmpty() ) + { + shaderProgramYCbCr.addShaderFromSourceCode( QGLShader::Vertex, QString( vShaderYCbCrSrc ).arg( precisionStr ) ); + /* Use hue only when OpenGL/OpenGL|ES version >= 3.0, because it can be slow on old hardware and/or buggy drivers and may increase CPU usage! */ + shaderProgramYCbCr.addShaderFromSourceCode( QGLShader::Fragment, QString( fShaderYCbCrSrc ).arg( precisionStr ).arg( (glMajor * 10 + glMinor >= 30) ? fShaderYCbCrHueSrc : "" ) ); + } + if ( shaderProgramYCbCr.bind() ) + { + const qint32 newTexCoordLoc = shaderProgramYCbCr.attributeLocation( "aTexCoord" ); + const qint32 newPositionLoc = shaderProgramYCbCr.attributeLocation( "vPosition" ); + if ( newTexCoordLoc != newPositionLoc ) //If new locations are invalid, just leave them untouched... + { + texCoordYCbCrLoc = newTexCoordLoc; + positionYCbCrLoc = newPositionLoc; + } + shaderProgramYCbCr.setUniformValue( "Ytex", 0 ); + shaderProgramYCbCr.setUniformValue( "Utex", 1 ); + shaderProgramYCbCr.setUniformValue( "Vtex", 2 ); + shaderProgramYCbCr.release(); } else { @@ -291,16 +307,22 @@ } /* OSD shader */ - shaderProgramOSD->addShaderFromSourceCode( QGLShader::Vertex, QString( vShaderOSDSrc ).arg( precisionStr ) ); - shaderProgramOSD->addShaderFromSourceCode( QGLShader::Fragment, QString( fShaderOSDSrc ).arg( precisionStr ) ); - if ( shaderProgramOSD->bind() ) + if ( shaderProgramOSD.shaders().isEmpty() ) { - texCoordOSDLoc = shaderProgramOSD->attributeLocation( "aTexCoord" ); - positionOSDLoc = shaderProgramOSD->attributeLocation( "vPosition" ); - - shaderProgramOSD->setUniformValue( "tex", 3 ); - - shaderProgramOSD->release(); + shaderProgramOSD.addShaderFromSourceCode( QGLShader::Vertex, QString( vShaderOSDSrc ).arg( precisionStr ) ); + shaderProgramOSD.addShaderFromSourceCode( QGLShader::Fragment, QString( fShaderOSDSrc ).arg( precisionStr ) ); + } + if ( shaderProgramOSD.bind() ) + { + const qint32 newTexCoordLoc = shaderProgramYCbCr.attributeLocation( "aTexCoord" ); + const qint32 newPositionLoc = shaderProgramYCbCr.attributeLocation( "vPosition" ); + if ( newTexCoordLoc != newPositionLoc ) //If new locations are invalid, just leave them untouched... + { + texCoordOSDLoc = newTexCoordLoc; + positionOSDLoc = newPositionLoc; + } + shaderProgramOSD.setUniformValue( "tex", 3 ); + shaderProgramOSD.release(); } else { @@ -414,23 +436,23 @@ hasImage = true; } - shaderProgramYCbCr->setAttributeArray( positionYCbCrLoc, verticesYCbCr[ writer.flip ], 2 ); - shaderProgramYCbCr->setAttributeArray( texCoordYCbCrLoc, texCoordYCbCr, 2 ); - shaderProgramYCbCr->enableAttributeArray( positionYCbCrLoc ); - shaderProgramYCbCr->enableAttributeArray( texCoordYCbCrLoc ); + shaderProgramYCbCr.setAttributeArray( positionYCbCrLoc, verticesYCbCr[ writer.flip ], 2 ); + shaderProgramYCbCr.setAttributeArray( texCoordYCbCrLoc, texCoordYCbCr, 2 ); + shaderProgramYCbCr.enableAttributeArray( positionYCbCrLoc ); + shaderProgramYCbCr.enableAttributeArray( texCoordYCbCrLoc ); - shaderProgramYCbCr->bind(); + shaderProgramYCbCr.bind(); if ( doReset ) { - shaderProgramYCbCr->setUniformValue( "scale", W / ( float )width(), H / ( float )height() ); - shaderProgramYCbCr->setUniformValue( "videoEq", Brightness, Contrast, Saturation, Hue ); + shaderProgramYCbCr.setUniformValue( "scale", W / ( float )width(), H / ( float )height() ); + shaderProgramYCbCr.setUniformValue( "videoEq", Brightness, Contrast, Saturation, Hue ); doReset = !resetDone; } glDrawArrays( GL_TRIANGLE_STRIP, 0, 4 ); - shaderProgramYCbCr->release(); + shaderProgramYCbCr.release(); - shaderProgramYCbCr->disableAttributeArray( texCoordYCbCrLoc ); - shaderProgramYCbCr->disableAttributeArray( positionYCbCrLoc ); + shaderProgramYCbCr.disableAttributeArray( texCoordYCbCrLoc ); + shaderProgramYCbCr.disableAttributeArray( positionYCbCrLoc ); glActiveTexture( GL_TEXTURE3 ); @@ -467,19 +489,19 @@ right - 1.0f, -top + 1.0f, }; - shaderProgramOSD->setAttributeArray( positionOSDLoc, verticesOSD, 2 ); - shaderProgramOSD->setAttributeArray( texCoordOSDLoc, texCoordOSD, 2 ); - shaderProgramOSD->enableAttributeArray( positionOSDLoc ); - shaderProgramOSD->enableAttributeArray( texCoordOSDLoc ); + shaderProgramOSD.setAttributeArray( positionOSDLoc, verticesOSD, 2 ); + shaderProgramOSD.setAttributeArray( texCoordOSDLoc, texCoordOSD, 2 ); + shaderProgramOSD.enableAttributeArray( positionOSDLoc ); + shaderProgramOSD.enableAttributeArray( texCoordOSDLoc ); glEnable( GL_BLEND ); - shaderProgramOSD->bind(); + shaderProgramOSD.bind(); glDrawArrays( GL_TRIANGLE_STRIP, 0, 4 ); - shaderProgramOSD->release(); + shaderProgramOSD.release(); glDisable( GL_BLEND ); - shaderProgramOSD->disableAttributeArray( texCoordOSDLoc ); - shaderProgramOSD->disableAttributeArray( positionOSDLoc ); + shaderProgramOSD.disableAttributeArray( texCoordOSDLoc ); + shaderProgramOSD.disableAttributeArray( positionOSDLoc ); } osd_mutex.unlock(); @@ -633,7 +655,7 @@ fmt.setDepth( false ); fmt.setStencil( false ); drawable = new Drawable( *this, fmt ); - return drawable->init(); + return drawable->testGL(); #else drawable = new Drawable( *this ); return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-15.12.06/src/modules/OpenGL2/OpenGL2Writer.hpp new/QMPlay2-src-15.12.25/src/modules/OpenGL2/OpenGL2Writer.hpp --- old/QMPlay2-src-15.12.06/src/modules/OpenGL2/OpenGL2Writer.hpp 2015-11-29 22:23:12.000000000 +0100 +++ new/QMPlay2-src-15.12.25/src/modules/OpenGL2/OpenGL2Writer.hpp 2015-12-25 18:01:48.000000000 +0100 @@ -3,11 +3,12 @@ #ifndef USE_NEW_OPENGL_API #include <QGLWidget> + #include <QGLShaderProgram> #else #include <QOpenGLWidget> + #include <QOpenGLShaderProgram> #endif -class QGLShaderProgram; class OpenGL2Writer; class QMPlay2_OSD; @@ -20,11 +21,15 @@ public: #ifndef USE_NEW_OPENGL_API Drawable( OpenGL2Writer &, const QGLFormat & ); - bool init(); + bool testGL(); #else Drawable( OpenGL2Writer & ); #endif +#ifndef OPENGL_ES2 + void initGLProc(); +#endif + void clr(); void resizeEvent( QResizeEvent * ); @@ -40,6 +45,10 @@ void resetClearCounter(); #endif private: +#ifndef OPENGL_ES2 + void showOpenGLMissingFeaturesMessage(); +#endif + void initializeGL(); #ifndef USE_NEW_OPENGL_API void resizeGL( int w, int h ); @@ -51,8 +60,9 @@ #endif bool event( QEvent * ); - QGLShaderProgram *shaderProgramYCbCr, *shaderProgramOSD; + QGLShaderProgram shaderProgramYCbCr, shaderProgramOSD; #ifndef OPENGL_ES2 + bool supportsShaders, canCreateNonPowerOfTwoTextures; GLActiveTexture glActiveTexture; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-15.12.06/src/qmplay2/headers/Functions.hpp new/QMPlay2-src-15.12.25/src/qmplay2/headers/Functions.hpp --- old/QMPlay2-src-15.12.06/src/qmplay2/headers/Functions.hpp 2015-12-03 20:21:58.000000000 +0100 +++ new/QMPlay2-src-15.12.25/src/qmplay2/headers/Functions.hpp 2015-12-20 21:18:28.000000000 +0100 @@ -70,11 +70,7 @@ #else timespec now; clock_gettime( - #ifdef CLOCK_MONOTONIC_RAW - CLOCK_MONOTONIC_RAW, - #else CLOCK_MONOTONIC, - #endif &now ); return now.tv_sec + ( now.tv_nsec / 1000000000.0 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QMPlay2-src-15.12.06/src/qmplay2/headers/QMPlay2Core.hpp new/QMPlay2-src-15.12.25/src/qmplay2/headers/QMPlay2Core.hpp --- old/QMPlay2-src-15.12.06/src/qmplay2/headers/QMPlay2Core.hpp 2015-12-05 23:49:07.000000000 +0100 +++ new/QMPlay2-src-15.12.25/src/qmplay2/headers/QMPlay2Core.hpp 2015-12-25 17:07:10.000000000 +0100 @@ -1,7 +1,7 @@ #ifndef QMPLAY2CORE_HPP #define QMPLAY2CORE_HPP -#define QMPlay2Version "15.12.06" +#define QMPlay2Version "15.12.25" #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || (__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64) #define QMPLAY2_CPU_X86 @@ -104,7 +104,11 @@ } inline bool isWorking() { +#if QT_VERSION < 0x050000 return working > 0; +#else + return working.load() > 0; //For Qt5 <= 5.2 +#endif } private slots: void restoreCursorSlot();

1 0

commit cpuset for openSUSE:Factory
by root＠hilbert.suse.de 01 Jan '16

01 Jan '16

Hello community, here is the log from the commit of package cpuset for openSUSE:Factory checked in at 2016-01-01 19:48:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cpuset (Old) and /work/SRC/openSUSE:Factory/.cpuset.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cpuset" Changes: -------- --- /work/SRC/openSUSE:Factory/cpuset/cpuset.changes 2014-06-01 19:41:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cpuset.new/cpuset.changes 2016-01-01 19:51:03.000000000 +0100 @@ -1,0 +2,20 @@ +Wed Dec 30 12:00:50 UTC 2015 - mgalbraith(a)suse.com + +- Remove obsolete 'Authors' section from cpuset.spec. + +------------------------------------------------------------------- +Tue Dec 29 07:41:24 UTC 2015 - mgalbraith(a)suse.com + +- Merge new cpuset upstream. Update URL, and add post v1.5.6 fixes. + +- New patches: + Fix-crash-with-SCHED_IDLE-policy.patch (bnc#959992) + Handle-unknown-scheduler-policy-codes-gracefully.patch (bnc#959992) + Parse-proc-pid-stat-properly.patch + Docu-remove-mention-about-nonexistent-option.patch (bnc#957323) + Docu-fix-asciidoc-build-error.patch + Update-URLs-after-project-migration.patch + Docu-fixed-a-typo.patch + Fix-typo-in-setup-py.patch + +------------------------------------------------------------------- New: ---- Docu-fix-asciidoc-build-error.patch Docu-fixed-a-typo.patch Docu-remove-mention-about-nonexistent-option.patch Fix-crash-with-SCHED_IDLE-policy.patch Fix-typo-in-setup-py.patch Handle-unknown-scheduler-policy-codes-gracefully.patch Parse-proc-pid-stat-properly.patch Update-URLs-after-project-migration.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cpuset.spec ++++++ --- /var/tmp/diff_new_pack.H80B8g/_old 2016-01-01 19:51:04.000000000 +0100 +++ /var/tmp/diff_new_pack.H80B8g/_new 2016-01-01 19:51:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cpuset # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2008-2011 Novell, Inc. Waltham, MA, USA # # All modifications and additions to the file contributed by third parties @@ -21,19 +21,30 @@ Version: 1.5.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://code.google.com/p/cpuset +Url: https://github.com/lpechacek/cpuset Summary: Allows manipulation of cpusets on system and provides higher level functions License: GPL-2.0 Group: System/Management Source: %{name}-%{version}.tar.gz Patch0: cset-make-it-handle-cgroup-mounts.patch +Patch1: Fix-crash-with-SCHED_IDLE-policy.patch +Patch2: Handle-unknown-scheduler-policy-codes-gracefully.patch +Patch3: Parse-proc-pid-stat-properly.patch +Patch4: Docu-remove-mention-about-nonexistent-option.patch +Patch5: Docu-fix-asciidoc-build-error.patch +Patch6: Update-URLs-after-project-migration.patch +Patch7: Docu-fixed-a-typo.patch +Patch8: Fix-typo-in-setup-py.patch BuildRequires: python-devel + %if 0%{?suse_version} > 0 %py_requires %endif + %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description + Cpuset is a Python application to make using the cpusets facilities in the Linux kernel easier. The actual included command is called cset and it allows manipulation of cpusets on the system and provides higher @@ -43,6 +54,14 @@ %prep %setup %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build CFLAGS="%{optflags}" \ @@ -53,6 +72,7 @@ # Install binaries, but do not install docs via setup.py %{__python} setup.py install --root=%{buildroot} --prefix=%{_prefix} --install-data=/eraseme %{__rm} -rf %{buildroot}/eraseme + # Install documentation %{__mkdir_p} %{buildroot}/%{_defaultdocdir}/cpuset %{__cp} NEWS README INSTALL AUTHORS COPYING cset.init.d %{buildroot}/%{_defaultdocdir}/cpuset/ @@ -64,6 +84,9 @@ %{__mkdir} %{buildroot}/%{_defaultdocdir}/cpuset/html %{__cp} *.html %{buildroot}/%{_defaultdocdir}/cpuset/html/ +%clean +%{__rm} -rf %{buildroot} + %files %defattr(-,root,root) %{_bindir}/cset ++++++ Docu-fix-asciidoc-build-error.patch ++++++ >From 9fb11328779ec31bd7034b3a6099d8cfb4510be4 Mon Sep 17 00:00:00 2001 From: Libor Pechacek <lpechacek(a)suse.com> Date: Wed, 23 Dec 2015 14:01:54 +0100 Subject: [PATCH] Docu: fix asciidoc build error References: Signed-off-by: Libor Pechacek <lpechacek(a)suse.com> Signed-off-by: Mike Galbraith <mgalbraith(a)suse.de> --- doc/tutorial.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/doc/tutorial.txt +++ b/doc/tutorial.txt @@ -1,5 +1,5 @@ Cpuset (cset) Tutorial -###################### +====================== Alex Tsariounov <alext(a)novell.com> + Copyright (c) 2009-2011 Novell Inc., cset v1.5.6 + ++++++ Docu-fixed-a-typo.patch ++++++ ++++ 928 lines (skipped) ++++++ Docu-remove-mention-about-nonexistent-option.patch ++++++ ++++ 916 lines (skipped) ++++++ Fix-crash-with-SCHED_IDLE-policy.patch ++++++ >From de1ae0d598c29b2ae056234f8ecd003e86314871 Mon Sep 17 00:00:00 2001 From: Libor Pechacek <lpechacek(a)suse.com> Date: Tue, 22 Dec 2015 09:46:00 +0100 Subject: [PATCH] Fix crash with SCHED_IDLE policy References: bnc#959992 There are two new schduling policies to be recognized by cset. SCHED_ISO and SCHED_IDLE. The former is not yet implemented in Linux kernel so we write out '???' when we encounter its code. For the latter there is the string 'idl'. Signed-off-by: Libor Pechacek <lpechacek(a)suse.com> Signed-off-by: Mike Galbraith <mgalbraith(a)suse.de> --- cpuset/commands/proc.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/cpuset/commands/proc.py +++ b/cpuset/commands/proc.py @@ -684,7 +684,7 @@ options = [make_option('-l', '--list', def task_detail(pid, width=70): # scheduler policy definitions - policy = ['o', 'f', 'r', 'b'] + policy = ['o', 'f', 'r', 'b', '?', 'i'] # stat location definitions statdef = { 'pid': 0, @@ -732,6 +732,11 @@ options = [make_option('-l', '--list', out2.append('th') elif stat[statdef['rtpolicy']] == '3': out2.append('at') + # SCHED_ISO is reserved but not yet implemented as of Linux v4.4 + elif stat[statdef['rtpolicy']] == '4': + out2.append('??') + elif stat[statdef['rtpolicy']] == '5': + out2.append('dl') else: if int(stat[statdef['rtpriority']]) < 10: out2.append('_') ++++++ Fix-typo-in-setup-py.patch ++++++ From: Mike Galbraith <mgalbraith(a)suse.de> Subject: Fix type in setup.py to get make [rpm/srcrpm] working Date: Tue Dec 29 07:45:23 CET 2015 References: Signed-off-by: Mike Galbraith <mgalbraith(a)suse.de> --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup(name = 'cpuset', license = 'GPLv2', author = 'Alex Tsariounov', author_email = 'alext(a)novell.com', - url = 'https://github.com/lpechacek/cpuset' + url = 'https://github.com/lpechacek/cpuset', description = 'Allows manipluation of cpusets and provides higher level functions.', long_description = \ 'Cpuset is a Python application to make using the cpusets facilities in the Linux\n' ++++++ Handle-unknown-scheduler-policy-codes-gracefully.patch ++++++ >From 0dab14e927137f4cb8d311b6cbae77343fa95ee0 Mon Sep 17 00:00:00 2001 From: Libor Pechacek <lpechacek(a)suse.com> Date: Tue, 22 Dec 2015 12:50:55 +0100 Subject: [PATCH] Handle unknown scheduler policy codes gracefully References: bnc#959992 Prevent unhandled exception upon reading unknown scheduler policy code from /proc/<pid>/stat. Signed-off-by: Libor Pechacek <lpechacek(a)suse.com> Signed-off-by: Mike Galbraith <mgalbraith(a)suse.de> --- cpuset/commands/proc.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/cpuset/commands/proc.py +++ b/cpuset/commands/proc.py @@ -727,7 +727,8 @@ options = [make_option('-l', '--list', out2 = [] out2.append(stdict['State'].split()[0]) - out2.append(policy[int(stat[statdef['rtpolicy']])]) + policy_code=int(stat[statdef['rtpolicy']]) + out2.append(policy[policy_code] if policy_code<len(policy) else '?') if stat[statdef['rtpolicy']] == '0': out2.append('th') elif stat[statdef['rtpolicy']] == '3': ++++++ Parse-proc-pid-stat-properly.patch ++++++ >From 226c8185d4f59cdbcc2116b7bf5df1f44fc59aa4 Mon Sep 17 00:00:00 2001 From: Libor Pechacek <lpechacek(a)suse.com> Date: Tue, 22 Dec 2015 15:10:55 +0100 Subject: [PATCH] Parse /proc/<pid>/stat properly References: Process names can contain spaces. Handle these cases correctly. Signed-off-by: Libor Pechacek <lpechacek(a)suse.com> Signed-off-by: Mike Galbraith <mgalbraith(a)suse.de> --- cpuset/commands/proc.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/cpuset/commands/proc.py +++ b/cpuset/commands/proc.py @@ -711,7 +711,12 @@ options = [make_option('-l', '--list', except: pass # sometimes, we get an extra \n out of this file... stat = file('/proc/'+pid+'/stat', 'r').readline() - stat = stat.split() + # we assume parentheses appear only around the name + stat_right_paren = stat.rfind(')') + stat_left_paren = stat.find('(') + stat = [stat[:stat_left_paren-1]] + \ + [stat[stat_left_paren:stat_right_paren+1]] + \ + stat[stat_right_paren+2:].split() cmdline = file('/proc/'+pid+'/cmdline').readline() # assume that a zero delimits the cmdline (it does now...) cmdline = cmdline.replace('\0', ' ') ++++++ Update-URLs-after-project-migration.patch ++++++ ++++ 2109 lines (skipped)

1 0

commit qtractor for openSUSE:Factory
by root＠hilbert.suse.de 01 Jan '16

01 Jan '16

Hello community, here is the log from the commit of package qtractor for openSUSE:Factory checked in at 2016-01-01 19:48:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qtractor (Old) and /work/SRC/openSUSE:Factory/.qtractor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qtractor" Changes: -------- --- /work/SRC/openSUSE:Factory/qtractor/qtractor.changes 2015-12-23 08:49:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qtractor.new/qtractor.changes 2016-01-01 19:51:01.000000000 +0100 @@ -1,0 +2,29 @@ +Wed Dec 30 10:56:18 UTC 2015 - ecsos(a)opensuse.org + +- update to 0.7.3 + - Slight increase on the number of decimal digits for the plugin + parameters while on the generic plugin properties dialog. Also + applied to automation curve node value editing. + - Unlimited slack is now in effect on editing over and beyond + the current session or clip contents length, on both the main + tracks and MIDI clip editor (piano-roll) views. + - Ctrl+click and dragging the left or right edges of a clip will + now make it spill over and replicate as many clip clones as it + fits in the left or right horizontal extent. + - Added View/Note Type and Value Type command menus to the MIDI + clip editor (aka. piano-roll) which opens the possibility for + discrete shortcuts to switching views eg. Note Velocity and + Controller views (after a kind request by yubatake, thanks). + - Fixed the conversion and/or override of MIDI clip offsets when + moving and copy/pasting across tempo/time-signature changes. + - Fixed MIDI file track/channel duration estimator, which was + giving quite wrong and way too short reads. + - Fixed a drag-and-drop bug over the main tracks view, when new + tracks were being inserted at the top and not to the bottom as + is normally indicated by the floating visual placeholder. + - Fixed LV2UI_Resize handle from extension_data(LV2_UI__resize), + now passing LV2UI_Handle in first argument to ui_resize(), as + found correct and needed for resizable/scaleable LV2 UI's, most + specially to ssj71's so called Infamous Plugins, thanks. + +------------------------------------------------------------------- Old: ---- qtractor-0.7.2.tar.gz New: ---- qtractor-0.7.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtractor.spec ++++++ --- /var/tmp/diff_new_pack.pEaayy/_old 2016-01-01 19:51:02.000000000 +0100 +++ /var/tmp/diff_new_pack.pEaayy/_new 2016-01-01 19:51:02.000000000 +0100 @@ -17,7 +17,7 @@ Name: qtractor -Version: 0.7.2 +Version: 0.7.3 Release: 0 Summary: An Audio/MIDI multi-track sequencer License: GPL-2.0+ ++++++ qtractor-0.7.2.tar.gz -> qtractor-0.7.3.tar.gz ++++++ ++++ 28554 lines of diff (skipped)

1 0