openSUSE Commits
Threads by month
- ----- 2024 -----
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
September 2017
- 1 participants
- 3820 discussions
Hello community,
here is the log from the commit of package gpg2 for openSUSE:Factory checked in at 2017-09-04 12:26:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gpg2 (Old)
and /work/SRC/openSUSE:Factory/.gpg2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpg2"
Mon Sep 4 12:26:32 2017 rev:119 rq:519193 version:2.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/gpg2/gpg2.changes 2017-08-04 11:56:54.336583235 +0200
+++ /work/SRC/openSUSE:Factory/.gpg2.new/gpg2.changes 2017-09-04 12:26:34.789702409 +0200
@@ -1,0 +2,34 @@
+Mon Aug 28 17:21:30 UTC 2017 - astieger(a)suse.com
+
+- GnuPG 2.2.0:
+ * New long term stable branch, replacing the 2.0.x series
+ * gpg: Reverted change in 2.1.23 so that --no-auto-key-retrieve
+ is again the default boo#1054088
+ * Fixed a few minor bugs
+
+-------------------------------------------------------------------
+Sat Aug 12 16:56:26 UTC 2017 - astieger(a)suse.com
+
+- GnuPG 2.1.23:
+ * gpg: Options --auto-key-retrieve and --auto-key-locate "local,wkd"
+ are now used by default. Note: this enables keyserver and Web Key
+ Directory operators to notice when a signature from a locally
+ non-available key is being verified for the first time or when
+ you intend to encrypt to a mail address without having the key
+ locally. This new behaviour will eventually make key discovery
+ much easier and mostly automatic. Disable this by adding
+ no-auto-key-retrieve
+ auto-key-locate local
+ to your gpg.conf.
+ * agent: Option --no-grab is now the default. The new option --grab
+ allows to revert this.
+ * gpg: New import option "show-only".
+ * gpg: New option --disable-dirmngr to entirely disable network
+ access for gpg.
+ * gpg,gpgsm: Tweaked DE-VS compliance behaviour.
+ * New configure flag --enable-all-tests to run more extensive tests
+ during "make check".
+ * gpgsm: The keygrip is now always printed in colon mode as
+ documented in the man page.
+
+-------------------------------------------------------------------
Old:
----
gnupg-2.1.22.tar.bz2
gnupg-2.1.22.tar.bz2.sig
New:
----
gnupg-2.2.0.tar.bz2
gnupg-2.2.0.tar.bz2.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gpg2.spec ++++++
--- /var/tmp/diff_new_pack.EkfFsC/_old 2017-09-04 12:26:36.277493237 +0200
+++ /var/tmp/diff_new_pack.EkfFsC/_new 2017-09-04 12:26:36.281492673 +0200
@@ -17,7 +17,7 @@
Name: gpg2
-Version: 2.1.22
+Version: 2.2.0
Release: 0
Summary: File encryption, decryption, signature creation and verification utility
License: GPL-3.0+
@@ -103,8 +103,9 @@
--enable-large-secmem \
--enable-wks-tools \
--with-gnu-ld \
- --with-default-trust-store=%{_sysconfdir}/ssl/ca-bundle.pem \
+ --with-default-trust-store-file=%{_sysconfdir}/ssl/ca-bundle.pem \
--enable-build-timestamp=$date \
+ --enable-gpg-is-gpg2 \
make %{?_smp_mflags}
++++++ gnupg-2.0.18-files-are-digests.patch ++++++
--- /var/tmp/diff_new_pack.EkfFsC/_old 2017-09-04 12:26:36.325486488 +0200
+++ /var/tmp/diff_new_pack.EkfFsC/_new 2017-09-04 12:26:36.329485926 +0200
@@ -4,11 +4,11 @@
g10/sign.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
3 files changed, 67 insertions(+), 6 deletions(-)
-Index: gnupg-2.1.22/g10/gpg.c
+Index: gnupg-2.1.23/g10/gpg.c
===================================================================
---- gnupg-2.1.22.orig/g10/gpg.c
-+++ gnupg-2.1.22/g10/gpg.c
-@@ -379,6 +379,7 @@ enum cmd_and_opt_values
+--- gnupg-2.1.23.orig/g10/gpg.c 2017-08-09 15:46:17.000000000 +0200
++++ gnupg-2.1.23/g10/gpg.c 2017-08-10 16:21:26.692847431 +0200
+@@ -380,6 +380,7 @@ enum cmd_and_opt_values
oTTYtype,
oLCctype,
oLCmessages,
@@ -16,7 +16,7 @@
oXauthority,
oGroup,
oUnGroup,
-@@ -828,6 +829,7 @@ static ARGPARSE_OPTS opts[] = {
+@@ -829,6 +830,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_s (oWeakDigest, "weak-digest","@"),
ARGPARSE_s_n (oUnwrap, "unwrap", "@"),
ARGPARSE_s_n (oOnlySignTextIDs, "only-sign-text-ids", "@"),
@@ -24,15 +24,15 @@
/* Aliases. I constantly mistype these, and assume other people do
as well. */
-@@ -2383,6 +2385,7 @@ main (int argc, char **argv)
+@@ -2388,6 +2390,7 @@ main (int argc, char **argv)
opt.def_cert_expire = "0";
gnupg_set_homedir (NULL);
opt.passphrase_repeat = 1;
+ opt.files_are_digests=0;
opt.emit_version = 0;
opt.weak_digests = NULL;
- additional_weak_digest("MD5");
-@@ -2944,6 +2947,7 @@ main (int argc, char **argv)
+
+@@ -2952,6 +2955,7 @@ main (int argc, char **argv)
opt.verify_options&=~VERIFY_SHOW_PHOTOS;
break;
case oPhotoViewer: opt.photo_viewer = pargs.r.ret_str; break;
@@ -40,11 +40,11 @@
case oForceMDC: opt.force_mdc = 1; break;
case oNoForceMDC: opt.force_mdc = 0; break;
-Index: gnupg-2.1.22/g10/options.h
+Index: gnupg-2.1.23/g10/options.h
===================================================================
---- gnupg-2.1.22.orig/g10/options.h
-+++ gnupg-2.1.22/g10/options.h
-@@ -212,6 +212,7 @@ struct
+--- gnupg-2.1.23.orig/g10/options.h 2017-08-09 15:46:17.000000000 +0200
++++ gnupg-2.1.23/g10/options.h 2017-08-10 16:21:26.692847431 +0200
+@@ -213,6 +213,7 @@ struct
int no_auto_check_trustdb;
int preserve_permissions;
int no_homedir_creation;
@@ -52,10 +52,10 @@
struct groupitem *grouplist;
int mangle_dos_filenames;
int enable_progress_filter;
-Index: gnupg-2.1.22/g10/sign.c
+Index: gnupg-2.1.23/g10/sign.c
===================================================================
---- gnupg-2.1.22.orig/g10/sign.c
-+++ gnupg-2.1.22/g10/sign.c
+--- gnupg-2.1.23.orig/g10/sign.c 2017-07-28 19:39:06.000000000 +0200
++++ gnupg-2.1.23/g10/sign.c 2017-08-10 16:21:26.692847431 +0200
@@ -43,6 +43,8 @@
#include "../common/mbox-util.h"
#include "../common/compliance.h"
++++++ gnupg-2.1.22.tar.bz2 -> gnupg-2.2.0.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/gpg2/gnupg-2.1.22.tar.bz2 /work/SRC/openSUSE:Factory/.gpg2.new/gnupg-2.2.0.tar.bz2 differ: char 11, line 1
1
0
Hello community,
here is the log from the commit of package spice-protocol for openSUSE:Factory checked in at 2017-09-04 12:26:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/spice-protocol (Old)
and /work/SRC/openSUSE:Factory/.spice-protocol.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spice-protocol"
Mon Sep 4 12:26:24 2017 rev:22 rq:519132 version:0.12.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/spice-protocol/spice-protocol.changes 2017-02-14 00:36:24.023890186 +0100
+++ /work/SRC/openSUSE:Factory/.spice-protocol.new/spice-protocol.changes 2017-09-04 12:26:26.810824184 +0200
@@ -1,0 +2,12 @@
+Mon Aug 28 09:41:14 UTC 2017 - cbosdonnat(a)suse.com
+
+- Update to version 0.12.13:
+ + add DISPLAY_PREFERRED_VIDEO_CODEC_TYPE
+ + add VP9 codec type
+ + add VD_AGENT_CLEAR_CAPABILITY() macro
+ + add VD_AGENT_CAP_FILE_XFER_DISABLED
+ + add VD_AGENT_FILE_XFER_STATUS_NOT_ENOUGH_SPACE
+ + add new file-xfer statuses for detailed error
+ + Change enums.h license to MIT
+
+-------------------------------------------------------------------
Old:
----
spice-protocol-0.12.12.tar.bz2
New:
----
spice-protocol-0.12.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ spice-protocol.spec ++++++
--- /var/tmp/diff_new_pack.091o3B/_old 2017-09-04 12:26:27.726695419 +0200
+++ /var/tmp/diff_new_pack.091o3B/_new 2017-09-04 12:26:27.730694857 +0200
@@ -17,7 +17,7 @@
Name: spice-protocol
-Version: 0.12.12
+Version: 0.12.13
Release: 0
Url: http://www.spice-space.org/
Summary: SPICE-protocol definitions
++++++ spice-protocol-0.12.12.tar.bz2 -> spice-protocol-0.12.13.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spice-protocol-0.12.12/Makefile.in new/spice-protocol-0.12.13/Makefile.in
--- old/spice-protocol-0.12.12/Makefile.in 2016-08-04 13:50:00.000000000 +0200
+++ new/spice-protocol-0.12.13/Makefile.in 2017-02-20 10:35:28.000000000 +0100
@@ -187,7 +187,7 @@
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/spice-protocol.pc.in AUTHORS COPYING ChangeLog \
- INSTALL NEWS README compile depcomp install-sh missing
+ INSTALL NEWS README install-sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -573,7 +573,7 @@
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
@@ -598,7 +598,7 @@
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@@ -616,7 +616,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -626,7 +626,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spice-protocol-0.12.12/NEWS new/spice-protocol-0.12.13/NEWS
--- old/spice-protocol-0.12.12/NEWS 2016-07-07 15:19:59.000000000 +0200
+++ new/spice-protocol-0.12.13/NEWS 2017-07-03 13:14:24.000000000 +0200
@@ -1,3 +1,13 @@
+Major changes in 0.12.13
+========================
+* add DISPLAY_PREFERRED_VIDEO_CODEC_TYPE
+* add VP9 codec type
+* add VD_AGENT_CLEAR_CAPABILITY() macro
+* add VD_AGENT_CAP_FILE_XFER_DISABLED
+* add VD_AGENT_FILE_XFER_STATUS_NOT_ENOUGH_SPACE
+* add new file-xfer statuses for detailed error
+* Change enums.h license to MIT
+
Major changes in 0.12.12
========================
* protocol: Add lz4 compression support to the SpiceVMC channel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spice-protocol-0.12.12/compile new/spice-protocol-0.12.13/compile
--- old/spice-protocol-0.12.12/compile 2015-08-14 12:56:55.000000000 +0200
+++ new/spice-protocol-0.12.13/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,347 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2012-10-14.11; # UTC
-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey(a)cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake(a)gnu.org> or send patches to
-# <automake-patches(a)gnu.org>.
-
-nl='
-'
-
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" "" $nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
- file=$1
- case $file in
- / | /[!/]*) # absolute file, and not a UNC file
- if test -z "$file_conv"; then
- # lazily determine how to convert abs files
- case `uname -s` in
- MINGW*)
- file_conv=mingw
- ;;
- CYGWIN*)
- file_conv=cygwin
- ;;
- *)
- file_conv=wine
- ;;
- esac
- fi
- case $file_conv/,$2, in
- *,$file_conv,*)
- ;;
- mingw/*)
- file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
- ;;
- cygwin/*)
- file=`cygpath -m "$file" || echo "$file"`
- ;;
- wine/*)
- file=`winepath -w "$file" || echo "$file"`
- ;;
- esac
- ;;
- esac
-}
-
-# func_cl_dashL linkdir
-# Make cl look for libraries in LINKDIR
-func_cl_dashL ()
-{
- func_file_conv "$1"
- if test -z "$lib_path"; then
- lib_path=$file
- else
- lib_path="$lib_path;$file"
- fi
- linker_opts="$linker_opts -LIBPATH:$file"
-}
-
-# func_cl_dashl library
-# Do a library search-path lookup for cl
-func_cl_dashl ()
-{
- lib=$1
- found=no
- save_IFS=$IFS
- IFS=';'
- for dir in $lib_path $LIB
- do
- IFS=$save_IFS
- if $shared && test -f "$dir/$lib.dll.lib"; then
- found=yes
- lib=$dir/$lib.dll.lib
- break
- fi
- if test -f "$dir/$lib.lib"; then
- found=yes
- lib=$dir/$lib.lib
- break
- fi
- if test -f "$dir/lib$lib.a"; then
- found=yes
- lib=$dir/lib$lib.a
- break
- fi
- done
- IFS=$save_IFS
-
- if test "$found" != yes; then
- lib=$lib.lib
- fi
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
- # Assume a capable shell
- lib_path=
- shared=:
- linker_opts=
- for arg
- do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as 'compile cc -o foo foo.c'.
- eat=1
- case $2 in
- *.o | *.[oO][bB][jJ])
- func_file_conv "$2"
- set x "$@" -Fo"$file"
- shift
- ;;
- *)
- func_file_conv "$2"
- set x "$@" -Fe"$file"
- shift
- ;;
- esac
- ;;
- -I)
- eat=1
- func_file_conv "$2" mingw
- set x "$@" -I"$file"
- shift
- ;;
- -I*)
- func_file_conv "${1#-I}" mingw
- set x "$@" -I"$file"
- shift
- ;;
- -l)
- eat=1
- func_cl_dashl "$2"
- set x "$@" "$lib"
- shift
- ;;
- -l*)
- func_cl_dashl "${1#-l}"
- set x "$@" "$lib"
- shift
- ;;
- -L)
- eat=1
- func_cl_dashL "$2"
- ;;
- -L*)
- func_cl_dashL "${1#-L}"
- ;;
- -static)
- shared=false
- ;;
- -Wl,*)
- arg=${1#-Wl,}
- save_ifs="$IFS"; IFS=','
- for flag in $arg; do
- IFS="$save_ifs"
- linker_opts="$linker_opts $flag"
- done
- IFS="$save_ifs"
- ;;
- -Xlinker)
- eat=1
- linker_opts="$linker_opts $2"
- ;;
- -*)
- set x "$@" "$1"
- shift
- ;;
- *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
- func_file_conv "$1"
- set x "$@" -Tp"$file"
- shift
- ;;
- *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
- func_file_conv "$1" mingw
- set x "$@" "$file"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
- done
- if test -n "$linker_opts"; then
- linker_opts="-link$linker_opts"
- fi
- exec "$@" $linker_opts
- exit 1
-}
-
-eat=
-
-case $1 in
- '')
- echo "$0: No command. Try '$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
-
-Report bugs to <bug-automake(a)gnu.org>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
- func_cl_wrapper "$@" # Doesn't return...
- ;;
-esac
-
-ofile=
-cfile=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as 'compile cc -o foo foo.c'.
- # So we strip '-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no '-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # '.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spice-protocol-0.12.12/configure new/spice-protocol-0.12.13/configure
--- old/spice-protocol-0.12.12/configure 2016-08-04 13:50:00.000000000 +0200
+++ new/spice-protocol-0.12.13/configure 2017-02-20 10:35:28.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for spice-protocol 0.12.12.
+# Generated by GNU Autoconf 2.69 for spice-protocol 0.12.13.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -576,8 +576,8 @@
# Identity of this package.
PACKAGE_NAME='spice-protocol'
PACKAGE_TARNAME='spice-protocol'
-PACKAGE_VERSION='0.12.12'
-PACKAGE_STRING='spice-protocol 0.12.12'
+PACKAGE_VERSION='0.12.13'
+PACKAGE_STRING='spice-protocol 0.12.13'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1200,7 +1200,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 spice-protocol 0.12.12 to adapt to many kinds of systems.
+\`configure' configures spice-protocol 0.12.13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1266,7 +1266,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of spice-protocol 0.12.12:";;
+ short | recursive ) echo "Configuration of spice-protocol 0.12.13:";;
esac
cat <<\_ACEOF
@@ -1343,7 +1343,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-spice-protocol configure 0.12.12
+spice-protocol configure 0.12.13
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1360,7 +1360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by spice-protocol $as_me 0.12.12, which was
+It was created by spice-protocol $as_me 0.12.13, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2228,7 +2228,7 @@
# Define the identity of the package.
PACKAGE='spice-protocol'
- VERSION='0.12.12'
+ VERSION='0.12.13'
cat >>confdefs.h <<_ACEOF
@@ -2905,7 +2905,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by spice-protocol $as_me 0.12.12, which was
+This file was extended by spice-protocol $as_me 0.12.13, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2967,7 +2967,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-spice-protocol config.status 0.12.12
+spice-protocol config.status 0.12.13
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/spice-protocol-0.12.12/configure.ac new/spice-protocol-0.12.13/configure.ac
--- old/spice-protocol-0.12.12/configure.ac 2016-06-14 17:05:34.000000000 +0200
+++ new/spice-protocol-0.12.13/configure.ac 2017-02-20 10:34:26.000000000 +0100
@@ -2,7 +2,7 @@
m4_define([SPICE_MAJOR], 0)
m4_define([SPICE_MINOR], 12)
-m4_define([SPICE_MICRO], 12)
+m4_define([SPICE_MICRO], 13)
AC_INIT(spice-protocol, [SPICE_MAJOR.SPICE_MINOR.SPICE_MICRO], [], spice-protocol)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spice-protocol-0.12.12/depcomp new/spice-protocol-0.12.13/depcomp
--- old/spice-protocol-0.12.12/depcomp 2015-08-14 12:56:55.000000000 +0200
+++ new/spice-protocol-0.12.13/depcomp 1970-01-01 01:00:00.000000000 +0100
@@ -1,791 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2013-05-30.07; # UTC
-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva(a)dcc.unicamp.br>.
-
-case $1 in
- '')
- echo "$0: No command. Try '$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
- depmode Dependency tracking mode.
- source Source file read by 'PROGRAMS ARGS'.
- object Object file output by 'PROGRAMS ARGS'.
- DEPDIR directory where to store dependencies.
- depfile Dependency file to output.
- tmpdepfile Temporary file to use when outputting dependencies.
- libtool Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake(a)gnu.org>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "depcomp $scriptversion"
- exit $?
- ;;
-esac
-
-# Get the directory component of the given path, and save it in the
-# global variables '$dir'. Note that this directory component will
-# be either empty or ending with a '/' character. This is deliberate.
-set_dir_from ()
-{
- case $1 in
- */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
- *) dir=;;
- esac
-}
-
-# Get the suffix-stripped basename of the given path, and save it the
-# global variable '$base'.
-set_base_from ()
-{
- base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
-}
-
-# If no dependency file was actually created by the compiler invocation,
-# we still have to create a dummy depfile, to avoid errors with the
-# Makefile "include basename.Plo" scheme.
-make_dummy_depfile ()
-{
- echo "#dummy" > "$depfile"
-}
-
-# Factor out some common post-processing of the generated depfile.
-# Requires the auxiliary global variable '$tmpdepfile' to be set.
-aix_post_process_depfile ()
-{
- # If the compiler actually managed to produce a dependency file,
- # post-process it.
- if test -f "$tmpdepfile"; then
- # Each line is of the form 'foo.o: dependency.h'.
- # Do two passes, one to just change these to
- # $object: dependency.h
- # and one to simply output
- # dependency.h:
- # which is needed to avoid the deleted-header problem.
- { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
- sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
- } > "$depfile"
- rm -f "$tmpdepfile"
- else
- make_dummy_depfile
- fi
-}
-
-# A tabulation character.
-tab=' '
-# A newline character.
-nl='
-'
-# Character ranges might be problematic outside the C locale.
-# These definitions help.
-upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
-lower=abcdefghijklmnopqrstuvwxyz
-digits=0123456789
-alpha=${upper}${lower}
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
- echo "depcomp: Variables source, object and depmode must be set" 1>&2
- exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
- sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Avoid interferences from the environment.
-gccflag= dashmflag=
-
-# Some modes work just like other modes, but use different flags. We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write. Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
- # HP compiler uses -M and no extra arg.
- gccflag=-M
- depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
- # This is just like dashmstdout with a different argument.
- dashmflag=-xM
- depmode=dashmstdout
-fi
-
-cygpath_u="cygpath -u -f -"
-if test "$depmode" = msvcmsys; then
- # This is just like msvisualcpp but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u='sed s,\\\\,/,g'
- depmode=msvisualcpp
-fi
-
-if test "$depmode" = msvc7msys; then
- # This is just like msvc7 but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u='sed s,\\\\,/,g'
- depmode=msvc7
-fi
-
-if test "$depmode" = xlc; then
- # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
- gccflag=-qmakedep=gcc,-MF
- depmode=gcc
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want. Yay! Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff. Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am. Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
- for arg
- do
- case $arg in
- -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
- *) set fnord "$@" "$arg" ;;
- esac
- shift # fnord
- shift # $arg
- done
- "$@"
- stat=$?
- if test $stat -ne 0; then
- rm -f "$tmpdepfile"
- exit $stat
- fi
- mv "$tmpdepfile" "$depfile"
- ;;
-
-gcc)
-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
-## (see the conditional assignment to $gccflag above).
-## There are various ways to get dependency output from gcc. Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-## up in a subdir. Having to rename by hand is ugly.
-## (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say). Also, it might not be
-## supported by the other compilers which use the 'gcc' depmode.
-## - Using -M directly means running the compiler twice (even worse
-## than renaming).
- if test -z "$gccflag"; then
- gccflag=-MD,
- fi
- "$@" -Wp,"$gccflag$tmpdepfile"
- stat=$?
- if test $stat -ne 0; then
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- # The second -e expression handles DOS-style file names with drive
- # letters.
- sed -e 's/^[^:]*: / /' \
- -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the "deleted header file" problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header). We avoid this by adding
-## dummy dependencies for each header file. Too bad gcc doesn't do
-## this for us directly.
-## Some versions of gcc put a space before the ':'. On the theory
-## that the space means something, we add a space to the output as
-## well. hp depmode also adds that space, but also prefixes the VPATH
-## to the object. Take care to not repeat it in the output.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- tr ' ' "$nl" < "$tmpdepfile" \
- | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
- | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-hp)
- # This case exists only to let depend.m4 do its work. It works by
- # looking at the text of this script. This case will never be run,
- # since it is checked for above.
- exit 1
- ;;
-
-sgi)
- if test "$libtool" = yes; then
- "$@" "-Wp,-MDupdate,$tmpdepfile"
- else
- "$@" -MDupdate "$tmpdepfile"
- fi
- stat=$?
- if test $stat -ne 0; then
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
-
- if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
- echo "$object : \\" > "$depfile"
- # Clip off the initial element (the dependent). Don't try to be
- # clever and replace this with sed code, as IRIX sed won't handle
- # lines with more than a fixed number of characters (4096 in
- # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like '#:fec' to the end of the
- # dependency line.
- tr ' ' "$nl" < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
- | tr "$nl" ' ' >> "$depfile"
- echo >> "$depfile"
- # The second pass generates a dummy entry for each header file.
- tr ' ' "$nl" < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> "$depfile"
- else
- make_dummy_depfile
- fi
- rm -f "$tmpdepfile"
- ;;
-
-xlc)
- # This case exists only to let depend.m4 do its work. It works by
- # looking at the text of this script. This case will never be run,
- # since it is checked for above.
- exit 1
- ;;
-
-aix)
- # The C for AIX Compiler uses -M and outputs the dependencies
- # in a .u file. In older versions, this file always lives in the
- # current directory. Also, the AIX compiler puts '$object:' at the
- # start of each line; $object doesn't have directory information.
- # Version 6 uses the directory in both cases.
- set_dir_from "$object"
- set_base_from "$object"
- if test "$libtool" = yes; then
- tmpdepfile1=$dir$base.u
- tmpdepfile2=$base.u
- tmpdepfile3=$dir.libs/$base.u
- "$@" -Wc,-M
- else
- tmpdepfile1=$dir$base.u
- tmpdepfile2=$dir$base.u
- tmpdepfile3=$dir$base.u
- "$@" -M
- fi
- stat=$?
- if test $stat -ne 0; then
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
- do
- test -f "$tmpdepfile" && break
- done
- aix_post_process_depfile
- ;;
-
-tcc)
- # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
- # FIXME: That version still under development at the moment of writing.
- # Make that this statement remains true also for stable, released
- # versions.
- # It will wrap lines (doesn't matter whether long or short) with a
- # trailing '\', as in:
- #
- # foo.o : \
- # foo.c \
- # foo.h \
- #
- # It will put a trailing '\' even on the last line, and will use leading
- # spaces rather than leading tabs (at least since its commit 0394caf7
- # "Emit spaces for -MD").
- "$@" -MD -MF "$tmpdepfile"
- stat=$?
- if test $stat -ne 0; then
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
- # We have to change lines of the first kind to '$object: \'.
- sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
- # And for each line of the second kind, we have to emit a 'dep.h:'
- # dummy dependency, to avoid the deleted-header problem.
- sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-## The order of this option in the case statement is important, since the
-## shell code in configure will try each of these formats in the order
-## listed in this file. A plain '-MD' option would be understood by many
-## compilers, so we must ensure this comes after the gcc and icc options.
-pgcc)
- # Portland's C compiler understands '-MD'.
- # Will always output deps to 'file.d' where file is the root name of the
- # source file under compilation, even if file resides in a subdirectory.
- # The object file name does not affect the name of the '.d' file.
- # pgcc 10.2 will output
- # foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using '\' :
- # foo.o: sub/foo.c ... \
- # sub/foo.h ... \
- # ...
- set_dir_from "$object"
- # Use the source, not the object, to determine the base name, since
- # that's sadly what pgcc will do too.
- set_base_from "$source"
- tmpdepfile=$base.d
-
- # For projects that build the same source file twice into different object
- # files, the pgcc approach of using the *source* file root name can cause
- # problems in parallel builds. Use a locking strategy to avoid stomping on
- # the same $tmpdepfile.
- lockdir=$base.d-lock
- trap "
- echo '$0: caught signal, cleaning up...' >&2
- rmdir '$lockdir'
- exit 1
- " 1 2 13 15
- numtries=100
- i=$numtries
- while test $i -gt 0; do
- # mkdir is a portable test-and-set.
- if mkdir "$lockdir" 2>/dev/null; then
- # This process acquired the lock.
- "$@" -MD
- stat=$?
- # Release the lock.
- rmdir "$lockdir"
- break
- else
- # If the lock is being held by a different process, wait
- # until the winning process is done or we timeout.
- while test -d "$lockdir" && test $i -gt 0; do
- sleep 1
- i=`expr $i - 1`
- done
- fi
- i=`expr $i - 1`
- done
- trap - 1 2 13 15
- if test $i -le 0; then
- echo "$0: failed to acquire lock after $numtries attempts" >&2
- echo "$0: check lockdir '$lockdir'" >&2
- exit 1
- fi
-
- if test $stat -ne 0; then
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- # Each line is of the form `foo.o: dependent.h',
- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
- # Some versions of the HPUX 10.20 sed can't process this invocation
- # correctly. Breaking it into two sed invocations is a workaround.
- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
- | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-hp2)
- # The "hp" stanza above does not work with aCC (C++) and HP's ia64
- # compilers, which have integrated preprocessors. The correct option
- # to use with these is +Maked; it writes dependencies to a file named
- # 'foo.d', which lands next to the object file, wherever that
- # happens to be.
- # Much of this is similar to the tru64 case; see comments there.
- set_dir_from "$object"
- set_base_from "$object"
- if test "$libtool" = yes; then
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir.libs/$base.d
- "$@" -Wc,+Maked
- else
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir$base.d
- "$@" +Maked
- fi
- stat=$?
- if test $stat -ne 0; then
- rm -f "$tmpdepfile1" "$tmpdepfile2"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add 'dependent.h:' lines.
- sed -ne '2,${
- s/^ *//
- s/ \\*$//
- s/$/:/
- p
- }' "$tmpdepfile" >> "$depfile"
- else
- make_dummy_depfile
- fi
- rm -f "$tmpdepfile" "$tmpdepfile2"
- ;;
-
-tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in 'foo.d' instead, so we check for that too.
- # Subdirectories are respected.
- set_dir_from "$object"
- set_base_from "$object"
-
- if test "$libtool" = yes; then
- # Libtool generates 2 separate objects for the 2 libraries. These
- # two compilations output dependencies in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
- # automatically cleaned when .libs/ is deleted, while ignoring
- # the former would cause a distcleancheck panic.
- tmpdepfile1=$dir$base.o.d # libtool 1.5
- tmpdepfile2=$dir.libs/$base.o.d # Likewise.
- tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504
- "$@" -Wc,-MD
- else
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir$base.d
- tmpdepfile3=$dir$base.d
- "$@" -MD
- fi
-
- stat=$?
- if test $stat -ne 0; then
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
- do
- test -f "$tmpdepfile" && break
- done
- # Same post-processing that is required for AIX mode.
- aix_post_process_depfile
- ;;
-
-msvc7)
- if test "$libtool" = yes; then
- showIncludes=-Wc,-showIncludes
- else
- showIncludes=-showIncludes
- fi
- "$@" $showIncludes > "$tmpdepfile"
- stat=$?
- grep -v '^Note: including file: ' "$tmpdepfile"
- if test $stat -ne 0; then
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- # The first sed program below extracts the file names and escapes
- # backslashes for cygpath. The second sed program outputs the file
- # name when reading, but also accumulates all include files in the
- # hold buffer in order to output them again at the end. This only
- # works with sed implementations that can handle large buffers.
- sed < "$tmpdepfile" -n '
-/^Note: including file: *\(.*\)/ {
- s//\1/
- s/\\/\\\\/g
- p
-}' | $cygpath_u | sort -u | sed -n '
-s/ /\\ /g
-s/\(.*\)/'"$tab"'\1 \\/p
-s/.\(.*\) \\/\1:/
-H
-$ {
- s/.*/'"$tab"'/
- G
- p
-}' >> "$depfile"
- echo >> "$depfile" # make sure the fragment doesn't end with a backslash
- rm -f "$tmpdepfile"
- ;;
-
-msvc7msys)
- # This case exists only to let depend.m4 do its work. It works by
- # looking at the text of this script. This case will never be run,
- # since it is checked for above.
- exit 1
- ;;
-
-#nosideeffect)
- # This comment above is used by automake to tell side-effect
- # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout, regardless of -o.
- "$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test "X$1" != 'X--mode=compile'; do
- shift
- done
- shift
- fi
-
- # Remove '-o $object'.
- IFS=" "
- for arg
- do
- case $arg in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift # fnord
- shift # $arg
- ;;
- esac
- done
-
- test -z "$dashmflag" && dashmflag=-M
- # Require at least two characters before searching for ':'
- # in the target name. This is to cope with DOS-style filenames:
- # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
- "$@" $dashmflag |
- sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- # Some versions of the HPUX 10.20 sed can't process this sed invocation
- # correctly. Breaking it into two sed invocations is a workaround.
- tr ' ' "$nl" < "$tmpdepfile" \
- | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
- | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-dashXmstdout)
- # This case only exists to satisfy depend.m4. It is never actually
- # run, as this mode is specially recognized in the preamble.
- exit 1
- ;;
-
-makedepend)
- "$@" || exit $?
- # Remove any Libtool call
- if test "$libtool" = yes; then
- while test "X$1" != 'X--mode=compile'; do
- shift
- done
- shift
- fi
- # X makedepend
- shift
- cleared=no eat=no
- for arg
- do
- case $cleared in
- no)
- set ""; shift
- cleared=yes ;;
- esac
- if test $eat = yes; then
- eat=no
- continue
- fi
- case "$arg" in
- -D*|-I*)
- set fnord "$@" "$arg"; shift ;;
- # Strip any option that makedepend may not understand. Remove
- # the object too, otherwise makedepend will parse it as a source file.
- -arch)
- eat=yes ;;
- -*|$object)
- ;;
- *)
- set fnord "$@" "$arg"; shift ;;
- esac
- done
- obj_suffix=`echo "$object" | sed 's/^.*\././'`
- touch "$tmpdepfile"
- ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
- rm -f "$depfile"
- # makedepend may prepend the VPATH from the source file name to the object.
- # No need to regex-escape $object, excess matching of '.' is harmless.
- sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
- # Some versions of the HPUX 10.20 sed can't process the last invocation
- # correctly. Breaking it into two sed invocations is a workaround.
- sed '1,2d' "$tmpdepfile" \
- | tr ' ' "$nl" \
- | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
- | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile" "$tmpdepfile".bak
- ;;
-
-cpp)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout.
- "$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test "X$1" != 'X--mode=compile'; do
- shift
- done
- shift
- fi
-
- # Remove '-o $object'.
- IFS=" "
- for arg
- do
- case $arg in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift # fnord
- shift # $arg
- ;;
- esac
- done
-
- "$@" -E \
- | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
- | sed '$ s: \\$::' > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- cat < "$tmpdepfile" >> "$depfile"
- sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-msvisualcpp)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout.
- "$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test "X$1" != 'X--mode=compile'; do
- shift
- done
- shift
- fi
-
- IFS=" "
- for arg
- do
- case "$arg" in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
- "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
- set fnord "$@"
- shift
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift
- shift
- ;;
- esac
- done
- "$@" -E 2>/dev/null |
- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
- echo "$tab" >> "$depfile"
- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-msvcmsys)
- # This case exists only to let depend.m4 do its work. It works by
- # looking at the text of this script. This case will never be run,
- # since it is checked for above.
- exit 1
- ;;
-
-none)
- exec "$@"
- ;;
-
-*)
- echo "Unknown depmode $depmode" 1>&2
- exit 1
- ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spice-protocol-0.12.12/spice/enums.h new/spice-protocol-0.12.13/spice/enums.h
--- old/spice-protocol-0.12.12/spice/enums.h 2016-06-14 17:05:41.000000000 +0200
+++ new/spice-protocol-0.12.13/spice/enums.h 2017-06-07 21:57:25.000000000 +0200
@@ -1,19 +1,32 @@
/* this is a file autogenerated by spice_codegen.py */
/*
- Copyright (C) 2013 Red Hat, Inc.
+ Copyright (C) 2013 Red Hat, Inc.
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ * Neither the name of the copyright holder nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _H_SPICE_ENUMS
@@ -106,13 +119,6 @@
SPICE_MOUSE_MODE_MASK = 0x3
} SpiceMouseMode;
-typedef enum SpiceDataCompressionType {
- SPICE_DATA_COMPRESSION_TYPE_NONE,
- SPICE_DATA_COMPRESSION_TYPE_LZ4,
-
- SPICE_DATA_COMPRESSION_TYPE_ENUM_END
-} SpiceDataCompressionType;
-
typedef enum SpicePubkeyType {
SPICE_PUBKEY_TYPE_INVALID,
SPICE_PUBKEY_TYPE_RSA,
@@ -128,6 +134,13 @@
SPICE_PUBKEY_TYPE_ENUM_END
} SpicePubkeyType;
+typedef enum SpiceDataCompressionType {
+ SPICE_DATA_COMPRESSION_TYPE_NONE,
+ SPICE_DATA_COMPRESSION_TYPE_LZ4,
+
+ SPICE_DATA_COMPRESSION_TYPE_ENUM_END
+} SpiceDataCompressionType;
+
typedef enum SpiceClipType {
SPICE_CLIP_TYPE_NONE,
SPICE_CLIP_TYPE_RECTS,
@@ -148,6 +161,7 @@
SPICE_VIDEO_CODEC_TYPE_MJPEG = 1,
SPICE_VIDEO_CODEC_TYPE_VP8,
SPICE_VIDEO_CODEC_TYPE_H264,
+ SPICE_VIDEO_CODEC_TYPE_VP9,
SPICE_VIDEO_CODEC_TYPE_ENUM_END
} SpiceVideoCodecType;
@@ -529,6 +543,7 @@
SPICE_MSGC_DISPLAY_STREAM_REPORT,
SPICE_MSGC_DISPLAY_PREFERRED_COMPRESSION,
SPICE_MSGC_DISPLAY_GL_DRAW_DONE,
+ SPICE_MSGC_DISPLAY_PREFERRED_VIDEO_CODEC_TYPE,
SPICE_MSGC_END_DISPLAY
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spice-protocol-0.12.12/spice/macros.h new/spice-protocol-0.12.13/spice/macros.h
--- old/spice-protocol-0.12.12/spice/macros.h 2016-03-10 17:09:31.000000000 +0100
+++ new/spice-protocol-0.12.13/spice/macros.h 2017-02-20 10:34:26.000000000 +0100
@@ -78,11 +78,15 @@
#define SPICE_GNUC_NO_INSTRUMENT
#endif /* !__GNUC__ */
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+#ifdef G_DEPRECATED
+#define SPICE_GNUC_DEPRECATED G_DEPRECATED
+#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
#define SPICE_GNUC_DEPRECATED __attribute__((__deprecated__))
+#elif defined(_MSC_VER) && (_MSC_VER >= 1300)
+#define SPICE_GNUC_DEPRECATED __declspec(deprecated)
#else
#define SPICE_GNUC_DEPRECATED
-#endif /* __GNUC__ */
+#endif
#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
# define SPICE_GNUC_MAY_ALIAS __attribute__((may_alias))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spice-protocol-0.12.12/spice/protocol.h new/spice-protocol-0.12.13/spice/protocol.h
--- old/spice-protocol-0.12.12/spice/protocol.h 2016-06-14 17:05:34.000000000 +0200
+++ new/spice-protocol-0.12.13/spice/protocol.h 2017-02-20 10:34:26.000000000 +0100
@@ -141,6 +141,8 @@
SPICE_DISPLAY_CAP_CODEC_MJPEG,
SPICE_DISPLAY_CAP_CODEC_VP8,
SPICE_DISPLAY_CAP_CODEC_H264,
+ SPICE_DISPLAY_CAP_PREF_VIDEO_CODEC_TYPE,
+ SPICE_DISPLAY_CAP_CODEC_VP9,
};
enum {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spice-protocol-0.12.12/spice/vd_agent.h new/spice-protocol-0.12.13/spice/vd_agent.h
--- old/spice-protocol-0.12.12/spice/vd_agent.h 2016-03-10 16:46:17.000000000 +0100
+++ new/spice-protocol-0.12.13/spice/vd_agent.h 2017-06-23 11:09:54.000000000 +0200
@@ -66,10 +66,23 @@
VD_AGENT_MOUSE_STATE = 1,
VD_AGENT_MONITORS_CONFIG,
VD_AGENT_REPLY,
+ /* Set clipboard data (both directions).
+ * Message comes with type and data.
+ * See VDAgentClipboard structure.
+ */
VD_AGENT_CLIPBOARD,
VD_AGENT_DISPLAY_CONFIG,
VD_AGENT_ANNOUNCE_CAPABILITIES,
+ /* Asks to listen for clipboard changes (both directions).
+ * Remote should empty clipboard and wait for one
+ * of the types passed.
+ * See VDAgentClipboardGrab structure.
+ */
VD_AGENT_CLIPBOARD_GRAB,
+ /* Asks for clipboard data (both directions).
+ * Request comes with a specific type.
+ * See VDAgentClipboardRequest structure.
+ */
VD_AGENT_CLIPBOARD_REQUEST,
VD_AGENT_CLIPBOARD_RELEASE,
VD_AGENT_FILE_XFER_START,
@@ -86,11 +99,25 @@
VD_AGENT_FILE_XFER_STATUS_CANCELLED,
VD_AGENT_FILE_XFER_STATUS_ERROR,
VD_AGENT_FILE_XFER_STATUS_SUCCESS,
+ VD_AGENT_FILE_XFER_STATUS_NOT_ENOUGH_SPACE,
+ VD_AGENT_FILE_XFER_STATUS_SESSION_LOCKED,
+ VD_AGENT_FILE_XFER_STATUS_VDAGENT_NOT_CONNECTED,
+ VD_AGENT_FILE_XFER_STATUS_DISABLED,
};
typedef struct SPICE_ATTR_PACKED VDAgentFileXferStatusMessage {
uint32_t id;
uint32_t result;
+ /* Used to send additional data for detailed error messages
+ * to clients with VD_AGENT_CAP_FILE_XFER_DETAILED_ERRORS capability.
+ * Type of data varies with the result:
+ * result : data type (NULL if no data)
+ * VD_AGENT_FILE_XFER_STATUS_NOT_ENOUGH_SPACE : uint64_t
+ * VD_AGENT_FILE_XFER_STATUS_SESSION_LOCKED : NULL
+ * VD_AGENT_FILE_XFER_STATUS_VDAGENT_NOT_CONNECTED : NULL
+ * VD_AGENT_FILE_XFER_STATUS_DISABLED : NULL
+ */
+ uint8_t data[0];
} VDAgentFileXferStatusMessage;
typedef struct SPICE_ATTR_PACKED VDAgentFileXferStartMessage {
@@ -180,6 +207,12 @@
VD_AGENT_CLIPBOARD_IMAGE_JPG, /* optional */
};
+enum {
+ VD_AGENT_CLIPBOARD_SELECTION_CLIPBOARD = 0,
+ VD_AGENT_CLIPBOARD_SELECTION_PRIMARY,
+ VD_AGENT_CLIPBOARD_SELECTION_SECONDARY,
+};
+
typedef struct SPICE_ATTR_PACKED VDAgentClipboardGrab {
#if 0 /* VD_AGENT_CAP_CLIPBOARD_SELECTION */
uint8_t selection;
@@ -228,15 +261,11 @@
VD_AGENT_CAP_MAX_CLIPBOARD,
VD_AGENT_CAP_AUDIO_VOLUME_SYNC,
VD_AGENT_CAP_MONITORS_CONFIG_POSITION,
+ VD_AGENT_CAP_FILE_XFER_DISABLED,
+ VD_AGENT_CAP_FILE_XFER_DETAILED_ERRORS,
VD_AGENT_END_CAP,
};
-enum {
- VD_AGENT_CLIPBOARD_SELECTION_CLIPBOARD = 0,
- VD_AGENT_CLIPBOARD_SELECTION_PRIMARY,
- VD_AGENT_CLIPBOARD_SELECTION_SECONDARY,
-};
-
typedef struct SPICE_ATTR_PACKED VDAgentAnnounceCapabilities {
uint32_t request;
uint32_t caps[0];
@@ -255,6 +284,9 @@
#define VD_AGENT_SET_CAPABILITY(caps, index) \
{ (caps)[(index) / 32] |= (1 << ((index) % 32)); }
+#define VD_AGENT_CLEAR_CAPABILITY(caps, index) \
+ { (caps)[(index) / 32] &= ~(1 << ((index) % 32)); }
+
#include <spice/end-packed.h>
#endif /* _H_VD_AGENT */
1
0
Hello community,
here is the log from the commit of package parted for openSUSE:Factory checked in at 2017-09-04 12:26:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/parted (Old)
and /work/SRC/openSUSE:Factory/.parted.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "parted"
Mon Sep 4 12:26:03 2017 rev:117 rq:519107 version:3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/parted/parted.changes 2017-08-23 11:53:01.708796663 +0200
+++ /work/SRC/openSUSE:Factory/.parted.new/parted.changes 2017-09-04 12:26:07.005608656 +0200
@@ -1,0 +2,13 @@
+Thu Aug 24 16:51:37 CEST 2017 - sparschauer(a)suse.de
+
+- Drop using deprecated configure option "--disable-Werror"
+- Drop (SUSE specific) support for hybrid pMBR (gpt_sync_mbr
+ label) (fate#317849, bsc#1041322)
+ - remove: parted-gpt-mbr-sync.patch
+ - remove: libparted-ppc-prepboot-in-syncmbr.patch
+ - remove: parted-workaround-windows7-gpt-implementation.patch
+ - refresh patches
+- libparted: Fix starting CHS in protective MBR (bsc#969165)
+ - add: libparted-fix-starting-CHS-in-protective-MBR.patch
+
+-------------------------------------------------------------------
Old:
----
libparted-ppc-prepboot-in-syncmbr.patch
parted-gpt-mbr-sync.patch
parted-workaround-windows7-gpt-implementation.patch
New:
----
libparted-fix-starting-CHS-in-protective-MBR.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ parted.spec ++++++
--- /var/tmp/diff_new_pack.qWY47z/_old 2017-09-04 12:26:08.341420850 +0200
+++ /var/tmp/diff_new_pack.qWY47z/_new 2017-09-04 12:26:08.345420288 +0200
@@ -37,9 +37,6 @@
Patch12: libparted-partition-naming.patch
#PATCH-FEATURE-SUSE more-reliable-informing-the-kernel.patch bnc#657360 petr.uzel(a)suse.cz
Patch13: more-reliable-informing-the-kernel.patch
-Patch14: parted-gpt-mbr-sync.patch
-Patch15: libparted-ppc-prepboot-in-syncmbr.patch
-Patch16: parted-workaround-windows7-gpt-implementation.patch
Patch17: dummy-bootcode-only-for-x86.patch
Patch18: parted-type.patch
Patch19: parted-mac.patch
@@ -80,6 +77,7 @@
Patch49: libparted-set-swap-flag-on-GPT-partitions.patch
Patch50: libparted-dasd-add-swap-flag-handling-for-DASD-CDL.patch
Patch51: parted-mkpart-allow-empty-gpt-part-name.patch
+Patch52: libparted-fix-starting-CHS-in-protective-MBR.patch
Patch100: parted-fatresize-autoconf.patch
BuildRequires: check-devel
BuildRequires: device-mapper-devel >= 1.02.33
@@ -136,9 +134,6 @@
%patch11 -p1
%patch12 -p1
%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
@@ -174,6 +169,7 @@
%patch49 -p1
%patch50 -p1
%patch51 -p1
+%patch52 -p1
%patch100 -p1
%build
@@ -184,7 +180,6 @@
--enable-device-mapper=yes \
--enable-dynamic-loading=no \
--enable-selinux \
- --disable-Werror \
--disable-silent-rules
make %{?_smp_mflags}
++++++ libparted-fix-starting-CHS-in-protective-MBR.patch ++++++
From: Petr Uzel <petr.uzel(a)suse.cz>
Date: Thu, 10 Mar 2016 14:18:52 +0100
Subject: libparted: Fix starting CHS in protective MBR
References: bsc#969165
Patch-mainline: v3.3
Git-commit: df6770d213b60320426a3ee0bed118d063b40fc5
The CHS address for protective partition start in protective MBR
should be 0/0/2, according to UEFI spec (v2.6, section 5.2.1).
* libparted/labels/gpt.c (_write_pmbr): Fix starting CHS address
Reported by Steffen Winterfeldt in https://bugzilla.suse.com/969165
Signed-off-by: Petr Uzel <petr.uzel(a)suse.cz>
---
libparted/labels/gpt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/libparted/labels/gpt.c
+++ b/libparted/labels/gpt.c
@@ -1143,7 +1143,7 @@ _write_pmbr (PedDevice *dev, bool pmbr_b
pmbr->Signature = PED_CPU_TO_LE16 (MSDOS_MBR_SIGNATURE);
pmbr->PartitionRecord[0].OSType = EFI_PMBR_OSTYPE_EFI;
- pmbr->PartitionRecord[0].StartSector = 1;
+ pmbr->PartitionRecord[0].StartSector = 2;
pmbr->PartitionRecord[0].EndHead = 0xFE;
pmbr->PartitionRecord[0].EndSector = 0xFF;
pmbr->PartitionRecord[0].EndTrack = 0xFF;
++++++ libparted-make-BLKRRPART-more-robust.patch ++++++
--- /var/tmp/diff_new_pack.qWY47z/_old 2017-09-04 12:26:08.521395547 +0200
+++ /var/tmp/diff_new_pack.qWY47z/_new 2017-09-04 12:26:08.525394985 +0200
@@ -2,11 +2,9 @@
libparted/arch/linux.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
-Index: parted-3.1/libparted/arch/linux.c
-===================================================================
---- parted-3.1.orig/libparted/arch/linux.c
-+++ parted-3.1/libparted/arch/linux.c
-@@ -40,6 +40,7 @@
+--- a/libparted/arch/linux.c
++++ b/libparted/arch/linux.c
+@@ -39,6 +39,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/utsname.h> /* for uname() */
@@ -14,7 +12,7 @@
#include <scsi/scsi.h>
#include <assert.h>
#ifdef ENABLE_DEVICE_MAPPER
-@@ -2901,14 +2902,15 @@ static int
+@@ -3102,14 +3103,15 @@ static int
_kernel_reread_part_table (PedDevice* dev)
{
LinuxSpecific* arch_specific = LINUX_SPECIFIC (dev);
@@ -33,7 +31,7 @@
if (!retry_count) {
ped_exception_throw (
-@@ -2918,10 +2920,12 @@ _kernel_reread_part_table (PedDevice* de
+@@ -3119,10 +3121,12 @@ _kernel_reread_part_table (PedDevice* de
"table on %s (%s). As a result, it may not "
"reflect all of your changes until after reboot."),
dev->path, strerror (errno));
++++++ libparted-set-swap-flag-on-GPT-partitions.patch ++++++
--- /var/tmp/diff_new_pack.qWY47z/_old 2017-09-04 12:26:08.557390486 +0200
+++ /var/tmp/diff_new_pack.qWY47z/_new 2017-09-04 12:26:08.561389924 +0200
@@ -25,7 +25,7 @@
int raid;
int boot;
int bios_grub;
-@@ -918,7 +919,8 @@ _parse_part_entry (PedDisk *disk, GuidPa
+@@ -818,7 +819,8 @@ _parse_part_entry (PedDisk *disk, GuidPa
gpt_part_data->name[i] = 0;
gpt_part_data->translated_name = 0;
@@ -35,7 +35,7 @@
= gpt_part_data->boot = gpt_part_data->hp_service
= gpt_part_data->hidden = gpt_part_data->msftres
= gpt_part_data->msftdata
-@@ -941,6 +943,8 @@ _parse_part_entry (PedDisk *disk, GuidPa
+@@ -841,6 +843,8 @@ _parse_part_entry (PedDisk *disk, GuidPa
gpt_part_data->raid = 1;
else if (!guid_cmp (gpt_part_data->type, PARTITION_LVM_GUID))
gpt_part_data->lvm = 1;
@@ -44,7 +44,7 @@
else if (!guid_cmp (gpt_part_data->type, PARTITION_HPSERVICE_GUID))
gpt_part_data->hp_service = 1;
else if (!guid_cmp (gpt_part_data->type, PARTITION_MSFT_RESERVED_GUID))
-@@ -1568,6 +1572,7 @@ gpt_partition_new (const PedDisk *disk,
+@@ -1361,6 +1365,7 @@ gpt_partition_new (const PedDisk *disk,
gpt_part_data->type = PARTITION_LINUX_DATA_GUID;
gpt_part_data->lvm = 0;
@@ -52,7 +52,7 @@
gpt_part_data->raid = 0;
gpt_part_data->boot = 0;
gpt_part_data->bios_grub = 0;
-@@ -1656,6 +1661,11 @@ gpt_partition_set_system (PedPartition *
+@@ -1449,6 +1454,11 @@ gpt_partition_set_system (PedPartition *
gpt_part_data->type = PARTITION_LVM_GUID;
return 1;
}
@@ -64,7 +64,7 @@
if (gpt_part_data->raid)
{
gpt_part_data->type = PARTITION_RAID_GUID;
-@@ -1720,11 +1730,6 @@ gpt_partition_set_system (PedPartition *
+@@ -1513,11 +1523,6 @@ gpt_partition_set_system (PedPartition *
gpt_part_data->type = PARTITION_APPLE_HFS_GUID;
return 1;
}
@@ -76,7 +76,7 @@
}
gpt_part_data->type = PARTITION_LINUX_DATA_GUID;
-@@ -1843,6 +1848,7 @@ gpt_partition_set_flag (PedPartition *pa
+@@ -1636,6 +1641,7 @@ gpt_partition_set_flag (PedPartition *pa
if (state)
gpt_part_data->raid
= gpt_part_data->lvm
@@ -84,7 +84,7 @@
= gpt_part_data->bios_grub
= gpt_part_data->hp_service
= gpt_part_data->msftres
-@@ -1857,6 +1863,7 @@ gpt_partition_set_flag (PedPartition *pa
+@@ -1650,6 +1656,7 @@ gpt_partition_set_flag (PedPartition *pa
if (state)
gpt_part_data->raid
= gpt_part_data->lvm
@@ -92,7 +92,7 @@
= gpt_part_data->boot
= gpt_part_data->hp_service
= gpt_part_data->msftres
-@@ -1871,6 +1878,7 @@ gpt_partition_set_flag (PedPartition *pa
+@@ -1664,6 +1671,7 @@ gpt_partition_set_flag (PedPartition *pa
if (state)
gpt_part_data->boot
= gpt_part_data->lvm
@@ -100,7 +100,7 @@
= gpt_part_data->bios_grub
= gpt_part_data->hp_service
= gpt_part_data->msftres
-@@ -1884,6 +1892,22 @@ gpt_partition_set_flag (PedPartition *pa
+@@ -1677,6 +1685,22 @@ gpt_partition_set_flag (PedPartition *pa
gpt_part_data->lvm = state;
if (state)
gpt_part_data->boot
@@ -123,7 +123,7 @@
= gpt_part_data->raid
= gpt_part_data->bios_grub
= gpt_part_data->hp_service
-@@ -1900,6 +1924,7 @@ gpt_partition_set_flag (PedPartition *pa
+@@ -1693,6 +1717,7 @@ gpt_partition_set_flag (PedPartition *pa
gpt_part_data->boot
= gpt_part_data->raid
= gpt_part_data->lvm
@@ -131,7 +131,7 @@
= gpt_part_data->bios_grub
= gpt_part_data->msftres
= gpt_part_data->msftdata
-@@ -1914,6 +1939,7 @@ gpt_partition_set_flag (PedPartition *pa
+@@ -1707,6 +1732,7 @@ gpt_partition_set_flag (PedPartition *pa
gpt_part_data->boot
= gpt_part_data->raid
= gpt_part_data->lvm
@@ -139,7 +139,7 @@
= gpt_part_data->bios_grub
= gpt_part_data->hp_service
= gpt_part_data->msftdata
-@@ -1928,6 +1954,7 @@ gpt_partition_set_flag (PedPartition *pa
+@@ -1721,6 +1747,7 @@ gpt_partition_set_flag (PedPartition *pa
gpt_part_data->boot
= gpt_part_data->raid
= gpt_part_data->lvm
@@ -147,7 +147,7 @@
= gpt_part_data->bios_grub
= gpt_part_data->hp_service
= gpt_part_data->msftres
-@@ -1946,6 +1973,7 @@ gpt_partition_set_flag (PedPartition *pa
+@@ -1739,6 +1766,7 @@ gpt_partition_set_flag (PedPartition *pa
gpt_part_data->boot
= gpt_part_data->raid
= gpt_part_data->lvm
@@ -155,7 +155,7 @@
= gpt_part_data->bios_grub
= gpt_part_data->hp_service
= gpt_part_data->msftdata
-@@ -1960,6 +1988,7 @@ gpt_partition_set_flag (PedPartition *pa
+@@ -1753,6 +1781,7 @@ gpt_partition_set_flag (PedPartition *pa
gpt_part_data->boot
= gpt_part_data->raid
= gpt_part_data->lvm
@@ -163,7 +163,7 @@
= gpt_part_data->bios_grub
= gpt_part_data->hp_service
= gpt_part_data->msftres
-@@ -1973,6 +2002,7 @@ gpt_partition_set_flag (PedPartition *pa
+@@ -1766,6 +1795,7 @@ gpt_partition_set_flag (PedPartition *pa
gpt_part_data->boot
= gpt_part_data->raid
= gpt_part_data->lvm
@@ -171,7 +171,7 @@
= gpt_part_data->bios_grub
= gpt_part_data->hp_service
= gpt_part_data->msftres
-@@ -1986,6 +2016,7 @@ gpt_partition_set_flag (PedPartition *pa
+@@ -1779,6 +1809,7 @@ gpt_partition_set_flag (PedPartition *pa
gpt_part_data->boot
= gpt_part_data->raid
= gpt_part_data->lvm
@@ -179,7 +179,7 @@
= gpt_part_data->bios_grub
= gpt_part_data->hp_service
= gpt_part_data->msftres
-@@ -2000,7 +2031,6 @@ gpt_partition_set_flag (PedPartition *pa
+@@ -1793,7 +1824,6 @@ gpt_partition_set_flag (PedPartition *pa
case PED_PARTITION_LEGACY_BOOT:
gpt_part_data->legacy_boot = state;
return 1;
@@ -187,7 +187,7 @@
case PED_PARTITION_ROOT:
case PED_PARTITION_LBA:
default:
-@@ -2046,6 +2076,7 @@ gpt_partition_get_flag (const PedPartiti
+@@ -1839,6 +1869,7 @@ gpt_partition_get_flag (const PedPartiti
case PED_PARTITION_IRST:
return gpt_part_data->irst;
case PED_PARTITION_SWAP:
@@ -195,7 +195,7 @@
case PED_PARTITION_LBA:
case PED_PARTITION_ROOT:
default:
-@@ -2062,6 +2093,7 @@ gpt_partition_is_flag_available (const P
+@@ -1855,6 +1886,7 @@ gpt_partition_is_flag_available (const P
{
case PED_PARTITION_RAID:
case PED_PARTITION_LVM:
@@ -203,7 +203,7 @@
case PED_PARTITION_BOOT:
case PED_PARTITION_BIOS_GRUB:
case PED_PARTITION_HPSERVICE:
-@@ -2075,7 +2107,6 @@ gpt_partition_is_flag_available (const P
+@@ -1868,7 +1900,6 @@ gpt_partition_is_flag_available (const P
case PED_PARTITION_IRST:
case PED_PARTITION_ESP:
return 1;
1
0
Hello community,
here is the log from the commit of package nghttp2 for openSUSE:Factory checked in at 2017-09-04 12:25:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nghttp2 (Old)
and /work/SRC/openSUSE:Factory/.nghttp2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nghttp2"
Mon Sep 4 12:25:53 2017 rev:44 rq:519099 version:1.25.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/nghttp2/nghttp2.changes 2017-07-21 22:37:56.729670630 +0200
+++ /work/SRC/openSUSE:Factory/.nghttp2.new/nghttp2.changes 2017-09-04 12:25:54.995297214 +0200
@@ -1,0 +2,8 @@
+Mon Aug 28 10:58:52 UTC 2017 - mpluskal(a)suse.com
+
+- Update to version 1.25.0:
+ * lib: add nghttp2_rcbuf_is_static() (Patch from Anna Henningsen) (GH-983)
+ * nghttpx: Fix bug that forwarded for is not affected by proxy protocol (GH-979)
+ * nghttpx: Update mruby to 1.3.0 (GH-957)
+
+-------------------------------------------------------------------
Old:
----
nghttp2-1.24.0.tar.xz
New:
----
nghttp2-1.25.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nghttp2.spec ++++++
--- /var/tmp/diff_new_pack.SBMahh/_old 2017-09-04 12:25:56.179130776 +0200
+++ /var/tmp/diff_new_pack.SBMahh/_new 2017-09-04 12:25:56.187129651 +0200
@@ -21,7 +21,7 @@
%define soname_asio libnghttp2_asio
%define sover_asio 1
Name: nghttp2
-Version: 1.24.0
+Version: 1.25.0
Release: 0
Summary: Implementation of Hypertext Transfer Protocol version 2 in C
License: MIT
++++++ nghttp2-1.24.0.tar.xz -> nghttp2-1.25.0.tar.xz ++++++
++++ 27621 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package libzip for openSUSE:Factory checked in at 2017-09-04 12:25:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libzip (Old)
and /work/SRC/openSUSE:Factory/.libzip.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzip"
Mon Sep 4 12:25:44 2017 rev:29 rq:519094 version:1.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libzip/libzip.changes 2017-06-30 18:38:03.366470801 +0200
+++ /work/SRC/openSUSE:Factory/.libzip.new/libzip.changes 2017-09-04 12:25:48.924150770 +0200
@@ -1,0 +2,7 @@
+Mon Aug 28 10:38:05 UTC 2017 - pgajdos(a)suse.com
+
+- security update:
+ * CVE-2017-12858 [bsc#1055377]
+ + libzip-CVE-2017-12858.patch
+
+-------------------------------------------------------------------
New:
----
libzip-CVE-2017-12858.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzip.spec ++++++
--- /var/tmp/diff_new_pack.pVNFpO/_old 2017-09-04 12:25:50.203970837 +0200
+++ /var/tmp/diff_new_pack.pVNFpO/_new 2017-09-04 12:25:50.207970274 +0200
@@ -28,6 +28,7 @@
Source1: baselibs.conf
# PATCH-FIX-OPENSUSE: close on exec, upstream is aware, will be probably fixes next release
Patch1: libzip-ocloexec.patch
+Patch2: libzip-CVE-2017-12858.patch
BuildRequires: libtool
BuildRequires: pkgconfig
# for tests
@@ -80,6 +81,7 @@
%prep
%setup -q
%patch1 -p1
+%patch2 -p1
%build
%configure \
++++++ libzip-CVE-2017-12858.patch ++++++
--- a/lib/zip_dirent.c
+++ b/lib/zip_dirent.c
@@ -579,9 +579,6 @@ _zip_dirent_read(zip_dirent_t *zde, zip_source_t *src, zip_buffer_t *buffer, boo
}
if (!_zip_dirent_process_winzip_aes(zde, error)) {
- if (!from_buffer) {
- _zip_buffer_free(buffer);
- }
return -1;
}
1
0
Hello community,
here is the log from the commit of package jsoncpp for openSUSE:Factory checked in at 2017-09-04 12:25:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jsoncpp (Old)
and /work/SRC/openSUSE:Factory/.jsoncpp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jsoncpp"
Mon Sep 4 12:25:29 2017 rev:19 rq:519093 version:1.8.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/jsoncpp/jsoncpp.changes 2017-07-17 09:01:56.453823496 +0200
+++ /work/SRC/openSUSE:Factory/.jsoncpp.new/jsoncpp.changes 2017-09-04 12:25:31.282631024 +0200
@@ -1,0 +2,9 @@
+Mon Aug 28 10:32:13 UTC 2017 - mpluskal(a)suse.com
+
+- Update to version 1.8.2:
+ * Some C++ "move" operators.
+ * Fix uninitialized value detected by valgrind.
+ * Other minor improvements.
+ * Moved most READ docs to Wiki.
+
+-------------------------------------------------------------------
Old:
----
jsoncpp-1.8.1.tar.gz
New:
----
jsoncpp-1.8.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jsoncpp.spec ++++++
--- /var/tmp/diff_new_pack.U7zqCs/_old 2017-09-04 12:25:32.654438160 +0200
+++ /var/tmp/diff_new_pack.U7zqCs/_new 2017-09-04 12:25:32.670435911 +0200
@@ -18,7 +18,7 @@
%define sover 11
Name: jsoncpp
-Version: 1.8.1
+Version: 1.8.2
Release: 0
Summary: C++ library that allows manipulating with JSON
License: MIT
@@ -92,7 +92,7 @@
%{_libdir}/lib%{name}.so.%{version}
%files devel
-%doc AUTHORS LICENSE NEWS.txt README.md
+%doc AUTHORS LICENSE README.md
%{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/cmake/%{name}
%{_libdir}/lib%{name}.so
++++++ jsoncpp-1.8.1.tar.gz -> jsoncpp-1.8.2.tar.gz ++++++
++++ 1881 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package python-construct for openSUSE:Factory checked in at 2017-09-04 12:25:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-construct (Old)
and /work/SRC/openSUSE:Factory/.python-construct.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-construct"
Mon Sep 4 12:25:15 2017 rev:9 rq:518920 version:2.8.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-construct/python-construct.changes 2017-05-09 17:59:45.557640890 +0200
+++ /work/SRC/openSUSE:Factory/.python-construct.new/python-construct.changes 2017-09-04 12:25:24.559576230 +0200
@@ -1,0 +2,15 @@
+Sat Aug 26 16:52:44 UTC 2017 - jengelh(a)inai.de
+
+- Rewrite description for more neutrality.
+
+-------------------------------------------------------------------
+Thu Aug 24 07:24:54 UTC 2017 - tbechtold(a)suse.com
+
+- update to 2.8.12:
+ * README and docs updated
+ * Version uped to 2.8.12
+ * Union: fixed buildfrom (bug #348)
+ * Docs updated: API reference
+ * Prefixed instead of Array (#349)
+
+-------------------------------------------------------------------
Old:
----
construct-2.8.11.tar.gz
New:
----
construct-2.8.12.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-construct.spec ++++++
--- /var/tmp/diff_new_pack.TXAJ3Q/_old 2017-09-04 12:25:26.715273157 +0200
+++ /var/tmp/diff_new_pack.TXAJ3Q/_new 2017-09-04 12:25:26.731270908 +0200
@@ -18,9 +18,9 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-construct
-Version: 2.8.11
+Version: 2.8.12
Release: 0
-Summary: A powerful declarative parser/builder for binary data
+Summary: A declarative parser/builder for binary data
License: MIT
Group: Development/Languages/Python
Url: http://construct.readthedocs.org
@@ -37,12 +37,12 @@
%python_subpackages
%description
-Construct is a powerful declarative parser (and builder) for binary data.
+Construct is a declarative parser (and builder) for binary data.
-Instead of writing imperative code to parse a piece of data, you declaratively
-define a data structure that describes your data. As this data structure is not
-code, you can use it in one direction to parse data into Pythonic objects,
-and in the other direction, convert ("build") objects into binary data.
+Instead of writing imperative code to parse a piece of data, a data
+structure that describes the data is declared. As this data structure is not
+code, it can be used in one direction to parse data into Pythonic objects,
+and in the other direction to convert ("build") objects into binary data.
%prep
%setup -q -n construct-%{version}
++++++ construct-2.8.11.tar.gz -> construct-2.8.12.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/README.rst new/construct-2.8.12/README.rst
--- old/construct-2.8.11/README.rst 2017-04-05 23:02:36.000000000 +0200
+++ new/construct-2.8.12/README.rst 2017-04-25 00:35:54.000000000 +0200
@@ -3,7 +3,7 @@
Construct is a powerful **declarative** parser (and builder) for binary data.
-Instead of writing *imperative code* to parse a piece of data, you declaratively define a *data structure* that describes your data. As this data structure is not code, you can use it in one direction to *parse* data into Pythonic objects, and in the other direction, build objects into binary data.
+Instead of writing *imperative code* to parse a piece of data, you declaratively define a *data structure* that describes your data. As this data structure is not code, you can use it in one direction to *parse* data into Pythonic objects, and in the other direction, to *build* objects into binary data.
The library provides both simple, atomic constructs (such as integers of various sizes), as well as composite ones which allow you form hierarchical and sequential structures of increasing complexity. Construct features **bit and byte granularity**, easy debugging and testing, an **easy-to-extend subclass system**, and lots of primitive constructs to make your work easier:
@@ -47,7 +47,7 @@
Sticky
--------
-Version 2.5.5 is the previous stable release. If you are maintaining a project that depended on this framework for a long time, you should probably use this version. This branch is not actively maintained. Even bugfixes are not being added.
+Version 2.5.5 is the previous stable release. If you are maintaining a project that depended on this framework for a long time, you should probably use this version. This branch is not actively maintained.
Version 2.8 was released September, 2016. There are significant API and implementation changes. Fields are now name-less and operators / >> are used to construct Structs and Sequences. Most classes were redesigned and reimplemented. You should read the documentation again.
@@ -58,7 +58,7 @@
Construct's main documentation is at `construct.readthedocs.org <http://construct.readthedocs.org>`_, where you can find all kinds of examples. The library itself is developed on `github <https://github.com/construct/construct>`_. Releases are also available on `pypi <https://pypi.python.org/pypi/construct>`_.
-`Construct3 <http://tomerfiliba.com/blog/Survey-of-Construct3/>`_ is a different project. It is a rewrite from scratch and belongs to another developer, it diverged from this project. As far as I can tell, it was not released yet.
+`Construct3 <http://tomerfiliba.com/blog/Survey-of-Construct3/>`_ is a different project. It is a rewrite from scratch and belongs to another developer, it diverged from this project. As far as I can tell, it was not released and abandonded.
Requirements
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/construct/core.py new/construct-2.8.12/construct/core.py
--- old/construct-2.8.11/construct/core.py 2017-04-05 23:02:36.000000000 +0200
+++ new/construct-2.8.12/construct/core.py 2017-04-25 00:35:54.000000000 +0200
@@ -1089,10 +1089,10 @@
def PrefixedArray(lengthfield, subcon):
r"""
- An array prefixed by a length field (as opposed to preixed by byte count, see :func:`~construct.core.Array`).
+ An array prefixed by a length field (as opposed to prefixed by byte count, see :func:`~construct.core.Prefixed`).
- :param lengthfield: a field parsing and building an integer
- :param subcon: the subcon to process individual elements
+ :param lengthfield: field parsing and building an integer
+ :param subcon: subcon to process individual elements
Example::
@@ -1329,9 +1329,9 @@
r"""
Treats the same data as multiple constructs (similar to C union statement) so you can "look" at the data in multiple views.
- When parsing, all fields read the same data bytes, but stream remains at same offset by default, unless buildfrom selects a subcon. When building, either the first subcon that can find an entry in given dict is allowed to put into the stream, or the subcon is selected by index or name, or builds nothing.
+ When parsing, all fields read the same data bytes, but stream remains at initial offset by default, unless buildfrom selects a subcon. When building, either the first subcon that can find an entry in given dict is allowed to put into the stream, or the subcon is selected by index or name, or builds nothing.
- WARNING: If you skip the `buildfrom` parameter then parsing will not advance the stream, because subcons can be of different sizes.
+ .. warning:: If you skip the `buildfrom` parameter then parsing will not advance the stream, because subcons can be of different sizes.
:param subcons: subconstructs (order and name sensitive)
:param buildfrom: optional, how to build, the subcon used for building and calculating size, can be integer index or string name selecting a subcon, None (then tries each subcon in sequence, the default), Pass (builds nothing), a context lambda returning either of previously mentioned
@@ -1347,7 +1347,7 @@
b'\x00\x01\x02\x03\x04\x05\x06\x07'
Note that this syntax works ONLY on python 3.6 due to unordered keyword arguments:
- >>> Union(raw=Bytes(8), ints=Int32ub[2], shorts=Int16ub[4], chars=Byte[8], buildfrom=3)
+ >>> Union(raw=Bytes(8), ints=Int32ub[2], shorts=Int16ub[4], chars=Int8ub[8], buildfrom=3)
"""
__slots__ = ["subcons","buildfrom"]
def __init__(self, *subcons, **kw):
@@ -1356,11 +1356,13 @@
if k not in ["buildfrom"]:
subcons.append(k / v)
super(Union, self).__init__()
- self.subcons = [Peek(sc) for sc in subcons]
+ self.subcons = subcons
self.buildfrom = kw.get("buildfrom")
def _parse(self, stream, context, path):
obj = Container()
context = Container(_ = context)
+ fallback = stream.tell()
+ forwards = {}
for i,sc in enumerate(self.subcons):
if sc.flagembedded:
subobj = list(sc._parse(stream, context, path).items())
@@ -1371,24 +1373,25 @@
if sc.name is not None:
obj[sc.name] = subobj
context[sc.name] = subobj
- if callable(self.buildfrom):
- self.buildfrom = self.buildfrom(context)
- if isinstance(self.buildfrom, int):
- jump = self.subcons[self.buildfrom].subcon._sizeof(context, path)
- stream.seek(jump, 1)
- if isinstance(self.buildfrom, str):
- index = [i for i,sc in enumerate(self.subcons) if sc.name == self.buildfrom][0]
- jump = self.subcons[index].subcon._sizeof(context, path)
- stream.seek(jump, 1)
+ forwards[i] = stream.tell()
+ if sc.name is not None:
+ forwards[sc.name] = stream.tell()
+ stream.seek(fallback)
+ buildfrom = self.buildfrom
+ if callable(buildfrom):
+ buildfrom = buildfrom(context)
+ if isinstance(buildfrom, (int,str)):
+ stream.seek(forwards[buildfrom])
return obj
def _build(self, obj, stream, context, path):
context = Container(_ = context)
context.update(obj)
- if callable(self.buildfrom):
- self.buildfrom = self.buildfrom(context)
- if self.buildfrom is Pass:
+ buildfrom = self.buildfrom
+ if callable(buildfrom):
+ buildfrom = buildfrom(context)
+ if buildfrom is Pass:
return
- if self.buildfrom is None:
+ if buildfrom is None:
for i,sc in enumerate(self.subcons):
if sc.subcon.flagbuildnone:
subobj = obj.get(sc.name, None)
@@ -1410,31 +1413,32 @@
return buildret
else:
raise UnionError("none of subcons %s were found in the dictionary %s" % (self.subcons, obj))
- if isinstance(self.buildfrom, int):
- sc = self.subcons[self.buildfrom]
- # pass the full object if building an embedded union member
+ if isinstance(buildfrom, int):
+ sc = self.subcons[buildfrom]
obj2 = obj if sc.flagembedded else obj[sc.name]
- return sc.subcon._build(obj2, stream, context, path)
+ return sc._build(obj2, stream, context, path)
if isinstance(self.buildfrom, str):
- index = [i for i,sc in enumerate(self.subcons) if sc.name == self.buildfrom][0]
- sc = self.subcons[index]
- return sc.subcon._build(obj[sc.name], stream, context, path)
+ sc = {sc.name:sc for sc in self.subcons if sc.name is not None}[buildfrom]
+ obj2 = obj if sc.flagembedded else obj[sc.name]
+ return sc._build(obj2, stream, context, path)
raise UnionError("buildfrom should be either: None, Pass, an int, a str")
def _sizeof(self, context, path):
+ buildfrom = self.buildfrom
try:
- if callable(self.buildfrom):
- self.buildfrom = self.buildfrom(context)
+ if callable(buildfrom):
+ buildfrom = buildfrom(context)
except (KeyError, AttributeError):
raise SizeofError("cannot calculate size, key not found in context")
- if self.buildfrom is Pass:
+ if buildfrom is Pass:
return 0
- if self.buildfrom is None:
+ if buildfrom is None:
raise SizeofError("cannot calculate size")
- if isinstance(self.buildfrom, int):
- return self.subcons[self.buildfrom].subcon._sizeof(context, path)
- if isinstance(self.buildfrom, str):
- index = [i for i,sc in enumerate(self.subcons) if sc.name == self.buildfrom][0]
- return self.subcons[index].subcon._sizeof(context, path)
+ if isinstance(buildfrom, int):
+ sc = self.subcons[buildfrom]
+ return sc._sizeof(context, path)
+ if isinstance(buildfrom, str):
+ sc = {sc.name:sc for sc in self.subcons if sc.name is not None}[buildfrom]
+ return sc._sizeof(context, path)
raise UnionError("buildfrom should be either: None, Pass, an int, a str")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/construct/version.py new/construct-2.8.12/construct/version.py
--- old/construct-2.8.11/construct/version.py 2017-04-05 23:02:36.000000000 +0200
+++ new/construct-2.8.12/construct/version.py 2017-04-25 00:35:54.000000000 +0200
@@ -1,3 +1,3 @@
-version = (2, 8, 11)
-version_string = "2.8.11"
-release_date = "2017.04.05"
+version = (2, 8, 12)
+version_string = "2.8.12"
+release_date = "2017.04.25"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/docs/api/align.rst new/construct-2.8.12/docs/api/align.rst
--- old/construct-2.8.11/docs/api/align.rst 1970-01-01 01:00:00.000000000 +0100
+++ new/construct-2.8.12/docs/api/align.rst 2017-04-25 00:35:54.000000000 +0200
@@ -0,0 +1,7 @@
+===============================
+Core API: Alignment and Padding
+===============================
+
+.. autofunction:: construct.Padding
+.. autofunction:: construct.Padded
+.. autofunction:: construct.Aligned
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/docs/api/bytes.rst new/construct-2.8.12/docs/api/bytes.rst
--- old/construct-2.8.11/docs/api/bytes.rst 2017-04-05 23:02:36.000000000 +0200
+++ new/construct-2.8.12/docs/api/bytes.rst 2017-04-25 00:35:54.000000000 +0200
@@ -3,12 +3,7 @@
========================
.. autofunction:: construct.Bytes
-
.. autofunction:: construct.GreedyBytes
-
.. autofunction:: construct.Bitwise
-
.. autofunction:: construct.BytesInteger
-
.. autofunction:: construct.BitsInteger
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/docs/api/debugging.rst new/construct-2.8.12/docs/api/debugging.rst
--- old/construct-2.8.11/docs/api/debugging.rst 2017-04-05 23:02:36.000000000 +0200
+++ new/construct-2.8.12/docs/api/debugging.rst 2017-04-25 00:35:54.000000000 +0200
@@ -3,6 +3,4 @@
================================
.. automodule:: construct.debug
-
.. autofunction:: construct.Error
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/docs/api/lazy.rst new/construct-2.8.12/docs/api/lazy.rst
--- old/construct-2.8.11/docs/api/lazy.rst 2017-04-05 23:02:36.000000000 +0200
+++ new/construct-2.8.12/docs/api/lazy.rst 2017-04-25 00:35:54.000000000 +0200
@@ -3,15 +3,8 @@
===============================
.. autofunction:: construct.LazyStruct
-
.. autofunction:: construct.LazySequence
-
.. autofunction:: construct.LazyRange
-
.. autofunction:: construct.OnDemand
-
.. autofunction:: construct.OnDemandPointer
-
.. autofunction:: construct.LazyBound
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/docs/api/lib.rst new/construct-2.8.12/docs/api/lib.rst
--- old/construct-2.8.11/docs/api/lib.rst 2017-04-05 23:02:36.000000000 +0200
+++ new/construct-2.8.12/docs/api/lib.rst 2017-04-25 00:35:54.000000000 +0200
@@ -3,4 +3,3 @@
==========================================
.. automodule:: construct.lib
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/docs/api/misc.rst new/construct-2.8.12/docs/api/misc.rst
--- old/construct-2.8.11/docs/api/misc.rst 1970-01-01 01:00:00.000000000 +0100
+++ new/construct-2.8.12/docs/api/misc.rst 2017-04-25 00:35:54.000000000 +0200
@@ -0,0 +1,12 @@
+===============================
+Core API: Miscellaneous
+===============================
+
+.. autofunction:: construct.Const
+.. autofunction:: construct.Computed
+.. autofunction:: construct.Numpy
+.. autofunction:: construct.NamedTuple
+.. autofunction:: construct.Rebuild
+.. autofunction:: construct.Check
+.. autofunction:: construct.FocusedSeq
+.. autofunction:: construct.Default
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/docs/api/repeaters.rst new/construct-2.8.12/docs/api/repeaters.rst
--- old/construct-2.8.11/docs/api/repeaters.rst 2017-04-05 23:02:36.000000000 +0200
+++ new/construct-2.8.12/docs/api/repeaters.rst 2017-04-25 00:35:54.000000000 +0200
@@ -2,15 +2,8 @@
Core API: Repeaters
==========================================
-
.. autofunction:: construct.Array
-
.. autofunction:: construct.PrefixedArray
-
.. autofunction:: construct.Range
-
.. autofunction:: construct.GreedyRange
-
.. autofunction:: construct.RepeatUntil
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/docs/api/streaming.rst new/construct-2.8.12/docs/api/streaming.rst
--- old/construct-2.8.11/docs/api/streaming.rst 2017-04-05 23:02:36.000000000 +0200
+++ new/construct-2.8.12/docs/api/streaming.rst 2017-04-25 00:35:54.000000000 +0200
@@ -3,15 +3,10 @@
===============================
.. autofunction:: construct.Pointer
-
.. autofunction:: construct.Peek
-
.. autofunction:: construct.Tell
-
.. autofunction:: construct.Seek
-
+.. autofunction:: construct.Pass
+.. autofunction:: construct.Terminated
.. autofunction:: construct.Restreamed
-
.. autofunction:: construct.Rebuffered
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/docs/api/strings.rst new/construct-2.8.12/docs/api/strings.rst
--- old/construct-2.8.11/docs/api/strings.rst 2017-04-05 23:02:36.000000000 +0200
+++ new/construct-2.8.12/docs/api/strings.rst 2017-04-25 00:35:54.000000000 +0200
@@ -3,12 +3,7 @@
===================
.. autofunction:: construct.setglobalstringencoding
-
.. autofunction:: construct.String
-
.. autofunction:: construct.PascalString
-
.. autofunction:: construct.CString
-
.. autofunction:: construct.GreedyString
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/docs/api/structs.rst new/construct-2.8.12/docs/api/structs.rst
--- old/construct-2.8.11/docs/api/structs.rst 1970-01-01 01:00:00.000000000 +0100
+++ new/construct-2.8.12/docs/api/structs.rst 2017-04-25 00:35:54.000000000 +0200
@@ -0,0 +1,17 @@
+===============================
+Core API: Structs and Sequences
+===============================
+
+.. autofunction:: construct.Struct
+.. autofunction:: construct.Sequence
+.. autofunction:: construct.Embedded
+.. autofunction:: construct.StopIf
+.. autofunction:: construct.Union
+.. autofunction:: construct.Select
+.. autofunction:: construct.Optional
+.. autofunction:: construct.If
+.. autofunction:: construct.IfThenElse
+.. autofunction:: construct.Switch
+.. autofunction:: construct.AlignedStruct
+.. autofunction:: construct.BitStruct
+.. autofunction:: construct.EmbeddedBitStruct
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/docs/api/structseq.rst new/construct-2.8.12/docs/api/structseq.rst
--- old/construct-2.8.11/docs/api/structseq.rst 2017-04-05 23:02:36.000000000 +0200
+++ new/construct-2.8.12/docs/api/structseq.rst 1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-===============================
-Core API: Structs and Sequences
-===============================
-
-.. autofunction:: construct.Struct
-
-.. autofunction:: construct.Sequence
-
-.. autofunction:: construct.Embedded
-
-.. autofunction:: construct.StopIf
-
-.. autofunction:: construct.AlignedStruct
-
-.. autofunction:: construct.BitStruct
-
-.. autofunction:: construct.EmbeddedBitStruct
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/docs/api/tunneling.rst new/construct-2.8.12/docs/api/tunneling.rst
--- old/construct-2.8.11/docs/api/tunneling.rst 2017-04-05 23:02:36.000000000 +0200
+++ new/construct-2.8.12/docs/api/tunneling.rst 2017-04-25 00:35:54.000000000 +0200
@@ -3,15 +3,8 @@
===============================
.. autofunction:: construct.RawCopy
-
.. autofunction:: construct.ByteSwapped
-
.. autofunction:: construct.BitsSwapped
-
.. autofunction:: construct.Prefixed
-
.. autofunction:: construct.Checksum
-
.. autofunction:: construct.Compressed
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/docs/index.rst new/construct-2.8.12/docs/index.rst
--- old/construct-2.8.11/docs/index.rst 2017-04-05 23:02:36.000000000 +0200
+++ new/construct-2.8.12/docs/index.rst 2017-04-25 00:35:54.000000000 +0200
@@ -37,19 +37,19 @@
<strong>Sticky</strong><br/>
- <a class="reference external" href="https://github.com/construct/construct/releases">Version 2.5.5</a> is the previous stable release. If you are maintaining a project that depended on this framework for a long time, you should probably use this version. This branch is not actively maintained. Only bugfixes will be added.<br/>
+ <a class="reference external" href="https://github.com/construct/construct/releases">Version 2.5.5</a> is the previous stable release. If you are maintaining a project that depended on this library for a long time, you should probably use this version. This branch is not actively maintained.<br/>
<br/>
- <a class="reference external" href="https://github.com/construct/construct/releases">Version 2.8</a> was released on September, 2016. There are significant API and implementation changes. Fields are now name-less and operators / >> are used to construct Structs and Sequences. Most classes were redesigned and reimplemented. You should read the documentation again.<br/>
+ <a class="reference external" href="https://github.com/construct/construct/releases">Version 2.8</a> was released on September, 2016. There are significant API and implementation changes. Fields are now name-less and operators / >> are used to construct Structs and Sequences. Most classes changed interface and behavior. You should read the documentation again.<br/>
<br/>
- Please use the <a class="reference external" href="https://github.com/construct/construct/issues">github issues</a> to ask general questions, make feature requests, report issues and bugs, and to send in patches.<br/>
+ Please use the <a class="reference external" href="https://github.com/construct/construct/issues">github issues</a> to ask general questions, make feature requests, report issues and bugs, and to send in patches. Good quality extensions to test suite are highly welcomed.<br/>
</div>
Construct is a powerful **declarative** parser (and builder) for binary data.
-Instead of writing *imperative code* to parse a piece of data, you declaratively define a *data structure* that describes your data. As this data structure is not code, you can use it in one direction to *parse* data into Pythonic objects, and in the other direction, build objects into binary data.
+Instead of writing *imperative code* to parse a piece of data, you declaratively define a *data structure* that describes your data. As this data structure is not code, you can use it in one direction to *parse* data into Pythonic objects, and in the other direction, to *build* objects into binary data.
The library provides both simple, atomic constructs (such as integers of various sizes), as well as composite ones which allow you form hierarchical and sequential structures of increasing complexity. Construct features **bit and byte granularity**, easy debugging and testing, an **easy-to-extend subclass system**, and lots of primitive constructs to make your work easier:
@@ -97,7 +97,7 @@
Construct's main documentation is at `construct.readthedocs.org <http://construct.readthedocs.org>`_, where you can find all kinds of examples. The library itself is developed on `github <https://github.com/construct/construct>`_. Releases are also available on `pypi <https://pypi.python.org/pypi/construct>`_.
-`Construct3 <http://tomerfiliba.com/blog/Survey-of-Construct3/>`_ is a different project. It is a rewrite from scratch and belongs to another developer, it diverged from this project. As far as I can tell, it was not released yet.
+`Construct3 <http://tomerfiliba.com/blog/Survey-of-Construct3/>`_ is a different project. It is a rewrite from scratch and belongs to another developer, it diverged from this project. As far as I can tell, it was not released and abandoned.
Requirements
@@ -135,9 +135,11 @@
api/bytes
api/strings
- api/structseq
+ api/structs
api/repeaters
api/lazy
+ api/misc
+ api/align
api/streaming
api/tunneling
api/debugging
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/construct-2.8.11/tests/test_all.py new/construct-2.8.12/tests/test_all.py
--- old/construct-2.8.11/tests/test_all.py 2017-04-05 23:02:36.000000000 +0200
+++ new/construct-2.8.12/tests/test_all.py 2017-04-25 00:35:54.000000000 +0200
@@ -671,15 +671,17 @@
assert Union("a"/Bytes(2), "b"/Int16ub, buildfrom="a").build(dict(a=b"zz",b=5)) == b"zz"
assert Union("a"/Bytes(2), "b"/Int16ub, buildfrom="b").build(dict(a=b"zz",b=5)) == b"\x00\x05"
assert Union("a"/Bytes(2), "b"/Int16ub, buildfrom=Pass).build({}) == b""
- assert raises(Union(Pass, buildfrom=123).parse, b"") == IndexError
- assert raises(Union(Pass, buildfrom="missing").build, {}) == IndexError
+ assert raises(Union(Pass, buildfrom=123).parse, b"") == KeyError
+ assert raises(Union(Pass, buildfrom="missing").parse, b"") == KeyError
+ assert raises(Union(Pass, buildfrom=123).build, {}) == IndexError
+ assert raises(Union(Pass, buildfrom="missing").build, {}) == KeyError
assert raises(Union(Byte).sizeof) == SizeofError
assert raises(Union(VarInt).sizeof) == SizeofError
assert Union(Byte, VarInt, buildfrom=0).sizeof() == 1
assert raises(Union(Byte, VarInt, buildfrom=1).sizeof) == SizeofError
assert raises(Union(Pass, buildfrom=123).sizeof) == IndexError
- assert raises(Union(Pass, buildfrom="missing").sizeof) == IndexError
+ assert raises(Union(Pass, buildfrom="missing").sizeof) == KeyError
assert raises(Union(Pass, buildfrom=this.missing).sizeof) == SizeofError
assert (Union("b"/Int16ub) >> Byte).parse(b"\x01\x02\x03") == [Container(b=0x0102),0x01]
@@ -701,6 +703,14 @@
assert st.parse(b"\x01\x02\x03\x04") == Container(a=0x01,b=0x0102,c=0x01020304)
assert st.build(Container(c=0x01020304)) == b"\x01\x02\x03\x04"
+ def test_union_issue_348(self):
+ u = Union(
+ Int8=Prefixed(Int16ub, Int8ub[:]),
+ Int16=Prefixed(Int16ub, Int16ub[:]),
+ Int32=Prefixed(Int16ub, Int32ub[:]),
+ buildfrom=0)
+ assert u.parse(b'\x00\x04\x11\x22\x33\x44') == {'Int16': [4386, 13124], 'Int32': [287454020], 'Int8': [17, 34, 51, 68]}
+
def test_prefixed(self):
assert Prefixed(Byte, Int16ul).parse(b"\x02\xff\xff??????") == 65535
assert Prefixed(Byte, Int16ul).build(65535) == b"\x02\xff\xff"
1
0
Hello community,
here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2017-09-04 12:25:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk"
Mon Sep 4 12:25:08 2017 rev:88 rq:518880 version:1.7.0.151
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk-bootstrap.changes 2017-08-13 14:53:41.339107681 +0200
+++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes 2017-09-04 12:25:10.833505998 +0200
@@ -1,0 +2,7 @@
+Sat Aug 26 10:37:11 UTC 2017 - fstrba(a)suse.com
+
+- Added patch:
+ * fix-aarch64-build.patch
+ - Fix build breakage in aarch64 port
+
+-------------------------------------------------------------------
java-1_7_0-openjdk.changes: same change
New:
----
fix-aarch64-build.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.lgtb3g/_old 2017-09-04 12:25:13.297159629 +0200
+++ /var/tmp/diff_new_pack.lgtb3g/_new 2017-09-04 12:25:13.301159067 +0200
@@ -201,6 +201,7 @@
# remove unsused definition of min conflicting with macro
Patch201: aarch64-remove-unused-code.patch
Patch202: no-exec-shield-workaround.patch
+Patch203: fix-aarch64-build.patch
#
# Optional component packages
#
@@ -632,6 +633,7 @@
patch -p0 -i %{PATCH200}
patch -p0 -i %{PATCH201}
patch -p0 -i %{PATCH202}
+patch -p0 -i %{PATCH203}
%if ! %{with zero}
patch -p0 -i %{PATCH403}
java-1_7_0-openjdk.spec: same change
++++++ fix-aarch64-build.patch ++++++
--- openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad Tue Jul 04 21:23:37 2017 +0100
+++ openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad Tue Aug 22 18:17:20 2017 +0100
@@ -1540,10 +1540,14 @@
return 0;
}
-bool Matcher::is_short_branch_offset(int rule, int br_size, int offset)
-{
- Unimplemented();
- return false;
+// Is this branch offset short enough that a short branch can be used?
+//
+// NOTE: If the platform does not provide any short branch variants, then
+// this method should return false for offset 0.
+bool Matcher::is_short_branch_offset(int rule, int br_size, int offset) {
+ // The passed offset is relative to address of the branch.
+
+ return (-32768 <= offset && offset < 32768);
}
const bool Matcher::isSimpleConstant64(jlong value) {
@@ -11153,7 +11157,8 @@
// Test bit and Branch
-instruct cmpL_branch_sign(cmpOp cmp, iRegL op1, immL0 op2, label labl, rFlagsReg cr) %{
+// Patterns for short (< 32KiB) variants
+instruct cmpL_branch_sign(cmpOp cmp, iRegL op1, immL0 op2, label labl) %{
match(If cmp (CmpL op1 op2));
predicate(n->in(1)->as_Bool()->_test._test == BoolTest::lt
|| n->in(1)->as_Bool()->_test._test == BoolTest::ge);
@@ -11163,16 +11168,15 @@
format %{ "cb$cmp $op1, $labl # long" %}
ins_encode %{
Label* L = $labl$$label;
- Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode;
- if (cond == Assembler::LT)
- __ tbnz($op1$$Register, 63, *L);
- else
- __ tbz($op1$$Register, 63, *L);
+ Assembler::Condition cond =
+ ((Assembler::Condition)$cmp$$cmpcode == Assembler::LT) ? Assembler::NE : Assembler::EQ;
+ __ tbr(cond, $op1$$Register, 63, *L);
%}
ins_pipe(pipe_cmp_branch);
-%}
-
-instruct cmpI_branch_sign(cmpOp cmp, iRegIorL2I op1, immI0 op2, label labl, rFlagsReg cr) %{
+ ins_short_branch(1);
+%}
+
+instruct cmpI_branch_sign(cmpOp cmp, iRegIorL2I op1, immI0 op2, label labl) %{
match(If cmp (CmpI op1 op2));
predicate(n->in(1)->as_Bool()->_test._test == BoolTest::lt
|| n->in(1)->as_Bool()->_test._test == BoolTest::ge);
@@ -11182,16 +11186,15 @@
format %{ "cb$cmp $op1, $labl # int" %}
ins_encode %{
Label* L = $labl$$label;
- Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode;
- if (cond == Assembler::LT)
- __ tbnz($op1$$Register, 31, *L);
- else
- __ tbz($op1$$Register, 31, *L);
+ Assembler::Condition cond =
+ ((Assembler::Condition)$cmp$$cmpcode == Assembler::LT) ? Assembler::NE : Assembler::EQ;
+ __ tbr(cond, $op1$$Register, 31, *L);
%}
ins_pipe(pipe_cmp_branch);
-%}
-
-instruct cmpL_branch_bit(cmpOp cmp, iRegL op1, immL op2, immL0 op3, label labl, rFlagsReg cr) %{
+ ins_short_branch(1);
+%}
+
+instruct cmpL_branch_bit(cmpOp cmp, iRegL op1, immL op2, immL0 op3, label labl) %{
match(If cmp (CmpL (AndL op1 op2) op3));
predicate((n->in(1)->as_Bool()->_test._test == BoolTest::ne
|| n->in(1)->as_Bool()->_test._test == BoolTest::eq)
@@ -11204,15 +11207,13 @@
Label* L = $labl$$label;
Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode;
int bit = exact_log2($op2$$constant);
- if (cond == Assembler::EQ)
- __ tbz($op1$$Register, bit, *L);
- else
- __ tbnz($op1$$Register, bit, *L);
+ __ tbr(cond, $op1$$Register, bit, *L);
%}
ins_pipe(pipe_cmp_branch);
-%}
-
-instruct cmpI_branch_bit(cmpOp cmp, iRegIorL2I op1, immI op2, immI0 op3, label labl, rFlagsReg cr) %{
+ ins_short_branch(1);
+%}
+
+instruct cmpI_branch_bit(cmpOp cmp, iRegIorL2I op1, immI op2, immI0 op3, label labl) %{
match(If cmp (CmpI (AndI op1 op2) op3));
predicate((n->in(1)->as_Bool()->_test._test == BoolTest::ne
|| n->in(1)->as_Bool()->_test._test == BoolTest::eq)
@@ -11225,10 +11226,79 @@
Label* L = $labl$$label;
Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode;
int bit = exact_log2($op2$$constant);
- if (cond == Assembler::EQ)
- __ tbz($op1$$Register, bit, *L);
- else
- __ tbnz($op1$$Register, bit, *L);
+ __ tbr(cond, $op1$$Register, bit, *L);
+ %}
+ ins_pipe(pipe_cmp_branch);
+ ins_short_branch(1);
+%}
+
+// And far variants
+instruct far_cmpL_branch_sign(cmpOp cmp, iRegL op1, immL0 op2, label labl) %{
+ match(If cmp (CmpL op1 op2));
+ predicate(n->in(1)->as_Bool()->_test._test == BoolTest::lt
+ || n->in(1)->as_Bool()->_test._test == BoolTest::ge);
+ effect(USE labl);
+
+ ins_cost(BRANCH_COST);
+ format %{ "cb$cmp $op1, $labl # long" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Condition cond =
+ ((Assembler::Condition)$cmp$$cmpcode == Assembler::LT) ? Assembler::NE : Assembler::EQ;
+ __ tbr(cond, $op1$$Register, 63, *L, /*far*/true);
+ %}
+ ins_pipe(pipe_cmp_branch);
+%}
+
+instruct far_cmpI_branch_sign(cmpOp cmp, iRegIorL2I op1, immI0 op2, label labl) %{
+ match(If cmp (CmpI op1 op2));
+ predicate(n->in(1)->as_Bool()->_test._test == BoolTest::lt
+ || n->in(1)->as_Bool()->_test._test == BoolTest::ge);
+ effect(USE labl);
+
+ ins_cost(BRANCH_COST);
+ format %{ "cb$cmp $op1, $labl # int" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Condition cond =
+ ((Assembler::Condition)$cmp$$cmpcode == Assembler::LT) ? Assembler::NE : Assembler::EQ;
+ __ tbr(cond, $op1$$Register, 31, *L, /*far*/true);
+ %}
+ ins_pipe(pipe_cmp_branch);
+%}
+
+instruct far_cmpL_branch_bit(cmpOp cmp, iRegL op1, immL op2, immL0 op3, label labl) %{
+ match(If cmp (CmpL (AndL op1 op2) op3));
+ predicate((n->in(1)->as_Bool()->_test._test == BoolTest::ne
+ || n->in(1)->as_Bool()->_test._test == BoolTest::eq)
+ && is_power_of_2(n->in(2)->in(1)->in(2)->get_long()));
+ effect(USE labl);
+
+ ins_cost(BRANCH_COST);
+ format %{ "tb$cmp $op1, $op2, $labl" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode;
+ int bit = exact_log2($op2$$constant);
+ __ tbr(cond, $op1$$Register, bit, *L, /*far*/true);
+ %}
+ ins_pipe(pipe_cmp_branch);
+%}
+
+instruct far_cmpI_branch_bit(cmpOp cmp, iRegIorL2I op1, immI op2, immI0 op3, label labl) %{
+ match(If cmp (CmpI (AndI op1 op2) op3));
+ predicate((n->in(1)->as_Bool()->_test._test == BoolTest::ne
+ || n->in(1)->as_Bool()->_test._test == BoolTest::eq)
+ && is_power_of_2(n->in(2)->in(1)->in(2)->get_int()));
+ effect(USE labl);
+
+ ins_cost(BRANCH_COST);
+ format %{ "tb$cmp $op1, $op2, $labl" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode;
+ int bit = exact_log2($op2$$constant);
+ __ tbr(cond, $op1$$Register, bit, *L, /*far*/true);
%}
ins_pipe(pipe_cmp_branch);
%}
--- openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp Tue Jul 04 21:23:37 2017 +0100
+++ openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp Tue Aug 22 18:17:20 2017 +0100
@@ -2723,6 +2723,32 @@
void movptr(Register r, uintptr_t imm64);
+public:
+
+ // Generalized Test Bit And Branch, including a "far" variety which
+ // spans more than 32KiB.
+ void tbr(Condition cond, Register Rt, int bitpos, Label &dest, bool far = false) {
+ assert(cond == EQ || cond == NE, "must be");
+
+ if (far)
+ cond = ~cond;
+
+ void (Assembler::* branch)(Register Rt, int bitpos, Label &L);
+ if (cond == Assembler::EQ)
+ branch = &Assembler::tbz;
+ else
+ branch = &Assembler::tbnz;
+
+ if (far) {
+ Label L;
+ (this->*branch)(Rt, bitpos, L);
+ b(dest);
+ bind(L);
+ } else {
+ (this->*branch)(Rt, bitpos, dest);
+ }
+ }
+
// macro instructions for accessing and updating floating point
// status register
//
--- openjdk/hotspot/src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.hpp Tue Jul 04 21:23:37 2017 +0100
+++ openjdk/hotspot/src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.hpp Tue Aug 22 18:17:20 2017 +0100
@@ -27,6 +27,8 @@
#ifndef CPU_AARCH64_VM_C1_MACROASSEMBLER_AARCH64_HPP
#define CPU_AARCH64_VM_C1_MACROASSEMBLER_AARCH64_HPP
+using MacroAssembler::null_check;
+
// C1_MacroAssembler contains high-level macros for C1
private:
--- openjdk/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.cpp Tue Jul 04 21:23:37 2017 +0100
+++ openjdk/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.cpp Tue Aug 22 18:17:20 2017 +0100
@@ -1370,9 +1370,8 @@
// the code to check if the event should be sent.
if (JvmtiExport::can_post_interpreter_events()) {
Label L;
- ldr(r3, Address(rthread, JavaThread::interp_only_mode_offset()));
- tst(r3, ~0);
- br(Assembler::EQ, L);
+ ldrw(r3, Address(rthread, JavaThread::interp_only_mode_offset()));
+ cbzw(r3, L);
call_VM(noreg, CAST_FROM_FN_PTR(address,
InterpreterRuntime::post_method_entry));
bind(L);
--- openjdk/hotspot/src/share/vm/adlc/formssel.cpp Tue Jul 04 21:23:37 2017 +0100
+++ openjdk/hotspot/src/share/vm/adlc/formssel.cpp Tue Aug 22 18:17:20 2017 +0100
@@ -1249,7 +1249,8 @@
!is_short_branch() && // Don't match another short branch variant
reduce_result() != NULL &&
strcmp(reduce_result(), short_branch->reduce_result()) == 0 &&
- _matrule->equivalent(AD.globalNames(), short_branch->_matrule)) {
+ _matrule->equivalent(AD.globalNames(), short_branch->_matrule) &&
+ equivalent_predicates(this, short_branch)) {
// The instructions are equivalent.
// Now verify that both instructions have the same parameters and
1
0
Hello community,
here is the log from the commit of package appstream-glib for openSUSE:Factory checked in at 2017-09-04 12:24:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/appstream-glib (Old)
and /work/SRC/openSUSE:Factory/.appstream-glib.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "appstream-glib"
Mon Sep 4 12:24:43 2017 rev:45 rq:520145 version:0.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/appstream-glib/appstream-glib.changes 2017-04-29 10:50:18.239523918 +0200
+++ /work/SRC/openSUSE:Factory/.appstream-glib.new/appstream-glib.changes 2017-09-04 12:24:44.765170967 +0200
@@ -1,0 +2,72 @@
+Mon Jun 26 06:56:38 UTC 2017 - zaitor(a)opensuse.org
+
+- Update to version 0.7.0:
+ + trivial: Fix a -Wpointer-sign warning.
+ + Switch to the meson build system.
+ + build: Improve build-api wrapper for Meson.
+ + build: Add options for building API docs and man pages.
+ + build: Conditionally generate man pages.
+ + build: Conditionally generate the API reference.
+ + trivial: Fix the autogenerated pkgconfig files.
+ + trivial: Add back the Requires and Requires.private in the .pc
+ files.
+ + Remove the cache-id functionality.
+ + trivial: Ensure HAVE_GCAB is set when libgcab is being used.
+ + Add as_store_get_apps_by_id_merge().
+ + trivial: Try linking the GIR file with the local
+ appstream-glib.
+ + Show a warning if adding keywords after the keyword cache was
+ created.
+ + Fix the default plugin directory used by appstream-builder.
+ + Add the limits in the validation output messages.
+ + trivial: Prevent crash when a sanity check fails.
+ + trivial: Remove the ability to run threaded.
+ + Remove functionality processing an old metadata file.
+ + trivial: Fix a warning message to be more clear.
+ + trivial: Fix a variable with a misleading name.
+ + Actually return failure if the AsbTask fails.
+ + Add the missing shell-extension plugin.
+ + trivial: Remove autotools fixups no longer required.
+ + Do not enforce that the project_group is a valid
+ environment_id.
+ + Do not add the GNOME-Software-specific categories or icons by
+ default.
+ + Enable Travis CI for Fedora 25 and Debian Stretch.
+ + Allow compiling with newer versions of meson.
+ + trivial: Fix the meson version compare value.
+ + Fix regression when building component types without icons.
+ + as-app-builder: Don't cast gsize to guint32 when getting file
+ length.
+ + trivial: Fix an error message in news-to-appdata.
+ + Do not write a timestamp when using news-to-appdata.
+ + trivial: Ensure every app has format set before adding to
+ store.
+ + trivial: Fix up several small memory leaks.
+- Add meson BuildRequires and switch autotools macros configure,
+ make and makeinstall to meson, meson_build and meson_install
+ following upstream switch to Meson build system.
+
+-------------------------------------------------------------------
+Mon Jun 26 06:56:07 UTC 2017 - zaitor(a)opensuse.org
+
+- Update to version 0.6.13:
+ + Add functions for getting the AsApp search match.
+ + Add functions for getting the AsStore search match.
+ + Allow using the app origin as a search keyword.
+ + trivial: Use the new custom tag in the self tests.
+ + Add support for <launchable>.
+ + trivial: Fix up some broken links in the generated
+ documentation.
+ + Add support for icon scaling.
+ + Add as_utils_guid_from_data().
+ + Support non-numeric version numbers correctly.
+ + trivial: Do not store the .shell-extension prefix in the search
+ cache.
+ + Casefold all stemmed entries.
+ + trivial: Add a regex command to appstream-util for testing
+ firmware versions.
+ + Add a 'check-component' command to appstream-util.
+ + Add as_app_remove_category().
+ + Add as_app_remove_kudo().
+
+-------------------------------------------------------------------
Old:
----
appstream-glib-0.6.12.tar.xz
New:
----
appstream-glib-0.7.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ appstream-glib.spec ++++++
--- /var/tmp/diff_new_pack.onaqVw/_old 2017-09-04 12:24:45.769029834 +0200
+++ /var/tmp/diff_new_pack.onaqVw/_new 2017-09-04 12:24:45.805024774 +0200
@@ -20,7 +20,7 @@
%define _build_from_vcs 1
Name: appstream-glib
-Version: 0.6.12
+Version: 0.7.0
Release: 0
Summary: AppStream Abstraction Library
License: LGPL-2.1+
@@ -39,6 +39,7 @@
BuildRequires: gperf
BuildRequires: intltool >= 0.40.0
BuildRequires: libyaml-devel
+BuildRequires: meson
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.14
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gio-unix-2.0)
@@ -167,17 +168,15 @@
%setup -q
%build
-%if %{_build_from_vcs}
-NOCONFIGURE=1 ./autogen.sh
-%endif
-%configure \
- --disable-static \
- --enable-gtk-doc \
- --enable-rpm
-make %{?_smp_mflags}
+%meson \
+ -Denable-rpm=true \
+ -Denable-gtk-doc=true \
+ -Denable-stemmer=false \
+ %{nil}
+%meson_build
%install
-%make_install
+%meson_install
# We don't care for 'installed tests'; that's used by GNOME Smoke Testing.
rm %{buildroot}%{_datadir}/installed-tests/appstream-glib/*.test
find %{buildroot} -type f -name "*.la" -delete -print
@@ -238,7 +237,6 @@
%files devel
%defattr(-,root,root)
-%{_datadir}/aclocal/appdata-xml.m4
%{_datadir}/aclocal/appstream-xml.m4
%dir %{_datadir}/gettext/its
%{_datadir}/gettext/its/appdata.*
++++++ _service ++++++
--- /var/tmp/diff_new_pack.onaqVw/_old 2017-09-04 12:24:45.897011841 +0200
+++ /var/tmp/diff_new_pack.onaqVw/_new 2017-09-04 12:24:45.905010716 +0200
@@ -2,9 +2,9 @@
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/hughsie/appstream-glib.git</param>
<param name="scm">git</param>
- <param name="versionformat">0.6.12</param>
+ <param name="versionformat">0.7.0</param>
<param name="changesgenerate">enable</param>
- <param name="revision">refs/tags/appstream_glib_0_6_12</param>
+ <param name="revision">refs/tags/appstream_glib_0_7_0</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.onaqVw/_old 2017-09-04 12:24:45.945005094 +0200
+++ /var/tmp/diff_new_pack.onaqVw/_new 2017-09-04 12:24:45.945005094 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/hughsie/appstream-glib.git</param>
- <param name="changesrevision">ab7b5a089ce01fd90ac53bf100d143eacca73c9c</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">9ca9447929d8b15703c91946026534585826ab13</param></service></servicedata>
\ No newline at end of file
++++++ appstream-glib-0.6.12.tar.xz -> appstream-glib-0.7.0.tar.xz ++++++
++++ 20788 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package pango for openSUSE:Factory checked in at 2017-09-04 12:24:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pango (Old)
and /work/SRC/openSUSE:Factory/.pango.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pango"
Mon Sep 4 12:24:36 2017 rev:110 rq:519949 version:1.40.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/pango/pango.changes 2017-08-24 18:25:06.740034204 +0200
+++ /work/SRC/openSUSE:Factory/.pango.new/pango.changes 2017-09-04 12:24:37.570182514 +0200
@@ -1,0 +2,6 @@
+Thu Aug 31 12:33:32 UTC 2017 - pmonrealgonzalez(a)suse.com
+
+- Add pango-fix-default-break-function.patch: Fix
+ pango_default_break function for sentence start/end (bgo#785978).
+
+-------------------------------------------------------------------
New:
----
pango-fix-default-break-function.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pango.spec ++++++
--- /var/tmp/diff_new_pack.Rz58pV/_old 2017-09-04 12:24:38.690025075 +0200
+++ /var/tmp/diff_new_pack.Rz58pV/_new 2017-09-04 12:24:38.726020015 +0200
@@ -18,7 +18,6 @@
# When updating the binary version, do not forget to also update baselibs.conf
%define pango_binary_version 1.8.0
-
Name: pango
Version: 1.40.11
Release: 0
@@ -29,6 +28,8 @@
Source: https://download.gnome.org/sources/pango/1.40/%{name}-%{version}.tar.xz
Source2: macros.pango
Source99: baselibs.conf
+# PATCH-FIX-UPSTREAM pango-fix-default-break-function.patch bgo#785978 pmonrealgonzalez(a)suse.com -- Fix pango_default_break function for sentence start/end
+Patch0: pango-fix-default-break-function.patch
BuildRequires: gcc-c++
BuildRequires: gtk-doc
BuildRequires: help2man
@@ -101,12 +102,12 @@
Group: Development/Libraries/GNOME
Requires: libpango-1_0-0 = %{version}
Requires: typelib-1_0-Pango-1_0 = %{version}
+Provides: pango-doc = %{version}
+Obsoletes: pango-doc < %{version}
# bug437293
%ifarch ppc64
Obsoletes: pango-devel-64bit
%endif
-Provides: pango-doc = %{version}
-Obsoletes: pango-doc < %{version}
%description devel
Pango is a library for layout and rendering of text, with an emphasis
@@ -120,6 +121,7 @@
%prep
%setup -q
+%patch0 -p1
%build
%meson \
@@ -152,7 +154,7 @@
%files tools
%{_bindir}/pango-view
-%doc %{_mandir}/man1/pango-view.1%{ext_man}
+%{_mandir}/man1/pango-view.1%{ext_man}
%files devel
%doc README AUTHORS
++++++ pango-fix-default-break-function.patch ++++++
>From 6ff8f019170241188b4b76531c60f420bf81ffe2 Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico(a)gmail.com>
Date: Wed, 16 Aug 2017 15:02:36 +0800
Subject: [PATCH] Fix pango_default_break function for sentence start/end
Skip the space characters in sentence start/end.
https://bugzilla.gnome.org/show_bug.cgi?id=785978
---
pango/break.c | 39 +++++++++++++++++++++++++++++----------
1 file changed, 29 insertions(+), 10 deletions(-)
Index: pango-1.40.11/pango/break.c
===================================================================
--- pango-1.40.11.orig/pango/break.c
+++ pango-1.40.11/pango/break.c
@@ -559,6 +559,7 @@ pango_default_break (const gchar *text
gunichar base_character = 0;
gint last_sentence_start = -1;
+ gint last_non_space = -1;
gboolean almost_done = FALSE;
gboolean done = FALSE;
@@ -1660,19 +1661,37 @@ pango_default_break (const gchar *text
}
/* ---- Sentence breaks ---- */
+ {
- /* default to not a sentence start/end */
- attrs[i].is_sentence_start = FALSE;
- attrs[i].is_sentence_end = FALSE;
-
- if (last_sentence_start == -1 && !is_sentence_boundary) {
- last_sentence_start = i - 1;
- attrs[i - 1].is_sentence_start = TRUE;
- }
+ /* default to not a sentence start/end */
+ attrs[i].is_sentence_start = FALSE;
+ attrs[i].is_sentence_end = FALSE;
+
+ /* maybe start sentence */
+ if (last_sentence_start == -1 && !is_sentence_boundary)
+ last_sentence_start = i - 1;
+
+ /* remember last non space character position */
+ if (i > 0 && !attrs[i - 1].is_white)
+ last_non_space = i;
+
+ /* meets sentence end, mark both sentence start and end */
+ if (last_sentence_start != -1 && is_sentence_boundary) {
+ if (last_non_space != -1) {
+ attrs[last_sentence_start].is_sentence_start = TRUE;
+ attrs[last_non_space].is_sentence_end = TRUE;
+ }
+
+ last_sentence_start = -1;
+ last_non_space = -1;
+ }
+
+ /* meets space character, move sentence start */
+ if (last_sentence_start != -1 &&
+ last_sentence_start == i - 1 &&
+ attrs[i - 1].is_white)
+ last_sentence_start++;
- if (last_sentence_start != -1 && is_sentence_boundary) {
- last_sentence_start = -1;
- attrs[i].is_sentence_end = TRUE;
}
prev_wc = wc;
1
0