February 2015 - openSUSE Commits - openSUSE Mailing Lists

commit libdiscid for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package libdiscid for openSUSE:Factory checked in at 2015-02-20 12:00:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdiscid (Old) and /work/SRC/openSUSE:Factory/.libdiscid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdiscid" Changes: -------- --- /work/SRC/openSUSE:Factory/libdiscid/libdiscid.changes 2013-08-05 20:46:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libdiscid.new/libdiscid.changes 2015-02-20 12:00:54.000000000 +0100 @@ -1,0 +2,25 @@ +Tue Feb 17 10:55:42 UTC 2015 - idonmez(a)suse.com + +- Add baselibs.conf as source + +------------------------------------------------------------------- +Tue Feb 17 03:01:01 UTC 2015 - p.drouand(a)gmail.com + +- Update to version 0.6.1 + * LIB-59: windows: fix bug preventing ISRC reads +- Changes from version 0.6.0 + * LIB-41: add discid_get_troc_string() for fuzzy toc lookup + * LIB-54: add libmusicbrainz example with fuzzy toc lookup + * LIB-43: windows: the default drive is the first cd drive letter + * LIB-45: Linux/BSD/Solaris: try several possible default device names + * LIB-28: Mac: allow drive numbers as devices, default now "1" + * LIB-55, LIB-56: allow drive numbers for Windows and Linux + * LIB-53: discid_get_submission_url() returns the new NGS url + currently no functional change, the old url was redirected + * LIB-52: more validation for parameters of discid_put() + * LIB-48: assert successful read/put when API is used + * the discisrc example prints the name of the device used +- Add pkgconfig(libmusicbrainz5) build require; new upstream dependency +- Update libdiscid-no-crypto.patch + +------------------------------------------------------------------- Old: ---- libdiscid-0.5.2.tar.gz New: ---- libdiscid-0.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdiscid.spec ++++++ --- /var/tmp/diff_new_pack.Jen1xL/_old 2015-02-20 12:00:55.000000000 +0100 +++ /var/tmp/diff_new_pack.Jen1xL/_new 2015-02-20 12:00:55.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libdiscid # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,20 @@ Name: libdiscid -Version: 0.5.2 +Version: 0.6.1 Release: 0 Summary: Library for gathering DiscIDs and ISRCs from audio CDs License: LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://musicbrainz.org/doc/libdiscid Source: http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/%{name}-%{version}.tar… +Source1000: baselibs.conf # PATCH-FEATURE-OPENSUSE libdiscid-no-crypto.patch Patch0: libdiscid-no-crypto.patch BuildRequires: libtool BuildRequires: openssl-devel BuildRequires: pkg-config +BuildRequires: pkgconfig(libmusicbrainz5) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ libdiscid-0.5.2.tar.gz -> libdiscid-0.6.1.tar.gz ++++++ ++++ 3839 lines of diff (skipped) ++++++ libdiscid-no-crypto.patch ++++++ --- /var/tmp/diff_new_pack.Jen1xL/_old 2015-02-20 12:00:55.000000000 +0100 +++ /var/tmp/diff_new_pack.Jen1xL/_new 2015-02-20 12:00:55.000000000 +0100 @@ -1,10 +1,10 @@ Subject: use openssl for sha1 Upstream: no -Index: libdiscid-0.5.2/Makefile.am +Index: libdiscid-0.6.1/Makefile.am =================================================================== ---- libdiscid-0.5.2.orig/Makefile.am -+++ libdiscid-0.5.2/Makefile.am +--- libdiscid-0.6.1.orig/Makefile.am ++++ libdiscid-0.6.1/Makefile.am @@ -33,7 +33,7 @@ pc_DATA = libdiscid.pc discid_incdir = $(includedir)/discid @@ -31,10 +31,10 @@ libdiscid_la_SOURCES += src/toc.c src/unix.c src/disc_linux.c endif if OS_NETBSD -Index: libdiscid-0.5.2/src/disc.c +Index: libdiscid-0.6.1/src/disc.c =================================================================== ---- libdiscid-0.5.2.orig/src/disc.c -+++ libdiscid-0.5.2/src/disc.c +--- libdiscid-0.6.1.orig/src/disc.c ++++ libdiscid-0.6.1/src/disc.c @@ -33,8 +33,8 @@ #include <string.h> #include <assert.h> @@ -45,7 +45,7 @@ #include "base64.h" #include "discid/discid.h" -@@ -311,31 +311,34 @@ char *discid_get_version_string(void) { +@@ -361,31 +361,35 @@ * The DiscID is placed in the provided string buffer. */ static void create_disc_id(mb_disc_private *d, char buf[]) { @@ -57,10 +57,11 @@ + unsigned char digest[EVP_MAX_MD_SIZE]; char tmp[17]; /* for 8 hex digits (16 to avoid trouble) */ int i; -+ EVP_MD_CTX *sha; ++ EVP_MD_CTX *sha; + unsigned int sha_len; - assert( d != NULL ); + assert(d != NULL); + assert(d->success); - sha_init(&sha); + sha = EVP_MD_CTX_create(); @@ -85,8 +86,9 @@ - base64 = rfc822_binary(digest, sizeof(digest), &size); + EVP_DigestFinal_ex(sha, digest, &sha_len); + EVP_MD_CTX_destroy(sha); - ++ + base64 = rfc822_binary(digest, sha_len , &size); + memcpy(buf, base64, size); buf[size] = '\0'; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit autofs for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package autofs for openSUSE:Factory checked in at 2015-02-20 12:00:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autofs (Old) and /work/SRC/openSUSE:Factory/.autofs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autofs" Changes: -------- --- /work/SRC/openSUSE:Factory/autofs/autofs.changes 2015-02-06 10:20:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.autofs.new/autofs.changes 2015-02-20 12:00:52.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 17 10:23:44 CET 2015 - mszeredi(a)suse.cz + +- add autofs-5.1.0-dont-pass-sloppy-option-for-other-than-nfs-mounts.patch + (bsc#911720) + +------------------------------------------------------------------- New: ---- autofs-5.1.0-dont-pass-sloppy-option-for-other-than-nfs-mounts.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.rCbjtT/_old 2015-02-20 12:00:53.000000000 +0100 +++ /var/tmp/diff_new_pack.rCbjtT/_new 2015-02-20 12:00:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package autofs # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -79,6 +79,7 @@ Source100: autofs-rpmlintrc # PATCH-FIX-UPSTREAM autofs-5.1.0-task-use-after-free.patch [bnc#727392] Patch82: autofs-5.0.9-task-use-after-free.patch +Patch83: autofs-5.1.0-dont-pass-sloppy-option-for-other-than-nfs-mounts.patch # PATCH-FIX-OPENSUSE autofs-5.0.9-suse-auto_master_default.patch Patch100: autofs-5.0.9-suse-auto_master_default.patch # PATCH-EXTEND-OPENSUSE autofs-5.0.8-dbus-udisks-monitor.patch @@ -106,6 +107,7 @@ cp %{SOURCE5} . # %patch82 -p1 +%patch83 -p1 %patch100 -p1 %patch102 -p0 -b .udisks %patch200 -p1 ++++++ autofs-5.1.0-dont-pass-sloppy-option-for-other-than-nfs-mounts.patch ++++++ autofs-5.1.0 - dont pass sloppy option for other than nfs mounts From: Ian Kent <ikent(a)redhat.com> Historically autofs added an option to mounts, called the sloppy option, meant to allow mount(8) to ignore invalid mount options. This was done so that mount map entries for sites that needed to use different mount options for some machines would still work. It was needed for nfs mounts in particular. Recent changes to mount(8) cause the sloppy option to be passed on for all mounts when it is given. Previously mount(8) only passed on the option to nfs mounts so now, for other than nfs mounts, the mount will fail if the file system doesn't understand the sloppy option. Since the option was not passed on to other than nfs mounts before it seems sensible for autofs to not add it for other than nfs mounts now. Signed-off-by: Ian Kent <ikent(a)redhat.com> --- modules/mount_bind.c | 9 ++++----- modules/mount_changer.c | 6 +++--- modules/mount_ext2.c | 6 +++--- modules/mount_generic.c | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) --- a/modules/mount_bind.c +++ b/modules/mount_bind.c @@ -158,13 +158,12 @@ int mount_mount(struct autofs_point *ap, if (!status) existed = 0; - debug(ap->logopt, - MODPREFIX - "calling mount --bind " SLOPPY " -o %s %s %s", + debug(ap->logopt, MODPREFIX + "calling mount --bind -o %s %s %s", options, what, fullpath); - err = spawn_bind_mount(ap->logopt, - SLOPPYOPT "-o", options, what, fullpath, NULL); + err = spawn_bind_mount(ap->logopt, "-o", + options, what, fullpath, NULL); if (err) { if (ap->type != LKP_INDIRECT) --- a/modules/mount_changer.c +++ b/modules/mount_changer.c @@ -103,12 +103,12 @@ int mount_mount(struct autofs_point *ap, } if (options && options[0]) { - debug(ap->logopt, - MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s", + debug(ap->logopt, MODPREFIX + "calling mount -t %s -o %s %s %s", fstype, options, what, fullpath); err = spawn_mount(ap->logopt, "-t", fstype, - SLOPPYOPT "-o", options, what, fullpath, NULL); + "-o", options, what, fullpath, NULL); } else { debug(ap->logopt, MODPREFIX "calling mount -t %s %s %s", --- a/modules/mount_ext2.c +++ b/modules/mount_ext2.c @@ -116,11 +116,11 @@ int mount_mount(struct autofs_point *ap, } if (options) { - debug(ap->logopt, - MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s", + debug(ap->logopt, MODPREFIX + "calling mount -t %s -o %s %s %s", fstype, options, what, fullpath); err = spawn_mount(ap->logopt, "-t", fstype, - SLOPPYOPT "-o", options, what, fullpath, NULL); + "-o", options, what, fullpath, NULL); } else { debug(ap->logopt, MODPREFIX "calling mount -t %s %s %s", --- a/modules/mount_generic.c +++ b/modules/mount_generic.c @@ -97,11 +97,11 @@ int mount_mount(struct autofs_point *ap, if (options && options[0]) { debug(ap->logopt, - MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s", + MODPREFIX "calling mount -t %s -o %s %s %s", fstype, options, loc, fullpath); err = spawn_mount(ap->logopt, "-t", fstype, - SLOPPYOPT "-o", options, loc, fullpath, NULL); + "-o", options, loc, fullpath, NULL); } else { debug(ap->logopt, MODPREFIX "calling mount -t %s %s %s", fstype, loc, fullpath); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-pep8 for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package python-pep8 for openSUSE:Factory checked in at 2015-02-20 12:00:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pep8 (Old) and /work/SRC/openSUSE:Factory/.python-pep8.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pep8" Changes: -------- --- /work/SRC/openSUSE:Factory/python-pep8/python-pep8.changes 2015-01-21 21:54:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-pep8.new/python-pep8.changes 2015-02-20 12:00:50.000000000 +0100 @@ -1,0 +2,20 @@ +Tue Feb 17 10:07:08 UTC 2015 - mcihar(a)suse.cz + +- Update to 1.6.2: + * Added check for breaking around a binary operator. (Issue #197, Pull #305) + * Assign variables before referenced. (Issue #287) + * Report E731 for lambda assignment. (Issue #277) + * Report E704 for one-liner def instead of E701. Do not report this error in the default configuration. (Issue #277) + * Replace codes E111, E112 and E113 with codes E114, E115 and E116 for bad indentation of comments. (Issue #274) + * Report E266 instead of E265 when the block comment starts with multiple #. (Issue #270) + * Report E402 for import statements not at the top of the file. (Issue #264) + * Do not enforce whitespaces around ** operator. (Issue #292) + * Strip whitespace from around paths during normalization. (Issue #339 / #343) + * Update --format documentation. (Issue #198 / Pull Request #310) + * Add .tox/ to default excludes. (Issue #335) + * Do not report E121 or E126 in the default configuration. (Issues #256 / #316) + * Allow spaces around the equals sign in an annotated function. (Issue #357) + * Allow trailing backslash if in an inline comment. (Issue #374) + * If --config is used, only that configuration is processed. Otherwise, merge the user and local configurations are merged. (Issue #368 / #369) + +------------------------------------------------------------------- Old: ---- pep8-1.5.7.tar.gz New: ---- pep8-1.6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pep8.spec ++++++ --- /var/tmp/diff_new_pack.LjoXy6/_old 2015-02-20 12:00:51.000000000 +0100 +++ /var/tmp/diff_new_pack.LjoXy6/_new 2015-02-20 12:00:51.000000000 +0100 @@ -17,7 +17,7 @@ Name: python-pep8 -Version: 1.5.7 +Version: 1.6.2 Release: 0 Url: http://github.com/jcrocholl/pep8 Summary: Python style guide checker ++++++ pep8-1.5.7.tar.gz -> pep8-1.6.2.tar.gz ++++++ ++++ 1736 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libcaca for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package libcaca for openSUSE:Factory checked in at 2015-02-20 12:00:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcaca (Old) and /work/SRC/openSUSE:Factory/.libcaca.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcaca" Changes: -------- --- /work/SRC/openSUSE:Factory/libcaca/libcaca.changes 2015-01-20 19:12:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libcaca.new/libcaca.changes 2015-02-20 12:00:48.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 17 03:37:09 UTC 2015 - p.drouand(a)gmail.com + +- Update to version 0.99beta19 + * No changelog available +- Remove automake-1.12.patch; fixed on upstream release + +------------------------------------------------------------------- Old: ---- automake-1.12.patch libcaca-0.99.beta18.tar.gz New: ---- libcaca-0.99.beta19.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcaca.spec ++++++ --- /var/tmp/diff_new_pack.c6F3MJ/_old 2015-02-20 12:00:49.000000000 +0100 +++ /var/tmp/diff_new_pack.c6F3MJ/_new 2015-02-20 12:00:49.000000000 +0100 @@ -43,7 +43,7 @@ BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(x11) -Version: 0.99.beta18 +Version: 0.99.beta19 Release: 0 Summary: Library for Colour ASCII Art, text mode graphics License: WTFPL @@ -57,7 +57,6 @@ Patch5: libcaca-ruby_vendor_install.patch Patch7: libcaca-0.99.beta16-missing-GLU.patch Patch9: caca-no-build-date.patch -Patch10: automake-1.12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define rb_vendorarch %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch} %define rb_vendorlib %{_libdir}/ruby/vendor_ruby/%{rb_ver} @@ -189,7 +188,6 @@ %patch7 %patch9 %patch1 -%patch10 -p1 RUBY="ruby-`echo %{rb_ver} | sed 's|\.[^\.]*$||'`" find . -type f -exec sed -i "s|ruby-1.9|$RUBY|" \{\} \; @@ -263,7 +261,6 @@ %{_includedir}/* %{_mandir}/man1/caca-config.1* %{_mandir}/man3/* -%{_datadir}/doc/libcucul-dev %{_datadir}/doc/libcaca-dev %if 0%{?withjava} == 1 %{_libdir}/jni/libcaca-java.so ++++++ libcaca-0.99-texbuild.patch ++++++ --- /var/tmp/diff_new_pack.c6F3MJ/_old 2015-02-20 12:00:49.000000000 +0100 +++ /var/tmp/diff_new_pack.c6F3MJ/_new 2015-02-20 12:00:49.000000000 +0100 @@ -2,12 +2,12 @@ =================================================================== --- doc/doxygen.cfg.in.orig 2010-01-03 04:54:32.000000000 +0200 +++ doc/doxygen.cfg.in 2010-11-20 07:32:05.000000000 +0200 -@@ -1047,7 +1047,7 @@ USE_PDFLATEX = YES - # running if errors occur, instead of asking the user for help. - # This option is also used when generating formulas in HTML. +@@ -1663,7 +1663,7 @@ + # The default value is: NO. + # This tag requires that the tag GENERATE_LATEX is set to YES. -LATEX_BATCHMODE = YES +LATEX_BATCHMODE = NO - # If LATEX_HIDE_INDICES is set to YES then doxygen will not - # include the index chapters (such as File Index, Compound Index, etc.) + # If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the + # index chapters (such as File Index, Compound Index, etc.) in the output. ++++++ libcaca-0.99.beta18.tar.gz -> libcaca-0.99.beta19.tar.gz ++++++ ++++ 21821 lines of diff (skipped) ++++++ libcaca-ruby_vendor_install.patch ++++++ --- /var/tmp/diff_new_pack.c6F3MJ/_old 2015-02-20 12:00:50.000000000 +0100 +++ /var/tmp/diff_new_pack.c6F3MJ/_new 2015-02-20 12:00:50.000000000 +0100 @@ -2,18 +2,18 @@ =================================================================== --- configure.ac.orig 2012-05-14 11:56:04.447928052 +0200 +++ configure.ac 2012-05-14 12:03:02.562272828 +0200 -@@ -462,14 +462,17 @@ ac_cv_my_have_ruby="no" +@@ -465,14 +465,17 @@ if test "${enable_ruby}" != "no"; then AC_PATH_PROG(RUBY, ruby, no) if test "${RUBY}" != "no"; then -- RUBY_CFLAGS="-I$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"archdir"@:>@')" +- RUBY_CFLAGS="$(ruby -r mkmf -e 'conf = RbConfig::CONFIG.merge("hdrdir" => $hdrdir, "arch_hdrdir" => $arch_hdrdir); print RbConfig::expand("#$INCFLAGS", conf)')" + RUBY_CFLAGS=$(pkg-config --cflags ruby-1.9) + if test -z "$RUBY_CFLAGS"; then + RUBY_CFLAGS="-I$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"archdir"@:>@')" + fi - RUBY_LIBS="-L$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"libdir"@:>@') -l$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"RUBY_SO_NAME"@:>@')" -- RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"sitearchdir"@:>@'` -- RUBY_SITELIBDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"sitelibdir"@:>@'` + RUBY_LIBS="-L$(ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"libdir"@:>@') -l$(ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"RUBY_SO_NAME"@:>@')" +- RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitearchdir"@:>@'` +- RUBY_SITELIBDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitelibdir"@:>@'` + RUBY_VENDORARCHDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"vendorarchdir"@:>@'` + RUBY_VENDORLIBDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"vendorlibdir"@:>@'` AC_SUBST(RUBY_CFLAGS) @@ -42,119 +42,4 @@ +rubyvendor_DATA = lib/caca.rb TESTS = test endif - -Index: ruby/caca-canvas.c -=================================================================== ---- ruby/caca-canvas.c.orig 2010-02-16 00:49:40.000000000 +0100 -+++ ruby/caca-canvas.c 2012-05-14 12:05:27.623453608 +0200 -@@ -274,7 +274,7 @@ static VALUE draw_polyline(VALUE self, V - int error = 0; - VALUE v, x, y; - -- n = RARRAY(points)->len; -+ n = RARRAY_LEN(points); - - ax = (int*)malloc(n*sizeof(int)); - if(!ax) -@@ -290,7 +290,7 @@ static VALUE draw_polyline(VALUE self, V - for(i=0; i<n; i++) - { - v = rb_ary_entry(points, i); -- if((TYPE(v) == T_ARRAY) && (RARRAY(v)->len == 2)) -+ if((TYPE(v) == T_ARRAY) && (RARRAY_LEN(v) == 2)) - { - x = rb_ary_entry(v,0); - y = rb_ary_entry(v,1); -@@ -336,7 +336,7 @@ static VALUE draw_thin_polyline(VALUE se - int error = 0; - VALUE v, x, y; - -- n = RARRAY(points)->len; -+ n = RARRAY_LEN(points); - - ax = (int*)malloc(n*sizeof(int)); - if(!ax) -@@ -352,7 +352,7 @@ static VALUE draw_thin_polyline(VALUE se - for(i=0; i<n; i++) - { - v = rb_ary_entry(points, i); -- if((TYPE(v) == T_ARRAY) && (RARRAY(v)->len == 2)) -+ if((TYPE(v) == T_ARRAY) && (RARRAY_LEN(v) == 2)) - { - x = rb_ary_entry(v,0); - y = rb_ary_entry(v,1); -@@ -459,7 +459,7 @@ static VALUE fill_triangle_textured(VALU - float cuv[6]; - VALUE v; - -- l = RARRAY(coords)->len; -+ l = RARRAY_LEN(coords); - if(l != 6 && l != 3) - { - rb_raise(rb_eArgError, "invalid coords list"); -@@ -471,14 +471,14 @@ static VALUE fill_triangle_textured(VALU - ccoords[i] = NUM2INT(v); - else - { -- if((TYPE(v) != T_ARRAY) || (RARRAY(v)->len != 2)) -+ if((TYPE(v) != T_ARRAY) || (RARRAY_LEN(v) != 2)) - rb_raise(rb_eArgError, "invalid coords list"); - ccoords[2*i] = NUM2INT(rb_ary_entry(v, 0)); - ccoords[2*i+1] = NUM2INT(rb_ary_entry(v, 1)); - } - } - -- l = RARRAY(uv)->len; -+ l = RARRAY_LEN(uv); - if(l != 6 && l != 3) - { - rb_raise(rb_eArgError, "invalid uv list"); -@@ -490,7 +490,7 @@ static VALUE fill_triangle_textured(VALU - cuv[i] = NUM2DBL(v); - else - { -- if((TYPE(v) != T_ARRAY) || (RARRAY(v)->len != 2)) -+ if((TYPE(v) != T_ARRAY) || (RARRAY_LEN(v) != 2)) - rb_raise(rb_eArgError, "invalid uv list"); - ccoords[2*i] = NUM2DBL(rb_ary_entry(v, 0)); - ccoords[2*i+1] = NUM2DBL(rb_ary_entry(v, 1)); -@@ -600,7 +600,7 @@ static VALUE render_canvas(VALUE self, V - static VALUE import_from_memory(VALUE self, VALUE data, VALUE format) - { - long int bytes; -- bytes = caca_import_canvas_from_memory (_SELF, StringValuePtr(data), RSTRING(StringValue(data))->len, StringValuePtr(format)); -+ bytes = caca_import_canvas_from_memory (_SELF, StringValuePtr(data), RSTRING_LEN(StringValue(data)), StringValuePtr(format)); - if(bytes <= 0) - rb_raise(rb_eRuntimeError, strerror(errno)); - -@@ -610,7 +610,7 @@ static VALUE import_from_memory(VALUE se - static VALUE import_area_from_memory(VALUE self, VALUE x, VALUE y, VALUE data, VALUE format) - { - long int bytes; -- bytes = caca_import_area_from_memory (_SELF, NUM2INT(x), NUM2INT(y), StringValuePtr(data), RSTRING(StringValue(data))->len, StringValuePtr(format)); -+ bytes = caca_import_area_from_memory (_SELF, NUM2INT(x), NUM2INT(y), StringValuePtr(data), RSTRING_LEN(StringValue(data)), StringValuePtr(format)); - if(bytes <= 0) - rb_raise(rb_eRuntimeError, strerror(errno)); - -Index: ruby/caca-dither.c -=================================================================== ---- ruby/caca-dither.c.orig 2010-02-16 00:49:47.000000000 +0100 -+++ ruby/caca-dither.c 2012-05-14 12:06:49.420608093 +0200 -@@ -48,7 +48,7 @@ static VALUE set_dither_palette(VALUE se - VALUE v, r, g, b, a; - int error = 0; - -- if(RARRAY(palette)->len != 256) -+ if(RARRAY_LEN(palette) != 256) - { - rb_raise(rb_eArgError, "Palette must contain 256 elements"); - } -@@ -84,7 +84,7 @@ static VALUE set_dither_palette(VALUE se - for(i=0; i<256; i++) - { - v = rb_ary_entry(palette, i); -- if((TYPE(v) == T_ARRAY) && (RARRAY(v)->len == 4)) -+ if((TYPE(v) == T_ARRAY) && (RARRAY_LEN(v) == 4)) - { - r = rb_ary_entry(v,0); - g = rb_ary_entry(v,1); + \ No newline at end of file -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libyui-ncurses for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package libyui-ncurses for openSUSE:Factory checked in at 2015-02-20 12:00:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-ncurses (Old) and /work/SRC/openSUSE:Factory/.libyui-ncurses.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-ncurses" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-ncurses/libyui-ncurses.changes 2015-01-21 21:52:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-ncurses.new/libyui-ncurses.changes 2015-02-20 12:00:34.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Feb 17 15:40:07 UTC 2015 - anaselli(a)linux.it + +- NCTimeField input validity check +- NCDateField input validity check +- Implementation of optional widget YTimeField +- Implementation of optional widget YDateField +- new class NCInputText to share code between NCTimeField, NCDateField + and NCInputField +- 2.46.10 + +------------------------------------------------------------------- +Tue Feb 3 13:57:26 CET 2015 - gs(a)suse.de + +- don't use internal ncurses (_nc_) functions (bnc #915945) +- 2.46.9 + +------------------------------------------------------------------- Old: ---- libyui-ncurses-2.46.8.tar.bz2 New: ---- libyui-ncurses-2.46.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-ncurses-doc.spec ++++++ --- /var/tmp/diff_new_pack.1MxvH6/_old 2015-02-20 12:00:35.000000000 +0100 +++ /var/tmp/diff_new_pack.1MxvH6/_new 2015-02-20 12:00:35.000000000 +0100 @@ -17,7 +17,7 @@ Name: libyui-ncurses-doc -Version: 2.46.8 +Version: 2.46.10 Release: 0 Source: libyui-ncurses-%{version}.tar.bz2 ++++++ libyui-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.1MxvH6/_old 2015-02-20 12:00:35.000000000 +0100 +++ /var/tmp/diff_new_pack.1MxvH6/_new 2015-02-20 12:00:35.000000000 +0100 @@ -17,7 +17,7 @@ Name: libyui-ncurses -Version: 2.46.8 +Version: 2.46.10 Release: 0 Source: libyui-ncurses-%{version}.tar.bz2 ++++++ libyui-ncurses-2.46.8.tar.bz2 -> libyui-ncurses-2.46.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.8/ChangeLog new/libyui-ncurses-2.46.10/ChangeLog --- old/libyui-ncurses-2.46.8/ChangeLog 2015-01-20 17:15:11.000000000 +0100 +++ new/libyui-ncurses-2.46.10/ChangeLog 2015-02-18 14:50:10.000000000 +0100 @@ -1,4 +1,21 @@ ------------------------------------------------------------------- +Tue Feb 17 15:40:07 UTC 2015 - anaselli(a)linux.it + +- NCTimeField input validity check +- NCDateField input validity check +- Implementation of optional widget YTimeField +- Implementation of optional widget YDateField +- new class NCInputText to share code between NCTimeField, NCDateField + and NCInputField +- 2.46.10 + +------------------------------------------------------------------- +Tue Feb 3 13:57:26 CET 2015 - gs(a)suse.de + +- don't use internal ncurses (_nc_) functions (bnc #915945) +- 2.46.9 + +------------------------------------------------------------------- Tue Jan 20 16:09:58 UTC 2015 - mvidner(a)suse.com - Fixed building with cmake 3.1 (PREFIX in spec, boo#911875). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.8/SOURCECONF.cmake new/libyui-ncurses-2.46.10/SOURCECONF.cmake --- old/libyui-ncurses-2.46.8/SOURCECONF.cmake 2014-02-21 11:37:26.000000000 +0100 +++ new/libyui-ncurses-2.46.10/SOURCECONF.cmake 2015-02-18 14:50:10.000000000 +0100 @@ -44,7 +44,10 @@ NCPushButton.cc NCDumbTab.cc NCRadioButton.cc + NCInputTextBase.cc NCInputField.cc + NCDateField.cc + NCTimeField.cc NCIntField.cc NCComboBox.cc NCPadWidget.cc @@ -115,7 +118,10 @@ NCPushButton.h NCDumbTab.h NCRadioButton.h + NCInputTextBase.h NCInputField.h + NCTimeField.h + NCDateField.h NCIntField.h NCComboBox.h NCPadWidget.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.8/VERSION.cmake new/libyui-ncurses-2.46.10/VERSION.cmake --- old/libyui-ncurses-2.46.8/VERSION.cmake 2015-01-20 17:15:11.000000000 +0100 +++ new/libyui-ncurses-2.46.10/VERSION.cmake 2015-02-18 14:50:10.000000000 +0100 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "2" ) SET( VERSION_MINOR "46" ) -SET( VERSION_PATCH "8" ) +SET( VERSION_PATCH "10" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.8/src/NCDateField.cc new/libyui-ncurses-2.46.10/src/NCDateField.cc --- old/libyui-ncurses-2.46.8/src/NCDateField.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-ncurses-2.46.10/src/NCDateField.cc 2015-02-18 14:50:10.000000000 +0100 @@ -0,0 +1,323 @@ +/* + Copyright (C) 2014 Angelo Naselli + + 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) version 3.0 of the License. This library + is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. You should have received a copy of the GNU + Lesser General Public License along with this library; if not, write + to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + Floor, Boston, MA 02110-1301 USA +*/ + + +/*-/ + + File: NCDateField.cc + + Author: Angelo Naselli <anaselli(a)linux.it> + +/-*/ +#include <climits> +#include <boost/date_time/posix_time/posix_time.hpp> +#include <iostream> +#include <sstream> + + +#define YUILogComponent "ncurses" +#include <yui/YUILog.h> +#include "NCurses.h" +#include "NCDateField.h" +#include "NCInputTextBase.h" + +using namespace boost::gregorian; + +const unsigned NCDateField::fieldLength = 10; + +NCDateField::NCDateField ( YWidget * parent, + const std::string & nlabel ) + : YDateField ( parent, nlabel ) + , NCInputTextBase ( parent, false, fieldLength, fieldLength ) +{ + yuiDebug() << std::endl; + + setLabel ( nlabel ); + + // Same value as QT default + setValue ( "2000-01-01" ); +} + + +NCDateField::~NCDateField() +{ + yuiDebug() << std::endl; +} + +int NCDateField::preferredHeight() +{ + return NCInputTextBase::preferredHeight(); +} + +int NCDateField::preferredWidth() +{ + return NCInputTextBase::preferredWidth(); +} + +void NCDateField::setSize ( int newWidth, int newHeight ) +{ + NCInputTextBase::setSize ( newWidth, newHeight ); +} + + +void NCDateField::setEnabled ( bool do_bv ) +{ + NCInputTextBase::setEnabled ( do_bv ); + YWidget::setEnabled ( do_bv ); +} + +void NCDateField::setLabel ( const std::string & nlabel ) +{ + _label = NCstring ( nlabel ); + _label.stripHotkey(); + YDateField::setLabel ( nlabel ); + setDefsze(); + Redraw(); +} + +bool NCDateField::validDate(const std::string& input_date) +{ + std::wstringstream ss; + wdate_input_facet * fac = new wdate_input_facet(L"%Y-%m-%d"); + ss.imbue(std::locale(std::locale::classic(), fac)); + + date d; + ss << input_date.c_str(); + ss >> d; + + return d != date(); +} + + +void NCDateField::setValue ( const std::string & ntext ) +{ + if ( validDate(ntext) ) + { + buffer = NCstring ( ntext ).str(); + + if ( buffer.length() > maxFldLength ) + { + buffer = buffer.erase ( maxFldLength ); + } + + fldstart = 0; + + curpos = buffer.length(); + tUpdate(); + } +} + + +std::string NCDateField::value( ) +{ + NCstring text ( buffer ); + + return text.Str(); +} + + +NCursesEvent NCDateField::wHandleInput ( wint_t key ) +{ + NCursesEvent ret = NCursesEvent::none; + bool beep = false; + bool update = true; + + switch ( key ) + { + case '\b': //ctrl-h + case 0x7f: //del + case KEY_BACKSPACE: + + buffer.erase ( curpos, 1 ); + buffer.insert ( std::wstring::size_type ( curpos ), 1, '0' ); + if ( curpos == 5 || curpos == 8 ) + curpos -= 2; + else + if ( curpos ) + curpos--; + + break; + + case KEY_DC: + + if ( curpos < buffer.length() ) + { + buffer.erase ( curpos, 1 ); + buffer.insert ( std::wstring::size_type ( curpos ), 1, '0' ); + } + else + { + update = false; + beep = true; + } + + break; + + case KEY_HOME: + + if ( curpos ) + { + curpos = 0; + } + else + { + update = false; + beep = true; + } + + break; + + case KEY_END: + + if ( curpos < maxCursor() ) + { + curpos = maxCursor(); + } + else + { + update = false; + beep = true; + } + + break; + + case KEY_LEFT: + + if ( curpos == 5 || curpos == 8 ) + curpos -= 2; + else + if ( curpos ) + { + --curpos; + } + else + { + update = false; + beep = true; + } + + break; + + case KEY_RIGHT: + + if ( curpos == 3 || curpos == 6 ) + curpos += 2; + else + if ( curpos < maxCursor() ) + { + ++curpos; + } + else + { + update = false; + beep = true; + } + + break; + + case KEY_RETURN: + update = false; + + if ( notify() || returnOnReturn_b ) + ret = NCursesEvent::Activated; + + break; + + case KEY_HOTKEY: + update = false; + + break; + + default: + bool is_special = false; + + if ( key > 0xFFFF ) + { + is_special = true; + key -= 0xFFFF; + } + + if ( ( !is_special && KEY_MIN < key && KEY_MAX > key ) + || + !iswprint ( key ) ) + { + update = false; + beep = true; + } + else + { + { + switch ( key ) + { + case L'0': + case L'1': + case L'2': + case L'3': + case L'4': + case L'5': + case L'6': + case L'7': + case L'8': + case L'9': + { + std::string buf = NCstring(buffer).Str(); + buffer.erase ( curpos, 1 ); + buffer.insert ( std::wstring::size_type ( curpos ), 1, key ); + if (validDate(NCstring(buffer).Str())) + { + if ( curpos == 3 || curpos == 6 ) + curpos += 2; + else + if ( curpos < maxCursor() ) + ++curpos; + } + else + { + update = false; + setValue(buf); + beep = true; + } + } + break; + + default: + update = false; + beep = true; + break; + } + } + + } + + break; + } + + if ( update ) + { + tUpdate(); + + if ( notify() ) + ret = NCursesEvent::ValueChanged; + } + + if ( beep ) + ::beep(); + + return ret; + +} + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.8/src/NCDateField.h new/libyui-ncurses-2.46.10/src/NCDateField.h --- old/libyui-ncurses-2.46.8/src/NCDateField.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-ncurses-2.46.10/src/NCDateField.h 2015-02-18 14:50:10.000000000 +0100 @@ -0,0 +1,87 @@ +/* + Copyright (C) 2014 Angelo Naselli + + 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) version 3.0 of the License. This library + is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. You should have received a copy of the GNU + Lesser General Public License along with this library; if not, write + to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + Floor, Boston, MA 02110-1301 USA +*/ + + +/*-/ + + File: NCDateField.h + + Author: Angelo Naselli <anaselli(a)linux.it> + +/-*/ + +#ifndef NCDateField_h +#define NCDateField_h + +#include <iosfwd> + +#include <yui/YDateField.h> +#include "NCWidget.h" +#include "NCInputTextBase.h" + +class NCDateField : public YDateField, public NCInputTextBase +{ + + friend std::ostream & operator<< ( std::ostream & STREAM, const NCDateField & OBJ ); + + NCDateField & operator= ( const NCDateField & ); + NCDateField ( const NCDateField & ); + +private: + static const unsigned fieldLength; + + bool validDate(const std::string& input_date); + +protected: + + virtual const char * location() const + { + return "NCDateField"; + } + +public: + + NCDateField ( YWidget * parent, + const std::string & label + ); + virtual ~NCDateField(); + + virtual int preferredWidth(); + virtual int preferredHeight(); + + virtual void setSize ( int newWidth, int newHeight ); + + virtual void setLabel ( const std::string & nlabel ); + + virtual void setValue ( const std::string & ntext ); + virtual std::string value(); + + virtual void setEnabled ( bool do_bv ); + + virtual NCursesEvent wHandleInput ( wint_t key ); + + virtual bool setKeyboardFocus() + { + if ( !grabFocus() ) + return YWidget::setKeyboardFocus(); + + return true; + } + +}; + + +#endif // NCDateField_h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.8/src/NCInputTextBase.cc new/libyui-ncurses-2.46.10/src/NCInputTextBase.cc --- old/libyui-ncurses-2.46.8/src/NCInputTextBase.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-ncurses-2.46.10/src/NCInputTextBase.cc 2015-02-18 14:50:10.000000000 +0100 @@ -0,0 +1,296 @@ +/* + Copyright (C) 2014 Angelo Naselli + + 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) version 3.0 of the License. This library + is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. You should have received a copy of the GNU + Lesser General Public License along with this library; if not, write + to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + Floor, Boston, MA 02110-1301 USA +*/ + + +/*-/ + + File: NCInputText.cc + + Author: Angelo Naselli <anaselli(a)linux.it> + +/-*/ +#include <climits> + + +#define YUILogComponent "ncurses" +#include <yui/YUILog.h> +#include "NCurses.h" +#include "NCInputTextBase.h" + +#include <wctype.h> // iswalnum() + + +NCInputTextBase::NCInputTextBase ( YWidget * parent, + bool passwordMode, + unsigned maxInput, + unsigned maxFld ) + : NCWidget ( parent ) + , passwd ( passwordMode ) + , lwin ( 0 ) + , twin ( 0 ) + , maxFldLength ( maxFld ) + , maxInputLength ( maxInput ) + , fldstart ( 0 ) + , fldlength ( 0 ) + , curpos ( 0 ) + , returnOnReturn_b ( false ) +{ + yuiDebug() << std::endl; + + if ( maxInputLength && + ( !maxFldLength || maxFldLength > maxInputLength ) ) + { + maxFldLength = maxInputLength; + } + + hotlabel = &_label; +} + + + +NCInputTextBase::~NCInputTextBase() +{ + delete lwin; + delete twin; + yuiDebug() << std::endl; +} + + + +int NCInputTextBase::preferredWidth() +{ + return wGetDefsze().W; +} + + + +int NCInputTextBase::preferredHeight() +{ + return wGetDefsze().H; +} + + + +void NCInputTextBase::setEnabled ( bool do_bv ) +{ + NCWidget::setEnabled ( do_bv ); +} + + + +void NCInputTextBase::setSize ( int newwidth, int newheight ) +{ + wRelocate ( wpos ( 0 ), wsze ( newheight, newwidth ) ); +} + + + +void NCInputTextBase::setDefsze() +{ + unsigned defwidth = maxFldLength ? maxFldLength : 5; + + if ( _label.width() > defwidth ) + defwidth = _label.width(); + + defsze = wsze ( _label.height() + 1, defwidth ); +} + + + +void NCInputTextBase::wCreate ( const wrect & newrect ) +{ + NCWidget::wCreate ( newrect ); + + if ( !win ) + return; + + wrect lrect ( 0, wsze::min ( newrect.Sze, + wsze ( _label.height(), newrect.Sze.W ) ) ); + + if ( lrect.Sze.H == newrect.Sze.H ) + lrect.Sze.H -= 1; + + wrect trect ( 0, wsze ( 1, newrect.Sze.W ) ); + + trect.Pos.L = lrect.Sze.H > 0 ? lrect.Sze.H : 0; + + lwin = new NCursesWindow ( *win, + lrect.Sze.H, lrect.Sze.W, + lrect.Pos.L, lrect.Pos.C, + 'r' ); + + twin = new NCursesWindow ( *win, + trect.Sze.H, trect.Sze.W, + trect.Pos.L, trect.Pos.C, + 'r' ); + + if ( maxFldLength && maxFldLength < ( unsigned ) newrect.Sze.W ) + trect.Sze.W = maxFldLength; + + fldlength = trect.Sze.W; +} + + + +void NCInputTextBase::wDelete() +{ + delete lwin; + delete twin; + lwin = 0; + twin = 0; + NCWidget::wDelete(); +} + + +void NCInputTextBase::wRedraw() +{ + if ( !win ) + return; + + // label + const NCstyle::StWidget & style ( widgetStyle ( true ) ); + + lwin->bkgd ( style.plain ); + + lwin->clear(); + + _label.drawAt ( *lwin, style ); + + tUpdate(); +} + + + +bool NCInputTextBase::bufferFull() const +{ + return ( maxInputLength && buffer.length() == maxInputLength ); +} + + + +unsigned NCInputTextBase::maxCursor() const +{ + return ( bufferFull() ? buffer.length() - 1 : buffer.length() ); +} + + + +void NCInputTextBase::tUpdate() +{ + if ( !win ) + return; + + unsigned maxc = maxCursor(); + + // adjust cursor + if ( curpos > maxc ) + { + curpos = maxc; + } + + // adjust fldstart that cursor is visible + if ( maxc < fldlength ) + { + fldstart = 0; + } + else + { + if ( curpos <= fldstart ) + { + fldstart = curpos ? curpos - 1 : 0; + } + + if ( curpos >= fldstart + fldlength - 1 ) + { + fldstart = curpos + ( curpos == maxc ? 1 : 2 ) - fldlength; + } + } + + const NCstyle::StWidget & style ( widgetStyle() ); + + twin->bkgd ( widgetStyle ( true ).plain ); + + twin->move ( 0, 0 ); + + unsigned i = 0; + + unsigned end = fldlength; + + const wchar_t * cp = buffer.data() + fldstart; + + // draw left scrollhint if + if ( *cp && fldstart ) + { + twin->bkgdset ( style.scrl ); + twin->addch ( ACS_LARROW ); + ++i; + ++cp; + } + + // check for right scrollhint + if ( fldstart + fldlength <= maxc ) + { + --end; + } + + // draw field + twin->bkgdset ( style.data ); + + for ( /*adjusted i*/; *cp && i < end; ++i ) + { + if ( passwd ) + { + twin->addwstr ( L"*" ); + } + else + { + twin->addwstr ( cp, 1 ); + } + + ++cp; + } + + twin->bkgdset ( style.plain ); + + for ( /*adjusted i*/; i < end; ++i ) + { + twin->addch ( ACS_CKBOARD ); + } + + // draw right scrollhint if + if ( end < fldlength ) + { + twin->bkgdset ( style.scrl ); + twin->addch ( ACS_RARROW ); + } + + // reverse curpos + if ( GetState() == NC::WSactive ) + { + twin->move ( 0, curpos - fldstart ); + twin->bkgdset ( wStyle().cursor ); + + if ( curpos < buffer.length() ) + twin->add_attr_char( ); + else + twin->addch ( ACS_CKBOARD ); + } + + Update(); +} + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.8/src/NCInputTextBase.h new/libyui-ncurses-2.46.10/src/NCInputTextBase.h --- old/libyui-ncurses-2.46.8/src/NCInputTextBase.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-ncurses-2.46.10/src/NCInputTextBase.h 2015-02-18 14:50:10.000000000 +0100 @@ -0,0 +1,105 @@ +/* + Copyright (C) 2014 Angelo Naselli + + 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) version 3.0 of the License. This library + is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. You should have received a copy of the GNU + Lesser General Public License along with this library; if not, write + to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + Floor, Boston, MA 02110-1301 USA +*/ + + +/*-/ + + File: NCInputText.h + + Author: Angelo Naselli <anaselli(a)linux.it> + +/-*/ +#ifndef NCInputText_h +#define NCInputText_h + +#include <iosfwd> + +#include "NCWidget.h" + + +class NCInputTextBase : public NCWidget +{ + + friend std::ostream & operator<< ( std::ostream & STREAM, const NCInputTextBase & OBJ ); + + NCInputTextBase & operator= ( const NCInputTextBase & ); + NCInputTextBase ( const NCInputTextBase & ); + +protected: + + bool passwd; + NClabel _label; + std::wstring buffer; + + NCursesWindow * lwin; + NCursesWindow * twin; + + unsigned maxFldLength; + unsigned maxInputLength; + + unsigned fldstart; + unsigned fldlength; + unsigned curpos; + + bool returnOnReturn_b; + + virtual void setDefsze(); + virtual void tUpdate(); + + virtual bool bufferFull() const; + virtual unsigned maxCursor() const; + + virtual const char * location() const + { + return "NCInputTextBase"; + } + + virtual void wCreate ( const wrect & newrect ); + virtual void wDelete(); + + virtual void wRedraw(); + + + NCInputTextBase ( YWidget * parent, + bool passwordMode = false, + unsigned maxInput = 0, + unsigned maxFld = 0 + ); + virtual ~NCInputTextBase(); + +public: + + void setReturnOnReturn ( bool on_br ) + { + returnOnReturn_b = on_br; + } + + virtual int preferredWidth(); + virtual int preferredHeight(); + + virtual void setSize ( int newWidth, int newHeight ); + + virtual void setEnabled ( bool do_bv ); + + virtual void setCurPos ( unsigned pos ) + { + curpos = pos; + } + +}; + + +#endif // NCInputText_h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.8/src/NCOptionalWidgetFactory.cc new/libyui-ncurses-2.46.10/src/NCOptionalWidgetFactory.cc --- old/libyui-ncurses-2.46.8/src/NCOptionalWidgetFactory.cc 2014-02-21 11:37:26.000000000 +0100 +++ new/libyui-ncurses-2.46.10/src/NCOptionalWidgetFactory.cc 2015-02-18 14:50:10.000000000 +0100 @@ -24,6 +24,8 @@ #include "NCOptionalWidgetFactory.h" #include <yui/YUIException.h> +#include <NCTimeField.h> +#include <NCDateField.h> #define THROW_UNSUPPORTED( WIDGET_TYPE ) \ @@ -57,5 +59,30 @@ return dumbTab; } +bool NCOptionalWidgetFactory::hasTimeField() +{ + return true; +} + +YTimeField* NCOptionalWidgetFactory::createTimeField( YWidget * parent, const std::string & label ) +{ + NCTimeField * timeField = new NCTimeField( parent, label ); + YUI_CHECK_NEW( timeField ); + + return timeField; +} + +bool NCOptionalWidgetFactory::hasDateField() +{ + return true; +} + +YDateField* NCOptionalWidgetFactory::createDateField( YWidget * parent, const std::string & label ) +{ + NCDateField * dateField = new NCDateField( parent, label ); + YUI_CHECK_NEW( dateField ); + + return dateField; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.8/src/NCOptionalWidgetFactory.h new/libyui-ncurses-2.46.10/src/NCOptionalWidgetFactory.h --- old/libyui-ncurses-2.46.8/src/NCOptionalWidgetFactory.h 2014-02-21 11:37:26.000000000 +0100 +++ new/libyui-ncurses-2.46.10/src/NCOptionalWidgetFactory.h 2015-02-18 14:50:10.000000000 +0100 @@ -29,6 +29,8 @@ #include <yui/YOptionalWidgetFactory.h> #include "NCDumbTab.h" +class YTimeField; +class YDateField; /** * Widget factory for optional ("special") widgets. @@ -68,6 +70,12 @@ NCDumbTab *createDumbTab( YWidget * parent ); + bool hasTimeField(); + YTimeField* createTimeField( YWidget * parent, const std::string & label ); + + bool hasDateField(); + YDateField* createDateField( YWidget * parent, const std::string & label ); + }; // class NCOptionalWidgetFactory diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.8/src/NCTimeField.cc new/libyui-ncurses-2.46.10/src/NCTimeField.cc --- old/libyui-ncurses-2.46.8/src/NCTimeField.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-ncurses-2.46.10/src/NCTimeField.cc 2015-02-18 14:50:10.000000000 +0100 @@ -0,0 +1,337 @@ +/* + Copyright (C) 2014 Angelo Naselli + + 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) version 3.0 of the License. This library + is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. You should have received a copy of the GNU + Lesser General Public License along with this library; if not, write + to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + Floor, Boston, MA 02110-1301 USA +*/ + + +/*-/ + + File: NCTimeField.cc + + Author: Angelo Naselli <anaselli(a)linux.it> + +/-*/ +#include <climits> +#include <iostream> +#include <sstream> + +#define YUILogComponent "ncurses" +#include <yui/YUILog.h> +#include "NCurses.h" +#include "NCTimeField.h" +#include "NCInputTextBase.h" + +#include <wctype.h> // iswalnum() + + +const unsigned NCTimeField::fieldLength = 8; + +NCTimeField::NCTimeField ( YWidget * parent, + const std::string & nlabel ) + : YTimeField ( parent, nlabel ) + , NCInputTextBase ( parent, false, fieldLength, fieldLength ) +{ + yuiDebug() << std::endl; + + setLabel ( nlabel ); + + setValue ( "00:00:00" ); +} + + + +NCTimeField::~NCTimeField() +{ + yuiDebug() << std::endl; +} + + + +int NCTimeField::preferredWidth() +{ + return NCInputTextBase::preferredWidth(); +} + + + +int NCTimeField::preferredHeight() +{ + return NCInputTextBase::preferredHeight(); +} + + + +void NCTimeField::setSize ( int newwidth, int newheight ) +{ + NCInputTextBase::setSize ( newwidth, newheight ); +} + + +void NCTimeField::setEnabled ( bool do_bv ) +{ + NCWidget::setEnabled ( do_bv ); + YWidget::setEnabled ( do_bv ); +} + +void NCTimeField::setLabel ( const std::string & nlabel ) +{ + _label = NCstring ( nlabel ); + _label.stripHotkey(); + YTimeField::setLabel ( nlabel ); + setDefsze(); + Redraw(); +} + + +bool NCTimeField::validTime(const std::string& input_time) +{ + tm tm1; + std::stringstream ss; + ss << input_time; + char c; + + if (!(ss >> tm1.tm_hour)) + return false; + ss >> c; + + if (!(ss >> tm1.tm_min)) + return false; + ss >> c; + + if (!(ss >> tm1.tm_sec)) + return false; + + return (tm1.tm_hour<=23 && tm1.tm_min <= 59 && tm1.tm_sec <= 59); +} + + +void NCTimeField::setValue ( const std::string & ntext ) +{ + if (validTime(ntext)) + { + buffer = NCstring ( ntext ).str(); + + if ( buffer.length() > maxFldLength ) + { + buffer = buffer.erase ( maxFldLength ); + } + + fldstart = 0; + + tUpdate(); + } +} + + + +std::string NCTimeField::value( ) +{ + NCstring text ( buffer ); + + return text.Str(); +} + + +NCursesEvent NCTimeField::wHandleInput ( wint_t key ) +{ + NCursesEvent ret = NCursesEvent::none; + bool beep = false; + bool update = true; + + switch ( key ) + { + case '\b': //ctrl-h + case 0x7f: //del + case KEY_BACKSPACE: + + buffer.erase ( curpos, 1 ); + buffer.insert ( std::wstring::size_type ( curpos ), 1, '0' ); + if ( curpos == 3 || curpos == 6 ) + curpos -= 2; + else + if ( curpos ) + curpos--; + + break; + + case KEY_DC: + + if ( curpos < buffer.length() ) + { + buffer.erase ( curpos, 1 ); + buffer.insert ( std::wstring::size_type ( curpos ), 1, '0' ); + } + else + { + update = false; + beep = true; + } + + break; + + case KEY_HOME: + + if ( curpos ) + { + curpos = 0; + } + else + { + update = false; + beep = true; + } + + break; + + case KEY_END: + + if ( curpos < maxCursor() ) + { + curpos = maxCursor(); + } + else + { + update = false; + beep = true; + } + + break; + + case KEY_LEFT: + + if ( curpos == 3 || curpos == 6 ) + curpos -= 2; + else + if ( curpos ) + { + --curpos; + } + else + { + update = false; + beep = true; + } + + break; + + case KEY_RIGHT: + + if ( curpos == 1 || curpos == 4 ) + curpos += 2; + else + if ( curpos < maxCursor() ) + { + ++curpos; + } + else + { + update = false; + beep = true; + } + + break; + + case KEY_RETURN: + update = false; + + if ( notify() || returnOnReturn_b ) + ret = NCursesEvent::Activated; + + break; + + case KEY_HOTKEY: + update = false; + + break; + + default: + bool is_special = false; + + if ( key > 0xFFFF ) + { + is_special = true; + key -= 0xFFFF; + } + + if ( ( !is_special && KEY_MIN < key && KEY_MAX > key ) + || + !iswprint ( key ) ) + { + update = false; + beep = true; + } + else + { + { + switch ( key ) + { + case L'0': + case L'1': + case L'2': + case L'3': + case L'4': + case L'5': + case L'6': + case L'7': + case L'8': + case L'9': + { + std::string buf = NCstring(buffer).Str(); + buffer.erase ( curpos, 1 ); + buffer.insert ( std::wstring::size_type ( curpos ), 1, key ); + + if (validTime(NCstring(buffer).Str())) + { + if ( curpos == 1 || curpos == 4 ) + curpos += 2; + else if ( curpos < maxCursor() ) + ++curpos; + } + else + { + update = false; + setValue(buf); + beep = true; + } + } + break; + + default: + update = false; + beep = true; + break; + } + } + + } + + break; + } + + if ( update ) + { + tUpdate(); + + if ( notify() ) + ret = NCursesEvent::ValueChanged; + } + + if ( beep ) + ::beep(); + + return ret; + +} + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.8/src/NCTimeField.h new/libyui-ncurses-2.46.10/src/NCTimeField.h --- old/libyui-ncurses-2.46.8/src/NCTimeField.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-ncurses-2.46.10/src/NCTimeField.h 2015-02-18 14:50:10.000000000 +0100 @@ -0,0 +1,88 @@ +/* + Copyright (C) Angelo Naselli + + 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) version 3.0 of the License. This library + is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. You should have received a copy of the GNU + Lesser General Public License along with this library; if not, write + to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + Floor, Boston, MA 02110-1301 USA +*/ + + +/*-/ + + File: NCTimeField.h + + Author: Angelo Naselli <anaselli(a)linux.it> + +/-*/ + +#ifndef NCTimeField_h +#define NCTimeField_h + +#include <iosfwd> + +#include <yui/YTimeField.h> +#include "NCWidget.h" +#include "NCInputTextBase.h" + + +class NCTimeField : public YTimeField, public NCInputTextBase +{ + + friend std::ostream & operator<< ( std::ostream & STREAM, const NCTimeField & OBJ ); + + NCTimeField & operator= ( const NCTimeField & ); + NCTimeField ( const NCTimeField & ); + +private: + static const unsigned fieldLength; + + bool validTime(const std::string& input_time); + +protected: + + virtual const char * location() const + { + return "NCTimeField"; + } + +public: + + NCTimeField ( YWidget * parent, + const std::string & label + ); + virtual ~NCTimeField(); + + virtual int preferredWidth(); + virtual int preferredHeight(); + + virtual void setSize ( int newWidth, int newHeight ); + + virtual void setLabel ( const std::string & nlabel ); + + virtual void setValue ( const std::string & ntext ); + virtual std::string value(); + + virtual void setEnabled ( bool do_bv ); + + virtual NCursesEvent wHandleInput ( wint_t key ); + + virtual bool setKeyboardFocus() + { + if ( !grabFocus() ) + return YWidget::setKeyboardFocus(); + + return true; + } + +}; + + +#endif // NCTimeField_h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.8/src/ncursesw.cc new/libyui-ncurses-2.46.10/src/ncursesw.cc --- old/libyui-ncurses-2.46.8/src/ncursesw.cc 2014-02-21 11:37:26.000000000 +0100 +++ new/libyui-ncurses-2.46.10/src/ncursesw.cc 2015-02-04 11:15:13.000000000 +0100 @@ -377,7 +377,6 @@ static int r_init_idx = 0; static RIPOFFINIT* prip = R_INIT; -extern "C" int _nc_ripoffline( int, int ( *init )( WINDOW*, int ) ); NCursesWindow::NCursesWindow( WINDOW *win, int cols ) { @@ -405,7 +404,7 @@ int NCursesWindow::ripoffline( int ripoff_lines, int ( *init )( NCursesWindow& win ) ) { - int code = ::_nc_ripoffline( ripoff_lines, ripoff_init ); + int code = ::ripoffline( ripoff_lines, ripoff_init ); if ( code == OK && init && ripoff_lines ) { @@ -579,7 +578,6 @@ return OK; } - int NCursesWindow::setcolor( short pair ) { @@ -596,11 +594,9 @@ return OK; } -extern "C" int _nc_has_mouse( void ); - bool NCursesWindow::has_mouse() const { - return (( ::has_key( KEY_MOUSE ) || ::_nc_has_mouse() ) + return (( ::has_key( KEY_MOUSE ) || ::has_mouse() ) ? TRUE : FALSE ); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package perl for openSUSE:Factory checked in at 2015-02-20 12:00:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl (Old) and /work/SRC/openSUSE:Factory/.perl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl" Changes: -------- --- /work/SRC/openSUSE:Factory/perl/perl.changes 2014-09-28 19:53:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl.new/perl.changes 2015-02-20 12:00:32.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 5 07:44:14 UTC 2015 - coolo(a)suse.com + +- use rm with -f to avoid prompts for rpmbuild in terminals + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl.spec ++++++ --- /var/tmp/diff_new_pack.Rs8iFq/_old 2015-02-20 12:00:33.000000000 +0100 +++ /var/tmp/diff_new_pack.Rs8iFq/_new 2015-02-20 12:00:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -253,9 +253,9 @@ d="`gcc -print-file-name=include`" test -f "$d/stdarg.h" && (cd $d ; $RPM_BUILD_ROOT/usr/bin/perl -I$cp -I$cpa $RPM_BUILD_ROOT/usr/bin/h2ph -d $vpa stdarg.h stddef.h float.h) # remove broken pm - we don't have the module -rm $RPM_BUILD_ROOT/usr/lib/perl5/*/Pod/Perldoc/ToTk.pm +rm -f $RPM_BUILD_ROOT/usr/lib/perl5/*/Pod/Perldoc/ToTk.pm # we don't need this in here -rm $RPM_BUILD_ROOT/usr/lib/perl5/*/*/CORE/libperl.a +rm -f $RPM_BUILD_ROOT/usr/lib/perl5/*/*/CORE/libperl.a #touch $RPM_BUILD_ROOT/usr/share/man/man3/perllocal.3pm #touch $cpa/perllocal.pod # test CVE-2007-5116 @@ -264,37 +264,37 @@ $RPM_BUILD_ROOT/usr/bin/perl -e 'eval "/\\6666666666/"' %if 0 # remove unrelated target/os manpages -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlaix.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlamiga.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlapollo.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlbeos.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlbs2000.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlcygwin.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perldgux.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perldos.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlepoc.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlfreebsd.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlhpux.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlhurd.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlirix.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlmachten.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlmacos.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlmacosx.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlmint.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlnetware.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlopenbsd.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlos2.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlos390.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlos400.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlplan9.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlqnx.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlsolaris.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perltru64.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perluts.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlvmesa.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlvms.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlvos.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlwin32.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlaix.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlamiga.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlapollo.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlbeos.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlbs2000.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlcygwin.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perldgux.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perldos.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlepoc.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlfreebsd.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlhpux.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlhurd.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlirix.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlmachten.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlmacos.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlmacosx.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlmint.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlnetware.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlopenbsd.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlos2.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlos390.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlos400.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlplan9.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlqnx.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlsolaris.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perltru64.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perluts.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlvmesa.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlvms.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlvos.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlwin32.1* %endif cat << EOF > perl-base-filelist /usr/lib/perl5/%pversion/B/Deparse.pm -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit elfutils for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package elfutils for openSUSE:Factory checked in at 2015-02-20 12:00:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/elfutils (Old) and /work/SRC/openSUSE:Factory/.elfutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "elfutils" Changes: -------- --- /work/SRC/openSUSE:Factory/elfutils/elfutils.changes 2015-01-10 23:04:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.elfutils.new/elfutils.changes 2015-02-20 12:00:31.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 11 01:28:52 UTC 2015 - tonyj(a)suse.com + +- Make ebl modversion predictable to allow build-compare (bnc#916043) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ elfutils.spec ++++++ --- /var/tmp/diff_new_pack.MxaucA/_old 2015-02-20 12:00:32.000000000 +0100 +++ /var/tmp/diff_new_pack.MxaucA/_new 2015-02-20 12:00:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package elfutils # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,6 +37,8 @@ Patch6: elfutils-0.148-dont-crash.diff Patch7: elfutils-fix-dir-traversal-vuln-in-ar-extraction.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: autoconf +BuildRequires: automake BuildRequires: bison BuildRequires: flex BuildRequires: libbz2-devel @@ -156,10 +158,15 @@ DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" TIME="\"$(date -d "${modified}" "+%%R")\"" find . -type f -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} + +# Set modversion used to verify dynamically loaded ebl backend matches to +# similarly predictable value [upstream default is hostname + date] +MODVERSION="suse-build `eval echo ${DATE} ${TIME}`" +sed --in-place "s/^MODVERSION=.*\$/MODVERSION=\"${MODVERSION}\"/" configure.ac %ifarch %sparc # Small PIC model not sufficient export CFLAGS="%optflags -fPIC" %endif +autoreconf -fi %configure --program-prefix=eu- make %{?_smp_mflags} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit valgrind for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package valgrind for openSUSE:Factory checked in at 2015-02-20 12:00:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/valgrind (Old) and /work/SRC/openSUSE:Factory/.valgrind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "valgrind" Changes: -------- --- /work/SRC/openSUSE:Factory/valgrind/valgrind.changes 2015-02-12 10:20:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.valgrind.new/valgrind.changes 2015-02-20 12:00:30.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 12 11:46:20 UTC 2015 - rguenther(a)suse.com + +- gcc-version.patch: Add support for GCC 5. + +------------------------------------------------------------------- New: ---- gcc-version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ valgrind.spec ++++++ --- /var/tmp/diff_new_pack.QbuC6V/_old 2015-02-20 12:00:31.000000000 +0100 +++ /var/tmp/diff_new_pack.QbuC6V/_new 2015-02-20 12:00:31.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package valgrind # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,6 +41,7 @@ Patch1: jit-register-unregister.diff Patch2: armv6-support.diff Patch3: glibc-version.patch +Patch4: gcc-version.patch # during building the major version of glibc is built into the suppression file %define glibc_main_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f1) %define glibc_major_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f2) @@ -138,6 +139,7 @@ %patch1 %patch2 %patch3 -p1 +%patch4 %build %ifarch %arm ++++++ gcc-version.patch ++++++ Index: configure.ac =================================================================== --- configure.ac.orig 2015-02-12 12:44:54.171760724 +0100 +++ configure.ac 2015-02-12 12:45:05.779894998 +0100 @@ -138,7 +138,7 @@ case "${is_clang}-${gcc_version}" in notclang-4.*) AC_MSG_RESULT([ok (${gcc_version})]) ;; - notclang-5.*) + notclang-5*) AC_MSG_RESULT([ok (${gcc_version})]) ;; clang-2.9|clang-3.*|clang-4.*) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tar for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package tar for openSUSE:Factory checked in at 2015-02-20 12:00:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tar (Old) and /work/SRC/openSUSE:Factory/.tar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tar" Changes: -------- --- /work/SRC/openSUSE:Factory/tar/tar.changes 2014-12-23 12:31:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tar.new/tar.changes 2015-02-20 12:00:29.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 9 14:00:15 UTC 2015 - vcizek(a)suse.com + +- extract files recursively with --files-from (bnc#913058) + * added tar-recursive--files-from.patch +- call autoreconf in %prep + +------------------------------------------------------------------- New: ---- tar-recursive--files-from.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tar.spec ++++++ --- /var/tmp/diff_new_pack.dZPDOT/_old 2015-02-20 12:00:30.000000000 +0100 +++ /var/tmp/diff_new_pack.dZPDOT/_new 2015-02-20 12:00:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tar # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,8 +39,10 @@ # the patch is used in Fedora and Debian # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=235820 Patch11: tar-ignore_lone_zero_blocks.patch +Patch12: tar-recursive--files-from.patch Patch20: add_readme-tests.patch %if 0%{?suse_version} >= %min_suse_ver +BuildRequires: automake BuildRequires: help2man BuildRequires: libacl-devel BuildRequires: libattr-devel @@ -86,6 +88,7 @@ %patch7 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %patch20 -p1 %build @@ -93,6 +96,7 @@ export CFLAGS="%{optflags} %my_cflags" export RSH="/usr/bin/rsh" export DEFAULT_ARCHIVE_FORMAT="POSIX" +autoreconf -fi %configure \ gl_cv_func_linkat_follow="yes" \ --enable-backup-scripts \ ++++++ tar-recursive--files-from.patch ++++++ From http://lists.gnu.org/archive/html/bug-tar/2014-09/msg00009.html * src/common.h (name_add_file): Change signature. * src/names.c (name_elt_alloc_matflags): New function. (name_add_name): Use name_elt_alloc_matflags. (name_add_file): Take matching flags as third argument. (read_next_name): Remove trailing slashes. * src/tar.c (parse_opt): Pass matching_flags to name_add_file. * tests/T-dir00.at: New file. * tests/T-dir01.at: New file. * tests/Makefile.am: Add new testcases. * tests/testsuite.at: Likewise. --- src/common.h | 2 +- src/names.c | 56 ++++++++++++++++++++++++++++++++++-------------------- src/tar.c | 2 +- tests/Makefile.am | 2 ++ tests/T-dir00.at | 45 +++++++++++++++++++++++++++++++++++++++++++ tests/T-dir01.at | 45 +++++++++++++++++++++++++++++++++++++++++++ tests/testsuite.at | 2 ++ 7 files changed, 131 insertions(+), 23 deletions(-) create mode 100644 tests/T-dir00.at create mode 100644 tests/T-dir01.at Index: tar-1.28/src/common.h =================================================================== --- tar-1.28.orig/src/common.h 2015-02-09 15:05:47.642772569 +0100 +++ tar-1.28/src/common.h 2015-02-09 15:05:50.076794925 +0100 @@ -725,7 +725,7 @@ int uname_to_uid (char const *uname, uid void name_init (void); void name_add_name (const char *name, int matching_flags); void name_add_dir (const char *name); -void name_add_file (const char *name, int term); +void name_add_file (const char *name, int term, int matching_flags); void name_term (void); const char *name_next (int change_dirs); void name_gather (void); Index: tar-1.28/src/names.c =================================================================== --- tar-1.28.orig/src/names.c 2015-02-09 15:05:47.642772569 +0100 +++ tar-1.28/src/names.c 2015-02-09 15:05:50.076794925 +0100 @@ -258,6 +258,21 @@ name_elt_alloc (void) return elt; } +static struct name_elt * +name_elt_alloc_matflags (int matflags) +{ + static int prev_flags = 0; /* FIXME: Or EXCLUDE_ANCHORED? */ + struct name_elt *ep = name_elt_alloc (); + if (prev_flags != matflags) + { + ep->type = NELT_FMASK; + ep->v.matching_flags = matflags; + prev_flags = matflags; + ep = name_elt_alloc (); + } + return ep; +} + static void name_list_adjust (void) { @@ -276,20 +291,13 @@ name_list_advance (void) free (elt); } -/* Add to name_array the file NAME with fnmatch options MATCHING_FLAGS */ + +/* Add to name_array the file NAME with fnmatch options MATFLAGS */ void -name_add_name (const char *name, int matching_flags) +name_add_name (const char *name, int matflags) { - static int prev_flags = 0; /* FIXME: Or EXCLUDE_ANCHORED? */ - struct name_elt *ep = name_elt_alloc (); + struct name_elt *ep = name_elt_alloc_matflags (matflags); - if (prev_flags != matching_flags) - { - ep->type = NELT_FMASK; - ep->v.matching_flags = matching_flags; - prev_flags = matching_flags; - ep = name_elt_alloc (); - } ep->type = NELT_NAME; ep->v.name = name; name_count++; @@ -305,9 +313,10 @@ name_add_dir (const char *name) } void -name_add_file (const char *name, int term) +name_add_file (const char *name, int term, int matflags) { - struct name_elt *ep = name_elt_alloc (); + struct name_elt *ep = name_elt_alloc_matflags (matflags); + ep->type = NELT_FILE; ep->v.file.name = name; ep->v.file.term = term; @@ -389,6 +398,15 @@ add_file_id (const char *filename) file_id_list = p; return 0; } + +/* Chop trailing slashes. */ +static void +chopslash (char *str) +{ + char *p = str + strlen (str) - 1; + while (p > str && ISSLASH (*p)) + *p-- = '\0'; +} enum read_file_list_state /* Result of reading file name from the list file */ { @@ -428,7 +446,7 @@ read_name_from_file (struct name_elt *en if (counter == name_buffer_length) name_buffer = x2realloc (name_buffer, &name_buffer_length); name_buffer[counter] = 0; - + chopslash (name_buffer); return (counter == 0 && c == EOF) ? file_list_end : file_list_success; } @@ -518,7 +536,6 @@ copy_name (struct name_elt *ep) { const char *source; size_t source_len; - char *cursor; source = ep->v.name; source_len = strlen (source); @@ -536,11 +553,7 @@ copy_name (struct name_elt *ep) name_buffer = xmalloc(name_buffer_length + 2); } strcpy (name_buffer, source); - - /* Zap trailing slashes. */ - cursor = name_buffer + strlen (name_buffer) - 1; - while (cursor > name_buffer && ISSLASH (*cursor)) - *cursor-- = '\0'; + chopslash (name_buffer); } @@ -553,7 +566,8 @@ static int matching_flags; /* exclude_fn the request to change to the given directory. Entries of type NELT_FMASK cause updates of the matching_flags - value. */ + value. +*/ static struct name_elt * name_next_elt (int change_dirs) { Index: tar-1.28/src/tar.c =================================================================== --- tar-1.28.orig/src/tar.c 2015-02-09 15:05:47.642772569 +0100 +++ tar-1.28/src/tar.c 2015-02-09 15:05:50.077794935 +0100 @@ -1641,7 +1641,7 @@ parse_opt (int key, char *arg, struct ar break; case 'T': - name_add_file (arg, filename_terminator); + name_add_file (arg, filename_terminator, MAKE_INCL_OPTIONS (args)); /* Indicate we've been given -T option. This is for backward compatibility only, so that `tar cfT archive /dev/null will succeed */ Index: tar-1.28/tests/Makefile.am =================================================================== --- tar-1.28.orig/tests/Makefile.am 2015-02-09 15:05:47.642772569 +0100 +++ tar-1.28/tests/Makefile.am 2015-02-09 15:05:50.077794935 +0100 @@ -43,6 +43,8 @@ $(srcdir)/package.m4: $(top_srcdir)/conf TESTSUITE_AT = \ T-cd.at\ + T-dir00.at\ + T-dir01.at\ T-empty.at\ T-null.at\ T-rec.at\ Index: tar-1.28/tests/T-dir00.at =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ tar-1.28/tests/T-dir00.at 2015-02-09 15:05:50.077794935 +0100 @@ -0,0 +1,45 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- +# +# Test suite for GNU tar. +# Copyright 2014 Free Software Foundation, Inc. + +# This file is part of GNU tar. + +# GNU tar 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 3 of the License, or +# (at your option) any later version. + +# GNU tar 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/>. + +# Tar 1.27 and 1.28 did not extract files under directory memberes listed +# in the file read by --file-from. +# +# Reported-by: Jean-Louis Martineau <address@hidden> +# References: <address@hidden>, +# http://lists.gnu.org/archive/html/bug-tar/2014-09/msg00006.html + +AT_SETUP([recursive extraction from --files-from]) +AT_KEYWORDS([files-from extract T-dir T-dir00]) +AT_TAR_CHECK([ +mkdir dir +genfile -f dir/file1 +genfile -f dir/file2 +tar cf archive dir +rm -rf dir +echo dir > list +tar xfTv archive list | sort +], +[0], +[dir/ +dir/file1 +dir/file2 +]) +AT_CLEANUP + Index: tar-1.28/tests/T-dir01.at =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ tar-1.28/tests/T-dir01.at 2015-02-09 15:45:52.309679130 +0100 @@ -0,0 +1,45 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- +# +# Test suite for GNU tar. +# Copyright 2014 Free Software Foundation, Inc. + +# This file is part of GNU tar. + +# GNU tar 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 3 of the License, or +# (at your option) any later version. + +# GNU tar 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/>. + +# Tar 1.27 and 1.28 did not remove trailing slashes from file names +# obtained with the --file-from option. +# +# Reported-by: Jean-Louis Martineau <address@hidden> +# References: <address@hidden>, +# http://lists.gnu.org/archive/html/bug-tar/2014-09/msg00006.html + +AT_SETUP([trailing slash in --files-from]) +AT_KEYWORDS([files-from extract T-dir T-dir01]) +AT_TAR_CHECK([ +mkdir dir +genfile -f dir/file1 +genfile -f dir/file2 +tar cf archive dir +rm -rf dir +echo dir/ > list +tar xfTv archive list | sort +], +[0], +[dir/ +dir/file1 +dir/file2 +]) +AT_CLEANUP + Index: tar-1.28/tests/testsuite.at =================================================================== --- tar-1.28.orig/tests/testsuite.at 2015-02-09 15:05:47.642772569 +0100 +++ tar-1.28/tests/testsuite.at 2015-02-09 15:05:50.116795293 +0100 @@ -205,6 +205,8 @@ m4_include([T-empty.at]) m4_include([T-null.at]) m4_include([T-zfile.at]) m4_include([T-nonl.at]) +m4_include([T-dir00.at]) +m4_include([T-dir01.at]) AT_BANNER([Various options]) m4_include([indexfile.at])

1 0

commit dracut for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2015-02-20 12:00:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dracut" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2015-02-06 22:36:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2015-02-20 12:00:25.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 9 14:28:56 UTC 2015 - dimstar(a)opensuse.org + +- Do no longer package 02caps: patch 90 takes care of removing it. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.Cvw0lm/_old 2015-02-20 12:00:28.000000000 +0100 +++ /var/tmp/diff_new_pack.Cvw0lm/_new 2015-02-20 12:00:28.000000000 +0100 @@ -549,7 +549,6 @@ %{dracutlibdir}/modules.d/00bash %{dracutlibdir}/modules.d/00systemd-bootchart/module-setup.sh %{dracutlibdir}/modules.d/00warpclock -%{dracutlibdir}/modules.d/02caps %{dracutlibdir}/modules.d/03modsign %{dracutlibdir}/modules.d/03rescue/module-setup.sh %{dracutlibdir}/modules.d/04watchdog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0