August 2016 - openSUSE Commits - openSUSE Mailing Lists

commit patchinfo.5539 for openSUSE:13.2:Update
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package patchinfo.5539 for openSUSE:13.2:Update checked in at 2016-08-31 17:48:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/patchinfo.5539 (Old) and /work/SRC/openSUSE:13.2:Update/.patchinfo.5539.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.5539" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo incident="5539"> <issue id="994157" tracker="bnc">VUL-0: CVE-2016-6313: libgcrypt,gpg: RNG prediction vulnerability</issue> <issue id="2016-6313" tracker="cve" /> <category>security</category> <rating>moderate</rating> <packager>pjanouch</packager> <description> This update for libgcrypt fixes the following issues: - RNG prediction vulnerability (boo#994157, CVE-2016-6313) </description> <summary>Security update for libgcrypt</summary> </patchinfo>

1 0

commit libgcrypt for openSUSE:13.2:Update
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package libgcrypt for openSUSE:13.2:Update checked in at 2016-08-31 17:48:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/libgcrypt (Old) and /work/SRC/openSUSE:13.2:Update/.libgcrypt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgcrypt" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.brS51q/_old 2016-08-31 17:48:57.000000000 +0200 +++ /var/tmp/diff_new_pack.brS51q/_new 2016-08-31 17:48:57.000000000 +0200 @@ -1 +1 @@ -<link package='libgcrypt.5091' cicount='copy' /> +<link package='libgcrypt.5539' cicount='copy' />

1 0

commit patchinfo.5538 for openSUSE:13.2:Update
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package patchinfo.5538 for openSUSE:13.2:Update checked in at 2016-08-31 16:17:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/patchinfo.5538 (Old) and /work/SRC/openSUSE:13.2:Update/.patchinfo.5538.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.5538" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo incident="5538"> <issue id="995034" tracker="bnc">VUL-0: CVE-2016-6905: gd: Out-of-bounds read in function read_image_tga in gd_tga.c</issue> <issue id="2016-6905" tracker="cve" /> <category>security</category> <rating>moderate</rating> <packager>pgajdos</packager> <description> This update for gd fixes the following issues: - Out-of-bounds read in function read_image_tga in gd_tga.c (CVE-2016-6905, boo#995034) </description> <summary>Security update for gd</summary> </patchinfo>

1 0

commit gd for openSUSE:13.2:Update
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package gd for openSUSE:13.2:Update checked in at 2016-08-31 16:17:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/gd (Old) and /work/SRC/openSUSE:13.2:Update/.gd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gd" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.XPjPSx/_old 2016-08-31 16:17:45.000000000 +0200 +++ /var/tmp/diff_new_pack.XPjPSx/_new 2016-08-31 16:17:45.000000000 +0200 @@ -1 +1 @@ -<link package='gd.5490' cicount='copy' /> +<link package='gd.5538' cicount='copy' />

1 0

commit gd.5538 for openSUSE:13.2:Update
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package gd.5538 for openSUSE:13.2:Update checked in at 2016-08-31 16:17:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/gd.5538 (Old) and /work/SRC/openSUSE:13.2:Update/.gd.5538.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gd.5538" Changes: -------- New Changes file: --- /dev/null 2016-07-07 10:01:34.856033756 +0200 +++ /work/SRC/openSUSE:13.2:Update/.gd.5538.new/gd.changes 2016-08-31 16:17:35.000000000 +0200 @@ -0,0 +1,435 @@ +------------------------------------------------------------------- +Tue Aug 23 12:58:16 UTC 2016 - pgajdos(a)suse.com + +- security update: + * CVE-2016-6905 [bsc#995034] + + gd-CVE-2016-6905.patch + +------------------------------------------------------------------- +Mon Aug 8 10:47:51 UTC 2016 - pgajdos(a)suse.com + +- security update: + * CVE-2016-6214 [bsc#991436] + + gd-CVE-2016-6214.patch + * CVE-2016-6132 [bsc#987577] + + gd-CVE-2016-6132.patch + * CVE-2016-6128 [bsc#991710] + + gd-CVE-2016-6128.patch + * CVE-2016-6207 [bsc#991622] + + gd-CVE-2016-6207.patch + * CVE-2016-6161 [bsc#988032] + + gd-CVE-2016-6161.patch + +------------------------------------------------------------------- +Mon May 30 13:20:20 UTC 2016 - pgajdos(a)suse.com + +- security update: + * CVE-2016-5116 [bsc#982176] + + gd-CVE-2016-5116.patch + +------------------------------------------------------------------- +Tue Mar 24 14:04:11 UTC 2015 - pgajdos(a)suse.com + +- fixed CVE-2014-9709 [bnc#923945] + + gd-CVE-2014-9709.patch + +------------------------------------------------------------------- +Tue Aug 26 05:58:53 UTC 2014 - jengelh(a)inai.de + +- Resolve build failure with automake-1.14 + +------------------------------------------------------------------- +Fri Jun 27 12:05:59 UTC 2014 - meissner(a)suse.com + +- split out libgd3, so libgd2 could be installed in parallel. + +------------------------------------------------------------------- +Thu Apr 17 17:51:34 UTC 2014 - tchvatal(a)suse.com + +- Add tiff and vpx to the devel deps as it is in .pc file. + +------------------------------------------------------------------- +Thu Apr 10 07:08:18 UTC 2014 - pgajdos(a)suse.com + +- build against libtiff and libvpx + +------------------------------------------------------------------- +Fri Apr 4 12:21:22 UTC 2014 - pgajdos(a)suse.com + +- fixed NULL ptr deref in GD XPM decoder [bnc#868624] + * CVE-2014-2497.patch + +------------------------------------------------------------------- +Fri Dec 27 07:42:11 UTC 2013 - tchvatal(a)suse.com + +- Cleanup here&there to parallelize everything +- Remove bogus cmake dependency + +------------------------------------------------------------------- +Tue Dec 17 14:30:38 UTC 2013 - pgajdos(a)suse.com + +- updated to 2.1.0 +- removed warn.patch (not needed) +- removed ppc64.patch (upstreamed) +- removed gd-png_check_sig.patch (upstreamed) + +------------------------------------------------------------------- +Sun Feb 3 14:57:17 UTC 2013 - crrodriguez(a)opensuse.org + +- gd-autoconf.patch fix up compile file so gd can handle + large files on 32 bit + +------------------------------------------------------------------- +Sun Feb 5 16:31:39 UTC 2012 - jengelh(a)medozas.de + +- Remove redundant tags/sections +- Parallel build with %_smp_mflags +- Remove pointless INSTALL file from rpm package + (it's just the default autotools INSTALL blurb) + +------------------------------------------------------------------- +Wed Oct 5 12:05:47 UTC 2011 - uli(a)suse.com + +- cross-build fix: use libpng from sysroot + +------------------------------------------------------------------- +Sat Oct 1 05:39:10 UTC 2011 - coolo(a)suse.com + +- add libtool as buildrequire to make the spec file more reliable + +------------------------------------------------------------------- +Tue Jun 14 15:00:32 UTC 2011 - aj(a)suse.de + +- Devel package needs zlib-devel and libpng-devel. + +------------------------------------------------------------------- +Tue Apr 6 18:27:56 CEST 2010 - ro(a)suse.de + +- add baselibs.conf (for libpghoto2) + +------------------------------------------------------------------- +Sun Apr 4 18:39:19 CEST 2010 - ro(a)suse.de + +- replace png_check_sig by negated png_sig_cmp for libpng14 + +------------------------------------------------------------------- +Wed Nov 12 16:18:34 CET 2008 - crrodriguez(a)suse.de + +- QA Results: Regression on PPC64 only, detected by PHP test suite, + the system libgd part, fix by IBM + +------------------------------------------------------------------- +Mon Mar 10 01:43:39 CET 2008 - crrodriguez(a)suse.de + +- fix rpm version number, otherwise it wont upgrade later. + +------------------------------------------------------------------- +Fri Jan 18 15:51:13 CET 2008 - anosek(a)suse.cz + +- updated to version 2.0.36RC1 + * Fixed gdImageCopy with true color image, the transparent color was ignored + * Fixed support of PNG grayscale image with alpha channel + * Added Netware builds script + * ease the creation of regexp to match symbols/functions in the sources + * _gdCreateFromFile() can crash if gdImageCreate fails + * gdImageCreateFrom*Ptr() can crash if gdNewDynamicCtxEx() fails + * gdImageRectangle draws 1x1 rectangles as 1x3 rectangles + * Possible integer overflow in gdImageFill() + * Optimization for single pixel line not in correct order + * gdImageColorDeallocate can write outside buffer + * gdImageColorTransparent can write outside buffer + * gdImageWBMPCtx can crash when createwbmp fails + * Fixed decoding of the html entity &thetasym; + * Fixed configure script ignoring --with-png=DIR option +- dropped obsoleted security.patch + +------------------------------------------------------------------- +Thu Dec 20 04:22:14 CET 2007 - crrodriguez(a)suse.de + +- remove static libraries and "la" files +- devel package dependency cleanup + +------------------------------------------------------------------- +Mon Jul 9 09:09:51 CEST 2007 - anosek(a)suse.cz + +- updated to version 2.0.35 + * Fix valgrind error in gdImageFillTiled (Nuno Lopes) + * Add missing custom cmake macros (required for the tests suite) + * Avoid signature buffer copy in gd_gif_c (Nuno Lopes) + * Race condition in gdImageStringFTEx (Antony Dogval, Pierre + Scott MacVicar) + * Reading GIF images is not thread safe (static usage in private + functions) (Roman Nemecek, Nuno Lopes, Pierre) + * GIF Local palette is read twice + * GIF, Use local frame dimension when possible instead of the + logical screen size (Pierre) + * GIF, do not try to use the global colmap if it does not exist + (Nuno Lopes, Pierre) + * gdImageAALine draws axis lines with two pixels width (Pierre) + * gdImageArc CPU usage with large angles (Pierre) + * gdImageFilledRectangle regression fixed when used with reversed + edges (Pierre) + * Possible infinite loop in libgd/gd_png.c, flaw found by Xavier + Roche (Pierre) + * Fixed segfault when an invalid color index is present in a GIF + image data, reported by Elliot <wccode at gmail dot com> (Pierre) + * Possible integer overflow in gdImageCreateTrueColor (Pierre) + gdImageCreateXbm can crash if gdImageCreate fails (Pierre) +- dropped obsolete patches (png-loop-CVE-2007-2756.patch) + +------------------------------------------------------------------- +Tue May 29 17:16:32 CEST 2007 - nadvornik(a)suse.cz + +- fixed infinite loop on truncated png images + CVE-2007-2756 [#276525] + +------------------------------------------------------------------- +Thu May 3 17:54:51 CEST 2007 - prusnak(a)suse.cz + +- changed expat to libexpat-devel in Requires of devel subpackage + +------------------------------------------------------------------- +Tue Feb 20 11:47:45 CET 2007 - nadvornik(a)suse.cz + +- updated to 2.0.34: + * security fixes merged upstream + * various other bugfixes + ++++ 238 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.2:Update/.gd.5538.new/gd.changes New: ---- baselibs.conf gd-2.1.0-CVE-2014-2497.patch gd-CVE-2014-9709.patch gd-CVE-2016-5116.patch gd-CVE-2016-6128.patch gd-CVE-2016-6132.patch gd-CVE-2016-6161.patch gd-CVE-2016-6207.patch gd-CVE-2016-6214.patch gd-CVE-2016-6905.patch gd-aliasing.patch gd-autoconf.patch gd-config.patch gd-fontpath.patch gd-format.patch gd.changes gd.spec libgd-2.1.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gd.spec ++++++ # # spec file for package gd # # Copyright (c) 2016 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define prjname libgd %define lname libgd3 Name: gd Version: 2.1.0 Release: 0 Summary: A Drawing Library for Programs That Use PNG and JPEG Output License: MIT Group: System/Libraries Url: http://libgd.bitbucket.org/ Source: https://bitbucket.org/libgd/gd-libgd/downloads/libgd-%{version}.tar.xz Source1: baselibs.conf # to be upstreamed, gdlib-config --libs to return the same as pkg-config --libs gdlib Patch0: gd-config.patch # might be upstreamed, but could be suse specific also (/usr/share/fonts/Type1 font dir) Patch1: gd-fontpath.patch # could be upstreamed, but not in this form (need ac check for attribute format printf, etc.) Patch2: gd-format.patch # could be upstreamed Patch3: gd-aliasing.patch # could be upstreamed? Patch4: gd-autoconf.patch Patch5: gd-2.1.0-CVE-2014-2497.patch Patch6: gd-CVE-2014-9709.patch Patch7: gd-CVE-2016-5116.patch Patch8: gd-CVE-2016-6214.patch Patch9: gd-CVE-2016-6905.patch Patch10: gd-CVE-2016-6128.patch Patch11: gd-CVE-2016-6207.patch Patch12: gd-CVE-2016-6161.patch Patch13: gd-CVE-2016-6132.patch BuildRequires: fontconfig-devel BuildRequires: freetype2-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: libtool BuildRequires: libvpx-devel BuildRequires: pkg-config BuildRequires: xorg-x11-libX11-devel BuildRequires: xorg-x11-libXau-devel BuildRequires: xorg-x11-libXdmcp-devel BuildRequires: xorg-x11-libXpm-devel Provides: gdlib = %{version} Obsoletes: gdlib < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Gd allows your code to quickly draw images complete with lines, arcs, text, and multiple colors. It supports cut and paste from other images and flood fills. It outputs PNG, JPEG, and WBMP (for wireless devices) and is supported by PHP. %package -n %lname Summary: A Drawing Library for Programs That Use PNG and JPEG Output Group: System/Libraries %description -n %lname Gd allows your code to quickly draw images complete with lines, arcs, text, and multiple colors. It supports cut and paste from other images and flood fills. It outputs PNG, JPEG, and WBMP (for wireless devices) and is supported by PHP. %package devel Summary: Drawing Library for Programs with PNG and JPEG Output Group: Development/Libraries/C and C++ Requires: %lname = %{version} Requires: glibc-devel Requires: libpng-devel Requires: libtiff-devel Requires: libvpx-devel Requires: zlib-devel %description devel gd allows code to quickly draw images complete with lines, arcs, text, multiple colors, cut and paste from other images, and flood fills. gd writes out the result as a PNG or JPEG file. This is particularly useful in World Wide Web applications, where PNG and JPEG are two of the formats accepted for inline images by most browsers. %prep %setup -q -n %{prjname}-%{version} %patch0 %patch1 %patch2 %patch3 %patch4 -p1 %patch5 %patch6 %patch7 -p1 %patch8 -p1 %patch9 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 %patch13 -p1 %build autoreconf -fiv # without-x -- useless switch which just mangles cflags %configure \ --without-x \ --with-fontconfig \ --with-freetype \ --with-jpeg \ --with-png \ --with-xpm \ --disable-static \ --with-pic make %{?_smp_mflags} %check make check %{?_smp_mflags} %install make DESTDIR=%{buildroot} install %{?_smp_mflags} find %{buildroot} -type f -name "*.la" -delete -print %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files %defattr(-,root,root) %doc COPYING NEWS examples %{_bindir}/annotate %{_bindir}/bdftogd %{_bindir}/gd2copypal %{_bindir}/gd2togif %{_bindir}/gd2topng %{_bindir}/gdcmpgif %{_bindir}/gdparttopng %{_bindir}/gdtopng %{_bindir}/giftogd2 %{_bindir}/pngtogd %{_bindir}/pngtogd2 %{_bindir}/webpng %files -n %lname %defattr(-,root,root) %doc COPYING %{_libdir}/*.so.* %files devel %defattr(-,root,root) %doc COPYING %{_bindir}/gdlib-config %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/gdlib.pc %changelog ++++++ baselibs.conf ++++++ libgd3 ++++++ gd-2.1.0-CVE-2014-2497.patch ++++++ Description: Patch to fix PHP bug 66901. Author: Andres Mejia <mejiaa(a)amazon.com> Forwarded: no Index: src/gdxpm.c =================================================================== --- src/gdxpm.c.orig 2014-04-04 12:56:02.570160501 +0200 +++ src/gdxpm.c 2014-04-04 13:01:24.031976322 +0200 @@ -62,6 +62,14 @@ for(i = 0; i < number; i++) { char *c_color = image.colorTable[i].c_color; + if (!image.colorTable[i].c_color) + { + /* unsupported color key or color key not defined */ + gdImageDestroy(im); + gdFree(colors); + im = 0; + goto done; + } if(strcmp(c_color, "None") == 0) { colors[i] = gdImageGetTransparent(im); if(colors[i] == -1) colors[i] = gdImageColorAllocate(im, 0, 0, 0); ++++++ gd-CVE-2014-9709.patch ++++++ >From 47eb44b2e90ca88a08dca9f9a1aa9041e9587f43 Mon Sep 17 00:00:00 2001 From: Remi Collet <fedora(a)famillecollet.com> Date: Sat, 13 Dec 2014 08:48:18 +0100 Subject: [PATCH] Fix possible buffer read overflow detected by -fsanitize=address, thanks to Jan Bee --- src/gd_gif_in.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) Index: src/gd_gif_in.c =================================================================== --- src/gd_gif_in.c.orig 2013-06-25 11:58:23.000000000 +0200 +++ src/gd_gif_in.c 2015-03-24 15:02:44.776580918 +0100 @@ -75,8 +75,10 @@ #define STACK_SIZE ((1<<(MAX_LWZ_BITS))*2) +#define CSD_BUF_SIZE 280 + typedef struct { - unsigned char buf[280]; + unsigned char buf[CSD_BUF_SIZE]; int curbit; int lastbit; int done; @@ -408,9 +410,13 @@ scd->lastbit = (2 + count) * 8; } - ret = 0; - for (i = scd->curbit, j = 0; j < code_size; ++i, ++j) { - ret |= ((scd->buf[i / 8] & (1 << (i % 8))) != 0) << j; + if ((scd->curbit + code_size - 1) >= (CSD_BUF_SIZE * 8)) { + ret = -1; + } else { + ret = 0; + for (i = scd->curbit, j = 0; j < code_size; ++i, ++j) { + ret |= ((scd->buf[i / 8] & (1 << (i % 8))) != 0) << j; + } } scd->curbit += code_size; ++++++ gd-CVE-2016-5116.patch ++++++ >From 4dc1a2d7931017d3625f2d7cff70a17ce58b53b4 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier(a)gentoo.org> Date: Sat, 14 May 2016 01:38:18 -0400 Subject: [PATCH] xbm: avoid stack overflow (read) with large names #211 We use the name passed in to printf into a local stack buffer which is limited to 4000 bytes. So given a large enough value, lots of stack data is leaked. Rewrite the code to do simple memory copies with most of the strings to avoid that issue, and only use stack buffer for small numbers of constant size. This closes #211. --- src/gd_xbm.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/src/gd_xbm.c b/src/gd_xbm.c index 74d839b..d28fdfc 100644 --- a/src/gd_xbm.c +++ b/src/gd_xbm.c @@ -180,7 +180,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromXbm(FILE * fd) /* {{{ gdCtxPrintf */ static void gdCtxPrintf(gdIOCtx * out, const char *format, ...) { - char buf[4096]; + char buf[1024]; int len; va_list args; @@ -191,6 +191,9 @@ static void gdCtxPrintf(gdIOCtx * out, const char *format, ...) } /* }}} */ +/* The compiler will optimize strlen(constant) to a constant number. */ +#define gdCtxPuts(out, s) out->putBuf(out, s, strlen(s)) + /* {{{ gdImageXbmCtx */ BGD_DECLARE(void) gdImageXbmCtx(gdImagePtr image, char* file_name, int fg, gdIOCtx * out) { @@ -215,9 +218,26 @@ BGD_DECLARE(void) gdImageXbmCtx(gdImagePtr image, char* file_name, int fg, gdIOC } } - gdCtxPrintf(out, "#define %s_width %d\n", name, gdImageSX(image)); - gdCtxPrintf(out, "#define %s_height %d\n", name, gdImageSY(image)); - gdCtxPrintf(out, "static unsigned char %s_bits[] = {\n ", name); + /* Since "name" comes from the user, run it through a direct puts. + * Trying to printf it into a local buffer means we'd need a large + * or dynamic buffer to hold it all. */ + + /* #define <name>_width 1234 */ + gdCtxPuts(out, "#define "); + gdCtxPuts(out, name); + gdCtxPuts(out, "_width "); + gdCtxPrintf(out, "%d\n", gdImageSX(image)); + + /* #define <name>_height 1234 */ + gdCtxPuts(out, "#define "); + gdCtxPuts(out, name); + gdCtxPuts(out, "_height "); + gdCtxPrintf(out, "%d\n", gdImageSY(image)); + + /* static unsigned char <name>_bits[] = {\n */ + gdCtxPuts(out, "static unsigned char "); + gdCtxPuts(out, name); + gdCtxPuts(out, "_bits[] = {\n "); free(name); @@ -234,9 +254,9 @@ BGD_DECLARE(void) gdImageXbmCtx(gdImagePtr image, char* file_name, int fg, gdIOC if ((b == 128) || (x == sx && y == sy)) { b = 1; if (p) { - gdCtxPrintf(out, ", "); + gdCtxPuts(out, ", "); if (!(p%12)) { - gdCtxPrintf(out, "\n "); + gdCtxPuts(out, "\n "); p = 12; } } @@ -248,6 +268,6 @@ BGD_DECLARE(void) gdImageXbmCtx(gdImagePtr image, char* file_name, int fg, gdIOC } } } - gdCtxPrintf(out, "};\n"); + gdCtxPuts(out, "};\n"); } /* }}} */ ++++++ gd-CVE-2016-6128.patch ++++++ --- a/src/gd_crop.c +++ b/src/gd_crop.c @@ -136,6 +136,10 @@ BGD_DECLARE(gdImagePtr) gdImageCropThreshold(gdImagePtr im, const unsigned int c return NULL; } + if (!gdImageTrueColor(im) && color >= gdImageColorsTotal(im)) { + return NULL; + } + /* TODO: Add gdImageGetRowPtr and works with ptr at the row level * for the true color and palette images * new formats will simply work with ptr ++++++ gd-CVE-2016-6132.patch ++++++ >From 921e590565deb033acafcfa9063b4563200b14b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej(a)sury.org> Date: Tue, 12 Jul 2016 11:24:09 +0200 Subject: [PATCH] Fix #247, A read out-of-bands was found in the parsing of TGA files --- src/gd_tga.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/gd_tga.c b/src/gd_tga.c index ef20f86..07f3c86 100644 --- a/src/gd_tga.c +++ b/src/gd_tga.c @@ -237,7 +237,10 @@ int read_image_tga( gdIOCtx *ctx, oTga *tga ) return -1; } - gdGetBuf(conversion_buffer, image_block_size, ctx); + if (gdGetBuf(conversion_buffer, image_block_size, ctx) != image_block_size) { + gdFree(conversion_buffer); + return -1; + } while (buffer_caret < image_block_size) { tga->bitmap[buffer_caret] = (int) conversion_buffer[buffer_caret]; @@ -261,7 +264,11 @@ int read_image_tga( gdIOCtx *ctx, oTga *tga ) return -1; } - gdGetBuf( conversion_buffer, image_block_size, ctx ); + if (gdGetBuf(conversion_buffer, image_block_size, ctx) != image_block_size) { + gdFree(conversion_buffer); + gdFree(decompression_buffer); + return -1; + } buffer_caret = 0; ++++++ gd-CVE-2016-6161.patch ++++++ >From 82b80dcb70a7ca8986125ff412bceddafc896842 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier(a)gentoo.org> Date: Sat, 14 May 2016 02:13:15 -0400 Subject: [PATCH] gif: avoid out-of-bound reads of masks array #209 When given invalid inputs, we might be fed the EOF marker before it is actually the EOF. The gif logic assumes once it sees the EOF marker, there won't be any more data, so it leaves the cur_bits index possibly negative. So when we get more data, we underflow the masks array. Flag it so we don't try to output anything more. The image is invalid, so we shouldn't be truncating any valid inputs. This fixes #209. --- src/gd_gif_out.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/gd_gif_out.c b/src/gd_gif_out.c index 51ceb75..3099d49 100644 --- a/src/gd_gif_out.c +++ b/src/gd_gif_out.c @@ -1442,15 +1442,23 @@ static void compress(int init_bits, gdIOCtxPtr outfile, gdImagePtr im, GifCtx *c * code in turn. When the buffer fills up empty it and start over. */ -static unsigned long masks[] = { +static const unsigned long masks[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF, 0x01FF, 0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF }; +/* Arbitrary value to mark output is done. When we see EOFCode, then we don't + * expect to see any more data. If we do (e.g. corrupt image inputs), cur_bits + * might be negative, so flag it to return early. + */ +#define CUR_BITS_FINISHED -1000 + static void output(code_int code, GifCtx *ctx) { + if (ctx->cur_bits == CUR_BITS_FINISHED) + return; ctx->cur_accum &= masks[ctx->cur_bits]; if(ctx->cur_bits > 0) { @@ -1492,6 +1500,8 @@ static void output(code_int code, GifCtx *ctx) ctx->cur_accum >>= 8; ctx->cur_bits -= 8; } + /* Flag that it's done to prevent re-entry. */ + ctx->cur_bits = CUR_BITS_FINISHED; flush_char(ctx); } ++++++ gd-CVE-2016-6207.patch ++++++ Index: libgd-2.1.0/src/gd.c =================================================================== --- libgd-2.1.0.orig/src/gd.c 2013-06-25 11:58:23.000000000 +0200 +++ libgd-2.1.0/src/gd.c 2016-08-08 15:04:29.487691217 +0200 @@ -207,7 +207,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateTru return 0; } - if (overflow2(sizeof(int), sx)) { + if (overflow2(sizeof(int *), sx)) { return NULL; } Index: libgd-2.1.0/src/gd_interpolation.c =================================================================== --- libgd-2.1.0.orig/src/gd_interpolation.c 2013-06-25 11:58:23.000000000 +0200 +++ libgd-2.1.0/src/gd_interpolation.c 2016-08-08 15:05:50.725062244 +0200 @@ -901,6 +901,7 @@ static inline LineContribType * _gdContr { unsigned int u = 0; LineContribType *res; + int overflow_error = 0; res = (LineContribType *) gdMalloc(sizeof(LineContribType)); if (!res) { @@ -908,10 +909,31 @@ static inline LineContribType * _gdContr } res->WindowSize = windows_size; res->LineLength = line_length; + if (overflow2(line_length, sizeof(ContributionType))) { + gdFree(res); + return NULL; + } res->ContribRow = (ContributionType *) gdMalloc(line_length * sizeof(ContributionType)); - + if (res->ContribRow == NULL) { + gdFree(res); + return NULL; + } for (u = 0 ; u < line_length ; u++) { - res->ContribRow[u].Weights = (double *) gdMalloc(windows_size * sizeof(double)); + if (overflow2(windows_size, sizeof(double))) { + overflow_error = 1; + } else { + res->ContribRow[u].Weights = (double *) gdMalloc(windows_size * sizeof(double)); + } + if (overflow_error == 1 || res->ContribRow[u].Weights == NULL) { + unsigned int i; + u--; + for (i=0;i<=u;i++) { + gdFree(res->ContribRow[i].Weights); + } + gdFree(res->ContribRow); + gdFree(res); + return NULL; + } } return res; } @@ -944,7 +966,9 @@ static inline LineContribType *_gdContri windows_size = 2 * (int)ceil(width_d) + 1; res = _gdContributionsAlloc(line_size, windows_size); - + if (res == NULL) { + return NULL; + } for (u = 0; u < line_size; u++) { const double dCenter = (double)u / scale_d; /* get the significant edge points affecting the pixel */ ++++++ gd-CVE-2016-6214.patch ++++++ --- a/src/gd_tga.c +++ b/src/gd_tga.c @@ -99,7 +99,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromTgaCtx(gdIOCtx* ctx) if (tga->bits == TGA_BPP_24) { *tpix = gdTrueColor(tga->bitmap[bitmap_caret + 2], tga->bitmap[bitmap_caret + 1], tga->bitmap[bitmap_caret]); bitmap_caret += 3; - } else if (tga->bits == TGA_BPP_32 || tga->alphabits) { + } else if (tga->bits == TGA_BPP_32 && tga->alphabits) { register int a = tga->bitmap[bitmap_caret + 3]; *tpix = gdTrueColorAlpha(tga->bitmap[bitmap_caret + 2], tga->bitmap[bitmap_caret + 1], tga->bitmap[bitmap_caret], gdAlphaMax - (a >> 1)); @@ -159,16 +159,12 @@ int read_header_tga(gdIOCtx *ctx, oTga *tga) printf("wxh: %i %i\n", tga->width, tga->height); #endif - switch(tga->bits) { - case 8: - case 16: - case 24: - case 32: - break; - default: - gd_error("bps %i not supported", tga->bits); + if (!((tga->bits == TGA_BPP_24 && tga->alphabits == 0) + || (tga->bits == TGA_BPP_32 && tga->alphabits == 8))) + { + gd_error_ex(GD_WARNING, "gd-tga: %u bits per pixel with %u alpha bits not supported\n", + tga->bits, tga->alphabits); return -1; - break; } tga->ident = NULL; ++++++ gd-CVE-2016-6905.patch ++++++ 6aa343e6e195bf65fb47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej(a)sury.org> Date: Tue, 12 Jul 2016 14:20:16 +0200 Subject: [PATCH] bug #248, fix Out-Of-Bounds Read in read_image_tga --- src/gd_tga.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) Index: libgd-2.1.0/src/gd_tga.c =================================================================== --- libgd-2.1.0.orig/src/gd_tga.c 2016-08-08 13:15:15.053952732 +0200 +++ libgd-2.1.0/src/gd_tga.c 2016-08-08 13:16:53.639592199 +0200 @@ -196,7 +196,6 @@ int read_image_tga( gdIOCtx *ctx, oTga * int buffer_caret = 0; int bitmap_caret = 0; int i = 0; - int j = 0; uint8_t encoded_pixels; if(overflow2(tga->width, tga->height)) { @@ -281,27 +280,36 @@ int read_image_tga( gdIOCtx *ctx, oTga * buffer_caret = 0; while( bitmap_caret < image_block_size ) { - + if ((decompression_buffer[buffer_caret] & TGA_RLE_FLAG) == TGA_RLE_FLAG) { - encoded_pixels = ( ( decompression_buffer[ buffer_caret ] & 127 ) + 1 ); + encoded_pixels = ( ( decompression_buffer[ buffer_caret ] & !TGA_RLE_FLAG ) + 1 ); buffer_caret++; + if ((bitmap_caret + (encoded_pixels * pixel_block_size)) >= image_block_size) { + gdFree( decompression_buffer ); + gdFree( conversion_buffer ); + return -1; + } + for (i = 0; i < encoded_pixels; i++) { - for (j = 0; j < pixel_block_size; j++, bitmap_caret++) { - tga->bitmap[ bitmap_caret ] = decompression_buffer[ buffer_caret + j ]; - } + memcpy(tga->bitmap + bitmap_caret, decompression_buffer + buffer_caret, pixel_block_size); + bitmap_caret += pixel_block_size; } buffer_caret += pixel_block_size; + } else { encoded_pixels = decompression_buffer[ buffer_caret ] + 1; buffer_caret++; - for (i = 0; i < encoded_pixels; i++) { - for( j = 0; j < pixel_block_size; j++, bitmap_caret++ ) { - tga->bitmap[ bitmap_caret ] = decompression_buffer[ buffer_caret + j ]; - } - buffer_caret += pixel_block_size; + if ((bitmap_caret + (encoded_pixels * pixel_block_size)) >= image_block_size) { + gdFree( decompression_buffer ); + gdFree( conversion_buffer ); + return -1; } + + memcpy(tga->bitmap + bitmap_caret, decompression_buffer + buffer_caret, encoded_pixels * pixel_block_size); + bitmap_caret += (encoded_pixels * pixel_block_size); + buffer_caret += (encoded_pixels * pixel_block_size); } } ++++++ gd-aliasing.patch ++++++ Index: src/fontwheeltest.c =================================================================== --- src/fontwheeltest.c.orig 2013-12-18 11:49:47.041577398 +0100 +++ src/fontwheeltest.c 2013-12-18 11:53:52.575496376 +0100 @@ -32,6 +32,8 @@ doerr (err, "------------------------------------------"); for (curang = 0.0; curang < 360.0; curang += angle) { + gdPoint points[4]; + curangrads = DEGTORAD(curang); x0 = x + cos (curangrads) * offset; y0 = y - sin (curangrads) * offset; @@ -47,7 +49,15 @@ if (cp) doerr (err, cp); - gdImagePolygon (im, (gdPointPtr)brect, 4, color); + points[0].x = brect[0]; + points[0].y = brect[1]; + points[1].x = brect[2]; + points[1].y = brect[3]; + points[2].x = brect[4]; + points[2].y = brect[5]; + points[3].x = brect[6]; + points[3].y = brect[7]; + gdImagePolygon (im, points, 4, color); } fclose (err); ++++++ gd-autoconf.patch ++++++ --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Index: libgd-2.1.0/configure.ac =================================================================== --- libgd-2.1.0.orig/configure.ac +++ libgd-2.1.0/configure.ac @@ -45,7 +45,7 @@ AC_SUBST(GDLIB_AGE) FEATURES="GD_GIF GD_GIFANIM GD_OPENPOLYGON" AC_SUBST(FEATURES) -AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-xz -Wall -Werror]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-xz -Wall]) AC_CONFIG_HEADERS([src/config.h:src/config.hin]) dnl newer automake wants this, but we still want to work with older @@ -53,6 +53,9 @@ m4_ifndef([AM_PROG_AR],[m4_define([AM_PR AM_PROG_AR AC_PROG_CC_STDC +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE + AM_PROG_CC_C_O AC_PROG_INSTALL AC_PROG_LIBTOOL ++++++ gd-config.patch ++++++ Index: config/gdlib-config.in =================================================================== --- config/gdlib-config.in.orig 2013-06-25 11:58:23.000000000 +0200 +++ config/gdlib-config.in 2013-12-18 10:00:24.635577307 +0100 @@ -71,7 +71,7 @@ echo @LDFLAGS@ ;; --libs) - echo -lgd @LIBS@ @LIBICONV@ + echo -lgd ;; --cflags|--includes) echo -I@includedir@ ++++++ gd-fontpath.patch ++++++ Index: src/gdft.c =================================================================== --- src/gdft.c.orig 2013-06-25 11:58:23.000000000 +0200 +++ src/gdft.c 2013-12-18 11:44:06.915533057 +0100 @@ -74,7 +74,7 @@ # define DEFAULT_FONTPATH "/usr/share/fonts/truetype:/System/Library/Fonts:/Library/Fonts" # else /* default fontpath for unix systems - whatever happened to standards ! */ -# define DEFAULT_FONTPATH "/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/lib/X11/fonts/Type1:/usr/openwin/lib/X11/fonts/Type1" +# define DEFAULT_FONTPATH "/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/lib/X11/fonts/Type1:/usr/openwin/lib/X11/fonts/Type1:/usr/share/fonts/Type1" # endif #endif ++++++ gd-format.patch ++++++ Index: src/gd_errors.h =================================================================== --- src/gd_errors.h.orig 2013-06-25 11:58:23.000000000 +0200 +++ src/gd_errors.h 2013-12-18 11:47:26.605907096 +0100 @@ -40,7 +40,7 @@ #define GD_INFO LOG_INFO #define GD_DEBUG LOG_DEBUG -void gd_error(const char *format, ...); -void gd_error_ex(int priority, const char *format, ...); +void gd_error(const char *format, ...) __attribute__((format(printf, 1, 2))); +void gd_error_ex(int priority, const char *format, ...) __attribute__((format(printf, 2, 3))); #endif

1 0

commit perl-Mojolicious-Plugin-CHI for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package perl-Mojolicious-Plugin-CHI for openSUSE:Factory checked in at 2016-08-31 14:31:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Mojolicious-Plugin-CHI (Old) and /work/SRC/openSUSE:Factory/.perl-Mojolicious-Plugin-CHI.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Mojolicious-Plugin-CHI" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Mojolicious-Plugin-CHI/perl-Mojolicious-Plugin-CHI.changes 2016-04-12 19:33:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Mojolicious-Plugin-CHI.new/perl-Mojolicious-Plugin-CHI.changes 2016-08-31 14:31:55.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Aug 31 05:59:30 UTC 2016 - coolo(a)suse.com + +- updated to 0.14 + see /usr/share/doc/packages/perl-Mojolicious-Plugin-CHI/Changes + + 0.14 2016-08-30 + - Fixed META_MERGE in Makefile. + +------------------------------------------------------------------- Old: ---- Mojolicious-Plugin-CHI-0.13.tar.gz New: ---- Mojolicious-Plugin-CHI-0.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Mojolicious-Plugin-CHI.spec ++++++ --- /var/tmp/diff_new_pack.mHW0RI/_old 2016-08-31 14:31:56.000000000 +0200 +++ /var/tmp/diff_new_pack.mHW0RI/_new 2016-08-31 14:31:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Mojolicious-Plugin-CHI -Version: 0.13 +Version: 0.14 Release: 0 %define cpan_name Mojolicious-Plugin-CHI Summary: Use CHI Caches in Mojolicious ++++++ Mojolicious-Plugin-CHI-0.13.tar.gz -> Mojolicious-Plugin-CHI-0.14.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mojolicious-Plugin-CHI-0.13/Changes new/Mojolicious-Plugin-CHI-0.14/Changes --- old/Mojolicious-Plugin-CHI-0.13/Changes 2016-04-01 11:42:35.000000000 +0200 +++ new/Mojolicious-Plugin-CHI-0.14/Changes 2016-08-30 19:59:20.000000000 +0200 @@ -1,46 +1,49 @@ +0.14 2016-08-30 + - Fixed META_MERGE in Makefile. + 0.13 2016-04-01 - Added dependency of Digest::JHash, - as there seem to be broken builds of CHI out there - (dependencies in CHI are correkt; cpantesters). + as there seem to be broken builds of CHI out there + (dependencies in CHI are correkt; cpantesters). 0.12 2015-11-14 - Removed smartmatch in tests. - - Made dependencies more concrete. + - Made dependencies more concrete. 0.11 2015-01-16 - Improve error handling in commands. 0.10 2015-01-16 - Improve documentation regarding precedence of configuration. - - Improve config check. - - Improve license information in M::P::CHI::chi. - - Update year. + - Improve config check. + - Improve license information in M::P::CHI::chi. + - Update year. 0.09 2014-04-20 - Bugfix test suite. 0.08 2014-04-17 - Logging now defaults to application log. - - Update requirements. - - Added commands. + - Update requirements. + - Added commands. 0.07 2014-04-01 - Update year. - - Documentation tweaks on CHI. - - Fixed License issue (now coherent Artistic License 2.0; max). + - Documentation tweaks on CHI. + - Fixed License issue (now coherent Artistic License 2.0; max). 0.06 2013-03-08 - Update year. - - Update description. - - Documentation tweaks. - - Namespaces parameter now set by default - (the opposite was deprecated in 0.04). - - Improve test suite. - - Warn regarding non-unique cache handles. + - Update description. + - Documentation tweaks. + - Namespaces parameter now set by default + (the opposite was deprecated in 0.04). + - Improve test suite. + - Warn regarding non-unique cache handles. 0.05 2012-12-07 - Fix for never started IOLoops. - - Removed IOLoop dependency (reneeb). + - Removed IOLoop dependency (reneeb). 0.04 2012-11-26 - Introduced 'namespaces' parameter. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mojolicious-Plugin-CHI-0.13/META.json new/Mojolicious-Plugin-CHI-0.14/META.json --- old/Mojolicious-Plugin-CHI-0.13/META.json 2016-04-01 12:14:38.000000000 +0200 +++ new/Mojolicious-Plugin-CHI-0.14/META.json 2016-08-30 21:29:18.000000000 +0200 @@ -4,7 +4,7 @@ "Nils Diewald" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 7.04, CPAN::Meta::Converter version 2.150005", + "generated_by" : "ExtUtils::MakeMaker version 7.1001, CPAN::Meta::Converter version 2.150005", "license" : [ "artistic_2" ], @@ -43,17 +43,17 @@ "release_status" : "stable", "resources" : { "bugtracker" : { - "web" : "https://github.com/Akron/XML-Loy/issues" + "web" : "https://github.com/Akron/Mojolicious-Plugin-CHI/issues" }, "license" : [ "http://www.opensource.org/licenses/artistic-license-2.0" ], "repository" : { "type" : "git", - "url" : "https://github.com/Akron/XML-Loy.git", - "web" : "https://github.com/Akron/XML-Loy" + "url" : "https://github.com/Akron/Mojolicious-Plugin-CHI.git", + "web" : "https://github.com/Akron/Mojolicious-Plugin-CHI" } }, - "version" : "0.13", - "x_serialization_backend" : "JSON::PP version 2.27203" + "version" : "0.14", + "x_serialization_backend" : "JSON::PP version 2.27300" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mojolicious-Plugin-CHI-0.13/META.yml new/Mojolicious-Plugin-CHI-0.14/META.yml --- old/Mojolicious-Plugin-CHI-0.13/META.yml 2016-04-01 12:14:38.000000000 +0200 +++ new/Mojolicious-Plugin-CHI-0.14/META.yml 2016-08-30 21:29:17.000000000 +0200 @@ -8,7 +8,7 @@ configure_requires: ExtUtils::MakeMaker: '0' dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 7.04, CPAN::Meta::Converter version 2.150005' +generated_by: 'ExtUtils::MakeMaker version 7.1001, CPAN::Meta::Converter version 2.150005' license: artistic_2 meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -24,8 +24,8 @@ Mojolicious: '4.77' perl: '5.010001' resources: - bugtracker: https://github.com/Akron/XML-Loy/issues + bugtracker: https://github.com/Akron/Mojolicious-Plugin-CHI/issues license: http://www.opensource.org/licenses/artistic-license-2.0 - repository: https://github.com/Akron/XML-Loy.git -version: '0.13' -x_serialization_backend: 'CPAN::Meta::YAML version 0.012' + repository: https://github.com/Akron/Mojolicious-Plugin-CHI.git +version: '0.14' +x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mojolicious-Plugin-CHI-0.13/Makefile.PL new/Mojolicious-Plugin-CHI-0.14/Makefile.PL --- old/Mojolicious-Plugin-CHI-0.13/Makefile.PL 2016-04-01 12:14:20.000000000 +0200 +++ new/Mojolicious-Plugin-CHI-0.14/Makefile.PL 2016-08-30 19:56:13.000000000 +0200 @@ -27,11 +27,11 @@ license => 'http://www.opensource.org/licenses/artistic-license-2.0', repository => { type => 'git', - web => 'https://github.com/Akron/XML-Loy', - url => 'https://github.com/Akron/XML-Loy.git', + web => 'https://github.com/Akron/Mojolicious-Plugin-CHI', + url => 'https://github.com/Akron/Mojolicious-Plugin-CHI.git', }, bugtracker => { - web => 'https://github.com/Akron/XML-Loy/issues', + web => 'https://github.com/Akron/Mojolicious-Plugin-CHI/issues', }, } }) : (), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mojolicious-Plugin-CHI-0.13/lib/Mojolicious/Plugin/CHI/chi.pm new/Mojolicious-Plugin-CHI-0.14/lib/Mojolicious/Plugin/CHI/chi.pm --- old/Mojolicious-Plugin-CHI-0.13/lib/Mojolicious/Plugin/CHI/chi.pm 2016-04-01 11:40:34.000000000 +0200 +++ new/Mojolicious-Plugin-CHI-0.14/lib/Mojolicious/Plugin/CHI/chi.pm 2016-08-30 20:01:07.000000000 +0200 @@ -46,8 +46,8 @@ # Do not modify non-persistant in-process caches! if ($chi->short_driver_name =~ /^(?:Raw)?Memory$/) { $log->warn("You are trying to $command a ". - $chi->short_driver_name . - '-Cache'); + $chi->short_driver_name . + '-Cache'); }; $chi->$command(); @@ -73,21 +73,21 @@ # Do not modify non-persistant in-process caches! if ($chi->short_driver_name =~ /^(?:Raw)?Memory$/) { - $log->warn("You are trying to $command " . - 'a key from a '. - $chi->short_driver_name . - '-Cache'); + $log->warn("You are trying to $command " . + 'a key from a '. + $chi->short_driver_name . + '-Cache'); }; # Remove or expire key if ($chi->$command($key)) { - print qq{Key "$key" from cache "$cache" was } . $command . "d.\n\n"; + print qq{Key "$key" from cache "$cache" was } . $command . "d.\n\n"; } # Not successful else { - print 'Unable to ' . $command . - qq{ key "$key" from cache "$cache".\n\n}; + print 'Unable to ' . $command . + qq{ key "$key" from cache "$cache".\n\n}; }; return 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mojolicious-Plugin-CHI-0.13/lib/Mojolicious/Plugin/CHI.pm new/Mojolicious-Plugin-CHI-0.14/lib/Mojolicious/Plugin/CHI.pm --- old/Mojolicious-Plugin-CHI-0.13/lib/Mojolicious/Plugin/CHI.pm 2016-04-01 11:40:20.000000000 +0200 +++ new/Mojolicious-Plugin-CHI-0.14/lib/Mojolicious/Plugin/CHI.pm 2016-08-30 20:00:29.000000000 +0200 @@ -3,7 +3,7 @@ use Scalar::Util 'weaken'; use CHI; -our $VERSION = '0.13'; +our $VERSION = '0.14'; # Register Plugin sub register { @@ -22,7 +22,7 @@ unless ($mojo->can('chi_handles')) { $mojo->attr( chi_handles => sub { - return ($caches //= {}); + return ($caches //= {}); } ); }

1 0

commit armadillo for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package armadillo for openSUSE:Factory checked in at 2016-08-31 14:31:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/armadillo (Old) and /work/SRC/openSUSE:Factory/.armadillo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "armadillo" Changes: -------- --- /work/SRC/openSUSE:Factory/armadillo/armadillo.changes 2016-08-05 18:17:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes 2016-08-31 14:31:52.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 29 11:42:41 UTC 2016 - badshah400(a)gmail.com + +- Update to version 7.400.2: + + Added expmat_sym(), logmat_sympd(), sqrtmat_sympd(). + + Added .replace(). + +------------------------------------------------------------------- Old: ---- armadillo-7.300.1.tar.xz New: ---- armadillo-7.400.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armadillo.spec ++++++ --- /var/tmp/diff_new_pack.YMylGU/_old 2016-08-31 14:31:53.000000000 +0200 +++ /var/tmp/diff_new_pack.YMylGU/_new 2016-08-31 14:31:53.000000000 +0200 @@ -19,7 +19,7 @@ %define soname libarmadillo7 Name: armadillo -Version: 7.300.1 +Version: 7.400.2 Release: 0 Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS License: MPL-2.0 ++++++ armadillo-7.300.1.tar.xz -> armadillo-7.400.2.tar.xz ++++++ ++++ 3223 lines of diff (skipped)

1 0

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

31 Aug '16

Hello community, here is the log from the commit of package python3-twine for openSUSE:Factory checked in at 2016-08-31 14:31:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-twine (Old) and /work/SRC/openSUSE:Factory/.python3-twine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-twine" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-twine/python3-twine.changes 2016-07-15 12:51:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-twine.new/python3-twine.changes 2016-08-31 14:31:48.000000000 +0200 @@ -1,0 +2,25 @@ +Wed Aug 31 03:32:31 UTC 2016 - arun(a)gmx.de + +- update to version 1.8.1: + * Check if a package exists for several download urls + +- changes from version 1.8.0: + * :feature:`201` Switch from upload.pypi.io to upload.pypi.org. + * :feature:`144` Retrieve configuration from the environment as a + default. + + Repository URL will default to TWINE_REPOSITORY + + Username will default to TWINE_USERNAME + + Password will default to TWINE_PASSWORD + * :feature:`166` Allow the Repository URL to be provided on the + command-line (--repository-url) or via an environment variable + (TWINE_REPOSITORY_URL). + * Generate SHA256 digest for all packages by default. + * :feature:`171` Generate Blake2b 256 digests for packages if + pyblake2 is installed. Users can use python -m pip install + twine[with-blake2] to have pyblake2 installed with Twine. + * Stop testing on Python 2.6. 2.6 support will be "best effort" + until 2.0.0 + * Warn users if they receive a 500 error when uploading to + *pypi.python.org + +------------------------------------------------------------------- Old: ---- twine-1.7.4.tar.gz New: ---- twine-1.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-twine.spec ++++++ --- /var/tmp/diff_new_pack.vwdi6z/_old 2016-08-31 14:31:49.000000000 +0200 +++ /var/tmp/diff_new_pack.vwdi6z/_new 2016-08-31 14:31:49.000000000 +0200 @@ -17,7 +17,7 @@ Name: python3-twine -Version: 1.7.4 +Version: 1.8.1 Release: 0 Summary: Collection of utilities for interacting with PyPI License: Apache-2.0 ++++++ twine-1.7.4.tar.gz -> twine-1.8.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/PKG-INFO new/twine-1.8.1/PKG-INFO --- old/twine-1.7.4/PKG-INFO 2016-07-09 13:22:23.000000000 +0200 +++ new/twine-1.8.1/PKG-INFO 2016-08-08 17:02:29.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: twine -Version: 1.7.4 +Version: 1.8.1 Summary: Collection of utilities for interacting with PyPI Home-page: https://github.com/pypa/twine Author: Donald Stufft and individual contributors @@ -172,7 +172,6 @@ Classifier: Operating System :: Microsoft :: Windows Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/docs/changelog.rst new/twine-1.8.1/docs/changelog.rst --- old/twine-1.7.4/docs/changelog.rst 2016-07-09 13:21:25.000000000 +0200 +++ new/twine-1.8.1/docs/changelog.rst 2016-08-08 17:01:12.000000000 +0200 @@ -4,6 +4,43 @@ Changelog ========= +* :release:`1.8.1 <2016-08-09>` + + * Check if a package exists if the URL is one of: + + - ``https://pypi.python.org/pypi/`` + - ``https://upload.pypi.org/`` + - ``https://upload.pypi.io/`` + + This helps people with ``https://upload.pypi.io`` still in their .pypirc + file. + +* :release:`1.8.0 <2016-08-08>` + + * :feature:`201` Switch from upload.pypi.io to upload.pypi.org. + + * :feature:`144` Retrieve configuration from the environment as a default. + + - Repository URL will default to ``TWINE_REPOSITORY`` + + - Username will default to ``TWINE_USERNAME`` + + - Password will default to ``TWINE_PASSWORD`` + + * :feature:`166` Allow the Repository URL to be provided on the command-line + (``--repository-url``) or via an environment variable + (``TWINE_REPOSITORY_URL``). + + * Generate SHA256 digest for all packages by default. + + * :feature:`171` Generate Blake2b 256 digests for packages *if* ``pyblake2`` + is installed. Users can use ``python -m pip install twine[with-blake2]`` + to have ``pyblake2`` installed with Twine. + + * Stop testing on Python 2.6. 2.6 support will be "best effort" until 2.0.0 + + * Warn users if they receive a 500 error when uploading to \*pypi.python.org + * :release:`1.7.4 <2016-07-09>` * Correct a packaging error. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/setup.cfg new/twine-1.8.1/setup.cfg --- old/twine-1.7.4/setup.cfg 2016-07-09 13:22:23.000000000 +0200 +++ new/twine-1.8.1/setup.cfg 2016-08-08 17:02:29.000000000 +0200 @@ -14,6 +14,7 @@ pkginfo >= 1.0 setuptools >= 0.7.0 argparse; python_version == '2.6' + pyblake2; extra == 'with-blake2' [egg_info] tag_build = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/setup.py new/twine-1.8.1/setup.py --- old/twine-1.7.4/setup.py 2016-06-15 03:16:21.000000000 +0200 +++ new/twine-1.8.1/setup.py 2016-08-08 17:01:12.000000000 +0200 @@ -55,7 +55,6 @@ "Operating System :: Microsoft :: Windows", "Programming Language :: Python", "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.2", @@ -79,4 +78,9 @@ }, install_requires=install_requires, + extras_require={ + 'with-blake2': [ + 'pyblake2', + ] + }, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/tests/helpers.py new/twine-1.8.1/tests/helpers.py --- old/twine-1.7.4/tests/helpers.py 1970-01-01 01:00:00.000000000 +0100 +++ new/twine-1.8.1/tests/helpers.py 2016-08-08 17:01:12.000000000 +0200 @@ -0,0 +1,40 @@ +# Copyright 2016 Ian Cordasco +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""Test functions useful across twine's tests.""" + +import contextlib +import os + + +(a)contextlib.contextmanager +def set_env(**environ): + """Set the process environment variables temporarily. + + >>> with set_env(PLUGINS_DIR=u'test/plugins'): + ... "PLUGINS_DIR" in os.environ + True + + >>> "PLUGINS_DIR" in os.environ + False + + :param environ: Environment variables to set + :type environ: dict[str, unicode] + """ + old_environ = dict(os.environ) + os.environ.update(environ) + try: + yield + finally: + os.environ.clear() + os.environ.update(old_environ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/tests/test_upload.py new/twine-1.8.1/tests/test_upload.py --- old/twine-1.7.4/tests/test_upload.py 2016-06-15 03:16:21.000000000 +0200 +++ new/twine-1.8.1/tests/test_upload.py 2016-08-08 17:01:12.000000000 +0200 @@ -20,8 +20,10 @@ import pytest from twine.commands import upload -from twine import package +from twine import package, cli +import twine +import helpers WHEEL_FIXTURE = 'tests/fixtures/twine-1.5.0-py2.py3-none-any.whl' @@ -48,7 +50,8 @@ def test_find_dists_expands_globs(): files = sorted(upload.find_dists(['twine/__*.py'])) - expected = ['twine/__init__.py', 'twine/__main__.py'] + expected = [os.path.join('twine', '__init__.py'), + os.path.join('twine', '__main__.py')] assert expected == files @@ -79,10 +82,13 @@ upload.upload(dists=dists, repository="pypi", sign=None, identity=None, username=None, password=None, comment=None, cert=None, client_cert=None, - sign_with=None, config_file=pypirc, skip_existing=False) + sign_with=None, config_file=pypirc, skip_existing=False, + repository_url=None, + ) except KeyError as err: assert err.args[0] == ( - "Missing 'pypi' section from the configuration file.\n" + "Missing 'pypi' section from the configuration file\n" + "or not a complete URL in --repository.\n" "Maybe you have a out-dated '{0}' format?\n" "more info: " "https://docs.python.org/distutils/packageindex.html#pypirc\n" @@ -124,3 +130,22 @@ assert upload.skip_upload(response=response, skip_existing=False, package=pkg) is False + + +def test_password_and_username_from_env(monkeypatch): + def none_upload(*args, **kwargs): + pass + + replaced_upload = pretend.call_recorder(none_upload) + monkeypatch.setattr(twine.commands.upload, "upload", replaced_upload) + testenv = {"TWINE_USERNAME": "pypiuser", + "TWINE_PASSWORD": "pypipassword"} + with helpers.set_env(**testenv): + cli.dispatch(["upload", "path/to/file"]) + cli.dispatch(["upload", "path/to/file"]) + result_kwargs = replaced_upload.calls[0].kwargs + assert "pypipassword" == result_kwargs["password"] + assert "pypiuser" == result_kwargs["username"] + result_kwargs = replaced_upload.calls[1].kwargs + assert None is result_kwargs["password"] + assert None is result_kwargs["username"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/tests/test_utils.py new/twine-1.8.1/tests/test_utils.py --- old/twine-1.7.4/tests/test_utils.py 2014-12-21 21:11:38.000000000 +0100 +++ new/twine-1.8.1/tests/test_utils.py 2016-08-08 17:01:12.000000000 +0200 @@ -16,9 +16,12 @@ import os.path import textwrap + import pytest -from twine.utils import DEFAULT_REPOSITORY, get_config, get_userpass_value +from twine import utils + +import helpers def test_get_config(tmpdir): @@ -34,9 +37,9 @@ password = testpassword """)) - assert get_config(pypirc) == { + assert utils.get_config(pypirc) == { "pypi": { - "repository": DEFAULT_REPOSITORY, + "repository": utils.DEFAULT_REPOSITORY, "username": "testuser", "password": "testpassword", }, @@ -53,9 +56,9 @@ password = testpassword """)) - assert get_config(pypirc) == { + assert utils.get_config(pypirc) == { "pypi": { - "repository": DEFAULT_REPOSITORY, + "repository": utils.DEFAULT_REPOSITORY, "username": "testuser", "password": "testpassword", }, @@ -75,9 +78,9 @@ password = testpassword """)) - assert get_config(pypirc) == { + assert utils.get_config(pypirc) == { "pypi": { - "repository": DEFAULT_REPOSITORY, + "repository": utils.DEFAULT_REPOSITORY, "username": "testuser", "password": "testpassword", }, @@ -87,23 +90,47 @@ def test_get_config_missing(tmpdir): pypirc = os.path.join(str(tmpdir), ".pypirc") - assert get_config(pypirc) == { + assert utils.get_config(pypirc) == { "pypi": { - "repository": DEFAULT_REPOSITORY, + "repository": utils.DEFAULT_REPOSITORY, "username": None, "password": None, }, + "pypitest": { + "repository": utils.TEST_REPOSITORY, + "username": None, + "password": None + }, } +def test_get_repository_config_missing(tmpdir): + pypirc = os.path.join(str(tmpdir), ".pypirc") + + repository_url = "https://notexisting.python.org/pypi" + exp = { + "repository": repository_url, + "username": None, + "password": None, + } + assert (utils.get_repository_from_config(pypirc, 'foo', repository_url) == + exp) + exp = { + "repository": utils.DEFAULT_REPOSITORY, + "username": None, + "password": None, + } + assert utils.get_repository_from_config(pypirc, "pypi") == exp + + def test_get_config_deprecated_pypirc(): tests_dir = os.path.dirname(os.path.abspath(__file__)) deprecated_pypirc_path = os.path.join(tests_dir, 'fixtures', 'deprecated-pypirc') - assert get_config(deprecated_pypirc_path) == { + assert utils.get_config(deprecated_pypirc_path) == { "pypi": { - "repository": DEFAULT_REPOSITORY, + "repository": utils.DEFAULT_REPOSITORY, "username": 'testusername', "password": 'testpassword', }, @@ -119,5 +146,29 @@ ), ) def test_get_userpass_value(cli_value, config, key, strategy, expected): - ret = get_userpass_value(cli_value, config, key, strategy) + ret = utils.get_userpass_value(cli_value, config, key, strategy) assert ret == expected + + +(a)pytest.mark.parametrize( + ('env_name', 'default', 'environ', 'expected'), + [ + ('MY_PASSWORD', None, {}, None), + ('MY_PASSWORD', None, {'MY_PASSWORD': 'foo'}, 'foo'), + ('URL', 'https://example.org', {}, 'https://example.org'), + ('URL', 'https://example.org', {'URL': 'https://pypi.org'}, + 'https://pypi.org'), + ], +) +def test_default_to_environment_action(env_name, default, environ, expected): + option_strings = ('-x', '--example') + dest = 'example' + with helpers.set_env(**environ): + action = utils.EnvironmentDefault( + env=env_name, + default=default, + option_strings=option_strings, + dest=dest, + ) + assert action.env == env_name + assert action.default == expected diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/twine/__init__.py new/twine-1.8.1/twine/__init__.py --- old/twine-1.7.4/twine/__init__.py 2016-07-09 13:21:34.000000000 +0200 +++ new/twine-1.8.1/twine/__init__.py 2016-08-08 17:01:12.000000000 +0200 @@ -23,7 +23,7 @@ __summary__ = "Collection of utilities for interacting with PyPI" __uri__ = "https://github.com/pypa/twine" -__version__ = "1.7.4" +__version__ = "1.8.1" __author__ = "Donald Stufft and individual contributors" __email__ = "donald(a)stufft.io" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/twine/commands/register.py new/twine-1.8.1/twine/commands/register.py --- old/twine-1.7.4/twine/commands/register.py 2015-12-17 00:37:02.000000000 +0100 +++ new/twine-1.8.1/twine/commands/register.py 2016-08-08 17:01:12.000000000 +0200 @@ -24,8 +24,12 @@ def register(package, repository, username, password, comment, config_file, - cert, client_cert): - config = utils.get_repository_from_config(config_file, repository) + cert, client_cert, repository_url): + config = utils.get_repository_from_config( + config_file, + repository, + repository_url, + ) config["repository"] = utils.normalize_repository_url( config["repository"] ) @@ -62,17 +66,38 @@ parser = argparse.ArgumentParser(prog="twine register") parser.add_argument( "-r", "--repository", + action=utils.EnvironmentDefault, + env="TWINE_REPOSITORY", default="pypi", - help="The repository to register the package to (default: " + help="The repository to register the package to. Can be a section in " + "the config file or a full URL to the repository (default: " "%(default)s)", ) parser.add_argument( + "--repository-url", + action=utils.EnvironmentDefault, + env="TWINE_REPOSITORY_URL", + default=None, + required=False, + help="The repository URL to upload the package to. This can be " + "specified with --repository because it will be used if there is " + "no configuration for the value passed to --repository." + ) + parser.add_argument( "-u", "--username", - help="The username to authenticate to the repository as", + action=utils.EnvironmentDefault, + env="TWINE_USERNAME", + required=False, help="The username to authenticate to the repository " + "as (can also be set via %(env)s environment " + "variable)", ) parser.add_argument( "-p", "--password", - help="The password to authenticate to the repository with", + action=utils.EnvironmentDefault, + env="TWINE_PASSWORD", + required=False, help="The password to authenticate to the repository " + "with (can also be set via %(env)s environment " + "variable)", ) parser.add_argument( "-c", "--comment", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/twine/commands/upload.py new/twine-1.8.1/twine/commands/upload.py --- old/twine-1.7.4/twine/commands/upload.py 2016-07-09 13:20:09.000000000 +0200 +++ new/twine-1.8.1/twine/commands/upload.py 2016-08-08 17:01:12.000000000 +0200 @@ -72,7 +72,8 @@ def upload(dists, repository, sign, identity, username, password, comment, - sign_with, config_file, skip_existing, cert, client_cert): + sign_with, config_file, skip_existing, cert, client_cert, + repository_url): # Check that a nonsensical option wasn't given if not sign and identity: raise ValueError("sign must be given along with identity") @@ -85,7 +86,11 @@ ) uploads = [i for i in dists if not i.endswith(".asc")] - config = utils.get_repository_from_config(config_file, repository) + config = utils.get_repository_from_config( + config_file, + repository, + repository_url, + ) config["repository"] = utils.normalize_repository_url( config["repository"] @@ -138,7 +143,7 @@ print(skip_message) continue - resp.raise_for_status() + utils.check_status_code(resp) # Bug 28. Try to silence a ResourceWarning by clearing the connection # pool. @@ -149,8 +154,22 @@ parser = argparse.ArgumentParser(prog="twine upload") parser.add_argument( "-r", "--repository", + action=utils.EnvironmentDefault, + env="TWINE_REPOSITORY", default="pypi", - help="The repository to upload the files to (default: %(default)s)", + help="The repository to register the package to. Can be a section in " + "the config file or a full URL to the repository (default: " + "%(default)s)", + ) + parser.add_argument( + "--repository-url", + action=utils.EnvironmentDefault, + env="TWINE_REPOSITORY_URL", + default=None, + required=False, + help="The repository URL to upload the package to. This can be " + "specified with --repository because it will be used if there is " + "no configuration for the value passed to --repository." ) parser.add_argument( "-s", "--sign", @@ -169,11 +188,19 @@ ) parser.add_argument( "-u", "--username", - help="The username to authenticate to the repository as", + action=utils.EnvironmentDefault, + env="TWINE_USERNAME", + required=False, help="The username to authenticate to the repository " + "as (can also be set via %(env)s environment " + "variable)", ) parser.add_argument( "-p", "--password", - help="The password to authenticate to the repository with", + action=utils.EnvironmentDefault, + env="TWINE_PASSWORD", + required=False, help="The password to authenticate to the repository " + "with (can also be set via %(env)s environment " + "variable)", ) parser.add_argument( "-c", "--comment", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/twine/package.py new/twine-1.8.1/twine/package.py --- old/twine-1.7.4/twine/package.py 2016-02-05 00:23:50.000000000 +0100 +++ new/twine-1.8.1/twine/package.py 2016-08-08 17:01:12.000000000 +0200 @@ -13,12 +13,18 @@ # limitations under the License. from __future__ import absolute_import, unicode_literals, print_function import hashlib +import io import os import subprocess import pkginfo import pkg_resources +try: + import pyblake2 +except ImportError: + pyblake2 = None + from twine.wheel import Wheel from twine.wininst import WinInst @@ -52,17 +58,24 @@ self.signed_basefilename = self.basefilename + '.asc' self.gpg_signature = None + blake2_256_hash = None + if pyblake2 is not None: + blake2_256_hash = pyblake2.blake2b(digest_size=256 // 8) + # NOTE(sigmavirus24): We may or may not be able to use blake2 so let's + # either use the methods or lambdas to do nothing. + blake_update = getattr(blake2_256_hash, 'update', lambda *args: None) + blake_hexdigest = getattr(blake2_256_hash, 'hexdigest', lambda: None) md5_hash = hashlib.md5() sha2_hash = hashlib.sha256() with open(filename, "rb") as fp: - content = fp.read(4096) - while content: + for content in iter(lambda: fp.read(io.DEFAULT_BUFFER_SIZE), b''): md5_hash.update(content) sha2_hash.update(content) - content = fp.read(4096) + blake_update(content) self.md5_digest = md5_hash.hexdigest() self.sha2_digest = sha2_hash.hexdigest() + self.blake2_256_digest = blake_hexdigest() @classmethod def from_filename(cls, filename, comment): @@ -117,11 +130,8 @@ "supported_platform": meta.supported_platforms, "comment": self.comment, "md5_digest": self.md5_digest, - - # When https://github.com/pypa/warehouse/issues/681 is closed and - # warehouse is deployed, uncomment the line below to start sending - # a more up-to-date digest. - # "sha256_digest": self.sha256_digest, + "sha256_digest": self.sha2_digest, + "blake2_256_digest": self.blake2_256_digest, # PEP 314 "provides": meta.provides, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/twine/repository.py new/twine-1.8.1/twine/repository.py --- old/twine-1.7.4/twine/repository.py 2016-07-09 13:20:09.000000000 +0200 +++ new/twine-1.8.1/twine/repository.py 2016-08-08 17:01:12.000000000 +0200 @@ -29,7 +29,8 @@ KEYWORDS_TO_NOT_FLATTEN = set(["gpg_signature", "content"]) LEGACY_PYPI = 'https://pypi.python.org/' -WAREHOUSE = 'https://upload.pypi.io/' +WAREHOUSE = 'https://upload.pypi.org/' +OLD_WAREHOUSE = 'https://upload.pypi.io/' class Repository(object): @@ -158,7 +159,7 @@ def package_is_uploaded(self, package, bypass_cache=False): # NOTE(sigmavirus24): Not all indices are PyPI and pypi.io doesn't # have a similar interface for finding the package versions. - if not self.url.startswith((LEGACY_PYPI, WAREHOUSE)): + if not self.url.startswith((LEGACY_PYPI, WAREHOUSE, OLD_WAREHOUSE)): return False safe_name = package.safe_name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/twine/utils.py new/twine-1.8.1/twine/utils.py --- old/twine-1.7.4/twine/utils.py 2016-07-04 21:45:58.000000000 +0200 +++ new/twine-1.8.1/twine/utils.py 2016-08-08 17:01:12.000000000 +0200 @@ -19,6 +19,8 @@ import functools import getpass import sys +import argparse + try: import configparser @@ -37,7 +39,8 @@ input_func = raw_input -DEFAULT_REPOSITORY = "https://upload.pypi.io/legacy/" +DEFAULT_REPOSITORY = "https://upload.pypi.org/legacy/" +TEST_REPOSITORY = "https://test.pypi.org/legacy/" def get_config(path="~/.pypirc"): @@ -48,7 +51,11 @@ return {"pypi": {"repository": DEFAULT_REPOSITORY, "username": None, "password": None - } + }, + "pypitest": {"repository": TEST_REPOSITORY, + "username": None, + "password": None + }, } # Parse the rc file @@ -92,13 +99,22 @@ return config -def get_repository_from_config(config_file, repository): +def get_repository_from_config(config_file, repository, repository_url=None): # Get our config from the .pypirc file try: return get_config(config_file)[repository] except KeyError: + if repository_url and "://" in repository_url: + # assume that the repsoitory is actually an URL and just sent + # them a dummy with the repo set + return { + "repository": repository_url, + "username": None, + "password": None, + } msg = ( - "Missing '{repo}' section from the configuration file.\n" + "Missing '{repo}' section from the configuration file\n" + "or not a complete URL in --repository.\n" "Maybe you have a out-dated '{cfg}' format?\n" "more info: " "https://docs.python.org/distutils/packageindex.html#pypirc\n" @@ -109,13 +125,29 @@ raise KeyError(msg) +_HOSTNAMES = set(["pypi.python.org", "testpypi.python.org", "upload.pypi.org", + "test.pypi.org"]) + + def normalize_repository_url(url): parsed = urlparse(url) - if parsed.netloc in ["pypi.python.org", "testpypi.python.org"]: + if parsed.netloc in _HOSTNAMES: return urlunparse(("https",) + parsed[1:]) return urlunparse(parsed) +def check_status_code(response): + if (response.status_code == 500 and + response.url.startswith(("https://pypi.python.org", + "https://testpypi.python.org"))): + print("It appears you're uploading to pypi.python.org (or testpypi) " + "you've recieved a 500 error response. PyPI is being phased " + "out for pypi.org. Try using https://upload.pypi.org/legacy/ " + "(or https://test.pypi.org/legacy/) to upload your packages " + "instead. These are the default URLs for Twine now.") + response.raise_for_status() + + def get_userpass_value(cli_value, config, key, prompt_strategy=None): """Gets the username / password from config. @@ -172,3 +204,21 @@ get_userpass_value, key='client_cert', ) + + +class EnvironmentDefault(argparse.Action): + """Get values from environment variable.""" + + def __init__(self, env, required=True, default=None, **kwargs): + default = os.environ.get(env, default) + self.env = env + if default: + required = False + super(EnvironmentDefault, self).__init__( + default=default, + required=required, + **kwargs + ) + + def __call__(self, parser, namespace, values, option_string=None): + setattr(namespace, self.dest, values) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/twine.egg-info/PKG-INFO new/twine-1.8.1/twine.egg-info/PKG-INFO --- old/twine-1.7.4/twine.egg-info/PKG-INFO 2016-07-09 13:22:22.000000000 +0200 +++ new/twine-1.8.1/twine.egg-info/PKG-INFO 2016-08-08 17:02:28.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: twine -Version: 1.7.4 +Version: 1.8.1 Summary: Collection of utilities for interacting with PyPI Home-page: https://github.com/pypa/twine Author: Donald Stufft and individual contributors @@ -172,7 +172,6 @@ Classifier: Operating System :: Microsoft :: Windows Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/twine.egg-info/SOURCES.txt new/twine-1.8.1/twine.egg-info/SOURCES.txt --- old/twine-1.7.4/twine.egg-info/SOURCES.txt 2016-07-09 13:22:23.000000000 +0200 +++ new/twine-1.8.1/twine.egg-info/SOURCES.txt 2016-08-08 17:02:29.000000000 +0200 @@ -10,6 +10,7 @@ docs/index.rst docs/make.bat docs/_static/.empty +tests/helpers.py tests/test_cli.py tests/test_package.py tests/test_repository.py @@ -30,6 +31,7 @@ twine.egg-info/SOURCES.txt twine.egg-info/dependency_links.txt twine.egg-info/entry_points.txt +twine.egg-info/pbr.json twine.egg-info/requires.txt twine.egg-info/top_level.txt twine/commands/__init__.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/twine.egg-info/pbr.json new/twine-1.8.1/twine.egg-info/pbr.json --- old/twine-1.7.4/twine.egg-info/pbr.json 1970-01-01 01:00:00.000000000 +0100 +++ new/twine-1.8.1/twine.egg-info/pbr.json 2015-10-01 17:27:14.000000000 +0200 @@ -0,0 +1 @@ +{"is_release": true, "git_version": "5c06ed2"} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twine-1.7.4/twine.egg-info/requires.txt new/twine-1.8.1/twine.egg-info/requires.txt --- old/twine-1.7.4/twine.egg-info/requires.txt 2016-07-09 13:22:22.000000000 +0200 +++ new/twine-1.8.1/twine.egg-info/requires.txt 2016-08-08 17:02:28.000000000 +0200 @@ -3,3 +3,6 @@ requests >= 2.5.0 requests-toolbelt >= 0.5.1 setuptools >= 0.7.0 + +[with-blake2] +pyblake2

1 0

commit i18nspector for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package i18nspector for openSUSE:Factory checked in at 2016-08-31 14:31:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/i18nspector (Old) and /work/SRC/openSUSE:Factory/.i18nspector.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "i18nspector" Changes: -------- --- /work/SRC/openSUSE:Factory/i18nspector/i18nspector.changes 2016-07-14 09:50:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.i18nspector.new/i18nspector.changes 2016-08-31 14:31:47.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Aug 30 04:51:42 UTC 2016 - lazy.kent(a)opensuse.org + +- Update to 0.25.3. + * Rewrite shebang at install time. + +------------------------------------------------------------------- +Thu Aug 25 05:48:46 UTC 2016 - lazy.kent(a)opensuse.org + +- Update to 0.25.2. + * Don't disable stdout line buffering. + * Make --version print also versions of Python and the libraries. + * Make --version print to stdout, not stderr. + * Use /usr/bin/env in shebangs. + * Fix compatibility with PyPy 3. + * Improve documentation about dependencies. + * Improve the test suite. + +------------------------------------------------------------------- Old: ---- i18nspector-0.25.1.tar.gz i18nspector-0.25.1.tar.gz.asc New: ---- i18nspector-0.25.3.tar.gz i18nspector-0.25.3.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ i18nspector.spec ++++++ --- /var/tmp/diff_new_pack.utDfQ4/_old 2016-08-31 14:31:48.000000000 +0200 +++ /var/tmp/diff_new_pack.utDfQ4/_new 2016-08-31 14:31:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: i18nspector -Version: 0.25.1 +Version: 0.25.3 Release: 0 Summary: Tool for Checking gettext POT/PO/MO Files License: MIT ++++++ i18nspector-0.25.1.tar.gz -> i18nspector-0.25.3.tar.gz ++++++ ++++ 1727 lines of diff (skipped)

1 0

commit geary for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package geary for openSUSE:Factory checked in at 2016-08-31 14:31:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geary (Old) and /work/SRC/openSUSE:Factory/.geary.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "geary" Changes: -------- --- /work/SRC/openSUSE:Factory/geary/geary.changes 2016-08-12 15:57:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.geary.new/geary.changes 2016-08-31 14:31:44.000000000 +0200 @@ -1,0 +2,30 @@ +Sun Aug 28 10:18:59 UTC 2016 - zaitor(a)opensuse.org + +- Update to version 0.11.2: + + Improve showing RTL email with no direction set as RTL + (bgo#713062). + + Improve composer not showing RTL messages as RTL (bgo#713607). + + Fix crash when archiving, deleting, etc. specific messages + (bgo#769010). + + Fix crash from invalid window sizes in settings (bgo#730356). + + Fix crash connecting to tiscali.it/poste.it & other Dovecot + (bgo#66509). + + Fix maximised state not being saved (bgo#755359). + + Fix unresponsive after sending long line starting with '>' + (bgo#768642). + + Fix warning/crash when unable to contact notification server + (bgo#768911). + + Fix using incorrect From address restoring from a draft + (bgo#768419). + + Fix format=flowed when sending non-Latin text (bgo#753528). + + Fix encoding problems with non ASCII/Latin-1/UTF-8 headers + (bgo#753870). + + Don't double spaces after address autocomplete in composer + (bgo#755589). + + Add Language headers to po files. + + Don't rely on a the GEdit app icon for the draft folder + (bgo#753672). + + Fix a number of edge-case critical warnings/errors. + + Updated translations. + +------------------------------------------------------------------- Old: ---- geary-0.11.1.tar.xz New: ---- geary-0.11.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geary.spec ++++++ --- /var/tmp/diff_new_pack.62764D/_old 2016-08-31 14:31:45.000000000 +0200 +++ /var/tmp/diff_new_pack.62764D/_new 2016-08-31 14:31:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: geary -Version: 0.11.1 +Version: 0.11.2 Release: 0 Summary: A lightweight email reader for the GNOME desktop License: LGPL-2.0+ ++++++ geary-0.11.1.tar.xz -> geary-0.11.2.tar.xz ++++++ ++++ 7193 lines of diff (skipped)

1 0

commit php5-ice for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package php5-ice for openSUSE:Factory checked in at 2016-08-31 14:31:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-ice (Old) and /work/SRC/openSUSE:Factory/.php5-ice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-ice" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-ice/php5-ice.changes 2016-06-19 10:49:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5-ice.new/php5-ice.changes 2016-08-31 14:31:40.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Aug 29 11:42:20 UTC 2016 - mruz(a)poczta.onet.pl + +- Ice 1.2.0 + * Db, add mongodb driver + * Validation, translate fields on With validator fix #123 + * Url, uri starts with // fix #121 + +------------------------------------------------------------------- Old: ---- php5-ice-1.1.5.tar.gz New: ---- php5-ice-1.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-ice.spec ++++++ --- /var/tmp/diff_new_pack.R8mWue/_old 2016-08-31 14:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.R8mWue/_new 2016-08-31 14:31:41.000000000 +0200 @@ -22,7 +22,7 @@ %define _name ice Name: %{_php}-%{_name} -Version: 1.1.5 +Version: 1.2.0 Release: 0 Summary: Simple and fast PHP framework delivered as C-extension License: BSD-3-Clause ++++++ php5-ice-1.1.5.tar.gz -> php5-ice-1.2.0.tar.gz ++++++ ++++ 8668 lines of diff (skipped)

1 0

commit efl for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package efl for openSUSE:Factory checked in at 2016-08-31 14:31:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/efl (Old) and /work/SRC/openSUSE:Factory/.efl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "efl" Changes: -------- --- /work/SRC/openSUSE:Factory/efl/efl.changes 2016-06-25 02:23:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.efl.new/efl.changes 2016-08-31 14:31:29.000000000 +0200 @@ -1,0 +2,63 @@ +Sat Aug 27 00:30:00 UTC 2016 - simonf.lees(a)suse.com + +- Remove poppler from OS's that don't support it + +------------------------------------------------------------------- +Thu Aug 25 09:53:13 UTC 2016 - simonf.lees(a)suse.com + +- remove vlc on OS's that dont support it + +------------------------------------------------------------------- +Thu Aug 25 00:53:51 UTC 2016 - simonf.lees(a)suse.com + +- Move things with a different version to last in the list. + +------------------------------------------------------------------- +Wed Aug 24 06:47:44 UTC 2016 - simonf.lees(a)suse.com + +- Remove efl-1.11.3-fix-bashisms.patch wasn't going to be included + upstream and breaks colored output. + +------------------------------------------------------------------- +Wed Aug 24 04:52:08 UTC 2016 - simonf.lees(a)suse.com + +- We now have a libelput1 under wayland + +------------------------------------------------------------------- +Mon Aug 22 12:21:12 UTC 2016 - sflees(a)suse.de + +- Add fix-xkbcommon-compile.patch to fix wayland build + +------------------------------------------------------------------- +Fri Aug 19 07:39:21 UTC 2016 - sflees(a)suse.de + +- Attempt to add back wayland build support - I suspect it has a bug + +------------------------------------------------------------------- +Fri Aug 19 02:59:29 UTC 2016 - sflees(a)suse.de + +- Update to 1.18.0 + * Major Packaging changes + * elementary evas-generic-loaders and emotion-generic-players(not + currently built), have been merged into this package + * New FDO Icon themes added and created in its own package + * The following patches have been removed (fixed upstream) + * fix-upstream-evas-opacity-check.patch + * fix-upstream-evas-opacity-rect.patch + * fix-upstream-evas-trans-rect.patch + * New Software features + * FDO Icon themes + * EFL gained a virtual path subsystem + * Many internal changes that will become visable in 1.19 + * With Elput we introduced a new library for input handling based on libinput. + * Many other bugfixes and minor enhancements + +------------------------------------------------------------------- +Tue Jul 19 06:30:48 UTC 2016 - sflees(a)suse.de + +- A series of patches to fix some themes + * fix-upstream-evas-opacity-check.patch + * fix-upstream-evas-opacity-rect.patch + * fix-upstream-evas-trans-rect.patch + +------------------------------------------------------------------- Old: ---- efl-1.11.3-fix-bashisms.patch efl-1.17.2.tar.xz New: ---- efl-1.18.0.tar.xz fix-xkbcommon-compile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ efl.spec ++++++ ++++ 833 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/efl/efl.spec ++++ and /work/SRC/openSUSE:Factory/.efl.new/efl.spec ++++++ efl-1.17.2.tar.xz -> efl-1.18.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/efl/efl-1.17.2.tar.xz /work/SRC/openSUSE:Factory/.efl.new/efl-1.18.0.tar.xz differ: char 26, line 1 ++++++ fix-xkbcommon-compile.patch ++++++ diff --git a/configure.ac b/configure.ac index 2a9efa4..75c42fe 100644 --- a/configure.ac +++ b/configure.ac @@ -5484,6 +5484,7 @@ EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_ecore_evas_gl_cocoa}], [e EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${build_ecore_evas_win32}], [ecore_win32]) EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_drm}], [ecore_drm2]) EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${build_ecore_evas_wayland}], [ecore_wl2]) +EFL_OPTIONAL_DEPEND_PKG([ELEMENTARY], [${want_elput}], [ELPUT], [xkbcommon]) EFL_OPTIONAL_DEPEND_PKG([ELEMENTARY], [${want_wayland}], [WAYLAND], [wayland-client])

1 0

commit enlightenment for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package enlightenment for openSUSE:Factory checked in at 2016-08-31 14:30:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/enlightenment (Old) and /work/SRC/openSUSE:Factory/.enlightenment.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "enlightenment" Changes: -------- --- /work/SRC/openSUSE:Factory/enlightenment/enlightenment.changes 2016-07-21 08:19:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.enlightenment.new/enlightenment.changes 2016-08-31 14:30:31.000000000 +0200 @@ -1,0 +2,66 @@ +Fri Aug 19 13:31:31 UTC 2016 - sflees(a)suse.de + +- Release test build + +------------------------------------------------------------------- +Fri Aug 19 04:16:19 UTC 2016 - sflees(a)suse.de + +- Bump to 0.21.2 +Carsten Haitzler (6): + e - fix dnd problems coming from getting top object in comp canvas + e ibar/ibox port to elm box - fix assumption on resize + e - fix major memory bloat when in gl mode - dont create shm segments + e temp module - kill tempget process not terminate to ensure death + e ibar - fix devilhorns fix to use the right widght and hight for separator + e comp - set alpha after setting native surface to avoid random crash + +Chidambar Zinnoury (3): + e: Don’t show two consecutive menu separators if there is no need in client menu. + e fm: Add a separator only if there is something before. + e fm: Don’t check every other line whether the location is writable when creating menu. + +Christopher Michael (7): + Revert "e - fix major memory bloat when in gl mode - dont create shm segments" + remove unused variables from _ibar_resize_handle + use proper variables to set size_hint_max on ibar + e ibar - fix "old man" fat finger typo ;) + remove need to create different dialog windows under wayland + wl_fb: Check that e_comp_wl_init does not fail. + add key_up and key_down methods to sreen interface + +Derek Foreman (2): + Fix wayland clients not deleting when they're hidden + Fix wayland extension global creation + +Jean-Philippe ANDRÉ (1): + bg: Fix bg with single jpeg images (no edj) + +JengHyun Kang (1): + e_comp_wl: break from meaningless loop + +Marcel Hollerbach (4): + e_comp_wl: destroy e_drag when source disappears + e_alert: define EFL_BETA_API_SUPPORT before any include + e_dnd: move the ungrab to the object free + xwayland: show the dialog after ecore_wl2 is in sync + +Massimo Maiurana (2): + Updating italian and spanish translations + Updating italian translation + +Mike Blumenkrantz (6): + only check x11 configurerequest geometry changes when applicable + improve quickaccess relaunch help dialog text + move new version of e_comp_top_window_at_xy_get() to dnd, restore old version + clear wl subsurface data during delete only if subsurface is not also deleted + add xwayland compat for efl 1.19+ + bump efl wayland req to 1.18 now that it's out + +Romain Naour (1): + E: include uuid.h only when Wayland support is enabled. + +Stefan Schmidt (1): + mailmap: sync updated file from efl repo + + +------------------------------------------------------------------- Old: ---- enlightenment-0.21.1.tar.xz New: ---- enlightenment-0.21.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enlightenment.spec ++++++ --- /var/tmp/diff_new_pack.zAoHMj/_old 2016-08-31 14:30:33.000000000 +0200 +++ /var/tmp/diff_new_pack.zAoHMj/_new 2016-08-31 14:30:33.000000000 +0200 @@ -16,14 +16,12 @@ # -%define efl_version 1.17.0 +%define efl_version 1.18.0 %define systemd_present (0%{?suse_version} >= 1230 || 0%{?fedora} >= 18) -# efl isn't new enough to currently support wayland -#%define enable_wayland (0%{?suse_version} > 1320) -%define enable_wayland 0 +%define enable_wayland (0%{?suse_version} > 1320) %define generate_manpages 0 Name: enlightenment -Version: 0.21.1 +Version: 0.21.2 Release: 0 Summary: The window manager License: BSD-2-Clause @@ -97,7 +95,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} %if %{enable_wayland} -BuildRequires: pkgconfig(ecore-wayland) +BuildRequires: pkgconfig(ecore-wl2) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-egl) ++++++ enlightenment-0.21.1.tar.xz -> enlightenment-0.21.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/enlightenment/enlightenment-0.21.1.tar.xz /work/SRC/openSUSE:Factory/.enlightenment.new/enlightenment-0.21.2.tar.xz differ: char 27, line 1

1 0

commit python-efl for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package python-efl for openSUSE:Factory checked in at 2016-08-31 14:30:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-efl (Old) and /work/SRC/openSUSE:Factory/.python-efl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-efl" Changes: -------- --- /work/SRC/openSUSE:Factory/python-efl/python-efl.changes 2016-07-05 09:52:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-efl.new/python-efl.changes 2016-08-31 14:30:18.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Aug 23 01:21:23 UTC 2016 - sflees(a)suse.de + +- Update to 1.18.0 to match efl + +------------------------------------------------------------------- +Sun Aug 21 07:43:51 UTC 2016 - sflees(a)suse.de + +- Drop python-efl-reproducible.patch fixed upstream + +------------------------------------------------------------------- Old: ---- python-efl-1.17.0.tar.xz python-efl-reproducible.patch New: ---- python-efl-1.18.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-efl.spec ++++++ --- /var/tmp/diff_new_pack.YQ9Mib/_old 2016-08-31 14:30:19.000000000 +0200 +++ /var/tmp/diff_new_pack.YQ9Mib/_new 2016-08-31 14:30:19.000000000 +0200 @@ -17,15 +17,13 @@ Name: python-efl -Version: 1.17.0 +Version: 1.18.0 Release: 0 Summary: Python bindings of evas License: GPL-3.0 and LGPL-3.0 Group: Development/Libraries/Python Url: http://enlightenment.org Source: %{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM https://phab.enlightenment.org/D3781 -- bmwiedemann -- allow for doc date to be dropped -Patch0: %{name}-reproducible.patch BuildRequires: pkgconfig BuildRequires: python-cython BuildRequires: pkgconfig(dbus-python) @@ -74,7 +72,6 @@ %prep %setup -q -%patch0 -p1 # drop build date from doc to fix build-compare sed -i "s/$html_last_updated_fmt = $.*/\\1None/" ./doc/conf.py ++++++ python-efl-1.17.0.tar.xz -> python-efl-1.18.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/python-efl/python-efl-1.17.0.tar.xz /work/SRC/openSUSE:Factory/.python-efl.new/python-efl-1.18.0.tar.xz differ: char 25, line 1

1 0

commit virtualbox for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at 2016-08-31 14:29:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtualbox (Old) and /work/SRC/openSUSE:Factory/.virtualbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virtualbox" Changes: -------- --- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2016-06-13 21:48:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virtualbox.new/virtualbox.changes 2016-08-31 14:29:55.000000000 +0200 @@ -1,0 +2,200 @@ +Sun Aug 28 01:59:37 UTC 2016 - Larry.Finger(a)lwfinger.net + +- Add "ExclusiveArch: %ix86 x86_64" line back into the spec file. + Handle a false positive indication from kmemleak. This patch is added to "modify_for_4_8_bo_move.patch". + +------------------------------------------------------------------- +Thu Aug 18 20:24:23 UTC 2016 - Larry.Finger(a)lwfinger.net + +- The API for ttm_bo_move_memcpy() is changed in kernel 4.8. + Add patch file "modify_for_4_8_bo_move.patch" to handle this case. + +------------------------------------------------------------------- +Thu Aug 18 18:29:35 UTC 2016 - Larry.Finger(a)lwfinger.net + +- Version bump to 5.1.4 (released 2016-08-16 by Oracle) + +This is a maintenance release. The following items were fixed and/or added: + + GUI: show actual VM uptime in the session information window + Audio: re-enabled speakers for Mac OS X guests (5.1.0 regression; bug #15611) + Audio: fixed crashes under certain conditions + USB: fixed a hang under certain conditions + USB: fixed a hanging guest under certain conditions (bug #15747) + PIIX4: implemented dummy SMBus controller to prevent annoying Linux kernel warnings about uninitialized SMBus base address (bug #9517) + NVMe: several fixes to improve stability, fixed a crash while saving a VM state + VMDK: Fixed an issue creating fixed size images with certain sizes and the Split2G option enabled (bug #15748) + VHDX: fixed cloning images with VBoxManage clonehd (bug #14288) + Storage: Fixed broken bandwidth limitation when the limit is very low (bug #14982) + EFI: fixed sending debug messages in the EFI firmware if a serial port is enabled (bug #12161) + OVF: when importing appliances, make sure that the version of the embedded VirtualBox-specific settings is processed, to get the default settings handling right + VBoxManage: Don't try to set the medium type if there is no change (bug #13850) + Linux installer: fixed some scripting issues (bugs #15701 and #15702) + Linux installer: fixed a path issue on certain Linux distributions (bug #15717) + Windows hosts: fixed corrupted mouse pointers with some Linux and Solaris guests (bug #15665) + Linux Additions: made the video driver work on 32-bit guests with large video memory sizes (bug #15621) + Linux Additions: made the video driver work on kernel 4.7 and later (bug #15769) + Linux Additions: converted a failure message to an informational one when drivers could not be stopped during upgrade (bug #15692) + Linux Additions: made the video driver work around an X server bug which cause screen refresh to stop (bug #15511) + Windows Additions: auto-resizing fixes for Windows 10 guests (bug #15257) + Windows Additions: fixed VBoxTray problems with Windows 2000 (bug #15661) + +- Other local changes: + + "changeset_60565.diff" is removed - fixed in upstream. + "vbox-kernel47-cpu_has_pge.diff" -s removed - also fixed in upstream. + +------------------------------------------------------------------- +Thu Aug 11 19:38:37 UTC 2016 - hpj(a)urpla.net + +- adjust file attributes on SUID helpers to avoid chkstat issues + +------------------------------------------------------------------- +Thu Aug 11 11:48:53 UTC 2016 - hpj(a)urpla.net + +- remove obsolete libgsoap-devel (again) +- remove /usr/lib/udev/rules.d/60-vboxdrv.rules + - it is overruled from vboxdrv init script anyway + - vboxdrv generates a /etc/udev/rules.d/60-vboxdrv.rules file + on _every_ start, note that fact in /etc/default/virtualbox + and describe a strategy to control this behaviour +- relocate VBoxCreateUSBNode.sh to /usr/lib/virtualbox + this is, where vboxdrv, resp. the generated 60-vboxdrv.rules + file is expecting it + +------------------------------------------------------------------- +Mon Aug 8 17:13:27 UTC 2016 - Larry.Finger(a)lwfinger.net + +- Remove request for patch that is no longer used. + +------------------------------------------------------------------- +Mon Aug 8 17:04:19 UTC 2016 - Larry.Finger(a)lwfinger.net + +- Patch11 is file "vbox-kernel47-cpu_has_pge.diff". + +------------------------------------------------------------------- +Mon Aug 8 11:57:18 UTC 2016 - bruno(a)ioda-net.ch + +- Add upstream patch fix cpu_has_pge removed macro in kernel 4.7 + Patch11 +- Add ifarch ix86 to limit concurrency on 32bits (-j2) + Remove ExcludeArch instructions + +------------------------------------------------------------------- +Fri Jul 22 00:49:00 UTC 2016 - luizluca(a)tre-sc.jus.br + +- Version bump to 5.1.2 (released 2016-07-21 by Oracle) + +New main capabilities in Oracle VM VirtualBox 5.1 are: + + Improved Performance: Significantly improved performance for multi-CPU virtual machines and networking. + Bug Reporting Tool: New utility able to collect all the information and logs related to the host and guest operating system, for debug or analysis purposes. + Improved Logging Window: New logging functionalities to highlight and filter information related to guest Virtual Machines. + Improved multimedia availability: Improved support for different USB devices and multi-channel audio availability. + Flash storage emulation: New NVMHCI storage controller emulation available, able to emulate NVME devices - Flash storage - on guest Virtual Machine. + Improved Linux integration: Automatic modules deployment in case of a Linux Kernel upgrade and improved systemd integration for the latest releases of popular Linux distributions. + +- Drop drm-vboxvideo-Add-delayed-update-to-support-fbdev.patch, fixed upstream. +- Drop drm-vboxvideo-Initialize-data-needed-to-map-fbdev-memory.patch, fixed upstream. +- Drop vbox-4.7.patch, fixed upstream. +- vbox-permissions_warning.diff and vbox-usb-warning.diff updated to Qt5 +- User Manual updated. + +------------------------------------------------------------------- +Thu Jul 21 19:18:39 UTC 2016 - adam(a)mizerski.pl + +- virtualbox-60-vboxdrv.rules: added missing udev rules for + vboxdrvu and vboxnetctl (http://www.mgreene.org/?p=211) + +------------------------------------------------------------------- +Tue Jul 20 19:03:36 UTC 2016 - Larry.Finger(a)lwfinger.net + +- Disable i586 builds as they fail with the OBS compiler. + Increased VM to 20000 M. + +- Version bump to 5.0.26 (released 2016-07-18 by Oracle) + +This is a maintenance release. The following items were fixed and/or added: + + VMM: fixed a bug in the task switching code (ticket #15571) + GUI: allow to overwrite an existing file when saving a log file (bug #8034) + GUI: fixed screenshot if the VM is started in separate mode + Audio: improved recording from USB headsets and other sources which might need conversion of captured data + Audio: fixed regression of not having any audio available on Solaris hosts + VGA: fixed an occasional hang when running Windows guests with 3D enabled + Storage: fixed a possible endless reconnect loop for the iSCSI backend if connecting to the target succeeds but further I/O requests cause a disconnect + Storage: fixed a bug when resizing certain VDI images which resulted in using the whole disk on the host (bug #15582) + EFI: fixed access to devices attached to SATA port 2 and higher (bug #15607) + API: fixed video recording with VBoxHeadless (bug #15443) + API: don't crash if there is no graphics controller configured (bug #15628) + VBoxSVC: fixed several memory leaks when handling .dmg images + Solaris hosts: fixed a crash on hosts with certain CPU configurations + Windows hosts: properly fall back to NDIS5 on pre-Vista hosts on silent installations + +------------------------------------------------------------------- +Mon Jul 18 15:24:19 UTC 2016 - Larry.Finger(a)lwfinger.net + +- Version bump to 5.0.24 (released 2016-06-28 by Oracle) + +This is a maintenance release. The following items were fixed and/or added: + + VMM: reverted to the old I/O-APIC code for now to fix certain regressions with 5.0.22 (bug #15529). This means that the networking performance with certain guests will drop to the 5.0.20 level (bug #15295). One workaround is to disable GRO for Linux guests. + Main: when taking a screenshot, don't save garbage for blanked screens + NAT: correctly parse resolv.conf file with multiple separators (5.0.22 regression) + Storage: fixed a possible corruption of stream optimized VMDK images from VMware when opened in read/write mode for the first time + Audio: imlemented dynamic re-attaching of input/output devices on Mac OS X hosts + ACPI: notify the guest when the battery / AC state changes instead of relying on guest polling + Linux hosts: fixed VERR_VMM_SET_JMP_ABORTED_RESUME Guru Meditations on hosts with Linux 4.6 or later (bug #15439) + +------------------------------------------------------------------- +Mon Jun 20 16:18:19 UTC 2016 - Larry.Finger(a)lwfinger.net + +- Version bump to 5.0.22 (released 2016-06-16 by Oracle) + +This is a maintenance release. The following items were fixed and/or added: + + VMM: fixes for certain Intel Atom hosts (bug #14915) + VMM: properly restore the complete FPU state for 32-bit guests on 64-bit hosts on Intel Sandy Bridge and Ivy Bridge CPUs + VMM: new I/O-APIC implementation fixing several bugs and improving the performance under certain conditions (bug #15295 and others) + VMM: fixed a potential Linux guest panic on AMD hosts + VMM: fixed a potential hang with 32-bit EFI guests on Intel CPUs (VT-x without unrestricted guest execution) + GUI: don't allow to start subsequent separate VM instances + GUI: raised upper limit for video capture screen resolution (bug #15432) + GUI: warn if the VM has less than 128MB VRAM configured and 3D enabled + Main: when monitoring DNS configuration changes on Windows hosts avoid false positives from competing DHCP renewals. This should fix NAT link flaps when host has multiple DHCP configured interfaces, in particular when the host uses OpnVPN. + Main: properly display an error message if the VRDE server cannot be enabled at runtime, for example because another service is using the same port + NAT: Initialize guest address guess for wildcard port-forwarding rules with default guest address (bug #15412) + VGA: fix for a problem which made certain legacy guests crash under certain conditions (bug #14811) + ACPI: properly notify the guest if the ACPI battery state changed + OVF: fixed import problems for some appliances using an AHCI controller created by 3rd party applications + SDK: reduced memory usage in the webservice Java bindings + Linux hosts: EL 6.8 fix (bug #15411) + Linux hosts: Linux 4.7 fix (bug #15459) + Linux Additions: Linux 4.7 fixes (bug #15444) + Linux Additions: fix for certain 32-bit guests (5.0.18 regression; bug #15320) + Linux Additions: fixed mouse pointer offset (5.0.18 regression; bug #15324) + Linux Additions: made old X.Org releases work again with kernels 3.11 and later (5.0.18 regression; bug #15319) + Linux Additions: fixed X.Org crash after hard guest reset (5.0.18 regression; bug #15354) + Linux Additions: don't stop the X11 setup if loading the shared folders module fails (5.0.18 regression) + Linux Additions: don't complain if the Drag and Drop service is not available on the host + Solaris Additions: added support for X.org 1.18 + +Local openSUSE specific changes: + File "changeset_60565.diff" is no longer needced and has been removed. + +Version bump to 5.0.20 (released 2016-04-28 by Oracle) + +This is a maintenance release. The following items were fixed and/or added: + + Storage: fixed a regression causing write requests from the BIOS to cause a Guru Meditation with the LsiLogic SCSI controller (5.0.18 regression; bug #15317) + Storage: several emulation fixes in the BusLogic SCSI controller emulation + NAT Network: support TCP in DNS proxy (same problem as in bug #14736 for NAT) + NAT: rework handling of port-forwarding rules (bug #13570) + NAT: rewrite host resolver to handle more query types and make it asynchronous so that a stalled lookup doesn't block all NAT traffic + Snapshots: don't crash when restoring a snapshot which has more network adapters than the current state (ie when the snapshot uses ICH9 and the current state uses PIIX3) + Guest Control: various bugfixes for the copyfrom and copyto commands / API (bug #14336) + VBoxManage: list processor features on list hostinfo (bug #15334) + Linux hosts: fix for Linux 4.5 if CONFIG_NET_CLS_ACT is enabled (bug #15327) ++++ 49 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes ++++ and /work/SRC/openSUSE:Factory/.virtualbox.new/virtualbox.changes Old: ---- VirtualBox-5.0.18-patched.tar.bz2 changeset_60565.diff drm-vboxvideo-Add-delayed-update-to-support-fbdev.patch drm-vboxvideo-Initialize-data-needed-to-map-fbdev-memory.patch vbox-4.7.patch virtualbox-60-vboxdrv.rules New: ---- VirtualBox-5.1.4-patched.tar.bz2 modify_for_4_8_bo_move.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -19,7 +19,7 @@ %define _vbox_instdir %{_libexecdir}/virtualbox %define _udevrulesdir %{_libexecdir}/udev/rules.d Name: virtualbox -Version: 5.0.18 +Version: 5.1.4 Release: 0 Summary: VirtualBox is an Emulator License: GPL-2.0+ @@ -32,7 +32,6 @@ #%(bash %{_sourcedir}/virtualbox-patch-source.sh VirtualBox-%{version}.tar.bz2) Source0: VirtualBox-%{version}-patched.tar.bz2 Source1: UserManual.pdf -Source2: %{name}-60-vboxdrv.rules Source3: %{name}-60-vboxguest.rules Source4: %{name}-default.virtualbox Source5: %{name}-host-kmp-files @@ -85,13 +84,8 @@ Patch109: vbox-usb-warning.diff # Prevent Guest Additions from creating wrong SONAME Patch111: vbox_prevent_wrong_SONAME.patch -# Apply Changeset 60565 - Fix bug in DevLsiLogicSCSI.cpp -Patch112: changeset_60565.diff -# Patch to make xf86-video-fbdev work on vboxvideodrm -Patch114: drm-vboxvideo-Initialize-data-needed-to-map-fbdev-memory.patch -Patch113: drm-vboxvideo-Add-delayed-update-to-support-fbdev.patch -# Patch to allow 5.0.18 to build on kernel 4.7 -Patch115: vbox-4.7.patch +# Fix change in kernel API for ttm_bo_move_memcpy() +Patch112: modify_for_4_8_bo_move.patch # BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel @@ -109,13 +103,15 @@ BuildRequires: glibc-devel-static BuildRequires: gsoap-devel BuildRequires: java-devel >= 1.6.0 -BuildRequires: kbuild >= 0.1.9998svn2689 +BuildRequires: kbuild >= 0.1.9998svn2808 BuildRequires: kernel-syms BuildRequires: libcap-devel BuildRequires: libcurl-devel BuildRequires: libidl-devel BuildRequires: libopenssl-devel -BuildRequires: libqt4-devel +BuildRequires: libqt5-linguist +BuildRequires: libqt5-qtbase-devel +BuildRequires: libqt5-qtx11extras-devel BuildRequires: libvpx-devel BuildRequires: libxslt-devel BuildRequires: module-init-tools @@ -132,6 +128,7 @@ BuildRequires: yasm BuildRequires: zlib-devel-static BuildRequires: pkgconfig(fontsproto) +BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(randrproto) BuildRequires: pkgconfig(renderproto) BuildRequires: pkgconfig(resourceproto) @@ -140,13 +137,17 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xau) BuildRequires: pkgconfig(xcomposite) +BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xdmcp) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xextproto) BuildRequires: pkgconfig(xf86driproto) BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xineramaproto) +BuildRequires: pkgconfig(xmu) BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(xrandr) Requires: %{name}-host-kmp = %{version} Requires(post): sysvinit(syslog) Requires(pre): permissions @@ -157,12 +158,7 @@ Obsoletes: %{name}-ose < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %(sed -e '/^Provides: multiversion(kernel)/d' %{_libexecdir}/rpm/kernel-module-subpackage > %{_builddir}/virtualbox-kmp-template) -# Temporarily disable i586 until build problem is solved -#ExclusiveArch: %ix86 x86_64 -#%if 0%{?suse_version} == 1315 -#ExcludeArch: %ix86 -#%endif -ExclusiveArch: x86_64 +ExclusiveArch: %ix86 x86_64 %ifarch amd64 x86_64 ia32e em64t BuildRequires: gcc-32bit BuildRequires: gcc-c++-32bit @@ -303,7 +299,7 @@ %prep %setup -q -n VirtualBox-%{version} -%patch1 +%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -323,9 +319,7 @@ %patch109 -p1 %patch111 -p1 %patch112 -p1 -%patch113 -p1 -%patch114 -p1 -%patch115 -p1 + #copy user manual cp %{SOURCE1} UserManual.pdf #copy kbuild config @@ -355,7 +349,6 @@ rm -rf src/libs/{libpng-*,libxml2-*,libxslt-*,zlib-*,boost-*} # --disable-kmods don't build Linux kernel modules - but use SUSE specific way see few lines under -# --nofatal try to avoid build fail caused by missing makeself package # NOT an autoconf configure macro ./configure \ --ose \ @@ -365,8 +358,9 @@ --with-linux="/usr" \ --disable-java \ --disable-docs \ - --nofatal \ - --enable-webservice + --enable-webservice \ + --with-mkisofs=/bin/true \ + --with-makeself=/bin/true # configure actually warns we should source env.sh (which seems like it could influence the build...) source ./env.sh @@ -375,7 +369,11 @@ # VBOX_PATH_PACKAGE_DOCS set propper path for link to pdf in .desktop file # VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui echo "build basic parts" -%{_bindir}/kmk %{?_smp_mflags} \ + %ifarch %ix86 + %{_bindir}/kmk -j2 \ + %else + %{_bindir}/kmk %{?_smp_mflags} \ + %endif VBOX_GCC_WERR= \ KBUILD_VERBOSE=2 \ VBOX_USE_SYSTEM_XORG_HEADERS=1 \ @@ -387,8 +385,8 @@ # # build kernel modules for guest and host (check novel-kmp package as example) -# host modules : vboxdrv,vboxnetflt,vboxnetadp -# guest modules : vboxguest,vboxsf,vboxvideo, vboxpci +# host modules : vboxdrv,vboxnetflt,vboxnetadp,vboxpci +# guest modules : vboxguest,vboxsf,vboxvideo echo "build kernel modules" for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \ out/linux.*/release/bin/additions/src/vbox{guest,sf,video}; do @@ -418,13 +416,13 @@ cp $PWD/modules_build_dir/$flavor/vboxguest/Module.symvers \ $PWD/modules_build_dir/$flavor/$module_name fi - # copy vboxguest (for guest) module symbols which are used by vboxvideo km: - if [ "$module_name" = "vboxvideo" ]; then - cp $PWD/modules_build_dir/$flavor/vboxguest/Module.symvers \ - $PWD/modules_build_dir/$flavor/$module_name - fi # build the module for the specific flavor - make %{?_smp_mflags} -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules \ + %ifarch %ix86 + make -j2 \ + %else + make %{?_smp_mflags} \ + %endif + -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules \ M=$PWD/modules_build_dir/$flavor/$module_name done done @@ -473,15 +471,13 @@ install -m 755 out/linux.*/release/bin/additions/mount.vboxsf %{buildroot}/sbin/mount.vboxsf install -m 744 src/VBox/Additions/linux/installer/vboxadd.sh %{buildroot}%{_sysconfdir}/init.d/vboxadd install -m 744 src/VBox/Additions/linux/installer/vboxadd-service.sh %{buildroot}%{_sysconfdir}/init.d/vboxadd-service -install -D -m 744 src/VBox/Additions/linux/installer/vboxadd.sh %{buildroot}/opt/VBoxGuestAdditions-%{version}/init/vboxadd -install -D -m 744 src/VBox/Additions/linux/installer/vboxadd-service.sh %{buildroot}/opt/VBoxGuestAdditions-%{version}/init/vboxadd-service ln -s %{_sysconfdir}/init.d/vboxadd %{buildroot}%{_sbindir}/rcvboxadd ln -s %{_sysconfdir}/init.d/vboxadd-service %{buildroot}%{_sbindir}/rcvboxadd-service # udev rule for guest (virtualbox-guest-tools) install -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules # /media is used for auto-mounting of shared folders %if 0%{?suse_version} > 1310 -install -d 755 %{buildroot}/media +install -d -m 755 %{buildroot}/media %endif # ############################################################## @@ -549,8 +545,6 @@ # create a menu entry install -m 644 out/linux.*/release/bin/VBox.png %{buildroot}%{_datadir}/pixmaps/virtualbox.png -# install udev rule for host (virtualbox) -install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir}/60-vboxdrv.rules # install config with session shutdown defs install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/default/virtualbox #install wrapper script @@ -559,8 +553,8 @@ # modify and install the vboxdrv init script # TODO: some of this stuff breaks the fillup macros below? sed -i "s|%{NOLSB}%|yes|g;s|%{DEBIAN}%||g;s|%{PACKAGE}%|virtualbox|g" \ - src/VBox/Installer/linux/vboxdrv.sh.in -install -m 744 src/VBox/Installer/linux/vboxdrv.sh.in %{buildroot}%{_sysconfdir}/init.d/vboxdrv + src/VBox/Installer/linux/vboxdrv.sh +install -m 744 src/VBox/Installer/linux/vboxdrv.sh %{buildroot}%{_sysconfdir}/init.d/vboxdrv ln -s %{_sysconfdir}/init.d/vboxdrv %{buildroot}%{_sbindir}/rcvboxdrv # Init script to start virtual boxes during boot install -m 755 %{SOURCE12} %{buildroot}%{_sysconfdir}/init.d/vboxes @@ -573,7 +567,7 @@ install -d -m 755 %{buildroot}%{_sysconfdir}/vbox echo -e "#settings for vboxwebsrn\nVBOXWEB_USER=root" > %{buildroot}%{_sysconfdir}/vbox/vbox.cfg # install udev helper script for creating usb devices -install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh %{buildroot}%{_udevrulesdir}/../VBoxCreateUSBNode.sh +install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh %{buildroot}%{_vbox_instdir}/VBoxCreateUSBNode.sh ###################################################### echo "entrering python-virtualbox install section" ###################################################### @@ -774,7 +768,6 @@ %{_vbox_instdir}/components/*.xpt %dir %{_datadir}/virtualbox %config %{_sysconfdir}/default/virtualbox -%{_udevrulesdir}/60-vboxdrv.rules %config %{_sysconfdir}/init.d/vboxdrv %dir %{_sysconfdir}/vbox %config %{_sysconfdir}/vbox/vbox.cfg @@ -782,16 +775,17 @@ %{_var}/adm/fillup-templates/sysconfig.vbox %{_sbindir}/rcvboxes %{_sbindir}/rcvboxdrv -%{_udevrulesdir}/../VBoxCreateUSBNode.sh -%verify(not mode) %attr(4711,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP -%verify(not mode) %attr(4711,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl -%verify(not mode) %attr(4711,root,vboxusers) %{_vbox_instdir}/VBoxHeadless -%verify(not mode) %attr(4711,root,vboxusers) %{_vbox_instdir}/VBoxSDL +%{_vbox_instdir}/VBoxCreateUSBNode.sh +#%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxNetNAT +%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP +%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl +%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxHeadless +%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxSDL %files qt %defattr(-, root, root) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxPermissionMessage -%verify(not mode) %attr(4711,root,vboxusers) %{_vbox_instdir}/VirtualBox +%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VirtualBox #wrapper script is in bindir %attr(0755,root,root) %{_bindir}/VirtualBox #ldd shows libQt* dependency @@ -823,10 +817,6 @@ %config %{_sysconfdir}/init.d/vboxadd-service %{_sbindir}/rcvboxadd %{_sbindir}/rcvboxadd-service -%dir /opt/VBoxGuestAdditions-%{version} -%dir /opt/VBoxGuestAdditions-%{version}/init -/opt/VBoxGuestAdditions-%{version}/init/vboxadd -/opt/VBoxGuestAdditions-%{version}/init/vboxadd-service %if 0%{?suse_version} > 1310 %dir /media %endif ++++++ UserManual.pdf ++++++ (binary differes) ++++++ VirtualBox-5.0.18-patched.tar.bz2 -> VirtualBox-5.1.4-patched.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/virtualbox/VirtualBox-5.0.18-patched.tar.bz2 /work/SRC/openSUSE:Factory/.virtualbox.new/VirtualBox-5.1.4-patched.tar.bz2 differ: char 11, line 1 ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -1,8 +1,8 @@ <?xml version="1.0"?> <constraints> <hardware> - <memory> + <physicalmemory> <size unit="M">8000</size> - </memory> + </physicalmemory> </hardware> </constraints> ++++++ gcc5-real-support.patch ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -1,7 +1,8 @@ -diff -urN VirtualBox-5.0.0.old/Config.kmk VirtualBox-5.0.0/Config.kmk ---- VirtualBox-5.0.0.old/Config.kmk 2015-07-11 13:17:27.273698360 +0200 -+++ VirtualBox-5.0.0/Config.kmk 2015-07-11 13:36:31.958812088 +0200 -@@ -2344,7 +2344,7 @@ +Index: VirtualBox-5.1.2/Config.kmk +=================================================================== +--- VirtualBox-5.1.2.orig/Config.kmk ++++ VirtualBox-5.1.2/Config.kmk +@@ -2542,7 +2542,7 @@ else # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)). # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`. VBOX_GCC_VERSION = $(shell \ @@ -10,10 +11,11 @@ endif # Find MinGW cross compilers for EFI on non-windows systems. We need to probe -diff -urN VirtualBox-5.0.0.old/configure VirtualBox-5.0.0/configure ---- VirtualBox-5.0.0.old/configure 2015-07-11 13:17:27.273698360 +0200 -+++ VirtualBox-5.0.0/configure 2015-07-11 13:37:30.457915488 +0200 -@@ -410,8 +410,13 @@ +Index: VirtualBox-5.1.2/configure +=================================================================== +--- VirtualBox-5.1.2.orig/configure ++++ VirtualBox-5.1.2/configure +@@ -431,8 +431,13 @@ check_gcc() log_failure "cannot execute '$CXX -dumpversion'" fail really fi ++++++ modify_for_4_8_bo_move.patch ++++++ Index: VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_ttm.c =================================================================== --- VirtualBox-5.1.4.orig/src/VBox/Additions/linux/drm/vbox_ttm.c +++ VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_ttm.c @@ -221,7 +221,11 @@ static int vbox_bo_move(struct ttm_buffe struct ttm_mem_reg *new_mem) { int r; +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) r = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem); +#else + r = ttm_bo_move_memcpy(bo, evict, interruptible, no_wait_gpu, new_mem); +#endif return r; } Index: VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_drv.c =================================================================== --- VirtualBox-5.1.4.orig/src/VBox/Additions/linux/drm/vbox_drv.c +++ VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_drv.c @@ -244,9 +244,14 @@ static int vbox_master_set(struct drm_de return 0; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) static void vbox_master_drop(struct drm_device *dev, struct drm_file *file_priv, bool from_release) +#else +static void vbox_master_drop(struct drm_device *dev, + struct drm_file *file_priv) +#endif { struct vbox_private *vbox = dev->dev_private; vbox->initial_mode_queried = false; Index: VirtualBox-5.1.4/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c =================================================================== --- VirtualBox-5.1.4.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +++ VirtualBox-5.1.4/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c @@ -35,7 +35,7 @@ #include <iprt/assert.h> #include <iprt/err.h> #include "r0drv/alloc-r0drv.h" - +#include <linux/kmemleak.h> #if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP) # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) @@ -294,6 +294,7 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb fFlags &= ~RTMEMHDR_FLAG_KMALLOC; pHdr = vmalloc(cb + sizeof(*pHdr)); } + kmemleak_not_leak(pHdr); } else pHdr = vmalloc(cb + sizeof(*pHdr)); ++++++ smap.diff ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -1,8 +1,8 @@ -Index: VirtualBox-4.3.28/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +Index: VirtualBox-5.1.4/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c =================================================================== ---- VirtualBox-4.3.28.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c -+++ VirtualBox-4.3.28/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c -@@ -48,6 +48,12 @@ +--- VirtualBox-5.1.4.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c ++++ VirtualBox-5.1.4/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +@@ -50,6 +50,12 @@ # include <iprt/power.h> # define VBOX_WITH_SUSPEND_NOTIFICATION #endif @@ -14,4 +14,4 @@ +#endif #include <linux/sched.h> - #ifdef CONFIG_DEVFS_FS + #include <linux/miscdevice.h> ++++++ vbox-default-os-type.diff ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -1,8 +1,10 @@ ---- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp 2014-02-25 18:08:58.000000000 +0100 -+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp 2014-03-03 15:18:07.298245235 +0100 -@@ -203,15 +203,15 @@ +Index: VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp +=================================================================== +--- VirtualBox-5.1.2.orig/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp ++++ VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp +@@ -327,15 +327,15 @@ void UINameAndSystemEditor::sltFamilyCha if (iIndexWin7 != -1) - m_pTypeCombo->setCurrentIndex(iIndexWin7); + m_pComboType->setCurrentIndex(iIndexWin7); } - /* Or select Ubuntu item for Linux family as default: */ + /* Or select openSUSE item for Linux family as default: */ @@ -12,12 +14,12 @@ + QString strDefaultID = "openSUSE"; if (ARCH_BITS == 64 && m_fSupportsHWVirtEx && m_fSupportsLongMode) strDefaultID += "_64"; -- int iIndexUbuntu = m_pTypeCombo->findData(strDefaultID, TypeID); +- const int iIndexUbuntu = m_pComboType->findData(strDefaultID, TypeID); - if (iIndexUbuntu != -1) -- m_pTypeCombo->setCurrentIndex(iIndexUbuntu); -+ int iIndexopenSUSE = m_pTypeCombo->findData(strDefaultID, TypeID); -+ if (iIndexopenSUSE != -1) -+ m_pTypeCombo->setCurrentIndex(iIndexopenSUSE); +- m_pComboType->setCurrentIndex(iIndexUbuntu); ++ const int iIndexOpenSUSE = m_pComboType->findData(strDefaultID, TypeID); ++ if (iIndexOpenSUSE != -1) ++ m_pComboType->setCurrentIndex(iIndexOpenSUSE); } /* Else simply select the first one present: */ - else m_pTypeCombo->setCurrentIndex(0); + else ++++++ vbox-deprec-gsoap-service-proxies.diff ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -1,12 +1,13 @@ -diff -Pdpru VirtualBox-4.3.18.orig/src/VBox/Main/webservice/Makefile.kmk VirtualBox-4.3.18/src/VBox/Main/webservice/Makefile.kmk ---- VirtualBox-4.3.18.orig/src/VBox/Main/webservice/Makefile.kmk 2014-10-11 14:07:33.000000000 +0200 -+++ VirtualBox-4.3.18/src/VBox/Main/webservice/Makefile.kmk 2014-10-13 17:10:53.689539003 +0200 -@@ -683,7 +683,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts - : $(VBOXWEB_GSOAPH_FROM_GSOAP) $(VBOXWEB_GSOAPH_FROM_XSLT) $(VBOX_NSMAP) $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@) +Index: VirtualBox-5.1.4/src/VBox/Main/webservice/Makefile.kmk +=================================================================== +--- VirtualBox-5.1.4.orig/src/VBox/Main/webservice/Makefile.kmk ++++ VirtualBox-5.1.4/src/VBox/Main/webservice/Makefile.kmk +@@ -724,7 +724,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts + $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@) $(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT)) $(RM) -f $@ - $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT) + $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT) - $(APPEND) $@ done - - # Copy the generated headers and stuff. This was split into a separate rule + ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround. + $(CP) -f "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp" + $(SED) -f $(VBOX_PATH_WEBSERVICE)/stdsoap2.sed --output "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp" ++++++ vbox-disable-updates.diff ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -1,7 +1,8 @@ -diff -urN VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp ---- VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp 2015-07-11 13:17:27.885699492 +0200 -+++ VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp 2015-07-11 13:21:56.912197474 +0200 -@@ -68,7 +68,7 @@ +Index: VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp +=================================================================== +--- VirtualBox-5.1.2.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp ++++ VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp +@@ -68,7 +68,7 @@ void UIGlobalSettingsUpdate::loadToCache void UIGlobalSettingsUpdate::getFromCache() { /* Apply internal variables data to QWidget(s): */ @@ -10,10 +11,11 @@ if (m_pCheckBoxUpdate->isChecked()) { m_pComboBoxUpdatePeriod->setCurrentIndex(m_cache.m_periodIndex); -diff -urN VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp ---- VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2015-07-11 13:17:27.885699492 +0200 -+++ VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2015-07-11 13:23:13.230338850 +0200 -@@ -106,16 +106,6 @@ +Index: VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +=================================================================== +--- VirtualBox-5.1.2.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp ++++ VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +@@ -104,16 +104,6 @@ UISettingsDialogGlobal::UISettingsDialog iPageIndex, "#input", pSettingsPage); break; } @@ -30,7 +32,7 @@ /* Language page: */ case GlobalSettingsPageType_Language: { -@@ -254,8 +244,6 @@ +@@ -252,8 +242,6 @@ void UISettingsDialogGlobal::retranslate m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input")); #ifdef VBOX_GUI_WITH_NETWORK_MANAGER ++++++ vbox-fpie.diff ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -1,8 +1,8 @@ -Index: VirtualBox-4.3.14/Config.kmk +Index: VirtualBox-5.1.4/Config.kmk =================================================================== ---- VirtualBox-4.3.14.orig/Config.kmk -+++ VirtualBox-4.3.14/Config.kmk -@@ -3963,6 +3963,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi +--- VirtualBox-5.1.4.orig/Config.kmk ++++ VirtualBox-5.1.4/Config.kmk +@@ -4852,6 +4852,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi ifeq ($(KBUILD_TARGET),linux) # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp # TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap @@ -12,10 +12,10 @@ endif ifeq ($(KBUILD_TARGET),win) # No CRT! TEMPLATE_VBOXR3HARDENEDEXE_SDKS = VBOX_NTDLL $(TEMPLATE_VBOXR3EXE_SDKS) -@@ -3981,8 +3984,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! - TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE) +@@ -4871,8 +4874,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE) - else ifn1of ($(KBUILD_TARGET), os2) + else ifn1of ($(KBUILD_TARGET), os2 solaris) + # We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH) - TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS)) - TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) + TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS)) -pie ++++++ vbox-gsoapssl-deps.diff ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-4.3.6/src/VBox/Main/webservice/Makefile.kmk +Index: VirtualBox-5.1.2/src/VBox/Main/webservice/Makefile.kmk =================================================================== ---- VirtualBox-4.3.6.orig/src/VBox/Main/webservice/Makefile.kmk -+++ VirtualBox-4.3.6/src/VBox/Main/webservice/Makefile.kmk +--- VirtualBox-5.1.2.orig/src/VBox/Main/webservice/Makefile.kmk ++++ VirtualBox-5.1.2/src/VBox/Main/webservice/Makefile.kmk @@ -303,6 +303,7 @@ endif vboxwebsrv_LIBS += \ $(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \ @@ -10,7 +10,7 @@ $(LIB_RUNTIME) vboxwebsrv_LIBS.solaris += socket nsl ifdef VBOX_WITH_WEBSERVICES_SSL -@@ -480,6 +481,7 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) | +@@ -483,6 +484,7 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) | webtest_LIBS += \ $(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \ $(VBOX_GSOAP_CXX_LIBS) \ ++++++ vbox-no-build-dates.diff ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -155,7 +155,7 @@ =================================================================== --- src/VBox/Main/glue/com.cpp.orig +++ src/VBox/Main/glue/com.cpp -@@ -292,7 +292,7 @@ static DECLCALLBACK(void) vboxHeaderFoot +@@ -283,7 +283,7 @@ static DECLCALLBACK(void) vboxHeaderFoot #endif "Log opened %s\n", g_pszLogEntity, VBOX_VERSION_STRING, RTBldCfgRevision(), @@ -168,7 +168,7 @@ =================================================================== --- src/VBox/Additions/common/VBoxService/VBoxService.cpp.orig +++ src/VBox/Additions/common/VBoxService/VBoxService.cpp -@@ -238,7 +238,7 @@ static DECLCALLBACK(void) vgsvcLogHeader +@@ -241,7 +241,7 @@ static DECLCALLBACK(void) vgsvcLogHeader "VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n" "Log opened %s\n", RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity, VBOX_BUILD_TARGET, ++++++ vbox-permissions_warning.diff ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -14,7 +14,7 @@ =================================================================== --- /dev/null +++ VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/Makefile.kmk -@@ -0,0 +1,31 @@ +@@ -0,0 +1,35 @@ +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +## @file +# @@ -38,9 +38,13 @@ + +PROGRAMS += VBoxPermissionMessage + -+VBoxPermissionMessage_TEMPLATE = VBOXQT4GUIEXE ++VBoxPermissionMessage_TEMPLATE = VBOXQTGUIEXE +VBoxPermissionMessage_SOURCES = VBoxPermissionMessage.cpp +VBoxPermissionMessage_QT_MODULES = Core Gui ++ifdef VBOX_WITH_QTGUI_V5 ++ # Qt5 requires additional modules: ++ VBoxPermissionMessage_QT_MODULES += Widgets ++endif # VBOX_WITH_QTGUI_V5 + +#INSTALLS += VBoxPermissionMessage + @@ -51,8 +55,8 @@ --- /dev/null +++ VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp @@ -0,0 +1,12 @@ -+#include <QtGui/QApplication> -+#include <QtGui/QMessageBox> ++#include <QtWidgets/QApplication> ++#include <QtWidgets/QMessageBox> +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); ++++++ vbox-python-detection.diff ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -1,8 +1,8 @@ -Index: VirtualBox-4.3.6/src/libs/xpcom18a4/python/gen_python_deps.py +Index: VirtualBox-5.1.2/src/libs/xpcom18a4/python/gen_python_deps.py =================================================================== ---- VirtualBox-4.3.6.orig/src/libs/xpcom18a4/python/gen_python_deps.py -+++ VirtualBox-4.3.6/src/libs/xpcom18a4/python/gen_python_deps.py -@@ -71,7 +71,7 @@ def main(argv): +--- VirtualBox-5.1.2.orig/src/libs/xpcom18a4/python/gen_python_deps.py ++++ VirtualBox-5.1.2/src/libs/xpcom18a4/python/gen_python_deps.py +@@ -75,7 +75,7 @@ def main(argv): else: multi = 1 @@ -11,15 +11,15 @@ prefixes = ["/usr"] versions = [str(sys.version_info[0])+'.'+str(sys.version_info[1])] -@@ -92,22 +92,23 @@ def main(argv): - for v in versions: +@@ -98,22 +98,23 @@ def main(argv): + continue for p in prefixes: c = checkPair(p, v, dllpre, dllsuff, bitness_magic) - if c is not None: + if c: known[v] = c break -- keys = known.keys() +- keys = list(known.keys()) - # we want default to be the lowest versioned Python - keys.sort() - d = None ++++++ vbox-smc-napa.diff ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -1,8 +1,8 @@ -Index: VirtualBox-4.3.6/src/VBox/Devices/PC/vbox.dsl +Index: VirtualBox-5.1.2/src/VBox/Devices/PC/vbox.dsl =================================================================== ---- VirtualBox-4.3.6.orig/src/VBox/Devices/PC/vbox.dsl -+++ VirtualBox-4.3.6/src/VBox/Devices/PC/vbox.dsl -@@ -848,7 +848,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, +--- VirtualBox-5.1.2.orig/src/VBox/Devices/PC/vbox.dsl ++++ VirtualBox-5.1.2/src/VBox/Devices/PC/vbox.dsl +@@ -1179,7 +1179,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, Device (SMC) { Name (_HID, EisaId ("APP0001")) ++++++ vbox-usb-warning.diff ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -16,7 +16,7 @@ =================================================================== --- a/src/apps/VBoxUSB_DevRules/Makefile.kmk (revision 0) +++ b/src/apps/VBoxUSB_DevRules/Makefile.kmk (working copy) -@@ -0,0 +1,29 @@ +@@ -0,0 +1,33 @@ +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +## @file +# @@ -37,9 +37,13 @@ + +PROGRAMS += VBoxUSB_DevRules + -+VBoxUSB_DevRules_TEMPLATE = VBOXQT4GUIEXE ++VBoxUSB_DevRules_TEMPLATE = VBOXQTGUIEXE +VBoxUSB_DevRules_SOURCES = VBoxUSB_DevRules.cpp +VBoxUSB_DevRules_QT_MODULES = Core Gui ++ifdef VBOX_WITH_QTGUI_V5 ++ # Qt5 requires additional modules: ++ VBoxUSB_DevRules_QT_MODULES += Widgets ++endif # VBOX_WITH_QTGUI_V5 + +#INSTALLS += VBoxUSB_DevRules + @@ -51,8 +55,8 @@ --- a/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp (revision 0) +++ b/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp (working copy) @@ -0,0 +1,13 @@ -+#include <QtGui/QApplication> -+#include <QtGui/QMessageBox> ++#include <QtWidgets/QApplication> ++#include <QtWidgets/QMessageBox> +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); ++++++ vbox-vboxadd-init-script.diff ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-5.0.18/src/VBox/Additions/linux/installer/vboxadd.sh +Index: VirtualBox-5.1.4/src/VBox/Additions/linux/installer/vboxadd.sh =================================================================== ---- VirtualBox-5.0.18.orig/src/VBox/Additions/linux/installer/vboxadd.sh -+++ VirtualBox-5.0.18/src/VBox/Additions/linux/installer/vboxadd.sh +--- VirtualBox-5.1.4.orig/src/VBox/Additions/linux/installer/vboxadd.sh ++++ VirtualBox-5.1.4/src/VBox/Additions/linux/installer/vboxadd.sh @@ -23,9 +23,12 @@ # Provides: vboxadd # Required-Start: @@ -15,8 +15,8 @@ +# Short-Description: VirtualBox Linux Additions kernel modules ### END INIT INFO - PATH=$PATH:/bin:/sbin:/usr/sbin -@@ -148,7 +151,6 @@ fail() + ## @todo This file duplicates a lot of script with vboxdrv.sh. When making +@@ -94,7 +97,6 @@ fail() dev=/dev/vboxguest userdev=/dev/vboxuser @@ -24,7 +24,7 @@ owner=vboxadd group=1 -@@ -226,12 +228,6 @@ do_vboxguest_non_udev() +@@ -140,12 +142,6 @@ do_vboxguest_non_udev() fail "Cannot create device $dev with major $maj and minor $min" } fi @@ -37,7 +37,7 @@ if [ ! -c $userdev ]; then maj=10 -@@ -242,12 +238,6 @@ do_vboxguest_non_udev() +@@ -156,12 +152,6 @@ do_vboxguest_non_udev() rmmod vboxguest 2>/dev/null fail "Cannot create device $userdev with major $maj and minor $min" } @@ -50,10 +50,10 @@ fi fi } -@@ -255,13 +245,6 @@ do_vboxguest_non_udev() - start() - { - begin "Starting the VirtualBox Guest Additions "; +@@ -171,13 +161,6 @@ start() + begin "Starting the VirtualBox Guest Additions" console; + # If we got this far assume that the slow set-up has been done. + QUICKSETUP=yes - if test -r $config; then - . $config - else @@ -64,28 +64,38 @@ uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null && ps -A -o comm | grep -q '/*udevd$' 2>/dev/null || no_udev=1 -@@ -300,7 +283,7 @@ start() - $MODPROBE vboxvideo > /dev/null 2>&1 +@@ -193,7 +176,7 @@ start() + $MODPROBE vboxguest >/dev/null 2>&1 || { + setup + $MODPROBE vboxguest >/dev/null 2>&1 || { +- /sbin/rcvboxadd-x11 cleanup ++ #/sbin/rcvboxadd-x11 cleanup + fail "modprobe vboxguest failed" + } + } +@@ -217,7 +200,7 @@ start() + } # Put the X.Org driver in place. This is harmless if it is not needed. - /sbin/rcvboxadd-x11 setup -+# /sbin/rcvboxadd-x11 setup ++ #/sbin/rcvboxadd-x11 setup # Install the guest OpenGL drivers. For now we don't support # multi-architecture installations - rm -rf /etc/ld.so.conf.d/00vboxvideo.conf -@@ -475,7 +458,7 @@ extra_setup() + rm -f /etc/ld.so.conf.d/00vboxvideo.conf +@@ -378,7 +361,7 @@ extra_setup() ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin # And an rc file to re-build the kernel modules and re-set-up the X server. ln -sf "$lib_path/$PACKAGE/vboxadd" /sbin/rcvboxadd - ln -sf "$lib_path/$PACKAGE/vboxadd-x11" /sbin/rcvboxadd-x11 -+# ln -sf "$lib_path/$PACKAGE/vboxadd-x11" /sbin/rcvboxadd-x11 - # At least Fedora 11 and Fedora 12 require the correct security context when - # executing this command from service scripts. Shouldn't hurt for other - # distributions. -@@ -497,49 +480,13 @@ extra_setup() ++ #ln -sf "$lib_path/$PACKAGE/vboxadd-x11" /sbin/rcvboxadd-x11 + # And a post-installation script for rebuilding modules when a new kernel + # is installed. + mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d +@@ -411,49 +394,13 @@ EOF # setup_script setup() { +- begin "Building Guest Additions kernel modules" console - if test -r $config; then - . $config - else @@ -99,20 +109,22 @@ - rm -f $LOG - MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER" - BUILDINTMP="$MODULE_SRC/build_in_tmp" -- DODKMS="$MODULE_SRC/do_dkms" - chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1 -- chcon -t bin_t "$DODKMS" > /dev/null 2>&1 - -- setup_modules -- mod_succ="$?" +- if setup_modules; then +- mod_succ=0 +- else +- mod_succ=1 +- show_error "Please check that you have gcc, make, the header files for your Linux kernel and possibly perl installed." +- fi +- test -n "${QUICKSETUP}" && return "${mod_succ}" - extra_setup - if [ "$mod_succ" -eq "0" ]; then - if running_vboxguest || running_vboxadd; then -- printf "You should restart your guest to make sure the new modules are actually used\n\n" -- else -- start +- begin "You should restart your guest to make sure the new modules are actually used" console - fi - fi +- return "${mod_succ}" + begin "Recompiling VirtualBox kernel module, NOT. It has been packaged." + succ_msg } @@ -124,9 +136,6 @@ - . $config - test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" || - fail "Configuration file $config not complete" -- DODKMS="$INSTALL_DIR/src/vboxguest-$INSTALL_VER/do_dkms" -- elif test -x ./do_dkms; then # Executing as part of the installer... -- DODKMS=./do_dkms - else - fail "Configuration file $config not found" - fi @@ -134,18 +143,18 @@ # Delete old versions of VBox modules. cleanup_modules depmod -@@ -550,12 +497,12 @@ cleanup() +@@ -464,12 +411,12 @@ cleanup() done # Clean-up X11-related bits - /sbin/rcvboxadd-x11 cleanup -+# /sbin/rcvboxadd-x11 cleanup ++ #/sbin/rcvboxadd-x11 cleanup # Remove other files rm /sbin/mount.vboxsf 2>/dev/null rm /sbin/rcvboxadd 2>/dev/null - rm /sbin/rcvboxadd-x11 2>/dev/null -+# rm /sbin/rcvboxadd-x11 2>/dev/null ++ #rm /sbin/rcvboxadd-x11 2>/dev/null + rm -f /etc/kernel/postinst.d/vboxadd /etc/kernel/prerm.d/vboxadd + rmdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d 2>/dev/null rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null - } - ++++++ vbox-vboxdrv-init-script.diff ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -1,7 +1,7 @@ -Index: src/VBox/Installer/linux/vboxdrv.sh.in +Index: VirtualBox-5.1.4/src/VBox/Installer/linux/vboxdrv.sh =================================================================== ---- src/VBox/Installer/linux/vboxdrv.sh.in.orig -+++ src/VBox/Installer/linux/vboxdrv.sh.in +--- VirtualBox-5.1.4.orig/src/VBox/Installer/linux/vboxdrv.sh ++++ VirtualBox-5.1.4/src/VBox/Installer/linux/vboxdrv.sh @@ -19,11 +19,12 @@ # ### BEGIN INIT INFO @@ -18,90 +18,57 @@ +# Description: VirtualBox Linux kernel module ### END INIT INFO - PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH -@@ -191,13 +192,6 @@ start() + ## @todo This file duplicates a lot of script with vboxadd.sh. When making +@@ -258,13 +259,6 @@ start() fi fi # ensure permissions -- if ! chown :%GROUP% $DEVICE 2>/dev/null; then +- if ! chown :"${GROUP}" $DEVICE 2>/dev/null; then - rmmod vboxpci 2>/dev/null - rmmod vboxnetadp 2>/dev/null - rmmod vboxnetflt 2>/dev/null - rmmod vboxdrv 2>/dev/null -- failure "Cannot change group %GROUP% for device $DEVICE" +- failure "Cannot change group ${GROUP} for device $DEVICE" - fi if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why" fi -@@ -295,70 +289,8 @@ stop_vms() +@@ -395,36 +389,8 @@ cleanup() # setup_script setup() { -- stop -- DKMS=`which dkms 2>/dev/null` -- if [ -n "$DKMS" ]; then -- begin_msg "Uninstalling old VirtualBox DKMS kernel modules" -- $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG -- succ_msg +- begin_msg "Building VirtualBox kernel modules" console +- cleanup +- if ! $BUILDINTMP \ +- --save-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxdrv" \ +- --no-print-directory install >> $LOG 2>&1; then +- "${INSTALL_DIR}/check_module_dependencies.sh" +- failure "Look at $LOG to find out what went wrong" - fi -- if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then -- begin_msg "Removing old VirtualBox pci kernel module" -- find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null -- succ_msg -- fi -- if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then -- begin_msg "Removing old VirtualBox netadp kernel module" -- find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null -- succ_msg -- fi -- if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then -- begin_msg "Removing old VirtualBox netflt kernel module" -- find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null -- succ_msg -- fi -- if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then -- begin_msg "Removing old VirtualBox kernel module" -- find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null -- succ_msg +- if ! $BUILDINTMP \ +- --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxnetflt" \ +- --no-print-directory install >> $LOG 2>&1; then +- failure "Look at $LOG to find out what went wrong" - fi -- if [ -n "$DKMS" ]; then -- begin_msg "Trying to register the VirtualBox kernel modules using DKMS" -- if ! $DODKMS install vboxhost $VERSION >> $LOG; then -- fail_msg "Failed, trying without DKMS" -- DKMS="" -- fi +- if ! $BUILDINTMP \ +- --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxnetadp" \ +- --no-print-directory install >> $LOG 2>&1; then +- failure "Look at $LOG to find out what went wrong" - fi -- if [ -z "$DKMS" ]; then -- begin_msg "Recompiling VirtualBox kernel modules" -- if ! $BUILDINTMP \ -- --save-module-symvers /tmp/vboxdrv-Module.symvers \ -- --module-source "$MODULE_SRC/vboxdrv" \ -- --no-print-directory install >> $LOG 2>&1; then -- failure "Look at $LOG to find out what went wrong" -- fi -- if ! $BUILDINTMP \ -- --use-module-symvers /tmp/vboxdrv-Module.symvers \ -- --module-source "$MODULE_SRC/vboxnetflt" \ -- --no-print-directory install >> $LOG 2>&1; then -- failure "Look at $LOG to find out what went wrong" -- fi -- if ! $BUILDINTMP \ -- --use-module-symvers /tmp/vboxdrv-Module.symvers \ -- --module-source "$MODULE_SRC/vboxnetadp" \ -- --no-print-directory install >> $LOG 2>&1; then -- failure "Look at $LOG to find out what went wrong" -- fi -- if ! $BUILDINTMP \ -- --use-module-symvers /tmp/vboxdrv-Module.symvers \ -- --module-source "$MODULE_SRC/vboxpci" \ -- --no-print-directory install >> $LOG 2>&1; then -- failure "Look at $LOG to find out what went wrong" -- fi +- if ! $BUILDINTMP \ +- --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxpci" \ +- --no-print-directory install >> $LOG 2>&1; then +- failure "Look at $LOG to find out what went wrong" - fi - rm -f /etc/vbox/module_not_compiled +- depmod -a +- succ_msg "VirtualBox kernel modules built" + begin_msg "Recompiling VirtualBox kernel module, NOT. It has been packaged." - succ_msg -- start ++ succ_msg "" } dmnstatus() ++++++ vbox-vboxweb-init-script.diff ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -1,7 +1,7 @@ -Index: VirtualBox-4.1.8_OSE/src/VBox/Installer/linux/vboxweb-service.sh +Index: VirtualBox-5.1.2/src/VBox/Installer/linux/vboxweb-service.sh =================================================================== ---- VirtualBox-4.1.8_OSE.orig/src/VBox/Installer/linux/vboxweb-service.sh -+++ VirtualBox-4.1.8_OSE/src/VBox/Installer/linux/vboxweb-service.sh +--- VirtualBox-5.1.2.orig/src/VBox/Installer/linux/vboxweb-service.sh ++++ VirtualBox-5.1.2/src/VBox/Installer/linux/vboxweb-service.sh @@ -20,7 +20,7 @@ # Provides: vboxweb-service # Required-Start: vboxdrv @@ -11,12 +11,3 @@ # Default-Stop: 0 1 6 # Description: VirtualBox web service API ### END INIT INFO -@@ -50,7 +50,7 @@ if [ -f /etc/redhat-release ]; then - PIDFILE="/var/lock/subsys/vboxweb-service" - elif [ -f /etc/SuSE-release ]; then - system=suse -- PIDFILE="/var/lock/subsys/vboxweb-service" -+ PIDFILE="/var/run/vboxweb-service" - elif [ -f /etc/debian_version ]; then - system=debian - PIDFILE="/var/run/vboxweb-service" ++++++ vbox_prevent_wrong_SONAME.patch ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:57.000000000 +0200 @@ -1,8 +1,8 @@ -Index: VirtualBox-5.0.17/src/VBox/Additions/common/crOpenGL/Makefile.kmk +Index: VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk =================================================================== ---- VirtualBox-5.0.17.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk -+++ VirtualBox-5.0.17/src/VBox/Additions/common/crOpenGL/Makefile.kmk -@@ -227,7 +227,7 @@ if1of ($(KBUILD_TARGET), linux solaris f +--- VirtualBox-5.1.2.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk ++++ VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk +@@ -221,7 +221,7 @@ if1of ($(KBUILD_TARGET), linux solaris f dl endif else ++++++ virtualbox-default.virtualbox ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:58.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:58.000000000 +0200 @@ -14,3 +14,13 @@ # #SHUTDOWN_USERS="foo bar" #SHUTDOWN="savestate" + +# ------------------------------------------------------------------------------------------------- +# By default, vboxdrv creates a file /etc/udev/rules.d/60-vboxdrv.rules every time, it is started, +# that allows full control of this hosts usb devices in virtual machines (given, you allow accessing +# them with the GUI). +# In order to control this ability yourself, copy the generated /etc/udev/rules.d/60-vboxdrv.rules +# file to another name and modify to your needs, e.g. comment out all lines beginning with SUBSYSTEM, +# which will make this hosts usb devices inaccessible AND enable the next line. +#INSTALL_NO_UDEV=1 + ++++++ virtualbox-sed-params.patch ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:58.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:58.000000000 +0200 @@ -1,7 +1,8 @@ -diff -urN VirtualBox-5.0.0.old/src/VBox/Main/Makefile.kmk VirtualBox-5.0.0/src/VBox/Main/Makefile.kmk ---- VirtualBox-5.0.0.old/src/VBox/Main/Makefile.kmk 2015-07-11 13:17:27.573698915 +0200 -+++ VirtualBox-5.0.0/src/VBox/Main/Makefile.kmk 2015-07-11 14:34:21.357349819 +0200 -@@ -1199,7 +1199,7 @@ +Index: VirtualBox-5.1.2/src/VBox/Main/Makefile.kmk +=================================================================== +--- VirtualBox-5.1.2.orig/src/VBox/Main/Makefile.kmk ++++ VirtualBox-5.1.2/src/VBox/Main/Makefile.kmk +@@ -1331,7 +1331,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \ $(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \ --stringparam generating "dtrace-probes" \ -o "$@" $(VBoxAPIWrap_VBOX_XSLT) $< @@ -10,3 +11,17 @@ "$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-start.d" \ "$@" \ "$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-end.d" +Index: VirtualBox-5.0.24/src/VBox/Devices/Makefile.kmk +=================================================================== +--- VirtualBox-5.0.24.orig/src/VBox/Devices/Makefile.kmk ++++ VirtualBox-5.0.24/src/VBox/Devices/Makefile.kmk +@@ -818,8 +818,7 @@ if !defined(VBOX_ONLY_EXTPACKS) + $(call MSG_TOOL,iasl,VBoxDD,$<,$@) + $(QUIET)$(RM) -f $@ $@.tmp $@.pre + $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -x c -o $@.pre $< +- $(QUIET)$(SED) -e "s/<NL>/\n/g" \ +- --output $@.pre1 $@.pre ++ $(QUIET)$(SED) -e "s/<NL>/\n/g" $@.pre > $@.pre1 + $(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $@.pre1 + $(QUIET)$(MV) -f $@ $@.tmp + $(QUIET)$(SED) -e "s/AmlCode/AmlCodeSsdtCpuHotPlug/g" \ ++++++ virtualbox-snpritnf-buffer-overflow.patch ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:58.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:58.000000000 +0200 @@ -1,27 +1,12 @@ -diff -urN VirtualBox-5.0.0.old/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c VirtualBox-5.0.0/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c ---- VirtualBox-5.0.0.old/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c 2015-07-14 20:53:12.121479325 +0200 -+++ VirtualBox-5.0.0/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c 2015-07-19 17:11:11.677617929 +0200 -@@ -1568,10 +1568,10 @@ - width = 0; - - if (width != 0) -- f += snprintf(f, sizeof (format), "%d", ABS(width)); -+ f += snprintf(f, sizeof (f), "%d", ABS(width)); - - if (prec > 0) -- f += snprintf(f, sizeof (format), ".%d", prec); -+ f += snprintf(f, sizeof (f), ".%d", prec); - - (void) strcpy(f, pfd->pfd_fmt); - pfd->pfd_rec = rec; -diff -urN VirtualBox-5.0.0.old/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c VirtualBox-5.0.0/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c ---- VirtualBox-5.0.0.old/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c 2015-07-14 20:53:12.120479323 +0200 -+++ VirtualBox-5.0.0/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c 2015-07-19 17:12:35.554945664 +0200 -@@ -866,6 +866,7 @@ - x = x + (x >> 32); - return (x & 0x7F); +Index: VirtualBox-5.1.4/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c +=================================================================== +--- VirtualBox-5.1.4.orig/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c ++++ VirtualBox-5.1.4/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c +@@ -833,6 +833,7 @@ dt_gmatch(const char *s, const char *p) + #else + return (p == NULL || *p == '\0' || RTStrSimplePatternMatch(p, s)); /** @todo implement gmatch. */ #endif + return 0; } - /* + char * ++++++ virtualbox-system-x.patch ++++++ --- /var/tmp/diff_new_pack.FoCNC6/_old 2016-08-31 14:29:58.000000000 +0200 +++ /var/tmp/diff_new_pack.FoCNC6/_new 2016-08-31 14:29:58.000000000 +0200 @@ -1,7 +1,8 @@ -diff -urN VirtualBox-5.0.0.old/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-5.0.0/src/VBox/Additions/common/crOpenGL/Makefile.kmk ---- VirtualBox-5.0.0.old/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-07-11 13:17:27.581698930 +0200 -+++ VirtualBox-5.0.0/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-07-11 13:19:09.146886862 +0200 -@@ -67,18 +67,12 @@ +Index: VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk +=================================================================== +--- VirtualBox-5.1.2.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk ++++ VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk +@@ -68,18 +68,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES VBoxOGL_INCS = . if1of ($(KBUILD_TARGET), linux solaris freebsd) VBoxOGL_INCS += \ @@ -25,7 +26,7 @@ VBoxOGL_DEFS += VBOX_NO_NATIVEGL endif -@@ -213,10 +207,10 @@ +@@ -214,10 +208,10 @@ VBoxOGL_LIBS.win += \ if1of ($(KBUILD_TARGET), linux solaris freebsd) VBoxOGL_LIBS += \ @@ -40,10 +41,11 @@ ifdef VBoxOGL_FAKEDRI ifeq ($(KBUILD_TARGET), freebsd) VBoxOGL_LIBS += \ -diff -urN VirtualBox-5.0.0.old/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-5.0.0/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk ---- VirtualBox-5.0.0.old/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2015-07-11 13:17:27.580698928 +0200 -+++ VirtualBox-5.0.0/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2015-07-11 13:19:09.146886862 +0200 -@@ -40,8 +40,6 @@ +Index: VirtualBox-5.1.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk +=================================================================== +--- VirtualBox-5.1.2.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk ++++ VirtualBox-5.1.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk +@@ -40,8 +40,6 @@ LIBRARIES += \ VBoxGuestR3LibShared ifndef VBOX_ONLY_VALIDATIONKIT if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)

1 0

commit python3-lxml for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package python3-lxml for openSUSE:Factory checked in at 2016-08-31 14:29:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-lxml (Old) and /work/SRC/openSUSE:Factory/.python3-lxml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-lxml" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-lxml/python3-lxml.changes 2016-08-03 11:36:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-lxml.new/python3-lxml.changes 2016-08-31 14:29:41.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Aug 30 04:11:48 UTC 2016 - arun(a)gmx.de + +- update to version 3.6.4: + * GH#204, LP#1614693: build fix for MacOS-X. + +- changes from version 3.6.3: + * LP#1614603: change linker flags to build multi-linux wheels + +- changes from version 3.6.2: + * LP#1614603: release without source changes to provide cleanly + built Linux wheels + +------------------------------------------------------------------- Old: ---- lxml-3.6.1.tar.gz lxmldoc-3.6.1.pdf New: ---- lxml-3.6.4.tar.gz lxmldoc-3.6.4.pdf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-lxml.spec ++++++ --- /var/tmp/diff_new_pack.0NOW3M/_old 2016-08-31 14:29:42.000000000 +0200 +++ /var/tmp/diff_new_pack.0NOW3M/_new 2016-08-31 14:29:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: python3-lxml -Version: 3.6.1 +Version: 3.6.4 Release: 0 Summary: Powerful and Pythonic XML processing library License: BSD-3-Clause and GPL-2.0+ ++++++ lxml-3.6.1.tar.gz -> lxml-3.6.4.tar.gz ++++++ ++++ 20801 lines of diff (skipped) ++++++ lxmldoc-3.6.1.pdf -> lxmldoc-3.6.4.pdf ++++++ (binary differes)

1 0

commit python3-Sphinx for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package python3-Sphinx for openSUSE:Factory checked in at 2016-08-31 14:29:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-Sphinx (Old) and /work/SRC/openSUSE:Factory/.python3-Sphinx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-Sphinx" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-Sphinx/python3-Sphinx.changes 2016-07-27 16:29:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-Sphinx.new/python3-Sphinx.changes 2016-08-31 14:29:35.000000000 +0200 @@ -1,0 +2,32 @@ +Sun Aug 28 17:43:25 UTC 2016 - arun(a)gmx.de + +- update to version 1.4.6: + * Incompatible changes + + #2867: linkcheck builder crashes with six-1.4. Now Sphinx + depends on six-1.5 or later + * Bugs fixed + + applehelp: Sphinx crashes if "hiutil" or "codesign" commands not + found + + Fix "make clean" abort issue when build dir contains regular + files like "DS_Store". + + Reduce epubcheck warnings/errors: + - Fix DOCTYPE to html5 + - Change extension from .html to .xhtml. + - Disable search page on epub results + + #2778: Fix autodoc crashes if obj.__dict__ is a property method + and raises exception + + Fix duplicated toc in epub3 output. + + #2775: Fix failing linkcheck with servers not supporting + identidy encoding + + #2833: Fix formatting instance annotations in ext.autodoc. + + #1911: "-D" option of "sphinx-build" does not override the + "extensions" variable + + #2789: `sphinx.ext.intersphinx` generates wrong hyperlinks if + the inventory is given + + parsing errors for caption of code-blocks are displayed in + document (ref: #2845) + + #2846: "singlehtml" builder does not include figure numbers + + #2816: Fix data from builds cluttering the "Domain.initial_data" + class attributes + +------------------------------------------------------------------- Old: ---- Sphinx-1.4.5.tar.gz New: ---- Sphinx-1.4.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-Sphinx.spec ++++++ --- /var/tmp/diff_new_pack.KmbUrv/_old 2016-08-31 14:29:36.000000000 +0200 +++ /var/tmp/diff_new_pack.KmbUrv/_new 2016-08-31 14:29:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: python3-Sphinx -Version: 1.4.5 +Version: 1.4.6 Release: 0 Url: http://sphinx.pocoo.org Summary: Python documentation generator ++++++ Sphinx-1.4.5.tar.gz -> Sphinx-1.4.6.tar.gz ++++++ ++++ 2731 lines of diff (skipped)

1 0

commit libreoffice for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2016-08-31 14:29:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libreoffice" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2016-08-18 09:15:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2016-08-31 14:29:23.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 29 19:03:53 UTC 2016 - tchvatal(a)suse.com + +- Version update to 5.2.1.2: + * Various fixes for the 5.2 branch release + +------------------------------------------------------------------- Old: ---- libreoffice-5.2.0.4.tar.xz libreoffice-help-5.2.0.4.tar.xz libreoffice-translations-5.2.0.4.tar.xz New: ---- libreoffice-5.2.1.2.tar.xz libreoffice-help-5.2.1.2.tar.xz libreoffice-translations-5.2.1.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.rBJOuY/_old 2016-08-31 14:29:33.000000000 +0200 +++ /var/tmp/diff_new_pack.rBJOuY/_new 2016-08-31 14:29:33.000000000 +0200 @@ -22,7 +22,7 @@ %define numbertext_version 0.9.5 # Urls %define external_url http://dev-www.libreoffice.org/src/ -%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.2.0 +%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.2.1 # Wether to enable the kde integration %if 0%{?is_opensuse} || %{suse_version} == 1320 %bcond_without kdeintegration @@ -30,7 +30,7 @@ %bcond_with kdeintegration %endif Name: libreoffice -Version: 5.2.0.4 +Version: 5.2.1.2 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C ++++++ libreoffice-5.2.0.4.tar.xz -> libreoffice-5.2.1.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-5.2.0.4.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-5.2.1.2.tar.xz differ: char 26, line 1 ++++++ libreoffice-help-5.2.0.4.tar.xz -> libreoffice-help-5.2.1.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-5.2.0.4/ChangeLog-helpcontent2 new/libreoffice-5.2.1.2/ChangeLog-helpcontent2 --- old/libreoffice-5.2.0.4/ChangeLog-helpcontent2 2016-07-29 00:35:13.000000000 +0200 +++ new/libreoffice-5.2.1.2/ChangeLog-helpcontent2 2016-08-25 02:45:42.000000000 +0200 @@ -1,20 +1,14 @@ -2016-07-29 Christian Lohmaier <lohmaier+LibreOffice(a)googlemail.com> [e87cf45eb0377ab316a24398bf8ace4534e498ba] +2016-08-25 Christian Lohmaier <lohmaier+LibreOffice(a)googlemail.com> [07048bc9c7573177300708283ad5da188037d4eb] -Version 5.2.0.4, tag libreoffice-5.2.0.4 +Version 5.2.1.2, tag libreoffice-5.2.1.2 -Change-Id: I052a1c492b5add36e59fde62c895c975be47e3c8 +Change-Id: I5201ac63f8bc631cc44779ee66412dd9c02748c0 -2016-07-07 Christian Lohmaier <lohmaier+LibreOffice(a)googlemail.com> [4357ad5b500691531e20aa96077ce2bfcd3d640a] +2016-08-10 Christian Lohmaier <lohmaier+LibreOffice(a)googlemail.com> [6eeb237d46b38b846af0735dbe1ffb9b55a8fe8b] -Version 5.2.0.2, tag libreoffice-5.2.0.2 +Branch libreoffice-5-2-1 -Change-Id: Ic117c2199ace732725abe2797b67c05d94b66f7d - -2016-07-07 Christian Lohmaier <lohmaier+LibreOffice(a)googlemail.com> [4354b289987ea5ec7518949abb902d0b52dcd722] - -Branch libreoffice-5-2-0 - -This is 'libreoffice-5-2-0' - the stable branch for the 5.2.0 release. +This is 'libreoffice-5-2-1' - the stable branch for the 5.2.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.2.x release, @@ -22,7 +16,7 @@ If you want to build something cool, unstable, and risky, use master. -Change-Id: Id529a39e81a0e6879ca8e3ca7574346811800019 +Change-Id: I5635466eaea41c9cbc667edcca605936d048c6a9 2016-06-21 Christian Lohmaier <lohmaier+LibreOffice(a)googlemail.com> [3f4fadf4e649f0b196c131ecc51e09921e35da85] ++++++ libreoffice-translations-5.2.0.4.tar.xz -> libreoffice-translations-5.2.1.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-5.2.0.4.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-5.2.1.2.tar.xz differ: char 27, line 1

1 0

commit pango for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package pango for openSUSE:Factory checked in at 2016-08-31 14:29:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pango (Old) and /work/SRC/openSUSE:Factory/.pango.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pango" Changes: -------- --- /work/SRC/openSUSE:Factory/pango/pango.changes 2016-08-16 13:02:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pango.new/pango.changes 2016-08-31 14:29:03.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Aug 29 13:53:15 UTC 2016 - dimstar(a)opensuse.org + +- Update to version 1.40.2: + + Improve introspection builds in msvc (bgo#764984). + + Properly handle UTF32 chars in coretext. + + Add rebeccapurple to list of colors. + + Correct font weight mapping in coretext (bgo#766148). + + Use version macros for exports (bgo#767587). + +------------------------------------------------------------------- Old: ---- pango-1.40.1.tar.xz New: ---- pango-1.40.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pango.spec ++++++ --- /var/tmp/diff_new_pack.AxsRiR/_old 2016-08-31 14:29:04.000000000 +0200 +++ /var/tmp/diff_new_pack.AxsRiR/_new 2016-08-31 14:29:04.000000000 +0200 @@ -20,7 +20,7 @@ %define pango_binary_version 1.8.0 Name: pango -Version: 1.40.1 +Version: 1.40.2 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1+ ++++++ pango-1.40.1.tar.xz -> pango-1.40.2.tar.xz ++++++ ++++ 29608 lines of diff (skipped)

1 0

commit geoclue for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package geoclue for openSUSE:Factory checked in at 2016-08-31 14:28:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geoclue (Old) and /work/SRC/openSUSE:Factory/.geoclue.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "geoclue" Changes: -------- --- /work/SRC/openSUSE:Factory/geoclue/geoclue.changes 2016-03-29 14:29:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.geoclue.new/geoclue.changes 2016-08-31 14:28:49.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 13 09:31:16 UTC 2016 - idonmez(a)suse.com + +- Update to GNOME 3.20 Fate#318572 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit pacemaker for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package pacemaker for openSUSE:Factory checked in at 2016-08-31 14:28:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pacemaker (Old) and /work/SRC/openSUSE:Factory/.pacemaker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pacemaker" Changes: -------- --- /work/SRC/openSUSE:Factory/pacemaker/pacemaker.changes 2016-07-21 07:53:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pacemaker.new/pacemaker.changes 2016-08-31 14:28:38.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 26 16:20:25 UTC 2016 - ygao(a)suse.com + +- cts: Restart systemd-journald with "systemctl restart systemd-journald.socket" (bsc#995365) + * bug-995365_pacemaker-cts-restart-systemd-journald.patch + +------------------------------------------------------------------- New: ---- bug-995365_pacemaker-cts-restart-systemd-journald.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pacemaker.spec ++++++ --- /var/tmp/diff_new_pack.lxQjDB/_old 2016-08-31 14:28:39.000000000 +0200 +++ /var/tmp/diff_new_pack.lxQjDB/_new 2016-08-31 14:28:39.000000000 +0200 @@ -55,6 +55,7 @@ Patch7: pacemaker-Wno-format-signedness.patch Patch8: bug-943295_pacemaker-lrmd-log-notice.patch Patch9: bug-977201_pacemaker-controld-self-fencing.patch +Patch10: bug-995365_pacemaker-cts-restart-systemd-journald.patch # Required for core functionality (python-devel depends on python) BuildRequires: autoconf BuildRequires: automake @@ -262,6 +263,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build autoreconf -fvi ++++++ bug-995365_pacemaker-cts-restart-systemd-journald.patch ++++++ Index: pacemaker/cts/CTSaudits.py =================================================================== --- pacemaker.orig/cts/CTSaudits.py +++ pacemaker/cts/CTSaudits.py @@ -67,10 +67,8 @@ class LogAudit(ClusterAudit): for node in nodes: if self.CM.Env["have_systemd"]: - if self.CM.rsh(node, "systemctl stop systemd-journald.socket") != 0: - self.CM.log ("ERROR: Cannot stop 'systemd-journald' on %s" % node) - if self.CM.rsh(node, "systemctl start systemd-journald.service") != 0: - self.CM.log ("ERROR: Cannot start 'systemd-journald' on %s" % node) + if self.CM.rsh(node, "systemctl restart systemd-journald.socket") != 0: + self.CM.log ("ERROR: Cannot restart 'systemd-journald' on %s" % node) if self.CM.rsh(node, "service %s restart" % self.CM.Env["syslogd"]) != 0: self.CM.log ("ERROR: Cannot restart '%s' on %s" % (self.CM.Env["syslogd"], node))

1 0

commit ffmpeg for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package ffmpeg for openSUSE:Factory checked in at 2016-08-31 14:28:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffmpeg (Old) and /work/SRC/openSUSE:Factory/.ffmpeg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ffmpeg" Changes: -------- --- /work/SRC/openSUSE:Factory/ffmpeg/ffmpeg.changes 2016-08-26 23:15:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ffmpeg.new/ffmpeg.changes 2016-08-31 14:28:24.000000000 +0200 @@ -1,0 +2,29 @@ +Sat Aug 27 06:18:31 UTC 2016 - aloisio(a)gmx.com + +- Update to version 3.1.3 + * examples/demuxing_decoding: convert to codecpar + * avcodec/exr: Check tile positions + * avcodec/aacenc: Tighter input checks + * avformat/wtvdec: Check pointer before use + * libavcodec/wmalosslessdec: Check the remaining bits + * avcodec/adpcm: Fix adpcm_ima_wav padding + * avcodec/svq3: fix slice size check + * avcodec/diracdec: Check numx/y + * avcodec/h2645_parse: fix nal size + * avcodec/h2645_parse: Use get_nalsize() in + ff_h2645_packet_split() + * h2645_parse: only read avc length code at the correct + position + * h2645_parse: don't overread AnnexB NALs within an avc + stream + * avcodec/h264_parser: Factor get_avc_nalsize() out + * avcodec/cfhd: Increase minimum band dimension to 3 + * avcodec/indeo2: check ctab + * avformat/swfdec: Fix inflate() error code check + * avcodec/rawdec: Fix bits_per_coded_sample checks + * vcodec/h2645_parse: Clear buffer padding + * avcodec/h2645: Fix NAL unit padding + * avfilter/drawutils: Fix single plane with alpha + * cmdutils: check for SetDllDirectory() availability + +------------------------------------------------------------------- Old: ---- ffmpeg-3.1.2.tar.xz ffmpeg-3.1.2.tar.xz.asc New: ---- ffmpeg-3.1.3.tar.xz ffmpeg-3.1.3.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffmpeg.spec ++++++ --- /var/tmp/diff_new_pack.LdbhRj/_old 2016-08-31 14:28:25.000000000 +0200 +++ /var/tmp/diff_new_pack.LdbhRj/_new 2016-08-31 14:28:25.000000000 +0200 @@ -32,7 +32,7 @@ %bcond_without webp Name: ffmpeg -Version: 3.1.2 +Version: 3.1.3 Release: 0 Summary: Library for working with various multimedia formats License: LGPL-2.1+ and GPL-2.0+ ++++++ ffmpeg-3.1.2.tar.xz -> ffmpeg-3.1.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/ffmpeg/ffmpeg-3.1.2.tar.xz /work/SRC/openSUSE:Factory/.ffmpeg.new/ffmpeg-3.1.3.tar.xz differ: char 26, line 1

1 0

commit xdm for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package xdm for openSUSE:Factory checked in at 2016-08-31 14:27:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdm (Old) and /work/SRC/openSUSE:Factory/.xdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xdm" Changes: -------- --- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2016-06-29 15:03:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2016-08-31 14:27:56.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Aug 23 11:51:55 UTC 2016 - eich(a)suse.com + +- spec-file: + Move '%fillup_only -n displaymanager' into %else + clause of test for initV/systemd as this is only + required for systemd. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdm.spec ++++++ --- /var/tmp/diff_new_pack.a2D3ns/_old 2016-08-31 14:27:57.000000000 +0200 +++ /var/tmp/diff_new_pack.a2D3ns/_new 2016-08-31 14:27:57.000000000 +0200 @@ -177,8 +177,8 @@ %{fillup_and_insserv -Y xdm} %else %service_add_post display-manager.service -%endif %{fillup_only -n displaymanager} +%endif %pre %if !0%{?suse_version} < 1315

1 0

commit hplip for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package hplip for openSUSE:Factory checked in at 2016-08-31 14:27:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hplip (Old) and /work/SRC/openSUSE:Factory/.hplip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hplip" Changes: -------- --- /work/SRC/openSUSE:Factory/hplip/hplip.changes 2016-07-01 09:50:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hplip.new/hplip.changes 2016-08-31 14:27:44.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Aug 26 15:13:30 UTC 2016 - martin.wilck(a)suse.com + +- Fixed device communication/detection problems with mdns/Bonjour + * added hplip-mdns.patch (MDNS send/receive on every iterface) + * added hplip-mdns-retry-query.patch (MDNS retry) + See https://bugs.launchpad.net/hplip/+bug/1616861 + +------------------------------------------------------------------- New: ---- hplip-mdns-retry-query.patch hplip-mdns.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hplip.spec ++++++ --- /var/tmp/diff_new_pack.yhrzBK/_old 2016-08-31 14:27:45.000000000 +0200 +++ /var/tmp/diff_new_pack.yhrzBK/_new 2016-08-31 14:27:45.000000000 +0200 @@ -56,6 +56,10 @@ # Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing '#include <...>' # and missing '#define _GNU_SOURCE' see https://bugs.launchpad.net/hplip/+bug/1456590 Patch108: add_missing_includes_and_define_GNU_SOURCE.patch +# Patch200 fixes device communication and detection via MDNS in some network setups: +Patch200: hplip-mdns.patch +# Patch201 makes MDNS lookups more robust by retrying queries: +Patch201: hplip-mdns-retry-query.patch # HPLIP's Python module cupsext.so has a build-time dependancy on the CUPS version: # It needs symbols (like ippFirstAttribute, ippNextAttribute, ippSetOperation etc) # that are defined only in libcups.so version > 1.5. For backward compatibility @@ -350,6 +354,8 @@ # Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing '#include <...>' # and missing '#define _GNU_SOURCE' see https://bugs.launchpad.net/hplip/+bug/1456590 %patch108 -p1 -b .add_missing_includes_and_define_GNU_SOURCE.orig +%patch200 -p1 -b .mdns +%patch201 -p1 -b .mdns-retry %build # If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake) @@ -407,7 +413,8 @@ --with-drvdir=%{_libexecdir}/cups/driver \ --with-mimedir=%{_sysconfdir}/cups \ --with-docdir=%{_defaultdocdir}/%{name} \ - --with-htmldir==%{_defaultdocdir}/%{name} + --with-htmldir==%{_defaultdocdir}/%{name} \ + CFLAGS='%{optflags}' make %install ++++++ hplip-mdns-retry-query.patch ++++++ diff --git a/protocol/discovery/mdns.c b/protocol/discovery/mdns.c index 92e153a..75ef0ea 100644 --- a/protocol/discovery/mdns.c +++ b/protocol/discovery/mdns.c @@ -436,7 +436,7 @@ static int mdns_read_single_response(int udp_socket, char *recvbuffer, int recvb FD_SET(udp_socket, &master); maxfd = udp_socket; tmo.tv_sec = 0; - tmo.tv_usec = 300000; + tmo.tv_usec = 10000; readfd = master; ret = select(maxfd + 1, &readfd, NULL, NULL, &tmo); @@ -549,6 +549,34 @@ static void mdns_rr_cleanup(DNS_RECORD *rr) } } +static DNS_RECORD* send_and_receive(struct mdns_socket *mdns_sock, + const char *name, + int query_type, int read_mode) +{ + /* wait up to ~1s */ + const useconds_t DELTA_T = 251000; + const int RETRIES = 8; + int retry = RETRIES; + DNS_RECORD *rr_list; + + while (retry) { + if (mdns_send_query(mdns_sock, name, query_type) == MDNS_STATUS_OK) { + rr_list = mdns_read_responses(mdns_sock->socket, read_mode, name); + if (rr_list != NULL) { + DBG("send_and_receive: got response after %d retries\n", + RETRIES - retry); + return rr_list; + } + } + /* MDNS servers delay responses. If the server just responded + * to some query (maybe an earlier one we sent), we may need to wait. */ + --retry; + usleep(DELTA_T); + } + BUG("send_and_receive: no response after %d retries\n", RETRIES); + return NULL; +} + int mdns_probe_nw_scanners(char* uris_buf, int buf_size, int *count) { int n = 0, bytes_read = 0; @@ -562,11 +590,7 @@ int mdns_probe_nw_scanners(char* uris_buf, int buf_size, int *count) if (mdns_open_socket(&mdns_sock) != MDNS_STATUS_OK) goto bugout; - /* Send dns query */ - mdns_send_query(&mdns_sock, scanner_name, QTYPE_PTR); - - /* Read Responses */ - rr_list = mdns_read_responses(mdns_sock.socket, MODE_READ_ALL, scanner_name); + rr_list = send_and_receive(&mdns_sock, scanner_name, QTYPE_PTR, MODE_READ_ALL); /* Update URIs buffer */ bytes_read = mdns_update_uris(rr_list, uris_buf, buf_size, count); @@ -598,10 +622,8 @@ int mdns_lookup(char* hostname, unsigned char* ip) /* Send dns query */ sprintf(fqdn, "%s.local", hostname); - mdns_send_query(&mdns_sock, fqdn, QTYPE_A); - /* Read Responses */ - rr_list = mdns_read_responses(mdns_sock.socket, MODE_READ_SINGLE, fqdn); + rr_list = send_and_receive(&mdns_sock, fqdn, QTYPE_A, MODE_READ_SINGLE); /* Update IP Address buffer */ if(rr_list) diff --git a/protocol/discovery/mdns.h b/protocol/discovery/mdns.h index 34066fb..56d8847 100644 --- a/protocol/discovery/mdns.h +++ b/protocol/discovery/mdns.h @@ -102,5 +102,8 @@ static int mdns_parse_respponse(unsigned char *Response, DNS_RECORD *rr); static void mdns_rr_cleanup(DNS_RECORD *rr); static DNS_RECORD *mdns_read_responses(int udp_socket, int mode, const char *question); static unsigned char* mdns_readMDL(unsigned char *p, unsigned char *normalized_mdl, int len); +static DNS_RECORD* send_and_receive(struct mdns_socket *mdns_sock, const char *name, + int query_type, int read_mode); +static int get_ipv4_address(const char *iface, struct in_addr *addr); #endif // _DISCOVERY_MDNS_H ++++++ hplip-mdns.patch ++++++ diff --git a/base/mdns.py b/base/mdns.py index 03bdb92..11d08b8 100644 --- a/base/mdns.py +++ b/base/mdns.py @@ -35,6 +35,17 @@ from .g import * from . import utils from .sixext import BytesIO, to_bytes_utf8, to_bytes_latin, to_string_latin +if hasattr(socket, "if_nameindex"): + if_nameindex = socket.if_nameindex +else: + def _if_nameindex(): + """"Poor man's if_nameindex for Python 2.""" + import os + sysdir = "/sys/class/net" + return sorted([ (int(open("%s/%s/ifindex" % (sysdir, iface), "r").read(), 0), iface) + for iface in os.listdir(sysdir) ]) + if_nameindex = _if_nameindex + MAX_ANSWERS_PER_PACKET = 24 QTYPE_A = 1 @@ -45,6 +56,8 @@ QTYPE_PTR = 12 QCLASS_IN = 1 +MCAST_ADDR='224.0.0.251' + # Caller needs to ensure, data should be in string format. def read_utf8(offset, data, l): return offset+l, data[offset:offset+l] @@ -188,11 +201,6 @@ def createSocketsWithsetOption(ttl=4): s=None try: s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP) - x = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - x.connect(('1.2.3.4', 56)) - intf = x.getsockname()[0] - x.close() - s.setblocking(0) ttl = struct.pack('B', ttl) except socket.error: @@ -209,14 +217,42 @@ def createSocketsWithsetOption(ttl=4): try: s.setsockopt(socket.SOL_IP, socket.IP_MULTICAST_TTL, ttl) - s.setsockopt(socket.SOL_IP, socket.IP_MULTICAST_IF, socket.inet_aton(intf) + socket.inet_aton('0.0.0.0')) s.setsockopt(socket.SOL_IP, socket.IP_MULTICAST_LOOP ,1) except Exception as e: log.error("Unable to setup multicast socket for mDNS: %s" % e) if s: s.close() return None - return s + + ifaces = [] + for idx, name in if_nameindex(): + mreqn = struct.pack("=4sii", socket.inet_aton(MCAST_ADDR), + socket.ntohl(socket.INADDR_ANY), idx) + try: + s.setsockopt(socket.SOL_IP, socket.IP_ADD_MEMBERSHIP, mreqn) + except Exception as e: + log.debug("Failed to join multicast group on interface %s: %s" % + (name, e)) + else: + log.debug("Joined multicast group on interface %s" % name) + ifaces.append((idx, name)) + + if len(ifaces) == 0: + log.error("failed to join multicast group on any interface") + s.close() + return None + + return (s, ifaces) + +def closeSocket(s): + for idx, name in if_nameindex(): + mreqn = struct.pack("=4sii", socket.inet_aton(MCAST_ADDR), + socket.ntohl(socket.INADDR_ANY), idx) + try: + s.setsockopt(socket.SOL_IP, socket.IP_DROP_MEMBERSHIP, mreqn) + except Exception: + pass + s.close() def updateReceivedData(data, answers): update_spinner() @@ -299,13 +335,22 @@ def updateReceivedData(data, answers): break return y, answers +def send_packets(s, answers, name, mcast_addr, mcast_port): + for p in create_outgoing_packets(answers): + log.debug("Outgoing on %s: (%d)" % (name, len(p))) + log.log_data(p, width=16) + try: + s.sendto(p, 0, (mcast_addr, mcast_port)) + except socket.error as e: + log.debug("Unable to send broadcast DNS packet on %s: %s" % (name, e)) + raise def detectNetworkDevices(ttl=4, timeout=10): - mcast_addr, mcast_port ='224.0.0.251', 5353 + mcast_addr, mcast_port =MCAST_ADDR, 5353 found_devices = {} answers = [] - s = createSocketsWithsetOption(ttl) + s, ifaces = createSocketsWithsetOption(ttl) if not s: return {} @@ -321,14 +366,24 @@ def detectNetworkDevices(ttl=4, timeout=10): break if now >= next: - try: - for p in create_outgoing_packets(answers): - log.debug("Outgoing: (%d)" % len(p)) - log.log_data(p, width=16) - s.sendto(p, 0, (mcast_addr, mcast_port)) + good = [] + for idx, name in ifaces: + mreqn = struct.pack("=4sii", socket.inet_aton(mcast_addr), + socket.ntohl(socket.INADDR_ANY), idx) + try: + s.setsockopt(socket.SOL_IP, socket.IP_MULTICAST_IF, mreqn) + except socket.error as e: + log.debug("failed to set IP_MULTICAST_IF on %s" % name) + continue + try: + send_packets(s, answers, name, mcast_addr, mcast_port) + except socket.error: + continue + else: + good.append((idx, name)) - except socket.error as e: - log.error("Unable to send broadcast DNS packet: %s" % e) + if len(good) == 0: + log.error("Failed to send MDNS packet on any interface") next += delay delay *= 2 @@ -347,7 +402,5 @@ def detectNetworkDevices(ttl=4, timeout=10): found_devices[y['ip']] = y log.debug("Found %d devices" % len(found_devices)) - s.close() + closeSocket(s) return found_devices - - diff --git a/protocol/discovery/mdns.c b/protocol/discovery/mdns.c index 3324d2a..92e153a 100644 --- a/protocol/discovery/mdns.c +++ b/protocol/discovery/mdns.c @@ -1,3 +1,4 @@ + /***************************************************************************** mdns.c - mDNS related calls @@ -29,14 +30,17 @@ #endif #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <syslog.h> #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> #include <arpa/inet.h> +#include <net/if.h> #include "mdns.h" #include <unistd.h> +#include <sys/ioctl.h> /* Convert "www.google.com" to "3www6google3com". */ static int mdns_convert_name_to_dns(const char *name, int name_size, char *dns_name) @@ -71,14 +75,50 @@ static int mdns_convert_name_to_dns(const char *name, int name_size, char *dns_n return x; /* return length DOES include null termination */ } +#define MREQN_INIT(_mr, index) do { \ + (&(_mr))->imr_multiaddr.s_addr = inet_addr("224.0.0.251"); \ + (&(_mr))->imr_address.s_addr = htonl(INADDR_ANY); \ + (&(_mr))->imr_ifindex = (index); \ + } while(0) + +struct mdns_socket { + int socket; + struct if_nameindex *idx; + struct if_nameindex **good; +}; +#define MDNS_SOCKET_INIT { .socket = -1, .idx = NULL, .good = NULL, } + +static int get_ipv4_address(const char *iface, struct in_addr *addr) +{ + int s, r; + struct ifreq ifr; + + memset(&ifr, 0, sizeof(ifr)); + strncpy(ifr.ifr_name, iface, IFNAMSIZ-1); + + s = socket(AF_INET, SOCK_DGRAM, 0); + r = ioctl(s, SIOCGIFADDR, &ifr); + close(s); + + if (r == -1) { + DBG("error in SIOCGIFADDR for %s: %m\n", iface); + return MDNS_STATUS_ERROR; + } + + if (addr != NULL) + memcpy(addr, &((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr, + sizeof(*addr)); + return MDNS_STATUS_OK; +} -static int mdns_open_socket(int *psocket) +static int mdns_open_socket(struct mdns_socket *mdns_sock) { int stat = MDNS_STATUS_ERROR; - int udp_socket = -1, yes = 1; + int udp_socket = -1, yes = 1, ifaces; char loop = 0, ttl = 255; struct sockaddr_in recv_addr , addr; - struct ip_mreq mreq; + struct ip_mreqn mreqn; + struct if_nameindex *idx; DBG("mdns_open_socket entry.\n"); @@ -120,24 +160,86 @@ static int mdns_open_socket(int *psocket) goto bugout; } - /* Join the .local multicast group */ - mreq.imr_multiaddr.s_addr = inet_addr("224.0.0.251"); - mreq.imr_interface.s_addr = htonl(INADDR_ANY); - if (setsockopt(udp_socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(struct ip_mreq)) == -1) { - BUG("unable to add to multicast group: %m\n"); - close(udp_socket); + mdns_sock->idx = if_nameindex(); + if (mdns_sock->idx == NULL) { + BUG("if_nameindex failed: %m\n"); + goto bugout; + } + + for (idx = mdns_sock->idx, ifaces = 0; + idx && (idx->if_index != 0 || idx->if_name != NULL); idx++) { + ifaces ++; + } + + mdns_sock->good = calloc(ifaces, sizeof(struct if_nameindex*)); + if (mdns_sock->good == NULL) + goto bugout; + + for (idx = mdns_sock->idx, ifaces = 0; + idx && (idx->if_index != 0 || idx->if_name != NULL); idx++) { + + /* Skip lo and interfaces without IPv4 address */ + if (!strcmp(idx->if_name, "lo")) + continue; + if (get_ipv4_address(idx->if_name, NULL) == MDNS_STATUS_ERROR) + continue; + + /* Join the multicast group on each local interface */ + MREQN_INIT(mreqn, idx->if_index); + if (setsockopt(udp_socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreqn, + sizeof(struct ip_mreqn)) == -1) { + BUG("unable to add to multicast group for %s: %m\n", idx->if_name); + } else { + mdns_sock->good[ifaces++] = idx; + DBG("added multicast group on interface %s\n", idx->if_name); + } + } + + if (ifaces == 0) { + BUG("no interfaces for multicast found\n"); goto bugout; } - *psocket = udp_socket; - DBG("pSocket = [%d]: %m\n", *psocket); + mdns_sock->socket = udp_socket; + DBG("Socket = [%d]: %m\n", mdns_sock->socket); stat = MDNS_STATUS_OK; bugout: + if (stat != MDNS_STATUS_OK) + mdns_close_socket(mdns_sock); return stat; } -static void mdns_create_query_packet(char* fqdn, int query_type, char* querybuf, int *length) +static void mdns_close_socket(struct mdns_socket *mdns_sock) +{ + int i; + struct if_nameindex *idx; + struct ip_mreqn mreqn; + if (mdns_sock->socket != -1) { + for (i = 0; mdns_sock->good[i]; i++) { + idx = mdns_sock->good[i]; + MREQN_INIT(mreqn, idx->if_index); + if (setsockopt(mdns_sock->socket, IPPROTO_IP, IP_DROP_MEMBERSHIP, + &mreqn, sizeof(struct ip_mreqn)) == -1) { + BUG("unable to drop multicast group for %s: %m\n", idx->if_name); + }; + } + close(mdns_sock->socket); + mdns_sock->socket = -1; + } + + if (mdns_sock->idx != NULL) { + if_freenameindex(mdns_sock->idx); + mdns_sock->idx = NULL; + } + + if (mdns_sock->good != NULL) { + free(mdns_sock->good); + mdns_sock->good = NULL; + } +} + +static void mdns_create_query_packet(const char* fqdn, int query_type, char* querybuf, int *length) { int n = 0; char header[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; @@ -157,14 +259,14 @@ static void mdns_create_query_packet(char* fqdn, int query_type, char* querybuf, *length = n; } -static int mdns_send_query(int udp_socket, char *fqdn, int query_type) +static int mdns_send_query(struct mdns_socket *mdns_sock, const char *fqdn, int query_type) { char querybuf[256] = {0,}; - int length = 0; + int length = 0, i, success; int stat = MDNS_STATUS_OK; struct sockaddr_in send_addr; - DBG("mdns_send_query entry. send socket=%d len=%d\n", udp_socket, length); + DBG("mdns_send_query entry. send socket=%d len=%d\n", mdns_sock->socket, length); mdns_create_query_packet(fqdn, query_type, querybuf, &length); @@ -172,8 +274,26 @@ static int mdns_send_query(int udp_socket, char *fqdn, int query_type) send_addr.sin_family = AF_INET; send_addr.sin_addr.s_addr = inet_addr("224.0.0.251"); send_addr.sin_port = htons(5353); - if (sendto(udp_socket, querybuf, length, 0, (struct sockaddr *) &send_addr, sizeof(send_addr)) < 0) - stat = MDNS_STATUS_ERROR; + + for (i = 0, success = 0; mdns_sock->good[i]; i++) { + struct if_nameindex *idx; + struct ip_mreqn mreqn; + idx = mdns_sock->good[i]; + MREQN_INIT(mreqn, idx->if_index); + if (setsockopt(mdns_sock->socket, IPPROTO_IP, IP_MULTICAST_IF, &mreqn, sizeof(mreqn)) + == -1) { + DBG("failed to set IP_MULTICAST_IF to %s\n", idx->if_name); + continue; + } + if (sendto(mdns_sock->socket, querybuf, length, 0, + (struct sockaddr *) &send_addr, sizeof(send_addr))< 0) { + DBG("failed to send on %s\n", idx->if_name); + } else + success++; + } + + if (success == 0) + stat = MDNS_STATUS_ERROR; DBG("mdns_send_query returning with status(%d)...\n", stat); return stat; @@ -252,7 +372,7 @@ static void mdns_read_header(char *Response, DNS_PKT_HEADER *h) } -static void mdns_parse_respponse(unsigned char *Response, DNS_RECORD *rr) +static int mdns_parse_respponse(unsigned char *Response, DNS_RECORD *rr) { unsigned char *p = Response; unsigned short type = 0, data_len = 0; @@ -263,6 +383,11 @@ static void mdns_parse_respponse(unsigned char *Response, DNS_RECORD *rr) mdns_read_header(Response, &h); p += MDNS_HEADER_SIZE; + if (h.answers + h.additionals <= 0) { + DBG("mdns_parse_respponse: no answers"); + return MDNS_STATUS_ERROR; + } + for (i = 0; i < h.questions; i++) { p += mdns_readName(Response, p, rr->name); @@ -295,6 +420,7 @@ static void mdns_parse_respponse(unsigned char *Response, DNS_RECORD *rr) } DBG("mdns_parse_respponse returning MDL = %s, IP = %s\n",rr->mdl, rr->ip); + return MDNS_STATUS_OK; } static int mdns_read_single_response(int udp_socket, char *recvbuffer, int recvbufsize) @@ -328,7 +454,7 @@ static int mdns_read_single_response(int udp_socket, char *recvbuffer, int recvb return ret; } -static DNS_RECORD *mdns_read_responses(int udp_socket, int mode) +static DNS_RECORD *mdns_read_responses(int udp_socket, int mode, const char *question) { int retries = 3, ret = 0; char recvbuffer[MAX_MDNS_RESPONSE_LEN] = { 0, }; @@ -351,17 +477,22 @@ static DNS_RECORD *mdns_read_responses(int udp_socket, int mode) temp = (DNS_RECORD *)malloc(sizeof(DNS_RECORD)); if(temp) { - temp->next = NULL; - if(head == NULL) - rr = head = temp; - else - { - rr->next = temp; - rr = rr->next; - } - - memset(rr, 0, sizeof(DNS_RECORD)); - mdns_parse_respponse(recvbuffer, rr); + memset(temp, 0, sizeof(DNS_RECORD)); + if (mdns_parse_respponse(recvbuffer, temp) == MDNS_STATUS_OK && + (mode == MODE_READ_ALL || question == NULL || + !strncmp(question, temp->name, sizeof(temp->name)-1))) { + if(head == NULL) + rr = head = temp; + else + { + rr->next = temp; + rr = rr->next; + } + } else { + DBG("Parse error or wrong MDNS name"); + free(temp); + continue; + } if(mode == MODE_READ_SINGLE) break; @@ -421,28 +552,28 @@ static void mdns_rr_cleanup(DNS_RECORD *rr) int mdns_probe_nw_scanners(char* uris_buf, int buf_size, int *count) { int n = 0, bytes_read = 0; - int udp_socket = 0; + struct mdns_socket mdns_sock = MDNS_SOCKET_INIT; int stat = MDNS_STATUS_ERROR; DNS_RECORD *rr_list = NULL; + const char scanner_name[] = "_scanner._tcp.local"; DBG("mdns_probe_nw_scanners entry.\n"); /* Open UDP socket */ - if (mdns_open_socket(&udp_socket) != MDNS_STATUS_OK) + if (mdns_open_socket(&mdns_sock) != MDNS_STATUS_OK) goto bugout; /* Send dns query */ - mdns_send_query(udp_socket, "_scanner._tcp.local", QTYPE_PTR); + mdns_send_query(&mdns_sock, scanner_name, QTYPE_PTR); /* Read Responses */ - rr_list = mdns_read_responses(udp_socket, MODE_READ_ALL); + rr_list = mdns_read_responses(mdns_sock.socket, MODE_READ_ALL, scanner_name); /* Update URIs buffer */ bytes_read = mdns_update_uris(rr_list, uris_buf, buf_size, count); DBG("mdns_probe_nw_scanners returned with bytes_read = [%d].\n",bytes_read); bugout: - if (udp_socket >= 0) - close(udp_socket); + mdns_close_socket(&mdns_sock); mdns_rr_cleanup(rr_list); @@ -455,22 +586,22 @@ bugout: */ int mdns_lookup(char* hostname, unsigned char* ip) { - int udp_socket = 0; + struct mdns_socket mdns_sock = MDNS_SOCKET_INIT; int stat = MDNS_STATUS_ERROR; char fqdn[MAX_NAME_LENGTH] = {0}; DNS_RECORD *rr_list = NULL; DBG("mdns_probe_nw_scanners entry.\n"); /* Open UDP socket */ - if (mdns_open_socket(&udp_socket) != MDNS_STATUS_OK) + if (mdns_open_socket(&mdns_sock) != MDNS_STATUS_OK) goto bugout; /* Send dns query */ sprintf(fqdn, "%s.local", hostname); - mdns_send_query(udp_socket, fqdn, QTYPE_A); + mdns_send_query(&mdns_sock, fqdn, QTYPE_A); /* Read Responses */ - rr_list = mdns_read_responses(udp_socket, MODE_READ_SINGLE); + rr_list = mdns_read_responses(mdns_sock.socket, MODE_READ_SINGLE, fqdn); /* Update IP Address buffer */ if(rr_list) @@ -481,8 +612,7 @@ int mdns_lookup(char* hostname, unsigned char* ip) } bugout: - if (udp_socket >= 0) - close(udp_socket); + mdns_close_socket(&mdns_sock); mdns_rr_cleanup(rr_list); return stat; diff --git a/protocol/discovery/mdns.h b/protocol/discovery/mdns.h index 8fccc82..34066fb 100644 --- a/protocol/discovery/mdns.h +++ b/protocol/discovery/mdns.h @@ -86,19 +86,21 @@ typedef struct _DNS_PKT_HEADER int mdns_probe_nw_scanners(char* buf, int buf_size, int *count); int mdns_lookup(char* hostname, unsigned char* ip); +struct mdns_socket; /*Helper Function Prototypes*/ static int mdns_convert_name_to_dns(const char *name, int name_size, char *dns_name); static int mdns_read_single_response(int udp_socket, char *recvbuffer, int recvbufsize); -static int mdns_open_socket(int *psocket); -static int mdns_send_query(int udp_socket, char *fqdn, int query_type); +static int mdns_open_socket(struct mdns_socket *mdns_sock); +static void mdns_close_socket(struct mdns_socket *mdns_sock); +static int mdns_send_query(struct mdns_socket *mdns_sock, const char *fqdn, int query_type); static int mdns_readName(unsigned char* start, unsigned char *p, char *buf); static int mdns_update_uris(DNS_RECORD *rr, char* uris_buf, int buf_size, int *count); -static void mdns_create_query_packet(char* fqdn, int query_type, char* dnsquery, int *length); +static void mdns_create_query_packet(const char* fqdn, int query_type, char* dnsquery, int *length); static void mdns_read_header(char *Response, DNS_PKT_HEADER *h); -static void mdns_parse_respponse(unsigned char *Response, DNS_RECORD *rr); +static int mdns_parse_respponse(unsigned char *Response, DNS_RECORD *rr); static void mdns_rr_cleanup(DNS_RECORD *rr); -static DNS_RECORD *mdns_read_responses(int udp_socket, int mode); +static DNS_RECORD *mdns_read_responses(int udp_socket, int mode, const char *question); static unsigned char* mdns_readMDL(unsigned char *p, unsigned char *normalized_mdl, int len); #endif // _DISCOVERY_MDNS_H

1 0

commit yast2-users for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '16

31 Aug '16

Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at 2016-08-31 14:27:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-users (Old) and /work/SRC/openSUSE:Factory/.yast2-users.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-users" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-users/yast2-users.changes 2016-08-18 10:19:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-users.new/yast2-users.changes 2016-08-31 14:27:28.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 30 10:37:18 CEST 2016 - schubi(a)suse.de + +- AutoYaST: Checking users entries for duplicate username/UIDs. + (bnc#995397) +- 3.1.56 + +------------------------------------------------------------------- Old: ---- yast2-users-3.1.55.tar.bz2 New: ---- yast2-users-3.1.56.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.kVJbrV/_old 2016-08-31 14:27:29.000000000 +0200 +++ /var/tmp/diff_new_pack.kVJbrV/_new 2016-08-31 14:27:29.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.1.55 +Version: 3.1.56 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-users-3.1.55.tar.bz2 -> yast2-users-3.1.56.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.55/CONTRIBUTING.md new/yast2-users-3.1.56/CONTRIBUTING.md --- old/yast2-users-3.1.55/CONTRIBUTING.md 2016-08-12 16:59:07.000000000 +0200 +++ new/yast2-users-3.1.56/CONTRIBUTING.md 2016-08-30 11:12:17.000000000 +0200 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount… if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.55/package/yast2-users.changes new/yast2-users-3.1.56/package/yast2-users.changes --- old/yast2-users-3.1.55/package/yast2-users.changes 2016-08-12 16:59:07.000000000 +0200 +++ new/yast2-users-3.1.56/package/yast2-users.changes 2016-08-30 11:12:17.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 30 10:37:18 CEST 2016 - schubi(a)suse.de + +- AutoYaST: Checking users entries for duplicate username/UIDs. + (bnc#995397) +- 3.1.56 + +------------------------------------------------------------------- Fri Aug 12 14:37:40 UTC 2016 - ancor(a)suse.com - The YaST client using the user creation dialog can now know diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.55/package/yast2-users.spec new/yast2-users-3.1.56/package/yast2-users.spec --- old/yast2-users-3.1.55/package/yast2-users.spec 2016-08-12 16:59:07.000000000 +0200 +++ new/yast2-users-3.1.56/package/yast2-users.spec 2016-08-30 11:12:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.1.55 +Version: 3.1.56 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.55/src/clients/users_auto.rb new/yast2-users-3.1.56/src/clients/users_auto.rb --- old/yast2-users-3.1.55/src/clients/users_auto.rb 2016-08-12 16:59:07.000000000 +0200 +++ new/yast2-users-3.1.56/src/clients/users_auto.rb 2016-08-30 11:12:17.000000000 +0200 @@ -36,8 +36,12 @@ # This is a client for autoinstallation. It takes its arguments, # goes through the configuration and return the setting. # Does not do any changes to the configuration. + +Yast.import "Report" + module Yast class UsersAutoClient < Client + def main Yast.import "UI" textdomain "users" @@ -89,6 +93,7 @@ # param = $["users": users]; if @func == "Import" + check_users(@param["users"] || []) @ret = Users.Import(@param) # create a summary elsif @func == "Summary" @@ -156,6 +161,21 @@ deep_copy(@ret) end + + private + + # Checking double user entries + # (double username or UID) + # @param [Array] users to check + def check_users(users) + if users.size > users.uniq { |u| u["username"]}.size + Report.Error(_("Found users in profile with equal <username>.")) + end + if users.size > users.uniq { |u| u["uid"]}.size + Report.Error(_("Found users in profile with equal <uid>.")) + end + end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.55/test/fixtures/users_error.yml new/yast2-users-3.1.56/test/fixtures/users_error.yml --- old/yast2-users-3.1.55/test/fixtures/users_error.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-users-3.1.56/test/fixtures/users_error.yml 2016-08-30 11:12:17.000000000 +0200 @@ -0,0 +1,23 @@ +users: + - username: root + user_password: yast.password + fullname: Superuser + encrypted: true + - username: yast + user_password: suse + fullname: YaST team user + gid: 100 + uid: 1000 + shell: /usr/bin/zsh + encrypted: true + - username: saprouter + user_password: suse + fullname: SAP User + gid: 100 + uid: 1000 + shell: /usr/bin/zsh + encrypted: true + - username: root + user_password: yast.password + fullname: Superuser + encrypted: true \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.55/test/test_helper.rb new/yast2-users-3.1.56/test/test_helper.rb --- old/yast2-users-3.1.55/test/test_helper.rb 2016-08-12 16:59:08.000000000 +0200 +++ new/yast2-users-3.1.56/test/test_helper.rb 2016-08-30 11:12:17.000000000 +0200 @@ -48,6 +48,9 @@ config.mock_with :rspec do |c| # https://relishapp.com/rspec/rspec-mocks/v/3-0/docs/verifying-doubles/partia… c.verify_partial_doubles = true + + config.extend Yast::I18n # available in context/describe + config.include Yast::I18n # available in it/let/before/... end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.55/test/users_auto_test.rb new/yast2-users-3.1.56/test/users_auto_test.rb --- old/yast2-users-3.1.55/test/users_auto_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-users-3.1.56/test/users_auto_test.rb 2016-08-30 11:12:17.000000000 +0200 @@ -0,0 +1,41 @@ +#!/usr/bin/env rspec + +require_relative "test_helper" +require "yaml" +require_relative "../src/clients/users_auto" + +describe Yast::UsersAutoClient do + Yast.import "WFM" + Yast.import "Users" + Yast.import "Users" + Yast.import "Report" + + let(:mode) { "autoinstallation" } + + before do + allow(Yast::Mode).to receive(:mode).and_return(mode) + end + + describe "#AutoYaST" do + + context "Import" do + let(:func) { "Import" } + + context "when double users have been given in the profile" do + let(:users) { YAML.load_file(FIXTURES_PATH.join("users_error.yml")) } + + before do + allow(Yast::WFM).to receive(:Args).with(no_args).and_return([func,users]) + allow(Yast::WFM).to receive(:Args).with(0).and_return(func) + allow(Yast::WFM).to receive(:Args).with(1).and_return(users) + end + + it "report error" do + expect(Yast::Report).to receive(:Error).with(_("Found users in profile with equal <username>.")) + expect(Yast::Report).to receive(:Error).with(_("Found users in profile with equal <uid>.")) + expect(subject.main).to eq(true) + end + end + end + end +end

1 0

commit syncthing-gtk for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package syncthing-gtk for openSUSE:Factory checked in at 2016-08-31 00:11:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syncthing-gtk (Old) and /work/SRC/openSUSE:Factory/.syncthing-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "syncthing-gtk" Changes: -------- --- /work/SRC/openSUSE:Factory/syncthing-gtk/syncthing-gtk.changes 2016-07-27 16:12:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.syncthing-gtk.new/syncthing-gtk.changes 2016-08-31 00:12:27.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Aug 30 13:16:24 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 0.9.2.1 (changes since 0.9.1): + * Add black and white icons theme, selectable in UI settings. + * New directory ID is pre-filled with auto-generated ID. + * Add a man page. + * Add Spanish translation. + * Fix error message about incompatible nodes being repeated + infinitely. + * Fix File Pull Order defaulting to nothing. + * Fix "Override remote changes" option not doing anything. + * 'tcp://' is prepended to dynamic address in directory editor. + * Add more error details when '404/Not Found' error is generated. + +------------------------------------------------------------------- Old: ---- syncthing-gtk-0.9.1.tar.gz New: ---- syncthing-gtk-0.9.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syncthing-gtk.spec ++++++ --- /var/tmp/diff_new_pack.AJzR15/_old 2016-08-31 00:12:28.000000000 +0200 +++ /var/tmp/diff_new_pack.AJzR15/_new 2016-08-31 00:12:28.000000000 +0200 @@ -19,7 +19,7 @@ %global __requires_exclude typelib\$(Caja|Nautilus|Nemo)\$ %define _name syncthing_gtk Name: syncthing-gtk -Version: 0.9.1 +Version: 0.9.2.1 Release: 0 Summary: Syncthing Gtk-based graphical interface License: GPL-2.0+ @@ -119,9 +119,10 @@ %{python_sitelib}/%{_name}-* %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}*.png -%{_datadir}/icons/hicolor/*/apps/si-*.png %{_datadir}/icons/hicolor/*/emblems/emblem-*.png +%{_datadir}/icons/hicolor/*/status/si-*.png %{_datadir}/pixmaps/*.png +%{_mandir}/man1/%{name}.1%{?ext_man} %files lang -f %{name}.lang %defattr(-,root,root) ++++++ syncthing-gtk-0.9.1.tar.gz -> syncthing-gtk-0.9.2.1.tar.gz ++++++ ++++ 5483 lines of diff (skipped)

1 0

commit kalzium for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kalzium for openSUSE:Factory checked in at 2016-08-31 00:11:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kalzium (Old) and /work/SRC/openSUSE:Factory/.kalzium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kalzium" Changes: -------- --- /work/SRC/openSUSE:Factory/kalzium/kalzium.changes 2016-07-24 19:44:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kalzium.new/kalzium.changes 2016-08-31 00:12:25.000000000 +0200 @@ -1,0 +2,21 @@ +Tue Aug 30 10:29:24 UTC 2016 - fabian(a)ritter-vogt.de + +- Remove unnecessary Requires: libkdeedu4-devel + +------------------------------------------------------------------- +Fri Aug 12 10:08:34 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:45:28 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kalzium-16.04.3.tar.xz New: ---- kalzium-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kalzium.spec ++++++ --- /var/tmp/diff_new_pack.NWLeAX/_old 2016-08-31 00:12:26.000000000 +0200 +++ /var/tmp/diff_new_pack.NWLeAX/_new 2016-08-31 00:12:26.000000000 +0200 @@ -17,7 +17,7 @@ Name: kalzium -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Periodic Table of Elements License: GPL-2.0+ @@ -32,7 +32,6 @@ BuildRequires: glew-devel BuildRequires: libeigen2-devel BuildRequires: libkde4-devel -BuildRequires: libkdeedu4-devel BuildRequires: libopenbabel-devel BuildRequires: python-devel BuildRequires: xz @@ -54,7 +53,6 @@ Summary: Periodic Table of Elements Group: Development/Libraries/KDE Requires: kalzium = %{version} -Requires: libkdeedu4-devel %description devel Kalzium shows a periodic table of the elements. ++++++ kalzium-16.04.3.tar.xz -> kalzium-16.08.0.tar.xz ++++++

1 0

commit gnu_parallel for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package gnu_parallel for openSUSE:Factory checked in at 2016-08-31 00:11:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnu_parallel (Old) and /work/SRC/openSUSE:Factory/.gnu_parallel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnu_parallel" Changes: -------- --- /work/SRC/openSUSE:Factory/gnu_parallel/gnu_parallel.changes 2016-08-09 22:15:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnu_parallel.new/gnu_parallel.changes 2016-08-31 00:12:23.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Aug 30 08:47:57 UTC 2016 - jengelh(a)inai.de + +- Update to new upstream release 20160822 +* --tmuxpane opens jobs in panes in tmux. Useful if you want to + monitor progress of less than 100 simultaneous jobs. +* --linebuffer now treats \r as line ending, too. +* Perl changes forces use of floats to be given with leading + zero, so 0.1 and not .1 +* --xapply renamed to --link. + +------------------------------------------------------------------- Old: ---- parallel-20160722.tar.bz2 parallel-20160722.tar.bz2.sig New: ---- parallel-20160822.tar.bz2 parallel-20160822.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnu_parallel.spec ++++++ --- /var/tmp/diff_new_pack.0mphDh/_old 2016-08-31 00:12:24.000000000 +0200 +++ /var/tmp/diff_new_pack.0mphDh/_new 2016-08-31 00:12:24.000000000 +0200 @@ -17,7 +17,7 @@ Name: gnu_parallel -Version: 20160722 +Version: 20160822 Release: 0 Summary: Shell tool for executing jobs in parallel License: GPL-3.0+ ++++++ parallel-20160722.tar.bz2 -> parallel-20160822.tar.bz2 ++++++ ++++ 5877 lines of diff (skipped) ++++++ parallel-20160722.tar.bz2.sig -> parallel-20160822.tar.bz2.sig ++++++ --- /work/SRC/openSUSE:Factory/gnu_parallel/parallel-20160722.tar.bz2.sig 2016-08-09 22:15:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnu_parallel.new/parallel-20160822.tar.bz2.sig 2016-08-31 00:12:23.000000000 +0200 @@ -2,7 +2,7 @@ # To check the signature run: # echo | gpg -# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20160722.tar.bz2.sig +# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20160822.tar.bz2.sig echo | gpg 2>/dev/null gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve $0 @@ -11,32 +11,32 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 -iQTwBAABCgAGBQJXkpsYAAoJENGrRRaIiIiIU+AmoKgD9iN69S1RCcqteYyPGU9X -As5yKuaLZSeuJVA9BaGoE+XOsMfzqVGSjeimh4CGYs/FoE6rnoXb0XOL1Rsv1anM -ueR0ZwfCSoGC9CTPCiUjjswba2qgav/UqCs8dmczs0hRTNOs3TX4IYfslc6x7dFI -G0VcxD9ZbCdNcJ2C1s1bAfgbWchrM38zEsMcbaeLzA5av6i+gumUNsE30o/j2bKx -Hof7spYB1HrUVazhzjENorhHSD3TiJbOYAiaVOHXN4wDyL6PqzhSjMSMiKiRTAJ9 -eQojArkU5hn9mPrQYgKZLRm0M2G67hnqYShDtlT4HHdfpiLyz+t1etJDEmoUwcTp -32vvuDOmvwehRDN+8Z9Tdzhd9cQkw7di+kBWEV3HunhfW/P49lSeX56Z+1K8tOGM -jPO9izcuR8qj+eIDz9N6C6IY0u8/l3BVMxJHBuk8oRd7t4Zp3xVTS/PI6VrsZCdk -r4NcU6C4rNYEmn1KadHG2BlnjemGRcI3fmgUUfgzY+tHj8XQuj4RmAel1qbfCUIt -AbalMJbC84k0j1atjCRha0ivktbb5lWXQ2Ie1oc8AhUHpK120WwWB46ti8Wsd8IC -ZhDkrHrQ6ajxEe0TFtQKn9G0WuZkwVnQ7YNikbFocBwa3N/pulBDokVKIpJVCIew -Gyw3RXMD+VehFjiggHXztJerx5v5HOt/botPK4XuKK0ZEieQxcd6fGm4L6r7hpsc -2lY6KDUbyBDyz7V/C7nM8e0O/++sIo3FvdDaja4Pm0s+fyivfAeh7bDP0D9Cef/8 -UpDtrC7HGh9NSZJ3siN2oJ1jVN9wLbVcl2G92zts78FshgkyA0tVbLDa3sd0SAPq -DePy05U9a8YB2AhvNbItkrd/RYtGeEEHAGyt//5tcuEOHTbULbUbUR+bo89unmq5 -gEOvVJLPJ7/4aSN+jUFr2Z1zfgObcnRRtPVTcT99n0dxkSnFBScCQ8A/DyEA87hP -7mjpAMAIJgiKIHhCFgd6tybYwLwIJ1obC0d+U/UxBx8mMlHVsjPfAU0UgjQHN2OF -5YJVNHtXARBUbn9g5yHGCCnFUhHDpJmCfZ/wx8uBRkeEinOt3JDnzEimPkvVQcJ7 -FM1Y7dnVQPb37fAW8zkS9pNzOlBX8trqyWxdQn2zyKqmPXEsT9dRCyUIZeUxq5oN -BYUvlaCl8Jw+94Qtogk5HQazEgjZzOTqx8xBLKwm4UN1uGMtCRpVoAWHNa2bCdtH -Id2WqNjUabJSsqmLDg/+hhPg2dGrDlNGhwQYY3ZrTNIgsS0CAxrBBOHVpGjQ7ntO -OTft6Bl1CoI8HULcwyMLtqz+en29N5zY/QtwBd50svtX1lhs21SJRMAqWkLDYgtt -nkNRPVNvf5HwcrO8bbX4k+sDGpGgdJnUEEYdhhrwpdpWhYq1x0ORW6b83DvDLgH9 -+XXh9BtCJz8fsWE3/z7OsdrdMtO62GOJ6nmZN5ZAyBs5jjGINzlg2uEuoaoAWyVC -kHrxTG/+1NqOJswp7hY6I0DecQ2mmLfCuhiWHEOVzWBq24hgsd312BZvGIMABc4u -RB6cVlqFCYMS/xcsydDTmGc+kVM3ZwTiQIVn9WgewOt2BOu33I3C+2O/ZFmH6vq/ -DjUvPohRYkJ63nYH35HndvF4eg== -=822U +iQTwBAABCgAGBQJXugw/AAoJENGrRRaIiIiItdMmn2Vnnv8djUdw75c0sbbfuS6d +znF03fepp+tlDcalbvG77kMhWebxP0413WE9drIg7Q+JDa8/DqmhQ7e1AUbnqJO4 +P0QbAATR8Bz8AlqXv3wdJf6ly71g9S5cmvOb1d8Ou0RMgnoQbPWXipZel6mr/QFn +jOk9Ze/bDCcy/wcoMkd4RXlJnPJei1oR+uhv4lzls8Vz8iWg2Kem/cj8M0K0Lame +XEU7bebr9MhhtVx/kQqlYW37Cw9uIl50r/PCWpmaz8fCrBBK/AIcU2M1ITpck55W +/sbRzLcUX6E74jexDXWtH7AKcdMl4NbSfigJv2iiemZiSAx1t9AEG98fplk9F/7A +6xyn1Tv3mOzNfAw84JOqvhzoyo/4d7A6uzVq6AyzD6vO/ZfW6mUVnRA7m/2CIDnM +uhnlnw3pMT5Nezyt1lnGAnbZMpwoWnLnMEMhM6/A+q9gNMpUEpDjCYHQTerKKUXv +M6fY6QVT4xZu76rPP0K4O+kJqP2LGHR7GM7UDgrIJS4OAWEFlGPg2TLAvDGQRoo8 +tgQqemqe+PGkZGAKreG8CL7LfcStF/4srua1HsiEdIkqQsAQG2CVHNa2BiAtsoAR +OaEyAweF2ZQ/Qur4PMdKAiTXYe9issyPbqCDAaqmcFnXcly0UFC0iOsHnK6fho3h +dsymX4pO4WGbujlyCsHm1bHgXhBfpTu2eHcH7zZEoTdNbaHzhw1TnqPCrTL5AVyw +dEdPnZXVFKWIg5cm7e1/r5pJUuRkZpfNO0n2mGs1qujfYz0fzipRnpcEMUJmcyle +RiKUOYXhishZSzHiFEy3BcYbgY/OCjaIR4ZGSecgsZa/Ew+nsq+rm1cZB3fqqMAf +bFu15Zneixr6L3vCAAn7P1EM39FOhKAav2qW+LRA1jGyfLfika+Ejqq6piWnpdBT +w/H4optQ+zwEGLp2Sfc8oYO0n0LQmfoJXw2QfzIjOSmk9tKKr/L4yS8Ar9jdxbqc +DMsxH8ieaWNVpNSUfQlxXzfNYMMWf+zjlcOP2XgwyU0mBhR0vNr7AmPRywyGaA5I +gVfPJCqvU3nLPIPPMk8aFatX3XffSrS63DnT649NPAGyrbezcJbTd1s2ms8layGz +vLY0I+B+HBZSt4xawyR+ZDx2muJzZT8NWlm6YYec3VR9qMJbhvVyKewpjm7+Fb7r +ybLompreQT4DEwduiL8K0EXOgayDokQ9wmRvrJQ1Ny0JrCBXAEt+k/jz0Czthqts +yXIStpiE/hJhdUyL+SRvTpWVlsp2lcfKV9GHsBA7nJtt5Vf6UIzj9eqjwP8LMBin +390mt8uUZaApINjNys5zq1CiXAYv7hMeJoLWSnHwQkURaVl+iAqtPg5HpdavxXP5 +Q2QIl5VR9onIoj+pwyj/LraB796CKq39nSWSegYuGp/4jZPwDMntHI3e/GkAJ/eI +mG25NCHz6o2uBaJDkx+sGys69T6+140X5QhxbnsgHjsaQG1puHsbgGz7H1MZU1c8 +Ynb02mqs0ab8/AyfaUEpxQzgiwoXdxpocIIdpFdlgVKIh8HeAJ3CUq08GW2izNCc +eoQNs8kzmTRAvPzIITHbz2LRq5LoGp1mGME5vPDKluvMYl2bjjbw6xIs0mEfuNOT +XOW7Y+aFvzb2UdY9KM3eUYhEcw== +=2slJ -----END PGP SIGNATURE-----

1 0

commit kde-print-manager for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kde-print-manager for openSUSE:Factory checked in at 2016-08-31 00:11:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde-print-manager (Old) and /work/SRC/openSUSE:Factory/.kde-print-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kde-print-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/kde-print-manager/kde-print-manager.changes 2016-07-24 19:45:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kde-print-manager.new/kde-print-manager.changes 2016-08-31 00:12:22.000000000 +0200 @@ -1,0 +2,21 @@ +Tue Aug 30 08:56:28 UTC 2016 - wbauer(a)tmo.at + +- Adjust filelist for the plasmoid appdata, installed with KF >= 5.25.0 + +------------------------------------------------------------------- +Fri Aug 12 10:12:57 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:51:32 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- print-manager-16.04.3.tar.xz New: ---- print-manager-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde-print-manager.spec ++++++ --- /var/tmp/diff_new_pack.2T4VtP/_old 2016-08-31 00:12:23.000000000 +0200 +++ /var/tmp/diff_new_pack.2T4VtP/_new 2016-08-31 00:12:23.000000000 +0200 @@ -21,7 +21,7 @@ Summary: A new print manager for KDE License: GPL-2.0+ Group: System/GUI/KDE -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source: print-manager-%{version}.tar.xz BuildRequires: cups @@ -107,5 +107,6 @@ %{_kf5_applicationsdir}/org.kde.PrintQueue.desktop %{_kf5_qmldir}/org/kde/plasma/printmanager/ %{_kf5_notifydir}/printmanager.notifyrc +%{_kf5_appstreamdir}/org.kde.plasma.printmanager.appdata.xml %changelog ++++++ print-manager-16.04.3.tar.xz -> print-manager-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/CMakeLists.txt new/print-manager-16.08.0/CMakeLists.txt --- old/print-manager-16.04.3/CMakeLists.txt 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/CMakeLists.txt 2016-06-25 11:57:29.000000000 +0200 @@ -35,7 +35,9 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) -remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + +remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) # Generate config.h configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/add-printer/ChooseSamba.cpp new/print-manager-16.08.0/add-printer/ChooseSamba.cpp --- old/print-manager-16.04.3/add-printer/ChooseSamba.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/add-printer/ChooseSamba.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -60,19 +60,19 @@ QString address = ui->addressLE->text().trimmed(); QUrl url; if (address.startsWith(QLatin1String("//"))) { - url = QLatin1String("smb:") % address; + url = QUrl(QLatin1String("smb:") % address); } else if (address.startsWith(QLatin1String("/"))) { - url = QLatin1String("smb:/") % address; + url = QUrl(QLatin1String("smb:/") % address); } else if (address.startsWith(QLatin1String("://"))) { - url = QLatin1String("smb") % address; + url = QUrl(QLatin1String("smb") % address); } else if (address.startsWith(QLatin1String("smb://"))) { - url = address; + url = QUrl(address); } else if (!QUrl::fromUserInput(address).scheme().isEmpty() && QUrl::fromUserInput(address).scheme() != QStringLiteral("smb")) { url = QUrl::fromUserInput(address); url.setScheme(QStringLiteral("smb")); } else { - url = QStringLiteral("smb://") % address; + url = QUrl(QStringLiteral("smb://") % address); } qDebug() << 1 << url; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/add-printer/ChooseSocket.cpp new/print-manager-16.08.0/add-printer/ChooseSocket.cpp --- old/print-manager-16.04.3/add-printer/ChooseSocket.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/add-printer/ChooseSocket.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -53,7 +53,7 @@ ui->addressLE->clear(); ui->portISB->setValue(9100); QString deviceUri = args[KCUPS_DEVICE_URI].toString(); - QUrl url = deviceUri; + QUrl url(deviceUri); if (url.scheme() == QStringLiteral("socket")) { ui->addressLE->setText(url.host()); ui->portISB->setValue(url.port(9100)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/add-printer/ChooseUri.cpp new/print-manager-16.08.0/add-printer/ChooseUri.cpp --- old/print-manager-16.04.3/add-printer/ChooseUri.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/add-printer/ChooseUri.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -51,7 +51,7 @@ { m_args = args; bool visible = false; - QUrl url = args[KCUPS_DEVICE_URI].toString(); + QUrl url(args[KCUPS_DEVICE_URI].toString()); if (url.url() == QLatin1String("other")) { ui->addressLE->clear(); visible = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/add-printer/PageChoosePPD.cpp new/print-manager-16.08.0/add-printer/PageChoosePPD.cpp --- old/print-manager-16.04.3/add-printer/PageChoosePPD.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/add-printer/PageChoosePPD.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -93,7 +93,7 @@ } qDebug() << deviceURI << url; KJob *job = KIO::file_copy(url, - tempFile->fileName(), + QUrl::fromLocalFile(tempFile->fileName()), -1, KIO::Overwrite | KIO::HideProgressInfo); job->setProperty("URI", deviceURI); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/add-printer/PageDestinations.cpp new/print-manager-16.08.0/add-printer/PageDestinations.cpp --- old/print-manager-16.04.3/add-printer/PageDestinations.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/add-printer/PageDestinations.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -301,7 +301,7 @@ } else { QVariant aux = ui->connectionsCB->itemData(ui->connectionsCB->currentIndex()); KCupsPrinter printer = aux.value<KCupsPrinter>(); - QUrl url = uri.toString(); + QUrl url(uri.toString()); url.setPath(QLatin1String("printers/") % printer.name()); ret[KCUPS_DEVICE_URI] = url.url(); ret[KCUPS_DEVICE_ID] = index.data(DevicesModel::DeviceId); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/configure-printer/PrinterOptions.cpp new/print-manager-16.08.0/configure-printer/PrinterOptions.cpp --- old/print-manager-16.04.3/configure-printer/PrinterOptions.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/configure-printer/PrinterOptions.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -78,7 +78,7 @@ void PrinterOptions::reloadPPD() { // The caller "owns" the file that is created and must unlink the returned filename. - if (!m_filename.isNull()) { + if (!m_filename.isEmpty()) { unlink(m_filename.toUtf8()); } @@ -393,7 +393,7 @@ ppdClose(m_ppd); } - if (!m_filename.isNull()) { + if (!m_filename.isEmpty()) { unlink(m_filename.toUtf8()); } @@ -706,7 +706,7 @@ *keyptr; /* Pointer into keyword... */ // copy cups-1.4.2/cgi-bin line 3779 - if (!m_filename.isNull()) { + if (!m_filename.isEmpty()) { out = cupsTempFile2(tempfile, sizeof(tempfile)); in = cupsFileOpen(m_filename.toUtf8(), "r"); @@ -764,6 +764,12 @@ cupsFileClose(in); cupsFileClose(out); } + else { + // TODO add a KMessageBox::error + qCWarning(PM_CONFIGURE_PRINTER) << "No printer PPD file set, can't save options."; + + return; + } QVariantHash values; // we need null values QPointer<KCupsRequest> request = new KCupsRequest;

1 0

commit neovim for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package neovim for openSUSE:Factory checked in at 2016-08-31 00:11:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/neovim (Old) and /work/SRC/openSUSE:Factory/.neovim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "neovim" Changes: -------- --- /work/SRC/openSUSE:Factory/neovim/neovim.changes 2016-05-10 09:27:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.neovim.new/neovim.changes 2016-08-31 00:12:20.000000000 +0200 @@ -1,0 +2,55 @@ +Mon Aug 29 22:45:13 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 0.1.5: + * Breaking changes: + + 'termguicolors' option enables "true color". + NVIM_TUI_ENABLE_TRUE_COLOR is now ignored. + + Remove ":oldfiles!", replaced by Vim's ":browse oldfiles". + * Features: + + Full :ruby support! + + timers: timer_start(), timer_stop(). + + :CheckHealth command. + + file: Add buffered reading and writing. + Much faster shada file reading (important for startup time). + + jobstart() learned 'rpc': + - jobs and RPC channel IDs share the same "namespace". + - jobstart() can start RPC channels, which allows scripts to + handle 'stderr' on a RPC channel, like a typical non-RPC + job. + - jobpid()/jobstop() works on RPC jobs. + - Deprecates rpcstart(). + + man.vim rewrite: + - :Man command is enabled by default. + - New features: completion, window handling, better parsing, + and more. + + capture() function (renamed to execute()) + - Supports nesting, including nested :redir. + + rplugin manifest: default to XDG dir. + + Better handling of mouse-clicks on concealed chars. + + terminal: Ensure b:term_title always has a value. + + tui: Assume 256 colours in most cases. + + Always resize the :terminal. + + api_info(). + + allow setting cwd in jobstart(), termopen(). + + support "special" highlight (undercurl). + + mouse: Implement horizontal scroll. + * Fixes: + + Prevent data loss for process output streams. + + 'process.c: Fix block in teardown'. + + Prevent endless loop in printdigraph() (gh#neovim/neovim#5215). + + timers: Avoid crash after processing events. + + Set the default value for 'packpath'. + + Restore double click. + + readfile(): Less-disruptive readonly check. + Fixes an issue where nvim unnecessarily "touched" open files. + + Handle very long $XDG_DATA_DIRS. + + option: Do not expand options in XDG vars. + + server_init: Handle server_address_new() failure. + + Fix v:register for clipboard=unnamed,unnamedplus. + + 'Trigger TabNewEntered with T'. + + synIDattr(): Return RRGGBB value for fg#. +- Correct group: Productivity/Text/Editors. +- Separate locales into neovim-lang. +- Some spec cleanup. + +------------------------------------------------------------------- @@ -132 +186,0 @@ - Old: ---- neovim-0.1.4.tar.gz New: ---- neovim-0.1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ neovim.spec ++++++ --- /var/tmp/diff_new_pack.uzLTnj/_old 2016-08-31 00:12:21.000000000 +0200 +++ /var/tmp/diff_new_pack.uzLTnj/_new 2016-08-31 00:12:21.000000000 +0200 @@ -17,80 +17,80 @@ Name: neovim -Version: 0.1.4 +Version: 0.1.5 Release: 0 Summary: Vim-fork focused on extensibility and agility License: Apache-2.0 -Group: Productivity/Editors/Vi +Group: Productivity/Text/Editors Url: https://neovim.io/ Source: https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{version}.tar… -Source1: neovim.svg -Source2: neovim.desktop +Source1: neovim.desktop +Source2: neovim.svg BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: libmsgpack-devel >= 1.2.0 BuildRequires: libmsgpackc-devel >= 1.2.0 -BuildRequires: libuv-devel BuildRequires: lua51-BitOp BuildRequires: lua51-LPeg BuildRequires: lua51-mpack BuildRequires: luajit-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(jemalloc) +BuildRequires: pkgconfig(libuv) BuildRequires: pkgconfig(termkey) BuildRequires: pkgconfig(unibilium) BuildRequires: pkgconfig(vterm) +Recommends: %{name}-lang Recommends: python-neovim Recommends: python3-neovim Recommends: xsel %description -Neovim is a refactor - and sometimes redactor - in the tradition of Vim, which -itself derives from Stevie. It is not a rewrite, but a continuation and -extension of Vim. Many rewrites, clones, emulators and imitators exist; some are -very clever, but none are Vim. Neovim strives to be a superset of Vim, -notwithstanding some intentionally removed misfeatures; excepting those few and -carefully-considered excisions, Neovim is Vim. It is built for users who want -the good parts of Vim, without compromise, and more. +Neovim is a refactor - and sometimes redactor - in the tradition of +Vim, which itself derives from Stevie. It is not a rewrite, but a +continuation and extension of Vim. Many rewrites, clones, emulators +and imitators exist; some are very clever, but none are Vim. Neovim +strives to be a superset of Vim, notwithstanding some intentionally +removed misfeatures; excepting those few and carefully-considered +excisions, Neovim is Vim. It is built for users who want the good +parts of Vim, without compromise, and more. + +%lang_package %prep %setup -q +cp -f %{SOURCE1} neovim.desktop +cp -f %{SOURCE2} neovim.svg -# Remove __DATE__ and __TIME__ -modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" -DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" -TIME="\"$(date -d "${modified}" "+%%R")\"" -find . -name '*.[ch]' | xargs sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" +# Remove __DATE__ and __TIME__. +BUILD_TIME=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%{H}:%{M}') +BUILD_DATE=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%{b} %{d} %{Y}') +sed -i "s/__TIME__/\"$BUILD_TIME\"/" $(grep -rl '__TIME__') +sed -i "s/__DATE__/\"$BUILD_DATE\"/" $(grep -rl '__DATE__') %build -%cmake -DLUA_PRG=%{_bindir}/lua \ +%cmake \ + -DLUA_PRG=%{_bindir}/lua \ -DUSE_BUNDLED=OFF \ -DLUAJIT_USE_BUNDLED=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DENABLE_JEMALLOC=ON - make %{?_smp_mflags} %install -pushd build -make %{?_smp_mflags} DESTDIR=%{buildroot} install -popd - -# Install icon. -install -D -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%cmake_install # Install desktop file. -install -D -m 644 %{SOURCE2} %{buildroot}/%{_datadir}/applications/%{name}.desktop +install -Dpm 0644 neovim.desktop %{buildroot}/%{_datadir}/applications/neovim.desktop -# Create hardlinks for duplicate files. -%fdupes %{buildroot}%{_datadir}/nvim/runtime/ftplugin/ +# Install the icon. +install -Dpm 0644 neovim.svg %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/neovim.svg %suse_update_desktop_file -r neovim ConsoleOnly Application Utility TextEditor +%fdupes %{buildroot}%{_datadir}/ %find_lang nvim %post @@ -101,13 +101,16 @@ %desktop_database_postun %icon_theme_cache_postun -%files -f nvim.lang +%files %defattr(-,root,root) %doc BACKERS.md CONTRIBUTING.md LICENSE README.md %{_bindir}/nvim -%{_datadir}/applications/%{name}.desktop %{_datadir}/nvim/ -%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg -%{_mandir}/man1/nvim.1%{ext_man} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.svg +%{_mandir}/man1/nvim.1%{?ext_man} + +%files lang -f nvim.lang +%defattr(-,root,root) %changelog ++++++ neovim-0.1.4.tar.gz -> neovim-0.1.5.tar.gz ++++++ /work/SRC/openSUSE:Factory/neovim/neovim-0.1.4.tar.gz /work/SRC/openSUSE:Factory/.neovim.new/neovim-0.1.5.tar.gz differ: char 12, line 1

1 0

commit libguestfs for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libguestfs for openSUSE:Factory checked in at 2016-08-31 00:11:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libguestfs (Old) and /work/SRC/openSUSE:Factory/.libguestfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libguestfs" Changes: -------- --- /work/SRC/openSUSE:Factory/libguestfs/libguestfs.changes 2016-08-09 22:14:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libguestfs.new/libguestfs.changes 2016-08-31 00:12:18.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Aug 26 13:55:55 UTC 2016 - cbosdonnat(a)suse.com + +- Clean up dependencies and add recommends for optional packages + like the ones enabling file system features + fate#316274, bsc#993501 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libguestfs.spec ++++++ --- /var/tmp/diff_new_pack.NYWT45/_old 2016-08-31 00:12:20.000000000 +0200 +++ /var/tmp/diff_new_pack.NYWT45/_new 2016-08-31 00:12:20.000000000 +0200 @@ -268,11 +268,6 @@ Requires: curl Requires: gpg2 Requires: xz - -# For core disk features -Requires: qemu-tools - -Recommends: mdadm Conflicts: guestfs-data < %{version} Conflicts: libguestfs0 < %{version} @@ -493,6 +488,23 @@ Requires: libhivex0 Requires: libpcre1 +# For core disk features +Requires: qemu-tools + +# Optional packages that could be picked up by supermin +Recommends: btrfsprogs +Recommends: dosfstools +Recommends: e2fsprogs +Recommends: cryptsetup +Recommends: gptfdisk +Recommends: jfsutils +Recommends: reiserfs +Recommends: xfsprogs +Recommends: mdadm +Recommends: parted +Recommends: zerofree +Recommends: genisoimage + Summary: Virtual machine needed for libguestfs License: GPL-2.0 Group: System/Filesystems

1 0

commit calibre for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package calibre for openSUSE:Factory checked in at 2016-08-31 00:11:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calibre (Old) and /work/SRC/openSUSE:Factory/.calibre.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "calibre" Changes: -------- --- /work/SRC/openSUSE:Factory/calibre/calibre.changes 2016-08-29 15:38:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.calibre.new/calibre.changes 2016-08-31 00:12:16.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Aug 26 18:46:32 UTC 2016 - cornelis(a)solcon.nl + +- Update to 2.65.1: + * Devices: + - Driver for Kobo Aura One and Aura Edition 2 + - Kobo driver: Add an option to ignore some collections on the + device. The specified collections will not be touched by the + driver. + * For details see http://calibre-ebook.com/whats-new + +------------------------------------------------------------------- Old: ---- calibre-2.64.0.tar.xz New: ---- calibre-2.65.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calibre.spec ++++++ --- /var/tmp/diff_new_pack.OxM2LX/_old 2016-08-31 00:12:18.000000000 +0200 +++ /var/tmp/diff_new_pack.OxM2LX/_new 2016-08-31 00:12:18.000000000 +0200 @@ -20,7 +20,7 @@ License: GPL-3.0 Group: Productivity/Other Name: calibre -Version: 2.64.0 +Version: 2.65.1 Release: 0 Url: http://calibre-ebook.com Source0: http://download.calibre-ebook.com/%{version}/calibre-%{version}.tar.xz ++++++ calibre-2.64.0.tar.xz -> calibre-2.65.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/calibre/calibre-2.64.0.tar.xz /work/SRC/openSUSE:Factory/.calibre.new/calibre-2.65.1.tar.xz differ: char 26, line 1

1 0

commit chromium for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2016-08-31 00:11:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium" Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2016-08-24 10:17:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2016-08-31 00:12:02.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Aug 27 18:46:44 UTC 2016 - tittiatcoke(a)gmail.com + +- Make it build on ARM. + * Add build patch arm_use_right_compiler.patch + +- Drop unnecessary patches: + * chromium-arm-r0.patch + +------------------------------------------------------------------- Old: ---- chromium-arm-r0.patch New: ---- arm_use_right_compiler.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.5uVczB/_old 2016-08-31 00:12:12.000000000 +0200 +++ /var/tmp/diff_new_pack.5uVczB/_new 2016-08-31 00:12:12.000000000 +0200 @@ -52,14 +52,16 @@ Patch8: gcc60-fixes.diff # archlinux arm enhancement patches Patch100: arm-webrtc-fix.patch -Patch101: chromium-arm-r0.patch +Patch101: arm_use_right_compiler.patch # GN buildsystem related patches Patch200: chromium-last-commit-position-r0.patch Patch201: chromium-snapshot-toolchain-r1.patch BuildRequires: alsa-devel +BuildRequires: binutils-gold BuildRequires: bison BuildRequires: cups-devel +BuildRequires: dbus-1-devel BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: flac-devel @@ -68,49 +70,66 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gperf +BuildRequires: harfbuzz-devel BuildRequires: hicolor-icon-theme BuildRequires: hunspell-devel BuildRequires: krb5-devel BuildRequires: libbz2-devel -BuildRequires: pkgconfig(libffi) -BuildRequires: binutils-gold -BuildRequires: dbus-1-devel -BuildRequires: libevent-devel -BuildRequires: harfbuzz-devel -BuildRequires: libwebp-devel -BuildRequires: snappy-devel -BuildRequires: zlib-devel -BuildRequires: yasm-devel BuildRequires: libelf-devel +BuildRequires: libevent-devel BuildRequires: libexpat-devel BuildRequires: libpulse-devel -BuildRequires: update-desktop-files +BuildRequires: libwebp-devel BuildRequires: python-xml +BuildRequires: snappy-devel +BuildRequires: update-desktop-files +BuildRequires: zlib-devel +BuildRequires: pkgconfig(libffi) Requires(pre): permissions +BuildRequires: SDL-devel +BuildRequires: dirac-devel >= 1.0.0 +BuildRequires: libcap-devel +BuildRequires: libdc1394 +BuildRequires: libdc1394-devel +BuildRequires: libdrm-devel BuildRequires: libgcrypt-devel BuildRequires: libgnome-keyring-devel -BuildRequires: libcap-devel +BuildRequires: libgsm +BuildRequires: libgsm-devel +BuildRequires: libjack-devel +BuildRequires: libogg-devel +BuildRequires: liboil-devel >= 0.3.15 +BuildRequires: libopenssl-devel +BuildRequires: libtheora-devel >= 1.1 +BuildRequires: libvdpau-devel +BuildRequires: libvorbis-devel +BuildRequires: libvpx-devel +BuildRequires: ncurses-devel BuildRequires: ninja BuildRequires: pam-devel BuildRequires: pciutils-devel BuildRequires: pkg-config BuildRequires: python BuildRequires: python-devel -BuildRequires: pkgconfig(sqlite3) +BuildRequires: schroedinger-devel +BuildRequires: slang-devel +BuildRequires: texinfo BuildRequires: util-linux BuildRequires: valgrind-devel BuildRequires: wdiff -BuildRequires: perl(Switch) BuildRequires: pkgconfig(cairo) >= 1.6 BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(nspr) >= 4.9.5 BuildRequires: pkgconfig(nss) >= 3.14 +BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xcursor) @@ -123,29 +142,6 @@ BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtst) -BuildRequires: libdrm-devel -BuildRequires: pkgconfig(libexif) -BuildRequires: pkgconfig(libcrypto) -BuildRequires: libdc1394 -BuildRequires: libdc1394-devel -BuildRequires: libgsm -BuildRequires: libgsm-devel -BuildRequires: libogg-devel -BuildRequires: liboil-devel >= 0.3.15 -BuildRequires: libjack-devel -BuildRequires: imlib2-devel -BuildRequires: libtheora-devel >= 1.1 -BuildRequires: libvdpau-devel -BuildRequires: libvorbis-devel -BuildRequires: libvpx-devel -BuildRequires: ncurses-devel -BuildRequires: schroedinger-devel -BuildRequires: slang-devel -BuildRequires: texinfo -BuildRequires: libopenssl-devel -BuildRequires: SDL-devel -BuildRequires: dirac-devel >= 1.0.0 -#Requirements to build a fully functional ffmpeg Requires: alsa Requires: ffmpegsumo Requires: hicolor-icon-theme @@ -153,7 +149,7 @@ Requires: xdg-utils Requires(pre): permissions # Recommends the chromium-ffmpeg library (available from packman) -Recommends: chromium-ffmpeg +Recommends: %{name}-ffmpeg Conflicts: otherproviders(chromium-browser) Provides: chromium-based-browser = %{version} Provides: chromium-browser = %{version} @@ -161,8 +157,7 @@ Obsoletes: %{name}-suid-helper < %{version} Obsoletes: chromium-browser < %{version} Provides: %{name}-suid-helper = %{version} -# There is no v8 for ppc and thus chromium won't run on ppc. For aarch64 certain buildrequires are missing (e.g. valgrind) -ExcludeArch: aarch64 ppc ppc64 ppc64le +ExclusiveArch: %{ix86} x86_64 %arm #Requirements to build a fully functional ffmpeg # This can only be done on packman OBS %if 0%{?packman_bs} @@ -173,6 +168,13 @@ BuildRequires: libxvidcore-devel %endif +#Define the maximum number of build processes to prevent running out of memory +%ifarch %arm +%define ninjaproc 2 +%else +%define ninjaproc 4 +%endif + %description Chromium is the open-source project behind Google Chrome. We invite you to join us in our effort to help build a safer, faster, and more stable way for all Internet users to experience the web, and to create a powerful platform for developing a new generation of web applications. @@ -182,6 +184,7 @@ Group: Productivity/Networking/Web/Browsers Requires: %{name} Conflicts: otherproviders(ffmpegsumo) +Conflicts: %{name}-ffmpeg Provides: ffmpegsumo = %{version} %description ffmpegsumo @@ -230,7 +233,7 @@ Summary: The ffmpeg library for Google's opens source browser Chromium License: BSD-3-Clause and LGPL-2.1+ Group: Productivity/Networking/Web/Browsers -Requires: %{name} = %{version} +Requires: %{name} Conflicts: otherproviders(ffmpegsumo) Provides: ffmpegsumo = %{version} @@ -243,7 +246,7 @@ #GN Buildsystem fixes %patch200 -p1 -%patch201 +%patch201 -p0 #Standard patches %patch1 @@ -259,7 +262,7 @@ # archlinux arm enhancements %patch100 -%patch101 +%patch101 -p0 %build @@ -284,6 +287,17 @@ myconf_gn+=" ffmpeg_branding=\"Chrome\"" %endif +%ifarch %arm +myconf_gn+=" target_cpu =\"arm\"" +myconf_gn+=" target_sysroot_dir=\"\"" +myconf_gn+=" arm_use_neon=false" +myconf_gn+=" arm_optionally_use_neon=false" +myconf_gn+=" arm_use_thumb=true" +myconf_gn+=" remove_webcore_debug_symbols=true" +myconf_gn+=" symbol_level = 0" +myconf_gn+=" is_component_build = true" +%endif + # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys # Note: these are for the openSUSE Chromium builds ONLY. For your own distribution, # please get your own set of keys. @@ -308,13 +322,13 @@ %if 0%{?packman_bs} ninja -C out/Release third_party/ffmpeg %else - ninja -j 4 -C out/Release chrome + ninja -j %{ninjaproc} -C out/Release chrome # Build the required SUID_SANDBOX helper - ninja -C out/Release chrome_sandbox + ninja -j %{ninjaproc} -C out/Release chrome_sandbox # Build the ChromeDriver test suite - ninja -C out/Release chromedriver + ninja -j %{ninjaproc} -C out/Release chromedriver %endif %install @@ -353,6 +367,13 @@ cp -a *.bin *.pak locales xdg-mime icudtl.dat %{buildroot}%{_libdir}/chromium/ cp -a chromedriver %{buildroot}%{_libdir}/chromium/ + # chromium components +%ifarch %arm + cp -a lib*.so %{buildroot}%{_libdir}/chromium/ +%else + cp -av libffmpeg.so %{buildroot}%{_libdir}/chromium/ +%endif + # Patch xdg-settings to use the chromium version of xdg-mime as that the system one is not KDE4 compatible sed "s|xdg-mime|%{_libdir}/chromium/xdg-mime|g" xdg-settings > %{buildroot}%{_libdir}/chromium/xdg-settings @@ -362,9 +383,6 @@ cp -a chrome.1 %{buildroot}%{_mandir}/man1/chromium.1 %fdupes %{buildroot}%{_mandir}/man1/ - # chromium components - cp -av libffmpeg.so %{buildroot}%{_libdir}/chromium/ - popd mkdir -p %{buildroot}%{_datadir}/icons/ ++++++ arm_use_right_compiler.patch ++++++ --- build/toolchain/linux/BUILD.gn 2016-08-25 12:19:55.634174140 +0200 +++ build/toolchain/linux/BUILD.gn 2016-08-25 12:19:55.634174140 +0200 @@ -8,11 +8,11 @@ clang_toolchain("clang_arm") { toolchain_cpu = "arm" toolchain_os = "linux" - toolprefix = "arm-linux-gnueabihf-" + toolprefix = "" } gcc_toolchain("arm") { - toolprefix = "arm-linux-gnueabihf-" + toolprefix = "" cc = "${toolprefix}gcc" cxx = "${toolprefix}g++" ++++++ chromium-snapshot-toolchain-r1.patch ++++++ --- /var/tmp/diff_new_pack.5uVczB/_old 2016-08-31 00:12:13.000000000 +0200 +++ /var/tmp/diff_new_pack.5uVczB/_new 2016-08-31 00:12:13.000000000 +0200 @@ -21,3 +21,4 @@ - - +snapshot_toolchain = default_toolchain + ++++++ gcc60-fixes.diff ++++++ --- /var/tmp/diff_new_pack.5uVczB/_old 2016-08-31 00:12:13.000000000 +0200 +++ /var/tmp/diff_new_pack.5uVczB/_new 2016-08-31 00:12:13.000000000 +0200 @@ -1,26 +1,11 @@ ---- build/common.gypi 2016-06-15 21:03:15.000000000 +0200 -+++ build/common.gypi 2016-06-15 21:03:15.000000000 +0200 -@@ -4699,6 +4699,7 @@ - ['_toolset=="target"', { - 'cflags_cc': [ - '-std=gnu++11', -+ '-fno-delete-null-pointer-checks', - # See comment for -Wno-c++11-narrowing. - '-Wno-narrowing', - ], -@@ -4710,6 +4711,7 @@ - ['_toolset=="host"', { - 'cflags_cc': [ - '-std=gnu++11', -+ '-fno-delete-null-pointer-checks', - # See comment for -Wno-c++11-narrowing. - '-Wno-narrowing', - ], -@@ -4720,6 +4722,7 @@ - 'target_conditions': [ - ['_toolset=="target"', { - 'cflags_cc': [ -+ '-fno-delete-null-pointer-checks', - # TODO(thakis): Remove, http://crbug.com/263960 - '-Wno-literal-suffix', - ], +--- build/config/compiler/BUILD.gn 2016-08-14 09:59:05.527738286 +0200 ++++ build/config/compiler/BUILD.gn 2016-08-14 09:59:56.340463935 +0200 +@@ -389,6 +389,7 @@ + # TODO(thakis): Eventually switch this to c++11 instead, + # http://crbug.com/427584 + cflags_cc += [ "-std=gnu++11" ] ++ cflags_cc += [ "-fno-delete-null-pointer-checks" ] + } else if (!is_win && !is_nacl) { + # TODO(mcgrathr) - the NaCl GCC toolchain doesn't support either gnu++11 + # or c++11; we technically don't need this toolchain any more, but there +

1 0

commit libmateweather for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libmateweather for openSUSE:Factory checked in at 2016-08-31 00:10:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmateweather (Old) and /work/SRC/openSUSE:Factory/.libmateweather.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmateweather" Changes: -------- --- /work/SRC/openSUSE:Factory/libmateweather/libmateweather.changes 2016-08-29 15:37:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libmateweather.new/libmateweather.changes 2016-08-31 00:11:59.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Aug 29 20:12:36 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 1.14.2: + * METAR: Switch to https and use recommended method of data + retrieval (as per + https://aviationweather.gov/dataserver/bestpractices) + +------------------------------------------------------------------- Old: ---- libmateweather-1.14.1.tar.xz New: ---- libmateweather-1.14.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmateweather.spec ++++++ --- /var/tmp/diff_new_pack.6H5qLd/_old 2016-08-31 00:12:00.000000000 +0200 +++ /var/tmp/diff_new_pack.6H5qLd/_new 2016-08-31 00:12:00.000000000 +0200 @@ -19,7 +19,7 @@ %define sover 1 %define _version 1.14 Name: libmateweather -Version: 1.14.1 +Version: 1.14.2 Release: 0 Summary: MATE Weather License: GPL-2.0+ and LGPL-2.1+ ++++++ libmateweather-1.14.1.tar.xz -> libmateweather-1.14.2.tar.xz ++++++ ++++ 25179 lines of diff (skipped)

1 0

commit tpm2.0-tools for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package tpm2.0-tools for openSUSE:Factory checked in at 2016-08-31 00:10:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tpm2.0-tools (Old) and /work/SRC/openSUSE:Factory/.tpm2.0-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tpm2.0-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/tpm2.0-tools/tpm2.0-tools.changes 2016-04-28 16:56:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tpm2.0-tools.new/tpm2.0-tools.changes 2016-08-31 00:11:56.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 22 12:02:01 UTC 2016 - meissner(a)suse.com + +- update description + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tpm2.0-tools.spec ++++++ --- /var/tmp/diff_new_pack.uERbBi/_old 2016-08-31 00:11:57.000000000 +0200 +++ /var/tmp/diff_new_pack.uERbBi/_new 2016-08-31 00:11:57.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package tpm-tools +# spec file for package tpm2.0-tools # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: tpm2.0-tools Version: 1.0.1 Release: 0 @@ -26,20 +27,19 @@ # https://github.com/01org/TPM2.0-TSS ... Source1: https://github.com/01org/TPM2.0-TSS/archive/1.0-alpha_0.zip Patch0: tpm2-install-binaries.patch -BuildRequires: unzip -BuildRequires: gcc-c++ BuildRequires: autoconf-archive BuildRequires: automake +BuildRequires: gcc-c++ BuildRequires: libtool +BuildRequires: unzip BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Trusted Computing is a set of specifications published by the Trusted Computing Group (TCG). The Trusted Platform Module (TPM) is the -hardware component for Trusted Computing. The tpm-tools package -provides tools for enablement and configuration of the TPM and -associated interfaces. Also look inside the trousers package for more -software for TC. +hardware component for Trusted Computing. The tpm2.0-tools package +provides tools for enablement and configuration of the TPM 2.0 and +associated interfaces. %prep %setup -q

1 0

commit mlocate for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package mlocate for openSUSE:Factory checked in at 2016-08-31 00:10:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mlocate (Old) and /work/SRC/openSUSE:Factory/.mlocate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mlocate" Changes: -------- --- /work/SRC/openSUSE:Factory/mlocate/mlocate.changes 2016-01-22 01:10:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mlocate.new/mlocate.changes 2016-08-31 00:11:55.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 29 12:50:37 UTC 2016 - tchvatal(a)suse.com + +- Reduce dependencies a bit +- Update updatedb.conf wrt bnc#994663 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mlocate.spec ++++++ --- /var/tmp/diff_new_pack.OVdyED/_old 2016-08-31 00:11:56.000000000 +0200 +++ /var/tmp/diff_new_pack.OVdyED/_new 2016-08-31 00:11:56.000000000 +0200 @@ -27,16 +27,12 @@ Source1: updatedb.conf Source2: %{name}.cron Source3: sysconfig.locate -BuildRequires: autoconf -BuildRequires: automake BuildRequires: gettext-tools BuildRequires: grep BuildRequires: sed BuildRequires: xz Requires: cron Requires(post): %fillup_prereq -Requires(pre): permissions -Requires(pre): pwdutils Recommends: %{name}-lang = %{version} Provides: findutils:%{_bindir}/locate # findutils is at version 4.5 so we need newer ++++++ updatedb.conf ++++++ --- /var/tmp/diff_new_pack.OVdyED/_old 2016-08-31 00:11:56.000000000 +0200 +++ /var/tmp/diff_new_pack.OVdyED/_new 2016-08-31 00:11:56.000000000 +0200 @@ -13,4 +13,5 @@ PRUNENAMES = ".git .hg .svn .bzr .arch-ids {arch} CVS" # Skip bind mounts. -PRUNE_BIND_MOUNTS="yes" +# DISABLED for bnc#994663 and to avoid btrfs subvolume issues +PRUNE_BIND_MOUNTS="no"

1 0

commit booth for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package booth for openSUSE:Factory checked in at 2016-08-31 00:10:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/booth (Old) and /work/SRC/openSUSE:Factory/.booth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "booth" Changes: -------- --- /work/SRC/openSUSE:Factory/booth/booth.changes 2016-07-14 09:50:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2016-08-31 00:11:54.000000000 +0200 @@ -17 +17 @@ - + main: fix address matching procedure + + main: fix address matching procedure (bsc#994999) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.xOiWrl/_old 2016-08-31 00:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.xOiWrl/_new 2016-08-31 00:11:55.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/booth.git</param> - <param name="changesrevision">106efdf386c23aa7c740f1d238ecd04fd63f5ebc</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">4d35ac7ffe9e7ec4a8d32020a7c4e62a0f205b61</param></service></servicedata>

1 0

commit ceph for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package ceph for openSUSE:Factory checked in at 2016-08-31 00:10:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ceph (Old) and /work/SRC/openSUSE:Factory/.ceph.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ceph" Changes: -------- --- /work/SRC/openSUSE:Factory/ceph/ceph-test.changes 2016-08-22 10:07:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ceph.new/ceph-test.changes 2016-08-31 00:11:52.000000000 +0200 @@ -2 +2 @@ -Fri Aug 19 16:02:46 UTC 2016 - ncutler(a)suse.com +Mon Aug 29 07:24:44 UTC 2016 - ncutler(a)suse.com @@ -4 +4,56 @@ -- Update to version 10.2.2+git.1471622341.b446b70: +- pre_checkin.sh: add Source line for ceph-rpmlintrc +- move Source line for ceph-rpmlintrc from ceph.spec to ceph-test.spec + (see https://github.com/SUSE/ceph/pull/60 for rationale) + +------------------------------------------------------------------- +Mon Aug 29 07:20:00 UTC 2016 - ncutler(a)suse.com + +- Update to version 11.0.0+git.1472455009.a17726c: + + ceph.spec.in: drop ceph-rpmlintrc source line + + ceph.spec.in: drop epoch prefixes + +------------------------------------------------------------------- +Sun Aug 28 11:48:42 UTC 2016 - ncutler(a)suse.com + +- Update to version 11.0.0+git.1472384770.c9f3af8: + + test/rgw: add --gateways-per-zone to test_multi.py + + rgw: RGWDataSyncCR fails on errors from RGWListBucketIndexesCR + + rgw: RGWCoroutinesManager::run returns status of last cr + + os/bluestore: fix whitespace in bitset apply helper + + cmake: do not link secret.c if not necessary + + cmake: do not link against keyutils if not necessary + + os/bluestore: fsck on mkfs (on by default) + + os/bluestore: ensure block device size is a multiple of the block size + + Revert "ceph.spec.in: don't try to package __pycache__ for SUSE" + + rpm: force creation of Python 3 __pycache__ on SUSE + + doc: add v0.94.7 changelog + + doc: add v0.94.8 changelog + + doc/releases: add v0.94.8 to timeline + + doc/release-notes: fix v10.2.2 changelog link + + unittest_bluefs: fix block device sizes + + doc: do not list all major versions in get-packages.rst + + doc: add missing PR to hammer 0.94.8 release notes + + doc: release-notes.rst: move misplaced line + + doc: fix two broken links in releases.rst + + doc: add 11.0.0 to releases table + +------------------------------------------------------------------- +Sun Aug 28 10:55:04 UTC 2016 - ncutler(a)suse.com + +- pre_checkin.sh: forward-port insert_line_before() function from + filesystems:ceph:jewel/ceph version +- README-ceph-test.txt: new file +- ceph-test.spec: add ceph_ver_hack.sh as a source file + +------------------------------------------------------------------- +Fri Aug 26 09:06:41 UTC 2016 - ncutler(a)suse.com + +- Update to version 11.0.0+git.1472202104.8999301: + + rgw: add deadlock detection to RGWCoroutinesManager::run() + + src/common/lockdep.cc Reduce logging noise if lockdep is not tested + + osd: fix updating same_interval_since logic of project_pg_history() + + osd: drop duplicated sched_scrub during tick() + + osd: move methods which don't need osd_lock from tick into tick_without_osd_lock() + + mon/PGMonitor: mark dump_object_stat_sum() as static + + mon/PGMonitor: calc the %USED of pool using used/(used+avail) + + rpm: proper packaging of udev directories @@ -5,0 +61,81 @@ + + ceph-disk: do not activate device that is not ready + + osd: update reture type of get_pg_or_queue_for_pg() to PGRef + + common/WPQ: add sanity check to avoid potential access violation + + osd/osd_types: kill undefined_shard() method of pg_shard_t + + release-notes.rst: draft 0.94.8 release notes + + PG: introduce and maintain upset + + mon/MonClient: should update sub_sent with sub_new + + osd: set objecter.osdmap when starts + + rgw: fix for assertion in RGWMetaSyncCR + + PG: use upset rather than up for _update_calc_stats + + rgw: do not try to encode or decode time_t + + cls_rgw: fix the compiler warning + + msg/async: fix compiler warnings + + os/filestore: silence compiling warnings + + test/rbd: silence compiling warnings + + rgw: silence a compiling warning + + msg/async/kqueue: avoid remove nonexist kqueue event + + librbd: cache was not switching to writeback after first flush + + mon/OSDMonitor: fix potential division-by-zero error + + mon/OSDMonitor: get rid of snprintf when formatting output string + + mon/OSDMonitor: avoid duplicated calls when determining osdmap boundary + + osd/OSDMonitor: avoid duplicated assignment of oldest_map/newest_map + + osd/OSDMonitor: drop redundant check of exists() + + mon/PGMonitor: skip scrub checking if we can + + mon/PGMonitor: drop redundant loading of dumpcontents + + mon/PGMonitor: fix potential underflow + + debian: replace SysV rbdmap with systemd service + + os/bluestore: break down onode vs bnode_map size in log + + os/bluestore/BlueFS: do direct io by default (not buffered) + + os/bluestore/BlueFS: rename buffered_io option + + os/bluestore: add multiple finishers to bluestore + + os/bluestore: fix decoding hash of bnode + + cmake: fix unmatched endforeach + + debian: enable dh_python3 for python3 packages + + debian: exclude python3* packages in dh_shlibdeps + + debian: drop python-argparse dependency + + os/bluestore: fix race condition during get_fs_usage() + + os/bluestore: use bluefs_max_prefetch for log file prefetch + + os/bluestore: use hex if we are running out of space + + os/bluestore: fix assert + + osd: bail out if transaction size overflows + + os/filestore/FileJournal: bail out if transaction is too large + + os/FuseStore: remove unneeded header file + + os/Memstore.h: add override to virtual functions + + os/MemStore: move OmapIteratorImpl to cc file + + os/bluestore: include bluefs space in statfs result + + common/config_opts: fix comment(radio -> ratio) + + msg: kill unused macros + + mon/OSDMonitor: add output field name of average/overload_utilization + + test/librados: rados_connect() should succeed + + ceph-osd-prestart.sh: check existence of OSD data directory + + osd/ReplicatedPG:wipe off param op from generate_subop() + + ceph-post-file: migrate to RSA SSH keys + + ceph-post-file: Ignore keys offered by ssh-agent + + os/Memstore: move PageSetObject class to .cc file + + yasm-wrapper: dont echo the yasm command line + + arch/arm.c: remove unnecessary variable read for simplicity + + rpm: drop obsolete libs-compat metapackage + + ceph.spec.in: drop trouble-making divider comments + + rpm: do not unnecessarily spawn shells for scriptlets + + cls_lock: support updating the lock cookie without releasing the lock + + librbd: helper state machine to update lock cookie + + librbd: store exclusive lock cookie instead of recalculating + + librbd: exclusive lock now supports reacquiring a lost lock + + librbd: helper state machine for asynchronous watch recovery + + librbd: integrate asynchronous image rewatch state machine + + librbd: image state machine now has hooks for lock requests + + librbd: interlock image refresh and lock operations + + librbd: remove unused refresh request logic + + test/common/test_util.cc: FreeBSD does not have distro information + + README.md: replace package build instructions with tarball instructions + + doc: fix singleton example in Developer Guide + + rgw: delete region map after upgrade to zonegroup map + + rgw: fix period update --commit return error + + cmake: use PERF_LOCAL_FLAGS only if defined + + tests: populate /dev/disk/by-partuuid for scsi_debug + + ceph.spec.in: don't try to package __pycache__ for SUSE + + doc: fix wrong osdkeepalive name in mount.ceph manpage + + rados-striper.sh: Use expect_failure and conditional stringmatching + + Revert "ceph.spec.in: ppc64 build in Tumbleweed only" + + jerasure: include generic objects in neon jerasure lib (like sse3/4) @@ -8,183 +144 @@ -Fri Aug 19 13:25:43 UTC 2016 - ncutler(a)suse.com - -- Update to version 10.2.2+git.1471612825.45407b0: - + ceph.spec.in: be less naive when removing sources - -------------------------------------------------------------------- -Fri Aug 19 12:11:58 UTC 2016 - ncutler(a)suse.com - -- _constraints: tweak ceph constraints to pick up more build workers - -------------------------------------------------------------------- -Fri Aug 19 11:07:21 UTC 2016 - ncutler(a)suse.com - -- Update to version 10.2.2+git.1471601351.ddee097: - + ceph.spec.in: jewel is x86_64+aarch64 only - + ceph.spec.in: nuke sources at end of %install phase - -------------------------------------------------------------------- -Wed Aug 10 08:56:43 UTC 2016 - ncutler(a)suse.com - -- pre_checkin.sh: modify script so it adds - "Source98: README-ceph-test.txt" to ceph-test.spec - -------------------------------------------------------------------- -Tue Aug 09 21:50:35 UTC 2016 - ncutler(a)suse.com - -- Update to version 10.2.2+git.1470776886.38cd6cb (latest upstream jewel): - - rados/test.sh workunit timesout on OpenStack (pr#8904, issue#15700) - - Fixes for list-inconsistent-* (pr#9565, issue#16193, issue#16194, issue#15767) - - Missing export for rados_aio_get_version in src/include/rados/librados.h - (pr#9574, issue#16153) - - osd:sched_time not actually randomized (pr#9578, issue#16080) - - global-init: fixup chown of the run directory along with log and asok files - (pr#8754, issue#15608) - - crash adding snap to purged_snaps in ReplicatedPG::WaitingOnReplicas - (pr#9575, issue#16150) - - Scrub error: 0/1 pinned (pr#9576, issue#16148) - - msg/async: backports of all asyncmsgr fixes to jewel (pr#9633, issue#16487) - - FileStore: umount hang because sync thread doesn't exit (pr#9105, issue#15768) - - librbd: flag image as updated after proxying maintenance op (pr#9883, pr#16422) - - rgw: don't unregister request if request is not connected to manager - (pr#9242, issue#15978) - - rgw: add_zone only clears master_zone if --master=false (pr#9327, issue#16086) - - rgw: retry on bucket sync errors (pr#9425, issue#16109) - - test: improve rbd-mirror test case coverage (pr#9631, issue#16232) - - rgw: updating CORS/ACLs might not work in some circumstances (pr#9543, - issue#16040) - - rgw: account/container metadata not actually present in a request are - deleted during POST through Swift API (pr#9542, issue#15967, issue#16039) - - rgw: cleanup radosgw-admin temp command as it was deprecated (pr#9390, - issue#16071) - - rgw: initial slashes are not properly handled in Swift's BulkDelete - (pr#9316, issue#15954) - - rgw: custom metadata aren't camelcased in Swift's responses (pr#9267, ++++ 2082 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/ceph/ceph-test.changes ++++ and /work/SRC/openSUSE:Factory/.ceph.new/ceph-test.changes ceph.changes: same change Old: ---- ceph-10.2.2+git.1471622341.b446b70.tar.bz2 New: ---- ceph-11.0.0+git.1472455009.a17726c.tar.bz2 ceph_ver_hack.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ceph-test.spec ++++++ ++++ 650 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/ceph/ceph-test.spec ++++ and /work/SRC/openSUSE:Factory/.ceph.new/ceph-test.spec ceph.spec: same change ++++++ _service ++++++ --- /var/tmp/diff_new_pack.SMJzno/_old 2016-08-31 00:11:54.000000000 +0200 +++ /var/tmp/diff_new_pack.SMJzno/_new 2016-08-31 00:11:54.000000000 +0200 @@ -1,13 +1,13 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="versionformat">10.2.2+git.%ct.%h</param> + <param name="versionformat">11.0.0+git.%ct.%h</param> <param name="url">git://github.com/SUSE/ceph.git</param> - <param name="revision">ses3</param> + <param name="revision">ses5</param> <param name="filename">ceph</param> <param name="scm">git</param> <param name="package-meta">no</param> <param name="changesgenerate">enable</param> - <param name="commandtorun">src/make_version -g src/.git_version</param> + <param name="commandtorun">sh ../../../ceph_ver_hack.sh</param> </service> <service name="extract_ceph_spec" mode="disabled" /> <service name="recompress" mode="disabled"> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.SMJzno/_old 2016-08-31 00:11:54.000000000 +0200 +++ /var/tmp/diff_new_pack.SMJzno/_new 2016-08-31 00:11:54.000000000 +0200 @@ -1,5 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/SUSE/ceph.git</param> - <param name="changesrevision">b446b700df1cbdc2bddd72ae37f3e89fb84a262f</param></service> -</servicedata> \ No newline at end of file + <param name="changesrevision">a17726c4326ee895bf40686e3340c04c6963c153</param></service></servicedata> \ No newline at end of file ++++++ ceph-10.2.2+git.1471622341.b446b70.tar.bz2 -> ceph-11.0.0+git.1472455009.a17726c.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/ceph/ceph-10.2.2+git.1471622341.b446b70.tar.bz2 /work/SRC/openSUSE:Factory/.ceph.new/ceph-11.0.0+git.1472455009.a17726c.tar.bz2 differ: char 11, line 1 ++++++ ceph-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.SMJzno/_old 2016-08-31 00:11:54.000000000 +0200 +++ /var/tmp/diff_new_pack.SMJzno/_new 2016-08-31 00:11:54.000000000 +0200 @@ -1,2 +1,5 @@ # to be used as a last resort addFilter("shlib-fixed-dependency") +addFilter("ceph-base.*devel-file-in-non-devel-package.*erasure-code") +addFilter("ceph-base.*devel-file-in-non-devel-package.*compressor") +addFilter("ceph-base.*devel-file-in-non-devel-package.*rados-classes") ++++++ ceph_ver_hack.sh ++++++ # Don't run this manually. It's only here to be invoked inside the # git checkout during `osc service dr`. Here's why: # # - cmake, when it runs to set up the build system, in turn invokes # git to set CEPH_GIT_VER and CEPH_GIT_NICE_VER (src/CMakeLists.txt # line 237+). # - Those two variables are substituted into src/ceph_ver.h.in.cmake, # generating build/src/include/ceph_ver.h. # - When cmake is run inside OBS, it's working off a tarball, so # there's no git repo information, so CEPH_GIT_VER ends up set to # GITDIR-NOTFOUND, which breaks the build. # - cmake *really* wants to be run from a git source checkout (at # least insofar as getting the version stuff set up goes). # # This script uses the old src/make_version script to generate # src/.git_version (which has the git commit hash on the first line # and the pretty version on the second), then sed's these two values # into src/ceph_ver.h.in.cmake in place of @CEPH_GIT_VER@ and # @CEPH_GIT_NICE_VER@, so when cmake later runs as part of the build, # it ends up (effectively) just copying that file to # build/src/include/ceph_ver.h. It doesn't matter that cmake will # still internally set CEPH_GIT_VER and CEPH_GIT_NICE_VER to bogus # values, because we've already done the variable substitution. # # This script is invoked from the _service file via: # # <param name="commandtorun">sh ../../../ceph_ver_hack.sh</param> # # It works because the cloned git source ends up three directories # under the OBS source checkout. I had previously tried to do the # below three commands directly inside the "comandtorun" parameter, # as follows: # # <param name="commandtorun">sh -c 'src/make_version -g src/.git_version ; sed -i \"s/@CEPH_GIT_VER@/$(head -n1 src/.git_version)/\" src/ceph_ver.h.in.cmake ; sed -i \"s/@CEPH_GIT_NICE_VER@/$(tail -n1 src/.git_version)/\" src/ceph_ver.h.in.cmake'</param> # # ...but that doesn't work, because obs-service-tar_scm runs # str.split() on it, which splits on whitespace and thus totally # breaks the big long string I'm trying to pass to `sh -c`. # # This is the nastiest hack I've written in recent memory. I'm # very, very sorry. # # -- Tim Serong <tserong(a)suse.com> # src/make_version -g src/.git_version sed -i "s/@CEPH_GIT_VER@/$(head -n1 src/.git_version)/" src/ceph_ver.h.in.cmake sed -i "s/@CEPH_GIT_NICE_VER@/$(tail -n1 src/.git_version)/" src/ceph_ver.h.in.cmake ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.SMJzno/_old 2016-08-31 00:11:54.000000000 +0200 +++ /var/tmp/diff_new_pack.SMJzno/_new 2016-08-31 00:11:54.000000000 +0200 @@ -20,7 +20,7 @@ in_files=true continue ;; - "%post"* | "%pre"* | "%preun"* | "%postun"*) + "%post"* | "%pre"* | "%preun"* | "%postun"* | "%changelog") in_files=false continue ;; @@ -50,31 +50,6 @@ ;; esac - # process path variables - result=`echo "$result" | sed -e 's!%{_bindir}!/usr/bin!g' \ - -e 's!%{_docdir}!/usr/share/doc/packages!g' \ - -e 's!%{_sbindir}!/usr/sbin!g' \ - -e 's!%{_libdir}!/usr/lib64!g' \ - -e 's!%{_mandir}!/usr/share/man!g' \ - -e 's!%{_sysconfdir}!/etc!g' \ - -e 's!%{_includedir}!/usr/include!g' \ - -e 's!%{_unitdir}!/usr/lib/systemd/system!g' \ - -e 's!%{python_sitelib}!/usr/lib/python2.7/site-packages!g' \ - -e 's!%{_datadir}!/usr/share!g' \ - -e 's!%{python_sitearch}!/usr/lib64/python2.7/site-packages!g' \ - -e 's!%{_javadir}!/usr/share/java!g' \ - -e 's!%{_libexecdir}!/usr/lib!g' \ - -e 's!%{_prefix}!/usr!g' \ - -e 's!%{_localstatedir}!/var!g' \ - -e 's!%{_tmpfilesdir}!/usr/lib/tmpfiles.d!g' \ - -e 's!%{_udevrulesdir}!/usr/lib/udev/rules.d!g'` - - # sanity check - if [[ "$result" == "%"* ]]; then - echo "ERROR: unparsable file entry: $result" - exit 1 - fi - echo "$result" done done < $spec_file @@ -194,7 +169,7 @@ "Source0:"*) line=`echo $line | sed 's/%{name}/ceph/g'` ;; - "%setup -q") + "%autosetup -p1") line="$line -n ceph-%version" ;; "Requires:"*) @@ -220,14 +195,8 @@ fi ;; "%package "*) - #pkg=`echo "$line" | sed 's/%package.* $\w\+$/\1/g'` - #if [[ $pkg == $include_pkg ]]; then - # in_package=false - #else - in_package=true - continue - #fi - in_desc=false + in_package=true + continue ;; "%prep"* | "%build"* | "%install"*) in_package=false @@ -313,5 +282,7 @@ desc=`get_package_description $SPEC_FILE $PACKAGE` reqs=`get_package_requires $SPEC_FILE $PACKAGE` transform_spec_file $SPEC_FILE $PACKAGE "$rm_files" "$summ" "$desc" "$reqs" > $PACKAGE.spec +insert_line_before "${PACKAGE}.spec" "Source99: ceph-rpmlintrc" "_insert_obs_source_lines_here" insert_line_before "${PACKAGE}.spec" "Source98: README-ceph-test.txt" "^Source99:" +insert_line_before "${PACKAGE}.spec" "Source97: ceph_ver_hack.sh" "^Source98:" copy_changes_file $PACKAGE

1 0

commit libtorrent-rasterbar for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libtorrent-rasterbar for openSUSE:Factory checked in at 2016-08-31 00:10:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libtorrent-rasterbar (Old) and /work/SRC/openSUSE:Factory/.libtorrent-rasterbar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libtorrent-rasterbar" Changes: -------- --- /work/SRC/openSUSE:Factory/libtorrent-rasterbar/libtorrent-rasterbar.changes 2016-08-18 09:18:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libtorrent-rasterbar.new/libtorrent-rasterbar.changes 2016-08-31 00:11:49.000000000 +0200 @@ -1,0 +2,47 @@ +Sun Aug 28 12:34:58 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 1.1.1: + * Update puff.c for gzip inflation. + * Add dht_bootstrap_node a setting in settings_pack (and add + default). + * Make pad-file and symlink support conform to BEP47. + * Fix piece picker bug that could result in division by zero. + * Fix value of current_tracker when all tracker failed. + * Deprecate lt_trackers extension. + * Remove load_asnum_db and load_country_db from python bindings. + * Fix a crash in session::get_ip_filter when not having set one. + * Fix filename escaping when repairing torrents with broken web + seeds. + * fix a bug where file_completed_alert would not be posted unless + file_progress had been queries by the client. + * Move files one-by-one when moving storage for a torrent. + * Fix bug in python bindings of announce_entry. + * Fix a bug related to flag_merge_resume_http_seeds flag in + add_torrent_params. + * Fixed inverted priority of incoming piece suggestions. + * Optimise allow-fast logic. + * Fix an issue where FAST extension messages were not used during + handshake. + * Fix a crash on invalid input in http_parser. + * Upgrade to libtommath 1.0. + * Fix parsing of an IPv6 endpoint with invalid port character + separator. + * Add a limited support for new x.pe parameter from BEP 9. + * Fix dht stats counters that weren't being updated. + * Make sure add_torrent_alert is always posted before other + alerts for the torrent. + * Fix a peer-class leak when settings per-torrent rate limits. + * Add a new "preformatted" type to bencode entry variant type. + * Improve Socks5 support and test coverage. + * Fix set_settings in python bindings. + * Add missing alert categories in python bindings. + * Add dht_get_peers_reply_alert alert in python bindings. + * Fix updating the node id reported to peers after changing IPs. +- Remove libtorrent-rasterbar-1.1.0-fix-get-ip-filter.patch: merged + upstream. +- Remove libtorrent-rasterbar-1.1.0-remove-x86-only-flag.patch, + libtorrent-rasterbar-1.1.0-add_ppc64le_as_64_bit_system_libraries.patch, + libtorrent-rasterbar-1.1.0-fix-invalid-input-crash.patch, + libtorrent-rasterbar-1.1.0-python-fixes.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- libtorrent-rasterbar-1.1.0-add_ppc64le_as_64_bit_system_libraries.patch libtorrent-rasterbar-1.1.0-fix-get-ip-filter.patch libtorrent-rasterbar-1.1.0-fix-invalid-input-crash.patch libtorrent-rasterbar-1.1.0-python-fixes.patch libtorrent-rasterbar-1.1.0-remove-x86-only-flag.patch libtorrent-rasterbar-1.1.0.tar.gz New: ---- libtorrent-rasterbar-1.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtorrent-rasterbar.spec ++++++ --- /var/tmp/diff_new_pack.E4Ifni/_old 2016-08-31 00:11:50.000000000 +0200 +++ /var/tmp/diff_new_pack.E4Ifni/_new 2016-08-31 00:11:50.000000000 +0200 @@ -18,27 +18,17 @@ %define _name libtorrent %define sover 9 -%define _version 1_1 +%define _version 1_1_1 %bcond_with examples %bcond_with tests Name: libtorrent-rasterbar -Version: 1.1.0 +Version: 1.1.1 Release: 0 Summary: Libtorrent is a C++ implementation of the BitTorrent protocol License: BSD-3-Clause Group: Development/Libraries/C and C++ Url: http://libtorrent.org/ Source: https://github.com/arvidn/%{_name}/releases/download/%{_name}-%{_version}/%… -# PATCH-FIX-UPSTREAM libtorrent-rasterbar-1.1.0-remove-x86-only-flag.patch -- Remove -msse4.2 flag (commit 680eddf). -Patch0: %{name}-1.1.0-remove-x86-only-flag.patch -# PATCH-FIX-UPSTREAM libtorrent-rasterbar-1.1.0-fix-get-ip-filter.patch boo#978600 -- Fix crash in session::get_ip_filter when not having set one (commit 66e5994). -Patch1: %{name}-1.1.0-fix-get-ip-filter.patch -# PATCH-FIX-UPSTREAM libtorrent-rasterbar-1.1.0-python-fixes.patch boo#988986 -- Fixes for Python bindings (commits e4fd45e, 80710ab, f01ac8f, 42c6376, f05fad0). -Patch2: %{name}-1.1.0-python-fixes.patch -# PATCH-FIX-UPSTREAM libtorrent-rasterbar-1.1.0-fix-invalid-input-crash.patch boo#983228 -- Fix crash on invalid input in http_parser (commit 3624ce6). -Patch3: %{name}-1.1.0-fix-invalid-input-crash.patch -# PATCH-FIX-UPSTREAM libtorrent-rasterbar-1.1.0-add_ppc64le_as_64_bit_system_libraries.patch -- Fix configure error on ppc64le (commit 487cb44). -Patch4: %{name}-1.1.0-add_ppc64le_as_64_bit_system_libraries.patch BuildRequires: boost-devel >= 1.53 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -135,11 +125,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing" ++++++ libtorrent-rasterbar-1.1.0.tar.gz -> libtorrent-rasterbar-1.1.1.tar.gz ++++++ ++++ 34392 lines of diff (skipped)

1 0

commit octave for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2016-08-31 00:10:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "octave" Changes: -------- --- /work/SRC/openSUSE:Factory/octave/octave.changes 2016-08-03 11:43:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2016-08-31 00:11:47.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 26 21:26:33 UTC 2016 - dmitry_r(a)opensuse.org + +- Fix suse-alternative-link-missing [boo#994253] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.wgouMU/_old 2016-08-31 00:11:49.000000000 +0200 +++ /var/tmp/diff_new_pack.wgouMU/_new 2016-08-31 00:11:49.000000000 +0200 @@ -333,6 +333,7 @@ %doc AUTHORS BUGS COPYING NEWS %doc README ChangeLog %ghost %{_sysconfdir}/alternatives/%{name} +%ghost %{_sysconfdir}/alternatives/%{name}-%{src_ver} %ghost %{_bindir}/%{name}-%{src_ver} %{_bindir}/%{name}-gui %{_bindir}/%{name}-gui-%{src_ver} @@ -353,6 +354,7 @@ %{_bindir}/%{name} %ghost %{_bindir}/%{name}-%{src_ver} %ghost %{_sysconfdir}/alternatives/%{name} +%ghost %{_sysconfdir}/alternatives/%{name}-%{src_ver} %{_bindir}/octave-cli %{_bindir}/octave-cli-%{src_ver} %{_mandir}/man1/octave.1.gz

1 0

commit mate-applet-dock for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package mate-applet-dock for openSUSE:Factory checked in at 2016-08-31 00:10:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-applet-dock (Old) and /work/SRC/openSUSE:Factory/.mate-applet-dock.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mate-applet-dock" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-applet-dock/mate-applet-dock.changes 2016-07-27 16:12:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mate-applet-dock.new/mate-applet-dock.changes 2016-08-31 00:11:44.000000000 +0200 @@ -1,0 +2,25 @@ +Sun Aug 28 12:34:58 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 0.74: + * Correct position of window lists on non-expanded panels. + * Fix for window list flickering on bottom aligned panels on MATE + built with Gtk3. + * Increase the delay before window lists are shown when the mouse + hovers over an application icon. It was 0.5 seconds, and is now + 1 second. + * Shortened pin/unpin window list text. It now says + 'Pin <application name>' rather than + 'Pin <application name> to the dock', and the Unpin text is + similarly shortened. + * Fix a bug that would cause Pin/Unpin actions to act upon + previously highlighted application icons, rather than the one + that is currently highlighted. + * When starting to drag an application icon, the window list is + now hidden. + * The applet can now display progress bars and counts on + application icons for applications which support this e.g. the + Ubuntu software updater. + * Fix for improved matching of binary packaged applications on + Gentoo. + +------------------------------------------------------------------- Old: ---- mate-dock-applet-0.73.tar.gz New: ---- mate-dock-applet-0.74.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-applet-dock.spec ++++++ --- /var/tmp/diff_new_pack.ownylg/_old 2016-08-31 00:11:47.000000000 +0200 +++ /var/tmp/diff_new_pack.ownylg/_new 2016-08-31 00:11:47.000000000 +0200 @@ -18,7 +18,7 @@ %define _name mate-dock-applet Name: mate-applet-dock -Version: 0.73 +Version: 0.74 Release: 0 Summary: Dock applet for the MATE panel License: GPL-2.0+ @@ -34,8 +34,8 @@ Requires: python3-cairo Requires: python3-gobject Requires: python3-gobject-cairo -Requires: python3-scipy Requires: python3-xdg +Recommends: libunity %glib2_gsettings_schema_requires %if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 Requires: python3-gobject-Gdk @@ -75,7 +75,8 @@ find %{buildroot}%{_libdir}/ -type f -name '*.py' | while read py; do # Create Python bytecode. - rm -f *.pyc *.pyo __pycache__/ + rm -rf *.pyc *.pyo __pycache__/ + touch -c *.py %py3_compile . if [[ "$(head -c2 "$py"; echo)" == "#!" ]]; then chmod a+x "$py" ++++++ mate-dock-applet-0.73.tar.gz -> mate-dock-applet-0.74.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-dock-applet-0.73/ChangeLog new/mate-dock-applet-0.74/ChangeLog --- old/mate-dock-applet-0.73/ChangeLog 2016-07-20 09:17:33.000000000 +0200 +++ new/mate-dock-applet-0.74/ChangeLog 2016-08-24 09:18:29.000000000 +0200 @@ -1,3 +1,21 @@ +V0.74 Fix for improved matching of binary packaged apps on Gentoo . + Amended README.me to include the availability of an overlay for the applet + on Gentoo. + Corrected position of window lists on non-expanded panels. + Fix for window list flickering on bottom aligned panels on MATE Gtk3 + Increased the delay before window lists are shown when the mouse hovers over an + app icon. It was 0.5 seconds, and is now 1 second. + Shortened pin/unpin window list text. It now says 'Pin <app name>' rather than + 'Pin <app name> to the dock', and the Unpin text is similarly shortened. + Fixed a bug that would cause Pin/Unpin actions to act upon previously highlighted app + icons, rather than the one that is currently highlighted. + When starting to drag an app icon, the window list is now hidden. + The applet can now display progress bars and counts on app icons for apps which + support this e.g. the Ubuntu software updater. + +V0.73 Added drag and drop rearranging ing of dock icons (Gtk3 only). Window list + reworked and prettified. + V0.72 The applet now works on and can be built for both GTK2 and GTK3 versions of MATE. Aside from the changes to layout containers (i.e. GTK2 VBox & HBoxes become GTK3 Boxes/Grids), underlying differences between the two toolkits meant that the code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-dock-applet-0.73/README.md new/mate-dock-applet-0.74/README.md --- old/mate-dock-applet-0.73/README.md 2016-07-20 09:17:33.000000000 +0200 +++ new/mate-dock-applet-0.74/README.md 2016-08-24 09:18:29.000000000 +0200 @@ -37,6 +37,10 @@ For Arch users there's a [package](http://aur.archlinux.org/packages/mate-applet-dock-git) available in the AUR. +### Gentoo based distributions + +An ebuild is available via the [mate-de-gentoo](https://github.com/oz123/mate-de-gentoo) + ### Other distributions Users of other distros will need to install from source, so first install the required dependencies: @@ -45,7 +49,6 @@ * gir1.2-wnck-1.0 * libglib2-dev * Python Imaging Library -* SciPy * Python 3 Cairo bindings then cd to the directory containing all of the development files and run: @@ -81,9 +84,16 @@ From this point the instructions above for compiling from source should be followed. +### Note for Compiz Users + +In order for window minimizing and maximizing to work correctly under Compiz, the Focus Prevention Level setting must be set to off in CompizConfig Settings Manager (General Options, Focus and Raise Behaviour) ### Obligatory screen shots +GTK3 version of the applet running on Ubuntu MATE 16.10 Alpha 1 + +![GTK3 Ubunbtu Mate](https://github.com/robint99/screenshots/raw/master/16.10 win-list.png) + Running on Arch with a Unity style layout ![Arch screenshot](https://github.com/robint99/screenshots/raw/master/arch_V0.6_ss… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-dock-applet-0.73/configure.ac new/mate-dock-applet-0.74/configure.ac --- old/mate-dock-applet-0.73/configure.ac 2016-07-20 09:17:33.000000000 +0200 +++ new/mate-dock-applet-0.74/configure.ac 2016-08-24 09:18:29.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([Dock Applet], [0.73]) +AC_INIT([Dock Applet], [0.74]) AM_INIT_AUTOMAKE AM_PATH_PYTHON([3.0]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-dock-applet-0.73/src/dock.in new/mate-dock-applet-0.74/src/dock.in --- old/mate-dock-applet-0.73/src/dock.in 2016-07-20 09:17:33.000000000 +0200 +++ new/mate-dock-applet-0.74/src/dock.in 2016-08-24 09:18:29.000000000 +0200 @@ -8,6 +8,8 @@ Respond to window opening and closing events from libwnck Respond to changes to the Gtk icon theme and update all docked apps Load and save dock settings (e.g. pinned apps and indicator type) +Respond to Unity API DBus messages so that apps can display counts and +progress meters on their icons respond to selections made in the applet right click menu, specifically : allow apps to be pinned to the dock @@ -65,6 +67,8 @@ import os.path import sys from time import sleep +import dbus +from dbus.mainloop.glib import DBusGMainLoop import docked_app import dock_prefs @@ -335,7 +339,7 @@ self.app_win_list = dock_win_list.DockWinList(self.wnck_screen) self.app_win_list.icontheme = self.icontheme - self.win_list_delay = 500 + self.win_list_delay = 1000 self.win_list_timer = None self.panel_x = 0 @@ -356,10 +360,31 @@ self.panel_cc = dock_color_changer.PanelColorChanger() + # we need to monitor the Unity dbus interface + DBusGMainLoop(set_as_default=True) + self.session_bus = dbus.SessionBus() + + # claim the Unity bus (Unity won't be using it...) so that clients know + # to start using it + self.session_bus.request_name("com.canonical.Unity", + dbus.bus.NAME_FLAG_ALLOW_REPLACEMENT) + + # add a handler to listen in Unity dbus messages + self.session_bus.add_signal_receiver(self.unity_cb_handler, + dbus_interface = "com.canonical.Unity.LauncherEntry", + signal_name="Update") + # instantiate a timer to perform further setup once the applet has been # fully created GObject.timeout_add(1000, self.do_delayed_setup) + def __del__(self): + """ Clean up ... + """ + + # release the unity bus + self.session_bus.release_name("com.canonical.Unity") + def do_delayed_setup(self): """ Perform setup operations that we couldn't do until the dock was fully instantiated @@ -805,9 +830,9 @@ move_right_action.set_label("Move %s to the right on the dock" % app.app_name) if pin_action.is_visible(): - pin_action.set_label("Pin %s to the dock" % app.app_name) + pin_action.set_label("Pin %s" % app.app_name) else: - unpin_action.set_label("Unpin %s from the dock" % app.app_name) + unpin_action.set_label("Unpin %s" % app.app_name) # set the actions for selecting specific windows @@ -900,39 +925,63 @@ """Perform the app's 1st .desktop file specified shortcut/action """ - if self.right_clicked_app is not None: - self.right_clicked_app.run_rc_action(1) + # get the app in question + if self.app_win_list is None: + return # shouldn't ever happen... + the_app = self.app_win_list.the_app + + if the_app is not None: + the_app.run_rc_action(1) def df_shortcut_2(self, data=None): """Perform the app's 1st .desktop file specified shortcut/action """ - if self.right_clicked_app is not None: - self.right_clicked_app.run_rc_action(2) + # get the app we need in question + if self.app_win_list is None: + return # shouldn't ever happen... + the_app = self.app_win_list.the_app + + if the_app is not None: + the_app.run_rc_action(2) def df_shortcut_3(self, data=None): """Perform the app's 1st .desktop file specified shortcut/action """ + # get the app in question + if self.app_win_list is None: + return # shouldn't ever happen... + the_app = self.app_win_list.the_app - if self.right_clicked_app is not None: - self.right_clicked_app.run_rc_action(3) + if the_app is not None: + the_app.run_rc_action(3) def df_shortcut_4(self, data=None): """Perform the app's 1st .desktop file specified shortcut/action + + The app is specfied from the winwdow list """ + # get the app win quesion + if self.app_win_list is None: + return # shouldn't ever happen. + the_app = self.app_win_list.the_app - if self.right_clicked_app is not None: - self.right_clicked_app.run_rc_action(4) + if the_app is not None: + the_app.run_rc_action(4) def unpin_app(self, data=None): """Unpin an app from the dock + This action is performed from the window list Unpin the app and update the dock settings. If the app is not running, remove it from the dock also """ - the_app = self.right_clicked_app + # get the app we need to unpin + if self.app_win_list is None: + return # shouldn't ever happen... + the_app = self.app_win_list.the_app if the_app is not None: the_app.is_pinned = False @@ -946,7 +995,11 @@ Pin the app and update the dock settings""" - the_app = self.right_clicked_app + # get the app we need to pin + if self.app_win_list is None: + return # shouldn't ever happen... + + the_app = self.app_win_list.the_app if the_app is not None: the_app.is_pinned = True self.write_settings() @@ -1075,16 +1128,18 @@ two integers, the x and y coordinates """ + dock_x, dock_y = self.get_dock_root_coords() + if (self.panel_orient == "top") or (self.panel_orient == "bottom"): - min_x = self.applet_pos + 1 + \ + min_x = dock_x + \ (self.get_app_position_in_dock(app) * app.drawing_area_size) if build_gtk2: min_x += self.get_app_position_in_dock(app) - min_y = self.panel_y + 1 + min_y = dock_y else: - min_x = self.panel_x + 1 - min_y = self.applet_pos + 1 + \ + min_x = dock_x + min_y = dock_y + \ (self.get_app_position_in_dock(app) * app.drawing_area_size) if build_gtk2: min_y += self.get_app_position_in_dock(app) @@ -1098,12 +1153,17 @@ two integers, the x and y coordinates """ - if (self.panel_orient == "top") or (self.panel_orient == "bottom"): - dock_x = self.applet_pos + 1 - dock_y = self.panel_y + 1 + # get root coord from the applet window rather from panel settings... + win = self.applet.props.window + # check validity of win - can be None during applet creation... + if win is None: + return 0, 0 + + if build_gtk2: + # win.get_origin doesn't work on gtk2, so... + dock_x, dock_y = win.get_root_coords(0, 0) else: - dock_x = self.panel_x + 1 - dock_y = self.applet_pos + 1 + thing, dock_x, dock_y = win.get_origin() return dock_x, dock_y @@ -1838,7 +1898,33 @@ """ self.app_list.remove(app) - self.box.remove(app.drawing_area) + num_apps = len(self.box.get_children()) + + if build_gtk2: + self.box.remove(app.drawing_area) + else: + # the row/column which contains the app needs to be + # removed, so get the app's position in the grid + pos = 0 + while pos < num_apps: + if self.box.orientation == Gtk.Orientation.VERTICAL: + left = 0 + top = pos + else: + left = pos + top = 0 + + if self.box.get_child_at(left, top) == app.drawing_area: + # we've found the app + if self.box.orientation == Gtk.Orientation.VERTICAL: + self.box.remove_row(pos) + else: + self.box.remove_column(pos) + + app = None + return + + pos += 1 app = None @@ -2152,8 +2238,8 @@ """ Show the the list of open windows and actions for the currently highlighted app - Get the currently highlighted app. If the highlighted app is not - running or a window list is already being displayed for it, or a user + Get the currently highlighted app. If the highlighted app is being + launched or a window list is already being displayed for it, or a user interaction has already dismissed the window list, then do nothing Otherwise, fill the window list, set the window position and set the @@ -2169,97 +2255,97 @@ if (highlighted_app is None): return - if highlighted_app is not None: - - self.set_actions_for_app(self.app_with_mouse) - - # first of all, add any shortcut actions specifedd in the app's - # .desktop file + # is the app being launched? + if highlighted_app.is_pulsing: + self.win_list_timer = None + return False - df_shortcut_1_action = self.dock_action_group.get_action("df_shortcut_1_action") - df_shortcut_2_action = self.dock_action_group.get_action("df_shortcut_2_action") - df_shortcut_3_action = self.dock_action_group.get_action("df_shortcut_3_action") - df_shortcut_4_action = self.dock_action_group.get_action("df_shortcut_4_action") - pin_action = self.dock_action_group.get_action("pin_action") - unpin_action = self.dock_action_group.get_action("unpin_action") + # always recreate the window list e.g. to account for windows being + # opened/closed, the app being pinned/unpinned etc. - # recreate the window every time - if self.app_win_list is not None: - self.app_win_list.destroy() + if self.app_win_list is not None: + self.app_win_list.destroy() - self.app_win_list = dock_win_list.DockWinList(self.wnck_screen) - self.app_win_list.icontheme = self.icontheme + self.set_actions_for_app(self.app_with_mouse) - # set the background colour of the window list to the - # colour of the panel - pr, pg, pb = self.get_applet_panel_rgb() - self.app_win_list.set_bg_col(pr, pg, pb) + # first of all, add any shortcut actions specified in the app's + # .desktop file - self.app_win_list.the_app = highlighted_app + df_shortcut_1_action = self.dock_action_group.get_action("df_shortcut_1_action") + df_shortcut_2_action = self.dock_action_group.get_action("df_shortcut_2_action") + df_shortcut_3_action = self.dock_action_group.get_action("df_shortcut_3_action") + df_shortcut_4_action = self.dock_action_group.get_action("df_shortcut_4_action") + pin_action = self.dock_action_group.get_action("pin_action") + unpin_action = self.dock_action_group.get_action("unpin_action") + self.app_win_list = dock_win_list.DockWinList(self.wnck_screen) + self.app_win_list.icontheme = self.icontheme - if df_shortcut_1_action.is_visible(): + # set the background colour of the window list to the + # colour of the panel : Note: not properly implemented yet + pr, pg, pb = self.get_applet_panel_rgb() + self.app_win_list.set_bg_col(pr, pg, pb) + + self.app_win_list.the_app = highlighted_app + + if df_shortcut_1_action.is_visible(): + self.app_win_list.add_to_list(False, + df_shortcut_1_action.get_label(), + None, df_shortcut_1_action, + True) + if df_shortcut_2_action.is_visible(): self.app_win_list.add_to_list(False, - df_shortcut_1_action.get_label(), - None, df_shortcut_1_action, + df_shortcut_2_action.get_label(), + None, + df_shortcut_2_action, True) - if df_shortcut_2_action.is_visible(): - self.app_win_list.add_to_list(False, - df_shortcut_2_action.get_label(), - None, - df_shortcut_2_action, - True) - if df_shortcut_3_action.is_visible(): - self.app_win_list.add_to_list(False, - df_shortcut_3_action.get_label(), - None, - df_shortcut_3_action, - True) - if df_shortcut_4_action.is_visible(): - self.app_win_list.add_to_list(False, - df_shortcut_4_action.get_label(), - None, - df_shortcut_4_action, - True) - self.app_win_list.add_separator() - - # add any open windows - if highlighted_app.is_running(): - self.app_win_list.setup_list(self.win_from_cur_ws_only) - self.app_win_list.add_separator() - - if pin_action.is_visible(): - self.app_win_list.add_to_list(False, pin_action.get_label(), - None, pin_action, False) - else: - self.app_win_list.add_to_list(False, unpin_action.get_label(), - None, unpin_action, False) + if df_shortcut_3_action.is_visible(): + self.app_win_list.add_to_list(False, + df_shortcut_3_action.get_label(), + None, + df_shortcut_3_action, + True) + if df_shortcut_4_action.is_visible(): + self.app_win_list.add_to_list(False, + df_shortcut_4_action.get_label(), + None, + df_shortcut_4_action, + True) + self.app_win_list.add_separator() - self.app_win_list.clear_mouse_areas() + # add any open windows + if highlighted_app.is_running(): + self.app_win_list.setup_list(self.win_from_cur_ws_only) + self.app_win_list.add_separator() - applet_x, applet_y = self.get_dock_root_coords() - applet_w = applet_h = highlighted_app.drawing_area_size + if pin_action.is_visible(): + self.app_win_list.add_to_list(False, pin_action.get_label(), + None, pin_action, False) + else: + self.app_win_list.add_to_list(False, unpin_action.get_label(), + None, unpin_action, False) - self.app_win_list.set_applet_details(applet_x, applet_y, - applet_w, applet_h) - self.app_win_list.set_panel_orient(self.applet.get_orient()) - app_x, app_y = self.get_app_root_coords(highlighted_app) - self.app_win_list.set_app_root_coords(app_x, app_y) + self.app_win_list.clear_mouse_areas() - self.app_win_list.show_all() + applet_x, applet_y = self.get_dock_root_coords() + applet_w = applet_h = highlighted_app.drawing_area_size - self.win_list_timer = None - return False + self.app_win_list.set_applet_details(applet_x, applet_y, + applet_w, applet_h) + self.app_win_list.set_panel_orient(self.applet.get_orient()) + app_x, app_y = self.get_app_root_coords(highlighted_app) + self.app_win_list.set_app_root_coords(app_x, app_y) + + self.app_win_list.show_all() + + self.win_list_timer = None + return False def hide_win_list(self): """ Hide the window list """ if self.app_win_list is not None: - if build_gtk2: - self.app_win_list.hide() - else: - self.app_win_list.destroy() - self.app_win_list = None + self.app_win_list.hide() def minimize_or_restore_windows(self, app, event): """ Minimize or restore an app's windows in response to a left click of @@ -2500,6 +2586,38 @@ return self.get_app_at_mouse(x, y) + def unity_cb_handler(self, app_uri, args): + """ Handler for Unity API dbus messages + + If the specified app is in the dock, forward the set the progress + and/or count, and redraw the app's icon + + Args: + app_uri : the basename of the .desktop file of the app + args : the contents of the dbus message + + """ + + # remove the leading part of the app uri + df = app_uri.split("://")[1] + + # search for the an app which has the same desktop file name + for app in self.app_list: + app_df_path, app_df = os.path.split(app.desktop_file) + if app_df == df: + # we've found the app - update it... + + if "count-visible" in args: + app.set_counter_visible(args["count-visible"]) + if "count" in args: + app.set_counter_value(args["count"]) + + if "progress-visible" in args: + app.set_progress_visible(args["progress-visible"]) + if "progress" in args: + app.set_progress_value(args["progress"]) + break + def win_activation_timer(args): """ Timer function to be called by GObject.timeout_add and which diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-dock-applet-0.73/src/dock_applet.in new/mate-dock-applet-0.74/src/dock_applet.in --- old/mate-dock-applet-0.73/src/dock_applet.in 2016-07-20 09:17:33.000000000 +0200 +++ new/mate-dock-applet-0.74/src/dock_applet.in 2016-08-24 09:18:29.000000000 +0200 @@ -180,14 +180,12 @@ if app is not None: app.has_mouse = True app.queue_draw() + the_dock.app_with_mouse = app # set up the available options for the app the_dock.set_actions_for_app(app) - the_dock.reset_win_list_timer() - - def applet_leave_notify(widget, event, the_dock): """Leave notifiy event handle for the applet @@ -204,7 +202,7 @@ the_dock.app_with_mouse.queue_draw() the_dock.app_with_mouse = None - the_dock.stop_win_list_timer() + the_dock.stop_win_list_timer() def applet_motion_notify(widget, event, the_dock): @@ -325,6 +323,10 @@ the_dock.start_drag_motion_timer(the_dock.app_with_mouse) + # finally, hide the window list if it was being shown + the_dock.hide_win_list() + + def applet_drag_data_get(widget, drag_context, data, info, time): """ Handler the for drag-data-get event @@ -374,7 +376,6 @@ app.set_dragee(False) app.queue_draw() - def applet_fill(applet): """ Create the applet @@ -470,6 +471,3 @@ if __name__ == "__main__": main() - -#timer object to check the mouse x and y as a substitute for drag-motion -#need to convert root coords to applet window coords - use applet window.get_origin to get its root coords diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-dock-applet-0.73/src/dock_win_list.in new/mate-dock-applet-0.74/src/dock_win_list.in --- old/mate-dock-applet-0.73/src/dock_win_list.in 2016-07-20 09:17:33.000000000 +0200 +++ new/mate-dock-applet-0.74/src/dock_win_list.in 2016-08-24 09:18:29.000000000 +0200 @@ -440,6 +440,8 @@ if len(self.__list_store) == 0: self.set_win_position() + self.start_mouse_area_timer() + def set_win_position(self): """ Move the window so that it appears near the panel and centrered on @@ -579,11 +581,23 @@ self.move(win_x, win_y) - if self.__timer_id is not None: - GObject.source_remove(self.__timer_id) + def start_mouse_area_timer(self): + """ Start the timer that that monitors the mouse position + """ + + # remove any old timer... + self.stop_mouse_area_timer() self.__timer_id = GObject.timeout_add(CONST_TIMER_DELAY, self.do_timer) + def stop_mouse_area_timer(self): + """ Stop the timer that monitors the mouse position + """ + # + if self.__timer_id is not None: + GObject.source_remove(self.__timer_id) + self.__timer_id = None + def win_configure(self, widget, event): """ Event handler for the window's configure event @@ -611,7 +625,9 @@ self.set_win_position() - # TODO: investigate reason for shape_combine_region not working + # TODO: keep checking status of this bug: + # https://bugzilla.gnome.org/show_bug.cgi?id=667959 + # and when a fix is available shape_combine_region for rounded windows... #def size_allocate(self, widget, allocation): # def rounded_rectangle(cr, x, y, w, h, r=20): # # Attribution: @@ -809,9 +825,7 @@ """ - if self.__timer_id is not None: - GObject.source_remove(self.__timer_id) - self.__timer_id = None + self.stop_mouse_area_timer() def query_tooltip(self, widget, x, y, keyboard_mode, tooltip): """ Handler for the query-tooltip event to determine whether or not diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-dock-applet-0.73/src/docked_app.in new/mate-dock-applet-0.74/src/docked_app.in --- old/mate-dock-applet-0.73/src/docked_app.in 2016-07-20 09:17:33.000000000 +0200 +++ new/mate-dock-applet-0.74/src/docked_app.in 2016-08-24 09:18:29.000000000 +0200 @@ -71,6 +71,7 @@ import os import os.path import subprocess +import re from collections import namedtuple @@ -333,6 +334,13 @@ is_dragee : boolean - indicates whether or not the app's icon is being dragged to a new position on the dock + + show_progress : boolean - indicates whether or not to display a + progress indicator on the app's icon + progress_val : the progress value( 0 to 1.0) + show_count : boolean - indicates whether or not to display a + count value on the app's icon + count_val : the value of the count """ def __init__(self): @@ -396,6 +404,11 @@ self.is_dragee = False + self.show_progress = False + self.progress_val = 0.0 + self.show_count = False + self.count_val = 0 + def has_wnck_app(self, wnck_app): """ see if this app has a process with the specified wnck_app @@ -629,7 +642,6 @@ True if the desktop file was found, False otherwise """ - for the_dir, dir_list, file_list in os.walk(srch_dir): dfname = the_dir + self.wm_class_name + ".desktop" @@ -735,9 +747,15 @@ # .desktop de_exec = the_de.getExec() exec_found = False - if (de_exec is not None) and (de_exec != ""): - de_exec = de_exec.split() + if de_exec: + # if the exec line specfies an environment variable to + # set, we need to get rid of this part + if de_exec.startswith("env"): + cmd_parts = de_exec.split(" ", 2) + de_exec = cmd_parts[2] + + de_exec = de_exec.split() # now that we have the app command line we can simply # check that it ends with the same command as the # .desktop file contains. So... @@ -763,6 +781,14 @@ if exec_found: break + # try matching just the last part, removing -bin from the name + if not exec_found: + de_exec = de_exec[0] + de_exec = re.sub("-bin", "", de_exec) + + if "/" in de_exec: + if de_exec.split("/")[-1] in self.cmd_line: + exec_found = True # check that the wm_classes match wm_class_found = False @@ -1176,6 +1202,13 @@ this_ind += 1 ctx.fill() + # do we need a count? + if self.show_count: + self.draw_count(ctx) + + if self.show_progress: + self.draw_progress(ctx) + # now draw to the screen if build_gtk2: screen_ctx = self.drawing_area.window.cairo_create() @@ -1199,6 +1232,174 @@ ctx = None + def draw_count(self, ctx): + """ Draw the app's counter value + + Args: ctx - the cairo context where the counter is to be drawn + """ + + # drawing is done at a notional size 64x64 px, and then scaled + # appropriately according to self.drawing_area_size + + draw_size = 64.0 + + # height of the counter = 2 pix border top and bottom + 16 pix + # internal height + height = 20 + + # work out the appropriate font size to use - has to fit within the + # borders and provide some space above and below the count_val + reqd_font_height = height - 8 + + # find a font size where the count can be shown with the required height + ctx.select_font_face("", cairo.FONT_SLANT_NORMAL, cairo.FONT_WEIGHT_BOLD) + ctext = "%d" % self.count_val + for fsize in range(24, 2, -1): + ctx.set_font_size(fsize) + extents = ctx.text_extents(ctext) + + if (extents[3]< reqd_font_height): + font_size = fsize + break + + # work out an appropriate width for the counter + inset = height/2 + radius = inset-1 + if int(extents[2] + extents[0]) > int(radius): + width = extents[2] + extents[0] + radius + else: + width = height + inset + + ctx.save() + + # the background color of the count is the app's highlight colour + # convert the highlight values to their cairo equivalents + bred = self.highlight_color.r / 255 + bgreen = self.highlight_color.g / 255 + bblue = self.highlight_color.b / 255 + + # set an appropriate text and border color + if bred + bgreen + bblue > 1.5: # mid-level grey + tred = tgreen = tblue = 0.0 + else: + tred = tgreen = tblue = 1.0 + + # the count is placed in the upper right of the drawing area, and we need + # to calculate it's position based on the notional DA_SIZE + # + + left = draw_size - width + inset + + # do the drawing - attribution for the drawing code: + # https://bazaar.launchpad.net/~unity-team/unity/trunk/view/head:/launcher/La… + ctx.scale(self.drawing_area_size/draw_size, + self.drawing_area_size/draw_size) + + ctx.move_to(left, height-1) + ctx.arc(left, inset, radius, 0.5 * math.pi, 1.5*math.pi) + ctx.arc(draw_size-inset, inset, radius, 1.5*math.pi, 0.5*math.pi) + ctx.line_to(left, height-1) + ctx.set_source_rgb(bred, bgreen, bblue) + ctx.fill_preserve() + ctx.set_source_rgb(tred, tgreen, tblue) + ctx.set_line_width(2) + ctx.stroke() + + # draw the text + ctx.move_to(left - inset + width/2 - (extents[0]+extents[2]/2), + (height/2)+extents[3]/2) + ctx.set_source_rgb(tred, tgreen, tblue) + ctx.show_text(ctext) + + ctx.restore() + + def draw_progress(self, ctx): + """ Draw a progress bar to show the app's progress value + + Args: ctx - the cairo context where the counter is to be drawn + """ + + def rounded_rectangle(cr, x, y, w, h, r=20): + """ Convenience function to draw a rounded rectangle, really needs + to be in a library module somewhere, as its used bythe window + list + + # Attribution: + # https://stackoverflow.com/questions/2384374/rounded-rectangle-in-pygtk + # This is just one of the samples from + # http://www.cairographics.org/cookbook/roundedrectangles/ + # A****BQ + # H C + # * * + # G D + # F****E + """ + + cr.move_to(x + r, y) # Move to A + cr.line_to(x + w - r, y) # Straight line to B + cr.curve_to(x + w, y, x + w, y, x + w, y + r) + # Curve to C, Control points are both at Q + cr.line_to(x + w, y + h - r) # Move to D + cr.curve_to(x + w, y + h, x + w, y + h, x + w - r, y + h) # Curve to E + cr.line_to(x + r, y + h) # Line to F + cr.curve_to(x, y + h, x, y + h, x, y + h - r) # Curve to G + cr.line_to(x, y+r) # Line to H + cr.curve_to(x, y, x, y, x+r, y) # Curve to A + + # drawing is done on a to scale of 64x64 pixels and then scaled + # down to the fit the app's drawing area + draw_size = 64.0 + + # the foreground colour of the progress is the app's highlight colour + # convert the highlight values to their cairo equivalents + fred = self.highlight_color.r / 255 + fgreen = self.highlight_color.g / 255 + fblue = self.highlight_color.b / 255 + + # set an appropriate border color and also a background colour for + # the progress bar, based on the highlight colour + if fred + fgreen + fblue > 1.5: # mid-level grey + brd_red = brd_green = brd_blue = 0.0 + bk_red = bk_green = bk_blue = 1.0 + else: + brd_red = brd_green = brd_blue = 1.0 + bk_red = bk_green = bk_blue = 0.0 + + height = 8 # total height of the progress bar + line_width = 2 # border line width + int_height = height - line_width * 2 # interior height + left = 8 + width = draw_size - left * 2 # width of the progress bar + + top = (draw_size/8) * 5 + + ctx.save() + ctx.scale(self.drawing_area_size/draw_size, self.drawing_area_size/draw_size) + + # draw exterior of the progress bar + ctx.set_source_rgb(brd_red, brd_green, brd_blue) + ctx.set_line_width(2) + rounded_rectangle(ctx, left, top, width, height, 7) + ctx.stroke() + + # fill the interior with the background colour + ctx.set_line_width(1) + ctx.set_source_rgb (bk_red, bk_green, bk_blue) + rounded_rectangle(ctx, left + line_width, top + line_width, + width - line_width*2, height-line_width*2, + 2) + + ctx.fill() + + # fill part of the interior with a different colour, depending on + # the progress value + ctx.set_source_rgb(fred, fgreen, fblue) + rounded_rectangle(ctx, left + line_width, top + line_width, + (width - line_width*2) * self.progress_val, + height-line_width*2, 2) + ctx.fill() + ctx.restore() + def set_pixbuf(self, pixbuf): """Set the app pixbuf and calculate its average colour. """ @@ -1252,9 +1453,36 @@ cmd_line = bytearray(cmd_line, "UTF-8") cmd_line = cmd_line.decode("unicode-escape") + + # if an environment variable is specified, extract its name an value + # Note: the .desktop file specification at + # https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s06.ht… + # does not mention this. Both Ubuntu + # https://help.ubuntu.com/community/EnvironmentVariables#Launching_desktop_ap… + # and Arch linux + # https://wiki.archlinux.org/index.php/Desktop_entries#Modify_environment_var… + # seem to indicate that only a single variable can be set and that + # there are no spaces between the variable name, the '=' character and + # variable's value ..... + + # so, if cmd_line begins with "env" it specifies an environment variable + # to set, follwed by the app e.g. env LANG=he_IL.UTF-8 /usr/bin/pluma + # + if cmd_line.startswith("env"): + cmd_parts = cmd_line.split(" ", 2) + var_parts = cmd_parts[1].split("=") + var_name = var_parts[0] + var_value = var_parts[1] + + # now we need to get the app path and args and carry on... + cmd_line = cmd_parts[2] + else: + var_name = None + var_value = None + # if any of the directories in cmd_line contain a " ", they need to be # escaped - head,tail = os.path.split(cmd_line) + head, tail = os.path.split(cmd_line) if " " in head: head = head.replace(" ", "\ ") cmd_line = head + "/" + tail @@ -1263,7 +1491,11 @@ Gio.AppInfoCreateFlags.NONE) alc = Gdk.AppLaunchContext() alc.set_desktop(-1) # use default screen & desktop - app_info.launch() + # if the .desktop specfied an environment variable, set it + if (var_name is not None) and (var_value is not None): + alc.setenv(var_name, var_value) + + app_info.launch(None, alc) # set the app icon pulsing throbber = PulseTimer(self) @@ -1312,6 +1544,65 @@ self.is_dragee = is_dragee self.queue_draw() + def set_progress_visible(self, is_visible): + """ + Update the progress visibility and cause the app's icon to be + redrawn + + Args: + is_visible : whether the progress is to be displayed + """ + + if (is_visible != self.show_progress): + self.show_progress = bool(is_visible) + self.queue_draw() + + def set_progress_value(self, val): + """ + Update the progress value and cause the app's icon to be + redrawn + + Args: + val : the counter value + """ + + # if the new progressvalue is the same as the old, then there's no need + # to do anything... + if val != self.progress_val: + self.progress_val = val + self.queue_draw() + + def set_counter_visible(self, is_visible): + """ + Update the counter visibility and cause the app's icon to be + redrawn + + Args: + is_visible : whether the counter is to be displayed + """ + + # if the new value is the same as the old, then there's no need + # to do anything... + if is_visible != self.show_count: + self.show_count = bool(is_visible) + self.queue_draw() + + def set_counter_value(self, val): + """ + Update the counter value and cause the app's icon to be + redrawn + + Args: + val : the counter value + """ + + # if the new counter value is the same as the old, then there's no need + # to do anything... + if val != self.count_val: + self.count_val = val + self.queue_draw() + + def main(): """Main function. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-dock-applet-0.73/src/dom_color.in new/mate-dock-applet-0.74/src/dom_color.in --- old/mate-dock-applet-0.73/src/dom_color.in 2016-07-20 09:17:33.000000000 +0200 +++ new/mate-dock-applet-0.74/src/dom_color.in 2016-08-24 09:18:29.000000000 +0200 @@ -19,7 +19,13 @@ colour_tuple = [None, None, None] for channel in range(3): # Get data for one channel at a time - pixels = image.getdata(band=channel) + + # in case of errors stop processing and return black as the + # dominant colour + try: + pixels = image.getdata(band=channel) + except ValueError: + return "000000" values = [] for pixel in pixels:

1 0

commit f2fs-tools for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package f2fs-tools for openSUSE:Factory checked in at 2016-08-31 00:10:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/f2fs-tools (Old) and /work/SRC/openSUSE:Factory/.f2fs-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "f2fs-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/f2fs-tools/f2fs-tools.changes 2016-01-26 10:15:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.f2fs-tools.new/f2fs-tools.changes 2016-08-31 00:11:41.000000000 +0200 @@ -1,0 +2,28 @@ +Sun Aug 28 12:14:21 UTC 2016 - jengelh(a)inai.de + +- Trim filelists, update descriptions, move symlink collection into + their own subpackage. + +------------------------------------------------------------------- +Sun Aug 28 11:00:18 UTC 2016 - mpluskal(a)suse.com + +- Update to version 1.7: + * mkfs: define DISCARD/SECDISCARD macro + * dump.f2fs: show inode->i_dir_level + * f2fs.fsck: fix endianess + * fsck.f2fs: correct variable type and name + * fsck.f2fs: fix typo + * fsck.f2fs: free nat entry cache + * f2fs-tools: update the format of output message + * fsck.f2fs: clean up duplicated code + * fsck: recover symlink with zero i_size + * f2fs-tools: release 1.7.0 +- Add f2fs-tools-1.4.0-bigendian.patch (from Fedora) +- Use _service to fetch release from upstream git +- Split lib packages and create devel package (as andoid tools + need it) +- Link binaries from /usr/sbin to /sbin, many tools expect fsck + and friends to be in /sbin +- Supplement f2fs filesystem + +------------------------------------------------------------------- Old: ---- f2fs-tools-1.6.0.tar.xz New: ---- _service f2fs-tools-1.4.0-bigendian.patch f2fs-tools-1.7.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ f2fs-tools.spec ++++++ --- /var/tmp/diff_new_pack.uIFurV/_old 2016-08-31 00:11:44.000000000 +0200 +++ /var/tmp/diff_new_pack.uIFurV/_new 2016-08-31 00:11:44.000000000 +0200 @@ -17,55 +17,107 @@ Name: f2fs-tools -Version: 1.6.0 +Version: 1.7.0 Release: 0 Summary: Utilities for the Flash-friendly Filesystem (F2FS) License: GPL-2.0 and LGPL-2.1 Group: System/Filesystems -Url: http://f2fs-tools.sf.net/_(disused) - -#Snapshot: v1.6.0 -#Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools -#DL-URL: no pre-made tarballs provided +Url: https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git Source: %name-%version.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch1: f2fs-tools-1.4.0-bigendian.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: xz +BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(uuid) +Supplements: filesystem(f2fs) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Utilities needed to create and maintain F2 filesystems. +Utilities needed to create and maintain so-called Flash-Friendly (F2) +filesystems. + +%package -n libf2fs1 +Summary: Library to manipulate F2 filesystems +Group: System/Libraries + +%description -n libf2fs1 +This package contains a shared library used for manipulation of F2 +filesystems. + +%package -n libf2fs_format0 +Summary: Library to create F2 filesystems +Group: System/Libraries + +%description -n libf2fs_format0 +This package contains a shared library to format F2 filesystems. + +%package compat +Summary: f2fs utility compatibility symlinks +Group: System/Filesystem +BuildArch: noarch + +%description compat +This subpackage contains symbolic links /sbin/fsck.* and /sbin/mkfs.* +needed for programs that assume these locations. + +%package devel +Summary: Development files for f2fs +Group: Development/Languages/C and C++ +Requires: libf2fs1 = %version +Requires: libf2fs_format0 = %version + +%description devel +This package contains development files for %name. %prep -%setup -qn %name +%setup -q +%patch -P 1 -p1 %build -if [ ! -e configure ]; then - autoreconf -fi -fi +autoreconf -fiv %configure --disable-static -make %{?_smp_mflags} sbindir="%_sbindir" - -%install -b="%buildroot" -%make_install sbindir="%_sbindir" -# The devel files are quite useless at this time without public headers. -rm -f "$b/%_libdir"/*.{la,so} -# This is a useless library which just incorporates mkfs verbatim -rm -f "$b/%_libdir"/libf2fs_format* +make %{?_smp_mflags} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%install -p /bin/bash +%make_install +find %buildroot -type f -name "*.la" -delete -print + +mkdir -p "%buildroot/sbin" "%buildroot/%_includedir" +ln -sf "%_sbindir"/{defrag.f2fs,dump.f2fs,f2fstat,fibmap.f2fs,fsck.f2fs,mkfs.f2fs,parse.f2fs,resize.f2fs,sload.f2fs} "%buildroot/sbin/" +# for android-tools… this is of course totally untested. +# The shared library for example has a "main" symbol :-/ +cp -a include/f2fs_fs.h mkfs/f2fs_format_utils.h \ + "%buildroot/%_includedir/" + +%post -n libf2fs1 -p /sbin/ldconfig +%postun -n libf2fs1 -p /sbin/ldconfig +%post -n libf2fs_format0 -p /sbin/ldconfig +%postun -n libf2fs_format0 -p /sbin/ldconfig %files %defattr(-,root,root) -%_sbindir/f2fstat -%_sbindir/*.f2fs -%_libdir/libf2fs*.so.* -%_mandir/man8/* %doc COPYING +%_sbindir/* +%_mandir/man8/* + +%files -n libf2fs1 +%defattr(-,root,root) +%_libdir/libf2fs.so.* + +%files -n libf2fs_format0 +%defattr(-,root,root) +%_libdir/libf2fs_format.so.* + +%files compat +%defattr(-,root,root) +/sbin/* + +%files devel +%defattr(-,root,root) +%_includedir/*.h +%_libdir/libf2fs*.so %changelog ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="filename">f2fs-tools</param> <param name="version">1.7.0</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version"/> </services> ++++++ f2fs-tools-1.4.0-bigendian.patch ++++++ --- include/f2fs_fs.h | 1 + 1 file changed, 1 insertion(+) Index: f2fs-tools-1.7.0/include/f2fs_fs.h =================================================================== --- f2fs-tools-1.7.0.orig/include/f2fs_fs.h +++ f2fs-tools-1.7.0/include/f2fs_fs.h @@ -95,6 +95,7 @@ static inline uint64_t bswap_64(uint64_t #define cpu_to_le32(x) ((__u32)(x)) #define cpu_to_le64(x) ((__u64)(x)) #elif __BYTE_ORDER == __BIG_ENDIAN +#include <byteswap.h> #define le16_to_cpu(x) bswap_16(x) #define le32_to_cpu(x) bswap_32(x) #define le64_to_cpu(x) bswap_64(x) ++++++ f2fs-tools-1.6.0.tar.xz -> f2fs-tools-1.7.0.tar.xz ++++++ ++++ 7207 lines of diff (skipped)

1 0

commit gitg for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package gitg for openSUSE:Factory checked in at 2016-08-31 00:10:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gitg (Old) and /work/SRC/openSUSE:Factory/.gitg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gitg" Changes: -------- --- /work/SRC/openSUSE:Factory/gitg/gitg.changes 2016-06-25 02:23:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gitg.new/gitg.changes 2016-08-31 00:11:39.000000000 +0200 @@ -1,0 +2,11 @@ +Sat Aug 27 16:49:49 UTC 2016 - zaitor(a)opensuse.org + +- Update to version 3.20.2: + + Set primary selection to selected commit SHA1. + + Scrollable commit message in diff view. + + Incremental loading on large repositories. + + Faster switching of large repositories. + + Create global git config if it does not exist yet. + + Remember opened projects regardless of gnome privacy settings. + +------------------------------------------------------------------- Old: ---- gitg-3.20.1.tar.xz New: ---- gitg-3.20.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gitg.spec ++++++ --- /var/tmp/diff_new_pack.CJaIvT/_old 2016-08-31 00:11:40.000000000 +0200 +++ /var/tmp/diff_new_pack.CJaIvT/_new 2016-08-31 00:11:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: gitg -Version: 3.20.1 +Version: 3.20.2 Release: 0 Summary: Git repository viewer License: GPL-2.0+ ++++++ gitg-3.20.1.tar.xz -> gitg-3.20.2.tar.xz ++++++ ++++ 290175 lines of diff (skipped)

1 0

commit tomboy for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package tomboy for openSUSE:Factory checked in at 2016-08-31 00:10:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomboy (Old) and /work/SRC/openSUSE:Factory/.tomboy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tomboy" Changes: -------- --- /work/SRC/openSUSE:Factory/tomboy/tomboy.changes 2016-07-21 08:17:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tomboy.new/tomboy.changes 2016-08-31 00:11:36.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Aug 26 11:35:36 UTC 2016 - dimstar(a)opensuse.org + +- Update to version 1.15.5: + + gitignore additions for newer autotools, Visual Studio. + + Updated FSF address. + + Updated DOAP file: corrected URLs, added category, description + and programming-language. + + Use gacutil when searching for Mono.Cairo in configure instead + of hardcoded paths. + + Fix icon loading on Windows (bgo#734399). + + Help corrections: index and pin-notes pages (bgo#730502). + + Typo fixes in tomboy.schemas.in and FuseSyncServiceAddin. + + Updated translations. +- Drop hot-patch to look for mono libraries in different locations: + Upstream now correctly uses gacutil. + +------------------------------------------------------------------- Old: ---- tomboy-1.15.4.tar.xz New: ---- tomboy-1.15.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomboy.spec ++++++ --- /var/tmp/diff_new_pack.cOMnL2/_old 2016-08-31 00:11:38.000000000 +0200 +++ /var/tmp/diff_new_pack.cOMnL2/_new 2016-08-31 00:11:38.000000000 +0200 @@ -19,7 +19,7 @@ %define build_applet 0 Name: tomboy -Version: 1.15.4 +Version: 1.15.5 Release: 0 Summary: GNOME Note Taking Application License: LGPL-2.1+ @@ -79,10 +79,6 @@ %build autoreconf -f -i -if [ ! -d %{_libexecdir}/mono/2.0 -a -d %{_libexecdir}/mono/2.0-api ]; then - # Mono moved the 2.0 API files from mono/2.0 to mono/2.0-api - hotpatch configure - sed -i "s|mono/2.0/|mono/2.0-api/|g" configure -fi %configure\ --disable-schemas-install\ --disable-scrollkeeper\ ++++++ tomboy-1.15.4.tar.xz -> tomboy-1.15.5.tar.xz ++++++ /work/SRC/openSUSE:Factory/tomboy/tomboy-1.15.4.tar.xz /work/SRC/openSUSE:Factory/.tomboy.new/tomboy-1.15.5.tar.xz differ: char 25, line 1

1 0

commit libgda for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libgda for openSUSE:Factory checked in at 2016-08-31 00:10:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgda (Old) and /work/SRC/openSUSE:Factory/.libgda.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgda" Changes: -------- --- /work/SRC/openSUSE:Factory/libgda/libgda.changes 2016-07-20 09:29:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgda.new/libgda.changes 2016-08-31 00:11:31.000000000 +0200 @@ -7,0 +8,5 @@ +Fri Apr 15 01:40:44 UTC 2016 - mgorse(a)suse.com + +- Update to GNOME 3.20 Fate#318572 + +------------------------------------------------------------------- @@ -823,13 +828,13 @@ - + This is a major re-write of the core parts of Libgda, and is API - incompatible with the 3.x versions. Changes include: - - Easier to understand and to use API, with less strange path usage - - Reduce the size of the library (almost half the size, half the symbols) - - Easier connection opening (removal of the GdaClient object) - - Merge of the GdaQuery and GdaCommand into only one object to represent - statements - - New adaptative SQL parser (can be adaptated to each DBMS's SQL syntax) - - New database based dictionary which can handle namespaces - - Rework of the database adaptators (providers) for easier maintenance and - more features - - Sample "skeleton" database adaptators to make it easy to write a database - adaptator for a new database type + + This is a major re-write of the core parts of Libgda, and is + API incompatible with the 3.x versions. Changes include: + - Easier to understand and to use API, with less strange path + usage - Reduce the size of the library (almost half the + size, half the symbols) - Easier connection opening (removal + of the GdaClient object) - Merge of the GdaQuery and + GdaCommand into only one object to represent statements + - New adaptative SQL parser (can be adaptated to each DBMS's + SQL syntax) - New database based dictionary which can + handle namespaces - Rework of the database adaptators + (providers) for easier maintenance and more features + - Sample "skeleton" database adaptators to make it easy to + write a database adaptator for a new database type @@ -838,3 +843,3 @@ - + Preliminary MacOS X support, and better support for cross compilation - + New JDBC provider (allows access to any database through a JDBC driver) - NOTE: This is currently not built. + + Preliminary MacOS X support, and better support for cross + compilation + New JDBC provider (allows access to any database + through a JDBC driver) NOTE: This is currently not built. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit mtd-utils for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package mtd-utils for openSUSE:Factory checked in at 2016-08-31 00:10:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mtd-utils (Old) and /work/SRC/openSUSE:Factory/.mtd-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mtd-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/mtd-utils/mtd-utils.changes 2016-04-28 16:56:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mtd-utils.new/mtd-utils.changes 2016-08-31 00:11:29.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Aug 28 14:48:27 UTC 2016 - mpluskal(a)suse.com + +- Supplement jffs2 and ubifs filesystems + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mtd-utils.spec ++++++ --- /var/tmp/diff_new_pack.Cw93Ty/_old 2016-08-31 00:11:31.000000000 +0200 +++ /var/tmp/diff_new_pack.Cw93Ty/_new 2016-08-31 00:11:31.000000000 +0200 @@ -27,10 +27,12 @@ Source1: ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-%{version}.tar.bz2.asc Source2: %{name}.keyring BuildRequires: libacl-devel -BuildRequires: libuuid-devel BuildRequires: lzo-devel -BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig +BuildRequires: pkgconfig(uuid) +BuildRequires: pkgconfig(zlib) +Supplements: filesystem(jffs2) +Supplements: filesystem(ubifs) %description This package contains tools for erasing and formatting flash devices, @@ -43,7 +45,7 @@ make %{?_smp_mflags} CC="cc %{optflags}" V=1 %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install +%make_install %files %defattr(-,root,root)

1 0

commit plasma5-sdk for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package plasma5-sdk for openSUSE:Factory checked in at 2016-08-31 00:10:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-sdk (Old) and /work/SRC/openSUSE:Factory/.plasma5-sdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma5-sdk" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-sdk/plasma5-sdk.changes 2016-08-13 18:30:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-sdk.new/plasma5-sdk.changes 2016-08-31 00:11:28.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Aug 26 20:36:41 UTC 2016 - fabian(a)ritter-vogt.de + +- Update to 5.7.4 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.4.php + +------------------------------------------------------------------- +Fri Aug 12 23:44:28 UTC 2016 - hrvoje.senjan(a)gmail.com + +- Adjust filelist for the plasmoid appdata, installed with KF > 5.25.0 + +------------------------------------------------------------------- Old: ---- plasma-sdk-5.7.3.tar.xz New: ---- plasma-sdk-5.7.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-sdk.spec ++++++ --- /var/tmp/diff_new_pack.Bay8kg/_old 2016-08-31 00:11:29.000000000 +0200 +++ /var/tmp/diff_new_pack.Bay8kg/_new 2016-08-31 00:11:29.000000000 +0200 @@ -18,7 +18,7 @@ %bcond_without lang Name: plasma5-sdk -Version: 5.7.3 +Version: 5.7.4 Release: 0 Summary: Plasma SDK License: LGPL-2.0+ @@ -30,26 +30,26 @@ BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: kf5-filesystem BuildRequires: xz -BuildRequires: cmake(KF5Archive) -BuildRequires: cmake(KF5Completion) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5Declarative) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5ItemModels) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5NewStuff) -BuildRequires: cmake(KF5Parts) -BuildRequires: cmake(KF5Plasma) -BuildRequires: cmake(KF5PlasmaQuick) -BuildRequires: cmake(KF5Service) -BuildRequires: cmake(KF5TextEditor) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(KF5WindowSystem) -BuildRequires: cmake(KF5XmlGui) +BuildRequires: cmake(KF5Archive) >= 5.25.0 +BuildRequires: cmake(KF5Completion) >= 5.25.0 +BuildRequires: cmake(KF5Config) >= 5.25.0 +BuildRequires: cmake(KF5ConfigWidgets) >= 5.25.0 +BuildRequires: cmake(KF5CoreAddons) >= 5.25.0 +BuildRequires: cmake(KF5DBusAddons) >= 5.25.0 +BuildRequires: cmake(KF5Declarative) >= 5.25.0 +BuildRequires: cmake(KF5I18n) >= 5.25.0 +BuildRequires: cmake(KF5IconThemes) >= 5.25.0 +BuildRequires: cmake(KF5ItemModels) >= 5.25.0 +BuildRequires: cmake(KF5KIO) >= 5.25.0 +BuildRequires: cmake(KF5NewStuff) >= 5.25.0 +BuildRequires: cmake(KF5Parts) >= 5.25.0 +BuildRequires: cmake(KF5Plasma) >= 5.25.0 +BuildRequires: cmake(KF5PlasmaQuick) >= 5.25.0 +BuildRequires: cmake(KF5Service) >= 5.25.0 +BuildRequires: cmake(KF5TextEditor) >= 5.25.0 +BuildRequires: cmake(KF5WidgetsAddons) >= 5.25.0 +BuildRequires: cmake(KF5WindowSystem) >= 5.25.0 +BuildRequires: cmake(KF5XmlGui) >= 5.25.0 BuildRequires: cmake(Qt5Core) >= 5.4.0 BuildRequires: cmake(Qt5DBus) >= 5.4.0 BuildRequires: cmake(Qt5Gui) >= 5.4.0 @@ -133,10 +133,7 @@ %dir %{_kf5_iconsdir}/hicolor/* %dir %{_kf5_iconsdir}/hicolor/*/* %{_kf5_iconsdir}/*/*/*/*.* -%if 0%{?suse_version} <= 1320 -%dir %{_kf5_appstreamdir} -%endif -%{_kf5_appstreamdir}/org.kde.cuttlefish.appdata.xml +%{_kf5_appstreamdir}/ %files -n plasmaengineexplorer5 %defattr(-,root,root) ++++++ plasma-sdk-5.7.3.tar.xz -> plasma-sdk-5.7.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-sdk-5.7.3/CMakeLists.txt new/plasma-sdk-5.7.4/CMakeLists.txt --- old/plasma-sdk-5.7.3/CMakeLists.txt 2016-08-02 11:47:31.000000000 +0200 +++ new/plasma-sdk-5.7.4/CMakeLists.txt 2016-08-23 14:57:46.000000000 +0200 @@ -1,5 +1,5 @@ project(plasma-sdk) -set(PROJECT_VERSION "5.7.3") +set(PROJECT_VERSION "5.7.4") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-sdk-5.7.3/cuttlefish/org.kde.cuttlefish.appdata.xml new/plasma-sdk-5.7.4/cuttlefish/org.kde.cuttlefish.appdata.xml --- old/plasma-sdk-5.7.3/cuttlefish/org.kde.cuttlefish.appdata.xml 2016-08-02 11:47:04.000000000 +0200 +++ new/plasma-sdk-5.7.4/cuttlefish/org.kde.cuttlefish.appdata.xml 2016-08-23 14:57:10.000000000 +0200 @@ -8,9 +8,12 @@ <name xml:lang="ca-valencia">Cuttlefish</name> <name xml:lang="da">Cuttlefish</name> <name xml:lang="de">Cuttlefish</name> + <name xml:lang="en-GB">Cuttlefish</name> <name xml:lang="es">Cuttlefish</name> + <name xml:lang="et">Cuttlefish</name> <name xml:lang="fi">Cuttlefish</name> <name xml:lang="gl">Cuttlefish</name> + <name xml:lang="it">Cuttlefish</name> <name xml:lang="nl">Cuttlefish</name> <name xml:lang="nn">Cuttlefish</name> <name xml:lang="pl">Cuttlefish</name> @@ -29,9 +32,12 @@ <summary xml:lang="ca">Vista prèvia de les icones pels artistes i desenvolupadors</summary> <summary xml:lang="ca-valencia">Vista prèvia de les icones pels artistes i desenvolupadors</summary> <summary xml:lang="de">Symbolvorschau für Künstler und Entwickler</summary> + <summary xml:lang="en-GB">Icon Previewer for Artists and Developers</summary> <summary xml:lang="es">Vista previa de iconos para artistas y desarrolladores</summary> + <summary xml:lang="et">Ikoonide eelvaatlus kunstnikele ja arendajatele</summary> <summary xml:lang="fi">Kuvakkeiden esikatselu graafikoille ja kehittäjille</summary> <summary xml:lang="gl">Visor de iconas para artistas e desenvolvedores</summary> + <summary xml:lang="it">Visore di anteprime di icone per artisti e sviluppatori</summary> <summary xml:lang="nl">Pictogramviewer voor kunstenaars en ontwikkelaars</summary> <summary xml:lang="nn">Førehandsvising av ikon for kunstnarar og utviklarar</summary> <summary xml:lang="pl">Podglądanie ikon dla artystów i programistów</summary> @@ -52,8 +58,11 @@ El Cuttlefish permet als artistes i als desenvolupadors previsualitzar i seleccionar icones. El Cuttlefish intenta representar les icones exactament com es dibuixaran a l'aplicació. Permet filtrar segons la categoria i el nom. El Cuttlefish no és una eina de propòsit general, si no destinada als casos d'ús d'artistes i desenvolupadors. El Cuttlefish també proporciona un connector pel Kate i el KDevelop per ser usat com a selector d'icones. El Cuttlefish permet als artistes i als desenvolupadors previsualitzar i seleccionar icones. El Cuttlefish intenta representar les icones exactament com es dibuixaran a l'aplicació. Permet filtrar segons la categoria i el nom. El Cuttlefish no és una eina de propòsit general, si no destinada als casos d'ús d'artistes i desenvolupadors. El Cuttlefish també proporciona un connector pel Kate i el KDevelop per ser usat com a selector d'icones. + Cuttlefish allows artists and developers to preview and pick icons. Cuttlefish attempts to render the icons exactly as they would look drawn in the application. It allows to filter based on category and name. Cuttlefish is not a general-purpose tool, but geared towards artists' and developers' use-cases. Cuttlefish also provides a plugin for Kate and KDevelop to be used as icon picker. Cuttlefish permite a los artistas y a los desarrolladores obtener vistas previas de iconos y seleccionarlos. Cuttlefish trata de visualizar los iconos tal y como se verían en la aplicación. Permite filtrarlos por su categoría y por su nombre. Cuttlefish no es una herramienta de uso general, ya que está pensada para que la usen artistas y desarrolladores. Cuttlefish también proporciona un complemento para Kate y para KDevelop que se puede usar como selector de iconos. + Cuttlefish annab kunstnikele ja arendajatele võimaluse näha ikoonide eelvaatlust ja neid siis enda tarbeks välja valida. Cuttlefish püüab ikoone näidata täpselt sellisena, nagu need oleksid näha vastavas rakenduses. Ikoone on võimalik filtreerida kategooria ja nime järgi. Cuttlefish ei ole nii-öelda tavakasutajale mõeldud rakendus, vaid sihtrühmana nähakse eelkõige kunstnikke ja arendajaid. Samuti pakub Cuttlefish Katele ja KDevelopile pluginat, mida saab kasutada ikoonide valimiseks. Cuttlefish permite que artistas e desenvolvedores observen e seleccionen iconas. Cuttlefish intenta mostrar as iconas tal e como aparecerían nun programa. Permite filtrar por nome e por categoría. Cuttlefish non é unha ferramentas de uso xeral, senón que está pensada específicamente para casos de uso de artistas e desenvolvedores. Cuttlefish tamén fornece un complemento para usalo como selector de iconas en Kate e KDevelop. + Cuttlefish permette agli artisti ed agli sviluppatori di visualizzare anteprime e scegliere icone. Cuttlefish tenta di mostrare l'icona esattamente per come apparirebbe all'interno dell'applicazione. Permette di filtrare in base alla categoria ed al nome. Cuttlefish non è uno strumento di uso generico, ma indirizzato ai casi d'uso di artisti e sviluppatori. Cuttlefish fornisce inoltre un'estensione per Kate e KDevelop che permette la selezione di icone. Cuttlefish biedt artiesten en ontwikkelaars om pictogrammen te kiezen en te bekijken. Cuttlefish probeert de pictogrammen exact weer te geven zoals ze er uit zouden zien in de toepassing. Het biedt filtering gebaseerd op categorie en naam. Cuttlefish is geen hulpmiddel voor algemeen gebruik, maar is toegespitst op gebruik door artiesten en ontwikkelaars. Cuttlefish biedt ook een plug-in voor Kate en KDevelop om te worden gebruikt als kiezer voor pictogrammen. Cuttlefish lèt kunstnarar og utviklarar sjå gjennom og velja ikon. Cuttlefish prøver å visa ikona akkurat slik dei vert viste i programma. Du kan òg filtrera på kategori eller namn. Cuttlefish er ikkje eit vanleg sluttbrukarprogram, men er retta mot kunstnarar og utviklarar. Det har òg Kate- og KDevelop-tillegg for veljing av ikon. Cuttlefish daje artystom i programistom podgląd i możliwość wyboru ikon. Cuttlefish wyświetla ikony dokładnie tak jak będą one wyświetlane w aplikacji. Umożliwia filtrowanie na podstawie kategorii i nazwy. Cuttlefish nie jest narzędziem ogólnego przeznaczenia, lecz przystosowanym do pracy artystów i programistów. Cuttlefish dostarcza także wtyczki dla Kate oraz KDevelop. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-sdk-5.7.3/po/ca/plasmate.po new/plasma-sdk-5.7.4/po/ca/plasmate.po --- old/plasma-sdk-5.7.3/po/ca/plasmate.po 2016-08-02 11:47:08.000000000 +0200 +++ new/plasma-sdk-5.7.4/po/ca/plasmate.po 2016-08-23 14:57:15.000000000 +0200 @@ -1,17 +1,17 @@ # Translation of plasmate.po to Catalan -# Copyright (C) 2014-2015 This_file_is_part_of_KDE +# Copyright (C) 2014-2016 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # -# Antoni Bella Pérez <antonibella5(a)yahoo.com>, 2014, 2015. +# Antoni Bella Pérez <antonibella5(a)yahoo.com>, 2014, 2015, 2016. # Josep Ma. Ferrer <txemaq(a)gmail.com>, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: plasmate\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2015-10-27 10:17+0000\n" -"PO-Revision-Date: 2015-05-29 15:49+0200\n" -"Last-Translator: Josep Ma. Ferrer <txemaq(a)gmail.com>\n" +"PO-Revision-Date: 2016-08-16 15:43+0100\n" +"Last-Translator: Antoni Bella Pérez <antonibella5(a)yahoo.com>\n" "Language-Team: Catalan <kde-i18n-ca(a)kde.org>\n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -19,11 +19,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Antoni Bella Pérez" +msgstr "Antoni Bella" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-sdk-5.7.3/po/ca(a)valencia/plasmate.po new/plasma-sdk-5.7.4/po/ca(a)valencia/plasmate.po --- old/plasma-sdk-5.7.3/po/ca(a)valencia/plasmate.po 2016-08-02 11:47:08.000000000 +0200 +++ new/plasma-sdk-5.7.4/po/ca(a)valencia/plasmate.po 2016-08-23 14:57:15.000000000 +0200 @@ -1,17 +1,17 @@ # Translation of plasmate.po to Catalan (Valencian) -# Copyright (C) 2014-2015 This_file_is_part_of_KDE +# Copyright (C) 2014-2016 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # -# Antoni Bella Pérez <antonibella5(a)yahoo.com>, 2014, 2015. +# Antoni Bella Pérez <antonibella5(a)yahoo.com>, 2014, 2015, 2016. # Josep Ma. Ferrer <txemaq(a)gmail.com>, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: plasmate\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2015-10-27 10:17+0000\n" -"PO-Revision-Date: 2015-05-29 15:49+0200\n" -"Last-Translator: Josep Ma. Ferrer <txemaq(a)gmail.com>\n" +"PO-Revision-Date: 2016-08-16 15:43+0100\n" +"Last-Translator: Antoni Bella Pérez <antonibella5(a)yahoo.com>\n" "Language-Team: Catalan <kde-i18n-ca(a)kde.org>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" @@ -19,11 +19,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Antoni Bella Pérez" +msgstr "Antoni Bella" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-sdk-5.7.3/po/de/org.kde.plasma.themeexplorer.po new/plasma-sdk-5.7.4/po/de/org.kde.plasma.themeexplorer.po --- old/plasma-sdk-5.7.3/po/de/org.kde.plasma.themeexplorer.po 2016-08-02 11:47:09.000000000 +0200 +++ new/plasma-sdk-5.7.4/po/de/org.kde.plasma.themeexplorer.po 2016-08-23 14:57:17.000000000 +0200 @@ -5,7 +5,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2016-04-09 08:03+0000\n" -"PO-Revision-Date: 2016-04-10 20:01+0100\n" +"PO-Revision-Date: 2016-08-20 14:16+0100\n" "Last-Translator: Frederik Schwarzer <schwarzer(a)kde.org>\n" "Language-Team: German <kde-i18n-de(a)kde.org>\n" "Language: de\n" @@ -280,7 +280,7 @@ #: src/main.cpp:46 msgid "Plasma Theme Explorer" -msgstr "Plasma-Designexplorer" +msgstr "Plasma-Erscheinungsbild-Betrachter" #: src/main.cpp:54 msgid "The theme to open" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-sdk-5.7.3/po/es/plasmawallpaperviewer.po new/plasma-sdk-5.7.4/po/es/plasmawallpaperviewer.po --- old/plasma-sdk-5.7.3/po/es/plasmawallpaperviewer.po 2016-08-02 11:47:11.000000000 +0200 +++ new/plasma-sdk-5.7.4/po/es/plasmawallpaperviewer.po 2016-08-23 14:57:18.000000000 +0200 @@ -2,15 +2,15 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Eloy Cuadra <ecuadra(a)eloihr.net>, 2009, 2012, 2013. +# Eloy Cuadra <ecuadra(a)eloihr.net>, 2009, 2012, 2013, 2016. # Javier Viñal <fjvinal(a)gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: plasmawallpaperviewer\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2015-10-27 10:17+0000\n" -"PO-Revision-Date: 2013-07-24 16:23+0200\n" -"Last-Translator: Javier Viñal <fjvinal(a)gmail.com>\n" +"PO-Revision-Date: 2016-08-07 12:14+0200\n" +"Last-Translator: Eloy Cuadra <ecuadra(a)eloihr.net>\n" "Language-Team: Spanish <kde-l10n-es(a)kde.org>\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -82,7 +82,7 @@ #: main.cpp:114 msgid "List all the known wallpapers and their modes" -msgstr "Lista todos los fondos de escritorio conocidos y sus modos" +msgstr "Listar todos los fondos de escritorio conocidos y sus modos" #: main.cpp:115 msgid "Open configuration dialog additionally to show the wallpaper plugin" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-sdk-5.7.3/po/it/cuttlefish.po new/plasma-sdk-5.7.4/po/it/cuttlefish.po --- old/plasma-sdk-5.7.3/po/it/cuttlefish.po 2016-08-02 11:47:16.000000000 +0200 +++ new/plasma-sdk-5.7.4/po/it/cuttlefish.po 2016-08-23 14:57:25.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the cuttlefish package. # Simone Solinas <ksolsim(a)gmail.com>, 2015. # Luigi Toscano <luigi.toscano(a)tiscali.it>, 2016. # @@ -8,7 +8,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2015-12-30 07:13+0000\n" -"PO-Revision-Date: 2016-02-08 23:09+0100\n" +"PO-Revision-Date: 2016-07-31 20:40+0200\n" "Last-Translator: Luigi Toscano <luigi.toscano(a)tiscali.it>\n" "Language-Team: Italian <kde-i18n-it(a)kde.org>\n" "Language: it\n" @@ -52,7 +52,7 @@ #: package/contents/ui/Preview.qml:223 msgid "Copy icon name to clipboard" -msgstr "Copia il nome dell'icona negli appunti" +msgstr "Copia il nome dell'icona negli appunti" #: package/contents/ui/Preview.qml:229 msgid "Insert QtQuick code" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-sdk-5.7.3/po/ru/plasmate.po new/plasma-sdk-5.7.4/po/ru/plasmate.po --- old/plasma-sdk-5.7.3/po/ru/plasmate.po 2016-08-02 11:47:23.000000000 +0200 +++ new/plasma-sdk-5.7.4/po/ru/plasmate.po 2016-08-23 14:57:35.000000000 +0200 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. +# # Alexander Potashev <aspotashev(a)gmail.com>, 2011, 2016. # Alexander Lakhin <exclusion(a)gmail.com>, 2013. -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2015-10-27 10:17+0000\n" -"PO-Revision-Date: 2016-06-08 02:04+0300\n" +"PO-Revision-Date: 2016-08-15 03:04+0300\n" "Last-Translator: Alexander Potashev <aspotashev(a)gmail.com>\n" "Language-Team: Russian <kde-russian(a)lists.kde.ru>\n" "Language: ru\n" @@ -138,13 +138,11 @@ #: app/plasmateextention.cpp:49 msgid "Code" -msgstr "" +msgstr "Код" #: app/plasmateextention.cpp:60 -#, fuzzy -#| msgid "Close Project" msgid "Plasmate Project Files" -msgstr "Закрыть проект" +msgstr "Файлы проектов Plasmate" #. i18n: ectx: Menu (edit) #: app/plasmateui.rc:6 @@ -156,7 +154,7 @@ #: app/plasmateui.rc:19 msgctxt "@title:menu" msgid "Editor" -msgstr "" +msgstr "Редактор" #. i18n: ectx: Menu (navigation) #: app/plasmateui.rc:24 @@ -851,11 +849,11 @@ #: publisher/publisher.cpp:74 msgid "Save" -msgstr "" +msgstr "Сохранить" #: publisher/publisher.cpp:74 msgid "Plasmoid (*.plasmoid)" -msgstr "" +msgstr "Виджеты Plasma (*.plasmoid)" #: publisher/publisher.cpp:130 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-sdk-5.7.3/themeexplorer/package/metadata.desktop new/plasma-sdk-5.7.4/themeexplorer/package/metadata.desktop --- old/plasma-sdk-5.7.3/themeexplorer/package/metadata.desktop 2016-08-02 11:47:04.000000000 +0200 +++ new/plasma-sdk-5.7.4/themeexplorer/package/metadata.desktop 2016-08-23 14:57:10.000000000 +0200 @@ -30,9 +30,9 @@ Encoding=UTF-8 Keywords= Name=Plasma Theme Explorer -Name[ca]=Explora els temes de Plasma -Name[ca@valencia]=Explora els temes de Plasma -Name[de]=Plasma-Designexplorer +Name[ca]=Explorador pels temes del Plasma +Name[ca@valencia]=Explorador pels temes del Plasma +Name[de]=Plasma-Erscheinungsbild-Betrachter Name[en_GB]=Plasma Theme Explorer Name[es]=Explorador de temas de Plasma Name[et]=Plasma teemade uurija

1 0

commit kwrited5 for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kwrited5 for openSUSE:Factory checked in at 2016-08-31 00:10:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwrited5 (Old) and /work/SRC/openSUSE:Factory/.kwrited5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kwrited5" Changes: -------- --- /work/SRC/openSUSE:Factory/kwrited5/kwrited5.changes 2016-08-13 18:30:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kwrited5.new/kwrited5.changes 2016-08-31 00:11:27.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Aug 26 20:36:41 UTC 2016 - fabian(a)ritter-vogt.de + +- Update to 5.7.4 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.4.php + +------------------------------------------------------------------- Old: ---- kwrited-5.7.3.tar.xz New: ---- kwrited-5.7.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwrited5.spec ++++++ --- /var/tmp/diff_new_pack.ayuSKH/_old 2016-08-31 00:11:28.000000000 +0200 +++ /var/tmp/diff_new_pack.ayuSKH/_new 2016-08-31 00:11:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: kwrited5 -Version: 5.7.3 +Version: 5.7.4 Release: 0 Summary: Daemon listening for wall and write messages License: GPL-2.0+ ++++++ kwrited-5.7.3.tar.xz -> kwrited-5.7.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwrited-5.7.3/CMakeLists.txt new/kwrited-5.7.4/CMakeLists.txt --- old/kwrited-5.7.3/CMakeLists.txt 2016-08-02 11:41:21.000000000 +0200 +++ new/kwrited-5.7.4/CMakeLists.txt 2016-08-23 14:48:10.000000000 +0200 @@ -1,5 +1,5 @@ project(kwrited) -set(PROJECT_VERSION "5.7.3") +set(PROJECT_VERSION "5.7.4") cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) set(QT_MIN_VERSION "5.4.0") set(KF5_MIN_VERSION "5.10.0")

1 0

commit kgamma5 for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kgamma5 for openSUSE:Factory checked in at 2016-08-31 00:10:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kgamma5 (Old) and /work/SRC/openSUSE:Factory/.kgamma5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kgamma5" Changes: -------- --- /work/SRC/openSUSE:Factory/kgamma5/kgamma5.changes 2016-08-13 18:30:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kgamma5.new/kgamma5.changes 2016-08-31 00:11:25.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Aug 26 20:36:41 UTC 2016 - fabian(a)ritter-vogt.de + +- Update to 5.7.4 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.4.php + +------------------------------------------------------------------- Old: ---- kgamma5-5.7.3.tar.xz New: ---- kgamma5-5.7.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kgamma5.spec ++++++ --- /var/tmp/diff_new_pack.dNwBXG/_old 2016-08-31 00:11:26.000000000 +0200 +++ /var/tmp/diff_new_pack.dNwBXG/_new 2016-08-31 00:11:26.000000000 +0200 @@ -18,13 +18,13 @@ %bcond_without lang Name: kgamma5 -Version: 5.7.3 +Version: 5.7.4 Release: 0 Summary: Display gamma configuration License: GPL-2.0+ Group: Productivity/Graphics/Other Url: http://www.kde.org -Source0: %{name}-%{version}.tar.xz +Source: %{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules >= 1.0.0 BuildRequires: kf5-filesystem BuildRequires: xz ++++++ kgamma5-5.7.3.tar.xz -> kgamma5-5.7.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.7.3/CMakeLists.txt new/kgamma5-5.7.4/CMakeLists.txt --- old/kgamma5-5.7.3/CMakeLists.txt 2016-08-02 11:36:08.000000000 +0200 +++ new/kgamma5-5.7.4/CMakeLists.txt 2016-08-23 14:40:43.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8.9) project(kgamma) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) -set(PROJECT_VERSION "5.7.3") +set(PROJECT_VERSION "5.7.4") set(QT_MIN_VERSION "5.4.0") find_package(ECM 1.0.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

1 0

commit discover for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package discover for openSUSE:Factory checked in at 2016-08-31 00:10:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/discover (Old) and /work/SRC/openSUSE:Factory/.discover.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "discover" Changes: -------- --- /work/SRC/openSUSE:Factory/discover/discover.changes 2016-08-13 18:30:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.discover.new/discover.changes 2016-08-31 00:11:23.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Aug 26 20:36:41 UTC 2016 - fabian(a)ritter-vogt.de + +- Update to 5.7.4 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.4.php + +------------------------------------------------------------------- Old: ---- discover-5.7.3.tar.xz New: ---- discover-5.7.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ discover.spec ++++++ --- /var/tmp/diff_new_pack.z6MzJU/_old 2016-08-31 00:11:25.000000000 +0200 +++ /var/tmp/diff_new_pack.z6MzJU/_new 2016-08-31 00:11:25.000000000 +0200 @@ -18,13 +18,13 @@ %bcond_without lang Name: discover -Version: 5.7.3 +Version: 5.7.4 Release: 0 Summary: KDE Software Installer License: GPL-2.0 Group: System/GUI/KDE Url: https://quickgit.kde.org/?p=discover.git -Source0: %{name}-%{version}.tar.xz +Source: %{name}-%{version}.tar.xz BuildRequires: PackageKit-Qt5-devel BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules ++++++ discover-5.7.3.tar.xz -> discover-5.7.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/CMakeLists.txt new/discover-5.7.4/CMakeLists.txt --- old/discover-5.7.3/CMakeLists.txt 2016-08-02 11:33:09.000000000 +0200 +++ new/discover-5.7.4/CMakeLists.txt 2016-08-23 14:36:00.000000000 +0200 @@ -1,5 +1,5 @@ project(discover) -set(PROJECT_VERSION "5.7.3") +set(PROJECT_VERSION "5.7.4") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/discover/org.kde.discover.appdata.xml new/discover-5.7.4/discover/org.kde.discover.appdata.xml --- old/discover-5.7.3/discover/org.kde.discover.appdata.xml 2016-08-02 11:32:42.000000000 +0200 +++ new/discover-5.7.4/discover/org.kde.discover.appdata.xml 2016-08-23 14:33:56.000000000 +0200 @@ -11,6 +11,7 @@ <name xml:lang="de">Discover</name> <name xml:lang="en-GB">Discover</name> <name xml:lang="es">Discover</name> + <name xml:lang="et">Avastusretk</name> <name xml:lang="gl">Discover</name> <name xml:lang="it">Discover</name> <name xml:lang="nl">Ontdekken</name> @@ -18,6 +19,7 @@ <name xml:lang="pl">Odkrywca</name> <name xml:lang="pt">Discover</name> <name xml:lang="pt-BR">Discover</name> + <name xml:lang="ru">Центр приложений Discover</name> <name xml:lang="sk">Objaviť</name> <name xml:lang="sl">Programsko središče</name> <name xml:lang="sr">Oткривач</name> @@ -36,6 +38,7 @@ <summary xml:lang="de">Discover</summary> <summary xml:lang="en-GB">Discover</summary> <summary xml:lang="es">Discover</summary> + <summary xml:lang="et">Avastusretk</summary> <summary xml:lang="gl">Discover</summary> <summary xml:lang="it">Discover</summary> <summary xml:lang="nl">Ontdekken</summary> @@ -43,6 +46,7 @@ <summary xml:lang="pl">Odkrywca</summary> <summary xml:lang="pt">Discover</summary> <summary xml:lang="pt-BR">Discover</summary> + <summary xml:lang="ru">Центр приложений Discover</summary> <summary xml:lang="sk">Objaviť</summary> <summary xml:lang="sl">Programsko središče</summary> <summary xml:lang="sr">Oткривач</summary> @@ -59,6 +63,7 @@ Alguna vegada heu trobat una eina que era perfecta per a les vostres necessitats però l'heu vist després d'ensopegar-hi per la xarxa? Quan considereu instal·lar una aplicació, voleu saber si val la pena? O si és la que realment esteu cercant? Haven’t you ever found a tool that was perfect for your need but you only found it after some time stumbling upon it on the net? When considering to install an application, don’t you wonder sometimes if it’s really worth it? Or if it’s actually what you’re looking for? ¿Ha encontrado alguna vez una herramienta perfecta para sus necesidades aunque solo la ha encontrado tras perder un tiempo valioso en Internet? Cuando considera instalar una aplicación, ¿no se pregunta a veces si realmente merece la pena o si realmente es lo que estaba buscando? + Kahtlemata on sulgi ette tulnud, et oled leidnud täpselt sobiva ja vajaliku tööriista täiesti kogemata sellele internetis peale komistades. Või oled mõne rakenduse puhul kaalunud, kas ikka tasub seda üldse paigaldada või kas see on üldse see, mida sulle tegelikult vaja läheb. Nunca lle pasou que atopou unha ferramenta perfecta para o que necesitaba, pero que para atopala tivo que pasar un bo anaco buscando en internet? Á hora de instalar un programa, non se pregunta ás veces se paga a pena? Ou se realmente é o programa que está a buscar? Non hai mai trovato uno strumento che fosse perfetto per le tue esigenze, ma lo hai trovato solo dopo esserci incappato in Internet? Quando decidi se installare un'applicazione, non ti chiedi a volte se ne valga davvero la pena? O se è effettivamente ciò che stai cercando? Hebt u niet ooit een hulpmiddel gevonden dat perfect was voor uw behoefte maar dat u alleen na enige tijd toevallig vond op het internet? Bij de overweging om een toepassing te installeren, hebt u uzelf dan soms niet afgevraagd of het dat werkelijk waard was? Of of het echt was waarnaar u op zoek was? @@ -81,6 +86,7 @@ El Discover ajuda als usuaris a cercar aplicacions i eines fàcilment i ràpidament. Permet explorar una biblioteca de programari cercant per categories de programari, llistes més valorades, junt amb informació detallada que inclou captures de pantalla i ressenyes. Els usuaris poden cercar ràpidament aplicacions que s'ajusten a les seues necessitats. Discover helps users easily and quickly find applications or tools. By allowing to navigate a software library by search, software categories, top lists along with detailed application information that includes screenshots and reviews, users can more quickly find applications that suit their needs. Discover le ayuda a encontrar aplicaciones y herramientas de una forma rápida y fácil. Al poder explorar una biblioteca de software usando búsquedas, categorías de software y listas de puntuaciones, junto a una detallada información sobre las aplicaciones que incluye capturas de pantalla y comentarios, los usuarios pueden encontrar más rápidamente aplicaciones que satisfagan sus necesidades. + Avastusretk aitab kasutajatel kiiresti ja vähese vaevaga leida vajaliku tööriista või rakenduse. Kui kasutaja saab tarkvarakogus hõlpsasti ringi liikuda ja olemasolevat näha nii otsides, kategooriate kaupa või mitmel alusel järjestatavate edetabelite abil, kusjuures alati pakutakse rakenduste kohta põhjalikku teavet koos ekraanipiltide ja arvustustega, ei ole täpselt sobiva tööriista või rakenduse leidmine enam kuigi keeruline. Discover permite atopar programas e ferramentas de maneira fácil e rápida. Atope rapidamente programas que se axustan ás súas necesidades explorando a biblioteca de software mediante buscas, categorías de software, e listas de programas máis usados con información detallada dos programas, incluíndo capturas de pantalla e opinións de usuarios. Discover aiuta gli utenti a trovare in modo semplice e rapido applicazioni o strumenti. Permettendo di navigare una raccolta di software tramite ricerca, categorie di software, liste preferite oltre alle informazioni dettagliate sulle applicazioni che includono schermate e recensioni, gli utenti possono trovare più rapidamente applicazioni che si adattano alle loro esigenze. Discover helpt gebruikers om gemakkelijk en snel een toepassing of hulpmiddel te vinden. Door navigatie te bieden in een softwarebibliotheek door zoeken in softwarecategorieën, lijsten met toppers, samen met gedetailleerde informatie over toepassingen die schermafdrukken en reviews bevatten, kunnen gebruikers sneller toepassingen vinden die in hun behoeften voorzien. @@ -103,6 +109,7 @@ Per altra banda, el Discover permet gestionar les diferents fonts de programari que tingueu i gestionar les aplicacions que ja heu instal·lat en el passat però ja no desitgeu. Furthermore, Discover will let you manage the different sources of software you have and manage the applications you’ve already installed in the past but you don’t want anymore. Además, Discover le permite gestionar las distintas fuentes de software de las que disponga y las aplicaciones que ya hubiera instalado en el pasado y que ya no desee. + Lisaks laseb Avastusretk sul mitmekülgselt hallata kõiki sinu käsutuses olevaid tarkvaraallikaid ega jäta sind hätta ka siis, kui sul leidub tarkvara, mille oled kunagi paigaldanud, aga enam sugugi ei vaja. Ademais, Discover permitiralle xestionar as distintas fontes de software de que dispón e xestionar os programas que ten instalados pero que xa non lle interesan. Inoltre, Discover ti consentirà di gestire le diverse fonti del software disponibili e gestire le applicazioni che hai già installato in passato, ma che non ti servono più. Verder laat Discover u de verschillende bronnen van software die u hebt beheren, evenals de al eerder geïnstalleerde toepassingen maar die u niet meer wilt. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/notifier/DiscoverNotifier.cpp new/discover-5.7.4/notifier/DiscoverNotifier.cpp --- old/discover-5.7.3/notifier/DiscoverNotifier.cpp 2016-08-02 11:32:42.000000000 +0200 +++ new/discover-5.7.4/notifier/DiscoverNotifier.cpp 2016-08-23 14:33:56.000000000 +0200 @@ -114,9 +114,9 @@ { switch(state()) { case SecurityUpdates: - return QStringLiteral("update-low"); - case NormalUpdates: return QStringLiteral("update-high"); + case NormalUpdates: + return QStringLiteral("update-low"); case NoUpdates: return QStringLiteral("update-none"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/ar/libdiscover.po new/discover-5.7.4/po/ar/libdiscover.po --- old/discover-5.7.3/po/ar/libdiscover.po 2016-08-02 11:32:43.000000000 +0200 +++ new/discover-5.7.4/po/ar/libdiscover.po 2016-08-23 14:34:05.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: ٢٠١٥-٠٨-١٨ ١٤:٢٩+0300\n" "Last-Translator: Safa Alfulaij <safa1996alfulaij(a)gmail.com>\n" "Language-Team: Arabic <doc(a)arabeyes.org>\n" @@ -1744,6 +1744,13 @@ msgid "Testing" msgstr "اختباريّ" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "مجهول" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/ast/libdiscover.po new/discover-5.7.4/po/ast/libdiscover.po --- old/discover-5.7.3/po/ast/libdiscover.po 2016-08-02 11:32:43.000000000 +0200 +++ new/discover-5.7.4/po/ast/libdiscover.po 2016-08-23 14:34:04.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2015-12-07 18:36+0100\n" "Last-Translator: enolp <enolp(a)softastur.org>\n" "Language-Team: Asturian <>\n" @@ -1678,6 +1678,10 @@ msgid "Testing" msgstr "" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/bg/libdiscover.po new/discover-5.7.4/po/bg/libdiscover.po --- old/discover-5.7.3/po/bg/libdiscover.po 2016-08-02 11:32:44.000000000 +0200 +++ new/discover-5.7.4/po/bg/libdiscover.po 2016-08-23 14:34:11.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2014-05-12 21:14+0200\n" "Last-Translator: Svetoslav Stefanov <svetlisashkov(a)yahoo.com>\n" "Language-Team: BULGARIAN <kde-i18n-doc(a)kde.org>\n" @@ -1887,6 +1887,13 @@ msgid "Testing" msgstr "" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Неизвестен" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, fuzzy, kde-format #| msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/bs/libdiscover.po new/discover-5.7.4/po/bs/libdiscover.po --- old/discover-5.7.3/po/bs/libdiscover.po 2016-08-02 11:32:45.000000000 +0200 +++ new/discover-5.7.4/po/bs/libdiscover.po 2016-08-23 14:34:17.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2014-01-31 20:46+0100\n" "Last-Translator: Samir Ribić <megaribi(a)epn.ba>\n" "Language-Team: Bosnian <bs(a)li.org>\n" @@ -1811,6 +1811,13 @@ msgid "Testing" msgstr "" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Nepoznato" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, fuzzy, kde-format #| msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/ca/libdiscover.po new/discover-5.7.4/po/ca/libdiscover.po --- old/discover-5.7.3/po/ca/libdiscover.po 2016-08-02 11:32:45.000000000 +0200 +++ new/discover-5.7.4/po/ca/libdiscover.po 2016-08-23 14:34:18.000000000 +0200 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: libdiscover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-06-03 22:16+0200\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-03 16:34+0200\n" "Last-Translator: Josep Ma. Ferrer <txemaq(a)gmail.com>\n" "Language-Team: Catalan <kde-i18n-ca(a)kde.org>\n" "Language: ca\n" @@ -1741,6 +1741,10 @@ msgid "Testing" msgstr "Proves" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "Desconegut" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/ca(a)valencia/libdiscover.po new/discover-5.7.4/po/ca(a)valencia/libdiscover.po --- old/discover-5.7.3/po/ca(a)valencia/libdiscover.po 2016-08-02 11:32:45.000000000 +0200 +++ new/discover-5.7.4/po/ca(a)valencia/libdiscover.po 2016-08-23 14:34:17.000000000 +0200 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: libdiscover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-06-03 22:16+0200\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-03 16:34+0200\n" "Last-Translator: Josep Ma. Ferrer <txemaq(a)gmail.com>\n" "Language-Team: Catalan <kde-i18n-ca(a)kde.org>\n" "Language: ca@valencia\n" @@ -1741,6 +1741,10 @@ msgid "Testing" msgstr "Proves" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "Desconegut" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/cs/libdiscover.po new/discover-5.7.4/po/cs/libdiscover.po --- old/discover-5.7.3/po/cs/libdiscover.po 2016-08-02 11:32:46.000000000 +0200 +++ new/discover-5.7.4/po/cs/libdiscover.po 2016-08-23 14:34:19.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2016-07-18 09:36+0100\n" "Last-Translator: Vít Pelčák <vit(a)pelcak.org>\n" "Language-Team: Czech <kde-i18n-doc(a)kde.org>\n" @@ -1719,6 +1719,10 @@ msgid "Testing" msgstr "Testovací" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "Neznámý" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/cs/plasma-discover.po new/discover-5.7.4/po/cs/plasma-discover.po --- old/discover-5.7.3/po/cs/plasma-discover.po 2016-08-02 11:32:46.000000000 +0200 +++ new/discover-5.7.4/po/cs/plasma-discover.po 2016-08-23 14:34:19.000000000 +0200 @@ -160,8 +160,8 @@ msgstr "Původ" #: discover/qml/ApplicationsListPage.qml:105 -#: discover/qml/ApplicationsListPage.qml:234 discover/qml/DiscoverWindow.qml:66 -#: discover/qml/InstalledPage.qml:17 +#: discover/qml/ApplicationsListPage.qml:234 +#: discover/qml/DiscoverWindow.qml:66 discover/qml/InstalledPage.qml:17 msgid "Installed" msgstr "Nainstalováno" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/da/libdiscover.po new/discover-5.7.4/po/da/libdiscover.po --- old/discover-5.7.3/po/da/libdiscover.po 2016-08-02 11:32:47.000000000 +0200 +++ new/discover-5.7.4/po/da/libdiscover.po 2016-08-23 14:34:20.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2016-06-18 14:38+0100\n" "Last-Translator: Martin Schlander <mschlander(a)opensuse.org>\n" "Language-Team: Danish <kde-i18n-doc(a)kde.org>\n" @@ -1728,6 +1728,13 @@ msgid "Testing" msgstr "Under test" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Ukendt" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/de/libdiscover.po new/discover-5.7.4/po/de/libdiscover.po --- old/discover-5.7.3/po/de/libdiscover.po 2016-08-02 11:32:47.000000000 +0200 +++ new/discover-5.7.4/po/de/libdiscover.po 2016-08-23 14:34:20.000000000 +0200 @@ -1,14 +1,14 @@ # Panagiotis Papadopoulos <pano_90(a)gmx.net>, 2010. # Jonathan Raphael Joachim Kolberg <bulldog98(a)kubuntu-de.org>, 2010. # Frederik Schwarzer <schwarzer(a)kde.org>, 2010, 2011, 2015, 2016. -# Burkhard Lück <lueck(a)hube-lueck.de>, 2011, 2012, 2013, 2014, 2015. +# Burkhard Lück <lueck(a)hube-lueck.de>, 2011, 2012, 2013, 2014, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-05-31 18:53+0100\n" -"Last-Translator: Frederik Schwarzer <schwarzer(a)kde.org>\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-04 14:44+0100\n" +"Last-Translator: Burkhard Lück <lueck(a)hube-lueck.de>\n" "Language-Team: German <kde-i18n-de(a)kde.org>\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -1745,6 +1745,10 @@ msgid "Testing" msgstr "Testing" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "Unbekannt" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/el/libdiscover.po new/discover-5.7.4/po/el/libdiscover.po --- old/discover-5.7.3/po/el/libdiscover.po 2016-08-02 11:32:47.000000000 +0200 +++ new/discover-5.7.4/po/el/libdiscover.po 2016-08-23 14:34:21.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2016-02-07 11:26+0200\n" "Last-Translator: Dimitris Kardarakos <dimkard(a)gmail.com>\n" "Language-Team: Greek <kde-i18n-el(a)kde.org>\n" @@ -1745,6 +1745,13 @@ msgid "Testing" msgstr "Σε δοκιμή" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Άγνωστη" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/en_GB/libdiscover.po new/discover-5.7.4/po/en_GB/libdiscover.po --- old/discover-5.7.3/po/en_GB/libdiscover.po 2016-08-02 11:32:47.000000000 +0200 +++ new/discover-5.7.4/po/en_GB/libdiscover.po 2016-08-23 14:34:21.000000000 +0200 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-05-02 11:55+0100\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-05 13:10+0000\n" "Last-Translator: Steve Allewell <steve.allewell(a)gmail.com>\n" -"Language-Team: British English <kde-l10n-en_gb(a)kde.org>\n" +"Language-Team: English <kde-l10n-en_gb(a)kde.org>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #: categoriesxml.cpp:2 #: libdiscover/backends/DummyBackend/dummy-backend-categories.xml:4 @@ -26,12 +26,9 @@ #: categoriesxml.cpp:4 #: libdiscover/backends/DummyBackend/dummy-backend-categories.xml:11 -#, fuzzy -#| msgctxt "Category" -#| msgid "dummy 1" msgctxt "Category" msgid "dummy addons" -msgstr "dummy 1" +msgstr "dummy addons" #: categoriesxml.cpp:6 #: libdiscover/backends/DummyBackend/dummy-backend-categories.xml:19 @@ -1737,6 +1734,10 @@ msgid "Testing" msgstr "Testing" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "Unknown" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/en_GB/plasma-discover.po new/discover-5.7.4/po/en_GB/plasma-discover.po --- old/discover-5.7.3/po/en_GB/plasma-discover.po 2016-08-02 11:32:47.000000000 +0200 +++ new/discover-5.7.4/po/en_GB/plasma-discover.po 2016-08-23 14:34:21.000000000 +0200 @@ -7,15 +7,15 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-05-02 11:54+0100\n" +"PO-Revision-Date: 2016-08-05 13:12+0000\n" "Last-Translator: Steve Allewell <steve.allewell(a)gmail.com>\n" -"Language-Team: British English <kde-l10n-en_gb(a)kde.org>\n" +"Language-Team: English <kde-l10n-en_gb(a)kde.org>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #: discover/main.cpp:49 msgid "Directly open the specified application by its package name." @@ -237,10 +237,8 @@ msgstr "Update (%1)" #: discover/qml/DiscoverWindow.qml:101 -#, fuzzy -#| msgid "Configure Sources" msgid "Configure Sources..." -msgstr "Configure Sources" +msgstr "Configure Sources..." #: discover/qml/InstallApplicationButton.qml:61 msgid "Install" @@ -276,11 +274,11 @@ #: discover/qml/Main.qml:102 #, kde-format msgid "Resources requested but unable to find: %1" -msgstr "" +msgstr "Resources requested but unable to find: %1" #: discover/qml/Main.qml:110 msgid "Running as root is discouraged and unnecessary." -msgstr "" +msgstr "Running as root is discouraged and unnecessary." #: discover/qml/MuonToolbar.qml:65 msgid "Back" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/es/libdiscover.po new/discover-5.7.4/po/es/libdiscover.po --- old/discover-5.7.3/po/es/libdiscover.po 2016-08-02 11:32:49.000000000 +0200 +++ new/discover-5.7.4/po/es/libdiscover.po 2016-08-23 14:34:22.000000000 +0200 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-05-31 19:16+0200\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-02 19:29+0200\n" "Last-Translator: Eloy Cuadra <ecuadra(a)eloihr.net>\n" "Language-Team: Spanish <kde-l10n-es(a)kde.org>\n" "Language: es\n" @@ -1743,6 +1743,10 @@ msgid "Testing" msgstr "En pruebas" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "Desconocido" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/et/libdiscover.po new/discover-5.7.4/po/et/libdiscover.po --- old/discover-5.7.3/po/et/libdiscover.po 2016-08-02 11:32:48.000000000 +0200 +++ new/discover-5.7.4/po/et/libdiscover.po 2016-08-23 14:34:23.000000000 +0200 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-07-27 19:16+0300\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-11 05:53+0300\n" "Last-Translator: Marek Laane <qiilaq69(a)gmail.com>\n" "Language-Team: Estonian <kde-i18n-doc(a)kde.org>\n" "Language: et\n" @@ -1728,6 +1728,10 @@ msgid "Testing" msgstr "Testimine" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "Tundmatu" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/fi/libdiscover.po new/discover-5.7.4/po/fi/libdiscover.po --- old/discover-5.7.3/po/fi/libdiscover.po 2016-08-02 11:32:49.000000000 +0200 +++ new/discover-5.7.4/po/fi/libdiscover.po 2016-08-23 14:34:25.000000000 +0200 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2016-06-08 23:30+0200\n" "Last-Translator: Lasse Liehu <lasse.liehu(a)gmail.com>\n" "Language-Team: Finnish <kde-i18n-doc(a)kde.org>\n" @@ -1731,6 +1731,13 @@ msgid "Testing" msgstr "Testattavana" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Tuntematon" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/fr/libdiscover.po new/discover-5.7.4/po/fr/libdiscover.po --- old/discover-5.7.3/po/fr/libdiscover.po 2016-08-02 11:32:50.000000000 +0200 +++ new/discover-5.7.4/po/fr/libdiscover.po 2016-08-23 14:34:26.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2015-11-05 05:21+0100\n" "Last-Translator: Vincent Pinon <vpinon(a)kde.org>\n" "Language-Team: French <kde-francophone(a)kde.org>\n" @@ -1746,6 +1746,13 @@ msgid "Testing" msgstr "en test" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Inconnu(s)" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/ga/libdiscover.po new/discover-5.7.4/po/ga/libdiscover.po --- old/discover-5.7.3/po/ga/libdiscover.po 2016-08-02 11:32:50.000000000 +0200 +++ new/discover-5.7.4/po/ga/libdiscover.po 2016-08-23 14:34:27.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2011-12-28 12:28-0500\n" "Last-Translator: Kevin Scannell <kscanne(a)gmail.com>\n" "Language-Team: Irish <gaeilge-gnulinux(a)lists.sourceforge.net>\n" @@ -1848,6 +1848,13 @@ msgid "Testing" msgstr "" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Anaithnid" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/gl/libdiscover.po new/discover-5.7.4/po/gl/libdiscover.po --- old/discover-5.7.3/po/gl/libdiscover.po 2016-08-02 11:32:51.000000000 +0200 +++ new/discover-5.7.4/po/gl/libdiscover.po 2016-08-23 14:34:28.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2016-06-29 07:02+0100\n" "Last-Translator: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail." "com>\n" @@ -1740,6 +1740,13 @@ msgid "Testing" msgstr "Probas" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Descoñecido" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/he/libdiscover.po new/discover-5.7.4/po/he/libdiscover.po --- old/discover-5.7.3/po/he/libdiscover.po 2016-08-02 11:32:51.000000000 +0200 +++ new/discover-5.7.4/po/he/libdiscover.po 2016-08-23 14:34:29.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2016-06-30 13:01+0200\n" "Last-Translator: Elkana Bardugo <ttv200(a)gmail.com>\n" "Language-Team: Hebrew <kde-i18n-doc(a)kde.org>\n" @@ -1678,6 +1678,12 @@ msgid "Testing" msgstr "בבדיקות" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgid "Unknown Status" +msgid "Unknown" +msgstr "מצב לא ידוע" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/hu/libdiscover.po new/discover-5.7.4/po/hu/libdiscover.po --- old/discover-5.7.3/po/hu/libdiscover.po 2016-08-02 11:32:52.000000000 +0200 +++ new/discover-5.7.4/po/hu/libdiscover.po 2016-08-23 14:34:39.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2015-04-21 15:50+0200\n" "Last-Translator: Kiszel Kristóf <ulysses(a)kubuntu.org>\n" "Language-Team: Hungarian <kde-l10n-hu(a)kde.org>\n" @@ -1769,6 +1769,13 @@ msgid "Testing" msgstr "Teszt" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Ismeretlen" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/id/libdiscover.po new/discover-5.7.4/po/id/libdiscover.po --- old/discover-5.7.3/po/id/libdiscover.po 2016-08-02 11:32:53.000000000 +0200 +++ new/discover-5.7.4/po/id/libdiscover.po 2016-08-23 14:34:42.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: KDE Frameworks 5 Applications\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2015-01-01 10:43+0700\n" "Last-Translator: Wantoyo <wantoyo(a)yahoo.com>\n" "Language-Team: Indonesian <translation-team-id(a)lists.sourceforge.net>\n" @@ -1771,6 +1771,13 @@ msgid "Testing" msgstr "" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Tidak Diketahui" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, fuzzy, kde-format #| msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/it/libdiscover.po new/discover-5.7.4/po/it/libdiscover.po --- old/discover-5.7.3/po/it/libdiscover.po 2016-08-02 11:32:53.000000000 +0200 +++ new/discover-5.7.4/po/it/libdiscover.po 2016-08-23 14:34:45.000000000 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-06-02 08:24+0200\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-04 06:50+0200\n" "Last-Translator: Vincenzo Reale <smart2128(a)baslug.org>\n" "Language-Team: Italian <kde-i18n-it(a)kde.org>\n" "Language: it\n" @@ -1734,6 +1734,10 @@ msgid "Testing" msgstr "Di prova" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "Sconosciuta" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/ja/libdiscover.po new/discover-5.7.4/po/ja/libdiscover.po --- old/discover-5.7.3/po/ja/libdiscover.po 2016-08-02 11:32:54.000000000 +0200 +++ new/discover-5.7.4/po/ja/libdiscover.po 2016-08-23 14:34:49.000000000 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2010-06-20 00:46-0700\n" "Last-Translator: Japanese KDE translation team <kde-jp(a)kde.org>\n" "Language-Team: Japanese <kde-jp(a)kde.org>\n" @@ -1675,6 +1675,10 @@ msgid "Testing" msgstr "" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/ja/plasma-discover.po new/discover-5.7.4/po/ja/plasma-discover.po --- old/discover-5.7.3/po/ja/plasma-discover.po 2016-08-02 11:32:54.000000000 +0200 +++ new/discover-5.7.4/po/ja/plasma-discover.po 2016-08-23 14:34:49.000000000 +0200 @@ -157,8 +157,8 @@ msgstr "" #: discover/qml/ApplicationsListPage.qml:105 -#: discover/qml/ApplicationsListPage.qml:234 discover/qml/DiscoverWindow.qml:66 -#: discover/qml/InstalledPage.qml:17 +#: discover/qml/ApplicationsListPage.qml:234 +#: discover/qml/DiscoverWindow.qml:66 discover/qml/InstalledPage.qml:17 msgid "Installed" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/kk/libdiscover.po new/discover-5.7.4/po/kk/libdiscover.po --- old/discover-5.7.3/po/kk/libdiscover.po 2016-08-02 11:32:54.000000000 +0200 +++ new/discover-5.7.4/po/kk/libdiscover.po 2016-08-23 14:34:53.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2013-10-03 04:53+0600\n" "Last-Translator: Sairan Kikkarin <sairan(a)computer.org>\n" "Language-Team: Kazakh <kde-i18n-doc(a)kde.org>\n" @@ -1861,6 +1861,13 @@ msgid "Testing" msgstr "" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Беймәлім" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, fuzzy, kde-format #| msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/ko/libdiscover.po new/discover-5.7.4/po/ko/libdiscover.po --- old/discover-5.7.3/po/ko/libdiscover.po 2016-08-02 11:32:55.000000000 +0200 +++ new/discover-5.7.4/po/ko/libdiscover.po 2016-08-23 14:34:59.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2015-11-07 00:41+0100\n" "Last-Translator: Shinjo Park <peremen(a)gmail.com>\n" "Language-Team: Korean <kde(a)peremen.name>\n" @@ -1716,6 +1716,13 @@ msgid "Testing" msgstr "테스팅 버전" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "알 수 없음" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/lt/libdiscover.po new/discover-5.7.4/po/lt/libdiscover.po --- old/discover-5.7.3/po/lt/libdiscover.po 2016-08-02 11:32:56.000000000 +0200 +++ new/discover-5.7.4/po/lt/libdiscover.po 2016-08-23 14:35:03.000000000 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2015-12-30 19:15+0200\n" "Last-Translator: Mindaugas Baranauskas <opensuse.lietuviu.kalba(a)gmail.com>\n" "Language-Team: lt <kde-i18n-lt(a)kde.org>\n" @@ -1872,6 +1872,13 @@ msgid "Testing" msgstr "Testavimas" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Nežinoma" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, fuzzy, kde-format #| msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/mr/libdiscover.po new/discover-5.7.4/po/mr/libdiscover.po --- old/discover-5.7.3/po/mr/libdiscover.po 2016-08-02 11:32:57.000000000 +0200 +++ new/discover-5.7.4/po/mr/libdiscover.po 2016-08-23 14:35:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2013-03-28 16:07+0530\n" "Last-Translator: Chetan Khona <chetan(a)kompkin.com>\n" "Language-Team: Marathi <kde-i18n-doc(a)kde.org>\n" @@ -1847,6 +1847,13 @@ msgid "Testing" msgstr "" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "अपरिचीत" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, fuzzy, kde-format #| msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/nds/libdiscover.po new/discover-5.7.4/po/nds/libdiscover.po --- old/discover-5.7.3/po/nds/libdiscover.po 2016-08-02 11:32:58.000000000 +0200 +++ new/discover-5.7.4/po/nds/libdiscover.po 2016-08-23 14:35:18.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2014-07-06 22:08+0200\n" "Last-Translator: Sönke Dibbern <s_dibbern(a)web.de>\n" "Language-Team: Low Saxon <kde-i18n-nds(a)kde.org>\n" @@ -2010,6 +2010,15 @@ msgid "Testing" msgstr "" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "" +#| "@item:inlistbox Human-readable name for the Debian package section " +#| "\"unknown\"" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Nich begäng" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/nl/libdiscover.po new/discover-5.7.4/po/nl/libdiscover.po --- old/discover-5.7.3/po/nl/libdiscover.po 2016-08-02 11:32:58.000000000 +0200 +++ new/discover-5.7.4/po/nl/libdiscover.po 2016-08-23 14:35:23.000000000 +0200 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-05-31 13:40+0200\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-03 12:54+0200\n" "Last-Translator: Freek de Kruijf <freekdekruijf(a)kde.nl>\n" "Language-Team: Dutch <kde-i18n-nl(a)kde.org>\n" "Language: nl\n" @@ -1737,6 +1737,10 @@ msgid "Testing" msgstr "Testen" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "Onbekend" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/pa/libdiscover.po new/discover-5.7.4/po/pa/libdiscover.po --- old/discover-5.7.3/po/pa/libdiscover.po 2016-08-02 11:32:59.000000000 +0200 +++ new/discover-5.7.4/po/pa/libdiscover.po 2016-08-23 14:35:24.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2013-04-30 19:56+0530\n" "Last-Translator: A S Alam <aalam(a)users.sf.net>\n" "Language-Team: Punjabi/Panjabi <punjabi-users(a)lists.sf.net>\n" @@ -1830,6 +1830,13 @@ msgid "Testing" msgstr "" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "ਅਣਜਾਣ" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, fuzzy, kde-format #| msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/pl/libdiscover.po new/discover-5.7.4/po/pl/libdiscover.po --- old/discover-5.7.3/po/pl/libdiscover.po 2016-08-02 11:33:00.000000000 +0200 +++ new/discover-5.7.4/po/pl/libdiscover.po 2016-08-23 14:35:25.000000000 +0200 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-06-04 07:35+0100\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-06 08:41+0100\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" @@ -1744,6 +1744,10 @@ msgid "Testing" msgstr "Testowe" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "Nieznane" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/pt/libdiscover.po new/discover-5.7.4/po/pt/libdiscover.po --- old/discover-5.7.3/po/pt/libdiscover.po 2016-08-02 11:33:00.000000000 +0200 +++ new/discover-5.7.4/po/pt/libdiscover.po 2016-08-23 14:35:26.000000000 +0200 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-05-31 12:37+0100\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-02 15:00+0100\n" "Last-Translator: José Nuno Coelho Pires <zepires(a)gmail.com>\n" "Language-Team: Portuguese <kde-i18n-pt(a)kde.org>\n" "Language: pt\n" @@ -1740,6 +1740,10 @@ msgid "Testing" msgstr "Testes" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "Desconhecido" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/pt_BR/libdiscover.po new/discover-5.7.4/po/pt_BR/libdiscover.po --- old/discover-5.7.3/po/pt_BR/libdiscover.po 2016-08-02 11:33:00.000000000 +0200 +++ new/discover-5.7.4/po/pt_BR/libdiscover.po 2016-08-23 14:35:27.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libdiscover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2016-04-30 09:28-0300\n" "Last-Translator: André Marcelo Alvarenga <alvarenga(a)kde.org>\n" "Language-Team: Brazilian Portuguese <kde-i18n-pt_br(a)kde.org>\n" @@ -1740,6 +1740,13 @@ msgid "Testing" msgstr "Testes" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Desconhecida" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/ro/libdiscover.po new/discover-5.7.4/po/ro/libdiscover.po --- old/discover-5.7.3/po/ro/libdiscover.po 2016-08-02 11:33:00.000000000 +0200 +++ new/discover-5.7.4/po/ro/libdiscover.po 2016-08-23 14:35:26.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2014-05-02 12:03+0300\n" "Last-Translator: Sergiu Bivol <sergiu(a)ase.md>\n" "Language-Team: Romanian <kde-i18n-ro(a)kde.org>\n" @@ -1868,6 +1868,13 @@ msgid "Testing" msgstr "" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Necunoscută" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, fuzzy, kde-format #| msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/ru/libdiscover.po new/discover-5.7.4/po/ru/libdiscover.po --- old/discover-5.7.3/po/ru/libdiscover.po 2016-08-02 11:33:01.000000000 +0200 +++ new/discover-5.7.4/po/ru/libdiscover.po 2016-08-23 14:35:28.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2016-03-27 22:05+0300\n" "Last-Translator: Alexander Potashev <aspotashev(a)gmail.com>\n" "Language-Team: Russian <kde-russian(a)lists.kde.ru>\n" @@ -1756,6 +1756,13 @@ msgid "Testing" msgstr "тестовое" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Неизвестно" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/ru/plasma_applet_org.kde.discovernotifier.po new/discover-5.7.4/po/ru/plasma_applet_org.kde.discovernotifier.po --- old/discover-5.7.3/po/ru/plasma_applet_org.kde.discovernotifier.po 1970-01-01 01:00:00.000000000 +0100 +++ new/discover-5.7.4/po/ru/plasma_applet_org.kde.discovernotifier.po 2016-08-23 14:35:28.000000000 +0200 @@ -0,0 +1,33 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Alexander Potashev <aspotashev(a)gmail.com>, 2015. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2016-06-13 08:41+0000\n" +"PO-Revision-Date: 2015-08-20 15:48+0300\n" +"Last-Translator: Alexander Potashev <aspotashev(a)gmail.com>\n" +"Language-Team: Russian <kde-russian(a)lists.kde.ru>\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" +"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Lokalize 2.0\n" + +# Над кнопкой сообщается, какие обновления доступны. Обновления можно _установить_. --aspotashev +#: contents/ui/Full.qml:57 +msgid "Update" +msgstr "Установить" + +#: contents/ui/Full.qml:58 +msgid "Launches the software to perform the update" +msgstr "Запустить программу, выполняющую обновление" + +# Над кнопкой сообщается, какие обновления доступны. Обновления можно _установить_. --aspotashev +#: contents/ui/main.qml:41 +msgid "See Updates..." +msgstr "Просмотреть обновления..." \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/sk/libdiscover.po new/discover-5.7.4/po/sk/libdiscover.po --- old/discover-5.7.3/po/sk/libdiscover.po 2016-08-02 11:33:02.000000000 +0200 +++ new/discover-5.7.4/po/sk/libdiscover.po 2016-08-23 14:35:33.000000000 +0200 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-06-07 22:09+0100\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-04 21:08+0100\n" "Last-Translator: Roman Paholik <wizzardsk(a)gmail.com>\n" "Language-Team: Slovak <kde-sk(a)linux.sk>\n" "Language: sk\n" @@ -1735,6 +1735,10 @@ msgid "Testing" msgstr "Testovanie" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "Neznáme" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/sl/libdiscover.po new/discover-5.7.4/po/sl/libdiscover.po --- old/discover-5.7.3/po/sl/libdiscover.po 2016-08-02 11:33:02.000000000 +0200 +++ new/discover-5.7.4/po/sl/libdiscover.po 2016-08-23 14:35:35.000000000 +0200 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-07-11 18:35+0200\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-03 22:32+0200\n" "Last-Translator: Andrej Mernik <andrejm(a)ubuntu.si>\n" "Language-Team: Slovenian <lugos-slo(a)lugos.si>\n" "Language: sl\n" @@ -1746,6 +1746,10 @@ msgid "Testing" msgstr "Testing" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "Neznano" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/sr/libdiscover.po new/discover-5.7.4/po/sr/libdiscover.po --- old/discover-5.7.3/po/sr/libdiscover.po 2016-08-02 11:33:03.000000000 +0200 +++ new/discover-5.7.4/po/sr/libdiscover.po 2016-08-23 14:35:39.000000000 +0200 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: libdiscover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-06-05 12:15+0200\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-14 23:47+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic(a)gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr(a)kde.org>\n" "Language: sr\n" @@ -1761,6 +1761,11 @@ msgid "Testing" msgstr "пробно" +# >> @item unknown licence +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "непозната" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/sr(a)ijekavian/libdiscover.po new/discover-5.7.4/po/sr(a)ijekavian/libdiscover.po --- old/discover-5.7.3/po/sr(a)ijekavian/libdiscover.po 2016-08-02 11:33:03.000000000 +0200 +++ new/discover-5.7.4/po/sr(a)ijekavian/libdiscover.po 2016-08-23 14:35:43.000000000 +0200 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: libdiscover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-06-05 12:15+0200\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-14 23:47+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic(a)gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr(a)kde.org>\n" "Language: sr@ijekavian\n" @@ -1761,6 +1761,11 @@ msgid "Testing" msgstr "пробно" +# >> @item unknown licence +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "непозната" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/sr(a)ijekavianlatin/libdiscover.po new/discover-5.7.4/po/sr(a)ijekavianlatin/libdiscover.po --- old/discover-5.7.3/po/sr(a)ijekavianlatin/libdiscover.po 2016-08-02 11:33:03.000000000 +0200 +++ new/discover-5.7.4/po/sr(a)ijekavianlatin/libdiscover.po 2016-08-23 14:35:43.000000000 +0200 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: libdiscover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-06-05 12:15+0200\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-14 23:47+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic(a)gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr(a)kde.org>\n" "Language: sr@ijekavianlatin\n" @@ -1762,6 +1762,11 @@ msgid "Testing" msgstr "probno" +# >> @item unknown licence +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "nepoznata" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/sr(a)latin/libdiscover.po new/discover-5.7.4/po/sr(a)latin/libdiscover.po --- old/discover-5.7.3/po/sr(a)latin/libdiscover.po 2016-08-02 11:33:04.000000000 +0200 +++ new/discover-5.7.4/po/sr(a)latin/libdiscover.po 2016-08-23 14:35:45.000000000 +0200 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: libdiscover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-06-05 12:15+0200\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-14 23:47+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic(a)gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr(a)kde.org>\n" "Language: sr@latin\n" @@ -1762,6 +1762,11 @@ msgid "Testing" msgstr "probno" +# >> @item unknown licence +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "nepoznata" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/sv/libdiscover.po new/discover-5.7.4/po/sv/libdiscover.po --- old/discover-5.7.3/po/sv/libdiscover.po 2016-08-02 11:33:04.000000000 +0200 +++ new/discover-5.7.4/po/sv/libdiscover.po 2016-08-23 14:35:50.000000000 +0200 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-05-31 17:30+0100\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-02 17:53+0100\n" "Last-Translator: Stefan Asserhäll <stefan.asserhall(a)bredband.net>\n" "Language-Team: Swedish <kde-i18n-doc(a)kde.org>\n" "Language: sv\n" @@ -1731,6 +1731,10 @@ msgid "Testing" msgstr "Test" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "Okänd" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/tr/libdiscover.po new/discover-5.7.4/po/tr/libdiscover.po --- old/discover-5.7.3/po/tr/libdiscover.po 2016-08-02 11:33:05.000000000 +0200 +++ new/discover-5.7.4/po/tr/libdiscover.po 2016-08-23 14:35:53.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: extragear-sysadmin-kde4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2015-09-15 09:33+0000\n" "Last-Translator: Necdet <necdetyucel(a)gmail.com>\n" "Language-Team: Turkish <kde-l10n-tr(a)kde.org>\n" @@ -1766,6 +1766,13 @@ msgid "Testing" msgstr "Deneme" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Bilinmeyen" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/ug/libdiscover.po new/discover-5.7.4/po/ug/libdiscover.po --- old/discover-5.7.3/po/ug/libdiscover.po 2016-08-02 11:33:06.000000000 +0200 +++ new/discover-5.7.4/po/ug/libdiscover.po 2016-08-23 14:35:53.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2013-09-08 07:04+0900\n" "Last-Translator: Gheyret Kenji <gheyret(a)gmail.com>\n" "Language-Team: Uyghur Computer Science Association <UKIJ(a)yahoogroups.com>\n" @@ -1791,6 +1791,13 @@ msgid "Testing" msgstr "" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "نامەلۇم" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, fuzzy, kde-format #| msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/uk/libdiscover.po new/discover-5.7.4/po/uk/libdiscover.po --- old/discover-5.7.3/po/uk/libdiscover.po 2016-08-02 11:33:06.000000000 +0200 +++ new/discover-5.7.4/po/uk/libdiscover.po 2016-08-23 14:35:54.000000000 +0200 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: libdiscover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-05-31 14:51+0300\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-02 20:29+0300\n" "Last-Translator: Yuri Chornoivan <yurchor(a)ukr.net>\n" "Language-Team: Ukrainian <kde-i18n-uk(a)kde.org>\n" "Language: uk\n" @@ -1758,6 +1758,10 @@ msgid "Testing" msgstr "Тестовий" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "Невідомий" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/vi/libdiscover.po new/discover-5.7.4/po/vi/libdiscover.po --- old/discover-5.7.3/po/vi/libdiscover.po 2016-08-02 11:33:06.000000000 +0200 +++ new/discover-5.7.4/po/vi/libdiscover.po 2016-08-23 14:35:55.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2012-06-13 11:10+0800\n" "Last-Translator: HeroP <herophuong93(a)gmail.com>\n" "Language-Team: Vietnamese <kde-i18n-vi(a)kde.org>\n" @@ -1929,6 +1929,13 @@ msgid "Testing" msgstr "" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "Không rõ" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/zh_CN/libdiscover.po new/discover-5.7.4/po/zh_CN/libdiscover.po --- old/discover-5.7.3/po/zh_CN/libdiscover.po 2016-08-02 11:33:07.000000000 +0200 +++ new/discover-5.7.4/po/zh_CN/libdiscover.po 2016-08-23 14:35:58.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" "PO-Revision-Date: 2016-06-17 13:00-0800\n" "Last-Translator: Weng Xuetian <wengxt(a)gmail.com>\n" "Language-Team: Chinese <kde-china(a)kde.org>\n" @@ -1702,6 +1702,13 @@ msgid "Testing" msgstr "测试" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +#, fuzzy +#| msgctxt "@info license" +#| msgid "Unknown" +msgid "Unknown" +msgstr "未知" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discover-5.7.3/po/zh_TW/libdiscover.po new/discover-5.7.4/po/zh_TW/libdiscover.po --- old/discover-5.7.3/po/zh_TW/libdiscover.po 2016-08-02 11:33:08.000000000 +0200 +++ new/discover-5.7.4/po/zh_TW/libdiscover.po 2016-08-23 14:35:58.000000000 +0200 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-07-28 11:36+0000\n" -"PO-Revision-Date: 2016-06-27 17:00+0800\n" +"POT-Creation-Date: 2016-08-02 12:18+0000\n" +"PO-Revision-Date: 2016-08-03 17:04+0800\n" "Last-Translator: Jeff Huang <s8321414(a)gmail.com>\n" "Language-Team: Chinese <kde-i18n-doc(a)kde.org>\n" "Language: zh_TW\n" @@ -1699,6 +1699,10 @@ msgid "Testing" msgstr "測試中" +#: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:97 +msgid "Unknown" +msgstr "未知" + #: libdiscover/backends/PackageKitBackend/PackageKitResource.cpp:226 #, kde-format msgctxt "package-name (version)"

1 0

commit kdf for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kdf for openSUSE:Factory checked in at 2016-08-31 00:09:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdf (Old) and /work/SRC/openSUSE:Factory/.kdf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdf" Changes: -------- --- /work/SRC/openSUSE:Factory/kdf/kdf.changes 2016-07-24 19:46:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdf.new/kdf.changes 2016-08-31 00:11:21.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:15:49 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:00:08 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kdf-16.04.3.tar.xz New: ---- kdf-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdf.spec ++++++ --- /var/tmp/diff_new_pack.LgKNfD/_old 2016-08-31 00:11:22.000000000 +0200 +++ /var/tmp/diff_new_pack.LgKNfD/_new 2016-08-31 00:11:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdf -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Disk Usage Viewer License: GPL-2.0+ @@ -25,12 +25,21 @@ Url: http://www.kde.org Source0: kdf-%{version}.tar.xz Patch1: desktop-files.diff -BuildRequires: libkde4-devel -BuildRequires: xz -Provides: kde4-kdf = 4.3.0 -Obsoletes: kde4-kdf < 4.3.0 +BuildRequires: kconfigwidgets-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kdoctools-devel +BuildRequires: ki18n-devel +BuildRequires: kiconthemes-devel +BuildRequires: kio-devel +BuildRequires: kcmutils-devel +BuildRequires: knotifications-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kxmlgui-devel +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description KDE free disk space utility @@ -40,42 +49,45 @@ %patch1 %build -%cmake_kde4 -d build +%cmake_kf5 -d build %make_jobs %install cd build -%kde4_makeinstall -%suse_update_desktop_file kdf System Filesystem -%kde_post_install +%kf5_makeinstall +%suse_update_desktop_file org.kde.kdf System Filesystem %package -n kwikdisk Summary: Removable Media Utility Group: System/GUI/KDE -%kde4_runtime_requires %description -n kwikdisk This utility allows you to manage removable media. +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc COPYING -%_kde4_bindir/kdf -%_kde4_modulesdir/kcm_kdf.so -%_kde4_applicationsdir/kdf.desktop -%_kde4_htmldir/en/kdf/ -%dir %_kde4_htmldir/en/kcontrol/ -%_kde4_htmldir/en/kcontrol/blockdevices/ -%_kde4_iconsdir/hicolor/*/*/kdf.png -%_kde4_iconsdir/oxygen/*/*/kcmdf.png -%_kde4_appsdir/kdf/ -%_kde4_servicesdir/kcmdf.desktop +%_kf5_bindir/kdf +%_kf5_plugindir/libkcm_kdf.so +%_kf5_applicationsdir/org.kde.kdf.desktop +%_kf5_htmldir/en/kdf/ +%dir %_kf5_htmldir/en/kcontrol/ +%_kf5_htmldir/en/kcontrol/blockdevices/ +%_kf5_iconsdir/hicolor/*/*/kdf.png +%_kf5_iconsdir/hicolor/*/*/kcmdf.png +%_kf5_sharedir/kxmlgui5/kdf/ +%_kf5_servicesdir/kcmdf.desktop +%_kf5_libdir/libkdfprivate.so.* %files -n kwikdisk %defattr(-,root,root) %doc COPYING -%_kde4_bindir/kwikdisk -%_kde4_applicationsdir/kwikdisk.desktop -%_kde4_iconsdir/hicolor/*/*/kwikdisk.png +%_kf5_bindir/kwikdisk +%_kf5_applicationsdir/org.kde.kwikdisk.desktop +%_kf5_iconsdir/hicolor/*/*/kwikdisk.png %changelog ++++++ desktop-files.diff ++++++ --- /var/tmp/diff_new_pack.LgKNfD/_old 2016-08-31 00:11:22.000000000 +0200 +++ /var/tmp/diff_new_pack.LgKNfD/_new 2016-08-31 00:11:22.000000000 +0200 @@ -1,5 +1,5 @@ ---- kwikdisk.desktop 2008/10/19 12:59:23 1.1 -+++ kwikdisk.desktop 2008/10/19 12:59:46 +--- desktop/org.kde.kwikdisk.desktop ++++ desktop/org.kde.kwikdisk.desktop @@ -69,3 +69,4 @@ GenericName[zh_TW]=可移動媒體公用程式 Terminal=false ++++++ kdf-16.04.3.tar.xz -> kdf-16.08.0.tar.xz ++++++ ++++ 11152 lines of diff (skipped)

1 0

commit perl-Sys-Virt for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package perl-Sys-Virt for openSUSE:Factory checked in at 2016-08-31 00:09:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Sys-Virt (Old) and /work/SRC/openSUSE:Factory/.perl-Sys-Virt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Sys-Virt" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Sys-Virt/perl-Sys-Virt.changes 2016-07-14 09:43:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Sys-Virt.new/perl-Sys-Virt.changes 2016-08-31 00:11:20.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Aug 20 23:13:43 UTC 2016 - jfehlig(a)suse.com + +- Update to 2.1.0 + - Add all new APIs and constants in libvirt 2.1.0 + +------------------------------------------------------------------- Old: ---- Sys-Virt-2.0.0.tar.gz New: ---- Sys-Virt-2.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Sys-Virt.spec ++++++ --- /var/tmp/diff_new_pack.MtQh11/_old 2016-08-31 00:11:21.000000000 +0200 +++ /var/tmp/diff_new_pack.MtQh11/_new 2016-08-31 00:11:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Sys-Virt -Version: 2.0.0 +Version: 2.1.0 Release: 0 %define cpan_name Sys-Virt Summary: Represent and manage a libvirt hypervisor connection ++++++ Sys-Virt-2.0.0.tar.gz -> Sys-Virt-2.1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Sys-Virt-2.0.0/Changes new/Sys-Virt-2.1.0/Changes --- old/Sys-Virt-2.0.0/Changes 2016-07-01 15:27:09.000000000 +0200 +++ new/Sys-Virt-2.1.0/Changes 2016-08-02 18:54:59.000000000 +0200 @@ -1,5 +1,12 @@ Revision history for perl module Sys::Virt +2.1.0 2016-08-02 + + - Add VIR_DOMAIN_MEMORY_STAT_USABLE and + VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE constants + - Fix handling of VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG with setter methods + 2.0.0 2016-07-01 - Add VIR_MIGRATE_PARAM_AUTO_CONVERGE_INITIAL and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Sys-Virt-2.0.0/META.yml new/Sys-Virt-2.1.0/META.yml --- old/Sys-Virt-2.0.0/META.yml 2016-07-01 15:27:23.000000000 +0200 +++ new/Sys-Virt-2.1.0/META.yml 2016-08-02 19:23:40.000000000 +0200 @@ -1,7 +1,7 @@ --- #YAML:1.0 name: Sys-Virt abstract: Extension for the libvirt library -version: 2.0.0 +version: 2.1.0 author: - Daniel P. Berrange <dan(a)berrange.com> license: perl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Sys-Virt-2.0.0/MYMETA.json new/Sys-Virt-2.1.0/MYMETA.json --- old/Sys-Virt-2.0.0/MYMETA.json 2016-07-01 15:27:14.000000000 +0200 +++ new/Sys-Virt-2.1.0/MYMETA.json 2016-08-02 19:23:27.000000000 +0200 @@ -42,6 +42,6 @@ } }, "release_status" : "stable", - "version" : "v2.0.0", + "version" : "v2.1.0", "x_serialization_backend" : "JSON::PP version 2.27400" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Sys-Virt-2.0.0/MYMETA.yml new/Sys-Virt-2.1.0/MYMETA.yml --- old/Sys-Virt-2.0.0/MYMETA.yml 2016-07-01 15:27:14.000000000 +0200 +++ new/Sys-Virt-2.1.0/MYMETA.yml 2016-08-02 19:23:27.000000000 +0200 @@ -24,5 +24,5 @@ Test::Pod::Coverage: '0' Time::HiRes: '0' XML::XPath: '0' -version: v2.0.0 +version: v2.1.0 x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Sys-Virt-2.0.0/Makefile.PL new/Sys-Virt-2.1.0/Makefile.PL --- old/Sys-Virt-2.0.0/Makefile.PL 2016-07-01 15:27:09.000000000 +0200 +++ new/Sys-Virt-2.1.0/Makefile.PL 2016-08-02 18:54:59.000000000 +0200 @@ -3,7 +3,7 @@ # See lib/ExtUtils/MakeMaker.pm for details of how to influence # the contents of the Makefile that is written. -my $libvirtver = "2.0.0"; +my $libvirtver = "2.1.0"; my $stat = system "pkg-config --atleast-version=$libvirtver libvirt"; die "cannot run pkg-config to check libvirt version" if $stat == -1; die "libvirt >= $libvirtver is required\n" unless $stat == 0; @@ -30,7 +30,7 @@ -Wnormalized=nfc -Wold-style-declaration -Wold-style-definition \\ -Woverflow -Woverride-init -Wpacked-bitfield-compat -Wparentheses \\ -Wpointer-arith -Wpointer-sign -Wpointer-to-int-cast -Wpragmas \\ - -Wreturn-type -Wsequence-point -Wshadow -Wstrict-aliasing \\ + -Wreturn-type -Wsequence-point -Wno-shadow -Wstrict-aliasing \\ -Wstrict-prototypes -Wsuggest-attribute=const \\ -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wswitch \\ -Wsync-nand -Wtrampolines -Wtrigraphs -Wtype-limits -Wuninitialized \\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Sys-Virt-2.0.0/README new/Sys-Virt-2.1.0/README --- old/Sys-Virt-2.0.0/README 2016-07-01 15:27:09.000000000 +0200 +++ new/Sys-Virt-2.1.0/README 2016-08-02 18:54:59.000000000 +0200 @@ -7,6 +7,6 @@ The only pre-requisite for this module is libvirt itself. For installation instructions, consult the INSTALL file. -The current minimum required version of libvirt is 2.0.0 +The current minimum required version of libvirt is 2.1.0 -- End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Sys-Virt-2.0.0/Virt.xs new/Sys-Virt-2.1.0/Virt.xs --- old/Sys-Virt-2.0.0/Virt.xs 2016-07-01 15:27:09.000000000 +0200 +++ new/Sys-Virt-2.1.0/Virt.xs 2016-08-02 18:54:59.000000000 +0200 @@ -2240,7 +2240,7 @@ int nparams; CODE: nparams = 0; - if (virNodeGetMemoryParameters(conn, NULL, &nparams, flags) < 0) + if (virNodeGetMemoryParameters(conn, NULL, &nparams, 0) < 0) _croak_error(); Newx(params, nparams, virTypedParameter); @@ -2266,12 +2266,12 @@ int nparams; PPCODE: nparams = 0; - if (virNodeGetMemoryParameters(conn, NULL, &nparams, flags) < 0) + if (virNodeGetMemoryParameters(conn, NULL, &nparams, 0) < 0) _croak_error(); Newx(params, nparams, virTypedParameter); - if (virNodeGetMemoryParameters(conn, params, &nparams, flags) < 0) { + if (virNodeGetMemoryParameters(conn, params, &nparams, 0) < 0) { Safefree(params); _croak_error(); } @@ -4133,16 +4133,9 @@ free(type); Newx(params, nparams, virTypedParameter); - if (flags) { - if (virDomainGetSchedulerParametersFlags(dom, params, &nparams, flags) < 0) { - Safefree(params); - _croak_error(); - } - } else { - if (virDomainGetSchedulerParameters(dom, params, &nparams) < 0) { - Safefree(params); - _croak_error(); - } + if (virDomainGetSchedulerParameters(dom, params, &nparams) < 0) { + Safefree(params); + _croak_error(); } nparams = vir_typed_param_from_hv(newparams, params, nparams); if (flags) { @@ -4164,7 +4157,7 @@ int nparams; CODE: nparams = 0; - if (virDomainGetMemoryParameters(dom, NULL, &nparams, flags) < 0) + if (virDomainGetMemoryParameters(dom, NULL, &nparams, 0) < 0) _croak_error(); Newx(params, nparams, virTypedParameter); @@ -4190,12 +4183,12 @@ int nparams; PPCODE: nparams = 0; - if (virDomainGetMemoryParameters(dom, NULL, &nparams, flags) < 0) + if (virDomainGetMemoryParameters(dom, NULL, &nparams, 0) < 0) _croak_error(); Newx(params, nparams, virTypedParameter); - if (virDomainGetMemoryParameters(dom, params, &nparams, flags) < 0) { + if (virDomainGetMemoryParameters(dom, params, &nparams, 0) < 0) { Safefree(params); _croak_error(); } @@ -4216,7 +4209,7 @@ int nparams; CODE: nparams = 0; - if (virDomainGetNumaParameters(dom, NULL, &nparams, flags) < 0) + if (virDomainGetNumaParameters(dom, NULL, &nparams, 0) < 0) _croak_error(); Newx(params, nparams, virTypedParameter); @@ -4242,12 +4235,12 @@ int nparams; PPCODE: nparams = 0; - if (virDomainGetNumaParameters(dom, NULL, &nparams, flags) < 0) + if (virDomainGetNumaParameters(dom, NULL, &nparams, 0) < 0) _croak_error(); Newx(params, nparams, virTypedParameter); - if (virDomainGetNumaParameters(dom, params, &nparams, flags) < 0) { + if (virDomainGetNumaParameters(dom, params, &nparams, 0) < 0) { Safefree(params); _croak_error(); } @@ -4268,7 +4261,7 @@ int nparams; CODE: nparams = 0; - if (virDomainGetBlkioParameters(dom, NULL, &nparams, flags) < 0) + if (virDomainGetBlkioParameters(dom, NULL, &nparams, 0) < 0) _croak_error(); Newx(params, nparams, virBlkioParameter); @@ -4294,12 +4287,12 @@ int nparams; PPCODE: nparams = 0; - if (virDomainGetBlkioParameters(dom, NULL, &nparams, flags) < 0) + if (virDomainGetBlkioParameters(dom, NULL, &nparams, 0) < 0) _croak_error(); Newx(params, nparams, virBlkioParameter); - if (virDomainGetBlkioParameters(dom, params, &nparams, flags) < 0) { + if (virDomainGetBlkioParameters(dom, params, &nparams, 0) < 0) { Safefree(params); _croak_error(); } @@ -4340,7 +4333,7 @@ virTypedParameterPtr params = NULL; int nparams = 0; PPCODE: - if (virDomainGetPerfEvents(dom, &params, &nparams, flags) < 0) { + if (virDomainGetPerfEvents(dom, &params, &nparams, 0) < 0) { Safefree(params); _croak_error(); } @@ -4942,7 +4935,7 @@ CODE: nparams = 0; RETVAL = NULL; - if (virDomainGetBlockIoTune(dom, disk, NULL, &nparams, flags) < 0) + if (virDomainGetBlockIoTune(dom, disk, NULL, &nparams, 0) < 0) _croak_error(); Newx(params, nparams, virTypedParameter); @@ -4968,11 +4961,11 @@ int nparams; PPCODE: nparams = 0; - if (virDomainGetBlockIoTune(dom, disk, NULL, &nparams, flags) < 0) + if (virDomainGetBlockIoTune(dom, disk, NULL, &nparams, 0) < 0) _croak_error(); Newx(params, nparams, virTypedParameter); - if (virDomainGetBlockIoTune(dom, disk, params, &nparams, flags) < 0) { + if (virDomainGetBlockIoTune(dom, disk, params, &nparams, 0) < 0) { Safefree(params); _croak_error(); } @@ -4993,7 +4986,7 @@ CODE: nparams = 0; RETVAL = NULL; - if (virDomainGetInterfaceParameters(dom, intf, NULL, &nparams, flags) < 0) + if (virDomainGetInterfaceParameters(dom, intf, NULL, &nparams, 0) < 0) _croak_error(); Newx(params, nparams, virTypedParameter); @@ -5019,11 +5012,11 @@ int nparams; PPCODE: nparams = 0; - if (virDomainGetInterfaceParameters(dom, intf, NULL, &nparams, flags) < 0) + if (virDomainGetInterfaceParameters(dom, intf, NULL, &nparams, 0) < 0) _croak_error(); Newx(params, nparams, virTypedParameter); - if (virDomainGetInterfaceParameters(dom, intf, params, &nparams, flags) < 0) { + if (virDomainGetInterfaceParameters(dom, intf, params, &nparams, 0) < 0) { Safefree(params); _croak_error(); } @@ -5047,7 +5040,7 @@ CODE: nparams = 0; RETVAL = NULL; - if (virDomainBlockStatsFlags(dom, path, NULL, &nparams, flags) < 0) { + if (virDomainBlockStatsFlags(dom, path, NULL, &nparams, 0) < 0) { virErrorPtr err = virGetLastError(); if (err && err->code == VIR_ERR_NO_SUPPORT && !flags) { if (virDomainBlockStats(dom, path, &stats, sizeof(stats)) < 0) @@ -5162,6 +5155,14 @@ case VIR_DOMAIN_MEMORY_STAT_RSS: (void)hv_store (RETVAL, "rss", 3, virt_newSVll(stats[i].val), 0); break; + + case VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE: + (void)hv_store (RETVAL, "last_update", 11, virt_newSVll(stats[i].val), 0); + break; + + case VIR_DOMAIN_MEMORY_STAT_USABLE: + (void)hv_store (RETVAL, "usable", 6, virt_newSVll(stats[i].val), 0); + break; } } Safefree(stats); @@ -8120,6 +8121,8 @@ REGISTER_CONSTANT(VIR_DOMAIN_MEMORY_STAT_AVAILABLE, MEMORY_STAT_AVAILABLE); REGISTER_CONSTANT(VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON, MEMORY_STAT_ACTUAL_BALLOON); REGISTER_CONSTANT(VIR_DOMAIN_MEMORY_STAT_RSS, MEMORY_STAT_RSS); + REGISTER_CONSTANT(VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE, MEMORY_STAT_LAST_UPDATE); + REGISTER_CONSTANT(VIR_DOMAIN_MEMORY_STAT_USABLE, MEMORY_STAT_USABLE); REGISTER_CONSTANT_STR(VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC, BLOCK_IOTUNE_TOTAL_BYTES_SEC); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Sys-Virt-2.0.0/lib/Sys/Virt/Domain.pm new/Sys-Virt-2.1.0/lib/Sys/Virt/Domain.pm --- old/Sys-Virt-2.0.0/lib/Sys/Virt/Domain.pm 2016-07-01 15:27:09.000000000 +0200 +++ new/Sys-Virt-2.1.0/lib/Sys/Virt/Domain.pm 2016-08-02 18:54:59.000000000 +0200 @@ -3593,6 +3593,14 @@ Actual balloon limit +=item Sys::Virt::Domain::MEMORY_STAT_USABLE + +Amount of usable memory + +=item Sys::Virt::Domain::MEMORY_STAT_LAST_UPDATE + +Time of last stats refresh from guest + =back =head2 DOMAIN LIST CONSTANTS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Sys-Virt-2.0.0/lib/Sys/Virt.pm new/Sys-Virt-2.1.0/lib/Sys/Virt.pm --- old/Sys-Virt-2.0.0/lib/Sys/Virt.pm 2016-07-01 15:27:09.000000000 +0200 +++ new/Sys-Virt-2.1.0/lib/Sys/Virt.pm 2016-08-02 18:54:59.000000000 +0200 @@ -78,7 +78,7 @@ use Sys::Virt::DomainSnapshot; use Sys::Virt::Stream; -our $VERSION = '2.0.0'; +our $VERSION = '2.1.0'; require XSLoader; XSLoader::load('Sys::Virt', $VERSION); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Sys-Virt-2.0.0/perl-Sys-Virt.spec new/Sys-Virt-2.1.0/perl-Sys-Virt.spec --- old/Sys-Virt-2.0.0/perl-Sys-Virt.spec 2016-07-01 15:27:23.000000000 +0200 +++ new/Sys-Virt-2.1.0/perl-Sys-Virt.spec 2016-08-02 19:23:40.000000000 +0200 @@ -1,7 +1,7 @@ # Automatically generated by perl-Sys-Virt.spec.PL Name: perl-Sys-Virt -Version: 2.0.0 +Version: 2.1.0 Release: 1%{?dist}%{?extra_release} Summary: Represent and manage a libvirt hypervisor connection License: GPLv2+ or Artistic ++++++ suse-set-migration-constraints.patch ++++++ --- /var/tmp/diff_new_pack.MtQh11/_old 2016-08-31 00:11:21.000000000 +0200 +++ /var/tmp/diff_new_pack.MtQh11/_new 2016-08-31 00:11:21.000000000 +0200 @@ -2,11 +2,11 @@ References: fate#316614, bsc#859868 -Index: Sys-Virt-2.0.0/Virt.xs +Index: Sys-Virt-2.1.0/Virt.xs =================================================================== ---- Sys-Virt-2.0.0.orig/Virt.xs -+++ Sys-Virt-2.0.0/Virt.xs -@@ -4646,7 +4646,7 @@ _migrate(dom, destcon, newparams, flags= +--- Sys-Virt-2.1.0.orig/Virt.xs ++++ Sys-Virt-2.1.0/Virt.xs +@@ -4639,7 +4639,7 @@ _migrate(dom, destcon, newparams, flags= virTypedParameterPtr params; int nparams; CODE: @@ -15,7 +15,7 @@ Newx(params, nparams, virTypedParameter); strncpy(params[0].field, VIR_MIGRATE_PARAM_URI, -@@ -4709,6 +4709,22 @@ _migrate(dom, destcon, newparams, flags= +@@ -4702,6 +4702,22 @@ _migrate(dom, destcon, newparams, flags= VIR_TYPED_PARAM_FIELD_LENGTH); params[14].type = VIR_TYPED_PARAM_INT; @@ -38,7 +38,7 @@ nparams = vir_typed_param_from_hv(newparams, params, nparams); vir_typed_param_add_string_list_from_hv(newparams, &params, &nparams, -@@ -4737,7 +4753,7 @@ _migrate_to_uri(dom, desturi, newparams, +@@ -4730,7 +4746,7 @@ _migrate_to_uri(dom, desturi, newparams, virTypedParameterPtr params; int nparams; PPCODE: @@ -47,7 +47,7 @@ Newx(params, nparams, virTypedParameter); strncpy(params[0].field, VIR_MIGRATE_PARAM_URI, -@@ -4800,6 +4816,22 @@ _migrate_to_uri(dom, desturi, newparams, +@@ -4793,6 +4809,22 @@ _migrate_to_uri(dom, desturi, newparams, VIR_TYPED_PARAM_FIELD_LENGTH); params[14].type = VIR_TYPED_PARAM_INT; @@ -70,7 +70,7 @@ nparams = vir_typed_param_from_hv(newparams, params, nparams); vir_typed_param_add_string_list_from_hv(newparams, &params, &nparams, -@@ -7847,6 +7879,10 @@ BOOT: +@@ -7848,6 +7880,10 @@ BOOT: REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_PERSIST_XML, MIGRATE_PARAM_PERSIST_XML); REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_AUTO_CONVERGE_INITIAL, MIGRATE_PARAM_AUTO_CONVERGE_INITIAL); REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT, MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT); @@ -81,10 +81,10 @@ REGISTER_CONSTANT(VIR_DOMAIN_XML_SECURE, XML_SECURE); REGISTER_CONSTANT(VIR_DOMAIN_XML_INACTIVE, XML_INACTIVE); -Index: Sys-Virt-2.0.0/lib/Sys/Virt/Domain.pm +Index: Sys-Virt-2.1.0/lib/Sys/Virt/Domain.pm =================================================================== ---- Sys-Virt-2.0.0.orig/lib/Sys/Virt/Domain.pm -+++ Sys-Virt-2.0.0/lib/Sys/Virt/Domain.pm +--- Sys-Virt-2.1.0.orig/lib/Sys/Virt/Domain.pm ++++ Sys-Virt-2.1.0/lib/Sys/Virt/Domain.pm @@ -1096,6 +1096,22 @@ The initial percentage to throttle guest The additional percentage step size to throttle guest vCPUs if progress is not made

1 0

commit libvirt-python for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libvirt-python for openSUSE:Factory checked in at 2016-08-31 00:09:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt-python (Old) and /work/SRC/openSUSE:Factory/.libvirt-python.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt-python" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt-python/libvirt-python.changes 2016-07-14 09:43:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt-python.new/libvirt-python.changes 2016-08-31 00:11:16.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Aug 20 23:08:23 UTC 2016 - jfehlig(a)suse.com + +- Update to 2.1.0 + - Add all new APIs and constants in libvirt 2.1.0 + +------------------------------------------------------------------- Old: ---- libvirt-python-2.0.0.tar.gz libvirt-python-2.0.0.tar.gz.asc New: ---- libvirt-python-2.1.0.tar.gz libvirt-python-2.1.0.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt-python.spec ++++++ --- /var/tmp/diff_new_pack.rPYozY/_old 2016-08-31 00:11:19.000000000 +0200 +++ /var/tmp/diff_new_pack.rPYozY/_new 2016-08-31 00:11:19.000000000 +0200 @@ -18,7 +18,7 @@ Name: libvirt-python Url: http://libvirt.org/ -Version: 2.0.0 +Version: 2.1.0 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ ++++++ libvirt-python-2.0.0.tar.gz -> libvirt-python-2.1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-2.0.0/AUTHORS new/libvirt-python-2.1.0/AUTHORS --- old/libvirt-python-2.0.0/AUTHORS 2016-07-01 11:09:01.000000000 +0200 +++ new/libvirt-python-2.1.0/AUTHORS 2016-08-02 10:36:15.000000000 +0200 @@ -46,6 +46,7 @@ Marcelo Cerri <mhcerri(a)linux.vnet.ibm.com> Marian Neagul <marian(a)info.uvt.ro> Mark McLoughlin <markmc(a)redhat.com> + Markus Rothe <markusr815(a)gmail.com> Martin Kletzander <mkletzan(a)redhat.com> MATSUDA Daiki <matsudadik(a)intellilink.co.jp> Matthias Bolte <matthias.bolte(a)googlemail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-2.0.0/ChangeLog new/libvirt-python-2.1.0/ChangeLog --- old/libvirt-python-2.0.0/ChangeLog 2016-07-01 11:09:01.000000000 +0200 +++ new/libvirt-python-2.1.0/ChangeLog 2016-08-02 10:36:15.000000000 +0200 @@ -1,3 +1,23 @@ +2016-07-28 Markus Rothe <markusr815(a)gmail.com> + + allow pkg-config binary to be set by env + https://bugzilla.redhat.com/show_bug.cgi?id=1350523 + + +2016-07-25 Pavel Hrdina <phrdina(a)redhat.com> + + Post-release version bump to 2.1.0 + + +2016-07-23 Pavel Hrdina <phrdina(a)redhat.com> + + Fix crash in storage pool refresh callback + Fixes copy-paste typo introduced by commit cb84e36c. + + Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1354271 + + + 2016-06-24 Daniel P. Berrange <berrange(a)redhat.com> Add support for storage pool refesh callback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-2.0.0/PKG-INFO new/libvirt-python-2.1.0/PKG-INFO --- old/libvirt-python-2.0.0/PKG-INFO 2016-07-01 11:09:01.000000000 +0200 +++ new/libvirt-python-2.1.0/PKG-INFO 2016-08-02 10:36:15.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: libvirt-python -Version: 2.0.0 +Version: 2.1.0 Summary: The libvirt virtualization API Home-page: http://www.libvirt.org Author: Libvirt Maintainers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-2.0.0/examples/event-test.py new/libvirt-python-2.1.0/examples/event-test.py --- old/libvirt-python-2.0.0/examples/event-test.py 2016-07-01 10:52:22.000000000 +0200 +++ new/libvirt-python-2.1.0/examples/event-test.py 2016-08-02 10:26:59.000000000 +0200 @@ -580,7 +580,7 @@ storageEventToString(event), detail)) -def myStoragePoolEventRefreshCallback(conn, pool, event, detail, opaque): +def myStoragePoolEventRefreshCallback(conn, pool, opaque): print("myStoragePoolEventRefreshCallback: Storage pool %s" % pool.name()) ########################################################################## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-2.0.0/libvirt-override.c new/libvirt-python-2.1.0/libvirt-override.c --- old/libvirt-python-2.0.0/libvirt-override.c 2016-07-01 10:52:22.000000000 +0200 +++ new/libvirt-python-2.1.0/libvirt-override.c 2016-08-02 10:26:59.000000000 +0200 @@ -8862,7 +8862,7 @@ /* Call the Callback Dispatcher */ pyobj_ret = PyObject_CallMethod(pyobj_conn, (char*)"_dispatchStoragePoolEventGenericCallback", - (char*)"OiiO", + (char*)"OO", pyobj_pool, pyobj_cbData); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-2.0.0/libvirt-python.spec new/libvirt-python-2.1.0/libvirt-python.spec --- old/libvirt-python-2.0.0/libvirt-python.spec 2016-07-01 11:09:01.000000000 +0200 +++ new/libvirt-python-2.1.0/libvirt-python.spec 2016-08-02 10:36:15.000000000 +0200 @@ -6,7 +6,7 @@ Summary: The libvirt virtualization API python2 binding Name: libvirt-python -Version: 2.0.0 +Version: 2.1.0 Release: 1%{?dist}%{?extra_release} Source0: http://libvirt.org/sources/python/%{name}-%{version}.tar.gz Url: http://libvirt.org diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvirt-python-2.0.0/setup.py new/libvirt-python-2.1.0/setup.py --- old/libvirt-python-2.0.0/setup.py 2016-07-01 10:52:22.000000000 +0200 +++ new/libvirt-python-2.1.0/setup.py 2016-08-02 10:26:59.000000000 +0200 @@ -28,6 +28,8 @@ def get_pkgcfg(do_fail=True): global _pkgcfg if _pkgcfg == -1: + _pkgcfg = os.getenv('PKG_CONFIG') + if _pkgcfg is None: _pkgcfg = distutils.spawn.find_executable("pkg-config") if _pkgcfg is None and do_fail: raise Exception("pkg-config binary is required to compile libvirt-python") @@ -305,7 +307,7 @@ _c_modules, _py_modules = get_module_lists() setup(name = 'libvirt-python', - version = '2.0.0', + version = '2.1.0', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com',

1 0

commit kdenlive for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kdenlive for openSUSE:Factory checked in at 2016-08-31 00:09:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdenlive (Old) and /work/SRC/openSUSE:Factory/.kdenlive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdenlive" Changes: -------- --- /work/SRC/openSUSE:Factory/kdenlive/kdenlive.changes 2016-07-24 19:45:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdenlive.new/kdenlive.changes 2016-08-31 00:11:14.000000000 +0200 @@ -1,0 +2,22 @@ +Fri Aug 19 18:02:53 UTC 2016 - wbauer(a)tmo.at + +- Require libqt5-qtquickcontrols, it doesn't start without it (boo#994649) +- Minimum required mlt version is 6.0.0 now + +------------------------------------------------------------------- +Fri Aug 12 10:14:27 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:55:59 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kdenlive-16.04.3.tar.xz New: ---- kdenlive-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenlive.spec ++++++ --- /var/tmp/diff_new_pack.kuIjdH/_old 2016-08-31 00:11:15.000000000 +0200 +++ /var/tmp/diff_new_pack.kuIjdH/_new 2016-08-31 00:11:15.000000000 +0200 @@ -16,16 +16,16 @@ # -%define mlt_version 0.9.8 +%define mlt_version 6.0.0 Name: kdenlive -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Non-linear video editor License: GPL-3.0+ Group: Productivity/Multimedia/Video/Editors and Convertors Url: http://www.kdenlive.org/ -Source0: http://download.kde.org/stable/applications/16.04.3/src/%{name}-%{version}.… +Source0: http://download.kde.org/stable/applications/16.08.0/src/%{name}-%{version}.… Patch1: use-mlt_datadir.patch BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -75,6 +75,8 @@ Requires: %(rpm -qf $(readlink -qne %{_libdir}/libmlt.so) --qf '%{NAME}')-modules # It requires the profiles Requires: %(rpm -qf $(readlink -qne %{_libdir}/libmlt.so) --qf '%{NAME}')-data +# It doesn't start without it (boo#994649) +Requires: libqt5-qtquickcontrols Recommends: %{_bindir}/dvdauthor Recommends: %{_bindir}/dvgrab Recommends: %{_bindir}/ffmpeg ++++++ kdenlive-16.04.3.tar.xz -> kdenlive-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdenlive/kdenlive-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kdenlive.new/kdenlive-16.08.0.tar.xz differ: char 27, line 1

1 0

commit kscd for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kscd for openSUSE:Factory checked in at 2016-08-31 00:09:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kscd (Old) and /work/SRC/openSUSE:Factory/.kscd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kscd" Changes: -------- --- /work/SRC/openSUSE:Factory/kscd/kscd.changes 2016-07-24 19:52:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kscd.new/kscd.changes 2016-08-31 00:11:11.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:40:59 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 16:04:02 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.04.3 + * KDE Applications 16.04.3 + * https://www.kde.org/announcements/announce-applications-16.04.3.php + + +------------------------------------------------------------------- Old: ---- kscd-16.04.3.tar.xz New: ---- kscd-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kscd.spec ++++++ --- /var/tmp/diff_new_pack.MBXOIW/_old 2016-08-31 00:11:14.000000000 +0200 +++ /var/tmp/diff_new_pack.MBXOIW/_new 2016-08-31 00:11:14.000000000 +0200 @@ -18,15 +18,15 @@ Name: kscd BuildRequires: alsa-devel +BuildRequires: libdiscid-devel BuildRequires: libkde4-devel BuildRequires: libmusicbrainz5-devel -BuildRequires: libdiscid-devel BuildRequires: xz Summary: CD Player License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM migrate-to-musicbrainz5.patch -- build against libmusicbrainz5 ++++++ kscd-16.04.3.tar.xz -> kscd-16.08.0.tar.xz ++++++

1 0

commit kde-l10n for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kde-l10n for openSUSE:Factory checked in at 2016-08-31 00:09:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde-l10n (Old) and /work/SRC/openSUSE:Factory/.kde-l10n.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kde-l10n" Changes: -------- --- /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n.changes 2016-07-24 19:50:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n.changes 2016-08-31 00:09:53.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 18:11:10 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 16:01:43 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kde-l10n-ar-16.04.3.tar.xz kde-l10n-ast-16.04.3.tar.xz kde-l10n-bg-16.04.3.tar.xz kde-l10n-bs-16.04.3.tar.xz kde-l10n-ca-16.04.3.tar.xz kde-l10n-ca(a)valencia-16.04.3.tar.xz kde-l10n-cs-16.04.3.tar.xz kde-l10n-da-16.04.3.tar.xz kde-l10n-de-16.04.3.tar.xz kde-l10n-el-16.04.3.tar.xz kde-l10n-en_GB-16.04.3.tar.xz kde-l10n-eo-16.04.3.tar.xz kde-l10n-es-16.04.3.tar.xz kde-l10n-et-16.04.3.tar.xz kde-l10n-eu-16.04.3.tar.xz kde-l10n-fa-16.04.3.tar.xz kde-l10n-fi-16.04.3.tar.xz kde-l10n-fr-16.04.3.tar.xz kde-l10n-ga-16.04.3.tar.xz kde-l10n-gl-16.04.3.tar.xz kde-l10n-he-16.04.3.tar.xz kde-l10n-hi-16.04.3.tar.xz kde-l10n-hr-16.04.3.tar.xz kde-l10n-hu-16.04.3.tar.xz kde-l10n-ia-16.04.3.tar.xz kde-l10n-id-16.04.3.tar.xz kde-l10n-is-16.04.3.tar.xz kde-l10n-it-16.04.3.tar.xz kde-l10n-ja-16.04.3.tar.xz kde-l10n-kk-16.04.3.tar.xz kde-l10n-km-16.04.3.tar.xz kde-l10n-ko-16.04.3.tar.xz kde-l10n-lt-16.04.3.tar.xz kde-l10n-lv-16.04.3.tar.xz kde-l10n-mr-16.04.3.tar.xz kde-l10n-nb-16.04.3.tar.xz kde-l10n-nds-16.04.3.tar.xz kde-l10n-nl-16.04.3.tar.xz kde-l10n-nn-16.04.3.tar.xz kde-l10n-pa-16.04.3.tar.xz kde-l10n-pl-16.04.3.tar.xz kde-l10n-pt-16.04.3.tar.xz kde-l10n-pt_BR-16.04.3.tar.xz kde-l10n-ro-16.04.3.tar.xz kde-l10n-ru-16.04.3.tar.xz kde-l10n-sk-16.04.3.tar.xz kde-l10n-sl-16.04.3.tar.xz kde-l10n-sr-16.04.3.tar.xz kde-l10n-sv-16.04.3.tar.xz kde-l10n-tr-16.04.3.tar.xz kde-l10n-ug-16.04.3.tar.xz kde-l10n-uk-16.04.3.tar.xz kde-l10n-wa-16.04.3.tar.xz kde-l10n-zh_CN-16.04.3.tar.xz kde-l10n-zh_TW-16.04.3.tar.xz New: ---- kde-l10n-ar-16.08.0.tar.xz kde-l10n-ast-16.08.0.tar.xz kde-l10n-bg-16.08.0.tar.xz kde-l10n-bs-16.08.0.tar.xz kde-l10n-ca-16.08.0.tar.xz kde-l10n-ca(a)valencia-16.08.0.tar.xz kde-l10n-cs-16.08.0.tar.xz kde-l10n-da-16.08.0.tar.xz kde-l10n-de-16.08.0.tar.xz kde-l10n-el-16.08.0.tar.xz kde-l10n-en_GB-16.08.0.tar.xz kde-l10n-eo-16.08.0.tar.xz kde-l10n-es-16.08.0.tar.xz kde-l10n-et-16.08.0.tar.xz kde-l10n-eu-16.08.0.tar.xz kde-l10n-fa-16.08.0.tar.xz kde-l10n-fi-16.08.0.tar.xz kde-l10n-fr-16.08.0.tar.xz kde-l10n-ga-16.08.0.tar.xz kde-l10n-gl-16.08.0.tar.xz kde-l10n-he-16.08.0.tar.xz kde-l10n-hi-16.08.0.tar.xz kde-l10n-hr-16.08.0.tar.xz kde-l10n-hu-16.08.0.tar.xz kde-l10n-ia-16.08.0.tar.xz kde-l10n-id-16.08.0.tar.xz kde-l10n-is-16.08.0.tar.xz kde-l10n-it-16.08.0.tar.xz kde-l10n-ja-16.08.0.tar.xz kde-l10n-kk-16.08.0.tar.xz kde-l10n-km-16.08.0.tar.xz kde-l10n-ko-16.08.0.tar.xz kde-l10n-lt-16.08.0.tar.xz kde-l10n-lv-16.08.0.tar.xz kde-l10n-mr-16.08.0.tar.xz kde-l10n-nb-16.08.0.tar.xz kde-l10n-nds-16.08.0.tar.xz kde-l10n-nl-16.08.0.tar.xz kde-l10n-nn-16.08.0.tar.xz kde-l10n-pa-16.08.0.tar.xz kde-l10n-pl-16.08.0.tar.xz kde-l10n-pt-16.08.0.tar.xz kde-l10n-pt_BR-16.08.0.tar.xz kde-l10n-ro-16.08.0.tar.xz kde-l10n-ru-16.08.0.tar.xz kde-l10n-sk-16.08.0.tar.xz kde-l10n-sl-16.08.0.tar.xz kde-l10n-sr-16.08.0.tar.xz kde-l10n-sv-16.08.0.tar.xz kde-l10n-tr-16.08.0.tar.xz kde-l10n-ug-16.08.0.tar.xz kde-l10n-uk-16.08.0.tar.xz kde-l10n-wa-16.08.0.tar.xz kde-l10n-zh_CN-16.08.0.tar.xz kde-l10n-zh_TW-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde-l10n.spec ++++++ --- /var/tmp/diff_new_pack.VqZGlh/_old 2016-08-31 00:10:12.000000000 +0200 +++ /var/tmp/diff_new_pack.VqZGlh/_new 2016-08-31 00:10:12.000000000 +0200 @@ -18,7 +18,7 @@ Name: kde-l10n -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: KDE translations base package License: GPL-2.0+ @@ -1493,6 +1493,13 @@ echo "%dir %{_kde4_appsdir}/step/objinfo/l10n/$i" echo "%lang($l) %{_kde4_appsdir}/step/objinfo/l10n/$i/*" fi + if test -f %{buildroot}%{_datadir}/step/objinfo/l10n/$i/Box.html; then + echo "%dir %{_datadir}/step" + echo "%dir %{_datadir}/step/objinfo" + echo "%dir %{_datadir}/step/objinfo/l10n" + echo "%dir %{_datadir}/step/objinfo/l10n/$i" + echo "%lang($l) %{_datadir}/step/objinfo/l10n/$i/*" + fi if test -f %{buildroot}%{_kde4_appsdir}/khangman/$i.txt; then echo "%dir %{_kde4_appsdir}/khangman" echo "%lang($l) %{_kde4_appsdir}/khangman/$i.txt" ++++++ kde-l10n-ar-16.04.3.tar.xz -> kde-l10n-ar-16.08.0.tar.xz ++++++ ++++ 145740 lines of diff (skipped) ++++++ kde-l10n-ast-16.04.3.tar.xz -> kde-l10n-ast-16.08.0.tar.xz ++++++ ++++ 140484 lines of diff (skipped) ++++++ kde-l10n-bg-16.04.3.tar.xz -> kde-l10n-bg-16.08.0.tar.xz ++++++ ++++ 123485 lines of diff (skipped) ++++++ kde-l10n-bs-16.04.3.tar.xz -> kde-l10n-bs-16.08.0.tar.xz ++++++ ++++ 147779 lines of diff (skipped) ++++++ kde-l10n-ca-16.04.3.tar.xz -> kde-l10n-ca-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-ca-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-ca-16.08.0.tar.xz differ: char 27, line 1 ++++++ kde-l10n-ca(a)valencia-16.04.3.tar.xz -> kde-l10n-ca(a)valencia-16.08.0.tar.xz ++++++ ++++ 137179 lines of diff (skipped) ++++++ kde-l10n-cs-16.04.3.tar.xz -> kde-l10n-cs-16.08.0.tar.xz ++++++ ++++ 137559 lines of diff (skipped) ++++++ kde-l10n-da-16.04.3.tar.xz -> kde-l10n-da-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-da-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-da-16.08.0.tar.xz differ: char 27, line 1 ++++++ kde-l10n-de-16.04.3.tar.xz -> kde-l10n-de-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-de-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-de-16.08.0.tar.xz differ: char 25, line 1 ++++++ kde-l10n-el-16.04.3.tar.xz -> kde-l10n-el-16.08.0.tar.xz ++++++ ++++ 164958 lines of diff (skipped) ++++++ kde-l10n-en_GB-16.04.3.tar.xz -> kde-l10n-en_GB-16.08.0.tar.xz ++++++ ++++ 178221 lines of diff (skipped) ++++++ kde-l10n-eo-16.04.3.tar.xz -> kde-l10n-eo-16.08.0.tar.xz ++++++ ++++ 131704 lines of diff (skipped) ++++++ kde-l10n-es-16.04.3.tar.xz -> kde-l10n-es-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-es-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-es-16.08.0.tar.xz differ: char 25, line 1 ++++++ kde-l10n-et-16.04.3.tar.xz -> kde-l10n-et-16.08.0.tar.xz ++++++ ++++ 224211 lines of diff (skipped) ++++++ kde-l10n-eu-16.04.3.tar.xz -> kde-l10n-eu-16.08.0.tar.xz ++++++ ++++ 90828 lines of diff (skipped) ++++++ kde-l10n-fa-16.04.3.tar.xz -> kde-l10n-fa-16.08.0.tar.xz ++++++ ++++ 88538 lines of diff (skipped) ++++++ kde-l10n-fi-16.04.3.tar.xz -> kde-l10n-fi-16.08.0.tar.xz ++++++ ++++ 150295 lines of diff (skipped) ++++++ kde-l10n-fr-16.04.3.tar.xz -> kde-l10n-fr-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-fr-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-fr-16.08.0.tar.xz differ: char 27, line 1 ++++++ kde-l10n-ga-16.04.3.tar.xz -> kde-l10n-ga-16.08.0.tar.xz ++++++ ++++ 144425 lines of diff (skipped) ++++++ kde-l10n-gl-16.04.3.tar.xz -> kde-l10n-gl-16.08.0.tar.xz ++++++ ++++ 209027 lines of diff (skipped) ++++++ kde-l10n-he-16.04.3.tar.xz -> kde-l10n-he-16.08.0.tar.xz ++++++ ++++ 119158 lines of diff (skipped) ++++++ kde-l10n-hi-16.04.3.tar.xz -> kde-l10n-hi-16.08.0.tar.xz ++++++ ++++ 119271 lines of diff (skipped) ++++++ kde-l10n-hr-16.04.3.tar.xz -> kde-l10n-hr-16.08.0.tar.xz ++++++ ++++ 124329 lines of diff (skipped) ++++++ kde-l10n-hu-16.04.3.tar.xz -> kde-l10n-hu-16.08.0.tar.xz ++++++ ++++ 159677 lines of diff (skipped) ++++++ kde-l10n-ia-16.04.3.tar.xz -> kde-l10n-ia-16.08.0.tar.xz ++++++ ++++ 77899 lines of diff (skipped) ++++++ kde-l10n-id-16.04.3.tar.xz -> kde-l10n-id-16.08.0.tar.xz ++++++ ++++ 7962 lines of diff (skipped) ++++++ kde-l10n-is-16.04.3.tar.xz -> kde-l10n-is-16.08.0.tar.xz ++++++ ++++ 111680 lines of diff (skipped) ++++++ kde-l10n-it-16.04.3.tar.xz -> kde-l10n-it-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-it-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-it-16.08.0.tar.xz differ: char 25, line 1 ++++++ kde-l10n-ja-16.04.3.tar.xz -> kde-l10n-ja-16.08.0.tar.xz ++++++ ++++ 140460 lines of diff (skipped) ++++++ kde-l10n-kk-16.04.3.tar.xz -> kde-l10n-kk-16.08.0.tar.xz ++++++ ++++ 147433 lines of diff (skipped) ++++++ kde-l10n-km-16.04.3.tar.xz -> kde-l10n-km-16.08.0.tar.xz ++++++ ++++ 121703 lines of diff (skipped) ++++++ kde-l10n-ko-16.04.3.tar.xz -> kde-l10n-ko-16.08.0.tar.xz ++++++ ++++ 124196 lines of diff (skipped) ++++++ kde-l10n-lt-16.04.3.tar.xz -> kde-l10n-lt-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-lt-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-lt-16.08.0.tar.xz differ: char 27, line 1 ++++++ kde-l10n-lv-16.04.3.tar.xz -> kde-l10n-lv-16.08.0.tar.xz ++++++ ++++ 131249 lines of diff (skipped) ++++++ kde-l10n-mr-16.04.3.tar.xz -> kde-l10n-mr-16.08.0.tar.xz ++++++ ++++ 128105 lines of diff (skipped) ++++++ kde-l10n-nb-16.04.3.tar.xz -> kde-l10n-nb-16.08.0.tar.xz ++++++ ++++ 76711 lines of diff (skipped) ++++++ kde-l10n-nds-16.04.3.tar.xz -> kde-l10n-nds-16.08.0.tar.xz ++++++ ++++ 165064 lines of diff (skipped) ++++++ kde-l10n-nl-16.04.3.tar.xz -> kde-l10n-nl-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-nl-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-nl-16.08.0.tar.xz differ: char 29, line 1 ++++++ kde-l10n-nn-16.04.3.tar.xz -> kde-l10n-nn-16.08.0.tar.xz ++++++ ++++ 107666 lines of diff (skipped) ++++++ kde-l10n-pa-16.04.3.tar.xz -> kde-l10n-pa-16.08.0.tar.xz ++++++ ++++ 129432 lines of diff (skipped) ++++++ kde-l10n-pl-16.04.3.tar.xz -> kde-l10n-pl-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-pl-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-pl-16.08.0.tar.xz differ: char 27, line 1 ++++++ kde-l10n-pt-16.04.3.tar.xz -> kde-l10n-pt-16.08.0.tar.xz ++++++ ++++ 241074 lines of diff (skipped) ++++++ kde-l10n-pt_BR-16.04.3.tar.xz -> kde-l10n-pt_BR-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-pt_BR-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-pt_BR-16.08.0.tar.xz differ: char 27, line 1 ++++++ kde-l10n-ro-16.04.3.tar.xz -> kde-l10n-ro-16.08.0.tar.xz ++++++ ++++ 157338 lines of diff (skipped) ++++++ kde-l10n-ru-16.04.3.tar.xz -> kde-l10n-ru-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-ru-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-ru-16.08.0.tar.xz differ: char 27, line 1 ++++++ kde-l10n-sk-16.04.3.tar.xz -> kde-l10n-sk-16.08.0.tar.xz ++++++ ++++ 145236 lines of diff (skipped) ++++++ kde-l10n-sl-16.04.3.tar.xz -> kde-l10n-sl-16.08.0.tar.xz ++++++ ++++ 151416 lines of diff (skipped) ++++++ kde-l10n-sr-16.04.3.tar.xz -> kde-l10n-sr-16.08.0.tar.xz ++++++ ++++ 261138 lines of diff (skipped) ++++++ kde-l10n-sv-16.04.3.tar.xz -> kde-l10n-sv-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-sv-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-sv-16.08.0.tar.xz differ: char 27, line 1 ++++++ kde-l10n-tr-16.04.3.tar.xz -> kde-l10n-tr-16.08.0.tar.xz ++++++ ++++ 160910 lines of diff (skipped) ++++++ kde-l10n-ug-16.04.3.tar.xz -> kde-l10n-ug-16.08.0.tar.xz ++++++ ++++ 129630 lines of diff (skipped) ++++++ kde-l10n-uk-16.04.3.tar.xz -> kde-l10n-uk-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-uk-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-uk-16.08.0.tar.xz differ: char 27, line 1 ++++++ kde-l10n-wa-16.04.3.tar.xz -> kde-l10n-wa-16.08.0.tar.xz ++++++ ++++ 64466 lines of diff (skipped) ++++++ kde-l10n-zh_CN-16.04.3.tar.xz -> kde-l10n-zh_CN-16.08.0.tar.xz ++++++ ++++ 149022 lines of diff (skipped) ++++++ kde-l10n-zh_TW-16.04.3.tar.xz -> kde-l10n-zh_TW-16.08.0.tar.xz ++++++ ++++ 168285 lines of diff (skipped) ++++++ kde-l10n.spec.in ++++++ --- /var/tmp/diff_new_pack.VqZGlh/_old 2016-08-31 00:11:10.000000000 +0200 +++ /var/tmp/diff_new_pack.VqZGlh/_new 2016-08-31 00:11:10.000000000 +0200 @@ -18,7 +18,7 @@ # icecream 0 Name: kde-l10n -Version: 16.04.3 +Version: 16.08.0 Release: 0 License: GPL-2.0+ Summary: English translations for KDE @@ -223,6 +223,13 @@ echo "%dir %{_kde4_appsdir}/step/objinfo/l10n/$i" echo "%lang($l) %{_kde4_appsdir}/step/objinfo/l10n/$i/*" fi + if test -f %{buildroot}%{_datadir}/step/objinfo/l10n/$i/Box.html; then + echo "%dir %{_datadir}/step" + echo "%dir %{_datadir}/step/objinfo" + echo "%dir %{_datadir}/step/objinfo/l10n" + echo "%dir %{_datadir}/step/objinfo/l10n/$i" + echo "%lang($l) %{_datadir}/step/objinfo/l10n/$i/*" + fi if test -f %{buildroot}%{_kde4_appsdir}/khangman/$i.txt; then echo "%dir %{_kde4_appsdir}/khangman" echo "%lang($l) %{_kde4_appsdir}/khangman/$i.txt"

1 0

commit umbrello for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package umbrello for openSUSE:Factory checked in at 2016-08-31 00:09:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/umbrello (Old) and /work/SRC/openSUSE:Factory/.umbrello.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "umbrello" Changes: -------- --- /work/SRC/openSUSE:Factory/umbrello/umbrello.changes 2016-07-24 19:49:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.umbrello.new/umbrello.changes 2016-08-31 00:09:40.000000000 +0200 @@ -1,0 +2,22 @@ +Fri Aug 12 12:46:37 UTC 2016 - wbauer(a)tmo.at + +- Don't rename the icon files any more, this breaks the build as + they are not found + +------------------------------------------------------------------- +Fri Aug 12 10:33:05 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:56:29 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- umbrello-16.04.3.tar.xz New: ---- umbrello-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ umbrello.spec ++++++ --- /var/tmp/diff_new_pack.rKlYwy/_old 2016-08-31 00:09:41.000000000 +0200 +++ /var/tmp/diff_new_pack.rKlYwy/_new 2016-08-31 00:09:41.000000000 +0200 @@ -24,7 +24,7 @@ License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,18 +35,6 @@ %prep %setup -q -n %{name}-%{version} -#Fix icons -cd umbrello/pics/global -mv 128-apps-umbrello.png hi128-apps-umbrello.png -mv 16-apps-umbrello.png hi16-apps-umbrello.png -mv 16-mimetypes-application-x-uml.png hi16-mimetypes-application-x-uml.png -mv 22-apps-umbrello.png hi22-apps-umbrello.png -mv 32-apps-umbrello.png hi32-apps-umbrello.png -mv 32-mimetypes-application-x-uml.png hi32-mimetypes-application-x-uml.png -mv 48-apps-umbrello.png hi48-apps-umbrello.png -mv 64-apps-umbrello.png hi64-apps-umbrello.png -mv sc-apps-umbrello.svgz hisc-apps-umbrello.svgz - %build %ifarch ppc64 ++++++ umbrello-16.04.3.tar.xz -> umbrello-16.08.0.tar.xz ++++++ ++++ 13359 lines of diff (skipped)

1 0

commit svgpart for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package svgpart for openSUSE:Factory checked in at 2016-08-31 00:09:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/svgpart (Old) and /work/SRC/openSUSE:Factory/.svgpart.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "svgpart" Changes: -------- --- /work/SRC/openSUSE:Factory/svgpart/svgpart.changes 2016-07-24 19:49:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.svgpart.new/svgpart.changes 2016-08-31 00:09:36.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:32:38 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:55:34 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- svgpart-16.04.3.tar.xz New: ---- svgpart-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ svgpart.spec ++++++ --- /var/tmp/diff_new_pack.hOkTs7/_old 2016-08-31 00:09:37.000000000 +0200 +++ /var/tmp/diff_new_pack.hOkTs7/_new 2016-08-31 00:09:37.000000000 +0200 @@ -17,7 +17,7 @@ Name: svgpart -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: SVG viewer component License: GPL-2.0+ ++++++ svgpart-16.04.3.tar.xz -> svgpart-16.08.0.tar.xz ++++++

1 0

commit step for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package step for openSUSE:Factory checked in at 2016-08-31 00:09:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/step (Old) and /work/SRC/openSUSE:Factory/.step.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "step" Changes: -------- --- /work/SRC/openSUSE:Factory/step/step.changes 2016-07-24 19:49:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.step.new/step.changes 2016-08-31 00:09:32.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:32:31 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:55:14 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- step-16.04.3.tar.xz New: ---- step-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ step.spec ++++++ --- /var/tmp/diff_new_pack.6nusEC/_old 2016-08-31 00:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.6nusEC/_new 2016-08-31 00:09:33.000000000 +0200 @@ -17,7 +17,7 @@ Name: step -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: An interactive physics simulator License: GPL-2.0+ ++++++ step-16.04.3.tar.xz -> step-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/step-16.04.3/CMakeLists.txt new/step-16.08.0/CMakeLists.txt --- old/step-16.04.3/CMakeLists.txt 2016-07-05 17:09:32.000000000 +0200 +++ new/step-16.08.0/CMakeLists.txt 2016-06-26 10:48:44.000000000 +0200 @@ -70,6 +70,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${EIGEN3_INCLUDE_DIR}) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + if(KF5DocTools_FOUND) ecm_optional_add_subdirectory(doc) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/step-16.04.3/doc/index.docbook new/step-16.08.0/doc/index.docbook --- old/step-16.04.3/doc/index.docbook 2016-07-05 17:09:32.000000000 +0200 +++ new/step-16.08.0/doc/index.docbook 2016-06-26 10:48:44.000000000 +0200 @@ -1,7 +1,6 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&step;"> - <!ENTITY package "kdeedu"> <!ENTITY tutorials SYSTEM "tutorials.docbook"> <!ENTITY examples SYSTEM "examples.docbook"> <!ENTITY % addindex "IGNORE"> @@ -31,8 +30,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2007-12-06</date> -<releaseinfo>0.0.3</releaseinfo> +<date>2016-05-07</date> +<releaseinfo>0.1.0 (Applications 16.04)</releaseinfo> <abstract> <para> @@ -254,27 +253,6 @@ </chapter> - - -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-step"> -<title>How to obtain &step;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> - -</appendix> - &documentation.index; </book> <!-- Files old/step-16.04.3/doc/mainwindow.png and new/step-16.08.0/doc/mainwindow.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/step-16.04.3/doc/tutorials.docbook new/step-16.08.0/doc/tutorials.docbook --- old/step-16.04.3/doc/tutorials.docbook 2016-07-05 17:09:32.000000000 +0200 +++ new/step-16.08.0/doc/tutorials.docbook 2016-06-26 10:48:44.000000000 +0200 @@ -8,7 +8,7 @@ <para>Each tutorial consists in some text presenting the new elements and explaining their properties. Then you are asked to change some properties of the elements in order to achieve a new result of the experiment. </para> <sect1 id="tutorial1"> -<title>Tutorial 1: bodies and springs</title> +<title>Tutorial 1: Bodies and springs</title> <para>This tutorial presents you bodies and springs and how to start your first simulation.</para> <para>A physical body or body for short is an object which can be described by the theories of classical mechanics, or quantum mechanics, and experimented upon with physical instruments. This includes the determination of position, and in some cases the orientation in space, as well as means to change these, by exerting forces.</para> <para>A spring is a flexible elastic object used to store mechanical energy.</para> @@ -28,7 +28,7 @@ </sect1> <sect1 id="tutorial2"> -<title>Tutorial 2: controllers and graphs</title> +<title>Tutorial 2: Controllers and graphs</title> <para>You will learn more about controllers and graphs in this tutorial.</para> <para>A controller is a device which allows you to graphically modify a property of a body or a spring. In the tutorial, the controller allows you to change the stiffness of the spring "spring1". By moving the slider to the right or using the W key you can increase spring1 stiffness value and by moving the slider to the left or using the Q key you can decrease it. Right-clicking on the controller brings you several context actions and the <guilabel>Configure Controller...</guilabel> dialog allows you to change each property of the controller.</para> <screenshot> @@ -47,7 +47,7 @@ </sect1> <sect1 id="tutorial3"> -<title>Tutorial 3: rigid bodies and tracers</title> +<title>Tutorial 3: Rigid bodies and tracers</title> <para>Tutorial 3 presents you rigid bodies and tracers.</para> <para>A rigid body is an idealization of a solid body of finite size in which deformation is neglected. In other words, the distance between any two given points of a rigid body remains constant in time regardless of external forces exerted on it.</para> <para>A tracer is a tool which shows the trajectory of a given point on a rigid body.</para> @@ -78,7 +78,7 @@ </sect1> <sect1 id="tutorial4"> -<title>Tutorial 4: motors and forces</title> +<title>Tutorial 4: Motors and forces</title> <para>You have two sorts of motors available in &step;: linear motors and circular motors. A linear motor applies a constant force to a given point on a body while a circular motor applies a constant angular momentum to a body.</para> <para>Three different forces can be added to bodies: the weight force, the gravitation force and the Coulomb force. By default all forces are turned off in &step;. Coulomb force is a force which existed intrinsically between two charges.</para> <screenshot> @@ -109,7 +109,7 @@ </sect1> <sect1 id="tutorial5"> -<title>Tutorial 5: joints</title> +<title>Tutorial 5: Joints</title> <para>Joints are objects that attaches bodies to each other or to the background. You have a the following joints in &step;: anchors, pins and sticks. An anchor is a joint that fixes position of the body. The body cannot move when it has an anchor. A pin is a joint that fixes one point of the body, the body can still move around the pin. A stick is a joint that fixes the distance between two points on two bodies.</para> <screenshot> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/step-16.04.3/step/infobrowser.cc new/step-16.08.0/step/infobrowser.cc --- old/step-16.04.3/step/infobrowser.cc 2016-07-05 17:09:32.000000000 +0200 +++ new/step-16.08.0/step/infobrowser.cc 2016-06-26 10:48:44.000000000 +0200 @@ -30,8 +30,8 @@ #include <KHTMLPart> #include <KLocalizedString> -#include <KToolInvocation> #include <KIO/Job> +#include <QDesktopServices> #include <QIcon> #include <QStandardPaths> @@ -112,8 +112,9 @@ void InfoBrowser::syncSelection(bool checked) { if(checked) { - QModelIndex current = _worldModel->selectionModel()->currentIndex(); - openUrl(QString("objinfo:").append(current.data(WorldModel::ClassNameRole).toString()), true); + const QModelIndex current = _worldModel->selectionModel()->currentIndex(); + const QUrl url(QString("objinfo:").append(current.data(WorldModel::ClassNameRole).toString())); + openUrl(url, true); } } @@ -211,7 +212,7 @@ _wikiJob = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo); connect(_wikiJob, SIGNAL(result(KJob*)), this, SLOT( wikiResult(KJob*))); } else { - KToolInvocation::invokeBrowser(url.url()); + QDesktopServices::openUrl(url); } } @@ -255,7 +256,7 @@ _forwardAction->setEnabled(true); } - openUrl(url, false, true); + openUrl(QUrl(url), false, true); } void InfoBrowser::forward() @@ -272,13 +273,13 @@ _backAction->setEnabled(true); } - openUrl(url, false, true); + openUrl(QUrl(url), false, true); } void InfoBrowser::openInBrowser() { if(_htmlPart->url().scheme() == "http") { - KToolInvocation::invokeBrowser(_htmlPart->url().url()); + QDesktopServices::openUrl(_htmlPart->url()); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/step-16.04.3/step/toolgraphics.cc new/step-16.08.0/step/toolgraphics.cc --- old/step-16.04.3/step/toolgraphics.cc 2016-07-05 17:09:32.000000000 +0200 +++ new/step-16.08.0/step/toolgraphics.cc 2016-06-26 10:48:44.000000000 +0200 @@ -733,7 +733,7 @@ formula->setImage(image); _textEdit->document()->addResource(QTextDocument::ImageResource, - formula->name(), pixmap); + QUrl(formula->name()), pixmap); return true; } @@ -748,7 +748,7 @@ if((*it)->metaObject()->inherits<StepCore::NoteImage>()) { QPixmap pix; pix.loadFromData(static_cast<StepCore::NoteImage*>(*it)->image()); - _textEdit->document()->addResource(QTextDocument::ImageResource, (*it)->name(), pix); + _textEdit->document()->addResource(QTextDocument::ImageResource, QUrl((*it)->name()), pix); } }

1 0

commit rocs for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package rocs for openSUSE:Factory checked in at 2016-08-31 00:09:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rocs (Old) and /work/SRC/openSUSE:Factory/.rocs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rocs" Changes: -------- --- /work/SRC/openSUSE:Factory/rocs/rocs.changes 2016-07-24 19:49:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rocs.new/rocs.changes 2016-08-31 00:09:28.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:32:16 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:54:44 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- rocs-16.04.3.tar.xz New: ---- rocs-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rocs.spec ++++++ --- /var/tmp/diff_new_pack.36FQql/_old 2016-08-31 00:09:29.000000000 +0200 +++ /var/tmp/diff_new_pack.36FQql/_new 2016-08-31 00:09:29.000000000 +0200 @@ -17,7 +17,7 @@ Name: rocs -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Graph Theory IDE License: GPL-3.0+ @@ -103,8 +103,8 @@ %{_kf5_sharedir}/rocs/ %{_kf5_bindir}/rocs %{_kf5_configkcfgdir}/ -%dir %{_kf5_sharedir}/appdata -%{_kf5_sharedir}/appdata/org.kde.rocs.appdata.xml +%dir %{_kf5_appstreamdir} +%{_kf5_appstreamdir}/org.kde.rocs.appdata.xml %{_kf5_sharedir}/kxmlgui5/ %{_kf5_plugindir}/ %{_kf5_iconsdir}/hicolor/*/*/* ++++++ rocs-16.04.3.tar.xz -> rocs-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-16.04.3/CMakeLists.txt new/rocs-16.08.0/CMakeLists.txt --- old/rocs-16.04.3/CMakeLists.txt 2016-04-18 21:26:08.000000000 +0200 +++ new/rocs-16.08.0/CMakeLists.txt 2016-06-23 23:45:40.000000000 +0200 @@ -70,6 +70,7 @@ ${Boost_INCLUDE_DIRS} ) +add_definitions(-fext-numeric-literals) add_definitions(-DQT_NO_CAST_TO_ASCII) add_definitions(-DQT_NO_URL_CAST_FROM_STRING) remove_definitions(-DQT_NO_CAST_FROM_ASCII) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-16.04.3/doc/chapterImportExport.docbook new/rocs-16.08.0/doc/chapterImportExport.docbook --- old/rocs-16.04.3/doc/chapterImportExport.docbook 2016-04-18 21:26:08.000000000 +0200 +++ new/rocs-16.08.0/doc/chapterImportExport.docbook 1970-01-01 01:00:00.000000000 +0100 @@ -1,85 +0,0 @@ -<chapter id="import-export"> -<title>Import and Export</title> -<sect1 id="import-export-projects"> - <title>Exchange &rocs; Projects</title> - <para> - &rocs; projects can be imported and exported as archived <literal>.tar.gz</literal> files. - These archives can be used to exchange projects. - Import and Export can be done with <menuchoice><guimenu>Graph Document</guimenu> <guimenuitem>Import Graph</guimenuitem></menuchoice> and <menuchoice><guimenu>Graph Document</guimenu> <guimenuitem>Export Graph as</guimenuitem></menuchoice>, respectively. - </para> -</sect1> - -<sect1 id="import-export-graphs"> - <title>Import and Export of Graph Documents</title> - <para>&rocs; currently supports import and export of the following file formats:</para> - <itemizedlist> - <listitem><para>DOT files, also known as Graphviz files</para></listitem> - <listitem><para>GML files</para></listitem> - <listitem><para>Trivial Graph Format files</para></listitem> - <listitem><para>Keyhole Markup Language Format</para></listitem> - </itemizedlist> - -<sect2 id="format-specification-tgf"> -<title>Trivial Graph File Format</title> -<para> - The <emphasis>Trivial Graph Format</emphasis> (TGF) is a simple text-based file format for describing graphs. - A TGF file consists of a list of node definitions, that map the node IDs to labels, followed by a list of the edges. - In this format it is only possible to have one label per node and one value per edge. - &rocs; interprets imported graphs as undirected graphs. - Exported graphs will contain two edges per connection if connections are bidirectional. -</para> - -<sect3> -<title>Format Specification</title> - <itemizedlist> - <listitem><para>The file starts with a list of nodes (one node per line), followed by a line with the only character "#", followed by a list of edges (one edge per line).</para></listitem> - <listitem><para>A node consists of an integer (identifier), followed by a space, followed by an arbitrary string.</para></listitem> - <listitem><para>An edge consists of two integers (identifiers) separated by a space, followed by a space, followed by an arbitrary string. It is assumed that the directed edge points from the first identifier to the second identifier.</para></listitem> - </itemizedlist> -</sect3> -<sect3> -<title>Example</title> -<programlisting> -1 starting node -2 transmitter -3 sink -# -1 2 blue -2 1 red -2 3 green -</programlisting> -</sect3> -</sect2> - -<sect2 id="format-specification-dot"> -<title>DOT Language / Graphviz Graph File Format</title> -<para> - The DOT language is a plain text graph description language that allows both,a good human readable representation of graphs as well as an efficient processing by graph layout programs. - DOT is the default file format for the Graphviz graph visualization suite, but is also widely used by other graph tools. - The usual file endings for DOT are <emphasis>.gv</emphasis> and <emphasis>.dot</emphasis>. -</para> - -<sect3> -<title>Unsupported Features</title> -<para> - &rocs; can parse every graph file that contains a graph specified according to the DOT language specification<footnote><para>http://www.graphviz.org/content/dot-language</para></footnote>. - The support of language features is complete, despite of the following exceptions: -</para> - <itemizedlist> - <listitem><para>subgraph: Due to the lack of a subgraph concept in &rocs;, subgraphs are only imported as a set of date elements and connections. Especially, connections to or from subgraphs are not imported.</para></listitem> - <listitem><para>&HTML; and &XML; attributes: Attributes (like labels) that contain &HTML; or &XML; syntax are read unchanged. Especially, not adjustment of fonts and styles are read from those attributes.</para></listitem> - </itemizedlist> -</sect3> -<sect3> -<title>Example</title> -<programlisting> -digraph myGraph { - a -> b -> c; - b -> d; -} -</programlisting> -</sect3> -</sect2> - -</sect1> -</chapter> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-16.04.3/doc/index.docbook new/rocs-16.08.0/doc/index.docbook --- old/rocs-16.04.3/doc/index.docbook 2016-04-18 21:26:08.000000000 +0200 +++ new/rocs-16.08.0/doc/index.docbook 2016-06-23 23:45:40.000000000 +0200 @@ -2,15 +2,9 @@ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&rocs;"> - <!ENTITY package "rocs"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> - <!ENTITY apiConsole SYSTEM "apiConsole.docbook"> - <!ENTITY apiDatastructure SYSTEM "apiDatastructure.docbook"> - <!ENTITY apiGraphstructure SYSTEM "apiGraphstructure.docbook"> - - <!ENTITY chapterImportExport SYSTEM "chapterImportExport.docbook"> ]> <book id="rocs" lang="&language;"> @@ -35,14 +29,14 @@  </authorgroup> -<date>2015-03-13</date> -<releaseinfo>2.0.0 &kde; 15.04</releaseinfo> +<date>2016-04-10</date> +<releaseinfo>Rocs 2.1.50 (Applications 16.04)</releaseinfo> <legalnotice>&FDLNotice;</legalnotice> <abstract> <para> -&rocs; is a graph theory tool for &kde;. +&rocs; is a graph theory tool by &kde;. </para> </abstract> @@ -278,7 +272,7 @@ format="PNG"/></imageobject></inlinemediaobject><guibutton>Create Edge</guibutton> tools, for creating new elements on the whiteboard. Note the extra-toolbar for selecting the respective node or edge type that becomes visible of one of these tools is selected. Also tools for selecting and moving as well as deleting elements are available here. - For details see <xref linkend="user-interface-toolbars" />. + For details see <xref linkend="user-interface-toolbar" />. </para></listitem> </varlistentry> <varlistentry> @@ -288,7 +282,6 @@ <itemizedlist> <listitem><para>Element Types: This widget gives you direct access to the available edge and node types.</para></listitem> <listitem><para>Journal: Each project has its own journal that can be used to, &eg; note tasks, results, or observations.</para></listitem> - <listitem><para>Handbook: To get direct access to the handbook and by this to the script documentation, you can open this widget.</para></listitem> <listitem><para>Scripting API: To get direct access to the script documentation, you can open this widget.</para></listitem> </itemizedlist> </para></listitem> @@ -298,7 +291,7 @@ <listitem><para> In this text editor you can write algorithms as explained in detail in <xref linkend="scripting" />. You can work on several script documents simultaneously by using several tabs. - The disk symbol at a tab appears if the script contains unsaved changes. +  </para></listitem> </varlistentry> <varlistentry> @@ -319,17 +312,9 @@ </variablelist> </sect1> -<sect1 id="user-interface-toolbars"> -<title>Toolbars</title> -<para>There are different toolbars for the graph editor that allow you to access features by only one click. Per default, the following toolbars are shown:</para> -<itemizedlist> - <listitem><para>Main Toolbar</para></listitem> - -</itemizedlist> - -<sect2 id="user-interface-toolbars-main"> -<title>Main Toolbar</title> -<para>The <emphasis>Main Toolbar</emphasis> consists of the following actions. Clicking at an action means that your mouse pointer applies this action at the graph editor whiteboard:</para> +<sect1 id="user-interface-toolbar"> +<title>Graph Editor Toolbar</title> +<para>This toolbar consists of the following actions. Clicking at an action means that your mouse pointer applies this action at the graph editor whiteboard:</para> <itemizedlist> <listitem><para> <inlinemediaobject><imageobject> @@ -353,69 +338,23 @@ </inlinemediaobject> <guilabel>Delete</guilabel>: Click at an element to delete it. If you delete a node, all adjacent edges are also deleted.</para></listitem> </itemizedlist> -</sect2> - - </sect1> -</chapter> + +</chapter> <chapter id="scripting"> -<title>Executing Algorithms in &rocs;</title> +<title>Scripting</title> +<sect1> + <title>Executing Algorithms in &rocs;</title> <para> -&rocs; internally uses the QtScript Java Script engine +&rocs; internally uses the QtScript Java Script engine.  This means, all algorithms that you implement must use Java Script. In the following, we explain how to access and change elements of a graph document from the scripting engine. It is important to note that changes done by the scripting engine are directly reflected at the properties at the graph editor elements. </para> -<sect1 id="scripting-controls"> +<sect2> <title>Control Script Execution</title> <para> There are different execution modes for your algorithms: @@ -426,30 +365,15 @@ <imagedata fileref="hi22-actions-controls-run.png" format="PNG"/></imageobject> </inlinemediaobject> <guilabel>Run</guilabel>: Execute the script until it finishes.</para></listitem> - - <listitem><para> <inlinemediaobject><imageobject> <imagedata fileref="hi22-actions-control-stop.png" format="PNG"/></imageobject> </inlinemediaobject> <guilabel>Stop</guilabel>: Stop script execution (only available while a script is executed).</para></listitem> </itemizedlist> -</sect1> +</sect2> -<sect1 id="scripting-output"> +<sect2> <title>Script Output</title> <para> During the execution of an algorithm, debug and program output is displayed in the <emphasis>Debug & Script Output</emphasis>. @@ -464,9 +388,9 @@ Console.debug(string message); // displays the message as debug output Console.error(string message); // displays the message as error output </programlisting> -</sect1> +</sect2> -<sect1 id="scripting-API"> +<sect2> <title>Scripting Engine API</title> <para> The different parts of &rocs; each provide a static element that can be accessed by the scripting engine. @@ -477,12 +401,94 @@ </itemizedlist> For the explicit API use and for a method reference, please see the inline help at the &rocs; side bar. </para> +</sect2> </sect1> </chapter> +<chapter id="import-export"> +<title>Import and Export</title> +<sect1 id="import-export-projects"> + <title>Exchange &rocs; Projects</title> + <para> + &rocs; projects can be imported and exported as archived <literal>.tar.gz</literal> files. + These archives can be used to exchange projects. + Import and Export can be done with <menuchoice><guimenu>Graph Document</guimenu> <guimenuitem>Import Graph</guimenuitem></menuchoice> and <menuchoice><guimenu>Graph Document</guimenu> <guimenuitem>Export Graph as</guimenuitem></menuchoice>, respectively. + </para> + +<sect2 id="import-export-graphs"> + <title>Import and Export of Graph Documents</title> + <para>&rocs; currently supports import and export of the following file formats:</para> + <itemizedlist> + <listitem><para>DOT files, also known as Graphviz files</para></listitem> + <listitem><para>GML files</para></listitem> + <listitem><para>Trivial Graph Format files</para></listitem> + <listitem><para>Keyhole Markup Language Format</para></listitem> + </itemizedlist> + +<sect3 id="format-specification-tgf"> +<title>Trivial Graph File Format</title> +<para> + The <emphasis>Trivial Graph Format</emphasis> (TGF) is a simple text-based file format for describing graphs. + A TGF file consists of a list of node definitions, that map the node IDs to labels, followed by a list of the edges. + In this format it is only possible to have one label per node and one value per edge. + &rocs; interprets imported graphs as undirected graphs. + Exported graphs will contain two edges per connection if connections are bidirectional. +</para> + +<sect4> +<title>Format Specification</title> + <itemizedlist> + <listitem><para>The file starts with a list of nodes (one node per line), followed by a line with the only character "#", followed by a list of edges (one edge per line).</para></listitem> + <listitem><para>A node consists of an integer (identifier), followed by a space, followed by an arbitrary string.</para></listitem> + <listitem><para>An edge consists of two integers (identifiers) separated by a space, followed by a space, followed by an arbitrary string. It is assumed that the directed edge points from the first identifier to the second identifier.</para></listitem> + </itemizedlist> +</sect4> +<sect4> +<title>Example</title> +<programlisting> +1 starting node +2 transmitter +3 sink +# +1 2 blue +2 1 red +2 3 green +</programlisting> +</sect4> +</sect3> -&chapterImportExport; - +<sect3 id="format-specification-dot"> +<title>DOT Language / Graphviz Graph File Format</title> +<para> + The DOT language is a plain text graph description language that allows both,a good human readable representation of graphs as well as an efficient processing by graph layout programs. + DOT is the default file format for the Graphviz graph visualization suite, but is also widely used by other graph tools. + The usual file extensions for DOT are <emphasis>.gv</emphasis> and <emphasis>.dot</emphasis>. +</para> + +<sect4> +<title>Unsupported Features</title> +<para> + &rocs; can parse every graph file that contains a graph specified according to the DOT language specification<footnote><para>http://www.graphviz.org/content/dot-language</para></footnote>. + The support of language features is complete, despite of the following exceptions: +</para> + <itemizedlist> + <listitem><para>subgraph: Due to the lack of a subgraph concept in &rocs;, subgraphs are only imported as a set of date elements and connections. Especially, connections to or from subgraphs are not imported.</para></listitem> + <listitem><para>&HTML; and &XML; attributes: Attributes (like labels) that contain &HTML; or &XML; syntax are read unchanged. Especially, not adjustment of fonts and styles are read from those attributes.</para></listitem> + </itemizedlist> +</sect4> +<sect4> +<title>Example</title> +<programlisting> +digraph myGraph { + a -> b -> c; + b -> d; +} +</programlisting> +</sect4> +</sect3> +</sect2> +</sect1> +</chapter> <chapter id="credits"> <title>Credits and License</title> @@ -511,24 +517,6 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-rocs"> -<title>How to obtain &rocs;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - &documentation.index; </book> <!-- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-16.04.3/libgraphtheory/editorplugins/assignvalues/assignvaluesplugin.json new/rocs-16.08.0/libgraphtheory/editorplugins/assignvalues/assignvaluesplugin.json --- old/rocs-16.04.3/libgraphtheory/editorplugins/assignvalues/assignvaluesplugin.json 2016-04-18 21:26:08.000000000 +0200 +++ new/rocs-16.08.0/libgraphtheory/editorplugins/assignvalues/assignvaluesplugin.json 2016-06-23 23:45:40.000000000 +0200 @@ -6,7 +6,6 @@ "Description[ca@valencia]": "Assigna valors a les arestes i nodes del graf.", "Description[ca]": "Assigna valors a les arestes i nodes del graf.", "Description[de]": "Werte zu Graphenkanten und -knoten zuweisen.", - "Description[en_GB]": "Assign values to graph edges and nodes.", "Description[es]": "Asignar valores a aristas de grafos y a nodos.", "Description[et]": "Väärtuste omistamine graafi seostele ja tippudele.", "Description[fi]": "Sijoita arvot graafin väleihin ja solmuihin.", @@ -24,7 +23,6 @@ "Description[tr]": "Değerleri grafik kenarlarına ve düğümlerine ata.", "Description[uk]": "Додавання значень до ребер та вузлів графу.", "Description[x-test]": "xxAssign values to graph edges and nodes.xx", - "Description[zh_TW]": "指定值給圖形邊緣與節點。", "Id": "rocs_assignvaluesplugin", "License": "GPL", "Name": "Assign Values Plugin", @@ -33,7 +31,6 @@ "Name[ca]": "Connector per assignar valors", "Name[cs]": "Modul pro přiřazování hodnot", "Name[de]": "Wertzuweisungs-Modul", - "Name[en_GB]": "Assign Values Plugin", "Name[es]": "Complemento para asignar valores", "Name[et]": "Väärtuste omistamise plugin", "Name[fi]": "Sijoita arvot -liitännäinen", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-16.04.3/libgraphtheory/editorplugins/generategraph/generategraphplugin.json new/rocs-16.08.0/libgraphtheory/editorplugins/generategraph/generategraphplugin.json --- old/rocs-16.04.3/libgraphtheory/editorplugins/generategraph/generategraphplugin.json 2016-04-18 21:26:08.000000000 +0200 +++ new/rocs-16.08.0/libgraphtheory/editorplugins/generategraph/generategraphplugin.json 2016-06-23 23:45:40.000000000 +0200 @@ -7,7 +7,6 @@ "Description[ca@valencia]": "Això genera un nou graf segons un patró.", "Description[ca]": "Això genera un nou graf segons un patró.", "Description[de]": "Erstellt anhand eines Musters einen neuen Graphen.", - "Description[en_GB]": "This generates a new graph by a pattern.", "Description[es]": "Esto genera un nuevo grafo usando un patrón.", "Description[et]": "Uue graafi genereerimine mustri järgi.", "Description[fi]": "Tämä generoi uuden graafin mallin perusteella.", @@ -25,7 +24,6 @@ "Description[tr]": "Bu, bir desene göre bir grafik oluşturur.", "Description[uk]": "Створює новий граф за шаблоном.", "Description[x-test]": "xxThis generates a new graph by a pattern.xx", - "Description[zh_TW]": "依樣式產生新的圖形。", "Id": "rocs_generategraphplugin", "License": "GPL", "Name": "Generate Graph", @@ -38,7 +36,6 @@ "Name[da]": "Generér graf", "Name[de]": "Graphen erstellen", "Name[el]": "Δημιουργία γράφου", - "Name[en_GB]": "Generate Graph", "Name[es]": "Generar grafo", "Name[et]": "Graafi genereerimine", "Name[fi]": "Generoi graafi", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-16.04.3/libgraphtheory/editorplugins/transformedges/transformedgesplugin.json new/rocs-16.08.0/libgraphtheory/editorplugins/transformedges/transformedgesplugin.json --- old/rocs-16.04.3/libgraphtheory/editorplugins/transformedges/transformedgesplugin.json 2016-04-18 21:26:08.000000000 +0200 +++ new/rocs-16.08.0/libgraphtheory/editorplugins/transformedges/transformedgesplugin.json 2016-06-23 23:45:40.000000000 +0200 @@ -7,7 +7,6 @@ "Description[ca@valencia]": "Transforma les arestes del graf seguint una regla de transformació.", "Description[ca]": "Transforma les arestes del graf seguint una regla de transformació.", "Description[de]": "Graphenkanten mittels Transformationsregel umformen.", - "Description[en_GB]": "Transform graph edges by a transformation rule.", "Description[es]": "Transforma las aristas del grafo usando una regla de transformación.", "Description[et]": "Graafi seoste teisendamine vastava reegli järgi.", "Description[fi]": "Muuntaa graafin välit säännön mukaan.", @@ -25,7 +24,6 @@ "Description[tr]": "Grafik kenarlarını bir dönüştürme kuralı ile dönüştür.", "Description[uk]": "Перетворити ребра графу за правилом перетворення.", "Description[x-test]": "xxTransform graph edges by a transformation rule.xx", - "Description[zh_TW]": "依轉換規則來轉換圖形邊緣。", "Id": "rocs_transformedges", "License": "GPL", "Name": "Transform Edges", @@ -36,7 +34,6 @@ "Name[da]": "Transformér kanter", "Name[de]": "Kanten umformen", "Name[el]": "Μετασχηματισμός ακμών", - "Name[en_GB]": "Transform Edges", "Name[es]": "Transformar aristas", "Name[et]": "Seoste teisendamine", "Name[fi]": "Muunna välit", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-16.04.3/libgraphtheory/fileformats/dot/dotfileformat.json new/rocs-16.08.0/libgraphtheory/fileformats/dot/dotfileformat.json --- old/rocs-16.04.3/libgraphtheory/fileformats/dot/dotfileformat.json 2016-04-18 21:26:08.000000000 +0200 +++ new/rocs-16.08.0/libgraphtheory/fileformats/dot/dotfileformat.json 2016-06-23 23:45:40.000000000 +0200 @@ -8,7 +8,6 @@ "Description[ca]": "Llegeix i escriu documents gràfics del Graphviz (DOT).", "Description[cs]": "Čte a ukládá soubory grafů Graphviz (DOT)", "Description[de]": "Graphviz-Graphendokumente (DOT) lesen und schreiben", - "Description[en_GB]": "Read and write Graphviz graph documents (DOT)", "Description[es]": "Leer y escribir documentos de grafos Graphviz (DOT)", "Description[et]": "Graphvizi graafidokumentide (DOT) lugemine ja kirjutamine.", "Description[fi]": "Lukee ja kirjoittaa Graphviz-graafitiedostoja (DOT)", @@ -26,7 +25,6 @@ "Description[tr]": "Graphviz grafik belgelerini oku ve yaz (DOT)", "Description[uk]": "Читання і запис файлів документів графів Graphviz (DOT)", "Description[x-test]": "xxRead and write Graphviz graph documents (DOT)xx", - "Description[zh_TW]": "讀寫 Graphviz 圖形檔 (DOT)。", "Id": "rocs_dotfileformat", "License": "GPL", "Name": "DOT Graph File Format", @@ -35,7 +33,6 @@ "Name[ca]": "Format de fitxer de grafs DOT", "Name[cs]": "Formát souborů grafů DOT", "Name[de]": "DOT-Graphendateiformat", - "Name[en_GB]": "DOT Graph File Format", "Name[es]": "Formato de archivo de grafos DOT", "Name[et]": "DOT graafifailivorming", "Name[fi]": "DOT-graafitiedostomuoto", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-16.04.3/libgraphtheory/fileformats/gml/gmlfileformat.json new/rocs-16.08.0/libgraphtheory/fileformats/gml/gmlfileformat.json --- old/rocs-16.04.3/libgraphtheory/fileformats/gml/gmlfileformat.json 2016-04-18 21:26:08.000000000 +0200 +++ new/rocs-16.08.0/libgraphtheory/fileformats/gml/gmlfileformat.json 2016-06-23 23:45:40.000000000 +0200 @@ -8,7 +8,6 @@ "Description[ca]": "Llegeix i escriu fitxers escrits en Llenguatge de Marcatge de Gràfics (GML)", "Description[cs]": "Číst a ukládat dokumenty Graph Markup Language (GML)", "Description[de]": "Dokumente im Format „Graph Markup Language“ (GML) lesen und schreiben", - "Description[en_GB]": "Read and write Graph Markup Language documents (GML)", "Description[es]": "Leer y escribir documentos del lenguaje de marcas de grafos (GML)", "Description[et]": "GML (Graph Markup Language) dokumentide lugemine ja kirjutamine.", "Description[fi]": "Lukee ja kirjoittaa Graph Markup Language (GML) -tiedostoja", @@ -26,7 +25,6 @@ "Description[tr]": "Graph İşaret Dili belgelerini oku ve yaz (GML)", "Description[uk]": "Читання і запис файлів у форматі Graph Markup Language (GML).", "Description[x-test]": "xxRead and write Graph Markup Language documents (GML)xx", - "Description[zh_TW]": "讀寫 Graph Markup Language 文件 (GML) 。", "Id": "rocs_gmlfileformat", "License": "GPL", "Name": "GML File Format", @@ -35,7 +33,6 @@ "Name[ca]": "Format de fitxer GML", "Name[cs]": "Formát souboru GML", "Name[de]": "GML-Dateiformat", - "Name[en_GB]": "GML File Format", "Name[es]": "Formato de archivo GML", "Name[et]": "GML-failivorming", "Name[fi]": "GML-tiedostomuoto", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-16.04.3/libgraphtheory/fileformats/rocs1/rocs1fileformat.json new/rocs-16.08.0/libgraphtheory/fileformats/rocs1/rocs1fileformat.json --- old/rocs-16.04.3/libgraphtheory/fileformats/rocs1/rocs1fileformat.json 2016-04-18 21:26:08.000000000 +0200 +++ new/rocs-16.08.0/libgraphtheory/fileformats/rocs1/rocs1fileformat.json 2016-06-23 23:45:40.000000000 +0200 @@ -8,7 +8,6 @@ "Description[ca]": "Format de fitxers de grafs del Rocs (antic)", "Description[cs]": "Formát souborů grafů Rocs (starý)", "Description[de]": "Rocs-Graphendatei-Format (veraltet)", - "Description[en_GB]": "Rocs Graph File Format (old)", "Description[es]": "Formato de archivo de grafos de Rocs (antiguo)", "Description[et]": "Rocsi graafifaili vorming (vana)", "Description[fi]": "Rocsin graafitiedostomuoto (vanha)", @@ -26,7 +25,6 @@ "Description[tr]": "Rocs Grafik Dosya Biçimi (eski)", "Description[uk]": "формат файлів графів Rocs (застарілий)", "Description[x-test]": "xxRocs Graph File Format (old)xx", - "Description[zh_TW]": "Rocs 圖形檔格式(舊式)", "Id": "rocs_rocs1fileformat", "License": "GPL", "Name": "Rocs File Format (old)", @@ -35,7 +33,6 @@ "Name[ca]": "Format de fitxer del Rocs (antic)", "Name[cs]": "Formát souborů Rocs (starý)", "Name[de]": "Rocs-Dateiformat (veraltet)", - "Name[en_GB]": "Rocs File Format (old)", "Name[es]": "Formato de archivo de Rocs (antiguo)", "Name[et]": "Rocsi failivorming (vana)", "Name[fi]": "Rocsin tiedostomuoto (vanha)", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-16.04.3/libgraphtheory/fileformats/rocs2/rocs2fileformat.json new/rocs-16.08.0/libgraphtheory/fileformats/rocs2/rocs2fileformat.json --- old/rocs-16.04.3/libgraphtheory/fileformats/rocs2/rocs2fileformat.json 2016-04-18 21:26:08.000000000 +0200 +++ new/rocs-16.08.0/libgraphtheory/fileformats/rocs2/rocs2fileformat.json 2016-06-23 23:45:40.000000000 +0200 @@ -8,7 +8,6 @@ "Description[ca]": "Format de fitxers de graf del Rocs", "Description[cs]": "Formát souborů grafů Rocs", "Description[de]": "Rocs-Graphendatei-Format", - "Description[en_GB]": "Rocs Graph File Format", "Description[es]": "Formato de archivo de grafos de Rocs", "Description[et]": "Rocsi graafifaili vorming", "Description[fi]": "Rocsin graafitiedostomuoto", @@ -26,7 +25,6 @@ "Description[tr]": "Rocs Grafik Dosya Biçimi", "Description[uk]": "формат файлів графів Rocs", "Description[x-test]": "xxRocs Graph File Formatxx", - "Description[zh_TW]": "Rocs 圖形檔格式", "Id": "rocs_rocs2fileformat", "License": "GPL", "Name": "Rocs File Format", @@ -35,7 +33,6 @@ "Name[ca]": "Format de fitxer del Rocs", "Name[cs]": "Formát souborů Rocs", "Name[de]": "Rocs-Dateiformat", - "Name[en_GB]": "Rocs File Format", "Name[es]": "Formato de archivo de Rocs", "Name[et]": "Rocsi failivorming", "Name[fi]": "Rocsin tiedostomuoto", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-16.04.3/libgraphtheory/fileformats/tgf/tgffileformat.json new/rocs-16.08.0/libgraphtheory/fileformats/tgf/tgffileformat.json --- old/rocs-16.04.3/libgraphtheory/fileformats/tgf/tgffileformat.json 2016-04-18 21:26:08.000000000 +0200 +++ new/rocs-16.08.0/libgraphtheory/fileformats/tgf/tgffileformat.json 2016-06-23 23:45:40.000000000 +0200 @@ -7,7 +7,6 @@ "Description[ca@valencia]": "Llig i escriu fitxers escrits en Format Gràfic Trivial (TGF)", "Description[ca]": "Llegeix i escriu fitxers escrits en Format Gràfic Trivial (TGF)", "Description[de]": "Dokumente im Format „Trivial Graph“ (TGF) lesen und schreiben", - "Description[en_GB]": "Read and write graph documents in Trivial Graph Format (TGF)", "Description[es]": "Leer y escribir documentos de grafos en el formato de grafos Trivial (TGF)", "Description[et]": "TGF (Trivial Graph Format) vormingus graafidokumentide lugemine ja kirjutamine", "Description[fi]": "Lukee ja kirjoittaa Trivial Graph Format (TGF) -muotoisia graafitiedostoja", @@ -25,7 +24,6 @@ "Description[tr]": "Grafik belgelerini Açık Grafik Biçiminde oku ve yaz (TGF)", "Description[uk]": "Читання і запис документів графів у форматі звичайного графу (TGF)", "Description[x-test]": "xxRead and write graph documents in Trivial Graph Format (TGF)xx", - "Description[zh_TW]": "讀寫 Trivial Graph Format (TGF) 格式的圖形檔。", "Id": "rocs_tgffileformat", "License": "GPL", "Name": "TGF Graph File Format", @@ -34,7 +32,6 @@ "Name[ca]": "Format de fitxer de grafs TGF", "Name[cs]": "Formát souborů grafů TGF", "Name[de]": "TGF-Graphendateiformat", - "Name[en_GB]": "TGF Graph File Format", "Name[es]": "Formato de archivo de grafos TGF", "Name[et]": "TGF graafifailivorming", "Name[fi]": "TGF-graafitiedostomuoto", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-16.04.3/libgraphtheory/fileformats/tikz/tikzfileformat.json new/rocs-16.08.0/libgraphtheory/fileformats/tikz/tikzfileformat.json --- old/rocs-16.04.3/libgraphtheory/fileformats/tikz/tikzfileformat.json 2016-04-18 21:26:08.000000000 +0200 +++ new/rocs-16.08.0/libgraphtheory/fileformats/tikz/tikzfileformat.json 2016-06-23 23:45:40.000000000 +0200 @@ -7,7 +7,6 @@ "Description[ca@valencia]": "Escriu documents gràfics en format PGF/TikZ per utilitzar-los en documents LaTeX", "Description[ca]": "Escriu documents gràfics en format PGF/TikZ per utilitzar-los en documents LaTeX", "Description[de]": "Exportiert Graphendokumente im Format PGF/TikZ zur Verwendung in LaTeX-Dokumenten", - "Description[en_GB]": "Writes graph documents in PGF/TikZ format for use in LaTeX documents", "Description[es]": "Escribe documentos de grafos en el formato PGF/TikZ para usar en documentos LaTeX", "Description[et]": "Graafidokumentide kirjutamine PGF/TikZ vormingus kasutamiseks LaTeXi dokumentides", "Description[fi]": "Kirjoittaa PGF/TikZ-muotoisia graafitiedostoja LaTeX-tiedostoissa käyttämiseen", @@ -25,7 +24,6 @@ "Description[tr]": "LaTeX belgelerinde kullanmak üzere grafik belgelerini PGF/TikZ biçiminde yazar", "Description[uk]": "Запис документів графів у форматі PGF/TikZ з метою наступного використання у документах LaTeX", "Description[x-test]": "xxWrites graph documents in PGF/TikZ format for use in LaTeX documentsxx", - "Description[zh_TW]": "寫入 PGF/TikZ 格式的圖形文件，以便在 LaTeX 文件中使用", "Id": "rocs_tikzfileformat", "License": "GPL", "Name": "PGF/TikZ Graph File Export Plugin", @@ -34,7 +32,6 @@ "Name[ca]": "Connector d'exportació del fitxer de grafs a PGF/TikZ", "Name[cs]": "Export souborů grafů PGF/TikZ", "Name[de]": "PGF/TikZ-Graphendateiexportmodul", - "Name[en_GB]": "PGF/TikZ Graph File Export Plugin", "Name[es]": "Complemento de exportación de archivo de grafos PGF/TikZ", "Name[et]": "PGF/TikZ graafifaili ekspordiplugin", "Name[fi]": "PGF/TikZ-graafitiedoston vientiliitännäinen",

1 0

commit poxml for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package poxml for openSUSE:Factory checked in at 2016-08-31 00:09:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poxml (Old) and /work/SRC/openSUSE:Factory/.poxml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "poxml" Changes: -------- --- /work/SRC/openSUSE:Factory/poxml/poxml.changes 2016-07-24 19:49:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.poxml.new/poxml.changes 2016-08-31 00:09:25.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:32:08 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:54:34 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- poxml-16.04.3.tar.xz New: ---- poxml-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poxml.spec ++++++ --- /var/tmp/diff_new_pack.wRrpPK/_old 2016-08-31 00:09:27.000000000 +0200 +++ /var/tmp/diff_new_pack.wRrpPK/_new 2016-08-31 00:09:27.000000000 +0200 @@ -28,7 +28,7 @@ License: GPL-2.0 and GFDL-1.2 Group: System/GUI/KDE Url: http://www.kde.org/ -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ poxml-16.04.3.tar.xz -> poxml-16.08.0.tar.xz ++++++

1 0

commit picmi for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package picmi for openSUSE:Factory checked in at 2016-08-31 00:09:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/picmi (Old) and /work/SRC/openSUSE:Factory/.picmi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "picmi" Changes: -------- --- /work/SRC/openSUSE:Factory/picmi/picmi.changes 2016-07-24 19:49:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.picmi.new/picmi.changes 2016-08-31 00:09:20.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:31:58 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:53:48 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- picmi-16.04.3.tar.xz New: ---- picmi-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ picmi.spec ++++++ --- /var/tmp/diff_new_pack.PKgVG7/_old 2016-08-31 00:09:21.000000000 +0200 +++ /var/tmp/diff_new_pack.PKgVG7/_new 2016-08-31 00:09:21.000000000 +0200 @@ -36,7 +36,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Logic Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: picmi-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,7 +69,7 @@ %dir %{_kf5_iconsdir}/hicolor/256x256/apps %{_kf5_iconsdir}/hicolor/*/apps/picmi.* %{_kf5_appsdir}/picmi/ -%_kf5_kxmlguidir/picmi/ -%{_datadir}/appdata/ +%{_kf5_kxmlguidir}/picmi/ +%{_kf5_appstreamdir}/ %changelog ++++++ picmi-16.04.3.tar.xz -> picmi-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-16.04.3/CMakeLists.txt new/picmi-16.08.0/CMakeLists.txt --- old/picmi-16.04.3/CMakeLists.txt 2016-04-12 14:33:30.000000000 +0200 +++ new/picmi-16.08.0/CMakeLists.txt 2016-06-12 09:38:25.000000000 +0200 @@ -28,7 +28,7 @@ find_package(KF5KDEGames 5.2.0 REQUIRED) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(FeatureSummary) include(ECMAddAppIcon) Files old/picmi-16.04.3/doc/gameboard.png and new/picmi-16.08.0/doc/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-16.04.3/doc/index.docbook new/picmi-16.08.0/doc/index.docbook --- old/picmi-16.04.3/doc/index.docbook 2016-04-12 14:33:30.000000000 +0200 +++ new/picmi-16.08.0/doc/index.docbook 2016-06-12 09:38:25.000000000 +0200 @@ -1,8 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ -<!ENTITY picmi "<application>Picmi</application>"> -<!ENTITY kappname "&picmi;"> -<!ENTITY package "kdegames"> <!ENTITY % English "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> @@ -27,8 +24,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2012-02-24</date> -<releaseinfo>2.0.0</releaseinfo> +<date>2016-05-13</date> +<releaseinfo>2.0.0 (Applications 16.04)</releaseinfo> <abstract> <para> @@ -51,6 +48,17 @@ &picmi; is a single player puzzle game. </para> +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="gameboard.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&picmi; gameboard</phrase> +</textobject> +</mediaobject> +</screenshot> + <para> The object of the game is to color cells according to numbers given at the side of the board. </para> @@ -135,6 +143,21 @@ <varlistentry> <term><menuchoice> +<shortcut> +<keycap>F5</keycap> +</shortcut> +<guimenu>Game</guimenu> +<guimenuitem>Restart</guimenuitem> +</menuchoice></term> +<listitem> +<para> +  +</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><menuchoice> <shortcut><keycap>P</keycap></shortcut> <guimenu>Game</guimenu> <guimenuitem>Pause</guimenuitem></menuchoice></term> @@ -192,14 +215,26 @@ <varlistentry> <term><menuchoice> <shortcut> -<keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo> +<keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo> </shortcut> <guimenu>Move</guimenu> -<guimenuitem>Load Position</guimenuitem> +<guimenuitem>Hint</guimenuitem> </menuchoice></term> <listitem> <para> -Loads the most recently saved position. +Marks a cell as occupied or empty. +</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><menuchoice> +<guimenu>Move</guimenu> +<guimenuitem>Solve</guimenuitem> +</menuchoice></term> +<listitem> +<para> +Play a demo game. </para> </listitem> </varlistentry> @@ -207,14 +242,14 @@ <varlistentry> <term><menuchoice> <shortcut> -<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo> +<keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo> </shortcut> <guimenu>Move</guimenu> -<guimenuitem>Save Position</guimenuitem> +<guimenuitem>Load Position</guimenuitem> </menuchoice></term> <listitem> <para> -Saves the current board position. +Loads the most recently saved position. </para> </listitem> </varlistentry> @@ -222,14 +257,14 @@ <varlistentry> <term><menuchoice> <shortcut> -<keycombo action="simul">&Ctrl;&Shift;<keycap>F</keycap></keycombo> +<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo> </shortcut> -<guimenu>Settings</guimenu> -<guimenuitem>Full Screen Mode</guimenuitem> +<guimenu>Move</guimenu> +<guimenuitem>Save Position</guimenuitem> </menuchoice></term> <listitem> <para> -Switches into full screen mode. +Saves the current board position. </para> </listitem> </varlistentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-16.04.3/org.kde.picmi.appdata.xml new/picmi-16.08.0/org.kde.picmi.appdata.xml --- old/picmi-16.04.3/org.kde.picmi.appdata.xml 2016-04-12 14:33:30.000000000 +0200 +++ new/picmi-16.08.0/org.kde.picmi.appdata.xml 2016-06-12 09:38:25.000000000 +0200 @@ -13,6 +13,7 @@ <summary xml:lang="ca-valencia">Joc de puzle basat en lògica de nombres</summary> <summary xml:lang="cs">Hra puzzle založená na číselné logice</summary> <summary xml:lang="de">Rätselspiel auf der Grundlage von Zahlenlogik</summary> + <summary xml:lang="el">Παιχνίδι γρίφος με βάση τη λογική των αριθμών</summary> <summary xml:lang="en-GB">Puzzle game based on number logic</summary> <summary xml:lang="es">Juego de rompecabezas basado en lógica numérica</summary> <summary xml:lang="fi">Lukulogiikkaan perustuva arvoituspeli</summary> @@ -31,7 +32,6 @@ <summary xml:lang="sv">Pusselspel baserat på sifferlogik</summary> <summary xml:lang="uk">Гра-головоломка, заснована на інтерпретації чисел</summary> <summary xml:lang="x-test">xxPuzzle game based on number logicxx</summary> - <summary xml:lang="zh-TW">數字邏輯的解謎遊戲</summary> <description> The goal is to reveal the hidden pattern in the board by coloring or @@ -43,6 +43,7 @@ L'objectiu és descobrir el patró ocult en el taulell acolorint o deixant en blanc les cel·les en una quadrícula d'acord amb els nombres indicats en el lateral de la quadrícula. És un joc d'un jugador. L'objectiu és descobrir el patró ocult en el taulell acolorint o deixant en blanc les cel·les en una quadrícula d'acord amb els nombres indicats en el lateral de la quadrícula. És un joc d'un jugador. Das Ziel ist, das verborgene Muster zu enthüllen, indem Sie Zellen einfärben oder leer lassen. Hinweise geben die Zahlen am Rand des Rasters. Dieses Spiel ist für einen Spieler. + Ο στόχος είναι να αποκαλυφθεί το κρυμμένο μοτίβο στον πίνακα χρωματίζοντας ή αφήνοντας κενά τα κελιά ενός καννάβου σύμφωνα με αριθμούς που δίνονται στο περιθώριο του καννάβου. Είναι παιχνίδι για έναν παίκτη. The goal is to reveal the hidden pattern in the board by coloring or leaving blank the cells in a grid according to numbers given at the side of the grid. This is a single player game. El objetivo consiste en revelar el patrón oculto en el tablero coloreando o dejando en blanco las casillas de una rejilla según los números que se muestran al lado de la rejilla. Este juego es para un único jugador. Tavoitteena on paljastaa laudan salainen hahmo värittämällä tai jättämällä tyhjiksi ruudukon soluja sen sivulla annettujen lukujen mukaan. Tämä on yksinpeli. @@ -61,7 +62,6 @@ Målet är att avslöja det dolda mönstret på spelbrädet genom att färglägga eller lämna rutorna tomma i ett rutmönster enligt de tal som anges vid sidan om rutmönstret. Detta är ett spel för en ensam spelare. Метою гри є визначення прихованого візерунка у полі для гри зафарбовуванням комірок поля відповідно до чисел, які наведено за бічною рискою поля. Грати у гру одночасно можна лише один гравець. xxThe goal is to reveal the hidden pattern in the board by coloring or leaving blank the cells in a grid according to numbers given at the side of the grid. This is a single player game.xx - 單人遊戲，依據棋盤側邊的數字來標記或留白棋盤上的每一格。 </description> <url type="homepage">https://projects.kde.org/projects/kde/kdegames/picmi</url> <screenshots>

1 0

commit parley for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package parley for openSUSE:Factory checked in at 2016-08-31 00:09:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/parley (Old) and /work/SRC/openSUSE:Factory/.parley.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "parley" Changes: -------- --- /work/SRC/openSUSE:Factory/parley/parley.changes 2016-07-24 19:49:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.parley.new/parley.changes 2016-08-31 00:09:18.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:31:47 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:53:30 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- parley-16.04.3.tar.xz New: ---- parley-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ parley.spec ++++++ --- /var/tmp/diff_new_pack.0jTIJ4/_old 2016-08-31 00:09:19.000000000 +0200 +++ /var/tmp/diff_new_pack.0jTIJ4/_new 2016-08-31 00:09:19.000000000 +0200 @@ -17,7 +17,7 @@ Name: parley -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Vocabulary Trainer License: GPL-2.0+ ++++++ parley-16.04.3.tar.xz -> parley-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/CMakeLists.txt new/parley-16.08.0/CMakeLists.txt --- old/parley-16.04.3/CMakeLists.txt 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/CMakeLists.txt 2016-07-28 15:11:23.000000000 +0200 @@ -13,6 +13,7 @@ #Allows QString concatenation to use a single memory allocation per source line. add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) set(REQUIRED_QT_VERSION "5.2") find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED @@ -22,7 +23,7 @@ Multimedia ) -find_package(KF5 5.15 MODULE REQUIRED COMPONENTS +find_package(KF5 5.22 MODULE REQUIRED COMPONENTS DocTools #to produce the docbook CoreAddons Config diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/autotests/parleyunittestutilities.cpp new/parley-16.08.0/autotests/parleyunittestutilities.cpp --- old/parley-16.04.3/autotests/parleyunittestutilities.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/autotests/parleyunittestutilities.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -51,7 +51,7 @@ doc->setAuthor( author ); doc->appendIdentifier( lang0 ); doc->setGenerator(generator); - doc->saveAs(this->fileName(), KEduVocDocument::Kvtml); + doc->saveAs(QUrl::fromLocalFile(fileName()), KEduVocDocument::Kvtml); delete doc; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/plugins/wiktionary/wiktionary_sound.py new/parley-16.08.0/plugins/wiktionary/wiktionary_sound.py --- old/parley-16.04.3/plugins/wiktionary/wiktionary_sound.py 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/plugins/wiktionary/wiktionary_sound.py 2016-07-28 15:11:23.000000000 +0200 @@ -17,9 +17,19 @@ from os import path import string import Kross +import urllib T = Kross.module("kdetranslation") +# fetch http_content +def fetch_http_content(url, params, method): + params = urllib.urlencode(params) + if method=='POST': + f = urllib.urlopen(url, params) + else: + f = urllib.urlopen(url+'?'+params) + return (f.read(), f.code) + # Connected to the action menu def fetchSound(): print "fetching sound" @@ -95,8 +105,16 @@ filename = filesdir + wikiObject.name.encode('utf-8') print filename saveas = open(filename,'w') - remote = wikiObject.download() - saveas.write(remote.read()) +# remote = wikiObject.download() +# workaround: because download method results with http response code 404 + content, response_code = fetch_http_content( + wikiObject.imageinfo['url'], + {}, + 'GET' + ) + print 'HTTP Response code: ', response_code + if(response_code == 200): + saveas.write(content) saveas.close() return filename diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/collection/collection.cpp new/parley-16.08.0/src/collection/collection.cpp --- old/parley-16.04.3/src/collection/collection.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/collection/collection.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -15,59 +15,19 @@ #include "collection.h" -#include <QTimer> -#include <QLocale> - -// KDE -#include <KEMailSettings> -#include <klocalizedstring.h> -//#include <KLocale> - // KEduVocDocument library #include <keduvocdocument.h> -#include <keduvoclesson.h> -#include <keduvocleitnerbox.h> -#include <keduvocexpression.h> -#include <keduvocwordtype.h> // Parley -#include "../config-parley.h" #include "../utils.h" -#include "prefs.h" #include "entryfilter.h" // ---------------------------------------------------------------- - -void fetchGrammar(KEduVocDocument* doc, int languageIndex) -{ - QString locale = doc->identifier(languageIndex).locale(); - - QUrl location(QStringLiteral("http://edu.kde.org/parley/locale/") + locale.split('_').at(0).toLower() + QStringLiteral(".kvtml")); - - KEduVocDocument grammarDoc; - if (grammarDoc.open(location) == KEduVocDocument::NoError) { - doc->identifier(languageIndex).setArticle(grammarDoc.identifier(0).article()); - doc->identifier(languageIndex).setPersonalPronouns(grammarDoc.identifier(0).personalPronouns()); - // @todo m_doc->identifier(index).setDeclension(grammarDoc.identifier(0).declension()); - doc->identifier(languageIndex).setTenseList(grammarDoc.identifier(0).tenseList()); - } else { - qDebug() << "Download of " << location.url() << " failed."; - } -} - -Collection::Collection(KEduVocDocument *doc, QObject* parent) - : QObject(parent) - , m_doc(doc) - , m_backupTimer(0) -{ -} - Collection::Collection(QUrl *url, QObject* parent) : QObject(parent) , m_doc(new KEduVocDocument(this)) - , m_backupTimer(0) { // We ignore file locks here because we open the file for readonly // purposes only. @@ -76,52 +36,13 @@ Collection::~Collection() { - close(); - - // NOTE: No saving here because at this point the Collection class is a - // read-only wrapper around KEduVocDocument. - if (m_doc) { - emit documentChanged(0); - m_doc->deleteLater(); - m_doc = 0; - } - - delete m_backupTimer; } - KEduVocDocument *Collection::eduVocDocument() { - // If there is no present vocabulary document, create an empty one. - if (!m_doc) { - m_doc = new KEduVocDocument(); - } - return m_doc; } -void Collection::setTitle(const QString& title) -{ - m_doc->setTitle(title); -} - - - -void Collection::enableAutoBackup(bool enable) -{ - if (!enable) { - if (m_backupTimer) { - m_backupTimer->stop(); - } - } else { - if (!m_backupTimer) { - m_backupTimer = new QTimer(this); - connect(m_backupTimer, SIGNAL(timeout()), this, SLOT(save())); - } - m_backupTimer->start(Prefs::backupTime() * 60 * 1000); - } -} - void Collection::numDueWords(WordCount &wc) { // Get the entries from the collection. Cache them for future use. @@ -131,7 +52,6 @@ } // Count the number of words due for each grade level. - // TODO: Also take into account pregrades. foreach (const TestEntry *entry, m_allTestEntries) { int languageTo = entry->languageTo(); KEduVocExpression *exp = entry->entry(); @@ -155,81 +75,3 @@ //kDebug() << m_doc->title() << wc.totalWords << "entries"; } - -// Slots - - -void Collection::close() -{ - enableAutoBackup(false); - m_doc->close(); -} - - -// ---------------------------------------------------------------- -// private functions - - -void Collection::setDefaultDocumentProperties(KEduVocDocument *doc) -{ - KEMailSettings emailSettings; - emailSettings.setProfile(emailSettings.defaultProfileName()); - doc->setAuthor(emailSettings.getSetting(KEMailSettings::RealName)); - doc->setAuthorContact(emailSettings.getSetting(KEMailSettings::EmailAddress)); - - doc->setLicense(i18n("Public Domain")); - doc->setCategory(i18n("Languages")); - - QString locale = QLocale().name(); - - doc->appendIdentifier(); - doc->appendIdentifier(); - doc->identifier(0).setName(QLocale(locale).nativeLanguageName()); - doc->identifier(0).setLocale(locale); - doc->identifier(1).setName(i18n("A Second Language")); - doc->identifier(1).setLocale(locale); - - KEduVocLesson* lesson = new KEduVocLesson(i18n("Lesson 1"), doc->lesson()); - doc->lesson()->appendChildContainer(lesson); - - // add some entries - for (int i = 0; i < 15 ; i++) { - lesson->appendEntry(new KEduVocExpression()); - } - - doc->setModified(false); -} - -void Collection::initializeDefaultGrammar(KEduVocDocument *doc) -{ - KEduVocWordType *root = doc->wordTypeContainer(); - KEduVocWordType *noun = new KEduVocWordType(i18n("Noun"), root); - noun->setWordType(KEduVocWordFlag::Noun); - root->appendChildContainer(noun); - - KEduVocWordType *nounChild = new KEduVocWordType(i18n("Masculine"), noun); - nounChild->setWordType(KEduVocWordFlag::Noun | KEduVocWordFlag::Masculine); - noun->appendChildContainer(nounChild); - nounChild = new KEduVocWordType(i18n("Feminine"), noun); - nounChild->setWordType(KEduVocWordFlag::Noun | KEduVocWordFlag::Feminine); - noun->appendChildContainer(nounChild); - nounChild = new KEduVocWordType(i18n("Neuter"), noun); - nounChild->setWordType(KEduVocWordFlag::Noun | KEduVocWordFlag::Neuter); - noun->appendChildContainer(nounChild); - - KEduVocWordType *verb = new KEduVocWordType(i18n("Verb"), root); - verb->setWordType(KEduVocWordFlag::Verb); - root->appendChildContainer(verb); - - KEduVocWordType *adjective = new KEduVocWordType(i18n("Adjective"), root); - adjective->setWordType(KEduVocWordFlag::Adjective); - root->appendChildContainer(adjective); - - KEduVocWordType *adverb = new KEduVocWordType(i18n("Adverb"), root); - adverb->setWordType(KEduVocWordFlag::Adverb); - root->appendChildContainer(adverb); - - KEduVocWordType *conjunction = new KEduVocWordType(i18n("Conjunction"), root); - conjunction->setWordType(KEduVocWordFlag::Conjunction); - root->appendChildContainer(conjunction); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/collection/collection.h new/parley-16.08.0/src/collection/collection.h --- old/parley-16.04.3/src/collection/collection.h 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/collection/collection.h 2016-07-28 15:11:23.000000000 +0200 @@ -27,7 +27,6 @@ #include "testentry.h" -class QTimer; class WordCount; @@ -36,43 +35,15 @@ Q_OBJECT public: - Collection(KEduVocDocument *doc, QObject* parent = 0); Collection(QUrl *url, QObject* parent = 0); ~Collection(); - KEduVocDocument *eduVocDocument(); - - void setTitle(const QString& title); - void numDueWords(WordCount &wc); - - /** Enable/disable the timed auto backup - */ - void enableAutoBackup(bool enable); - -public Q_SLOTS: - - /** close the document*/ - void close(); - -Q_SIGNALS: - /** Emitted when the document pointer is changed. - @todo Stop using documentChanged(0) as a replacement for destoyed in editor classes.**/ - void documentChanged(KEduVocDocument *newDocument); - void languagesChanged(); - void statesNeedSaving(); - -private: - void initializeDefaultGrammar(KEduVocDocument *doc); - void setDefaultDocumentProperties(KEduVocDocument *doc); - private: // The contents of the document KEduVocDocument *m_doc; - - QTimer *m_backupTimer; // Timer for next autosave QList<TestEntry*> m_allTestEntries; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/collection/entryfilter.cpp new/parley-16.08.0/src/collection/entryfilter.cpp --- old/parley-16.04.3/src/collection/entryfilter.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/collection/entryfilter.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -335,9 +335,9 @@ { foreach(const QString & tense, translation->conjugationTenses()) { if (m_tenses.contains(tense)) { - QList<KEduVocWordFlags> pronouns = translation->conjugation(tense).keys(); + QList<KEduVocWordFlags> pronouns = translation->getConjugation(tense).keys(); foreach(const KEduVocWordFlags & pronoun, pronouns) { - KEduVocText grade = translation->conjugation(tense).conjugation(pronoun); + KEduVocText grade = translation->getConjugation(tense).conjugation(pronoun); if (!isBlocked(&(grade))) { // just need to find any form that is not blocked for generating test entries // exact filtering is done later in conjugationTestEntries @@ -523,7 +523,7 @@ QSet<QString> practice_tenses = QSet<QString>::fromList(m_tenses); QSet<QString> existing_tenses; foreach(const QString & tense, translation->conjugationTenses()) { - if (!translation->conjugation(tense).isEmpty()) { + if (!translation->getConjugation(tense).isEmpty()) { existing_tenses << tense; } } @@ -563,7 +563,7 @@ if (!m_tenses.contains(tense)) { continue; } - KEduVocConjugation& conjugation = entry->translation(m_toTranslation)->conjugation(tense); + KEduVocConjugation conjugation = entry->translation(m_toTranslation)->getConjugation(tense); if (conjugation.isEmpty()) { continue; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/dashboard/barwidget.cpp new/parley-16.08.0/src/dashboard/barwidget.cpp --- old/parley-16.04.3/src/dashboard/barwidget.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/dashboard/barwidget.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -70,7 +70,7 @@ QPainter painter(this); painter.setRenderHint(QPainter::Antialiasing, true); const int legendWidth = COLLWIDTH - 10; - const int legendHeight = 20; + const int legendHeight = 45; const int legendOffsetY = 0; const int legendOffsetX = 0; //const int alphaValueIncrement = 35; @@ -133,10 +133,10 @@ //QPen pen(QColor(0, 0, 0)); painter.setPen(pen); if (m_percentageCompleted < 100) { - painter.drawText(0, 0, legendWidth, 20, Qt::AlignCenter, + painter.drawText(0, 0, legendWidth, legendHeight, Qt::AlignCenter | Qt::TextWordWrap, i18np("%1 word due", "%1 words due", m_totalDueWords)); } else { - painter.drawText(0, 0, legendWidth, 20, Qt::AlignCenter, i18n("Fully learned")); + painter.drawText(0, 0, legendWidth, legendHeight, Qt::AlignCenter | Qt::TextWordWrap, i18n("Fully learned")); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/dashboard/collectionwidget.cpp new/parley-16.08.0/src/dashboard/collectionwidget.cpp --- old/parley-16.04.3/src/dashboard/collectionwidget.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/dashboard/collectionwidget.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -36,10 +36,10 @@ // Size constants for the collection widgets -int COLLWIDTH = 140; // Width in pixels of a collection widget +int COLLWIDTH = 155; // Width in pixels of a collection widget //int COLLHEIGHT1 = 250; // Height in pixels of a collection widget not yet fully learned -int COLLHEIGHT1 = 150; // Height in pixels of a collection widget not yet fully learned -int COLLHEIGHT2 = 100; // Height in pixels of a collection widget fully learned +int COLLHEIGHT1 = 175; // Height in pixels of a collection widget not yet fully learned +int COLLHEIGHT2 = 125; // Height in pixels of a collection widget fully learned // ================================================================ @@ -81,20 +81,6 @@ painter.drawText(2, 1, height() - 2, height() - 1, Qt::AlignCenter, QStringLiteral("x")); } - -// ---------------------------------------------------------------- - - -static int randInt(int low, int high) -{ - // Random number between low and high - return qrand() % ((high + 1) - low) + low; -} - - -// ---------------------------------------------------------------- - - CollectionWidget::CollectionWidget(Collection *collection, WordCount *dueWords, QWidget *parent) : QWidget(parent) , m_collection(collection) @@ -178,10 +164,13 @@ } m_barWidget = new BarWidget(dueWords, this); - m_barWidget->setFixedSize(COLLWIDTH - 10, 20); + m_barWidget->setFixedSize(COLLWIDTH - 10, 45); mainLayout->addWidget(m_barWidget); m_practiceButton = new QPushButton(this); - m_practiceButton->setStyleSheet(QStringLiteral("QPushButton {border: none; margin: 0px; padding: 0px;}")); + QString buttonStyleSheet = "QPushButton { border: none; margin: 0px; padding: 0px; color: " + + palette.color(QPalette::Active, QPalette::ButtonText).name()+ "; background-color: " + + palette.color(QPalette::Active, QPalette::Button).name() + "; border-radius: 3px;}"; + m_practiceButton->setStyleSheet(buttonStyleSheet); // buttonLayout is the horizontal layout for the bottom line in the // collection widget: delete button, practice button, etc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/dashboard/dashboard.cpp new/parley-16.08.0/src/dashboard/dashboard.cpp --- old/parley-16.04.3/src/dashboard/dashboard.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/dashboard/dashboard.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -38,14 +38,6 @@ #include "gradereferencewidget.h" -// ---------------------------------------------------------------- - -static int randInt(int low, int high) -{ - // Random number between low and high - return qrand() % ((high + 1) - low) + low; -} - // ================================================================ // class Dashboard @@ -213,7 +205,6 @@ QUrl url(QUrl::fromLocalFile(urlString)); Collection *collection = new Collection(&url, this); - collection->close(); // We just want to look at it, not own it, so release the lock. WordCount dueWords; int percentageCompleted = dueWords.percentageCompleted(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/editor/audiowidget.cpp new/parley-16.08.0/src/editor/audiowidget.cpp --- old/parley-16.04.3/src/editor/audiowidget.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/editor/audiowidget.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -48,7 +48,7 @@ if (m_entry) { recordButton->setEnabled(true); audioUrlRequester->setEnabled(true); - audioUrlRequester->setUrl(m_entry->translation(m_currentTranslation)->soundUrl().toLocalFile()); + audioUrlRequester->setUrl(m_entry->translation(m_currentTranslation)->soundUrl()); } else { recordButton->setEnabled(false); audioUrlRequester->setEnabled(false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/editor/conjugationwidget.cpp new/parley-16.08.0/src/editor/conjugationwidget.cpp --- old/parley-16.04.3/src/editor/conjugationwidget.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/editor/conjugationwidget.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -78,7 +78,10 @@ { int valueIndex = m_conjugationLineEdits.values().indexOf(qobject_cast<QLineEdit*>(sender())); int key = m_conjugationLineEdits.keys().value(valueIndex); - m_entry->translation(m_identifier)->conjugation(tenseComboBox->currentText()).setConjugation(text, (KEduVocWordFlag::Flags)key); + KEduVocTranslation *translation = m_entry->translation(m_identifier); + KEduVocConjugation conjugation = translation->getConjugation(tenseComboBox->currentText()); + conjugation.setConjugation(text, (KEduVocWordFlag::Flags)key); + translation->setConjugation(tenseComboBox->currentText(), conjugation); } @@ -92,7 +95,7 @@ void ConjugationWidget::updateEntries() { m_lastTenseSelection = tenseComboBox->currentText(); - KEduVocConjugation& conjugation = m_entry->translation(m_identifier)->conjugation(m_lastTenseSelection); + KEduVocConjugation conjugation = m_entry->translation(m_identifier)->getConjugation(m_lastTenseSelection); foreach(KEduVocWordFlags flags, m_conjugationLineEdits.keys()) { QString text; if (conjugation.keys().contains(flags)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/editor/imagechooserwidget.cpp new/parley-16.08.0/src/editor/imagechooserwidget.cpp --- old/parley-16.04.3/src/editor/imagechooserwidget.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/editor/imagechooserwidget.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -42,7 +42,7 @@ if (m_entry) { setEnabled(true); - imageUrlRequester->setUrl(m_entry->translation(m_currentTranslation)->imageUrl().toLocalFile()); + imageUrlRequester->setUrl(m_entry->translation(m_currentTranslation)->imageUrl()); // slotImageChanged( m_entry->translation(m_currentTranslation)->imageUrl().toLocalFile() ); } else { setEnabled(false); @@ -52,10 +52,11 @@ } } -void ImageChooserWidget::slotImageChanged(const QString & url) +void ImageChooserWidget::slotImageChanged(const QString & urlStr) { - if (!url.isEmpty()) { - QPixmap pixmap(url); + QUrl url = QUrl::fromUserInput(urlStr); + if (!url.isEmpty() && url.isLocalFile()) { + QPixmap pixmap(url.toLocalFile()); imageWidget->setPixmap(pixmap); } else { // imageLabel->setText(i18nc("@label image preview is empty", "No Image")); @@ -63,7 +64,7 @@ } if (m_entry) { - m_entry->translation(m_currentTranslation)->setImageUrl( QUrl::fromLocalFile(url)); + m_entry->translation(m_currentTranslation)->setImageUrl(url); foreach(int j, m_entry->translationIndices()) { if (m_entry->translation(j)->imageUrl().isEmpty()) { m_entry->translation(j)->setImageUrl(imageUrlRequester->url()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/editor/multiplechoicewidget.cpp new/parley-16.08.0/src/editor/multiplechoicewidget.cpp --- old/parley-16.04.3/src/editor/multiplechoicewidget.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/editor/multiplechoicewidget.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -28,14 +28,16 @@ using namespace Editor; -MultipleChoiceWidget::MultipleChoiceWidget(QWidget *parent) : QWidget(parent) +MultipleChoiceWidget::MultipleChoiceWidget(QWidget *parent) + : QWidget(parent) + , m_translation(Q_NULLPTR) + , m_choicesModel(new QStringListModel(this)) { setupUi(this); connect(addChoiceButton, &QPushButton::clicked, this, &MultipleChoiceWidget::slotAddChoiceButton); connect(removeChoiceButton, &QPushButton::clicked, this, &MultipleChoiceWidget::slotRemoveChoiceButton); - m_choicesModel = new QStringListModel(this); multipleChoiceListView->setModel(m_choicesModel); connect(m_choicesModel, &QStringListModel::dataChanged, this, &MultipleChoiceWidget::slotDataChanged); @@ -47,16 +49,20 @@ } -void MultipleChoiceWidget::slotDataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight) +void MultipleChoiceWidget::slotDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) { Q_UNUSED(topLeft) Q_UNUSED(bottomRight) - m_translation->multipleChoice() = m_choicesModel->stringList(); - removeChoiceButton->setEnabled(m_translation && m_translation->multipleChoice().count() > 0); + if (m_translation) { + m_translation->setMultipleChoice(m_choicesModel->stringList()); + removeChoiceButton->setEnabled(m_translation->getMultipleChoice().count() > 0); + } else { + removeChoiceButton->setEnabled(false); + } } -void MultipleChoiceWidget::setTranslation(KEduVocExpression * entry, int translation) +void MultipleChoiceWidget::setTranslation(KEduVocExpression *entry, int translation) { if (entry) { m_translation = entry->translation(translation); @@ -66,12 +72,12 @@ if (m_translation) { setEnabled(true); - m_choicesModel->setStringList(m_translation->multipleChoice()); - removeChoiceButton->setEnabled(m_translation->multipleChoice().count() > 0); + m_choicesModel->setStringList(m_translation->getMultipleChoice()); + removeChoiceButton->setEnabled(m_translation->getMultipleChoice().count() > 0); } else { setEnabled(false); } - removeChoiceButton->setEnabled(m_translation && m_translation->multipleChoice().count() > 0); + removeChoiceButton->setEnabled(m_translation && m_translation->getMultipleChoice().count() > 0); } @@ -94,12 +100,16 @@ } else { m_choicesModel->removeRows(m_choicesModel->rowCount(QModelIndex()) - 1, 1, QModelIndex()); } - m_translation->multipleChoice() = m_choicesModel->stringList(); - removeChoiceButton->setEnabled(m_translation && m_translation->multipleChoice().count() > 0); + if (m_translation) { + m_translation->setMultipleChoice(m_choicesModel->stringList()); + removeChoiceButton->setEnabled(m_translation->getMultipleChoice().count() > 0); + } else { + removeChoiceButton->setEnabled(false); + } } -bool MultipleChoiceWidget::eventFilter(QObject * obj, QEvent * event) +bool MultipleChoiceWidget::eventFilter(QObject *obj, QEvent *event) { if (obj == multipleChoiceListView) { if (event->type() == QEvent::DragEnter) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/editor/multiplechoicewidget.h new/parley-16.08.0/src/editor/multiplechoicewidget.h --- old/parley-16.04.3/src/editor/multiplechoicewidget.h 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/editor/multiplechoicewidget.h 2016-07-28 15:11:23.000000000 +0200 @@ -45,19 +45,19 @@ explicit MultipleChoiceWidget(QWidget *parent = 0); public slots: - void setTranslation(KEduVocExpression* entry, int translation); + void setTranslation(KEduVocExpression *entry, int translation); protected: bool eventFilter(QObject *obj, QEvent *event); private slots: - void slotDataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight); + void slotDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); void slotAddChoiceButton(); void slotRemoveChoiceButton(); private: - KEduVocTranslation* m_translation; - QStringListModel * m_choicesModel; + KEduVocTranslation *m_translation; + QStringListModel *m_choicesModel; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/org.kde.parley.desktop new/parley-16.08.0/src/org.kde.parley.desktop --- old/parley-16.04.3/src/org.kde.parley.desktop 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/org.kde.parley.desktop 2016-07-28 15:11:23.000000000 +0200 @@ -68,6 +68,7 @@ Comment[el]=Πρόγραμμα που θα σας βοηθήσει στην απομνημόνευση πραγμάτων. Comment[en_GB]=A program to help you memorise things. Comment[es]=Un programa para ayudarle a memorizar cosas. +Comment[et]=Rakendus meeldejätmise hõlbustamiseks ja harjutamiseks. Comment[fi]=Ohjelma asioiden ulkoa opettelemiseen. Comment[gl]=Un programa para axudalo a memorizar cousas. Comment[it]=Un programma per aiutarti a memorizzare le cose. @@ -80,7 +81,6 @@ Comment[sv]=Ett program som hjälper dig memorera saker. Comment[uk]=Програма, яка допоможе вам запам’ятовувати знання. Comment[x-test]=xxA program to help you memorize things.xx -Comment[zh_TW]=訓練記憶力的程式。 X-DBUS-ServiceName=org.kde.parley GenericName=Vocabulary Trainer GenericName[af]=Woordeskat-afrigter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/parleydocument.cpp new/parley-16.08.0/src/parleydocument.cpp --- old/parley-16.04.3/src/parleydocument.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/parleydocument.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -562,7 +562,7 @@ QMimeType mimeType = db.mimeTypeForFile(file); qDebug() << "KNS2 file of mime type:" << db.mimeTypeForFile(file).name(); if (mimeType.inherits(QStringLiteral("application/x-kvtml"))) { - ParleyMainWindow::instance()->addRecentFile(file, QString()); ///@todo: title! + ParleyMainWindow::instance()->addRecentFile(QUrl::fromLocalFile(file), QString()); ///@todo: title! fileName = file; } } @@ -574,7 +574,7 @@ if (numberInstalled > 1) { openGHNS(); } else if (numberInstalled == 1) { - if (open(QUrl::fromUserInput(fileName))) + if (open(QUrl::fromLocalFile(fileName))) m_parleyApp->showPracticeConfiguration(); else KMessageBox::error(m_parleyApp, i18n("Could not open vocabulary collection \"%1\"", entries.first().name())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/configure/blockoptions.cpp new/parley-16.08.0/src/practice/configure/blockoptions.cpp --- old/parley-16.04.3/src/practice/configure/blockoptions.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/configure/blockoptions.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -206,6 +206,9 @@ block5->setEnabled(state); block6->setEnabled(state); block7->setEnabled(state); + if (state) { + checkValidity(); + } } void BlockOptions::slotExpireToggled(bool state) @@ -217,6 +220,9 @@ expire5->setEnabled(state); expire6->setEnabled(state); expire7->setEnabled(state); + if (state) { + checkValidity(); + } } void BlockOptions::slotComboBoxActivated(int) @@ -229,16 +235,12 @@ void BlockOptions::checkValidity() { QString message; - bool found = false; - for (int i = 1; i <= 6; i++) { - if (kcfg_Block->isChecked()) { - /*if (Prefs::blockItem(i-1) != 0 && - Prefs::blockItem(i) != 0 && - Prefs::blockItem(i-1) >= Prefs::blockItem(i))*/ + if (kcfg_Block->isChecked()) { + bool found = false; + for (int i = 1; i <= 6; i++) { if (date_itemlist[m_blockComboList[i - 1]->currentIndex()].num != 0 && date_itemlist[m_blockComboList[i]->currentIndex()].num != 0 && date_itemlist[m_blockComboList[i - 1]->currentIndex()].num >= date_itemlist[m_blockComboList[i]->currentIndex()].num) { - QString format; if (!found) message.append(i18n("Illogical blocking times.\n")); found = true; @@ -247,14 +249,13 @@ } } - for (int i = 1; i <= 6; i++) { - found = false; - if (kcfg_Expire->isChecked()) { + if (kcfg_Expire->isChecked()) { + bool found = false; + for (int i = 1; i <= 6; i++) { if (date_itemlist[m_expireComboList[i - 1]->currentIndex()].num != 0 && date_itemlist[m_expireComboList[i]->currentIndex()].num != 0 && date_itemlist[m_expireComboList[i - 1]->currentIndex()].num >= date_itemlist[m_expireComboList[i]->currentIndex()].num) { - QString format; if (!found) message.append(i18n("\nIllogical expiration times.\n")); found = true; @@ -263,17 +264,14 @@ } } - if (message.length() == 0) { - found = false; + if ((message.length() == 0) && kcfg_Block->isChecked() && kcfg_Expire->isChecked()) { + bool found = false; for (int i = 0; i <= 6; i++) { - if (kcfg_Block->isChecked() && - kcfg_Expire->isChecked() && - m_expireComboList[i]->currentIndex() >= 0 && + if (m_expireComboList[i]->currentIndex() >= 0 && m_blockComboList[i]->currentIndex() >= 0 && date_itemlist[m_expireComboList[i]->currentIndex()].num != 0 && date_itemlist[m_blockComboList[i]->currentIndex()].num != 0 && date_itemlist[m_blockComboList[i]->currentIndex()].num >= date_itemlist[m_expireComboList[i]->currentIndex()].num) { - QString format; if (!found) message.append(i18n("\nIllogical blocking vs. expiration times.\n")); found = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/configure/generalpracticeoptions.cpp new/parley-16.08.0/src/practice/configure/generalpracticeoptions.cpp --- old/parley-16.04.3/src/practice/configure/generalpracticeoptions.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/configure/generalpracticeoptions.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -34,7 +34,4 @@ setupUi(this); //connect(kcfg_ShowSolutionAfterAnswer, SIGNAL(toggled(bool)), kcfg_ShowSolutionAfterAnswerTime, SLOT(setEnabled(bool))); - - I18N_NOOP("Limit the number of words in the initial phase"); - I18N_NOOP("Max number of words in the initial phase"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/conjugationbackendmode.cpp new/parley-16.08.0/src/practice/conjugationbackendmode.cpp --- old/parley-16.04.3/src/practice/conjugationbackendmode.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/conjugationbackendmode.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -46,7 +46,7 @@ } data.tense = m_currentTense; - m_conjugation = m_current->entry()->translation(m_current->languageTo())->conjugation(m_currentTense); + m_conjugation = m_current->entry()->translation(m_current->languageTo())->getConjugation(m_currentTense); m_pronounFlags = current->conjugationPronouns(); data.questionInfinitive = m_current->entry()->translation(m_current->languageFrom())->text(); @@ -119,7 +119,7 @@ { Q_ASSERT(m_current != 0); KEduVocTranslation* trans = m_current->entry()->translation(m_current->languageTo()); - KEduVocConjugation& conj = trans->conjugation(m_current->conjugationTense()); + KEduVocConjugation conj = trans->getConjugation(m_current->conjugationTense()); QList<KEduVocWordFlags> keys = conj.keys(); grade_t min_grade = KV_MAX_GRADE; @@ -134,7 +134,7 @@ { Q_ASSERT(m_current != 0); KEduVocTranslation* trans = m_current->entry()->translation(m_current->languageTo()); - KEduVocConjugation& conj = trans->conjugation(m_current->conjugationTense()); + KEduVocConjugation conj = trans->getConjugation(m_current->conjugationTense()); QList<KEduVocWordFlags> keys = conj.keys(); grade_t min_grade = KV_MAX_GRADE; @@ -150,14 +150,18 @@ qDebug() << "Grading conjugations"; foreach(const KEduVocWordFlags & key, m_pronounFlags) { - KEduVocText& text = m_current->entry()->translation(m_current->languageTo())-> - conjugation(m_currentTense).conjugation(key); + KEduVocTranslation *translation = m_current->entry()->translation(m_current->languageTo()); + if (translation) { + KEduVocConjugation conjugationToUpdate = translation->getConjugation(m_currentTense); + conjugationToUpdate.conjugation(key).incPracticeCount(); + conjugationToUpdate.conjugation(key).setPracticeDate(QDateTime::currentDateTime()); + + updateGrade(conjugationToUpdate.conjugation(key), + m_frontend->resultState() == AbstractFrontend::AnswerCorrect, + m_current->statisticBadCount() == 0); - text.incPracticeCount(); - text.setPracticeDate(QDateTime::currentDateTime()); - - updateGrade(text, m_frontend->resultState() == AbstractFrontend::AnswerCorrect, - m_current->statisticBadCount() == 0); + translation->setConjugation(m_currentTense, conjugationToUpdate); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/guifrontend.cpp new/parley-16.08.0/src/practice/guifrontend.cpp --- old/parley-16.04.3/src/practice/guifrontend.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/guifrontend.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -32,20 +32,25 @@ using namespace Practice; -GuiFrontend::GuiFrontend(QWidget* parent) - : AbstractFrontend(parent), m_modeWidget(0), m_lastImage(QStringLiteral("invalid")), m_currentBox(0), m_newBoxIfCorrect(0), m_newBoxIfWrong(0) +GuiFrontend::GuiFrontend(QWidget *parent) + : AbstractFrontend(parent) + , m_widget(new ImageWidget()) + , m_ui(new Ui::PracticeMainWindow()) + , m_modeWidget(nullptr) + , m_resultState(AbstractFrontend::AnswerWrong) + , m_feedbackState(AbstractFrontend::AnswerWrong) + , m_currentBox(0) + , m_newBoxIfCorrect(0) + , m_newBoxIfWrong(0) + , m_themedBackgroundRenderer(new ThemedBackgroundRenderer(this, QStringLiteral("practicethemecache.bin"))) { - m_widget = new ImageWidget(); m_widget->setScalingEnabled(false, false); m_widget->setKeepAspectRatio(Qt::IgnoreAspectRatio); m_widget->setFadingEnabled(false); - m_ui = new Ui::PracticeMainWindow(); m_ui->setupUi(m_widget); m_ui->centralPracticeWidget->setLayout(new QHBoxLayout()); - m_themedBackgroundRenderer = new ThemedBackgroundRenderer(this, QStringLiteral("practicethemecache.bin")); - connect(Prefs::self(), &Prefs::configChanged, this, &GuiFrontend::setTheme); setTheme(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/guifrontend.h new/parley-16.08.0/src/practice/guifrontend.h --- old/parley-16.04.3/src/practice/guifrontend.h 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/guifrontend.h 2016-07-28 15:11:23.000000000 +0200 @@ -39,7 +39,7 @@ Q_OBJECT public: - GuiFrontend(QWidget* parent = 0); + GuiFrontend(QWidget *parent = 0); virtual ~GuiFrontend(); virtual QVariant userInput(); @@ -103,9 +103,9 @@ private: void setImage(const QUrl& image); - ImageWidget* m_widget; - Ui::PracticeMainWindow* m_ui; - AbstractModeWidget* m_modeWidget; + ImageWidget *m_widget; + Ui::PracticeMainWindow *m_ui; + AbstractModeWidget *m_modeWidget; ResultState m_resultState; ResultState m_feedbackState; QUrl m_lastImage; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/imagecache.cpp new/parley-16.08.0/src/practice/imagecache.cpp --- old/parley-16.04.3/src/practice/imagecache.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/imagecache.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -14,6 +14,7 @@ #include "imagecache.h" #include <QFileInfo> +#include <QDir> #include <QDataStream> #include <QDebug> @@ -57,10 +58,23 @@ return m_images.value(id); } +void ImageCache::setSaveFilename(const QString &filename) +{ + m_saveFilename = filename; + QDir fileDir = QFileInfo(filename).absoluteDir(); + if (!fileDir.exists() && !fileDir.mkpath(QStringLiteral("."))) { + qWarning() << QStringLiteral("Couldn't create image cache path: ") << fileDir.absolutePath(); + } +} + void ImageCache::openCache() { QFile file(m_saveFilename); - file.open(QIODevice::ReadOnly); + if (!file.open(QIODevice::ReadOnly)) { + // If cache is used for the first time it's normal to fail here, + // because cache file doesn't exist at this time. + return; + } QDataStream stream(&file); // check identifier QString temp; @@ -112,3 +126,4 @@ dbg.nospace() << "\n\ttotal pixel count: " << pixels << " (approx. " << double(pixels) * 4 / 1024 / 1024 << " MiB)"; return dbg.space(); } + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/imagecache.h new/parley-16.08.0/src/practice/imagecache.h --- old/parley-16.04.3/src/practice/imagecache.h 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/imagecache.h 2016-07-28 15:11:23.000000000 +0200 @@ -39,9 +39,7 @@ return m_images.isEmpty(); } - void setSaveFilename(const QString& filename) { - m_saveFilename = filename; - } + void setSaveFilename(const QString &filename); void openCache(); void saveCache(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/practicemainwindow.cpp new/parley-16.08.0/src/practice/practicemainwindow.cpp --- old/parley-16.04.3/src/practice/practicemainwindow.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/practicemainwindow.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -59,8 +59,6 @@ KConfigGroup cfg(KSharedConfig::openConfig(QStringLiteral("parleyrc")), objectName()); applyMainWindowSettings(cfg); - - I18N_NOOP("I knew it well"); } PracticeMainWindow::~PracticeMainWindow() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/practicestatemachine.cpp new/parley-16.08.0/src/practice/practicestatemachine.cpp --- old/parley-16.04.3/src/practice/practicestatemachine.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/practicestatemachine.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -221,8 +221,8 @@ m_frontend->setBoxes(grade, goodGrade, KV_LEV1_GRADE); - QString imgFrom = m_current->entry()->translation(m_current->languageFrom())->imageUrl().url(); - QString imgTo = m_current->entry()->translation(m_current->languageTo())->imageUrl().url(); + QUrl imgFrom = m_current->entry()->translation(m_current->languageFrom())->imageUrl(); + QUrl imgTo = m_current->entry()->translation(m_current->languageTo())->imageUrl(); if (imgFrom.isEmpty()) { imgFrom = imgTo; } @@ -232,12 +232,12 @@ if (Prefs::flashcardsFrontImage()) { m_frontend->setQuestionImage(imgFrom); } else { - m_frontend->setQuestionImage(QString()); + m_frontend->setQuestionImage(QUrl()); } if (Prefs::flashcardsBackImage()) { m_frontend->setSolutionImage(imgTo); } else { - m_frontend->setSolutionImage(QString()); + m_frontend->setSolutionImage(QUrl()); } m_frontend->showQuestion(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/sessionmanagerbase.cpp new/parley-16.08.0/src/practice/sessionmanagerbase.cpp --- old/parley-16.04.3/src/practice/sessionmanagerbase.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/sessionmanagerbase.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -251,7 +251,7 @@ // if the current entry has predefined multiple choice entries definied, use them first TestEntry *currentEntry = m_currentEntries.at(m_currentEntry); - QStringList predefinedChoices = currentEntry->entry()->translation(currentEntry->languageTo())->multipleChoice(); + QStringList predefinedChoices = currentEntry->entry()->translation(currentEntry->languageTo())->getMultipleChoice(); while (!predefinedChoices.isEmpty() && count > 0) { choices.append(predefinedChoices.takeAt(KRandom::random() % predefinedChoices.count())); count--; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/themedbackgroundrenderer.cpp new/parley-16.08.0/src/practice/themedbackgroundrenderer.cpp --- old/parley-16.04.3/src/practice/themedbackgroundrenderer.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/themedbackgroundrenderer.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -29,7 +29,7 @@ : QObject(parent), m_haveCache(true), m_queuedRequest(false), m_isFastScaledRender(true) { m_theme = new KGameTheme(); - m_cache.setSaveFilename(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + '/' + cacheFilename); + m_cache.setSaveFilename(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + '/' + cacheFilename); m_timer.setSingleShot(true); m_timer.setInterval(1000); connect(&m_timer, &QTimer::timeout, this, &ThemedBackgroundRenderer::updateBackgroundTimeout); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/scripts/scripting/container.h new/parley-16.08.0/src/scripts/scripting/container.h --- old/parley-16.04.3/src/scripts/scripting/container.h 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/scripts/scripting/container.h 2016-07-28 15:11:23.000000000 +0200 @@ -130,7 +130,7 @@ * @param url url of the image */ void setImageUrl(const QString & url) { - m_container->setImageUrl(url); + m_container->setImageUrl(QUrl(url)); } /* finds the container with the given name */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/scripts/scripting/document.h new/parley-16.08.0/src/scripts/scripting/document.h --- old/parley-16.04.3/src/scripts/scripting/document.h 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/scripts/scripting/document.h 2016-07-28 15:11:23.000000000 +0200 @@ -261,12 +261,12 @@ * Sets the URL of the XML file */ void setUrl(const QString& url) { - m_doc->setUrl(url); + m_doc->setUrl(QUrl(url)); } /* @returns the URL of the XML file */ QString url() const { - return m_doc->url().path(); + return m_doc->url().toString(); } public slots: @@ -390,7 +390,7 @@ */ int saveAs(const QString & url, KEduVocDocument::FileType ft = KEduVocDocument::Automatic, const QString & generator = QStringLiteral("Parley")) { m_doc->setGenerator(generator); - return m_doc->saveAs(url, ft); + return m_doc->saveAs(QUrl(url), ft); } // QByteArray toByteArray ( const QString &generator ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/scripts/scripting/translation.cpp new/parley-16.08.0/src/scripts/scripting/translation.cpp --- old/parley-16.04.3/src/scripts/scripting/translation.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/scripts/scripting/translation.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -46,14 +46,14 @@ void Translation::setConjugationText(const QString& conjugation, const QString& tense, const KEduVocWordFlags& flags) { - KEduVocConjugation & conjug = m_translation->conjugation(tense); + KEduVocConjugation conjug = m_translation->getConjugation(tense); conjug.setConjugation(conjugation, flags); m_translation->setConjugation(tense, conjug); } QObject * Translation::conjugation(const QString & tense, const KEduVocWordFlags& flags) { - KEduVocConjugation conjug = m_translation->conjugation(tense); + KEduVocConjugation conjug = m_translation->getConjugation(tense); return new Text(conjug.conjugation(flags)); } @@ -61,7 +61,7 @@ { Text * txt = dynamic_cast<Text*>(conjugation); if (txt) { - KEduVocConjugation & conjug = m_translation->conjugation(tense); + KEduVocConjugation conjug = m_translation->getConjugation(tense); conjug.setConjugation(*(txt->kEduVocText()), flags); m_translation->setConjugation(tense, conjug); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/scripts/scripting/translation.h new/parley-16.08.0/src/scripts/scripting/translation.h --- old/parley-16.04.3/src/scripts/scripting/translation.h 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/scripts/scripting/translation.h 2016-07-28 15:11:23.000000000 +0200 @@ -206,25 +206,25 @@ /* get the sound url for this translation if it exists */ QString soundUrl() { - return m_translation->soundUrl().path(); + return m_translation->soundUrl().toString(); } /* set the sound url for this translation * @param url url of the sound file */ void setSoundUrl(const QString &url) { - m_translation->setSoundUrl(url); + m_translation->setSoundUrl(QUrl(url)); } /* get the image url for this translation if it exists */ QString imageUrl() { - return m_translation->soundUrl().path(); + return m_translation->soundUrl().toString(); } /* set the image url for this translation * @param url url of the image */ void setImageUrl(const QString &url) { - m_translation->setImageUrl(url); + m_translation->setImageUrl(QUrl(url)); } /* @@ -321,7 +321,7 @@ /** returns multiple choice if available */ QStringList multipleChoice() { - return m_translation->multipleChoice(); + return m_translation->getMultipleChoice(); } /** returns a string list with the available conjugation tenses */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/scripts/translator.cpp new/parley-16.08.0/src/scripts/translator.cpp --- old/parley-16.04.3/src/scripts/translator.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/scripts/translator.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -18,6 +18,7 @@ #include <QDebug> Translator::Translator() + : m_parent(nullptr) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/settings/kgametheme/kgamethemeselector.cpp new/parley-16.08.0/src/settings/kgametheme/kgamethemeselector.cpp --- old/parley-16.04.3/src/settings/kgametheme/kgamethemeselector.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/settings/kgametheme/kgamethemeselector.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -48,7 +48,7 @@ // private slots void _k_updatePreview(); - void _k_updateThemeList(const QString& strTheme); + void _k_updateThemeList(const QString &strTheme); void _k_openKNewStuffDialog(); }; @@ -186,13 +186,23 @@ ui.themePreview->setPixmap(pix.scaled(ui.themePreview->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation)); } -void KGameThemeSelectorPrivate::_k_updateThemeList(const QString& strTheme) +void KGameThemeSelectorPrivate::_k_updateThemeList(const QString &strTheme) { //find theme and set selection to the current theme; happens when pressing "Default" - QListWidgetItem * currentItem = ui.themeList->currentItem(); - if (!currentItem || themeMap.value(currentItem->text())->fileName() != strTheme) { + QListWidgetItem *currentItem = ui.themeList->currentItem(); + + QString currentGameThemeFileName; + if (currentItem) { + KGameTheme *currentGameTheme = themeMap.value(currentItem->text()); + if (currentGameTheme) { + currentGameThemeFileName = currentGameTheme->fileName(); + } + } + + if (!currentItem || (currentGameThemeFileName != strTheme)) { for (int i = 0; i < ui.themeList->count(); i++) { - if (themeMap.value(ui.themeList->item(i)->text())->fileName() == strTheme) { + KGameTheme *listItemGameTheme = themeMap.value(ui.themeList->item(i)->text()); + if (listItemGameTheme && (listItemGameTheme->fileName() == strTheme)) { ui.themeList->setCurrentItem(ui.themeList->item(i)); break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/statistics/statisticslegendwidget.cpp new/parley-16.08.0/src/statistics/statisticslegendwidget.cpp --- old/parley-16.04.3/src/statistics/statisticslegendwidget.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/statistics/statisticslegendwidget.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -67,11 +67,6 @@ QString rightString = i18nc("adjective, The word has not even been practiced once by the user","Not practiced"); QFontMetrics fontMetrics(painter.font()); - I18N_NOOP("Initial phase"); - I18N_NOOP("Long term phase"); - I18N_NOOP("Invalid entry"); - I18N_NOOP("Newly started"); - // Calculate the size and position of the rectangle that will contain the // string on the left side of the legend. QRect leftRect = fontMetrics.boundingRect(leftString);

1 0

commit palapeli for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package palapeli for openSUSE:Factory checked in at 2016-08-31 00:09:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/palapeli (Old) and /work/SRC/openSUSE:Factory/.palapeli.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "palapeli" Changes: -------- --- /work/SRC/openSUSE:Factory/palapeli/palapeli.changes 2016-07-24 19:49:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.palapeli.new/palapeli.changes 2016-08-31 00:09:12.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:31:37 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:51:20 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- palapeli-16.04.3.tar.xz New: ---- palapeli-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ palapeli.spec ++++++ --- /var/tmp/diff_new_pack.I5Udmn/_old 2016-08-31 00:09:13.000000000 +0200 +++ /var/tmp/diff_new_pack.I5Udmn/_new 2016-08-31 00:09:13.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: palapeli-%{version}.tar.xz BuildRequires: libkdegames4-devel ++++++ palapeli-16.04.3.tar.xz -> palapeli-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-16.04.3/src/palapeli.desktop new/palapeli-16.08.0/src/palapeli.desktop --- old/palapeli-16.04.3/src/palapeli.desktop 2016-01-14 04:32:39.000000000 +0100 +++ new/palapeli-16.08.0/src/palapeli.desktop 2016-08-02 09:20:36.000000000 +0200 @@ -49,8 +49,8 @@ Name[zh_TW]=Palapeli GenericName=Jigsaw puzzle game GenericName[bs]=Igra slagalica -GenericName[ca]=Joc de trencaclosques Jigsaw -GenericName[ca@valencia]=Joc de trencaclosques Jigsaw +GenericName[ca]=Joc de trencaclosques +GenericName[ca@valencia]=Joc de trencaclosques GenericName[cs]=Hra se skládáním puzzle GenericName[da]=Puslespil GenericName[de]=Bilderpuzzle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-16.04.3/src/palapeli.notifyrc new/palapeli-16.08.0/src/palapeli.notifyrc --- old/palapeli-16.04.3/src/palapeli.notifyrc 2016-01-14 04:32:39.000000000 +0100 +++ new/palapeli-16.08.0/src/palapeli.notifyrc 2016-08-02 09:20:36.000000000 +0200 @@ -1,8 +1,8 @@ [Global] Comment=Palapeli Jigsaw Puzzle Comment[bs]=Palapeli testerasta slagalica -Comment[ca]=Trencaclosques Jigsaw Palapeli -Comment[ca@valencia]=Trencaclosques Jigsaw Palapeli +Comment[ca]=Trencaclosques Palapeli +Comment[ca@valencia]=Trencaclosques Palapeli Comment[da]=Palapeli puslespil Comment[de]=Palapeli-Bilderpuzzle Comment[el]=Palapeli Jigsaw Puzzle

1 0

commit okteta for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package okteta for openSUSE:Factory checked in at 2016-08-31 00:09:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/okteta (Old) and /work/SRC/openSUSE:Factory/.okteta.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "okteta" Changes: -------- --- /work/SRC/openSUSE:Factory/okteta/okteta.changes 2016-07-24 19:49:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.okteta.new/okteta.changes 2016-08-31 00:09:09.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:31:16 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:50:28 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- okteta-16.04.3.tar.xz New: ---- okteta-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okteta.spec ++++++ --- /var/tmp/diff_new_pack.4aN5k4/_old 2016-08-31 00:09:10.000000000 +0200 +++ /var/tmp/diff_new_pack.4aN5k4/_new 2016-08-31 00:09:10.000000000 +0200 @@ -39,7 +39,7 @@ License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: okteta-%{version}.tar.xz Obsoletes: %{name}5 < %{version} @@ -87,7 +87,7 @@ %{_kf5_sharedir}/icons/hicolor/*/*/*.* %{_kf5_sharedir}/okteta*/ %{_kf5_sharedir}/kxmlgui5/ -%{_kf5_sharedir}/appdata/ +%{_kf5_appstreamdir}/ %{_kf5_plugindir}/ %{_kf5_libdir}/libkasten*.so.* %{_kf5_libdir}/libokteta*.so.* ++++++ okteta-16.04.3.tar.xz -> okteta-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/CMakeLists.txt new/okteta-16.08.0/CMakeLists.txt --- old/okteta-16.04.3/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,44 +1,64 @@ -project( okteta ) - cmake_minimum_required(VERSION 2.8.12) -set(QT_MIN_VERSION "5.2.0") + +project( okteta ) find_package(ECM 1.7.0 REQUIRED NO_MODULE) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +# ECM KDE macros (include first, to have their policies and settings effect all other macros) +include(KDEInstallDirs) +include(KDECMakeSettings NO_POLICY_SCOPE) +include(KDECompilerSettings NO_POLICY_SCOPE) +# ECM macros include(ECMInstallIcons) include(ECMGenerateHeaders) include(ECMSetupVersion) include(ECMPackageConfigHelpers) include(ECMAddAppIcon) - +# CMake macros include(FeatureSummary) include(GenerateExportHeader) -include(KDEInstallDirs) -include(KDECMakeSettings) -include(KDECompilerSettings) -find_package(Qt5 REQUIRED NO_MODULE +set(REQUIRED_QT_VERSION "5.2.0") +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPONENTS Core Network - Designer PrintSupport Script ScriptTools Widgets Xml ) -find_package(Qt5Test QUIET) +find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG QUIET) if (NOT Qt5Test_FOUND) message(STATUS "Qt5Test not found, unit tests will not be built.") endif() +find_package(Qt5Designer ${REQUIRED_QT_VERSION} CONFIG QUIET) +set_package_properties(Qt5Designer PROPERTIES TYPE OPTIONAL + PURPOSE "Required to build Qt Designer plugins" +) +if(NOT Qt5Designer_VERSION_STRING VERSION_LESS 5.5.0) + find_package(Qt5UiPlugin ${REQUIRED_QT_VERSION} CONFIG QUIET) + set_package_properties(Qt5UiPlugin PROPERTIES TYPE OPTIONAL + PURPOSE "Required to build Qt Designer plugins" + ) + if (Qt5UiPlugin_FOUND) + # for some reason, Qt5UiPlugin does not set its _INCLUDE_DIRS variable. Fill it manually + get_target_property(Qt5UiPlugin_INCLUDE_DIRS Qt5::UiPlugin INTERFACE_INCLUDE_DIRECTORIES) + endif() + set(DesignerPluginDeps_FOUND ${Qt5UiPlugin_FOUND}) +else() + set(DesignerPluginDeps_FOUND ${Qt5Designer_FOUND}) +endif() + -find_package(KF5 REQUIRED +set(REQUIRED_KF5_VERSION "5.7.0") +find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED COMPONENTS Bookmarks Codecs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/core/CMakeLists.txt new/okteta-16.08.0/core/CMakeLists.txt --- old/okteta-16.04.3/core/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/core/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,5 +1,3 @@ -project( oktetacore ) - ecm_setup_version( ${OKTETALIBS_LIB_VERSION} VARIABLE_PREFIX OKTETACORE SOVERSION ${OKTETALIBS_LIB_SOVERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/designer/CMakeLists.txt new/okteta-16.08.0/designer/CMakeLists.txt --- old/okteta-16.04.3/designer/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/designer/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,4 +1,6 @@ -project( oktetadesignerplugin ) +if (NOT DesignerPluginDeps_FOUND) + return() +endif() set( oktetadesignerplugin_SRCS bytearraycolumnviewdesignerfactory.cpp @@ -14,7 +16,11 @@ OktetaGui OktetaCore Qt5::Widgets - Qt5::Designer +) +target_include_directories( oktetadesignerplugin + PRIVATE + ${Qt5UiPlugin_INCLUDE_DIRS} + ${Qt5Designer_INCLUDE_DIRS} ) install( TARGETS oktetadesignerplugin DESTINATION ${QT_PLUGIN_INSTALL_DIR}/designer ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/designer/examples/CMakeLists.txt new/okteta-16.08.0/designer/examples/CMakeLists.txt --- old/okteta-16.04.3/designer/examples/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/designer/examples/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,5 +1,3 @@ -project( oktetadesignerexamples ) - set( oktetadesignerexamplewidget_SRCS main.cpp ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/doc/index.docbook new/okteta-16.08.0/doc/index.docbook --- old/okteta-16.04.3/doc/index.docbook 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/doc/index.docbook 2016-08-09 02:30:36.000000000 +0200 @@ -8,7 +8,7 @@ <!ENTITY Friedrich.Kossebau.email "<email>kossebau(a)kde.org</email>"> <!ENTITY Alex.Richardson "<personname><firstname>Alex</firstname><surname>Richardson</surname></personname>"> - <!ENTITY Alex.Richardson.email "<email>alex.richardson(a)gmx.de</email>"> + <!ENTITY Alex.Richardson.email "<email>arichardson.kde(a)gmail.com</email>"> <!ENTITY % English "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> @@ -371,6 +371,11 @@ <sect2> <title>Creating structure definitions</title> + + <note><para>A more up to date, but not completed guide to writing structure definitions can be found + <ulink url="https://userbase.kde.org/Okteta/Writing_structure_definitions">on the KDE UserBase Wiki</ulink>. + </para></note> + <para>There are two different ways of creating structure definitions. The first is writing the definition in &XML; the other is using JavaScript. The JavaScript approach allows you to create more complex structures with features like &eg; validating the structure. Using &XML; gives you @@ -385,6 +390,9 @@ <sect2> <title>Structure definition &XML; file format</title> + <note><para>A more up to date, but not completed guide to writing structure definitions can be found + <ulink url="https://userbase.kde.org/Okteta/Writing_structure_definitions">on the KDE UserBase Wiki</ulink>. + </para></note> <para>  The <literal role="extension">.osd</literal> &XML; file has one root element: <emphasis><data></emphasis> with no @@ -560,6 +568,10 @@ <sect2> <title>An example structure definition in both &XML; and JavaScript</title> + <note><para>A more up to date, but not completed guide to writing structure definitions can be found + <ulink url="https://userbase.kde.org/Okteta/Writing_structure_definitions">on the KDE UserBase Wiki</ulink>. + </para></note> + <sect3> <title>The common step shared by both approaches</title> <para> @@ -633,7 +645,8 @@ <sect3> <title>The simple structure in JavaScript</title> <para> - To implement the structure above in JavaScript, create a file named <filename>main.js</filename> instead of <filename>simplestruct.osd</filename>. + To implement the structure above in JavaScript, create a file named <filename>main.js</filename> instead of <filename>simplestruct.osd</filename> + and change X-KDE-PluginInfo-Category=structure to X-KDE-PluginInfo-Category=structure/js. The contents of that file should be: <screen> function init() { @@ -709,9 +722,9 @@ <sect3> <title>Further information</title> <para> - A few example structure definitions can be found in the <ulink url="https://projects.kde.org/projects/kde/kdesdk/okteta/repository/revisions/ma…">Git repository.</ulink> + A few example structure definitions can be found in the <ulink url="https://commits.kde.org/okteta?path=kasten/controllers/view/structures/exam…">Git repository.</ulink> This includes for example the file header for PNG files and the ELF file header. - An &XML; schema describing the structure of the <literal role="extension">.osd</literal> file can be found <ulink url="https://projects.kde.org/projects/kde/kdesdk/okteta/repository/revisions/ma…">here.</ulink> + An &XML; schema describing the structure of the <literal role="extension">.osd</literal> file can be found <ulink url="https://commits.kde.org/okteta?path=kasten/controllers/view/structures/sche…">here.</ulink> If more information is needed feel free to contact me at &Alex.Richardson.email; </para> </sect3> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/gui/CMakeLists.txt new/okteta-16.08.0/gui/CMakeLists.txt --- old/okteta-16.04.3/gui/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/gui/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,5 +1,3 @@ -project( oktetagui ) - ecm_setup_version( ${OKTETALIBS_LIB_VERSION} VARIABLE_PREFIX OKTETAGUI SOVERSION ${OKTETALIBS_LIB_SOVERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/kasten/CMakeLists.txt new/okteta-16.08.0/kasten/CMakeLists.txt --- old/okteta-16.04.3/kasten/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/kasten/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,6 +1,3 @@ -project( oktetakasten ) -cmake_minimum_required(VERSION 2.8.8) - set( KASTEN_LIB_VERSION 0.3.0 ) set( KASTEN_ABI_VERSION 3 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/kasten/controllers/CMakeLists.txt new/okteta-16.08.0/kasten/controllers/CMakeLists.txt --- old/okteta-16.04.3/kasten/controllers/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/kasten/controllers/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -494,25 +494,26 @@ add_library( poddecoder-typeeditors STATIC ${PODDECODER_TYPEEDITOR_SRCS} ) set_target_properties( poddecoder-typeeditors PROPERTIES POSITION_INDEPENDENT_CODE TRUE ) target_link_libraries( poddecoder-typeeditors -PRIVATE +PUBLIC OktetaGui - OktetaCore +PRIVATE KF5::Completion ) add_library( structview-tested-srcs STATIC ${STRUCTVIEW_TESTED_SRCS} ) set_target_properties( structview-tested-srcs PROPERTIES POSITION_INDEPENDENT_CODE TRUE ) target_link_libraries( structview-tested-srcs -PRIVATE +PUBLIC OktetaCore KF5::ConfigGui - KF5::ConfigWidgets KF5::I18n - KF5::Completion KF5::Service Qt5::Script Qt5::Xml Qt5::Widgets +PRIVATE + KF5::Completion + KF5::ConfigWidgets ) set( OKTETA_KASTEN_CONTROLLERS_SRCS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/kasten/core/io/tests/bytearrayrawfilesynchronizerfactorytest.cpp new/okteta-16.08.0/kasten/core/io/tests/bytearrayrawfilesynchronizerfactorytest.cpp --- old/okteta-16.04.3/kasten/core/io/tests/bytearrayrawfilesynchronizerfactorytest.cpp 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/kasten/core/io/tests/bytearrayrawfilesynchronizerfactorytest.cpp 2016-08-09 02:30:36.000000000 +0200 @@ -43,7 +43,6 @@ static const char TestFileName[] = "test.data"; #if 0 static const char NotExistingUrl[] = "notexisting://"; -static const char FileProtocolName[] = "file://"; #endif static const int TestDataSize = 50; static const char TestDataChar = 0; @@ -95,7 +94,7 @@ #if 0 void ByteArrayRawFileSynchronizerFactoryTest::testLoadFromUrl() { - const QUrl fileUrl = mFileSystem->createFilePath( QStringLiteral(TestFileName) ).prepend( FileProtocolName ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QStringLiteral(TestFileName) ) ); Kasten::ByteArrayRawFileSynchronizerFactory *factory = new Kasten::ByteArrayRawFileSynchronizerFactory(); AbstractDocument* document = factory->loadNewDocument( fileUrl ); @@ -115,7 +114,7 @@ void ByteArrayRawFileSynchronizerFactoryTest::testLoadFromNotExistingUrl() { - const QUrl fileUrl = mFileSystem->createFilePath( QStringLiteral(NotExistingUrl) ); + const QUrl fileUrl = QUrl( QStringLiteral(NotExistingUrl) ); Kasten::ByteArrayRawFileSynchronizerFactory *factory = new Kasten::ByteArrayRawFileSynchronizerFactory(); AbstractDocument* document = factory->loadNewDocument( fileUrl ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/kasten/core/io/tests/bytearrayrawfilesynchronizertest.cpp new/okteta-16.08.0/kasten/core/io/tests/bytearrayrawfilesynchronizertest.cpp --- old/okteta-16.04.3/kasten/core/io/tests/bytearrayrawfilesynchronizertest.cpp 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/kasten/core/io/tests/bytearrayrawfilesynchronizertest.cpp 2016-08-09 02:30:36.000000000 +0200 @@ -50,7 +50,6 @@ static const char TestDirectory[] = "bytearrayrawfilesynchronizertest"; static const char TestFileName[] = "test.data"; static const char NotExistingUrl[] = "notexisting://"; -static const char FileProtocolName[] = "file://"; static const int TestDataSize = 50; static const char TestDataChar = 0; @@ -93,7 +92,7 @@ void ByteArrayRawFileSynchronizerTest::testLoadFromUrl() { - const QUrl fileUrl = QUrl( mFileSystem->createFilePath( QLatin1String(TestFileName) ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QLatin1String(TestFileName) ) ); ByteArrayRawFileSynchronizer* synchronizer = new ByteArrayRawFileSynchronizer(); synchronizer->startLoad( fileUrl )->exec(); AbstractDocument* document = synchronizer->document(); @@ -115,7 +114,7 @@ void ByteArrayRawFileSynchronizerTest::testLoadFromNotExistingUrl() { - const QUrl fileUrl = QUrl( mFileSystem->createFilePath( QLatin1String(NotExistingUrl) ) ); + const QUrl fileUrl = QUrl( QLatin1String(NotExistingUrl) ); ByteArrayRawFileSynchronizer* synchronizer = new ByteArrayRawFileSynchronizer(); synchronizer->startLoad( fileUrl )->exec(); @@ -127,7 +126,7 @@ void ByteArrayRawFileSynchronizerTest::testNewSaveAsToUrl() { - const QUrl fileUrl = QUrl( mFileSystem->createFilePath( QLatin1String(TestFileName) ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QLatin1String(TestFileName) ) ); ByteArrayDocument* document = new Kasten::ByteArrayDocument(QStringLiteral("New created for test.")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/libs/kasten/CMakeLists.txt new/okteta-16.08.0/libs/kasten/CMakeLists.txt --- old/okteta-16.04.3/libs/kasten/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/libs/kasten/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,5 +1,3 @@ -project( kasten ) - set( KASTEN_MAJOR_VERSION 0 ) set( KASTEN_MINOR_VERSION 3 ) set( KASTEN_PATCHLEVEL_VERSION 0 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/libs/kasten/controllers/CMakeLists.txt new/okteta-16.08.0/libs/kasten/controllers/CMakeLists.txt --- old/okteta-16.04.3/libs/kasten/controllers/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/libs/kasten/controllers/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,5 +1,3 @@ -project( kastencontrollers ) - ecm_setup_version( ${KASTEN_LIB_VERSION} VARIABLE_PREFIX KASTENCONTROLLERS SOVERSION ${KASTEN_LIB_SOVERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/libs/kasten/core/CMakeLists.txt new/okteta-16.08.0/libs/kasten/core/CMakeLists.txt --- old/okteta-16.04.3/libs/kasten/core/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/libs/kasten/core/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,5 +1,3 @@ -project( kastencore ) - ecm_setup_version( ${KASTEN_LIB_VERSION} VARIABLE_PREFIX KASTENCORE SOVERSION ${KASTEN_LIB_SOVERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/libs/kasten/core/tests/testdocumentfilesynchronizerfactorytest.cpp new/okteta-16.08.0/libs/kasten/core/tests/testdocumentfilesynchronizerfactorytest.cpp --- old/okteta-16.04.3/libs/kasten/core/tests/testdocumentfilesynchronizerfactorytest.cpp 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/libs/kasten/core/tests/testdocumentfilesynchronizerfactorytest.cpp 2016-08-09 02:30:36.000000000 +0200 @@ -42,7 +42,6 @@ #if 0 static const char TestFileName2[] = "test2.data"; static const char NotExistingFileName[] = "not.existing"; -static const char FileProtocolName[] = "file://"; static const char NotExistingUrlName[] = "not://existing"; #endif static const char TestData1[] = "TestData1"; @@ -114,7 +113,7 @@ void TestDocumentFileSynchronizerFactoryTest::testLoadFromFile() { const QByteArray testData( TestData1 ); - const QUrl fileUrl = mFileSystem->createFilePath( QStringLiteral(TestFileName1) ).prepend( FileProtocolName ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QStringLiteral(TestFileName1) ) ); Kasten::TestDocumentFileSynchronizerFactory* factory = new Kasten::TestDocumentFileSynchronizerFactory(); AbstractDocument* document = factory->loadNewDocument( fileUrl ); @@ -146,7 +145,7 @@ void TestDocumentFileSynchronizerFactoryTest::testLoadFromNotExistingFile() { - const QUrl fileUrl = mFileSystem->createFilePath( QStringLiteral(NotExistingFileName) ).prepend( FileProtocolName ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QStringLiteral(NotExistingFileName) ) ); Kasten::TestDocumentFileSynchronizerFactory* factory = new Kasten::TestDocumentFileSynchronizerFactory(); AbstractDocument* document = factory->loadNewDocument( fileUrl ); @@ -157,7 +156,7 @@ void TestDocumentFileSynchronizerFactoryTest::testLoadSaveFile() { const QByteArray otherData( TestData2 ); - const QUrl fileUrl = mFileSystem->createFilePath( QStringLiteral(TestFileName1) ).prepend( FileProtocolName ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QStringLiteral(TestFileName1) ) ); Kasten::TestDocumentFileSynchronizerFactory* factory = new Kasten::TestDocumentFileSynchronizerFactory(); AbstractDocument* document = factory->loadNewDocument( fileUrl ); @@ -179,7 +178,7 @@ { const QByteArray otherData( TestData2 ); const QString filePath = mFileSystem->createFilePath( QStringLiteral(TestFileName1) ); - const QUrl fileUrl = QString( filePath ).prepend( FileProtocolName ); + const QUrl fileUrl = QUrl::fromLocalFile( filePath ); Kasten::TestDocumentFileSynchronizerFactory* factory = new Kasten::TestDocumentFileSynchronizerFactory(); AbstractDocument* document = factory->loadNewDocument( fileUrl ); @@ -203,9 +202,9 @@ void TestDocumentFileSynchronizerFactoryTest::testConnectToFile() { const QByteArray otherData( TestData2 ); - const QUrl fileUrl1 = mFileSystem->createFilePath( QStringLiteral(TestFileName1) ).prepend( FileProtocolName ); + const QUrl fileUrl1 = QUrl::::fromLocalFile( mFileSystem->createFilePath( QStringLiteral(TestFileName1) ) ); const QString filePath2 = mFileSystem->createFilePath( QStringLiteral(TestFileName2) ); - const QUrl fileUrl2 = QString( filePath2 ).prepend( FileProtocolName ); + const QUrl fileUrl2 = QUrl::fromLocalFile( filePath2 ); Kasten::TestDocumentFileSynchronizerFactory* factory = new Kasten::TestDocumentFileSynchronizerFactory(); Kasten::TestDocument* testDocument = new Kasten::TestDocument(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/libs/kasten/core/tests/testdocumentfilesynchronizertest.cpp new/okteta-16.08.0/libs/kasten/core/tests/testdocumentfilesynchronizertest.cpp --- old/okteta-16.04.3/libs/kasten/core/tests/testdocumentfilesynchronizertest.cpp 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/libs/kasten/core/tests/testdocumentfilesynchronizertest.cpp 2016-08-09 02:30:36.000000000 +0200 @@ -46,7 +46,6 @@ static const char TestFileName1[] = "test1.data"; static const char TestFileName2[] = "test2.data"; static const char NotExistingFileName[] = "not.existing"; -static const char FileProtocolName[] = "file://"; static const char NotExistingUrlName[] = "not://existing"; static const char TestData1[] = "TestData1"; static const char TestData2[] = "TestData2"; @@ -105,7 +104,7 @@ void TestDocumentFileSynchronizerTest::testLoadFromFile() { const QByteArray testData( TestData1 ); - const QUrl fileUrl = QUrl( mFileSystem->createFilePath( QLatin1String(TestFileName1) ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QLatin1String(TestFileName1) ) ); Kasten::TestDocumentFileSynchronizer* synchronizer = new Kasten::TestDocumentFileSynchronizer(); synchronizer->startLoad( fileUrl )->exec(); @@ -139,7 +138,7 @@ void TestDocumentFileSynchronizerTest::testLoadFromNotExistingFile() { - const QUrl fileUrl = QUrl( mFileSystem->createFilePath( QLatin1String(NotExistingFileName) ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QLatin1String(NotExistingFileName) ) ); Kasten::TestDocumentFileSynchronizer* synchronizer = new Kasten::TestDocumentFileSynchronizer(); synchronizer->startLoad( fileUrl )->exec(); Kasten::AbstractDocument* document = synchronizer->document(); @@ -151,7 +150,7 @@ void TestDocumentFileSynchronizerTest::testLoadSaveFile() { const QByteArray otherData( TestData2 ); - const QUrl fileUrl = QUrl( mFileSystem->createFilePath( QLatin1String(TestFileName1) ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QLatin1String(TestFileName1) ) ); Kasten::TestDocumentFileSynchronizer* synchronizer = new Kasten::TestDocumentFileSynchronizer(); synchronizer->startLoad( fileUrl )->exec(); Kasten::AbstractDocument* document = synchronizer->document(); @@ -172,7 +171,7 @@ { const QByteArray otherData( TestData2 ); const QString filePath = mFileSystem->createFilePath( QLatin1String(TestFileName1) ); - const QUrl fileUrl = QUrl( QString( filePath ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl = QUrl::fromLocalFile( QString( filePath ) ); Kasten::TestDocumentFileSynchronizer* synchronizer = new Kasten::TestDocumentFileSynchronizer(); synchronizer->startLoad( fileUrl )->exec(); @@ -197,9 +196,9 @@ { const QByteArray data( TestData1 ); const QByteArray otherData( TestData2 ); - const QUrl fileUrl1 = QUrl( mFileSystem->createFilePath( QLatin1String(TestFileName1) ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl1 = QUrl::fromLocalFile( mFileSystem->createFilePath( QLatin1String(TestFileName1) ) ); const QString filePath2 = mFileSystem->createFilePath( QLatin1String(TestFileName2) ); - const QUrl fileUrl2 = QUrl( QString( filePath2 ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl2 = QUrl::fromLocalFile( filePath2 ); // load from 1 Kasten::TestDocumentFileSynchronizer* synchronizer = new Kasten::TestDocumentFileSynchronizer(); @@ -219,9 +218,9 @@ void TestDocumentFileSynchronizerTest::testConnectToFile() { const QByteArray otherData( TestData2 ); - const QUrl fileUrl1 = QUrl( mFileSystem->createFilePath( QLatin1String(TestFileName1) ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl1 = QUrl::fromLocalFile( mFileSystem->createFilePath( QLatin1String(TestFileName1) ) ); const QString filePath2 = mFileSystem->createFilePath( QLatin1String(TestFileName2) ); - const QUrl fileUrl2 = QUrl( QString( filePath2 ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl2 = QUrl::fromLocalFile( QString( filePath2 ) ); Kasten::TestDocument* testDocument = new Kasten::TestDocument(); Kasten::AbstractDocument* document = testDocument; @@ -251,7 +250,7 @@ const QByteArray header( Header1); const QByteArray otherData( TestData2 ); const QString filePath = mFileSystem->createFilePath( QLatin1String(TestFileName1) ); - const QUrl fileUrl = QUrl( QString( filePath ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl = QUrl::fromLocalFile( filePath ); // TODO: failing calls in AbstractDocumentFileSystemSynchronizer trigger GUI here, so far it worked ;) #if 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/libs/kasten/gui/CMakeLists.txt new/okteta-16.08.0/libs/kasten/gui/CMakeLists.txt --- old/okteta-16.04.3/libs/kasten/gui/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/libs/kasten/gui/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,5 +1,3 @@ -project( kastengui ) - ecm_setup_version( ${KASTEN_LIB_VERSION} VARIABLE_PREFIX KASTENGUI SOVERSION ${KASTEN_LIB_SOVERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/mimetypes/XmlMessages.sh new/okteta-16.08.0/mimetypes/XmlMessages.sh --- old/okteta-16.04.3/mimetypes/XmlMessages.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/okteta-16.08.0/mimetypes/XmlMessages.sh 2016-08-09 02:30:36.000000000 +0200 @@ -0,0 +1,22 @@ +function get_files +{ + echo okteta.xml +} + +function po_for_file +{ + case "$1" in + okteta.xml) + echo okteta_xml_mimetypes.po + ;; + esac +} + +function tags_for_file +{ + case "$1" in + okteta.xml) + echo comment + ;; + esac +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/mimetypes/okteta.xml new/okteta-16.08.0/mimetypes/okteta.xml --- old/okteta-16.04.3/mimetypes/okteta.xml 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/mimetypes/okteta.xml 2016-08-09 02:30:36.000000000 +0200 @@ -19,6 +19,22 @@ <sub-class-of type="text/plain"/> <generic-icon name="text-x-hex"/> <comment>Motorola S-Records</comment> + <comment xml:lang="ca">Registres S de Motorola</comment> + <comment xml:lang="ca@valencia">Registres S de Motorola</comment> + <comment xml:lang="en_GB">Motorola S-Records</comment> + <comment xml:lang="es">Motorola S-Records</comment> + <comment xml:lang="it">S-Records Motorola</comment> + <comment xml:lang="nl">Motorola S-records</comment> + <comment xml:lang="pl">Motorola S-Records</comment> + <comment xml:lang="pt">Registos-S da Motorola</comment> + <comment xml:lang="sk">Motorola S-Records</comment> + <comment xml:lang="sl">Motorola S-Records</comment> + <comment xml:lang="sr">Моторолин с‑рекорд</comment> + <comment xml:lang="sr@ijekavian">Моторолин с‑рекорд</comment> + <comment xml:lang="sr@ijekavianlatin">Motorolin S‑Record</comment> + <comment xml:lang="sr@latin">Motorolin S‑Record</comment> + <comment xml:lang="sv">Motorola S-Records</comment> + <comment xml:lang="uk">S-записи Motorola</comment> <magic priority="70"> <match offset="0" value="S0" type="string"> <match offset="4" value="0000" type="string"/> @@ -36,6 +52,22 @@ <generic-icon name="text-x-hex"/>  <comment>Intel hexadecimal object file</comment> + <comment xml:lang="ca">Fitxer objecte hexadecimal d'Intel</comment> + <comment xml:lang="ca@valencia">Fitxer objecte hexadecimal d'Intel</comment> + <comment xml:lang="en_GB">Intel hexadecimal object file</comment> + <comment xml:lang="es">Archivo objeto hexadecimal de Intel</comment> + <comment xml:lang="it">File oggetto esadecimale Intel</comment> + <comment xml:lang="nl">Intel hexadecimaal objectbestand</comment> + <comment xml:lang="pl">Plik obiektu szesnastkowego Intel</comment> + <comment xml:lang="pt">Ficheiro de objectos em hexadecimal da Intel</comment> + <comment xml:lang="sk">Intel hexadecimálny objektový súbor</comment> + <comment xml:lang="sl">Intelova šestnajstiška predmetna datoteka</comment> + <comment xml:lang="sr">Интелов хексадекадни објектни фајл</comment> + <comment xml:lang="sr@ijekavian">Интелов хексадекадни објектни фајл</comment> + <comment xml:lang="sr@ijekavianlatin">Intelov heksadekadni objektni fajl</comment> + <comment xml:lang="sr@latin">Intelov heksadekadni objektni fajl</comment> + <comment xml:lang="sv">Intel hexadecimal objektfil</comment> + <comment xml:lang="uk">шістнадцятковий об’єктний файл Intel®</comment>  <magic priority="70"> <match type="string" offset="0" value=":"> @@ -50,6 +82,22 @@ <sub-class-of type="text/plain"/> <generic-icon name="text-x-hex"/> <comment>Base64 encoded data</comment> + <comment xml:lang="ca">Dades codificades en Base64</comment> + <comment xml:lang="ca@valencia">Dades codificades en Base64</comment> + <comment xml:lang="en_GB">Base64 encoded data</comment> + <comment xml:lang="es">Datos codificados en Base64</comment> + <comment xml:lang="it">Dati codificati in Base64</comment> + <comment xml:lang="nl">Base64 gecodeerde gegevens</comment> + <comment xml:lang="pl">Dane zakodowane Base64</comment> + <comment xml:lang="pt">Dados codificados em Base64</comment> + <comment xml:lang="sk">Dáta zakódované Base64</comment> + <comment xml:lang="sl">Podatki kodirani z Base64</comment> + <comment xml:lang="sr">база64 кодирани подаци</comment> + <comment xml:lang="sr@ijekavian">база64 кодирани подаци</comment> + <comment xml:lang="sr@ijekavianlatin">base64 kodirani podaci</comment> + <comment xml:lang="sr@latin">base64 kodirani podaci</comment> + <comment xml:lang="sv">Base64-kodad data</comment> + <comment xml:lang="uk">дані у кодуванні Base64</comment> <glob pattern="*.base64"/> <glob pattern="*.b64"/> </mime-type> @@ -58,6 +106,22 @@ <sub-class-of type="text/plain"/> <generic-icon name="text-x-hex"/> <comment>Base32 encoded data</comment> + <comment xml:lang="ca">Dades codificades en Base32</comment> + <comment xml:lang="ca@valencia">Dades codificades en Base32</comment> + <comment xml:lang="en_GB">Base32 encoded data</comment> + <comment xml:lang="es">Datos codificados en Base32</comment> + <comment xml:lang="it">Dati codificati in Base32</comment> + <comment xml:lang="nl">Base32 gecodeerde gegevens</comment> + <comment xml:lang="pl">Dane zakodowane Base32</comment> + <comment xml:lang="pt">Dados codificados em Base32</comment> + <comment xml:lang="sk">Dáta zakódované Base32</comment> + <comment xml:lang="sl">Podatki kodirani z Base32</comment> + <comment xml:lang="sr">база32 кодирани подаци</comment> + <comment xml:lang="sr@ijekavian">база32 кодирани подаци</comment> + <comment xml:lang="sr@ijekavianlatin">base32 kodirani podaci</comment> + <comment xml:lang="sr@latin">base32 kodirani podaci</comment> + <comment xml:lang="sv">Base32-kodad data</comment> + <comment xml:lang="uk">дані у кодуванні Base32</comment> <glob pattern="*.base32"/> </mime-type> @@ -65,6 +129,22 @@ <sub-class-of type="text/plain"/> <generic-icon name="text-x-hex"/> <comment>Btoa Encoded File</comment> + <comment xml:lang="ca">Fitxer BTOA codificat</comment> + <comment xml:lang="ca@valencia">Fitxer BTOA codificat</comment> + <comment xml:lang="en_GB">Btoa Encoded File</comment> + <comment xml:lang="es">Archivo codificado en Btoa</comment> + <comment xml:lang="it">File codificato in Btoa</comment> + <comment xml:lang="nl">Btoa gecodeerd bestand</comment> + <comment xml:lang="pl">Dane zakodowane Btoa</comment> + <comment xml:lang="pt">Dados codificados em Btoa</comment> + <comment xml:lang="sk">Súbor zakódovaný Btoa</comment> + <comment xml:lang="sl">Datoteka kodirana z Btoa</comment> + <comment xml:lang="sr">бтоа кодирани подаци</comment> + <comment xml:lang="sr@ijekavian">бтоа кодирани подаци</comment> + <comment xml:lang="sr@ijekavianlatin">btoa kodirani podaci</comment> + <comment xml:lang="sr@latin">btoa kodirani podaci</comment> + <comment xml:lang="sv">BTOA-kodad data</comment> + <comment xml:lang="uk">файл у кодуванні Btoa</comment> <magic priority="50"> <match type="string" offset="0" value="xbtoa Begin"/> </magic> @@ -76,6 +156,22 @@ <sub-class-of type="text/plain"/> <generic-icon name="text-x-hex"/> <comment>Ascii85 encoded data</comment> + <comment xml:lang="ca">Dades codificades en ASCII85</comment> + <comment xml:lang="ca@valencia">Dades codificades en ASCII85</comment> + <comment xml:lang="en_GB">Ascii85 encoded data</comment> + <comment xml:lang="es">Datos codificados en Ascii85</comment> + <comment xml:lang="it">File codificato in Ascii85</comment> + <comment xml:lang="nl">Ascii85 gecodeerde gegevens</comment> + <comment xml:lang="pl">Dane zakodowane Ascii85</comment> + <comment xml:lang="pt">Dados codificados em Ascii85</comment> + <comment xml:lang="sk">Dáta zakódované Ascii85</comment> + <comment xml:lang="sl">Podatki kodirani z Ascii85</comment> + <comment xml:lang="sr">аски‑85 кодирани подаци</comment> + <comment xml:lang="sr@ijekavian">аски‑85 кодирани подаци</comment> + <comment xml:lang="sr@ijekavianlatin">ASCII‑85 kodirani podaci</comment> + <comment xml:lang="sr@latin">ASCII‑85 kodirani podaci</comment> + <comment xml:lang="sv">ASCII85-kodad data</comment> + <comment xml:lang="uk">дані у кодуванні Ascii85</comment> <magic priority="50"> <match type="string" offset="0" value="$lt;~"/> </magic> @@ -86,6 +182,22 @@ <sub-class-of type="text/plain"/> <generic-icon name="text-x-hex"/> <comment>Uuencoded file</comment> + <comment xml:lang="ca">Fitxer «uuencoded»</comment> + <comment xml:lang="ca@valencia">Fitxer «uuencoded»</comment> + <comment xml:lang="en_GB">Uuencoded file</comment> + <comment xml:lang="es">Archivo codificado con Uuencode</comment> + <comment xml:lang="it">File con codifica UUencode</comment> + <comment xml:lang="nl">Uuencoded bestand</comment> + <comment xml:lang="pl">Plik Uuencoded</comment> + <comment xml:lang="pt">Ficheiro codificado com UUencode</comment> + <comment xml:lang="sk">Uuencoded súbor</comment> + <comment xml:lang="sl">Datoteka Uuencoded</comment> + <comment xml:lang="sr">уу‑кодни фајл</comment> + <comment xml:lang="sr@ijekavian">уу‑кодни фајл</comment> + <comment xml:lang="sr@ijekavianlatin">Uuencoding fajl</comment> + <comment xml:lang="sr@latin">Uuencoding fajl</comment> + <comment xml:lang="sv">Uuencoded fil</comment> + <comment xml:lang="uk">файл даних у форматі UUE</comment> <magic priority="50"> <match type="string" offset="0" value="begin"/> <match type="string" offset="0" value="begin-base64"/> @@ -99,6 +211,22 @@ <sub-class-of type="text/plain"/> <generic-icon name="text-x-hex"/> <comment>Xxencoded file</comment> + <comment xml:lang="ca">Fitxer «xxencoded»</comment> + <comment xml:lang="ca@valencia">Fitxer «xxencoded»</comment> + <comment xml:lang="en_GB">Xxencoded file</comment> + <comment xml:lang="es">Archivo codificado con Xxencode</comment> + <comment xml:lang="it">File con codifica Xxencoded</comment> + <comment xml:lang="nl">Xxencoded bestand</comment> + <comment xml:lang="pl">Plik Xxencoded</comment> + <comment xml:lang="pt">Ficheiro codificado com Xxencode</comment> + <comment xml:lang="sk">Xxencoded súbor</comment> + <comment xml:lang="sl">Datoteka Xxencoded</comment> + <comment xml:lang="sr">иксикс-кодни фајл</comment> + <comment xml:lang="sr@ijekavian">иксикс-кодни фајл</comment> + <comment xml:lang="sr@ijekavianlatin">Xxencoding fajl</comment> + <comment xml:lang="sr@latin">Xxencoding fajl</comment> + <comment xml:lang="sv">Xxencoded fil</comment> + <comment xml:lang="uk">файл даних у форматі xxe</comment> <magic priority="50"> <match type="string" offset="0" value="begin"/> </magic> @@ -108,6 +236,22 @@ <mime-type type="application/x-vnd.kde.okteta.structure"> <sub-class-of type="application/xml"/> <comment>Okteta Structure definition</comment> + <comment xml:lang="ca">Definició d'estructura de l'Okteta</comment> + <comment xml:lang="ca@valencia">Definició d'estructura de l'Okteta</comment> + <comment xml:lang="en_GB">Okteta Structure definition</comment> + <comment xml:lang="es">Definición de estructura de Okteta</comment> + <comment xml:lang="it">Definizione di struttura di Okteta</comment> + <comment xml:lang="nl">Okteta structuurdefinitie</comment> + <comment xml:lang="pl">Definicja struktury Okteta</comment> + <comment xml:lang="pt">Definição de estrutura do Okteta</comment> + <comment xml:lang="sk">Definícia štruktúry Okteta</comment> + <comment xml:lang="sl">Določilo zgradbe za Okteto</comment> + <comment xml:lang="sr">Октетина дефиниција структуре</comment> + <comment xml:lang="sr@ijekavian">Октетина дефиниција структуре</comment> + <comment xml:lang="sr@ijekavianlatin">Oktetina definicija strukture</comment> + <comment xml:lang="sr@latin">Oktetina definicija strukture</comment> + <comment xml:lang="sv">Okteta strukturdefinition</comment> + <comment xml:lang="uk">визначення структури Okteta</comment> <glob pattern="*.osd"/> </mime-type> </mime-info> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/parts/kpart/CMakeLists.txt new/okteta-16.08.0/parts/kpart/CMakeLists.txt --- old/okteta-16.04.3/parts/kpart/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/parts/kpart/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,8 +1,5 @@ -project( oktetapart ) - add_definitions(-DTRANSLATION_DOMAIN=\"oktetapart\") - set( oktetapart_SRCS part.cpp browserextension.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/program/CMakeLists.txt new/okteta-16.08.0/program/CMakeLists.txt --- old/okteta-16.04.3/program/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/program/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,5 +1,3 @@ -project( oktetaprogram ) - set( okteta_SRCS main.cpp program.cpp @@ -34,7 +32,7 @@ install( PROGRAMS org.kde.okteta.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES oktetaui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/okteta ) -install( FILES org.kde.okteta.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata ) +install( FILES org.kde.okteta.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} ) ecm_install_icons( ICONS 16-apps-okteta.png 32-apps-okteta.png 48-apps-okteta.png diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/program/about.cpp new/okteta-16.08.0/program/about.cpp --- old/okteta-16.04.3/program/about.cpp 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/program/about.cpp 2016-08-09 02:30:36.000000000 +0200 @@ -29,7 +29,7 @@ OktetaAboutData::OktetaAboutData() : KAboutData( QStringLiteral("okteta"), i18n("Okteta"), // name - QStringLiteral("0.19.3"), + QStringLiteral("0.20.0"), i18n("Hex editor"), // description KAboutLicense::GPL_V2, i18n("Copyright 2006-2016 Friedrich W. H. Kossebau"), //copyright

1 0

commit lskat for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package lskat for openSUSE:Factory checked in at 2016-08-31 00:09:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lskat (Old) and /work/SRC/openSUSE:Factory/.lskat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lskat" Changes: -------- --- /work/SRC/openSUSE:Factory/lskat/lskat.changes 2016-07-24 19:49:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lskat.new/lskat.changes 2016-08-31 00:09:06.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:30:18 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:48:03 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- lskat-16.04.3.tar.xz New: ---- lskat-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lskat.spec ++++++ --- /var/tmp/diff_new_pack.GlZptd/_old 2016-08-31 00:09:07.000000000 +0200 +++ /var/tmp/diff_new_pack.GlZptd/_new 2016-08-31 00:09:07.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Card Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: lskat-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ lskat-16.04.3.tar.xz -> lskat-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lskat-16.04.3/grafix/blue.svg new/lskat-16.08.0/grafix/blue.svg --- old/lskat-16.04.3/grafix/blue.svg 2015-11-30 01:21:32.000000000 +0100 +++ new/lskat-16.08.0/grafix/blue.svg 2016-05-09 05:41:21.000000000 +0200 @@ -917,7 +917,6 @@ x1="78.195801" gradientUnits="userSpaceOnUse" id="linearGradient40474" - xlink:href="#XMLID_143_" inkscape:collect="always" /> <linearGradient y2="83.815903" @@ -926,7 +925,6 @@ x1="73.767097" gradientUnits="userSpaceOnUse" id="linearGradient40472" - xlink:href="#XMLID_142_" inkscape:collect="always" /> <linearGradient y2="83.835403" @@ -935,7 +933,6 @@ x1="69.441902" gradientUnits="userSpaceOnUse" id="linearGradient40470" - xlink:href="#XMLID_141_" inkscape:collect="always" /> <linearGradient y2="83.835403" @@ -944,7 +941,6 @@ x1="65.102997" gradientUnits="userSpaceOnUse" id="linearGradient40468" - xlink:href="#XMLID_140_" inkscape:collect="always" /> <linearGradient y2="83.835403" @@ -953,7 +949,6 @@ x1="60.764599" gradientUnits="userSpaceOnUse" id="linearGradient40466" - xlink:href="#XMLID_139_" inkscape:collect="always" /> <linearGradient y2="83.815903" @@ -962,7 +957,6 @@ x1="56.440399" gradientUnits="userSpaceOnUse" id="linearGradient40464" - xlink:href="#XMLID_138_" inkscape:collect="always" /> <linearGradient y2="83.806198" @@ -971,7 +965,6 @@ x1="52.0107" gradientUnits="userSpaceOnUse" id="linearGradient40462" - xlink:href="#XMLID_137_" inkscape:collect="always" /> <linearGradient y2="83.903801" @@ -980,7 +973,6 @@ x1="94.716301" gradientUnits="userSpaceOnUse" id="linearGradient40460" - xlink:href="#XMLID_136_" inkscape:collect="always" /> <linearGradient y2="83.903801" @@ -989,7 +981,6 @@ x1="28.855" gradientUnits="userSpaceOnUse" id="linearGradient40458" - xlink:href="#XMLID_135_" inkscape:collect="always" /> <linearGradient y2="83.903801" @@ -998,7 +989,6 @@ x1="88.983902" gradientUnits="userSpaceOnUse" id="linearGradient40456" - xlink:href="#XMLID_134_" inkscape:collect="always" /> <linearGradient y2="83.903801" @@ -1007,7 +997,6 @@ x1="40.589802" gradientUnits="userSpaceOnUse" id="linearGradient40454" - xlink:href="#XMLID_133_" inkscape:collect="always" /> <linearGradient y2="83.903801" @@ -1016,7 +1005,6 @@ x1="82.985802" gradientUnits="userSpaceOnUse" id="linearGradient40452" - xlink:href="#XMLID_132_" inkscape:collect="always" /> <linearGradient y2="83.903801" @@ -1025,7 +1013,6 @@ x1="34.857399" gradientUnits="userSpaceOnUse" id="linearGradient40450" - xlink:href="#XMLID_131_" inkscape:collect="always" /> <linearGradient y2="83.903801" @@ -1034,7 +1021,6 @@ x1="100.7192" gradientUnits="userSpaceOnUse" id="linearGradient40448" - xlink:href="#XMLID_130_" inkscape:collect="always" /> <linearGradient y2="83.903801" @@ -1043,7 +1029,6 @@ x1="46.587898" gradientUnits="userSpaceOnUse" id="linearGradient40446" - xlink:href="#XMLID_129_" inkscape:collect="always" /> <linearGradient y2="81.1772" @@ -1052,7 +1037,6 @@ x1="75.829597" gradientUnits="userSpaceOnUse" id="linearGradient40442" - xlink:href="#XMLID_127_" inkscape:collect="always" /> <linearGradient y2="81.186996" @@ -1061,7 +1045,6 @@ x1="71.399902" gradientUnits="userSpaceOnUse" id="linearGradient40440" - xlink:href="#XMLID_126_" inkscape:collect="always" /> <linearGradient y2="81.204597" @@ -1070,7 +1053,6 @@ x1="67.075699" gradientUnits="userSpaceOnUse" id="linearGradient40438" - xlink:href="#XMLID_125_" inkscape:collect="always" /> <linearGradient y2="81.204597" @@ -1079,7 +1061,6 @@ x1="62.737301" gradientUnits="userSpaceOnUse" id="linearGradient40436" - xlink:href="#XMLID_124_" inkscape:collect="always" /> <linearGradient y2="81.204597" @@ -1088,7 +1069,6 @@ x1="58.398399" gradientUnits="userSpaceOnUse" id="linearGradient40434" - xlink:href="#XMLID_123_" inkscape:collect="always" /> <linearGradient y2="81.186996" @@ -1097,7 +1077,6 @@ x1="54.0732" gradientUnits="userSpaceOnUse" id="linearGradient40432" - xlink:href="#XMLID_122_" inkscape:collect="always" /> <linearGradient y2="81.1772" @@ -1106,7 +1085,6 @@ x1="49.644001" gradientUnits="userSpaceOnUse" id="linearGradient40430" - xlink:href="#XMLID_121_" inkscape:collect="always" /> <linearGradient y2="81.274902" @@ -1115,7 +1093,6 @@ x1="92.349098" gradientUnits="userSpaceOnUse" id="linearGradient40428" - xlink:href="#XMLID_120_" inkscape:collect="always" /> <linearGradient y2="81.274902" @@ -1124,7 +1101,6 @@ x1="27.540001" gradientUnits="userSpaceOnUse" id="linearGradient40426" - xlink:href="#XMLID_119_" inkscape:collect="always" /> <linearGradient y2="81.274902" @@ -1133,7 +1109,6 @@ x1="86.616699" gradientUnits="userSpaceOnUse" id="linearGradient40424" - xlink:href="#XMLID_118_" inkscape:collect="always" /> <linearGradient y2="81.274902" @@ -1142,7 +1117,6 @@ x1="38.223598" gradientUnits="userSpaceOnUse" id="linearGradient40422" - xlink:href="#XMLID_117_" inkscape:collect="always" /> <linearGradient y2="81.274902" @@ -1151,7 +1125,6 @@ x1="80.619598" gradientUnits="userSpaceOnUse" id="linearGradient40420" - xlink:href="#XMLID_116_" inkscape:collect="always" /> <linearGradient y2="81.274902" @@ -1160,7 +1133,6 @@ x1="32.4902" gradientUnits="userSpaceOnUse" id="linearGradient40418" - xlink:href="#XMLID_115_" inkscape:collect="always" /> <linearGradient y2="81.274902" @@ -1169,7 +1141,6 @@ x1="97.300301" gradientUnits="userSpaceOnUse" id="linearGradient40416" - xlink:href="#XMLID_114_" inkscape:collect="always" /> <linearGradient y2="81.274902" @@ -1178,7 +1149,6 @@ x1="44.220699" gradientUnits="userSpaceOnUse" id="linearGradient40414" - xlink:href="#XMLID_113_" inkscape:collect="always" /> <linearGradient y2="86.181198" @@ -1187,7 +1157,6 @@ x1="76.0923" gradientUnits="userSpaceOnUse" id="linearGradient40412" - xlink:href="#XMLID_112_" inkscape:collect="always" /> <linearGradient y2="86.190903" @@ -1196,7 +1165,6 @@ x1="71.663597" gradientUnits="userSpaceOnUse" id="linearGradient40410" - xlink:href="#XMLID_111_" inkscape:collect="always" /> <linearGradient y2="86.210403" @@ -1205,7 +1173,6 @@ x1="67.338402" gradientUnits="userSpaceOnUse" id="linearGradient40408" - xlink:href="#XMLID_110_" inkscape:collect="always" /> <linearGradient y2="86.210403" @@ -1214,7 +1181,6 @@ x1="63" gradientUnits="userSpaceOnUse" id="linearGradient40406" - xlink:href="#XMLID_109_" inkscape:collect="always" /> <linearGradient y2="86.210403" @@ -1223,7 +1189,6 @@ x1="58.661098" gradientUnits="userSpaceOnUse" id="linearGradient40404" - xlink:href="#XMLID_108_" inkscape:collect="always" /> <linearGradient y2="86.190903" @@ -1232,7 +1197,6 @@ x1="54.336399" gradientUnits="userSpaceOnUse" id="linearGradient40402" - xlink:href="#XMLID_107_" inkscape:collect="always" /> <linearGradient y2="86.181198" @@ -1241,7 +1205,6 @@ x1="49.9067" gradientUnits="userSpaceOnUse" id="linearGradient40400" - xlink:href="#XMLID_106_" inkscape:collect="always" /> <linearGradient y2="86.278801" @@ -1250,7 +1213,6 @@ x1="92.612801" gradientUnits="userSpaceOnUse" id="linearGradient40398" - xlink:href="#XMLID_105_" inkscape:collect="always" /> <linearGradient y2="86.278801" @@ -1259,7 +1221,6 @@ x1="26.750999" gradientUnits="userSpaceOnUse" id="linearGradient40396" - xlink:href="#XMLID_104_" inkscape:collect="always" /> <linearGradient y2="86.278801" @@ -1268,7 +1229,6 @@ x1="86.880402" gradientUnits="userSpaceOnUse" id="linearGradient40394" - xlink:href="#XMLID_103_" inkscape:collect="always" /> <linearGradient y2="86.278801" @@ -1277,7 +1237,6 @@ x1="38.486301" gradientUnits="userSpaceOnUse" id="linearGradient40392" - xlink:href="#XMLID_102_" inkscape:collect="always" /> <linearGradient y2="86.278801" @@ -1286,7 +1245,6 @@ x1="80.882301" gradientUnits="userSpaceOnUse" id="linearGradient40390" - xlink:href="#XMLID_101_" inkscape:collect="always" /> <linearGradient y2="86.278801" @@ -1295,7 +1253,6 @@ x1="32.753899" gradientUnits="userSpaceOnUse" id="linearGradient40388" - xlink:href="#XMLID_100_" inkscape:collect="always" /> <linearGradient y2="86.278801" @@ -1304,7 +1261,6 @@ x1="98.6157" gradientUnits="userSpaceOnUse" id="linearGradient40386" - xlink:href="#XMLID_99_" inkscape:collect="always" /> <linearGradient y2="86.278801" @@ -1313,7 +1269,6 @@ x1="44.484402" gradientUnits="userSpaceOnUse" id="linearGradient40384" - xlink:href="#XMLID_98_" inkscape:collect="always" /> <linearGradient y2="103.3413" @@ -1322,7 +1277,6 @@ x1="91.617699" gradientUnits="userSpaceOnUse" id="linearGradient40372" - xlink:href="#XMLID_92_" inkscape:collect="always" /> <linearGradient y2="103.3413" @@ -1331,7 +1285,6 @@ x1="34.381802" gradientUnits="userSpaceOnUse" id="linearGradient40370" - xlink:href="#XMLID_91_" inkscape:collect="always" /> <linearGradient y2="99.370796" @@ -1340,7 +1293,6 @@ x1="58.837898" gradientUnits="userSpaceOnUse" id="linearGradient40368" - xlink:href="#XMLID_90_" inkscape:collect="always" /> <linearGradient y2="99.603996" @@ -1349,7 +1301,6 @@ x1="64.893097" gradientUnits="userSpaceOnUse" id="linearGradient40366" - xlink:href="#XMLID_89_" inkscape:collect="always" /> <linearGradient y2="1.728" @@ -1358,7 +1309,6 @@ x1="86.1558" gradientUnits="userSpaceOnUse" id="linearGradient40354" - xlink:href="#XMLID_83_" inkscape:collect="always" /> <linearGradient y2="1.728" @@ -1367,7 +1317,6 @@ x1="39.8442" gradientUnits="userSpaceOnUse" id="linearGradient40352" - xlink:href="#XMLID_82_" inkscape:collect="always" /> <linearGradient y2="68.678101" @@ -1376,7 +1325,6 @@ x1="114.6655" gradientUnits="userSpaceOnUse" id="linearGradient40346" - xlink:href="#XMLID_79_" inkscape:collect="always" /> <linearGradient y2="64.543701" @@ -1385,7 +1333,6 @@ x1="3.8773999" gradientUnits="userSpaceOnUse" id="linearGradient40344" - xlink:href="#XMLID_78_" inkscape:collect="always" /> <radialGradient r="3.691133" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lskat-16.04.3/grafix/egyptian.svg new/lskat-16.08.0/grafix/egyptian.svg --- old/lskat-16.04.3/grafix/egyptian.svg 2015-11-30 01:21:32.000000000 +0100 +++ new/lskat-16.08.0/grafix/egyptian.svg 2016-05-09 05:41:21.000000000 +0200 @@ -223,7 +223,6 @@ x2="78.195801" y2="83.806198" id="linearGradient40474" - xlink:href="#XMLID_143_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="73.767097" @@ -231,7 +230,6 @@ x2="73.767097" y2="83.815903" id="linearGradient40472" - xlink:href="#XMLID_142_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="69.441902" @@ -239,7 +237,6 @@ x2="69.441902" y2="83.835403" id="linearGradient40470" - xlink:href="#XMLID_141_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="65.102997" @@ -247,7 +244,6 @@ x2="65.102997" y2="83.835403" id="linearGradient40468" - xlink:href="#XMLID_140_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="60.764599" @@ -255,7 +251,6 @@ x2="60.764599" y2="83.835403" id="linearGradient40466" - xlink:href="#XMLID_139_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="56.440399" @@ -263,7 +258,6 @@ x2="56.440399" y2="83.815903" id="linearGradient40464" - xlink:href="#XMLID_138_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="52.0107" @@ -271,7 +265,6 @@ x2="52.0107" y2="83.806198" id="linearGradient40462" - xlink:href="#XMLID_137_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="94.716301" @@ -279,7 +272,6 @@ x2="94.716301" y2="83.903801" id="linearGradient40460" - xlink:href="#XMLID_136_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="28.855" @@ -287,7 +279,6 @@ x2="28.855" y2="83.903801" id="linearGradient40458" - xlink:href="#XMLID_135_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="88.983902" @@ -295,7 +286,6 @@ x2="88.983902" y2="83.903801" id="linearGradient40456" - xlink:href="#XMLID_134_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="40.589802" @@ -303,7 +293,6 @@ x2="40.589802" y2="83.903801" id="linearGradient40454" - xlink:href="#XMLID_133_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="82.985802" @@ -311,7 +300,6 @@ x2="82.985802" y2="83.903801" id="linearGradient40452" - xlink:href="#XMLID_132_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="34.857399" @@ -319,7 +307,6 @@ x2="34.857399" y2="83.903801" id="linearGradient40450" - xlink:href="#XMLID_131_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="100.7192" @@ -327,7 +314,6 @@ x2="100.7192" y2="83.903801" id="linearGradient40448" - xlink:href="#XMLID_130_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="46.587898" @@ -335,7 +321,6 @@ x2="46.587898" y2="83.903801" id="linearGradient40446" - xlink:href="#XMLID_129_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="75.829597" @@ -343,7 +328,6 @@ x2="75.829597" y2="81.1772" id="linearGradient40442" - xlink:href="#XMLID_127_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="71.399902" @@ -351,7 +335,6 @@ x2="71.399902" y2="81.186996" id="linearGradient40440" - xlink:href="#XMLID_126_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="67.075699" @@ -359,7 +342,6 @@ x2="67.075699" y2="81.204597" id="linearGradient40438" - xlink:href="#XMLID_125_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="62.737301" @@ -367,7 +349,6 @@ x2="62.737301" y2="81.204597" id="linearGradient40436" - xlink:href="#XMLID_124_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="58.398399" @@ -375,7 +356,6 @@ x2="58.398399" y2="81.204597" id="linearGradient40434" - xlink:href="#XMLID_123_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="54.0732" @@ -383,7 +363,6 @@ x2="54.0732" y2="81.186996" id="linearGradient40432" - xlink:href="#XMLID_122_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="49.644001" @@ -391,7 +370,6 @@ x2="49.644001" y2="81.1772" id="linearGradient40430" - xlink:href="#XMLID_121_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="92.349098" @@ -399,7 +377,6 @@ x2="92.349098" y2="81.274902" id="linearGradient40428" - xlink:href="#XMLID_120_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="27.540001" @@ -407,7 +384,6 @@ x2="27.540001" y2="81.274902" id="linearGradient40426" - xlink:href="#XMLID_119_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="86.616699" @@ -415,7 +391,6 @@ x2="86.616699" y2="81.274902" id="linearGradient40424" - xlink:href="#XMLID_118_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="38.223598" @@ -423,7 +398,6 @@ x2="38.223598" y2="81.274902" id="linearGradient40422" - xlink:href="#XMLID_117_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="80.619598" @@ -431,7 +405,6 @@ x2="80.619598" y2="81.274902" id="linearGradient40420" - xlink:href="#XMLID_116_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="32.4902" @@ -439,7 +412,6 @@ x2="32.4902" y2="81.274902" id="linearGradient40418" - xlink:href="#XMLID_115_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="97.300301" @@ -447,7 +419,6 @@ x2="97.300301" y2="81.274902" id="linearGradient40416" - xlink:href="#XMLID_114_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="44.220699" @@ -455,7 +426,6 @@ x2="44.220699" y2="81.274902" id="linearGradient40414" - xlink:href="#XMLID_113_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="76.0923" @@ -463,7 +433,6 @@ x2="76.0923" y2="86.181198" id="linearGradient40412" - xlink:href="#XMLID_112_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="71.663597" @@ -471,7 +440,6 @@ x2="71.663597" y2="86.190903" id="linearGradient40410" - xlink:href="#XMLID_111_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="67.338402" @@ -479,7 +447,6 @@ x2="67.338402" y2="86.210403" id="linearGradient40408" - xlink:href="#XMLID_110_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="63" @@ -487,7 +454,6 @@ x2="63" y2="86.210403" id="linearGradient40406" - xlink:href="#XMLID_109_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="58.661098" @@ -495,7 +461,6 @@ x2="58.661098" y2="86.210403" id="linearGradient40404" - xlink:href="#XMLID_108_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="54.336399" @@ -503,7 +468,6 @@ x2="54.336399" y2="86.190903" id="linearGradient40402" - xlink:href="#XMLID_107_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="49.9067" @@ -511,7 +475,6 @@ x2="49.9067" y2="86.181198" id="linearGradient40400" - xlink:href="#XMLID_106_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="92.612801" @@ -519,7 +482,6 @@ x2="92.612801" y2="86.278801" id="linearGradient40398" - xlink:href="#XMLID_105_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="26.750999" @@ -527,7 +489,6 @@ x2="26.750999" y2="86.278801" id="linearGradient40396" - xlink:href="#XMLID_104_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="86.880402" @@ -535,7 +496,6 @@ x2="86.880402" y2="86.278801" id="linearGradient40394" - xlink:href="#XMLID_103_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="38.486301" @@ -543,7 +503,6 @@ x2="38.486301" y2="86.278801" id="linearGradient40392" - xlink:href="#XMLID_102_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="80.882301" @@ -551,7 +510,6 @@ x2="80.882301" y2="86.278801" id="linearGradient40390" - xlink:href="#XMLID_101_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="32.753899" @@ -559,7 +517,6 @@ x2="32.753899" y2="86.278801" id="linearGradient40388" - xlink:href="#XMLID_100_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="98.6157" @@ -567,7 +524,6 @@ x2="98.6157" y2="86.278801" id="linearGradient40386" - xlink:href="#XMLID_99_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="44.484402" @@ -575,7 +531,6 @@ x2="44.484402" y2="86.278801" id="linearGradient40384" - xlink:href="#XMLID_98_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="91.617699" @@ -583,7 +538,6 @@ x2="91.617699" y2="103.3413" id="linearGradient40372" - xlink:href="#XMLID_92_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="34.381802" @@ -591,7 +545,6 @@ x2="34.381802" y2="103.3413" id="linearGradient40370" - xlink:href="#XMLID_91_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="58.837898" @@ -599,7 +552,6 @@ x2="61.340599" y2="99.370796" id="linearGradient40368" - xlink:href="#XMLID_90_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="64.893097" @@ -607,7 +559,6 @@ x2="66.9282" y2="99.603996" id="linearGradient40366" - xlink:href="#XMLID_89_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="86.1558" @@ -615,7 +566,6 @@ x2="86.1558" y2="1.728" id="linearGradient40354" - xlink:href="#XMLID_83_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="39.8442" @@ -623,7 +573,6 @@ x2="39.8442" y2="1.728" id="linearGradient40352" - xlink:href="#XMLID_82_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="114.6655" @@ -631,7 +580,6 @@ x2="123.1426" y2="68.678101" id="linearGradient40346" - xlink:href="#XMLID_79_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="3.8773999" @@ -639,7 +587,6 @@ x2="14.1946" y2="64.543701" id="linearGradient40344" - xlink:href="#XMLID_78_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="68.067902" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lskat-16.04.3/grafix/oxygen.svg new/lskat-16.08.0/grafix/oxygen.svg --- old/lskat-16.04.3/grafix/oxygen.svg 2015-11-30 01:21:32.000000000 +0100 +++ new/lskat-16.08.0/grafix/oxygen.svg 2016-05-09 05:41:21.000000000 +0200 @@ -507,7 +507,6 @@ x2="78.195801" y2="83.806198" id="linearGradient40474" - xlink:href="#XMLID_143_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="73.767097" @@ -515,7 +514,6 @@ x2="73.767097" y2="83.815903" id="linearGradient40472" - xlink:href="#XMLID_142_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="69.441902" @@ -523,7 +521,6 @@ x2="69.441902" y2="83.835403" id="linearGradient40470" - xlink:href="#XMLID_141_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="65.102997" @@ -531,7 +528,6 @@ x2="65.102997" y2="83.835403" id="linearGradient40468" - xlink:href="#XMLID_140_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="60.764599" @@ -539,7 +535,6 @@ x2="60.764599" y2="83.835403" id="linearGradient40466" - xlink:href="#XMLID_139_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="56.440399" @@ -547,7 +542,6 @@ x2="56.440399" y2="83.815903" id="linearGradient40464" - xlink:href="#XMLID_138_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="52.0107" @@ -555,7 +549,6 @@ x2="52.0107" y2="83.806198" id="linearGradient40462" - xlink:href="#XMLID_137_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="94.716301" @@ -563,7 +556,6 @@ x2="94.716301" y2="83.903801" id="linearGradient40460" - xlink:href="#XMLID_136_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="28.855" @@ -571,7 +563,6 @@ x2="28.855" y2="83.903801" id="linearGradient40458" - xlink:href="#XMLID_135_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="88.983902" @@ -579,7 +570,6 @@ x2="88.983902" y2="83.903801" id="linearGradient40456" - xlink:href="#XMLID_134_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="40.589802" @@ -587,7 +577,6 @@ x2="40.589802" y2="83.903801" id="linearGradient40454" - xlink:href="#XMLID_133_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="82.985802" @@ -595,7 +584,6 @@ x2="82.985802" y2="83.903801" id="linearGradient40452" - xlink:href="#XMLID_132_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="34.857399" @@ -603,7 +591,6 @@ x2="34.857399" y2="83.903801" id="linearGradient40450" - xlink:href="#XMLID_131_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="100.7192" @@ -611,7 +598,6 @@ x2="100.7192" y2="83.903801" id="linearGradient40448" - xlink:href="#XMLID_130_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="46.587898" @@ -619,7 +605,6 @@ x2="46.587898" y2="83.903801" id="linearGradient40446" - xlink:href="#XMLID_129_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="75.829597" @@ -627,7 +612,6 @@ x2="75.829597" y2="81.1772" id="linearGradient40442" - xlink:href="#XMLID_127_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="71.399902" @@ -635,7 +619,6 @@ x2="71.399902" y2="81.186996" id="linearGradient40440" - xlink:href="#XMLID_126_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="67.075699" @@ -643,7 +626,6 @@ x2="67.075699" y2="81.204597" id="linearGradient40438" - xlink:href="#XMLID_125_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="62.737301" @@ -651,7 +633,6 @@ x2="62.737301" y2="81.204597" id="linearGradient40436" - xlink:href="#XMLID_124_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="58.398399" @@ -659,7 +640,6 @@ x2="58.398399" y2="81.204597" id="linearGradient40434" - xlink:href="#XMLID_123_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="54.0732" @@ -667,7 +647,6 @@ x2="54.0732" y2="81.186996" id="linearGradient40432" - xlink:href="#XMLID_122_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="49.644001" @@ -675,7 +654,6 @@ x2="49.644001" y2="81.1772" id="linearGradient40430" - xlink:href="#XMLID_121_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="92.349098" @@ -683,7 +661,6 @@ x2="92.349098" y2="81.274902" id="linearGradient40428" - xlink:href="#XMLID_120_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="27.540001" @@ -691,7 +668,6 @@ x2="27.540001" y2="81.274902" id="linearGradient40426" - xlink:href="#XMLID_119_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="86.616699" @@ -699,7 +675,6 @@ x2="86.616699" y2="81.274902" id="linearGradient40424" - xlink:href="#XMLID_118_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="38.223598" @@ -707,7 +682,6 @@ x2="38.223598" y2="81.274902" id="linearGradient40422" - xlink:href="#XMLID_117_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="80.619598" @@ -715,7 +689,6 @@ x2="80.619598" y2="81.274902" id="linearGradient40420" - xlink:href="#XMLID_116_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="32.4902" @@ -723,7 +696,6 @@ x2="32.4902" y2="81.274902" id="linearGradient40418" - xlink:href="#XMLID_115_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="97.300301" @@ -731,7 +703,6 @@ x2="97.300301" y2="81.274902" id="linearGradient40416" - xlink:href="#XMLID_114_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="44.220699" @@ -739,7 +710,6 @@ x2="44.220699" y2="81.274902" id="linearGradient40414" - xlink:href="#XMLID_113_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="76.0923" @@ -747,7 +717,6 @@ x2="76.0923" y2="86.181198" id="linearGradient40412" - xlink:href="#XMLID_112_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="71.663597" @@ -755,7 +724,6 @@ x2="71.663597" y2="86.190903" id="linearGradient40410" - xlink:href="#XMLID_111_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="67.338402" @@ -763,7 +731,6 @@ x2="67.338402" y2="86.210403" id="linearGradient40408" - xlink:href="#XMLID_110_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="63" @@ -771,7 +738,6 @@ x2="63" y2="86.210403" id="linearGradient40406" - xlink:href="#XMLID_109_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="58.661098" @@ -779,7 +745,6 @@ x2="58.661098" y2="86.210403" id="linearGradient40404" - xlink:href="#XMLID_108_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="54.336399" @@ -787,7 +752,6 @@ x2="54.336399" y2="86.190903" id="linearGradient40402" - xlink:href="#XMLID_107_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="49.9067" @@ -795,7 +759,6 @@ x2="49.9067" y2="86.181198" id="linearGradient40400" - xlink:href="#XMLID_106_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="92.612801" @@ -803,7 +766,6 @@ x2="92.612801" y2="86.278801" id="linearGradient40398" - xlink:href="#XMLID_105_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="26.750999" @@ -811,7 +773,6 @@ x2="26.750999" y2="86.278801" id="linearGradient40396" - xlink:href="#XMLID_104_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="86.880402" @@ -819,7 +780,6 @@ x2="86.880402" y2="86.278801" id="linearGradient40394" - xlink:href="#XMLID_103_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="38.486301" @@ -827,7 +787,6 @@ x2="38.486301" y2="86.278801" id="linearGradient40392" - xlink:href="#XMLID_102_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="80.882301" @@ -835,7 +794,6 @@ x2="80.882301" y2="86.278801" id="linearGradient40390" - xlink:href="#XMLID_101_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="32.753899" @@ -843,7 +801,6 @@ x2="32.753899" y2="86.278801" id="linearGradient40388" - xlink:href="#XMLID_100_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="98.6157" @@ -851,7 +808,6 @@ x2="98.6157" y2="86.278801" id="linearGradient40386" - xlink:href="#XMLID_99_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="44.484402" @@ -859,7 +815,6 @@ x2="44.484402" y2="86.278801" id="linearGradient40384" - xlink:href="#XMLID_98_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="91.617699" @@ -867,7 +822,6 @@ x2="91.617699" y2="103.3413" id="linearGradient40372" - xlink:href="#XMLID_92_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="34.381802" @@ -875,7 +829,6 @@ x2="34.381802" y2="103.3413" id="linearGradient40370" - xlink:href="#XMLID_91_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="58.837898" @@ -883,7 +836,6 @@ x2="61.340599" y2="99.370796" id="linearGradient40368" - xlink:href="#XMLID_90_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="64.893097" @@ -891,7 +843,6 @@ x2="66.9282" y2="99.603996" id="linearGradient40366" - xlink:href="#XMLID_89_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="86.1558" @@ -899,7 +850,6 @@ x2="86.1558" y2="1.728" id="linearGradient40354" - xlink:href="#XMLID_83_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="39.8442" @@ -907,7 +857,6 @@ x2="39.8442" y2="1.728" id="linearGradient40352" - xlink:href="#XMLID_82_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="114.6655" @@ -915,7 +864,6 @@ x2="123.1426" y2="68.678101" id="linearGradient40346" - xlink:href="#XMLID_79_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="3.8773999" @@ -923,7 +871,6 @@ x2="14.1946" y2="64.543701" id="linearGradient40344" - xlink:href="#XMLID_78_" gradientUnits="userSpaceOnUse" /> <radialGradient cx="44.539673"

1 0

commit lokalize for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package lokalize for openSUSE:Factory checked in at 2016-08-31 00:09:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lokalize (Old) and /work/SRC/openSUSE:Factory/.lokalize.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lokalize" Changes: -------- --- /work/SRC/openSUSE:Factory/lokalize/lokalize.changes 2016-07-24 19:49:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lokalize.new/lokalize.changes 2016-08-31 00:09:05.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:30:09 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:47:42 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- lokalize-16.04.3.tar.xz New: ---- lokalize-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lokalize.spec ++++++ --- /var/tmp/diff_new_pack.pTfa2t/_old 2016-08-31 00:09:06.000000000 +0200 +++ /var/tmp/diff_new_pack.pTfa2t/_new 2016-08-31 00:09:06.000000000 +0200 @@ -17,7 +17,7 @@ Name: lokalize -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: KDE Translation Editor License: GPL-2.0+ ++++++ lokalize-16.04.3.tar.xz -> lokalize-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/lokalize.appdata.xml new/lokalize-16.08.0/lokalize.appdata.xml --- old/lokalize-16.04.3/lokalize.appdata.xml 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/lokalize.appdata.xml 2016-07-27 14:33:40.000000000 +0200 @@ -19,6 +19,7 @@ <name xml:lang="lt">Lokalize</name> <name xml:lang="nl">Lokalize</name> <name xml:lang="nn">Lokalize</name> + <name xml:lang="pa">ਲੋਕਾਲਾਈਜ਼</name> <name xml:lang="pl">Lokalize</name> <name xml:lang="pt">Lokalize</name> <name xml:lang="pt-BR">Lokalize</name> @@ -39,6 +40,7 @@ <summary xml:lang="ca">Sistema de traducció assistida per ordinador</summary> <summary xml:lang="ca-valencia">Sistema de traducció assistida per ordinador</summary> <summary xml:lang="cs">Systém pro překlad pomocí počítače</summary> + <summary xml:lang="da">Computerassisteret oversættelsessystem (CAT)</summary> <summary xml:lang="de">Computergestütztes Übersetzungssystem</summary> <summary xml:lang="en-GB">Computer-aided translation system</summary> <summary xml:lang="es">Sistema de traducción asistido por computador</summary> @@ -49,6 +51,7 @@ <summary xml:lang="lt">Kompiuterizuota vertimo sistema</summary> <summary xml:lang="nl">Computerondersteund vertaalsysteem</summary> <summary xml:lang="nn">Dataassistert omsetjing</summary> + <summary xml:lang="pa">ਕੰਪਿਊਟਰ-ਸਹਾਇਕ ਅਨੁਵਾਦ ਸਿਸਟਮ</summary> <summary xml:lang="pl">System tłumaczeń wspomagany komputerowo</summary> <summary xml:lang="pt">Sistema de traduções auxiliado por computador</summary> <summary xml:lang="pt-BR">Sistema de tradução auxiliado pelo computador</summary> @@ -69,6 +72,7 @@ Lokalize ye la ferramienta de llocalización pa KDE y otru software de códigu llibre. Ye tamién un sistema de traducción asistíu per ordenador (CAT) col que pues traducir ficheros OpenDocument (*.odt). Internamente úsase Translate-Toolkit pa estrayer el testu pa la traducción de ficheros El Lokalize és l'eina de traducció pel KDE i altre programari de codi lliure. També és un sistema de traducció assistit per ordinador (CAT) general que amb el que es poden traduir fitxers OpenDocument (*.odt). Internament s'utilitza el Translate-Toolkit per extreure text per a la traducció des de fitxers .odt a .xliff i per tornar a fusionar la traducció al fitxer .odt. El Lokalize és l'eina de traducció pel KDE i altre programari de codi lliure. També és un sistema de traducció assistit per ordinador (CAT) general que amb el que es poden traduir fitxers OpenDocument (*.odt). Internament s'utilitza el Translate-Toolkit per extreure text per a la traducció des de fitxers .odt a .xliff i per tornar a fusionar la traducció al fitxer .odt. + Lokalize er oversættelsesværktøjet til KDE og anden open source software. Den er også et generet computerassisteret oversættelsessystem (CAT), hvormed du kan oversætte OpenDocument-filer (*.odt). Translate-Toolkit bruges internt til at udtrække tekst til oversættelse fra .odt til .xliff-filer og til at flette oversættelsen tilbage til .odt-filen. Lokalize ist ein Lokalisierungs-Programm für KDE und andere quelloffene Software. Es ist außerdem ein rechnergestütztes Übersetzungssystem (CAT), mit dem Sie auch OpenDocument-Dateien (odt) übersetzen können. Intern wird „Translate-Toolkit“ zum Extrahieren von Text für die Übersetzung aus „odt“- in „xliff“-Dateien und für das Einfügen der Übersetzung zurück in „odt“-Dateien verwendet. Lokalize is the localisation tool for KDE and other open source software. It is also a general computer-aided translation system (CAT) with which you can translate OpenDocument files (*.odt). Translate-Toolkit is used internally to extract text for translation from .odt to .xliff files and to merge translation back into .odt file. Lokalize es la herramienta de traducción para KDE y para otros proyectos de software de código abierto. También es un sistema de traducción asistido por computador (CAT) de uso general con el que puede traducir archivos OpenDocument (*.odt). «Translate-Toolkit» se usa internamente para extraer el texto para la traducción de archivos .odt en .xliff y para volver a fusionar de nuevo las traducciones en los archivos .odt. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/binunitsview.cpp new/lokalize-16.08.0/src/binunitsview.cpp --- old/lokalize-16.04.3/src/binunitsview.cpp 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/binunitsview.cpp 2016-07-27 14:33:40.000000000 +0200 @@ -226,6 +226,6 @@ #ifndef NOKDE //FIXME child processes don't notify us about changes ;( if (item.column()<BinUnitsModel::Approved) - new KRun(Project::instance()->absolutePath(item.data().toString()),this); + new KRun(QUrl::fromLocalFile(Project::instance()->absolutePath(item.data().toString())), this); #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/catalog/catalog.cpp new/lokalize-16.08.0/src/catalog/catalog.cpp --- old/lokalize-16.04.3/src/catalog/catalog.cpp 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/catalog/catalog.cpp 2016-07-27 14:33:40.000000000 +0200 @@ -629,7 +629,7 @@ d._autoSave->close(); } else - d._autoSave->setManagedFile(d._filePath); + d._autoSave->setManagedFile(QUrl::fromLocalFile(d._filePath)); } #endif @@ -680,7 +680,7 @@ { d._filePath=localFilePath; #ifndef NOKDE - d._autoSave->setManagedFile(localFilePath); + d._autoSave->setManagedFile(QUrl::fromLocalFile(localFilePath)); #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/lokalize.notifyrc new/lokalize-16.08.0/src/lokalize.notifyrc --- old/lokalize-16.04.3/src/lokalize.notifyrc 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/lokalize.notifyrc 2016-07-27 14:33:40.000000000 +0200 @@ -238,9 +238,11 @@ Name[ast]=Escaniando carpetes con ficheros fonte... Name[ca]=S'estan explorant les carpetes amb els fitxers de codi font... Name[ca@valencia]=S'estan explorant les carpetes amb els fitxers de codi font... +Name[da]=Scanner mapper med kildefiler... Name[de]=Ordner mit Quelldateien wird durchsucht ... Name[en_GB]=Scanning folders with source files... Name[es]=Explorando carpetas con archivos de código fuente... +Name[et]=Lähtekoodifailidega kataloogide uurimine ... Name[fi]=Etsitään lähdekoodikansiosta… Name[gl]=Examinando os cartafoles con ficheiros fonte… Name[it]=Ricerca di cartelle contenenti file sorgente... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/nokde-stubs/kmessagebox.h new/lokalize-16.08.0/src/nokde-stubs/kmessagebox.h --- old/lokalize-16.04.3/src/nokde-stubs/kmessagebox.h 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/nokde-stubs/kmessagebox.h 2016-07-27 14:33:40.000000000 +0200 @@ -7,8 +7,12 @@ { static inline int save(){return 0;} static inline int discard(){return 0;} + static inline int yes(){return 0;} + static inline int no(){return 0;} }; +#define KGuiItem(x) 0 + class KMessageBox: public QMessageBox { public: @@ -23,6 +27,17 @@ Q_UNUSED(y) Q_UNUSED(n) Q_UNUSED(c) Q_UNUSED(dontAskAgainName) return warning(parent, caption, text, Yes|No|Cancel, Yes); } + static QMessageBox::StandardButton questionYesNoCancel(QWidget *parent, const QString &text, + const QString &caption, + int y=0, + int n=0, + int c=0, + const QString &dontAskAgainName=QString()) + { + Q_UNUSED(y) Q_UNUSED(n) Q_UNUSED(c) Q_UNUSED(dontAskAgainName) + return question(parent, caption, text, Yes|No|Cancel, Yes); + } + static QMessageBox::StandardButton questionYesNo(QWidget *parent, const QString &text, const QString &caption, int y=0, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/nokde-stubs/prefs.cpp new/lokalize-16.08.0/src/nokde-stubs/prefs.cpp --- old/lokalize-16.04.3/src/nokde-stubs/prefs.cpp 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/nokde-stubs/prefs.cpp 2016-07-27 14:33:40.000000000 +0200 @@ -141,12 +141,14 @@ { QSettings s; mRole = s.value("Project/AuthorRole", mRole).toInt(); + mSourceDir = s.value("Project/SourceDir", mSourceDir).toString(); } void ProjectLocal::save() { QSettings s; s.setValue(QStringLiteral("Project/AuthorRole"), mRole); + s.setValue(QStringLiteral("Project/SourceDir"), mSourceDir); } EditorTab* ProjectBase::fileOpen(QString filePath, int entry, bool setAsActive, const QString& mergeFile, bool silent) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/nokde-stubs/projectlocal.h new/lokalize-16.08.0/src/nokde-stubs/projectlocal.h --- old/lokalize-16.04.3/src/nokde-stubs/projectlocal.h 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/nokde-stubs/projectlocal.h 2016-07-27 14:33:40.000000000 +0200 @@ -22,6 +22,9 @@ void setFirstRun( bool v ){mFirstRun = v;} bool firstRun() const{return mFirstRun;} + void setSourceDir( const QString& s){mSourceDir = s;} + QString sourceDir() const{return mSourceDir;} + void save(); void setDefaults(){} protected: @@ -29,6 +32,7 @@ // Personal int mRole; bool mFirstRun; + QString mSourceDir; private: }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/prefs/prefs.cpp new/lokalize-16.08.0/src/prefs/prefs.cpp --- old/lokalize-16.04.3/src/prefs/prefs.cpp 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/prefs/prefs.cpp 2016-07-27 14:33:40.000000000 +0200 @@ -282,8 +282,8 @@ ui_prefs_projectmain.kcfg_PoBaseDir,SLOT(setText(QString))); connect(ui_prefs_projectmain.glossaryTbx,SIGNAL(textChanged(QString)), ui_prefs_projectmain.kcfg_GlossaryTbx,SLOT(setText(QString))); - ui_prefs_projectmain.poBaseDir->setUrl(p.poDir()); - ui_prefs_projectmain.glossaryTbx->setUrl(p.glossaryPath()); + ui_prefs_projectmain.poBaseDir->setUrl(QUrl::fromLocalFile(p.poDir())); + ui_prefs_projectmain.glossaryTbx->setUrl(QUrl::fromLocalFile(p.glossaryPath())); @@ -302,9 +302,9 @@ connect(ui_project_advanced.potBaseDir,SIGNAL(textChanged(QString)), ui_project_advanced.kcfg_PotBaseDir,SLOT(setText(QString))); connect(ui_project_advanced.branchDir,SIGNAL(textChanged(QString)), ui_project_advanced.kcfg_BranchDir,SLOT(setText(QString))); connect(ui_project_advanced.altDir,SIGNAL(textChanged(QString)), ui_project_advanced.kcfg_AltDir,SLOT(setText(QString))); - ui_project_advanced.potBaseDir->setUrl(p.potDir()); - ui_project_advanced.branchDir->setUrl(p.branchDir()); - ui_project_advanced.altDir->setUrl(p.altTransDir()); + ui_project_advanced.potBaseDir->setUrl(QUrl::fromLocalFile(p.potDir())); + ui_project_advanced.branchDir->setUrl(QUrl::fromLocalFile(p.branchDir())); + ui_project_advanced.altDir->setUrl(QUrl::fromLocalFile(p.altTransDir())); dialog->addPage(w, i18nc("@title:tab","Advanced"), "applications-development-translation"); //Scripts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/project/project.cpp new/lokalize-16.08.0/src/project/project.cpp --- old/lokalize-16.04.3/src/project/project.cpp 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/project/project.cpp 2016-07-27 14:33:40.000000000 +0200 @@ -37,7 +37,6 @@ #include <klocalizedstring.h> #include <kmessagebox.h> -#include <knotification.h> #include <QLocale> #include <QTimer> @@ -51,6 +50,8 @@ #include "projectmodel.h" #include "webquerycontroller.h" +#include <knotification.h> + #include <kio/global.h> #include <kjob.h> #include <kjobtrackerinterface.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/project/projectmodel.cpp new/lokalize-16.08.0/src/project/projectmodel.cpp --- old/lokalize-16.04.3/src/project/projectmodel.cpp 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/project/projectmodel.cpp 2016-07-27 14:33:40.000000000 +0200 @@ -1111,7 +1111,7 @@ } const FileMetaData& info=job->m_info.first(); - QModelIndex index = indexForUrl(info.filePath); + QModelIndex index = indexForUrl(QUrl::fromLocalFile(info.filePath)); if (!index.isValid()) return;

1 0

commit libkmahjongg for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libkmahjongg for openSUSE:Factory checked in at 2016-08-31 00:09:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkmahjongg (Old) and /work/SRC/openSUSE:Factory/.libkmahjongg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkmahjongg" Changes: -------- --- /work/SRC/openSUSE:Factory/libkmahjongg/libkmahjongg.changes 2016-07-24 19:49:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkmahjongg.new/libkmahjongg.changes 2016-08-31 00:09:03.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:29:46 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:44:48 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- libkmahjongg-16.04.3.tar.xz New: ---- libkmahjongg-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkmahjongg.spec ++++++ --- /var/tmp/diff_new_pack.0Hrqfg/_old 2016-08-31 00:09:04.000000000 +0200 +++ /var/tmp/diff_new_pack.0Hrqfg/_new 2016-08-31 00:09:04.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: libkmahjongg-%{version}.tar.xz BuildRequires: fdupes ++++++ libkmahjongg-16.04.3.tar.xz -> libkmahjongg-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/.clang-format new/libkmahjongg-16.08.0/.clang-format --- old/libkmahjongg-16.04.3/.clang-format 1970-01-01 01:00:00.000000000 +0100 +++ new/libkmahjongg-16.08.0/.clang-format 2016-08-07 14:15:56.000000000 +0200 @@ -0,0 +1,85 @@ +--- +Language: Cpp +# BasedOnStyle: WebKit +AccessModifierOffset: -4 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +AlignEscapedNewlinesLeft: false +AlignOperands: false +AlignTrailingComments: false +AllowAllParametersOfDeclarationOnNextLine: true +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: None +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: false +BinPackArguments: true +BinPackParameters: true +BraceWrapping: + AfterClass: true + AfterControlStatement: false + AfterEnum: false + AfterFunction: true + AfterNamespace: true + AfterStruct: true + AfterUnion: true + BeforeCatch: false + BeforeElse: false + IndentBraces: false +BreakBeforeBinaryOperators: All +BreakBeforeBraces: Custom +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: true +ColumnLimit: 0 +CommentPragmas: '' +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 4 +ContinuationIndentWidth: 4 +Cpp11BracedListStyle: true +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +ForEachMacros: [ foreach, Q_FOREACH ] +IncludeCategories: + - Regex: '^<Q' + Priority: 1 + - Regex: '^<K' + Priority: 2 + - Regex: '^"' + Priority: 3 +IndentCaseLabels: true +IndentWidth: 4 +IndentWrappedFunctionNames: false +KeepEmptyLinesAtTheStartOfBlocks: false +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 2 +NamespaceIndentation: Inner +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 60 +SortIncludes: true +PointerAlignment: Middle +SpaceAfterCStyleCast: false +SpaceBeforeAssignmentOperators: true +SpaceBeforeParens: ControlStatements +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: true +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp11 +TabWidth: 8 +UseTab: Never +#ForceEmptyLineAtEOF: true +... + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/.gitignore new/libkmahjongg-16.08.0/.gitignore --- old/libkmahjongg-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/libkmahjongg-16.08.0/.gitignore 2016-08-07 14:15:56.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/CMakeLists.txt new/libkmahjongg-16.08.0/CMakeLists.txt --- old/libkmahjongg-16.04.3/CMakeLists.txt 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/CMakeLists.txt 2016-08-07 14:15:56.000000000 +0200 @@ -6,10 +6,21 @@ find_package(ECM 1.3.0 REQUIRED NO_MODULE) +#if(ENABLE_CLAZY) +# set(CMAKE_CXX_COMPILER clazy) +#endif() + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Gui Test Svg) -find_package(KF5 REQUIRED COMPONENTS CoreAddons Config ConfigWidgets WidgetsAddons Completion I18n) +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Gui Svg) +find_package(KF5 REQUIRED COMPONENTS + CoreAddons + Config + ConfigWidgets + WidgetsAddons + Completion + I18n +) include(FeatureSummary) include(GenerateExportHeader) @@ -18,7 +29,7 @@ include(ECMGenerateHeaders) include(ECMMarkNonGuiExecutable) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) @@ -26,8 +37,8 @@ include_directories(${CMAKE_SOURCE_DIR}/includes) -add_subdirectory( tilesets ) -add_subdirectory( backgrounds ) +add_subdirectory(tilesets) +add_subdirectory(backgrounds) ########### next target ############### @@ -36,24 +47,35 @@ set(kmahjongg_LIB_SRCS libkmahjongg_debug.cpp - kmahjonggtileset.cpp - kmahjonggbackground.cpp - kmahjonggtilesetselector.cpp - kmahjonggbackgroundselector.cpp - kmahjonggconfigdialog.cpp ) + kmahjonggtileset.cpp + kmahjonggbackground.cpp + kmahjonggtilesetselector.cpp + kmahjonggbackgroundselector.cpp + kmahjonggconfigdialog.cpp +) ki18n_wrap_ui(kmahjongg_LIB_SRCS kmahjonggtilesetselector.ui kmahjonggbackgroundselector.ui ) add_library(KF5KMahjongglib SHARED ${kmahjongg_LIB_SRCS}) generate_export_header(KF5KMahjongglib BASE_NAME libkmahjongg) -target_link_libraries(KF5KMahjongglib PRIVATE Qt5::Core Qt5::Svg KF5::WidgetsAddons KF5::I18n KF5::Completion KF5::ConfigGui - PUBLIC Qt5::Gui KF5::ConfigWidgets) +target_link_libraries(KF5KMahjongglib + PRIVATE + Qt5::Core + Qt5::Svg + KF5::WidgetsAddons + KF5::I18n + KF5::Completion + KF5::ConfigGui + PUBLIC + Qt5::Gui + KF5::ConfigWidgets +) target_include_directories(KF5KMahjongglib INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KF5KMahjongg>" INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}>") -set_target_properties(KF5KMahjongglib PROPERTIES VERSION ${KMAHJONGGLIB_VERSION} - SOVERSION ${KMAHJONGGLIB_SOVERSION} +set_target_properties(KF5KMahjongglib PROPERTIES VERSION ${KMAHJONGGLIB_VERSION} + SOVERSION ${KMAHJONGGLIB_SOVERSION} EXPORT_NAME KF5KMahjongglib) ecm_setup_version(${KMAHJONGGLIB_VERSION} VARIABLE_PREFIX KF5KMAHJONGGLIB @@ -61,18 +83,19 @@ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfigVersion.cmake" SOVERSION 6) - + install(TARGETS KF5KMahjongglib EXPORT KF5KMahjonggLibraryDepends ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/libkmahjongg_export.h - kmahjonggtileset.h - kmahjonggbackground.h - kmahjonggconfigdialog.h -DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KF5KMahjongg COMPONENT Devel) + ${CMAKE_CURRENT_BINARY_DIR}/libkmahjongg_export.h + kmahjonggtileset.h + kmahjonggbackground.h + kmahjonggconfigdialog.h + DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KF5KMahjongg COMPONENT Devel +) ########### generate exports ############### @@ -84,23 +107,28 @@ set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5KMahjongglib") # create the Config.cmake and ConfigVersion.cmake files -ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5KMahjongglibConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} - ) - -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfigVersion.cmake" - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - COMPONENT Devel ) +ecm_configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KF5KMahjongglibConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} +) + +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel +) # install the export set for use with the install-tree -install(EXPORT KF5KMahjonggLibraryDepends DESTINATION - ${CMAKECONFIG_INSTALL_DIR} COMPONENT Devel) - -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kmahjongglib_version.h - DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KF5KMahjongg - COMPONENT Devel) +install(EXPORT KF5KMahjonggLibraryDepends + DESTINATION ${CMAKECONFIG_INSTALL_DIR} + COMPONENT Devel +) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kmahjongglib_version.h + DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KF5KMahjongg + COMPONENT Devel +) ########### Display Summary ############### feature_summary(WHAT ALL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/backgrounds/CMakeLists.txt new/libkmahjongg-16.08.0/backgrounds/CMakeLists.txt --- old/libkmahjongg-16.04.3/backgrounds/CMakeLists.txt 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/backgrounds/CMakeLists.txt 2016-08-07 14:15:56.000000000 +0200 @@ -1,28 +1,29 @@ ##default -install( FILES default.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES default.svg DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES default.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) +install(FILES default.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES default.svg DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES default.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) ##chinese landscape -install( FILES chinese_landscape.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES chinese_landscape.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES chinese_landscape.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) +install(FILES chinese_landscape.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES chinese_landscape.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES chinese_landscape.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) ##wood light -install( FILES wood_light.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES wood_light.svg DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES wood_light.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) +install(FILES wood_light.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES wood_light.svg DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES wood_light.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) ##summertime greens -install( FILES summerfield.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES summerfield.svg DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES summerfield.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) +install(FILES summerfield.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES summerfield.svg DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES summerfield.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) ##plain color -install( FILES color_plain.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) +install(FILES color_plain.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) ##egyptian -install( FILES egyptian.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES egyptian.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES egyptian.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) +install(FILES egyptian.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES egyptian.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES egyptian.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/backgrounds/color_plain.desktop new/libkmahjongg-16.08.0/backgrounds/color_plain.desktop --- old/libkmahjongg-16.04.3/backgrounds/color_plain.desktop 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/backgrounds/color_plain.desktop 2016-08-07 14:15:56.000000000 +0200 @@ -4,7 +4,7 @@ Name[be]=Проста колер Name[bs]=Boja ravnice Name[ca]=Color llis -Name[ca@valencia]=Color pla +Name[ca@valencia]=Color llis Name[cs]=Prostá barva Name[da]=Almindelig farve Name[de]=Einfache Farbe diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggbackground.cpp new/libkmahjongg-16.08.0/kmahjonggbackground.cpp --- old/libkmahjongg-16.04.3/kmahjonggbackground.cpp 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggbackground.cpp 2016-08-07 14:15:56.000000000 +0200 @@ -17,30 +17,41 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +// own #include "kmahjonggbackground.h" -#include "libkmahjongg_debug.h" -#include <KLocalizedString> -#include <kconfig.h> -#include <kconfiggroup.h> -#include <qsvgrenderer.h> -#include <QImage> +// Qt #include <QFile> +#include <QImage> #include <QMap> +#include <QPainter> #include <QPixmap> #include <QPixmapCache> -#include <QPainter> +#include <QSvgRenderer> + +// KDE +#include <KConfig> +#include <KConfigGroup> +#include <KLocalizedString> + +// LibKMahjongg +#include "libkmahjongg_debug.h" class KMahjonggBackgroundPrivate { - public: +public: KMahjonggBackgroundPrivate() - : w(1), h(1), graphicsLoaded(false), isTiled(true), isSVG(false) + : w(1) + , h(1) + , graphicsLoaded(false) + , isPlain(false) + , isTiled(true) + , isSVG(false) { } QMap<QString, QString> authorproperties; - QString pixmapCacheNameFromElementId(const QString &elementid); + QString pixmapCacheNameFromElementId(const QString & elementid); QPixmap renderBG(short width, short height); QPixmap backgroundPixmap; @@ -62,19 +73,21 @@ : d(new KMahjonggBackgroundPrivate) { static bool _inited = false; - if (_inited) + if (_inited) { return; + } _inited = true; } -KMahjonggBackground::~KMahjonggBackground() { +KMahjonggBackground::~KMahjonggBackground() +{ delete d; } bool KMahjonggBackground::loadDefault() { // Set default background here. - QLatin1String idx( "egyptian.desktop" ); + QLatin1String idx("egyptian.desktop"); QString bgPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kmahjongglib/backgrounds/" + idx); qCDebug(LIBKMAHJONGG_LOG) << "Inside LoadDefault(), located background at" << bgPath; @@ -86,7 +99,8 @@ #define kBGVersionFormat 1 -bool KMahjonggBackground::load(const QString &file, short width, short height) { +bool KMahjonggBackground::load(const QString & file, short width, short height) +{ //qCDebug(LIBKMAHJONGG_LOG) << "Background loading"; d->isSVG = false; @@ -95,23 +109,23 @@ // verify if it is a valid file first and if we can open it QFile bgfile(file); if (!bgfile.open(QIODevice::ReadOnly)) { - return (false); + return false; } bgfile.close(); KConfig bgconfig(file, KConfig::SimpleConfig); KConfigGroup group = bgconfig.group("KMahjonggBackground"); - d->authorproperties.insert(QLatin1String( "Name" ), group.readEntry("Name"));// Returns translated data - d->authorproperties.insert(QLatin1String( "Author" ), group.readEntry("Author")); - d->authorproperties.insert(QLatin1String( "Description" ), group.readEntry("Description")); - d->authorproperties.insert(QLatin1String( "AuthorEmail" ), group.readEntry("AuthorEmail")); + d->authorproperties.insert(QLatin1String("Name"), group.readEntry("Name")); // Returns translated data + d->authorproperties.insert(QLatin1String("Author"), group.readEntry("Author")); + d->authorproperties.insert(QLatin1String("Description"), group.readEntry("Description")); + d->authorproperties.insert(QLatin1String("AuthorEmail"), group.readEntry("AuthorEmail")); //The "Plain" key is set to 1 by the color_plain background. d->isPlain = group.readEntry("Plain", 0) != 0; - d->authorproperties.insert(QLatin1String( "Plain" ), d->isPlain ? QLatin1String("1") : QLatin1String("0")); + d->authorproperties.insert(QLatin1String("Plain"), d->isPlain ? QLatin1String("1") : QLatin1String("0")); //Version control - int bgversion = group.readEntry("VersionFormat",0); + int bgversion = group.readEntry("VersionFormat", 0); //Format is increased when we have incompatible changes, meaning that older clients are not able to use the remaining information safely if (bgversion > kBGVersionFormat) { return false; @@ -130,11 +144,13 @@ qCDebug(LIBKMAHJONGG_LOG) << "Using background at" << d->graphicspath; - if (d->graphicspath.isEmpty()) return (false); + if (d->graphicspath.isEmpty()) { + return false; + } - if (group.readEntry("Tiled",0)) { - d->w = group.readEntry("Width",0); - d->h = group.readEntry("Height",0); + if (group.readEntry("Tiled", 0) != 0) { + d->w = group.readEntry("Width", 0); + d->h = group.readEntry("Height", 0); d->isTiled = true; } else { d->w = width; @@ -146,35 +162,44 @@ return true; } -bool KMahjonggBackground::loadGraphics() { - if (d->graphicsLoaded || d->isPlain) return (true) ; +bool KMahjonggBackground::loadGraphics() +{ + if (d->graphicsLoaded || d->isPlain) { + return true; + } d->svg.load(d->graphicspath); if (d->svg.isValid()) { d->isSVG = true; } else { //qCDebug(LIBKMAHJONGG_LOG) << "could not load svg"; - return( false ); + return false; } - return (true); + return true; } -void KMahjonggBackground::sizeChanged(int newW, int newH) { +void KMahjonggBackground::sizeChanged(int newW, int newH) +{ //in tiled mode we do not care about the whole field size - if (d->isTiled || d->isPlain) return; + if (d->isTiled || d->isPlain) { + return; + } - if (newW == d->w && newH == d->h) + if (newW == d->w && newH == d->h) { return; + } d->w = newW; d->h = newH; } -QString KMahjonggBackgroundPrivate::pixmapCacheNameFromElementId(const QString &elementid) { - return authorproperties[QLatin1String( "Name" )]+ elementid+QString::fromLatin1( "W%1H%2").arg(w).arg(h); +QString KMahjonggBackgroundPrivate::pixmapCacheNameFromElementId(const QString & elementid) +{ + return authorproperties[QLatin1String("Name")] + elementid + QString::fromLatin1("W%1H%2").arg(w).arg(h); } -QPixmap KMahjonggBackgroundPrivate::renderBG(short width, short height) { - QImage qiRend(QSize(width, height),QImage::Format_ARGB32_Premultiplied); +QPixmap KMahjonggBackgroundPrivate::renderBG(short width, short height) +{ + QImage qiRend(QSize(width, height), QImage::Format_ARGB32_Premultiplied); qiRend.fill(0); if (svg.isValid()) { @@ -184,7 +209,8 @@ return QPixmap::fromImage(qiRend); } -QBrush & KMahjonggBackground::getBackground() { +QBrush & KMahjonggBackground::getBackground() +{ if (d->isPlain) { d->backgroundBrush = QBrush(QPixmap()); } else { @@ -197,11 +223,12 @@ return d->backgroundBrush; } -QString KMahjonggBackground::path() const { +QString KMahjonggBackground::path() const +{ return d->filename; } -QString KMahjonggBackground::authorProperty(const QString &key) const { +QString KMahjonggBackground::authorProperty(const QString & key) const +{ return d->authorproperties[key]; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggbackground.h new/libkmahjongg-16.08.0/kmahjonggbackground.h --- old/libkmahjongg-16.04.3/kmahjonggbackground.h 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggbackground.h 2016-08-07 14:15:56.000000000 +0200 @@ -17,11 +17,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _KMAHJONGGBACKGROUND_H_ -#define _KMAHJONGGBACKGROUND_H_ +#ifndef KMAHJONGGBACKGROUND_H +#define KMAHJONGGBACKGROUND_H -#include <QtGui/QBrush> +// Qt +#include <QBrush> +// LibKMahjongg #include "libkmahjongg_export.h" class KMahjonggBackgroundPrivate; @@ -47,4 +49,4 @@ Q_DISABLE_COPY(KMahjonggBackground) }; -#endif +#endif // KMAHJONGGBACKGROUND_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggbackgroundselector.cpp new/libkmahjongg-16.08.0/kmahjonggbackgroundselector.cpp --- old/libkmahjongg-16.04.3/kmahjonggbackgroundselector.cpp 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggbackgroundselector.cpp 2016-08-07 14:15:56.000000000 +0200 @@ -16,15 +16,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +// own #include "kmahjonggbackgroundselector.h" -#include <KLocalizedString> +// Qt +#include <QDir> #include <QPainter> + +// KDE +#include <KLocalizedString> + +// LibKMahjongg #include "kmahjonggbackground.h" -#include <QDir> -KMahjonggBackgroundSelector::KMahjonggBackgroundSelector( QWidget* parent, KConfigSkeleton * aconfig ) - : QWidget( parent ) +KMahjonggBackgroundSelector::KMahjonggBackgroundSelector(QWidget * parent, KConfigSkeleton * aconfig) + : QWidget(parent) { setupUi(this); setupData(aconfig); @@ -50,24 +56,23 @@ //Now get our backgrounds into a list QStringList bgsAvailable; const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "kmahjongglib/backgrounds", QStandardPaths::LocateDirectory); - Q_FOREACH (const QString& dir, dirs) { + Q_FOREACH (const QString & dir, dirs) { const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.desktop")); - Q_FOREACH (const QString& file, fileNames) { + Q_FOREACH (const QString & file, fileNames) { bgsAvailable.append(dir + '/' + file); - } + } } QLatin1String namestr("Name"); int numvalidentries = 0; - for (int i = 0; i < bgsAvailable.size(); ++i) - { + for (int i = 0; i < bgsAvailable.size(); ++i) { KMahjonggBackground * abg = new KMahjonggBackground(); QString bgpath = bgsAvailable.at(i); - if (abg->load(bgpath,backgroundPreview->width(),backgroundPreview->height())) { + if (abg->load(bgpath, backgroundPreview->width(), backgroundPreview->height())) { backgroundMap.insert(abg->authorProperty(namestr), abg); backgroundList->addItem(abg->authorProperty(namestr)); //Find if this is our currently configured background - if (bgpath==initialGroup) { + if (bgpath == initialGroup) { //Select current entry backgroundList->setCurrentRow(numvalidentries); backgroundChanged(); @@ -85,8 +90,10 @@ { KMahjonggBackground * selBG = backgroundMap.value(backgroundList->currentItem()->text()); //Sanity checkings. Should not happen. - if (!selBG) return; - if (selBG->path()==kcfg_Background->text()) { + if (selBG == nullptr) { + return; + } + if (selBG->path() == kcfg_Background->text()) { return; } QLatin1String authstr("Author"); @@ -97,23 +104,22 @@ backgroundContact->setText(selBG->authorProperty(contactstr)); backgroundDescription->setText(selBG->authorProperty(descstr)); - if (selBG->authorProperty(QLatin1String( "Plain" )) == QLatin1String("1")) { + if (selBG->authorProperty(QLatin1String("Plain")) == QLatin1String("1")) { backgroundPreview->setPixmap(QPixmap()); return; } //Make sure SVG is loaded when graphics is selected - if (!selBG->loadGraphics()) return; + if (!selBG->loadGraphics()) { + return; + } //Draw the preview //TODO here: add code to load and keep proportions for non-tiled content? - QImage qiRend(backgroundPreview->size(),QImage::Format_ARGB32_Premultiplied); + QImage qiRend(backgroundPreview->size(), QImage::Format_ARGB32_Premultiplied); qiRend.fill(0); QPainter p(&qiRend); - p.fillRect(p.viewport(), selBG->getBackground() ); + p.fillRect(p.viewport(), selBG->getBackground()); p.end(); backgroundPreview->setPixmap(QPixmap::fromImage(qiRend)); - } - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggbackgroundselector.h new/libkmahjongg-16.08.0/kmahjonggbackgroundselector.h --- old/libkmahjongg-16.04.3/kmahjonggbackgroundselector.h 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggbackgroundselector.h 2016-08-07 14:15:56.000000000 +0200 @@ -16,11 +16,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __LIB_KMAHJONGGBACKGROUNDSELECTOR_H_ -#define __LIB_KMAHJONGGBACKGROUNDSELECTOR_H_ +#ifndef KMAHJONGGBACKGROUNDSELECTOR_H +#define KMAHJONGGBACKGROUNDSELECTOR_H +// Qt #include <QMap> + +// KDE #include <KConfigSkeleton> + +// LibKMahjongg #include "ui_kmahjonggbackgroundselector.h" class KMahjonggBackground; @@ -29,13 +34,13 @@ { Q_OBJECT public: - explicit KMahjonggBackgroundSelector( QWidget* parent, KConfigSkeleton * config ); + explicit KMahjonggBackgroundSelector( QWidget* parent, KConfigSkeleton * aconfig ); ~KMahjonggBackgroundSelector(); - void setupData(KConfigSkeleton * config); + void setupData(KConfigSkeleton * aconfig); QMap<QString, KMahjonggBackground *> backgroundMap; public slots: void backgroundChanged(); }; -#endif // __LIB_KMAHJONGGBACKGROUNDSELECTOR_H_ +#endif // KMAHJONGGBACKGROUNDSELECTOR_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggconfigdialog.cpp new/libkmahjongg-16.08.0/kmahjonggconfigdialog.cpp --- old/libkmahjongg-16.04.3/kmahjonggconfigdialog.cpp 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggconfigdialog.cpp 2016-08-07 14:15:56.000000000 +0200 @@ -15,40 +15,45 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kmahjonggconfigdialog.h" - -#include "kmahjonggtilesetselector.h" -#include "kmahjonggbackgroundselector.h" -#include "libkmahjongg_debug.h" -#include <kconfigdialogmanager.h> -#include <kstandardguiitem.h> -#include <KLocalizedString> -#include <krandom.h> -#include <kconfig.h> -#include <KConfigGroup> +// own +#include "kmahjonggconfigdialog.h" +// Qt #include <QDialog> #include <QDialogButtonBox> #include <QPushButton> #include <QVBoxLayout> +// KDE +#include <KConfig> +#include <KConfigDialogManager> +#include <KConfigGroup> +#include <KLocalizedString> +#include <KRandom> +#include <KStandardGuiItem> + +// LibKMahjongg +#include "kmahjonggbackgroundselector.h" +#include "kmahjonggtilesetselector.h" +#include "libkmahjongg_debug.h" + class KMahjonggConfigDialogPrivate { public: KConfigSkeleton * m_config; }; -KMahjonggConfigDialog::KMahjonggConfigDialog( QWidget *parent, const QString& name, - KConfigSkeleton *config) - : KConfigDialog(parent, name, config), - d(new KMahjonggConfigDialogPrivate) +KMahjonggConfigDialog::KMahjonggConfigDialog(QWidget * parent, const QString & name, + KConfigSkeleton * config) + : KConfigDialog(parent, name, config) + , d(new KMahjonggConfigDialogPrivate) { setFaceType(List); - QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Apply); - QVBoxLayout *mainLayout = new QVBoxLayout; + QDialogButtonBox * buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Help | QDialogButtonBox::Apply); + QVBoxLayout * mainLayout = new QVBoxLayout; setLayout(mainLayout); - QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); + QPushButton * okButton = buttonBox->button(QDialogButtonBox::Ok); okButton->setDefault(true); okButton->setShortcut(Qt::CTRL | Qt::Key_Return); connect(buttonBox, &QDialogButtonBox::accepted, this, &KMahjonggConfigDialog::accept); @@ -68,27 +73,17 @@ { KMahjonggTilesetSelector * ts = new KMahjonggTilesetSelector(this, d->m_config); //TODO: Use the cards icon for our page for now, need to get one for tilesets made - addPage(ts, i18n("Tiles"), QLatin1String( "games-config-tiles" )); + addPage(ts, i18n("Tiles"), QLatin1String("games-config-tiles")); } void KMahjonggConfigDialog::addBackgroundPage() { KMahjonggBackgroundSelector * ts = new KMahjonggBackgroundSelector(this, d->m_config); //TODO: need icon - addPage(ts, i18n("Background"), QLatin1String( "games-config-background" )); + addPage(ts, i18n("Background"), QLatin1String("games-config-background")); } void KMahjonggConfigDialog::updateWidgetsDefault() { //qCDebug(LIBKMAHJONGG_LOG) << "updateWidgetsDefault"; } -/*void KMahjonggConfigDialog::updateWidgets() -{ - //qCDebug(LIBKMAHJONGG_LOG) << "updateWidgets"; -} -void KMahjonggConfigDialog::updateSettings() -{ - //qCDebug(LIBKMAHJONGG_LOG) << "updateSettings"; -}*/ - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggconfigdialog.h new/libkmahjongg-16.08.0/kmahjonggconfigdialog.h --- old/libkmahjongg-16.04.3/kmahjonggconfigdialog.h 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggconfigdialog.h 2016-08-07 14:15:56.000000000 +0200 @@ -16,14 +16,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __LIBKMAHJONGGCONFIGDIALOG_H_ -#define __LIBKMAHJONGGCONFIGDIALOG_H_ - -#include <kconfigdialog.h> -#include <libkmahjongg_export.h> +#ifndef KMAHJONGGCONFIGDIALOG_H +#define KMAHJONGGCONFIGDIALOG_H +// KDE +#include <KConfigDialog> #include <KConfigSkeleton> +// LibKMahjongg +#include <libkmahjongg_export.h> + class KMahjonggConfigDialogPrivate; class LIBKMAHJONGG_EXPORT KMahjonggConfigDialog : public KConfigDialog @@ -38,8 +40,6 @@ protected Q_SLOTS: void updateWidgetsDefault(); - //void updateWidgets(); - //void updateSettings(); private: friend class KMahjonggConfigDialogPrivate; @@ -48,4 +48,4 @@ Q_DISABLE_COPY(KMahjonggConfigDialog) }; -#endif +#endif // KMAHJONGGCONFIGDIALOG_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggtileset.cpp new/libkmahjongg-16.08.0/kmahjonggtileset.cpp --- old/libkmahjongg-16.04.3/kmahjonggtileset.cpp 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggtileset.cpp 2016-08-07 14:15:56.000000000 +0200 @@ -17,47 +17,64 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +// own #include "kmahjonggtileset.h" -#include "libkmahjongg_debug.h" -#include <KLocalizedString> -#include <kconfig.h> -#include <kconfiggroup.h> -#include <qimage.h> -#include <qsvgrenderer.h> -#include <QPainter> -#include <QPixmapCache> +// STL +#include <cstdlib> + +// Qt #include <QFile> +#include <QImage> #include <QMap> +#include <QPainter> +#include <QPixmapCache> #include <QStandardPaths> +#include <QSvgRenderer> -#include <stdlib.h> +// KDE +#include <KConfig> +#include <KConfigGroup> +#include <KLocalizedString> + +// LibKMahjongg +#include "libkmahjongg_debug.h" class KMahjonggTilesetMetricsData { - public: - short lvloffx; // used for 3D indentation, x value - short lvloffy; // used for 3D indentation, y value - short w; // tile width ( +border +shadow) - short h; // tile height ( +border +shadow) - short fw; // face width - short fh; // face height +public: + short lvloffx; // used for 3D indentation, x value + short lvloffy; // used for 3D indentation, y value + short w; // tile width ( +border +shadow) + short h; // tile height ( +border +shadow) + short fw; // face width + short fh; // face height KMahjonggTilesetMetricsData() - : lvloffx(0), lvloffy(0), w(0), h(0), fw(0), fh(0) - {} + : lvloffx(0) + , lvloffy(0) + , w(0) + , h(0) + , fw(0) + , fh(0) + { + } }; class KMahjonggTilesetPrivate { - public: - KMahjonggTilesetPrivate() : isSVG(false), graphicsLoaded(false) {} +public: + KMahjonggTilesetPrivate() + : isSVG(false) + , graphicsLoaded(false) + { + } QList<QString> elementIdTable; QMap<QString, QString> authorproperties; KMahjonggTilesetMetricsData originaldata; KMahjonggTilesetMetricsData scaleddata; - QString filename; // cache the last file loaded to save reloading it + QString filename; // cache the last file loaded to save reloading it QString graphicspath; QSvgRenderer svg; @@ -73,14 +90,16 @@ buildElementIdTable(); static bool _inited = false; - if (_inited) + if (_inited) { return; + } _inited = true; } // --------------------------------------------------------- -KMahjonggTileset::~KMahjonggTileset() { +KMahjonggTileset::~KMahjonggTileset() +{ delete d; } @@ -88,11 +107,11 @@ { d->scaleddata.w = tilew; d->scaleddata.h = tileh; - double ratio = ((qreal) d->scaleddata.w) / ((qreal) d->originaldata.w); - d->scaleddata.lvloffx = (short) (d->originaldata.lvloffx * ratio); - d->scaleddata.lvloffy = (short) (d->originaldata.lvloffy * ratio); - d->scaleddata.fw = (short) (d->originaldata.fw * ratio); - d->scaleddata.fh = (short) (d->originaldata.fh * ratio); + double ratio = (static_cast<qreal>(d->scaleddata.w)) / (static_cast<qreal>(d->originaldata.w)); + d->scaleddata.lvloffx = static_cast<short>(d->originaldata.lvloffx * ratio); + d->scaleddata.lvloffy = static_cast<short>(d->originaldata.lvloffy * ratio); + d->scaleddata.fw = static_cast<short>(d->originaldata.fw * ratio); + d->scaleddata.fh = static_cast<short>(d->originaldata.fh * ratio); } QSize KMahjonggTileset::preferredTileSize(const QSize & boardsize, int horizontalCells, int verticalCells) @@ -108,20 +127,20 @@ qreal floatw = d->originaldata.w; qreal floath = d->originaldata.h; - if ((fullw/fullh)>(bw/bh)) { + if ((fullw / fullh) > (bw / bh)) { //space will be left on height, use width as limit - aspectratio = bw/fullw; + aspectratio = bw / fullw; } else { - aspectratio = bh/fullh; + aspectratio = bh / fullh; } newtilew = aspectratio * floatw; newtileh = aspectratio * floath; - return QSize((short)newtilew, (short)newtileh); + return QSize(static_cast<short>(newtilew), static_cast<short>(newtileh)); } bool KMahjonggTileset::loadDefault() { - QString idx = QLatin1String( "default.desktop" ); + QString idx = QLatin1String("default.desktop"); QString tilesetPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kmahjongglib/tilesets/" + idx); qCDebug(LIBKMAHJONGG_LOG) << "Inside LoadDefault(), located path at" << tilesetPath; @@ -131,7 +150,7 @@ return loadTileset(tilesetPath); } -QString KMahjonggTileset::authorProperty(const QString &key) const +QString KMahjonggTileset::authorProperty(const QString & key) const { return d->authorproperties[key]; } @@ -158,12 +177,12 @@ short KMahjonggTileset::qWidth() const { - return (short) (d->scaleddata.fw / 2.0); + return static_cast<short>(d->scaleddata.fw / 2.0); } short KMahjonggTileset::qHeight() const { - return (short) (d->scaleddata.fh / 2.0); + return static_cast<short>(d->scaleddata.fh / 2.0); } QString KMahjonggTileset::path() const @@ -174,10 +193,8 @@ #define kTilesetVersionFormat 1 // --------------------------------------------------------- -bool KMahjonggTileset::loadTileset( const QString & tilesetPath) +bool KMahjonggTileset::loadTileset(const QString & tilesetPath) { - - QImage qiTiles; //qCDebug(LIBKMAHJONGG_LOG) << "Attempting to load .desktop at" << tilesetPath; //clear our properties map @@ -186,20 +203,20 @@ // verify if it is a valid file first and if we can open it QFile tilesetfile(tilesetPath); if (!tilesetfile.open(QIODevice::ReadOnly)) { - return (false); + return false; } tilesetfile.close(); KConfig tileconfig(tilesetPath, KConfig::SimpleConfig); KConfigGroup group = tileconfig.group("KMahjonggTileset"); - d->authorproperties.insert(QLatin1String( "Name" ), group.readEntry("Name"));// Returns translated data - d->authorproperties.insert(QLatin1String( "Author" ), group.readEntry("Author")); - d->authorproperties.insert(QLatin1String( "Description" ), group.readEntry("Description")); - d->authorproperties.insert(QLatin1String( "AuthorEmail" ), group.readEntry("AuthorEmail")); + d->authorproperties.insert(QLatin1String("Name"), group.readEntry("Name")); // Returns translated data + d->authorproperties.insert(QLatin1String("Author"), group.readEntry("Author")); + d->authorproperties.insert(QLatin1String("Description"), group.readEntry("Description")); + d->authorproperties.insert(QLatin1String("AuthorEmail"), group.readEntry("AuthorEmail")); //Version control - int tileversion = group.readEntry("VersionFormat",0); + int tileversion = group.readEntry("VersionFormat", 0); //Format is increased when we have incompatible changes, meaning that older clients are not able to use the remaining information safely if (tileversion > kTilesetVersionFormat) { return false; @@ -209,11 +226,12 @@ d->graphicspath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kmahjongglib/tilesets/" + graphName); //qCDebug(LIBKMAHJONGG_LOG) << "Using tileset at" << d->graphicspath; - //d->filename = graphicsPath; //only SVG for now d->isSVG = true; - if (d->graphicspath.isEmpty()) return (false); + if (d->graphicspath.isEmpty()) { + return false; + } d->originaldata.w = group.readEntry("TileWidth", 30); d->originaldata.h = group.readEntry("TileHeight", 50); @@ -226,31 +244,15 @@ d->graphicsLoaded = false; d->filename = tilesetPath; - /* if (d->isSVG) { - //really? - d->svg.load(graphicsPath); - if (d->svg.isValid()) { - d->filename = tilesetPath; - //invalidate our global cache - QPixmapCache::clear(); - - d->isSVG = true; - reloadTileset(QSize(d->originaldata.w, d->originaldata.h)); - } else { - return( false ); - } - } else { - //TODO add support for png?? - return false; - }*/ - - return( true ); + return true; } // --------------------------------------------------------- bool KMahjonggTileset::loadGraphics() { - if (d->graphicsLoaded == true) return (true) ; + if (d->graphicsLoaded) { + return true; + } if (d->isSVG) { //really? d->svg.load(d->graphicspath); @@ -260,79 +262,82 @@ d->graphicsLoaded = true; reloadTileset(QSize(d->originaldata.w, d->originaldata.h)); } else { - return( false ); + return false; } } else { //TODO add support for png?? return false; } - return( true ); + return true; } // --------------------------------------------------------- -bool KMahjonggTileset::reloadTileset( const QSize & newTilesize) +bool KMahjonggTileset::reloadTileset(const QSize & newTilesize) { - QString tilesetPath = d->filename; - - if (QSize(d->scaleddata.w, d->scaleddata.h) == newTilesize) return false; + if (QSize(d->scaleddata.w, d->scaleddata.h) == newTilesize) { + return false; + } if (d->isSVG) { if (d->svg.isValid()) { updateScaleInfo(newTilesize.width(), newTilesize.height()); //rendering will be done when needed, automatically using the global cache } else { - return( false ); + return false; } } else { //TODO add support for png??? return false; } - return( true ); + return true; } -void KMahjonggTileset::buildElementIdTable() { +void KMahjonggTileset::buildElementIdTable() +{ //Build a list for faster lookup of element ids, mapped to the enumeration used by GameData and BoardWidget //Unselected tiles - for (short idx=1; idx<=4; idx++) { - d->elementIdTable.append(QString::fromLatin1( "TILE_%1").arg(idx)); + for (short idx = 1; idx <= 4; idx++) { + d->elementIdTable.append(QString::fromLatin1("TILE_%1").arg(idx)); } //Selected tiles - for (short idx=1; idx<=4; idx++) { - d->elementIdTable.append(QString::fromLatin1( "TILE_%1_SEL").arg(idx)); + for (short idx = 1; idx <= 4; idx++) { + d->elementIdTable.append(QString::fromLatin1("TILE_%1_SEL").arg(idx)); } //now faces - for (short idx=1; idx<=9; idx++) { - d->elementIdTable.append(QString::fromLatin1( "CHARACTER_%1").arg(idx)); + for (short idx = 1; idx <= 9; idx++) { + d->elementIdTable.append(QString::fromLatin1("CHARACTER_%1").arg(idx)); } - for (short idx=1; idx<=9; idx++) { - d->elementIdTable.append(QString::fromLatin1( "BAMBOO_%1").arg(idx)); + for (short idx = 1; idx <= 9; idx++) { + d->elementIdTable.append(QString::fromLatin1("BAMBOO_%1").arg(idx)); } - for (short idx=1; idx<=9; idx++) { - d->elementIdTable.append(QString::fromLatin1( "ROD_%1").arg(idx)); + for (short idx = 1; idx <= 9; idx++) { + d->elementIdTable.append(QString::fromLatin1("ROD_%1").arg(idx)); } - for (short idx=1; idx<=4; idx++) { - d->elementIdTable.append(QString::fromLatin1( "SEASON_%1").arg(idx)); + for (short idx = 1; idx <= 4; idx++) { + d->elementIdTable.append(QString::fromLatin1("SEASON_%1").arg(idx)); } - for (short idx=1; idx<=4; idx++) { - d->elementIdTable.append(QString::fromLatin1( "WIND_%1").arg(idx)); + for (short idx = 1; idx <= 4; idx++) { + d->elementIdTable.append(QString::fromLatin1("WIND_%1").arg(idx)); } - for (short idx=1; idx<=3; idx++) { - d->elementIdTable.append(QString::fromLatin1( "DRAGON_%1").arg(idx)); + for (short idx = 1; idx <= 3; idx++) { + d->elementIdTable.append(QString::fromLatin1("DRAGON_%1").arg(idx)); } - for (short idx=1; idx<=4; idx++) { - d->elementIdTable.append(QString::fromLatin1( "FLOWER_%1").arg(idx)); + for (short idx = 1; idx <= 4; idx++) { + d->elementIdTable.append(QString::fromLatin1("FLOWER_%1").arg(idx)); } } -QString KMahjonggTileset::pixmapCacheNameFromElementId(const QString & elementid) { - return authorProperty(QLatin1String( "Name" ))+ elementid + QString::fromLatin1( "W%1H%2").arg(d->scaleddata.w).arg(d->scaleddata.h); +QString KMahjonggTileset::pixmapCacheNameFromElementId(const QString & elementid) +{ + return authorProperty(QLatin1String("Name")) + elementid + QString::fromLatin1("W%1H%2").arg(d->scaleddata.w).arg(d->scaleddata.h); } -QPixmap KMahjonggTileset::renderElement(short width, short height, const QString & elementid) { - ////qCDebug(LIBKMAHJONGG_LOG) << "render element" << elementid << width << height; - QImage qiRend(QSize(width, height),QImage::Format_ARGB32_Premultiplied); +QPixmap KMahjonggTileset::renderElement(short width, short height, const QString & elementid) +{ + //qCDebug(LIBKMAHJONGG_LOG) << "render element" << elementid << width << height; + QImage qiRend(QSize(width, height), QImage::Format_ARGB32_Premultiplied); qiRend.fill(0); if (d->svg.isValid()) { @@ -342,9 +347,10 @@ return QPixmap::fromImage(qiRend); } -QPixmap KMahjonggTileset::selectedTile(int num) { +QPixmap KMahjonggTileset::selectedTile(int num) +{ QPixmap pm; - QString elemId = d->elementIdTable.at(num+4);//selected offset in our idtable; + QString elemId = d->elementIdTable.at(num + 4); //selected offset in our idtable; if (!QPixmapCache::find(pixmapCacheNameFromElementId(elemId), &pm)) { //use tile size pm = renderElement(d->scaleddata.w, d->scaleddata.h, elemId); @@ -353,7 +359,8 @@ return pm; } -QPixmap KMahjonggTileset::unselectedTile(int num) { +QPixmap KMahjonggTileset::unselectedTile(int num) +{ QPixmap pm; QString elemId = d->elementIdTable.at(num); if (!QPixmapCache::find(pixmapCacheNameFromElementId(elemId), &pm)) { @@ -364,14 +371,15 @@ return pm; } -QPixmap KMahjonggTileset::tileface(int num) { +QPixmap KMahjonggTileset::tileface(int num) +{ QPixmap pm; if ((num + 8) >= d->elementIdTable.count()) { //qCDebug(LIBKMAHJONGG_LOG) << "Client asked for invalid tileface id"; return pm; } - QString elemId = d->elementIdTable.at(num + 8);//tileface offset in our idtable; + QString elemId = d->elementIdTable.at(num + 8); //tileface offset in our idtable; if (!QPixmapCache::find(pixmapCacheNameFromElementId(elemId), &pm)) { //use face size pm = renderElement(d->scaleddata.fw, d->scaleddata.fh, elemId); @@ -379,4 +387,3 @@ } return pm; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggtileset.h new/libkmahjongg-16.08.0/kmahjonggtileset.h --- old/libkmahjongg-16.04.3/kmahjonggtileset.h 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggtileset.h 2016-08-07 14:15:56.000000000 +0200 @@ -17,45 +17,47 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _KMAHJONGGTILESET_H_ -#define _KMAHJONGGTILESET_H_ +#ifndef KMAHJONGGTILESET_H +#define KMAHJONGGTILESET_H -#include <QtCore/QString> -#include <QtGui/QPixmap> +// Qt +#include <QString> +#include <QPixmap> +// LibKMahjongg #include <libkmahjongg_export.h> class KMahjonggTilesetPrivate; class LIBKMAHJONGG_EXPORT KMahjonggTileset { public: - KMahjonggTileset(); - ~KMahjonggTileset(); + KMahjonggTileset(); + ~KMahjonggTileset(); - bool loadDefault(); - bool loadTileset(const QString & tilesetPath); - bool loadGraphics(); - bool reloadTileset(const QSize & newTilesize); - QSize preferredTileSize(const QSize & boardsize, int horizontalCells, int verticalCells); - QString authorProperty(const QString &key) const; - - short width() const; - short height() const; - short levelOffsetX() const; - short levelOffsetY() const; - short qWidth() const; - short qHeight() const; - QString path() const; - - QPixmap selectedTile(int num); - QPixmap unselectedTile(int num); - QPixmap tileface(int num); - - protected: - void updateScaleInfo(short tilew, short tileh); - void buildElementIdTable(void); - QString pixmapCacheNameFromElementId(const QString & elementid); - QPixmap renderElement(short width, short height, const QString & elementid); + bool loadDefault(); + bool loadTileset(const QString & tilesetPath); + bool loadGraphics(); + bool reloadTileset(const QSize & newTilesize); + QSize preferredTileSize(const QSize & boardsize, int horizontalCells, int verticalCells); + QString authorProperty(const QString &key) const; + + short width() const; + short height() const; + short levelOffsetX() const; + short levelOffsetY() const; + short qWidth() const; + short qHeight() const; + QString path() const; + + QPixmap selectedTile(int num); + QPixmap unselectedTile(int num); + QPixmap tileface(int num); + +protected: + void updateScaleInfo(short tilew, short tileh); + void buildElementIdTable(void); + QString pixmapCacheNameFromElementId(const QString & elementid); + QPixmap renderElement(short width, short height, const QString & elementid); private: @@ -65,4 +67,4 @@ Q_DISABLE_COPY(KMahjonggTileset) }; -#endif +#endif // KMAHJONGGTILESET_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggtilesetselector.cpp new/libkmahjongg-16.08.0/kmahjonggtilesetselector.cpp --- old/libkmahjongg-16.04.3/kmahjonggtilesetselector.cpp 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggtilesetselector.cpp 2016-08-07 14:15:56.000000000 +0200 @@ -16,17 +16,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +// own #include "kmahjonggtilesetselector.h" -#include <KLocalizedString> -#include <QPainter> -#include <qstandardpaths.h> +// Qt #include <QDir> +#include <QPainter> +#include <QStandardPaths> +// KDE +#include <KLocalizedString> + +// LibKMahjongg #include "kmahjonggtileset.h" -KMahjonggTilesetSelector::KMahjonggTilesetSelector( QWidget* parent, KConfigSkeleton * aconfig ) - : QWidget( parent ) +KMahjonggTilesetSelector::KMahjonggTilesetSelector(QWidget * parent, KConfigSkeleton * aconfig) + : QWidget(parent) { setupUi(this); setupData(aconfig); @@ -34,7 +39,7 @@ KMahjonggTilesetSelector::~KMahjonggTilesetSelector() { - tilesetMap.clear(); + tilesetMap.clear(); } void KMahjonggTilesetSelector::setupData(KConfigSkeleton * aconfig) @@ -53,24 +58,23 @@ //Now get our tilesets into a list QStringList tilesAvailable; const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "kmahjongglib/tilesets", QStandardPaths::LocateDirectory); - Q_FOREACH (const QString& dir, dirs) { + Q_FOREACH (const QString & dir, dirs) { const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.desktop")); - Q_FOREACH (const QString& file, fileNames) { + Q_FOREACH (const QString & file, fileNames) { tilesAvailable.append(dir + '/' + file); } } QLatin1String namestr("Name"); int numvalidentries = 0; - for (int i = 0; i < tilesAvailable.size(); ++i) - { + for (int i = 0; i < tilesAvailable.size(); ++i) { KMahjonggTileset * aset = new KMahjonggTileset(); QString atileset = tilesAvailable.at(i); if (aset->loadTileset(atileset)) { tilesetMap.insert(aset->authorProperty(namestr), aset); tilesetList->addItem(aset->authorProperty(namestr)); //Find if this is our currently configured Tileset - if (atileset==initialGroup) { + if (atileset == initialGroup) { //Select current entry tilesetList->setCurrentRow(numvalidentries); tilesetChanged(); @@ -88,8 +92,10 @@ { KMahjonggTileset * selTileset = tilesetMap.value(tilesetList->currentItem()->text()); //Sanity checkings. Should not happen. - if (!selTileset) return; - if (selTileset->path()==kcfg_TileSet->text()) { + if (selTileset == nullptr) { + return; + } + if (selTileset->path() == kcfg_TileSet->text()) { return; } QLatin1String authstr("Author"); @@ -101,22 +107,21 @@ tilesetDescription->setText(selTileset->authorProperty(descstr)); //Make sure SVG is loaded when graphics is selected - if (!selTileset->loadGraphics()) return; + if (!selTileset->loadGraphics()) { + return; + } //Let the tileset calculate its ideal size for the preview area, but reduce the margins a bit (pass oversized drawing area) - QSize tilesize = selTileset->preferredTileSize(tilesetPreview->size()*1.3, 1, 1); + QSize tilesize = selTileset->preferredTileSize(tilesetPreview->size() * 1.3, 1, 1); selTileset->reloadTileset(tilesize); //Draw the preview - QImage qiRend(tilesetPreview->size(),QImage::Format_ARGB32_Premultiplied); + QImage qiRend(tilesetPreview->size(), QImage::Format_ARGB32_Premultiplied); qiRend.fill(0); QPainter p(&qiRend); //Calculate the margins to center the tile QSize margin = tilesetPreview->size() - tilesize; //Draw unselected tile and first tileface - p.drawPixmap(margin.width()/2, margin.height()/2, selTileset->unselectedTile(1)); - p.drawPixmap(margin.width()/2, margin.height()/2, selTileset->tileface(0)); + p.drawPixmap(margin.width() / 2, margin.height() / 2, selTileset->unselectedTile(1)); + p.drawPixmap(margin.width() / 2, margin.height() / 2, selTileset->tileface(0)); p.end(); tilesetPreview->setPixmap(QPixmap::fromImage(qiRend)); - } - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggtilesetselector.h new/libkmahjongg-16.08.0/kmahjonggtilesetselector.h --- old/libkmahjongg-16.04.3/kmahjonggtilesetselector.h 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggtilesetselector.h 2016-08-07 14:15:56.000000000 +0200 @@ -16,11 +16,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __LIB_KMAHJONGGTILESETSELECTOR_H_ -#define __LIB_KMAHJONGGTILESETSELECTOR_H_ +#ifndef KMAHJONGGTILESETSELECTOR_H +#define KMAHJONGGTILESETSELECTOR_H +// Qt #include <QMap> + +// KDE #include <KConfigSkeleton> + +// LibKMahjongg #include "ui_kmahjonggtilesetselector.h" class KMahjonggTileset; @@ -29,13 +34,13 @@ { Q_OBJECT public: - explicit KMahjonggTilesetSelector( QWidget* parent, KConfigSkeleton * config ); + explicit KMahjonggTilesetSelector( QWidget* parent, KConfigSkeleton * aconfig ); ~KMahjonggTilesetSelector(); - void setupData(KConfigSkeleton * config); + void setupData(KConfigSkeleton * aconfig); QMap<QString, KMahjonggTileset *> tilesetMap; public slots: void tilesetChanged(); }; -#endif // __LIB_KMAHJONGGTILESETSELECTOR_H_ +#endif // KMAHJONGGTILESETSELECTOR_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/libkmahjongg_debug.cpp new/libkmahjongg-16.08.0/libkmahjongg_debug.cpp --- old/libkmahjongg-16.04.3/libkmahjongg_debug.cpp 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/libkmahjongg_debug.cpp 2016-08-07 14:15:56.000000000 +0200 @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ +// own #include "libkmahjongg_debug.h" -Q_LOGGING_CATEGORY(LIBKMAHJONGG_LOG, "log_libkmahjongg") - +Q_LOGGING_CATEGORY(LIBKMAHJONGG_LOG, "log_libkmahjongg") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/tilesets/CMakeLists.txt new/libkmahjongg-16.08.0/tilesets/CMakeLists.txt --- old/libkmahjongg-16.04.3/tilesets/CMakeLists.txt 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/tilesets/CMakeLists.txt 2016-08-07 14:15:56.000000000 +0200 @@ -1,36 +1,36 @@ ##default -install( FILES default.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES default.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES default.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) +install(FILES default.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES default.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES default.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) ##classic -install( FILES classic.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES classic.svg DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES classic.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) +install(FILES classic.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES classic.svg DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES classic.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) ##bamboo -#install( FILES bamboo.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -#install( FILES bamboo.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -#install( FILES bamboo.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) +#install(FILES bamboo.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +#install(FILES bamboo.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +#install(FILES bamboo.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) ##traditional -install( FILES traditional.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES traditional.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES traditional.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) +install(FILES traditional.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES traditional.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES traditional.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) ##alphabet -install( FILES alphabet.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES alphabet.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES alphabet.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) +install(FILES alphabet.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES alphabet.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES alphabet.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) ##egypt -install( FILES egypt.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES egypt.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES egypt.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) +install(FILES egypt.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES egypt.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES egypt.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) ##Jade -install( FILES jade.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES jade.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES jade.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) +install(FILES jade.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES jade.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES jade.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/)

1 0

commit libkeduvocdocument for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libkeduvocdocument for openSUSE:Factory checked in at 2016-08-31 00:08:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkeduvocdocument (Old) and /work/SRC/openSUSE:Factory/.libkeduvocdocument.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkeduvocdocument" Changes: -------- --- /work/SRC/openSUSE:Factory/libkeduvocdocument/libkeduvocdocument.changes 2016-07-24 19:49:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkeduvocdocument.new/libkeduvocdocument.changes 2016-08-31 00:09:02.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:29:00 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:41:39 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- libkeduvocdocument-16.04.3.tar.xz New: ---- libkeduvocdocument-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkeduvocdocument.spec ++++++ --- /var/tmp/diff_new_pack.aMEjR4/_old 2016-08-31 00:09:03.000000000 +0200 +++ /var/tmp/diff_new_pack.aMEjR4/_new 2016-08-31 00:09:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: libkeduvocdocument -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Library for KDE Education Applications License: GPL-2.0+ ++++++ libkeduvocdocument-16.04.3.tar.xz -> libkeduvocdocument-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/.gitignore new/libkeduvocdocument-16.08.0/.gitignore --- old/libkeduvocdocument-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/.gitignore 2016-06-16 21:58:51.000000000 +0200 @@ -0,0 +1,3 @@ +build/ +libkeduvocdocument.kdev4 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/autotests/CMakeLists.txt new/libkeduvocdocument-16.08.0/keduvocdocument/autotests/CMakeLists.txt --- old/libkeduvocdocument-16.04.3/keduvocdocument/autotests/CMakeLists.txt 2016-02-18 08:51:38.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/autotests/CMakeLists.txt 2016-06-16 21:58:51.000000000 +0200 @@ -18,6 +18,8 @@ # keduvocdocumentvalidatortest # keduvocdocumentfilelockingtest # openAPItest + keduvocdocumenttest + emptydocumenttest ) #Unit Tests linked to objects behind the API wall @@ -64,5 +66,5 @@ endmacro() -keduvocdocument_gui_unit_tests(keduvocdocument ${kvocdoc_api_unittests}) +keduvocdocument_non_gui_unit_tests(KEduVocDocument ${kvocdoc_api_unittests}) keduvocdocument_gui_unit_tests_static(keduvocdocument_static ${kvocdoc_unittests}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/autotests/emptydocumenttest.cpp new/libkeduvocdocument-16.08.0/keduvocdocument/autotests/emptydocumenttest.cpp --- old/libkeduvocdocument-16.04.3/keduvocdocument/autotests/emptydocumenttest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/autotests/emptydocumenttest.cpp 2016-06-16 21:58:51.000000000 +0200 @@ -0,0 +1,50 @@ +/*************************************************************************** + * Copyright (C) 2016 by Hartmut Riesenbeck <hartmut.riesenbeck(a)gmx.de> * + * * + * 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 of the License, 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, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + +#include "emptydocumenttest.h" + +#include "keduvocdocument.h" +#include <QTest> + +namespace EmptyDocumentTests{ + +QString EmptyDocumentTest::sm_cappturedMessageOutput = QString(); + +void EmptyDocumentTest::testConstuctionDestruction() +{ + sm_cappturedMessageOutput.clear(); + QtMessageHandler previouMsgHandler = qInstallMessageHandler(captureMessageOutput); + KEduVocDocument *doc = new KEduVocDocument; + delete doc; + qInstallMessageHandler(previouMsgHandler); + + QCOMPARE(sm_cappturedMessageOutput, QString()); +} + +void EmptyDocumentTest::captureMessageOutput(QtMsgType /*type*/, const QMessageLogContext &/*context*/, const QString &msg) +{ + sm_cappturedMessageOutput = msg; +} + +} + +QTEST_MAIN(EmptyDocumentTests::EmptyDocumentTest) + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/autotests/emptydocumenttest.h new/libkeduvocdocument-16.08.0/keduvocdocument/autotests/emptydocumenttest.h --- old/libkeduvocdocument-16.04.3/keduvocdocument/autotests/emptydocumenttest.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/autotests/emptydocumenttest.h 2016-06-16 21:58:51.000000000 +0200 @@ -0,0 +1,48 @@ +/*************************************************************************** + * Copyright (C) 2016 by Hartmut Riesenbeck <hartmut.riesenbeck(a)gmx.de> * + * * + * 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 of the License, 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, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + +#ifndef EMPTYDOCUMENTTEST_H +#define EMPTYDOCUMENTTEST_H + +#include <QObject> + +namespace EmptyDocumentTests { +/** @file + * \brief Empty KEduVocDocument test application + * The creation and destruction of a default constructed KEduVocDocument object shouldn't + * give any error message on stderr. + * @author Hartmut Riesenbeck <hartmut.riesenbeck(a)gmx.de> + */ + +class EmptyDocumentTest : public QObject +{ +Q_OBJECT + +private slots: + void testConstuctionDestruction(); + +private: + static void captureMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg); + +private: + static QString sm_cappturedMessageOutput; +}; +} + +#endif // EMPTYDOCUMENTTEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/autotests/keduvocdocumenttest.cpp new/libkeduvocdocument-16.08.0/keduvocdocument/autotests/keduvocdocumenttest.cpp --- old/libkeduvocdocument-16.04.3/keduvocdocument/autotests/keduvocdocumenttest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/autotests/keduvocdocumenttest.cpp 2016-06-16 21:58:51.000000000 +0200 @@ -0,0 +1,126 @@ +/*************************************************************************** + * Copyright (C) 2016 by Hartmut Riesenbeck <hartmut.riesenbeck(a)gmx.de> * + * * + * 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 of the License, 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, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + +#include "keduvocdocument.h" +#include <QTemporaryFile> +#include <QTest> + +namespace KEduVocDocumentTests { +/** @file + * \brief Various KEduVocDocument tests + * This test class contends various tests for public KEduVocDocument methods. + * They are used to proof expected behavior before and after apply changes to the tested methods. + * @author Hartmut Riesenbeck <hartmut.riesenbeck(a)gmx.de> + */ + +class KEduVocDocumentTest : public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void testDetectFileType(); + void testOpen(); + +private: + void createTmpTestFileOfType(KEduVocDocument::FileType fileType); + QString tmpTestFileName() const; + QUrl tmpTestFileUrl() const; + +private: + QTemporaryFile m_tempTestFile; + KEduVocDocument m_documentTemplate; +}; + +void KEduVocDocumentTest::initTestCase() +{ + if (!m_tempTestFile.open()) { + QFAIL("Temporary test file could not be created."); + return; + } + m_tempTestFile.close(); + + KEduVocIdentifier lang; + lang.setName(QStringLiteral("KEduVocDocument Language Name")); + lang.setLocale(QStringLiteral("en")); + + m_documentTemplate.setAuthor(QStringLiteral("KEduVocDocument Tests")); + m_documentTemplate.appendIdentifier(lang); + m_documentTemplate.setGenerator(QStringLiteral("KEduVocDocument Unit Tests")); +} + +void KEduVocDocumentTest::testDetectFileType() +{ + KEduVocDocument::FileType resultFileType(KEduVocDocument::KvdNone); + + createTmpTestFileOfType(KEduVocDocument::Kvtml); + resultFileType = KEduVocDocument::detectFileType(tmpTestFileName()); + QCOMPARE(resultFileType, KEduVocDocument::Kvtml); + + createTmpTestFileOfType(KEduVocDocument::Csv); + resultFileType = KEduVocDocument::detectFileType(tmpTestFileName()); + QCOMPARE(resultFileType, KEduVocDocument::Csv); +} + +void KEduVocDocumentTest::testOpen() +{ + KEduVocDocument::ErrorCode openResult(KEduVocDocument::NoError); + + createTmpTestFileOfType(KEduVocDocument::Kvtml); + KEduVocDocument docKvtml; + openResult = docKvtml.open(tmpTestFileUrl(), KEduVocDocument::FileOpenReadOnly); + QCOMPARE(openResult, KEduVocDocument::NoError); + + createTmpTestFileOfType(KEduVocDocument::Csv); + KEduVocDocument docCsv; + openResult = docCsv.open(tmpTestFileUrl(), KEduVocDocument::FileOpenReadOnly); + QCOMPARE(openResult, KEduVocDocument::NoError); +} + +void KEduVocDocumentTest::createTmpTestFileOfType(KEduVocDocument::FileType fileType) +{ + KEduVocDocument::ErrorCode result = m_documentTemplate.saveAs(tmpTestFileUrl(), fileType); + if (result != KEduVocDocument::NoError) { + QStringList errorStrings = QStringList() << "NoError" << "Unknown" << "InvalidXml" + << "FileTypeUnknown" << "FileCannotWrite" << "FileWriterFailed" << "FileCannotRead" + << "FileReaderFailed"<< "FileDoesNotExist" << "FileLocked" << "FileCannotLock" + << "FileIsReadOnly"; + QString failText =QString("Temporary test file could not be saved. (Error code = %1)"); + failText = failText.arg(errorStrings.value(result)); + QFAIL(failText.toLocal8Bit().constData()); + } +} + +QString KEduVocDocumentTest::tmpTestFileName() const +{ + return m_tempTestFile.fileName(); +} + +QUrl KEduVocDocumentTest::tmpTestFileUrl() const +{ + return QUrl::fromLocalFile(m_tempTestFile.fileName()); +} + +} + +QTEST_MAIN(KEduVocDocumentTests::KEduVocDocumentTest) + +#include "keduvocdocumenttest.moc" + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/keduvocdocument.cpp new/libkeduvocdocument-16.08.0/keduvocdocument/keduvocdocument.cpp --- old/libkeduvocdocument-16.04.3/keduvocdocument/keduvocdocument.cpp 2016-02-18 08:51:38.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/keduvocdocument.cpp 2016-06-16 21:58:51.000000000 +0200 @@ -130,9 +130,6 @@ delete m_lessonContainer; delete m_wordTypeContainer; delete m_leitnerContainer; - - m_autosave->remove(); - m_autosave->releaseLock(); delete m_autosave; } @@ -217,33 +214,32 @@ } -KEduVocDocument::FileType KEduVocDocument::detectFileType( const QString &fileName ) +KEduVocDocument::FileType KEduVocDocument::detectFileType(const QString &fileName) { - QIODevice * f = KFilterDev::deviceForFile( fileName ); - f->open( QIODevice::ReadOnly ); + KFilterDev f(fileName); + f.open(QIODevice::ReadOnly); - ReaderManager::ReaderPtr reader( ReaderManager::reader( *f ) ); + ReaderManager::ReaderPtr reader(ReaderManager::reader(f)); - f->close(); - delete f; + f.close(); return reader->fileTypeHandled(); } -KEduVocDocument::ErrorCode KEduVocDocument::open( const QUrl& url, FileHandlingFlags flags) +KEduVocDocument::ErrorCode KEduVocDocument::open(const QUrl &url, FileHandlingFlags flags) { // save csv delimiter to preserve it in case this is a csv document QString csv = d->m_csvDelimiter; // clear all other properties d->init(); - if ( !url.isEmpty() ) { - setUrl( url ); + if (!url.isEmpty()) { + setUrl(url); } d->m_csvDelimiter = csv; KEduVocDocument::ErrorCode errStatus = Unknown; - QString errorMessage = i18n( "<qt>Cannot open file %1</qt>", url.toDisplayString() ); + QString errorMessage = i18n("<qt>Cannot open file %1</qt>", url.toDisplayString()); QString temporaryFile; QTemporaryFile tempFile; @@ -263,36 +259,35 @@ } if (flags & FileOpenReadOnly) { - d->m_isReadOnly = true; + d->m_isReadOnly = true; } ErrorCode autosaveError = NoError; if (!d->m_isReadOnly) { - autosaveError = d->initializeKAutoSave( *d->m_autosave, temporaryFile, flags ); - if (autosaveError != NoError) { - return autosaveError; - } + autosaveError = d->initializeKAutoSave(*d->m_autosave, temporaryFile, flags); + if (autosaveError != NoError) { + return autosaveError; + } } - QIODevice * f = KFilterDev::deviceForFile( temporaryFile ); - if ( f->open( QIODevice::ReadOnly ) ) { + KFilterDev f(temporaryFile); + if (f.open(QIODevice::ReadOnly)) { - ReaderManager::ReaderPtr reader( ReaderManager::reader( *f ) ); - errStatus = reader->read( *this ); + ReaderManager::ReaderPtr reader(ReaderManager::reader(f)); + errStatus = reader->read(*this); - if ( errStatus != KEduVocDocument::NoError ) { - errorMessage = i18n( "Could not open or properly read \"%1\"\n(Error reported: %2)" - , url.toDisplayString(), reader->errorMessage() ); + if (errStatus != KEduVocDocument::NoError) { + errorMessage = i18n("Could not open or properly read \"%1\"\n(Error reported: %2)" + , url.toDisplayString(), reader->errorMessage()); } } else { errStatus = FileCannotRead; } - f->close(); - delete f; + f.close(); - if ( errStatus == KEduVocDocument::NoError ) { + if (errStatus == KEduVocDocument::NoError) { setModified(false); } else { qWarning() << errorMessage; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/keduvocdocument.h new/libkeduvocdocument-16.08.0/keduvocdocument/keduvocdocument.h --- old/libkeduvocdocument-16.04.3/keduvocdocument/keduvocdocument.h 2016-02-18 08:51:38.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/keduvocdocument.h 2016-06-16 21:58:51.000000000 +0200 @@ -126,7 +126,7 @@ * @param flags How to handle expected unusual conditions (i.e. locking) * @returns ErrorCode */ - ErrorCode open( const QUrl& url, FileHandlingFlags flags = FileDefaultHandling); + ErrorCode open(const QUrl &url, FileHandlingFlags flags = FileDefaultHandling); /** * Close a document file and release the lock on the file @@ -395,7 +395,7 @@ * @param fileName filename * @return enum of filetype */ - static FileType detectFileType( const QString &fileName ); + static FileType detectFileType(const QString &fileName); /** * Create a string with the supported document types, that can be used diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/keduvockvtml2writer.cpp new/libkeduvocdocument-16.08.0/keduvocdocument/keduvockvtml2writer.cpp --- old/libkeduvocdocument-16.04.3/keduvocdocument/keduvockvtml2writer.cpp 2016-02-18 08:51:38.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/keduvockvtml2writer.cpp 2016-06-16 21:58:51.000000000 +0200 @@ -523,7 +523,7 @@ } // multiplechoice - if ( !translation->multipleChoice().isEmpty() ) { + if (!translation->getMultipleChoice().isEmpty()) { QDomElement multipleChoiceElement = m_domDoc.createElement( KVTML_MULTIPLECHOICE ); writeMultipleChoice( multipleChoiceElement, translation ); translationElement.appendChild( multipleChoiceElement ); @@ -595,7 +595,7 @@ </multiplechoice> */ { - foreach ( const QString &choice, translation->multipleChoice() ) { + foreach (const QString &choice, translation->getMultipleChoice()) { multipleChoiceElement.appendChild( newTextElement( KVTML_CHOICE, choice ) ); } return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/keduvoctranslation.cpp new/libkeduvocdocument-16.08.0/keduvocdocument/keduvoctranslation.cpp --- old/libkeduvocdocument-16.04.3/keduvocdocument/keduvoctranslation.cpp 2016-02-18 08:51:38.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/keduvoctranslation.cpp 2016-06-16 21:58:51.000000000 +0200 @@ -287,18 +287,39 @@ } -KEduVocConjugation& KEduVocTranslation::conjugation( const QString& tense ) +KEduVocConjugation& KEduVocTranslation::conjugation(const QString &tense) { return d->m_conjugations[tense]; } -QStringList & KEduVocTranslation::multipleChoice() +KEduVocConjugation KEduVocTranslation::getConjugation(const QString &tense) const +{ + if (d->m_conjugations.contains(tense)) { + return d->m_conjugations[tense]; + } + return KEduVocConjugation(); +} + + +QStringList& KEduVocTranslation::multipleChoice() +{ + return d->m_multipleChoice; +} + + +QStringList KEduVocTranslation::getMultipleChoice() const { return d->m_multipleChoice; } +void KEduVocTranslation::setMultipleChoice(const QStringList &choices) +{ + d->m_multipleChoice = choices; +} + + QString KEduVocTranslation::pronunciation() const { return d->m_pronunciation; @@ -503,7 +524,7 @@ // conjugation foreach ( const QString &tense, conjugationTenses() ) { QDomElement conjugationElement = parent.ownerDocument().createElement( KVTML_CONJUGATION ); - conjugation(tense).toKVTML2(conjugationElement, tense); + getConjugation(tense).toKVTML2(conjugationElement, tense); if (conjugationElement.hasChildNodes()) { parent.appendChild( conjugationElement ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/keduvoctranslation.h new/libkeduvocdocument-16.08.0/keduvocdocument/keduvoctranslation.h --- old/libkeduvocdocument-16.04.3/keduvocdocument/keduvoctranslation.h 2016-02-18 08:51:38.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/keduvoctranslation.h 2016-06-16 21:58:51.000000000 +0200 @@ -147,11 +147,19 @@ void setLeitnerBox( KEduVocLeitnerBox* leitnerBox ); /** + * This method is deprecated, please use @see getConjugation() @see setConjugation() * Returns a conjugation if available * @param tense tense of the requested conjugation * @return the conjugation */ - KEduVocConjugation& conjugation( const QString& tense ); + KEDUVOCDOCUMENT_DEPRECATED KEduVocConjugation& conjugation(const QString &tense); + + /** + * Returns a conjugation if available + * @param tense tense of the requested conjugation + * @return the conjugation + */ + KEduVocConjugation getConjugation(const QString &tense) const; /** adds conjugations or replaces them, if they exist. * @param conjugation conjugation @@ -202,14 +210,22 @@ KEduVocText article() const; void setArticle(const KEduVocText& article); - /** Returns multiple choice if available - */ - QStringList & multipleChoice(); + /** + * This method is deprecated, please use @see getMultipleChoice() @see setMultipleChoice() + * Returns multiple choice if available + */ + KEDUVOCDOCUMENT_DEPRECATED QStringList& multipleChoice(); + + /** + * Returns multiple choice if available + * @return list of multiple choice answers + */ + QStringList getMultipleChoice() const; /** Sets multiple choice - * @param mc multiple choice block - */ -// void setMultipleChoice( const QStringList &mc ); + * @param choices multiple choice block + */ + void setMultipleChoice(const QStringList &choices); /** Get the sound url for this translation if it exists */ QUrl soundUrl(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/readerwriters/keduvockvtml2reader.cpp new/libkeduvocdocument-16.08.0/keduvocdocument/readerwriters/keduvockvtml2reader.cpp --- old/libkeduvocdocument-16.04.3/keduvocdocument/readerwriters/keduvockvtml2reader.cpp 2016-02-18 08:51:38.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/readerwriters/keduvockvtml2reader.cpp 2016-06-16 21:58:51.000000000 +0200 @@ -700,7 +700,9 @@ { currentElement = choiceNodes.item( i ).toElement(); if ( currentElement.parentNode() == multipleChoiceElement ) { - translation->multipleChoice().append( currentElement.text() ); + QStringList choices = translation->getMultipleChoice(); + choices.append(currentElement.text()); + translation->setMultipleChoice(choices); } } return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/readerwriters/keduvockvtmlreader.cpp new/libkeduvocdocument-16.08.0/keduvocdocument/readerwriters/keduvockvtmlreader.cpp --- old/libkeduvocdocument-16.04.3/keduvocdocument/readerwriters/keduvockvtmlreader.cpp 2016-02-18 08:51:38.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/readerwriters/keduvockvtmlreader.cpp 2016-06-16 21:58:51.000000000 +0200 @@ -337,7 +337,32 @@ nat_indef = ""; } - m_doc->identifier(i).setArticle( KEduVocArticle( fem_def, fem_indef, mal_def, mal_indef, nat_def, nat_indef ) ); + KEduVocArticle article; + article.setArticle( + mal_def, + KEduVocWordFlag::Singular | KEduVocWordFlag::Definite | KEduVocWordFlag::Masculine + ); + article.setArticle( + fem_def, + KEduVocWordFlag::Singular | KEduVocWordFlag::Definite | KEduVocWordFlag::Feminine + ); + article.setArticle( + nat_def, + KEduVocWordFlag::Singular | KEduVocWordFlag::Definite | KEduVocWordFlag::Neuter + ); + article.setArticle( + mal_indef, + KEduVocWordFlag::Singular | KEduVocWordFlag::Indefinite | KEduVocWordFlag::Masculine + ); + article.setArticle( + fem_indef, + KEduVocWordFlag::Singular | KEduVocWordFlag::Indefinite | KEduVocWordFlag::Feminine + ); + article.setArticle( + nat_indef, + KEduVocWordFlag::Singular | KEduVocWordFlag::Indefinite | KEduVocWordFlag::Neuter + ); + m_doc->identifier(i).setArticle(article); } } @@ -670,10 +695,10 @@ QDomElement currentElement; currentElement = domElementParent.firstChildElement( KV_COMP_L2 ); - translation->setComparative(currentElement.text()); + translation->setComparativeForm(currentElement.text()); currentElement = domElementParent.firstChildElement( KV_COMP_L3 ); - translation->setSuperlative(currentElement.text()); + translation->setSuperlativeForm(currentElement.text()); return true; } @@ -692,32 +717,35 @@ { QDomElement currentElement; + QStringList choices = translation->getMultipleChoice(); currentElement = domElementParent.firstChildElement( KV_MC_1 ); if ( !currentElement.isNull() ) { - translation->multipleChoice().append( currentElement.text() ); + choices.append(currentElement.text()); } currentElement = domElementParent.firstChildElement( KV_MC_2 ); if ( !currentElement.isNull() ) { - translation->multipleChoice().append( currentElement.text() ); + choices.append(currentElement.text()); } currentElement = domElementParent.firstChildElement( KV_MC_3 ); if ( !currentElement.isNull() ) { - translation->multipleChoice().append( currentElement.text() ); + choices.append(currentElement.text()); } currentElement = domElementParent.firstChildElement( KV_MC_4 ); if ( !currentElement.isNull() ) { - translation->multipleChoice().append( currentElement.text() ); + choices.append(currentElement.text()); } currentElement = domElementParent.firstChildElement( KV_MC_5 ); if ( !currentElement.isNull() ) { - translation->multipleChoice().append( currentElement.text() ); + choices.append(currentElement.text()); } + translation->setMultipleChoice(choices); + return true; }

1 0

commit libkdegames for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libkdegames for openSUSE:Factory checked in at 2016-08-31 00:08:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkdegames (Old) and /work/SRC/openSUSE:Factory/.libkdegames.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkdegames" Changes: -------- --- /work/SRC/openSUSE:Factory/libkdegames/libkdegames.changes 2016-07-24 19:52:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkdegames.new/libkdegames.changes 2016-08-31 00:08:58.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:28:50 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:41:08 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- libkdegames-16.04.3.tar.xz New: ---- libkdegames-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkdegames.spec ++++++ --- /var/tmp/diff_new_pack.Ldhbib/_old 2016-08-31 00:08:59.000000000 +0200 +++ /var/tmp/diff_new_pack.Ldhbib/_new 2016-08-31 00:08:59.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: libkdegames-%{version}.tar.xz Patch1: libkdegames-bnc793185.patch ++++++ libkdegames-16.04.3.tar.xz -> libkdegames-16.08.0.tar.xz ++++++ ++++ 2533 lines of diff (skipped)

1 0

commit kwordquiz for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kwordquiz for openSUSE:Factory checked in at 2016-08-31 00:08:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwordquiz (Old) and /work/SRC/openSUSE:Factory/.kwordquiz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kwordquiz" Changes: -------- --- /work/SRC/openSUSE:Factory/kwordquiz/kwordquiz.changes 2016-07-24 19:49:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kwordquiz.new/kwordquiz.changes 2016-08-31 00:08:56.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:28:03 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:34:48 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kwordquiz-16.04.3.tar.xz New: ---- kwordquiz-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwordquiz.spec ++++++ --- /var/tmp/diff_new_pack.9fcou2/_old 2016-08-31 00:08:57.000000000 +0200 +++ /var/tmp/diff_new_pack.9fcou2/_new 2016-08-31 00:08:57.000000000 +0200 @@ -17,7 +17,7 @@ Name: kwordquiz -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Vocabulary Trainer License: GPL-2.0+ ++++++ kwordquiz-16.04.3.tar.xz -> kwordquiz-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwordquiz-16.04.3/CMakeLists.txt new/kwordquiz-16.08.0/CMakeLists.txt --- old/kwordquiz-16.04.3/CMakeLists.txt 2016-03-20 16:49:45.000000000 +0100 +++ new/kwordquiz-16.08.0/CMakeLists.txt 2016-06-25 18:47:04.000000000 +0200 @@ -41,6 +41,7 @@ find_package(LibKEduVocDocument REQUIRED) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_subdirectory(doc) add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwordquiz-16.04.3/doc/index.docbook new/kwordquiz-16.08.0/doc/index.docbook --- old/kwordquiz-16.04.3/doc/index.docbook 2016-03-20 16:49:45.000000000 +0100 +++ new/kwordquiz-16.08.0/doc/index.docbook 2016-06-25 18:47:04.000000000 +0200 @@ -1,8 +1,6 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&kwordquiz;"> - <!ENTITY package "kdeedu"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> ]> @@ -35,12 +33,12 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2011-08-20</date> -<releaseinfo>0.9.1 (&kde; 4.7)</releaseinfo> +<date>2016-05-07</date> +<releaseinfo>0.9.2 (Applications 16.04)</releaseinfo> <abstract> <para> -&kwordquiz; is a flashcard and vocabulary learning program for &kde;. +&kwordquiz; is a flashcard and vocabulary learning program by &kde;. </para> </abstract> @@ -168,14 +166,9 @@ <listitem> <para> <action>Downloads</action> new vocabularies. Downloaded vocabularies - can be found in <filename class="directory">$KDEHOME/share/apps/kvtml</filename> - directory. <envar>$KDEHOME</envar> is usually - a hidden folder in your Home folder called <filename class="directory">.kde</filename> - or <filename class="directory">.kde4</filename> -  + can be found in <filename class="directory">$XDG_DATA_HOME/kvtml</filename> + directory. <envar>$XDG_DATA_HOME</envar> is usually + a hidden folder in your Home folder called <filename class="directory">.local</filename>. </para> </listitem> </varlistentry> @@ -200,6 +193,9 @@ <varlistentry> <term> <menuchoice> + <shortcut> + <keycombo action="simul">&Ctrl;&Shift;<keycap>S</keycap></keycombo> + </shortcut> <guimenu>File</guimenu> <guimenuitem>Save As...</guimenuitem> </menuchoice> @@ -454,83 +450,7 @@ </variablelist> </sect1> - <sect1 id="vocabulary-menu"> <title>The Vocabulary Menu</title> @@ -595,25 +515,6 @@ </listitem> </varlistentry> - - <varlistentry> <term> <menuchoice> @@ -658,7 +559,7 @@ <term> <menuchoice> <guimenu>Mode</guimenu> - <guimenuitem>Column 1 -> Column 2 In Order</guimenuitem> + <guimenuitem>1 Column 1 -> Column 2 In Order</guimenuitem> </menuchoice> </term> <listitem> @@ -672,7 +573,7 @@ <term> <menuchoice> <guimenu>Mode</guimenu> - <guimenuitem>Column 2 -> Column 1 In Order</guimenuitem> + <guimenuitem>2 Column 2 -> Column 1 In Order</guimenuitem> </menuchoice> </term> <listitem> @@ -686,7 +587,7 @@ <term> <menuchoice> <guimenu>Mode</guimenu> - <guimenuitem>Column 1 -> Column 2 Randomly</guimenuitem> + <guimenuitem>3 Column 1 -> Column 2 Randomly</guimenuitem> </menuchoice> </term> <listitem> @@ -700,7 +601,7 @@ <term> <menuchoice> <guimenu>Mode</guimenu> - <guimenuitem>Column 2 -> Column 1 Randomly</guimenuitem> + <guimenuitem>4 Column 2 -> Column 1 Randomly</guimenuitem> </menuchoice> </term> <listitem> @@ -714,7 +615,7 @@ <term> <menuchoice> <guimenu>Mode</guimenu> - <guimenuitem>Column 1 <-> Column 2 Randomly</guimenuitem> + <guimenuitem>5 Column 1 <-> Column 2 Randomly</guimenuitem> </menuchoice> </term> <listitem> @@ -868,8 +769,13 @@ </variablelist> </sect1> -<sect1 id="settings-menu"> -<title>The Settings Menu</title> +<sect1 id="settings-help-menu"> +<title>The Settings and Help Menu</title> +<para>Apart from the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> +menu items described in the the <ulink url="help:/fundamentals/ui.html#menus-settings" +>Settings Menu</ulink> and <ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink> +of the &kde; Fundamentals &kwordquiz; this additional menu entry: +</para> <variablelist> <varlistentry> @@ -886,128 +792,9 @@ </listitem> </varlistentry> - <varlistentry> - <term> - <menuchoice> - <guimenu>Settings</guimenu> - <guisubmenu>Toolbars</guisubmenu> - <guimenuitem>Main Toolbar</guimenuitem> - </menuchoice> - </term> - <listitem> - <para> - <action>Toggle</action> the Main Toolbar - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <menuchoice> - <guimenu>Settings</guimenu> - <guisubmenu>Toolbars</guisubmenu> - <guimenuitem>Quiz</guimenuitem> - </menuchoice> - </term> - <listitem> - <para> - <action>Toggle</action> the Quiz Toolbar - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <menuchoice> - <guimenu>Settings</guimenu> - <guisubmenu>Toolbars</guisubmenu> - <guimenuitem>Special Characters</guimenuitem> - </menuchoice> - </term> - <listitem> - <para> - <action>Toggle</action> the Special Characters Toolbar - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <menuchoice> - <guimenu>Settings</guimenu> - <guimenuitem>Show Statusbar</guimenuitem> - </menuchoice> - </term> - <listitem> - <para> - <action>Toggle</action> the Statusbar - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <menuchoice> - <guimenu>Settings</guimenu> - <guimenuitem>Configure Shortcuts...</guimenuitem> - </menuchoice> - </term> - <listitem> - <para> - <action>Configure</action> the keyboard keys you use to access the different actions. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <menuchoice> - <guimenu>Settings</guimenu> - <guimenuitem>Configure Toolbars...</guimenuitem> - </menuchoice> - </term> - <listitem> - <para> - <action>Configure</action> the items you want to put in the toolbar - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <menuchoice> - <guimenu>Settings</guimenu> - <guimenuitem>Configure Notifications...</guimenuitem> - </menuchoice> - </term> - <listitem> - <para> - <action>Configure</action> notifications for certain events in &kwordquiz; - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <menuchoice> - <guimenu>Settings</guimenu> - <guimenuitem>Configure &kwordquiz;...</guimenuitem> - </menuchoice> - </term> - <listitem> - <para> - <action>Configure</action> preferences for the vocabulary editor and the quizzes. Displays a <link linkend="dlg-config-editor">dialog</link>. - </para> - </listitem> - </varlistentry> - </variablelist> </sect1> -<sect1 id="help-menu"> -<title>The Help Menu</title> -&help.menu.documentation; -</sect1> </chapter> <chapter id="main-window"> @@ -1351,7 +1138,7 @@ </screenshot> </chapter> - + <chapter id="dialogs"> <title>Dialogs</title> @@ -1639,57 +1426,6 @@ </sect1> - -</chapter> - -<chapter id="faq"> -<title>Questions and Answers</title> - -&reporting.bugs; -&updating.documentation; - </chapter> <chapter id="credits"> @@ -1714,24 +1450,6 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-kwordquiz"> -<title>How to obtain &kwordquiz;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - &documentation.index; </book> <!-- Files old/kwordquiz-16.04.3/doc/kwordquiz-icon.png and new/kwordquiz-16.08.0/doc/kwordquiz-icon.png differ Files old/kwordquiz-16.04.3/doc/kwq-dlg-characters.png and new/kwordquiz-16.08.0/doc/kwq-dlg-characters.png differ Files old/kwordquiz-16.04.3/doc/kwq-dlg-configure-appearance.png and new/kwordquiz-16.08.0/doc/kwq-dlg-configure-appearance.png differ Files old/kwordquiz-16.04.3/doc/kwq-dlg-configure-characters.png and new/kwordquiz-16.08.0/doc/kwq-dlg-configure-characters.png differ Files old/kwordquiz-16.04.3/doc/kwq-dlg-configure-editor.png and new/kwordquiz-16.08.0/doc/kwq-dlg-configure-editor.png differ Files old/kwordquiz-16.04.3/doc/kwq-dlg-configure-general.png and new/kwordquiz-16.08.0/doc/kwq-dlg-configure-general.png differ Files old/kwordquiz-16.04.3/doc/kwq-dlg-configure-quiz.png and new/kwordquiz-16.08.0/doc/kwq-dlg-configure-quiz.png differ Files old/kwordquiz-16.04.3/doc/kwq-dlg-languages.png and new/kwordquiz-16.08.0/doc/kwq-dlg-languages.png differ Files old/kwordquiz-16.04.3/doc/kwq-dlg-print-exam.png and new/kwordquiz-16.08.0/doc/kwq-dlg-print-exam.png differ Files old/kwordquiz-16.04.3/doc/kwq-dlg-print-flashcard.png and new/kwordquiz-16.08.0/doc/kwq-dlg-print-flashcard.png differ Files old/kwordquiz-16.04.3/doc/kwq-dlg-print-list.png and new/kwordquiz-16.08.0/doc/kwq-dlg-print-list.png differ Files old/kwordquiz-16.04.3/doc/kwq-dlg-print-type.png and new/kwordquiz-16.08.0/doc/kwq-dlg-print-type.png differ Files old/kwordquiz-16.04.3/doc/kwq-editor.png and new/kwordquiz-16.08.0/doc/kwq-editor.png differ Files old/kwordquiz-16.04.3/doc/kwq-flashcard.png and new/kwordquiz-16.08.0/doc/kwq-flashcard.png differ Files old/kwordquiz-16.04.3/doc/kwq-multiple.png and new/kwordquiz-16.08.0/doc/kwq-multiple.png differ Files old/kwordquiz-16.04.3/doc/kwq-qanda.png and new/kwordquiz-16.08.0/doc/kwq-qanda.png differ Files old/kwordquiz-16.04.3/doc/kwq-tutor-popup-minimalistic.png and new/kwordquiz-16.08.0/doc/kwq-tutor-popup-minimalistic.png differ Files old/kwordquiz-16.04.3/doc/kwq-tutor-popup-native.png and new/kwordquiz-16.08.0/doc/kwq-tutor-popup-native.png differ Files old/kwordquiz-16.04.3/doc/kwq-tutor-settings.png and new/kwordquiz-16.08.0/doc/kwq-tutor-settings.png differ Files old/kwordquiz-16.04.3/doc/kwq-tutor-shortcuts.png and new/kwordquiz-16.08.0/doc/kwq-tutor-shortcuts.png differ Files old/kwordquiz-16.04.3/doc/kwq-tutor-welcome.png and new/kwordquiz-16.08.0/doc/kwq-tutor-welcome.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwordquiz-16.04.3/src/kwqcommands.cpp new/kwordquiz-16.08.0/src/kwqcommands.cpp --- old/kwordquiz-16.04.3/src/kwqcommands.cpp 2016-03-20 16:49:45.000000000 +0100 +++ new/kwordquiz-16.08.0/src/kwqcommands.cpp 2016-06-25 18:47:04.000000000 +0200 @@ -413,7 +413,7 @@ KWQCommandImage::KWQCommandImage(KWQTableView *view, const QUrl &newUrl) : KWQUndoCommand(view), m_newUrl(newUrl) { setText(i18nc("@item:inmenu undo link image", "Link Image")); - m_oldUrl = view->model()->data(oldCurrentIndex(), KWQTableModel::ImageRole).toString(); + m_oldUrl = QUrl(view->model()->data(oldCurrentIndex(), KWQTableModel::ImageRole).toString()); } @@ -432,7 +432,7 @@ KWQCommandSound::KWQCommandSound(KWQTableView *view, const QUrl &newUrl) : KWQUndoCommand(view), m_newUrl(newUrl) { setText(i18nc("@item:inmenu undo link sound", "Link Sound")); - m_oldUrl = view->model()->data(oldCurrentIndex(), KWQTableModel::SoundRole).toString(); + m_oldUrl = QUrl(view->model()->data(oldCurrentIndex(), KWQTableModel::SoundRole).toString()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwordquiz-16.04.3/src/kwqquizmodel.cpp new/kwordquiz-16.08.0/src/kwqquizmodel.cpp --- old/kwordquiz-16.04.3/src/kwqquizmodel.cpp 2016-03-20 16:49:45.000000000 +0100 +++ new/kwordquiz-16.08.0/src/kwqquizmodel.cpp 2016-06-25 18:47:04.000000000 +0200 @@ -402,16 +402,16 @@ int col = column(row); col == 0 ? col = 1 : col = 0; - QUrl soundUrl = data(index(qAbs(row), col, QModelIndex()), KWQTableModel::SoundRole).toString(); - return soundUrl.toLocalFile(); + QUrl soundUrl(data(index(qAbs(row), col, QModelIndex()), KWQTableModel::SoundRole).toString()); + return soundUrl; } QUrl KWQQuizModel::soundAnswer() { int row = m_list.at(m_currentQuestion); - QUrl soundUrl = data(index(qAbs(row), column(row), QModelIndex()), KWQTableModel::SoundRole).toString(); - return soundUrl.toLocalFile(); + QUrl soundUrl(data(index(qAbs(row), column(row), QModelIndex()), KWQTableModel::SoundRole).toString()); + return soundUrl; } @@ -421,7 +421,7 @@ int col = column(row); col == 0 ? col = 1 : col = 0; - QUrl imageUrl = data(index(qAbs(row), col, QModelIndex()), KWQTableModel::ImageRole).toString(); + QUrl imageUrl(data(index(qAbs(row), col, QModelIndex()), KWQTableModel::ImageRole).toString()); return QPixmap(imageUrl.toLocalFile()); } @@ -429,7 +429,7 @@ QPixmap KWQQuizModel::imageAnswer() { int row = m_list.at(m_currentQuestion); - QUrl imageUrl = data(index(qAbs(row), column(row), QModelIndex()), KWQTableModel::ImageRole).toString(); + QUrl imageUrl(data(index(qAbs(row), column(row), QModelIndex()), KWQTableModel::ImageRole).toString()); return QPixmap(imageUrl.toLocalFile()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwordquiz-16.04.3/src/kwqquizview.cpp new/kwordquiz-16.08.0/src/kwqquizview.cpp --- old/kwordquiz-16.04.3/src/kwqquizview.cpp 2016-03-20 16:49:45.000000000 +0100 +++ new/kwordquiz-16.08.0/src/kwqquizview.cpp 2016-06-25 18:47:04.000000000 +0200 @@ -67,21 +67,22 @@ { static QUrl lastUrl; - QUrl *url = const_cast<QUrl *>(&soundUrl); + QUrl url = soundUrl; if (overwrite) - lastUrl = *url; + lastUrl = soundUrl; - if (url->isEmpty()) { + if (url.isEmpty()) { if (lastUrl.isEmpty()) { m_actionCollection->action(QStringLiteral("quiz_audio_play"))->setEnabled(false); return; } - url = &lastUrl; + url = lastUrl; + } else { + lastUrl = url; } - lastUrl = *url; m_actionCollection->action(QStringLiteral("quiz_audio_play"))->setEnabled(true); - qDebug() << "Attempting to play sound: " << *url; + qDebug() << "Attempting to play sound: " << url; if (!m_player) { m_player = new Phonon::MediaObject(this); @@ -90,6 +91,6 @@ } else { m_player->stop(); } - m_player->setCurrentSource(*url); + m_player->setCurrentSource(url); m_player->play(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwordquiz-16.04.3/src/kwqtableview.cpp new/kwordquiz-16.08.0/src/kwqtableview.cpp --- old/kwordquiz-16.04.3/src/kwqtableview.cpp 2016-03-20 16:49:45.000000000 +0100 +++ new/kwordquiz-16.08.0/src/kwqtableview.cpp 2016-06-25 18:47:04.000000000 +0200 @@ -716,7 +716,7 @@ void KWQTableView::doVocabImage() { - QUrl currentUrl = model()->data(currentIndex(), KWQTableModel::ImageRole).toString(); + QUrl currentUrl(model()->data(currentIndex(), KWQTableModel::ImageRole).toString()); QUrl imageUrl = KFileDialog::getImageOpenUrl(currentUrl, this, i18n("Select Image")); if (!imageUrl.isEmpty()) { @@ -728,7 +728,7 @@ void KWQTableView::doVocabSound() { - QUrl currentUrl = model()->data(currentIndex(), KWQTableModel::SoundRole).toString(); + QUrl currentUrl(model()->data(currentIndex(), KWQTableModel::SoundRole).toString()); QUrl soundUrl = QFileDialog::getOpenFileUrl(this, i18n("Select Sound"), currentUrl, i18n("*|All Files")); if (!soundUrl.isEmpty()) {

1 0

commit kuser for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kuser for openSUSE:Factory checked in at 2016-08-31 00:08:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kuser (Old) and /work/SRC/openSUSE:Factory/.kuser.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kuser" Changes: -------- --- /work/SRC/openSUSE:Factory/kuser/kuser.changes 2016-07-24 19:49:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kuser.new/kuser.changes 2016-08-31 00:08:54.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:27:48 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:33:11 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kuser-16.04.3.tar.xz New: ---- kuser-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kuser.spec ++++++ --- /var/tmp/diff_new_pack.PgO5wN/_old 2016-08-31 00:08:56.000000000 +0200 +++ /var/tmp/diff_new_pack.PgO5wN/_new 2016-08-31 00:08:56.000000000 +0200 @@ -19,7 +19,7 @@ Name: kuser BuildRequires: libkdepimlibs4-devel Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: User Account Manager License: GPL-2.0+ ++++++ kuser-16.04.3.tar.xz -> kuser-16.08.0.tar.xz ++++++

1 0

commit kubrick for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kubrick for openSUSE:Factory checked in at 2016-08-31 00:08:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubrick (Old) and /work/SRC/openSUSE:Factory/.kubrick.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kubrick" Changes: -------- --- /work/SRC/openSUSE:Factory/kubrick/kubrick.changes 2016-07-24 19:48:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kubrick.new/kubrick.changes 2016-08-31 00:08:52.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:27:40 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:32:20 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kubrick-16.04.3.tar.xz New: ---- kubrick-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubrick.spec ++++++ --- /var/tmp/diff_new_pack.zcPuPw/_old 2016-08-31 00:08:53.000000000 +0200 +++ /var/tmp/diff_new_pack.zcPuPw/_new 2016-08-31 00:08:53.000000000 +0200 @@ -24,7 +24,7 @@ License: GPL-2.0+ Group: Amusements/Games/Logic Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kubrick-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kubrick-16.04.3.tar.xz -> kubrick-16.08.0.tar.xz ++++++

1 0

commit kturtle for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kturtle for openSUSE:Factory checked in at 2016-08-31 00:08:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kturtle (Old) and /work/SRC/openSUSE:Factory/.kturtle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kturtle" Changes: -------- --- /work/SRC/openSUSE:Factory/kturtle/kturtle.changes 2016-07-24 19:48:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kturtle.new/kturtle.changes 2016-08-31 00:08:46.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:27:33 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:32:01 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kturtle-16.04.3.tar.xz New: ---- kturtle-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kturtle.spec ++++++ --- /var/tmp/diff_new_pack.oUhrJx/_old 2016-08-31 00:08:47.000000000 +0200 +++ /var/tmp/diff_new_pack.oUhrJx/_new 2016-08-31 00:08:47.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: Amusements/Teaching/Mathematics Url: http://edu.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRequires: update-desktop-files ++++++ kturtle-16.04.3.tar.xz -> kturtle-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kturtle-16.04.3/CMakeLists.txt new/kturtle-16.08.0/CMakeLists.txt --- old/kturtle-16.04.3/CMakeLists.txt 2016-03-15 21:41:26.000000000 +0100 +++ new/kturtle-16.08.0/CMakeLists.txt 2016-06-25 18:02:43.000000000 +0200 @@ -33,12 +33,9 @@ CoreAddons ) -include_directories(${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/interpreter -) - #Allows QString concatenation to use a single memory allocation per source line. add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_subdirectory (doc) add_subdirectory (src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kturtle-16.04.3/doc/index.docbook new/kturtle-16.08.0/doc/index.docbook --- old/kturtle-16.04.3/doc/index.docbook 2016-03-15 21:41:26.000000000 +0100 +++ new/kturtle-16.08.0/doc/index.docbook 2016-06-25 18:02:43.000000000 +0200 @@ -2,7 +2,6 @@ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&kturtle;"> - <!ENTITY package "kdeedu"> <!ENTITY turtlescript "TurtleScript"> <!ENTITY logo "Logo"> <!ENTITY % addindex "INCLUDE"> @@ -62,8 +61,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2013-02-08</date> -<releaseinfo>0.8.1 beta (&kde; 4.10)</releaseinfo> +<date>2016-05-07</date> +<releaseinfo>0.8.1 beta (Applications 16.04)</releaseinfo> <abstract> <para>&kturtle; is an educational programming environment that aims to make learning how to program as easy as possible. To achieve this &kturtle; makes all programming tools available from the user interface. The programming language used is &turtlescript; which allows its commands to be translated.</para> @@ -165,27 +164,6 @@ </chapter> - - -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-kturtle"> -<title>How to obtain &kturtle;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> - -</appendix> -  <index id='command-index'> <title>Command Index</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kturtle-16.04.3/doc/programming-reference.docbook new/kturtle-16.08.0/doc/programming-reference.docbook --- old/kturtle-16.04.3/doc/programming-reference.docbook 2016-03-15 21:41:26.000000000 +0100 +++ new/kturtle-16.08.0/doc/programming-reference.docbook 2016-06-25 18:02:43.000000000 +0200 @@ -61,7 +61,7 @@ <sect2 id="boolean-value"> <title>Boolean (true/false) values</title> -<para>There are only two boolean values: <userinput>true</userinput> and <userinput>false</userinput>. Sometimes they are also called: on and off, yes and no, one and zero. But in &turtlescript; we call them, always, <userinput>true</userinput> and <userinput>false</userinput>. Have a look at this piece of &turtlescript;: +<para>There are only two boolean values: <userinput>true</userinput><indexterm><primary>true</primary></indexterm> and <userinput>false</userinput><indexterm><primary>false</primary></indexterm>. Sometimes they are also called: on and off, yes and no, one and zero. But in &turtlescript; we call them, always, <userinput>true</userinput> and <userinput>false</userinput>. Have a look at this piece of &turtlescript;: <screen> $a = true </screen> @@ -111,7 +111,7 @@ <sect2 id="boolean-operators"> <title>Boolean (true/false) operators</title> -<para>Where <link linkend="mathematical-operators">mathematical operators</link> are mainly for <link linkend="number">numbers</link>, boolean operators are for <link linkend="boolean-value">boolean values</link> (<userinput>true</userinput> and <userinput>false</userinput>). There are only three boolean operators, namely: <userinput>and</userinput>, <userinput>or</userinput>, and <userinput>not</userinput>. The following piece of &turtlescript; shows how to use them: +<para>Where <link linkend="mathematical-operators">mathematical operators</link> are mainly for <link linkend="number">numbers</link>, boolean operators are for <link linkend="boolean-value">boolean values</link> (<userinput>true</userinput> and <userinput>false</userinput>). There are only three boolean operators, namely: <userinput>and</userinput><indexterm><primary>and</primary></indexterm>, <userinput>or</userinput><indexterm><primary>or</primary></indexterm>, and <userinput>not</userinput><indexterm><primary>not</primary></indexterm>. The following piece of &turtlescript; shows how to use them: <screen> $and_1_1 = true and true # -> true $and_1_0 = true and false # -> false @@ -745,7 +745,7 @@ <title>The "for" loop, a counting loop</title> <variablelist> <varlistentry> - <term>for<indexterm><primary>for</primary></indexterm><indexterm><primary>step</primary></indexterm></term> + <term>for<indexterm><primary>for</primary></indexterm><indexterm><primary>to</primary></indexterm><indexterm><primary>step</primary></indexterm></term> <listitem><para><screen>for <link linkend="assignment-of-variables">variable</link> = <link linkend="number">number</link> to <link linkend="number">number</link> { ... }</screen> The <userinput>for</userinput> loop is a <quote>counting loop</quote>, &ie; it keeps count for you. The first number sets the variable to the value in the first loop. Every loop the number is increased until the second number is reached. <screen> @@ -805,45 +805,8 @@ <sect1 id="learn"> - - - - - - - <title>Create your own commands with <quote>learn</quote></title> -<para><userinput>learn</userinput> is special as it is used to create your own commands. The commands you create can take <glossterm linkend="input-output">input</glossterm> and return <glossterm linkend="input-output">output</glossterm>. Let us take a look at how a new command is created: +<para><userinput>learn</userinput><indexterm><primary>learn</primary></indexterm> is special as it is used to create your own commands. The commands you create can take <glossterm linkend="input-output">input</glossterm> and return <glossterm linkend="input-output">output</glossterm>. Let us take a look at how a new command is created: <screen> learn circle $x { repeat 36 { @@ -868,7 +831,7 @@ circle 40 </screen> </para> -<para>In the next example, a command with a return value is created. +<para>In the next example, a command with a return<indexterm><primary>return</primary></indexterm> value is created. <screen> learn faculty $x { $r = 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kturtle-16.04.3/doc/using-kturtle.docbook new/kturtle-16.08.0/doc/using-kturtle.docbook --- old/kturtle-16.04.3/doc/using-kturtle.docbook 2016-03-15 21:41:26.000000000 +0100 +++ new/kturtle-16.08.0/doc/using-kturtle.docbook 2016-06-25 18:02:43.000000000 +0200 @@ -50,7 +50,7 @@ <para>In the menubar you find all the actions of &kturtle;. They are in the following groups: <guimenu>File</guimenu>, <guimenu>Edit</guimenu>, <guimenu>Canvas</guimenu>, <guimenu>Run</guimenu>, <guimenu>Tools</guimenu>, <guimenu>Settings</guimenu>, and <guimenu>Help</guimenu>. This section describes them all.</para> <sect2 id="the-file-menu"> -<title>The <guimenu>File</guimenu> Menu</title> +<title>The File Menu</title> <variablelist> <anchor id="file-new" /> @@ -127,6 +127,9 @@ <anchor id="file-save-as" /> <varlistentry> <term><menuchoice> + <shortcut> + <keycombo>&Ctrl;&Shift;<keycap>S</keycap></keycombo> + </shortcut> <guimenu>File</guimenu> <guimenuitem>Save As...</guimenuitem> </menuchoice></term> @@ -172,7 +175,7 @@ </sect2> <sect2 id="the-edit-menu"> - <title>The <guimenu>Edit</guimenu> Menu</title> + <title>The Edit Menu</title> <variablelist> <anchor id="edit-undo" /> <varlistentry> @@ -320,7 +323,7 @@ <sect2 id="the-canvas-menu"> - <title>The <guimenu>Canvas</guimenu> Menu</title> + <title>The Canvas Menu</title> <variablelist> <anchor id="canvas-export-to-image" /> <varlistentry> @@ -354,7 +357,7 @@ </sect2> <sect2 id="the-run-menu"> - <title>The <guimenu>Run</guimenu> Menu</title> + <title>The Run Menu</title> <variablelist> <anchor id="run-execute" /> <varlistentry> @@ -409,7 +412,7 @@ <sect2 id="the-tools-menu"> - <title>The <guimenu>Tools</guimenu> Menu</title> + <title>The Tools Menu</title> <variablelist> <anchor id="tools-direction-chooser" /> <varlistentry> @@ -433,7 +436,7 @@ </sect2> <sect2 id="the-setting-menu"> - <title>The <guimenu>Settings</guimenu> Menu</title> + <title>The Settings Menu</title> <variablelist> <anchor id="settings-set-script-language" /> <varlistentry> @@ -527,8 +530,10 @@ </sect2> <sect2 id="the-help-menu"> - <title>The <guimenu>Help</guimenu> Menu</title> - &help.menu.documentation; + <title>The Help Menu</title> +<para>&kturtle; has a default &kde; <guimenu>Help</guimenu> menu as described in the +<ulink url="help:/fundamentals/ui.html#menus-help">&kde; Fundamentals</ulink> +with one additional entry:</para> <variablelist> <anchor id="help-context-help" /> <varlistentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kturtle-16.04.3/src/CMakeLists.txt new/kturtle-16.08.0/src/CMakeLists.txt --- old/kturtle-16.04.3/src/CMakeLists.txt 2016-03-15 21:41:26.000000000 +0100 +++ new/kturtle-16.08.0/src/CMakeLists.txt 2016-06-25 18:02:43.000000000 +0200 @@ -1,5 +1,3 @@ -include_directories(${CMAKE_SOURCE_DIR}/kturtle/interpreter) - set(kturtle_SRCS canvas.cpp colorpicker.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kturtle-16.04.3/src/editor.cpp new/kturtle-16.08.0/src/editor.cpp --- old/kturtle-16.04.3/src/editor.cpp 2016-03-15 21:41:26.000000000 +0100 +++ new/kturtle-16.08.0/src/editor.cpp 2016-06-25 18:02:43.000000000 +0200 @@ -28,6 +28,7 @@ #include <QSaveFile> #include <QTemporaryFile> #include <QTextStream> +#include <QBuffer> #include <KFind> #include <KLocalizedString> @@ -125,7 +126,7 @@ if (newFile()) { setContent(example); editor->document()->setModified(false); - setCurrentUrl(exampleName); + setCurrentUrl(QUrl::fromLocalFile(exampleName)); } } @@ -160,34 +161,27 @@ url = QFileDialog::getOpenFileUrl(this, i18n("Open"), QUrl(), - QString("%1 (.*turtle);;%2 (*)").arg(i18n("Turtle code files")).arg(i18n("All files")) + QString("%1 (*.turtle);;%2 (*)").arg(i18n("Turtle code files")).arg(i18n("All files")) ); } if (!url.isEmpty()) { -// if (!KIO::NetAccess::exists(url, KIO::NetAccess::SourceSide, this)) { -// KMessageBox::error(this, i18n("The given file could not be read, check if it exists and if it is readable for the current user.")); -// return false; -// } - QString fileString; // could be a tmp file or local file - KIO::StoredTransferJob *job = KIO::storedGet(url); + KIO::StoredTransferJob *job = KIO::storedGet(url); if (job->exec()) { - QFile file(job->url().toLocalFile()); - if (!file.open(QFile::ReadOnly | QFile::Text)) { - KMessageBox::error(this, i18n("Cannot read %1", fileString)); - return false; + QByteArray data = job->data(); + QBuffer buffer(&data); + if (!buffer.open(QIODevice::ReadOnly | QIODevice::Text)) { + return false; // can't happen } - QTextStream in(&file); + QTextStream in(&buffer); // check for our magic identifier QString s; s = in.readLine(); if (s != KTURTLE_MAGIC_1_0) { - KMessageBox::error(this, i18n("The file you try to open is not a valid KTurtle script, or is incompatible with this version of KTurtle.\nCannot open %1", fileString)); + KMessageBox::error(this, i18n("The file you try to open is not a valid KTurtle script, or is incompatible with this version of KTurtle.\nCannot open %1", url.toDisplayString(QUrl::PreferLocalFile))); return false; } - QString localizedScript; - localizedScript = Translator::instance()->localizeScript(in.readAll()); + QString localizedScript = Translator::instance()->localizeScript(in.readAll()); setContent(localizedScript); - QFile::remove(fileString); setCurrentUrl(url); editor->document()->setModified(false); emit fileOpened(url); @@ -267,7 +261,7 @@ QUrl url = QFileDialog::getSaveFileUrl(this, i18n("Save As"), QUrl(), - QString("%1 (.*turtle);;%2 (*)").arg(i18n("Turtle code files")).arg(i18n("All files")) + QString("%1 (*.turtle);;%2 (*)").arg(i18n("Turtle code files")).arg(i18n("All files")) ); if (url.isEmpty()) return false; KIO::StatJob *job = KIO::stat(url, KIO::StatJob::SourceSide, 0); @@ -347,7 +341,7 @@ void Editor::setCurrentUrl(const QUrl &url) { - m_currentUrl = QUrl(url); + m_currentUrl = url; emit contentNameChanged(m_currentUrl.fileName()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kturtle-16.04.3/src/mainwindow.cpp new/kturtle-16.08.0/src/mainwindow.cpp --- old/kturtle-16.04.3/src/mainwindow.cpp 2016-03-15 21:41:26.000000000 +0100 +++ new/kturtle-16.08.0/src/mainwindow.cpp 2016-06-25 18:02:43.000000000 +0200 @@ -741,8 +741,6 @@ QAction* action = qobject_cast<QAction*>(sender()); QString exampleFilename = action->data().toString(); editor->openFile(QUrl::fromLocalFile(exampleFilename)); - QFileInfo fileInfo(exampleFilename); - editor->setCurrentUrl(fileInfo.baseName()); } void MainWindow::toggleOverwriteMode(bool b)

1 0

commit ktuberling for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package ktuberling for openSUSE:Factory checked in at 2016-08-31 00:08:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktuberling (Old) and /work/SRC/openSUSE:Factory/.ktuberling.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ktuberling" Changes: -------- --- /work/SRC/openSUSE:Factory/ktuberling/ktuberling.changes 2016-07-24 19:48:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ktuberling.new/ktuberling.changes 2016-08-31 00:08:44.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:27:23 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:31:23 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- ktuberling-16.04.3.tar.xz New: ---- ktuberling-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktuberling.spec ++++++ --- /var/tmp/diff_new_pack.pLt3vh/_old 2016-08-31 00:08:45.000000000 +0200 +++ /var/tmp/diff_new_pack.pLt3vh/_new 2016-08-31 00:08:45.000000000 +0200 @@ -42,7 +42,7 @@ License: GPL-2.0+ Group: Amusements/Toys/Other Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: ktuberling-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ ktuberling-16.04.3.tar.xz -> ktuberling-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktuberling-16.04.3/CMakeLists.txt new/ktuberling-16.08.0/CMakeLists.txt --- old/ktuberling-16.04.3/CMakeLists.txt 2016-05-10 22:40:20.000000000 +0200 +++ new/ktuberling-16.08.0/CMakeLists.txt 2016-08-03 14:31:34.000000000 +0200 @@ -30,7 +30,7 @@ include(ECMAddAppIcon) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) add_definitions(${QT_DEFINITIONS}) Files old/ktuberling-16.04.3/doc/button-new.png and new/ktuberling-16.08.0/doc/button-new.png differ Files old/ktuberling-16.04.3/doc/button-open.png and new/ktuberling-16.08.0/doc/button-open.png differ Files old/ktuberling-16.04.3/doc/button-print.png and new/ktuberling-16.08.0/doc/button-print.png differ Files old/ktuberling-16.04.3/doc/button-save.png and new/ktuberling-16.08.0/doc/button-save.png differ Files old/ktuberling-16.04.3/doc/document-new.png and new/ktuberling-16.08.0/doc/document-new.png differ Files old/ktuberling-16.04.3/doc/document-open.png and new/ktuberling-16.08.0/doc/document-open.png differ Files old/ktuberling-16.04.3/doc/document-print.png and new/ktuberling-16.08.0/doc/document-print.png differ Files old/ktuberling-16.04.3/doc/document-save.png and new/ktuberling-16.08.0/doc/document-save.png differ Files old/ktuberling-16.04.3/doc/edit-redo.png and new/ktuberling-16.08.0/doc/edit-redo.png differ Files old/ktuberling-16.04.3/doc/edit-undo.png and new/ktuberling-16.08.0/doc/edit-undo.png differ Files old/ktuberling-16.04.3/doc/gameboard.png and new/ktuberling-16.08.0/doc/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktuberling-16.04.3/doc/index.docbook new/ktuberling-16.08.0/doc/index.docbook --- old/ktuberling-16.04.3/doc/index.docbook 2016-05-10 22:40:20.000000000 +0200 +++ new/ktuberling-16.08.0/doc/index.docbook 2016-08-03 14:31:34.000000000 +0200 @@ -1,7 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&ktuberling;"> - <!ENTITY package "kdegames"> <!ENTITY technical.reference SYSTEM "technical-reference.docbook"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE" >  @@ -37,8 +35,8 @@ </authorgroup> -<date>2013-05-06</date> -<releaseinfo>0.8.0 (&kde; 4.11)</releaseinfo> +<date>2016-05-11</date> +<releaseinfo>1.0.0 (Applications 16.04)</releaseinfo> <copyright> <year>1999</year><year>2000</year><year>2002</year><year>2006</year> @@ -78,6 +76,18 @@ <title>Introduction</title> <para>Gametype: Toy</para> <para>Number of possible players: One</para> + +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="ktuberling-pizzeria.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>Pizzeria Playground</phrase> +</textobject> +</mediaobject> +</screenshot> + <para> &ktuberling; a simple constructor game suitable for children and adults alike. The idea of the game is based around a once popular doll making concept. A potato was decorated with various small artifacts to make it look more like a tiny person. &ktuberling; however, goes much further in terms of content and adds a surprising variety of different themes. </para> @@ -87,9 +97,6 @@ <title>How to Play</title> <para> - &ktuberling; is a game intended for small children. Of course, it may be suitable for adults who have remained young at heart. </para> @@ -179,13 +186,6 @@ <sect1 id="the-tool-bar"> <title>The Tool Bar</title> -<mediaobject> -<imageobject> -<imagedata format="PNG" fileref="toolbar.png"/> -</imageobject> -<textobject><phrase>Toolbar</phrase></textobject> -</mediaobject> - <para> The toolbar provides buttons for the commonly used functions. </para> @@ -208,7 +208,7 @@ <entry> <inlinemediaobject> <imageobject> - <imagedata format="PNG" fileref="button-new.png"/> + <imagedata format="PNG" fileref="document-new.png"/> </imageobject> <textobject><phrase>New Game Button</phrase></textobject> </inlinemediaobject> @@ -231,7 +231,7 @@ <entry> <inlinemediaobject> <imageobject> - <imagedata format="PNG" fileref="button-open.png"/> + <imagedata format="PNG" fileref="document-open.png"/> </imageobject> <textobject><phrase>Load Button</phrase></textobject> </inlinemediaobject> @@ -251,7 +251,7 @@ <entry> <inlinemediaobject> <imageobject> - <imagedata format="PNG" fileref="button-save.png"/> + <imagedata format="PNG" fileref="document-save.png"/> </imageobject> <textobject><phrase>Save Button</phrase></textobject> </inlinemediaobject> @@ -274,7 +274,7 @@ <entry> <inlinemediaobject> <imageobject> - <imagedata format="PNG" fileref="button-print.png"/> + <imagedata format="PNG" fileref="document-print.png"/> </imageobject> <textobject><phrase>Print Button</phrase></textobject> </inlinemediaobject> @@ -333,26 +333,6 @@ Re-does last operation.</entry> </row> - - </tbody> </tgroup> </table> @@ -362,13 +342,7 @@ <title>The Menu Items</title> <sect2> -<title>The <guimenu>Game</guimenu> Menu</title> -<mediaobject> -<imageobject> -<imagedata format="PNG" fileref="menu-game.png"/> -</imageobject> -<textobject><phrase><guimenu>Game</guimenu> Menu</phrase></textobject> -</mediaobject> +<title>The Game Menu</title> <variablelist> @@ -448,13 +422,7 @@ </sect2> <sect2> -<title>The <guimenu>Edit</guimenu> Menu</title> -<mediaobject> -<imageobject> -<imagedata format="PNG" fileref="menu-edit.png"/> -</imageobject> -<textobject><phrase>Edit Menu</phrase></textobject> -</mediaobject> +<title>The Edit Menu</title> <variablelist> @@ -503,7 +471,7 @@ </sect2> <sect2> -<title>The <guimenu>Playground</guimenu> Menu</title> +<title>The Playground Menu</title> <variablelist> @@ -538,9 +506,10 @@ </sect2> <sect2> -<title>The <guimenu>Speech</guimenu> Menu</title> +<title>The Speech Menu</title> - @@ -573,13 +542,7 @@ </sect2> <sect2 id="settings"> -<title>The <guimenu>Settings</guimenu> Menu</title> -<mediaobject> -<imageobject> -<imagedata format="PNG" fileref="menu-settings.png"/> -</imageobject> -<textobject><phrase>Settings Menu</phrase></textobject> -</mediaobject> +<title>The Settings Menu</title> <variablelist> Files old/ktuberling-16.04.3/doc/ktuberling-pizzeria.png and new/ktuberling-16.08.0/doc/ktuberling-pizzeria.png differ Files old/ktuberling-16.04.3/doc/ktuberling.png and new/ktuberling-16.08.0/doc/ktuberling.png differ Files old/ktuberling-16.04.3/doc/menu-edit.png and new/ktuberling-16.08.0/doc/menu-edit.png differ Files old/ktuberling-16.04.3/doc/menu-game.png and new/ktuberling-16.08.0/doc/menu-game.png differ Files old/ktuberling-16.04.3/doc/menu-settings.png and new/ktuberling-16.08.0/doc/menu-settings.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktuberling-16.04.3/doc/technical-reference.docbook new/ktuberling-16.08.0/doc/technical-reference.docbook --- old/ktuberling-16.04.3/doc/technical-reference.docbook 2016-05-10 22:40:20.000000000 +0200 +++ new/ktuberling-16.08.0/doc/technical-reference.docbook 2016-08-03 14:31:34.000000000 +0200 @@ -9,8 +9,8 @@  </authorgroup> -<date>2009-12-15</date> -<releaseinfo>0.6.0</releaseinfo> +<date>2016-05-11</date> +<releaseinfo>1.0.0 (Applications 16.04)</releaseinfo> <keywordset> <keyword>KDE</keyword> @@ -29,7 +29,7 @@ native tongue! </para> -<para> +<para> If you extend or add to the game please consider sending your additions to the maintainer <ulink url="mailto:alex@eyeos.org">Alex Fiestas</ulink> for inclusion in future releases. @@ -140,10 +140,11 @@ <listitem><para>Add the sound files and the .soundtheme files to the data/kdegames/ktuberling directory of your language translations.</para></listitem> <listitem><para>On that very same dir you need a CMakeLists.txt describing how to install the files, typically it will be.</para> + <programlisting> -FILE(GLOB datafiles *.ogg) -install( FILES ${datafiles} DESTINATION ${DATA_INSTALL_DIR}/ktuberling/sounds/<replaceable>yourLanguageTwoLetterCode</replaceable> ) -install( FILES <replaceable>yourLanguageTwoLetterCode</replaceable>.soundtheme DESTINATION ${DATA_INSTALL_DIR}/ktuberling/sounds/ ) +FILE( GLOB oggfiles *.ogg ) +INSTALL( FILES ${oggfiles} DESTINATION ${KDE_INSTALL_DATADIR}/ktuberling/sounds/<replaceable>yourLanguageTwoLetterCode</replaceable> ) +INSTALL( FILES <replaceable>yourLanguageTwoLetterCode</replaceable>.soundtheme DESTINATION ${KDE_INSTALL_DATADIR}/ktuberling/sounds/ ) </programlisting> </listitem> </itemizedlist> @@ -152,8 +153,8 @@ <listitem> <para>If you want to install it for yourself:</para> <itemizedlist> -<listitem><para>Place <replaceable>yourLanguageTwoLetterCode</replaceable>.soundtheme file in `kde4-config --prefix`/share/apps/ktuberling/sounds</para></listitem> -<listitem><para>Place yourSoundFiles in `kde4-config --prefix`/share/apps/ktuberling/sounds/someUniquePath</para></listitem> +<listitem><para>Place <replaceable>yourLanguageTwoLetterCode</replaceable>.soundtheme file in `kf5-config --prefix`/share/apps/ktuberling/sounds</para></listitem> +<listitem><para>Place yourSoundFiles in `kf5-config --prefix`/share/apps/ktuberling/sounds/someUniquePath</para></listitem> </itemizedlist> </listitem> Files old/ktuberling-16.04.3/doc/toolbar.png and new/ktuberling-16.08.0/doc/toolbar.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktuberling-16.04.3/org.kde.ktuberling.desktop new/ktuberling-16.08.0/org.kde.ktuberling.desktop --- old/ktuberling-16.04.3/org.kde.ktuberling.desktop 2016-05-10 22:40:20.000000000 +0200 +++ new/ktuberling-16.08.0/org.kde.ktuberling.desktop 2016-08-03 14:31:34.000000000 +0200 @@ -126,6 +126,7 @@ Comment[ca@valencia]=Un joc de construcció senzill, adequat per nens i també per adults Comment[da]=En simpelt byggeprogram til børn i alle aldre Comment[de]=Ein einfaches Aufbauspiel für Kinder und Erwachsene +Comment[el]=Ένα απλό παιχνίδι κατασκευών κατάλληλο για παιδιά και μεγάλους Comment[en_GB]=A simple constructor game suitable for children and adults alike Comment[es]=Un sencillo juego de construcción adecuado para niños y para adultos Comment[et]=Lihtne konstrueerimismäng, mis sobib nii lastele kui ka täiskasvanutele diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktuberling-16.04.3/playground.cpp new/ktuberling-16.08.0/playground.cpp --- old/ktuberling-16.04.3/playground.cpp 2016-05-10 22:40:20.000000000 +0200 +++ new/ktuberling-16.08.0/playground.cpp 2016-08-03 14:31:34.000000000 +0200 @@ -67,7 +67,7 @@ // Reset the play ground void PlayGround::reset() { - + foreach(QGraphicsItem *item, scene()->items()) { ToDraw *currentObject = qgraphicsitem_cast<ToDraw *>(item); @@ -317,7 +317,7 @@ void PlayGround::registerPlayGrounds() { QSet<QString> list; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::DataLocation, QStringLiteral("pics"), QStandardPaths::LocateDirectory); + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::AppDataLocation, QStringLiteral("pics"), QStandardPaths::LocateDirectory); Q_FOREACH (const QString &dir, dirs) { const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.theme")); @@ -336,7 +336,7 @@ if (layoutDocument.setContent(&layoutFile)) { QString desktop = layoutDocument.documentElement().attribute(QStringLiteral( "desktop" )); - KConfig c( QStandardPaths::locate(QStandardPaths::DataLocation, QLatin1String( "pics/" ) + desktop ) ); + KConfig c( QStandardPaths::locate(QStandardPaths::AppDataLocation, QLatin1String( "pics/" ) + desktop ) ); KConfigGroup cg = c.group("KTuberlingTheme"); QString gameboard = layoutDocument.documentElement().attribute(QStringLiteral( "gameboard" )); QPixmap pixmap(200,100); @@ -350,7 +350,7 @@ void PlayGround::playGroundPixmap(const QString &playgroundName, QPixmap &pixmap) { - m_SvgRenderer.load(QStandardPaths::locate(QStandardPaths::DataLocation, QLatin1String( "pics/" ) + playgroundName )); + m_SvgRenderer.load(QStandardPaths::locate(QStandardPaths::AppDataLocation, QLatin1String( "pics/" ) + playgroundName )); QPainter painter(&pixmap); m_SvgRenderer.render(&painter,QStringLiteral( "background" )); } @@ -382,7 +382,7 @@ if (!bgColor.isValid()) bgColor = Qt::white; - if (!m_SvgRenderer.load(QStandardPaths::locate(QStandardPaths::DataLocation, QLatin1String( "pics/" ) + gameboardName ))) + if (!m_SvgRenderer.load(QStandardPaths::locate(QStandardPaths::AppDataLocation, QLatin1String( "pics/" ) + gameboardName ))) return false; objectsList = playGroundElement.elementsByTagName(QStringLiteral( "object" )); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktuberling-16.04.3/playground.h new/ktuberling-16.08.0/playground.h --- old/ktuberling-16.04.3/playground.h 2016-05-10 22:40:20.000000000 +0200 +++ new/ktuberling-16.08.0/playground.h 2016-08-03 14:31:34.000000000 +0200 @@ -32,7 +32,7 @@ Q_OBJECT public: - PlayGround(TopLevel *parent); + explicit PlayGround(TopLevel *parent); ~PlayGround(); enum LoadError { NoError, OldFileVersionError, OtherError }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktuberling-16.04.3/playgrounddelegate.h new/ktuberling-16.08.0/playgrounddelegate.h --- old/ktuberling-16.04.3/playgrounddelegate.h 2016-05-10 22:40:20.000000000 +0200 +++ new/ktuberling-16.08.0/playgrounddelegate.h 2016-08-03 14:31:34.000000000 +0200 @@ -19,13 +19,13 @@ #ifndef PLAYGROUNDDELEGATE_H #define PLAYGROUNDDELEGATE_H -#include <QtWidgets/QAbstractItemDelegate> +#include <QAbstractItemDelegate> #include <QAbstractItemView> class PlaygroundDelegate : public QAbstractItemDelegate { public: - PlaygroundDelegate(QObject *parent = 0); + explicit PlaygroundDelegate(QObject *parent = 0); private: virtual QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const; virtual void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktuberling-16.04.3/soundfactory.cpp new/ktuberling-16.08.0/soundfactory.cpp --- old/ktuberling-16.04.3/soundfactory.cpp 2016-05-10 22:40:20.000000000 +0200 +++ new/ktuberling-16.08.0/soundfactory.cpp 2016-08-03 14:31:34.000000000 +0200 @@ -51,7 +51,7 @@ if (!namesList[sound].compare(soundRef)) break; if (sound == sounds) return; - soundFile = QStandardPaths::locate(QStandardPaths::DataLocation, QLatin1String( "sounds/" ) + filesList[sound]); + soundFile = QStandardPaths::locate(QStandardPaths::AppDataLocation, QLatin1String( "sounds/" ) + filesList[sound]); if (soundFile.isEmpty()) return; //printf("%s\n", (const char *) soundFile); @@ -63,7 +63,7 @@ void SoundFactory::registerLanguages() { QSet<QString> list; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::DataLocation, QStringLiteral("sounds"), QStandardPaths::LocateDirectory); + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::AppDataLocation, QStringLiteral("sounds"), QStandardPaths::LocateDirectory); Q_FOREACH (const QString &dir, dirs) { const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.soundtheme")); @@ -82,7 +82,7 @@ if (document.setContent(&file)) { QString code = document.documentElement().attribute(QStringLiteral( "code" )); - bool enabled = !(QStandardPaths::locate(QStandardPaths::DataLocation, QLatin1String( "sounds/" ) + code + QLatin1Char( '/' ), QStandardPaths::LocateDirectory).isEmpty()); + bool enabled = !(QStandardPaths::locate(QStandardPaths::AppDataLocation, QLatin1String( "sounds/" ) + code + QLatin1Char( '/' ), QStandardPaths::LocateDirectory).isEmpty()); topLevel->registerLanguage(code, soundTheme, enabled); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktuberling-16.04.3/soundfactory.h new/ktuberling-16.08.0/soundfactory.h --- old/ktuberling-16.04.3/soundfactory.h 2016-05-10 22:40:20.000000000 +0200 +++ new/ktuberling-16.08.0/soundfactory.h 2016-08-03 14:31:34.000000000 +0200 @@ -26,7 +26,7 @@ { public: - SoundFactory(TopLevel *parent); + explicit SoundFactory(TopLevel *parent); ~SoundFactory(); bool loadLanguage(const QString &selectedLanguageFile); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktuberling-16.04.3/toplevel.cpp new/ktuberling-16.08.0/toplevel.cpp --- old/ktuberling-16.04.3/toplevel.cpp 2016-05-10 22:40:20.000000000 +0200 +++ new/ktuberling-16.08.0/toplevel.cpp 2016-08-03 14:31:34.000000000 +0200 @@ -142,7 +142,7 @@ QFileInfo fi(newGameBoard); if (fi.isRelative()) { - fileToLoad = QStandardPaths::locate(QStandardPaths::DataLocation, QLatin1String( "pics/" ) + newGameBoard); + fileToLoad = QStandardPaths::locate(QStandardPaths::AppDataLocation, QLatin1String( "pics/" ) + newGameBoard); } else { @@ -189,7 +189,7 @@ QFileInfo fi(soundFile); if (fi.isRelative()) { - fileToLoad = QStandardPaths::locate(QStandardPaths::DataLocation, QLatin1String( "sounds/" ) + soundFile); + fileToLoad = QStandardPaths::locate(QStandardPaths::AppDataLocation, QLatin1String( "sounds/" ) + soundFile); } else {

1 0

commit ktp-call-ui for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package ktp-call-ui for openSUSE:Factory checked in at 2016-08-31 00:08:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktp-call-ui (Old) and /work/SRC/openSUSE:Factory/.ktp-call-ui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ktp-call-ui" Changes: -------- --- /work/SRC/openSUSE:Factory/ktp-call-ui/ktp-call-ui.changes 2016-07-24 19:48:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ktp-call-ui.new/ktp-call-ui.changes 2016-08-31 00:08:42.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:27:14 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:30:58 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- ktp-call-ui-16.04.3.tar.xz New: ---- ktp-call-ui-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktp-call-ui.spec ++++++ --- /var/tmp/diff_new_pack.PQdUUg/_old 2016-08-31 00:08:43.000000000 +0200 +++ /var/tmp/diff_new_pack.PQdUUg/_new 2016-08-31 00:08:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: ktp-call-ui -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Voice/Video Call UI for Telepathy License: GPL-2.0+ ++++++ ktp-call-ui-16.04.3.tar.xz -> ktp-call-ui-16.08.0.tar.xz ++++++

1 0

commit ktouch for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package ktouch for openSUSE:Factory checked in at 2016-08-31 00:08:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktouch (Old) and /work/SRC/openSUSE:Factory/.ktouch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ktouch" Changes: -------- --- /work/SRC/openSUSE:Factory/ktouch/ktouch.changes 2016-07-24 19:48:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ktouch.new/ktouch.changes 2016-08-31 00:08:40.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:25:47 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:26:29 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- ktouch-16.04.3.tar.xz New: ---- ktouch-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktouch.spec ++++++ --- /var/tmp/diff_new_pack.oS66sd/_old 2016-08-31 00:08:41.000000000 +0200 +++ /var/tmp/diff_new_pack.oS66sd/_new 2016-08-31 00:08:41.000000000 +0200 @@ -17,7 +17,7 @@ Name: ktouch -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Touch Typing Tutor License: GPL-2.0+ ++++++ ktouch-16.04.3.tar.xz -> ktouch-16.08.0.tar.xz ++++++

1 0

commit ktimer for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package ktimer for openSUSE:Factory checked in at 2016-08-31 00:08:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktimer (Old) and /work/SRC/openSUSE:Factory/.ktimer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ktimer" Changes: -------- --- /work/SRC/openSUSE:Factory/ktimer/ktimer.changes 2016-07-24 19:48:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ktimer.new/ktimer.changes 2016-08-31 00:08:39.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:25:31 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:25:42 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- ktimer-16.04.3.tar.xz New: ---- ktimer-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktimer.spec ++++++ --- /var/tmp/diff_new_pack.EqyQdl/_old 2016-08-31 00:08:40.000000000 +0200 +++ /var/tmp/diff_new_pack.EqyQdl/_new 2016-08-31 00:08:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: ktimer -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Countdown Launcher License: GPL-2.0+ @@ -62,9 +62,8 @@ %defattr(-,root,root) %doc COPYING %_kf5_bindir/ktimer -%_kf5_htmldir/en/ktimer/ %_kf5_applicationsdir/org.kde.ktimer.desktop %_kf5_iconsdir/hicolor/*/*/*.png -%_kf5_htmldir/en/ktimer/ +%doc %lang(en) %_kf5_htmldir/en/ktimer/ %changelog ++++++ ktimer-16.04.3.tar.xz -> ktimer-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktimer-16.04.3/doc/index.docbook new/ktimer-16.08.0/doc/index.docbook --- old/ktimer-16.04.3/doc/index.docbook 2015-11-30 19:35:56.000000000 +0100 +++ new/ktimer-16.08.0/doc/index.docbook 2016-07-01 21:40:11.000000000 +0200 @@ -1,7 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&ktimer;"> - <!ENTITY package "kdeutils"> <!ENTITY A.L.Spehr "<personname><firstname>A. L.</firstname><surname>Spehr</surname></personname>"> <!ENTITY A.L.Spehr.email "<email>zahl+kde(a)transbay.net</email>"> <!ENTITY Stefan.Schimanski "<personname><firstname>Stefan</firstname><surname>Schimanski</surname></personname>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktimer-16.04.3/org.kde.ktimer.desktop new/ktimer-16.08.0/org.kde.ktimer.desktop --- old/ktimer-16.04.3/org.kde.ktimer.desktop 2015-11-30 19:35:56.000000000 +0100 +++ new/ktimer-16.08.0/org.kde.ktimer.desktop 2016-07-01 21:40:11.000000000 +0200 @@ -20,6 +20,7 @@ GenericName[fr]=Lanceur de compte à rebours GenericName[ga]=Tosaitheoir Comhairimh Síos GenericName[gl]=Iniciador en conta-atrás +GenericName[he]=טיימר GenericName[hne]=उलटी गिनती चालू करइया GenericName[hr]=Pokretač odbrojavanja GenericName[hu]=Visszaszámláló

1 0

commit kteatime for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kteatime for openSUSE:Factory checked in at 2016-08-31 00:08:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kteatime (Old) and /work/SRC/openSUSE:Factory/.kteatime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kteatime" Changes: -------- --- /work/SRC/openSUSE:Factory/kteatime/kteatime.changes 2016-07-24 19:48:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kteatime.new/kteatime.changes 2016-08-31 00:08:36.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:25:22 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:25:23 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kteatime-16.04.3.tar.xz New: ---- kteatime-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kteatime.spec ++++++ --- /var/tmp/diff_new_pack.doENzu/_old 2016-08-31 00:08:37.000000000 +0200 +++ /var/tmp/diff_new_pack.doENzu/_new 2016-08-31 00:08:37.000000000 +0200 @@ -37,7 +37,7 @@ License: GPL-2.0+ Group: Amusements/Toys/Other Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{name}-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ kteatime-16.04.3.tar.xz -> kteatime-16.08.0.tar.xz ++++++ Files old/kteatime-16.04.3/doc/config.png and new/kteatime-16.08.0/doc/config.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kteatime-16.04.3/doc/index.docbook new/kteatime-16.08.0/doc/index.docbook --- old/kteatime-16.04.3/doc/index.docbook 2016-05-16 13:45:52.000000000 +0200 +++ new/kteatime-16.08.0/doc/index.docbook 2016-07-06 13:43:15.000000000 +0200 @@ -1,7 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&kteatime;"> - <!ENTITY package "kdetoys"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> ]> @@ -33,8 +31,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2014-09-11</date> -<releaseinfo>1.2.2 (&kde; 4.14)</releaseinfo> +<date>2016-07-06</date> +<releaseinfo>1.3.0 (Applications 16.04)</releaseinfo> <abstract> <para>This Handbook describes &kteatime;, the &kde; Tea Cooker.</para> @@ -84,6 +82,9 @@ <title>Select Your Tea</title> <para>Clicking on the icon with the &RMB; will bring up a menu. At the top of the menu there are four menu items. Here, you can select what kind of tea you are preparing to drink. There are: <guimenuitem>Black Tea</guimenuitem>, <guimenuitem>Earl Grey</guimenuitem>, <guimenuitem>Fruit Tea</guimenuitem>, and <guimenuitem>Green Tea</guimenuitem>. These teas are preconfigured with a default time. Many people have complained that the times are not correct. Please be aware that the amount of time it takes to steep a cup of tea is based on personal preference. The times chosen are approximations. If you read on, you will learn how to change or delete these predefined times and to set your own time. A quick-and-easy way to set a custom time is to choose <guimenuitem>Anonymous...</guimenuitem> from the menu.</para> + +<para>Clicking <guimenuitem>Configure Notifications...</guimenuitem> brings up the &kde; Notification Settings for &kteatime;.</para> + </sect1> <sect1 id="start"> @@ -109,7 +110,7 @@ <para>As shown in the picture, you may add new entries for other tea or change names, times and the order of existing entries. This is useful if you are brewing a cup of tea that is not on the list or if you do not agree with the predefined times. To edit one entry, mark it in the <guilabel>Tea List</guilabel> on the left and change the values in the <guilabel>Tea Properties</guilabel> on the right.</para> <para>The box below is the <guilabel>Action</guilabel> field. Here you can define an action that will be executed when the time is up. If <guilabel>Popup</guilabel> is selected, a message box will appear alerting you to the fact that your tea is ready. -The button <guibutton>Configure Notifications...</guibutton> brings up the &kde; Notification Settings for &kteatime;.</para> +</para> <para>If you enable the check box labeled <guilabel>Visualize progress in icon tray</guilabel>, the progress will be shown as a little animated clock inside the icon.</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kteatime-16.04.3/src/toplevel.cpp new/kteatime-16.08.0/src/toplevel.cpp --- old/kteatime-16.04.3/src/toplevel.cpp 2016-05-16 13:45:52.000000000 +0200 +++ new/kteatime-16.08.0/src/toplevel.cpp 2016-07-06 13:43:15.000000000 +0200 @@ -48,7 +48,7 @@ m_runningTeaTime( 0 ), m_nextNotificationTime( 0 ) { - setIconByName(icon); + setIconByPixmap(QIcon::fromTheme(icon)); setCategory(ApplicationStatus); setStatus(Active); KSharedConfigPtr config = KSharedConfig::openConfig();

1 0

commit ksystemlog for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package ksystemlog for openSUSE:Factory checked in at 2016-08-31 00:08:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksystemlog (Old) and /work/SRC/openSUSE:Factory/.ksystemlog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ksystemlog" Changes: -------- --- /work/SRC/openSUSE:Factory/ksystemlog/ksystemlog.changes 2016-07-24 19:48:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ksystemlog.new/ksystemlog.changes 2016-08-31 00:08:35.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:25:12 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:25:00 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- ksystemlog-16.04.3.tar.xz New: ---- ksystemlog-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksystemlog.spec ++++++ --- /var/tmp/diff_new_pack.TIVswQ/_old 2016-08-31 00:08:36.000000000 +0200 +++ /var/tmp/diff_new_pack.TIVswQ/_new 2016-08-31 00:08:36.000000000 +0200 @@ -26,7 +26,7 @@ BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: System Log Viewer Tool License: GPL-2.0 ++++++ ksystemlog-16.04.3.tar.xz -> ksystemlog-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksystemlog-16.04.3/.reviewboardrc new/ksystemlog-16.08.0/.reviewboardrc --- old/ksystemlog-16.04.3/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100 +++ new/ksystemlog-16.08.0/.reviewboardrc 2016-08-10 01:22:18.000000000 +0200 @@ -0,0 +1,2 @@ +REVIEWBOARD_URL = "https://git.reviewboard.kde.org" +REPOSITORY = 'git://anongit.kde.org/ksystemlog' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksystemlog-16.04.3/CMakeLists.txt new/ksystemlog-16.08.0/CMakeLists.txt --- old/ksystemlog-16.04.3/CMakeLists.txt 2016-07-06 16:58:23.000000000 +0200 +++ new/ksystemlog-16.08.0/CMakeLists.txt 2016-08-10 01:22:18.000000000 +0200 @@ -1,5 +1,11 @@ project(KSystemlog) +# KDE Application Version, managed by release script +set (KDE_APPLICATIONS_VERSION_MAJOR "16") +set (KDE_APPLICATIONS_VERSION_MINOR "08") +set (KDE_APPLICATIONS_VERSION_MICRO "0") +set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") + cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) set (QT_MIN_VERSION "5.2.0") set (KF5_MIN_VERSION "5.0.0") @@ -9,11 +15,15 @@ add_definitions(-DTRANSLATION_DOMAIN="ksystemlog") +include(ECMSetupVersion) include(KDEInstallDirs) include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(FeatureSummary) +ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX KSYSTEMLOG + VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/ksystemlog_version.h") + find_package (Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets @@ -49,7 +59,7 @@ set(CMAKE_REQUIRED_LIBRARIES ${KDEWIN32_LIBRARIES}) set(CMAKE_REQUIRED_INCLUDES ${KDEWIN32_INCLUDES}) endif(WIN32) -add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS -DQT_NO_URL_CAST_FROM_STRING) include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) # Help Eclipse to parse errors more efficiently diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksystemlog-16.04.3/cmake/FindJournald.cmake new/ksystemlog-16.08.0/cmake/FindJournald.cmake --- old/ksystemlog-16.04.3/cmake/FindJournald.cmake 2016-07-06 16:58:23.000000000 +0200 +++ new/ksystemlog-16.08.0/cmake/FindJournald.cmake 2016-08-10 01:22:18.000000000 +0200 @@ -15,7 +15,7 @@ # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) -pkg_check_modules(PC_JOURNALD QUIET libsystemd-journal) +pkg_check_modules(PC_JOURNALD QUIET systemd) set(JOURNALD_FOUND ${PC_JOURNALD_FOUND}) set(JOURNALD_DEFINITIONS ${PC_JOURNALD_CFLAGS_OTHER}) @@ -35,7 +35,7 @@ set(JOURNALD_LIBRARIES ${JOURNALD_LIBRARY}) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(BlueZ DEFAULT_MSG JOURNALD_LIBRARY JOURNALD_INCLUDE_DIR) +find_package_handle_standard_args(Journald DEFAULT_MSG JOURNALD_LIBRARY JOURNALD_INCLUDE_DIR) include(FeatureSummary) set_package_properties(Journald PROPERTIES URL https://github.com/systemd Files old/ksystemlog-16.04.3/doc/filter-process.png and new/ksystemlog-16.08.0/doc/filter-process.png differ Files old/ksystemlog-16.04.3/doc/first-opening.png and new/ksystemlog-16.08.0/doc/first-opening.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksystemlog-16.04.3/doc/index.docbook new/ksystemlog-16.08.0/doc/index.docbook --- old/ksystemlog-16.04.3/doc/index.docbook 2016-07-06 16:58:23.000000000 +0200 +++ new/ksystemlog-16.08.0/doc/index.docbook 2016-08-10 01:22:18.000000000 +0200 @@ -1,8 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ -<!ENTITY ksystemlog "<application>KSystemLog</application>"> -<!ENTITY kappname "&ksystemlog;"> -<!ENTITY package "kdeadmin"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> ]> @@ -30,11 +27,11 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2013-06-08</date> -<releaseinfo>0.4 (&kde; 4.11)</releaseinfo> +<date>2016-04-17</date> +<releaseinfo>0.4 (Applications 16.04)</releaseinfo> <abstract> -<para>&ksystemlog; is a system log viewer tool for &kde;. This program is developed for beginner users +<para>&ksystemlog; is a system log viewer tool by &kde;. This program is developed for beginner users who don't know how to find information about their system or where the log files are located. It is also designed for advanced users who want to quickly see problems occuring on their server. </para> @@ -55,7 +52,18 @@ </keywordset> </bookinfo> - + <chapter id="using_ksystemlog"> <title>Using &ksystemlog;</title> @@ -105,6 +113,7 @@ <listitem><simpara>Group by different criteria (log level, log file, process, hour, ...)</simpara></listitem> <listitem><simpara>Detailed information for each log lines</simpara></listitem> <listitem><simpara>Adding a log entry manually</simpara></listitem> + <listitem><simpara>Filtering by priority</simpara></listitem> </itemizedlist> <para> @@ -124,7 +133,7 @@ <listitem><simpara>Daemons logs</simpara></listitem> <listitem><simpara>Cron logs</simpara></listitem> <listitem><simpara>XSessions logs</simpara></listitem> - + <listitem><simpara>Systemd / Journald logs</simpara></listitem> </itemizedlist> <para> @@ -231,6 +240,13 @@ </para> </sect3> + <sect3 id="send_email"> + <title>Send logd via email</title> + <para> + The context menu has an action <guilabel>Send E-Mail selection</guilabel>. Select relevant lines in the log and use this action to open the composer window of your default email client prefilled with the selection. + </para> + + </sect3> </sect2> <sect2 id="monitoring_management"> <title>Monitoring Management</title> @@ -286,21 +302,6 @@ </chapter> -<appendix id="installation"> - <title>How to obtain and install &ksystemlog;</title> - - <para> - &ksystemlog; has its own home page <ulink url="http://ksystemlog.forum-software.org">http://ksystemlog.forum-software.org</ulink>. - Please refer to the instructions on the home page since they will contain up-to-date information about how to obtain &ksystemlog;. - </para> - - <para> - &ksystemlog; can also be found in the following folder of the &kde; Git Repository : - <ulink url="https://projects.kde.org/projects/kde/kdeadmin/ksystemlog">&ksystemlog; in the &kde; repository</ulink> - </para> - -</appendix> - &documentation.index; </book> Files old/ksystemlog-16.04.3/doc/main-screen.png and new/ksystemlog-16.08.0/doc/main-screen.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksystemlog-16.04.3/src/lib/logViewFilterWidget.cpp new/ksystemlog-16.08.0/src/lib/logViewFilterWidget.cpp --- old/ksystemlog-16.04.3/src/lib/logViewFilterWidget.cpp 2016-07-06 16:58:23.000000000 +0200 +++ new/ksystemlog-16.08.0/src/lib/logViewFilterWidget.cpp 2016-08-10 01:22:18.000000000 +0200 @@ -102,7 +102,7 @@ void LogViewWidgetSearchLine::setPriorityEnabled(int priority, bool enabled) { - if ((priority < 0) || (priority > Globals::LOG_LEVEL_NUM)) + if ((priority < 0) || (priority >= Globals::LOG_LEVEL_NUM)) return; d->priorities[priority] = enabled; updateSearch(QString()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksystemlog-16.04.3/src/main.cpp new/ksystemlog-16.08.0/src/main.cpp --- old/ksystemlog-16.04.3/src/main.cpp 2016-07-06 16:58:23.000000000 +0200 +++ new/ksystemlog-16.08.0/src/main.cpp 2016-08-10 01:22:18.000000000 +0200 @@ -25,6 +25,7 @@ #include <KAboutData> #include <KLocalizedString> +#include "ksystemlog_version.h" #include "mainWindow.h" #include "logging.h" @@ -39,7 +40,7 @@ KLocalizedString::setApplicationDomain("ksystemlog"); - KAboutData about(QStringLiteral("ksystemlog"), i18n("KSystemlog"), QStringLiteral("0.4"), + KAboutData about(QStringLiteral("ksystemlog"), i18n("KSystemlog"), QStringLiteral(KSYSTEMLOG_VERSION_STRING), i18n("System Logs Viewer for KDE"), KAboutLicense::GPL_V2, i18n("(C) 2007-2015, Nicolas Ternisien"), i18n("Do not hesitate to report bugs and problems to Nicolas Ternisien <a " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksystemlog-16.04.3/src/modes/base/fileListHelper.cpp new/ksystemlog-16.08.0/src/modes/base/fileListHelper.cpp --- old/ksystemlog-16.04.3/src/modes/base/fileListHelper.cpp 2016-07-06 16:58:23.000000000 +0200 +++ new/ksystemlog-16.08.0/src/modes/base/fileListHelper.cpp 2016-08-10 01:22:18.000000000 +0200 @@ -89,7 +89,7 @@ if (isValidFile(url)) { // If this Url uses a joker (i.e. : "/var/log/apache2/*") if (url.fileName().contains(QLatin1Char('*'))) { - const QStringList foundPaths = expandJoker(url.path()); + const QStringList foundPaths = expandJoker(url); logDebug() << "Found paths of " << url.path() << ":" << foundPaths; foreach (const QString &foundPath, foundPaths) { paths.append(foundPath); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksystemlog-16.04.3/src/modes/journald/journaldNetworkAnalyzer.cpp new/ksystemlog-16.08.0/src/modes/journald/journaldNetworkAnalyzer.cpp --- old/ksystemlog-16.04.3/src/modes/journald/journaldNetworkAnalyzer.cpp 2016-07-06 16:58:23.000000000 +0200 +++ new/ksystemlog-16.08.0/src/modes/journald/journaldNetworkAnalyzer.cpp 2016-08-10 01:22:18.000000000 +0200 @@ -276,7 +276,7 @@ break; } - request.setUrl(url); + request.setUrl(QUrl(url)); logDebug() << "Journal network analyzer requested" << url; m_reply = m_networkManager.get(request); connect(m_reply, &QNetworkReply::finished, this, &JournaldNetworkAnalyzer::httpFinished); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksystemlog-16.04.3/src/org.kde.ksystemlog.desktop new/ksystemlog-16.08.0/src/org.kde.ksystemlog.desktop --- old/ksystemlog-16.04.3/src/org.kde.ksystemlog.desktop 2016-07-06 16:58:23.000000000 +0200 +++ new/ksystemlog-16.08.0/src/org.kde.ksystemlog.desktop 2016-08-10 01:22:18.000000000 +0200 @@ -85,6 +85,7 @@ Comment[fr]=Outil d'affichage des journaux du système Comment[ga]=Amharcán ar logchomhaid an chórais Comment[gl]=Visor dos rexistros do sistema +Comment[he]=כלי לעיון ביומני מערכת Comment[hne]=तंत्र लाग प्रदर्सक औजार Comment[hr]=Alat za prikaz dnevnika sustava Comment[hu]=Rendszernapló-megjelenítő eszköz @@ -145,6 +146,7 @@ GenericName[fr]=Afficheur des journaux du système GenericName[ga]=Amharcán ar Logchomhaid an Chórais GenericName[gl]=Visor dos rexistros do sistema +GenericName[he]=מעיין ביומני מערכת GenericName[hr]=Preglednik sistemskih zapisa GenericName[hu]=Rendszernapló-megjelenítő GenericName[ia]=Visor de registro de systema

1 0

commit ksudoku for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package ksudoku for openSUSE:Factory checked in at 2016-08-31 00:08:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksudoku (Old) and /work/SRC/openSUSE:Factory/.ksudoku.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ksudoku" Changes: -------- --- /work/SRC/openSUSE:Factory/ksudoku/ksudoku.changes 2016-07-24 19:48:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ksudoku.new/ksudoku.changes 2016-08-31 00:08:33.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:25:02 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:24:33 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- ksudoku-16.04.3.tar.xz New: ---- ksudoku-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksudoku.spec ++++++ --- /var/tmp/diff_new_pack.v2nMTl/_old 2016-08-31 00:08:34.000000000 +0200 +++ /var/tmp/diff_new_pack.v2nMTl/_new 2016-08-31 00:08:34.000000000 +0200 @@ -24,7 +24,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: ksudoku-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ ksudoku-16.04.3.tar.xz -> ksudoku-16.08.0.tar.xz ++++++

1 0

commit kstars for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kstars for openSUSE:Factory checked in at 2016-08-31 00:08:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kstars (Old) and /work/SRC/openSUSE:Factory/.kstars.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kstars" Changes: -------- --- /work/SRC/openSUSE:Factory/kstars/kstars.changes 2016-07-24 19:48:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kstars.new/kstars.changes 2016-08-31 00:08:31.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Aug 12 10:24:40 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Tue Aug 9 09:09:34 UTC 2016 - wbauer(a)tmo.at + +- Cleanup build requirements + +------------------------------------------------------------------- +Mon Aug 8 15:23:50 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kstars-16.04.3.tar.xz New: ---- kstars-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kstars.spec ++++++ --- /var/tmp/diff_new_pack.wzKjyx/_old 2016-08-31 00:08:33.000000000 +0200 +++ /var/tmp/diff_new_pack.wzKjyx/_new 2016-08-31 00:08:33.000000000 +0200 @@ -17,7 +17,7 @@ Name: kstars -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Desktop Planetarium License: GPL-2.0+ @@ -38,28 +38,19 @@ BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5PrintSupport) -BuildRequires: pkgconfig(Qt5Multimedia) -BuildRequires: pkgconfig(Qt5Declarative) BuildRequires: pkgconfig(Qt5Test) BuildRequires: kconfig-devel +BuildRequires: kcrash-devel BuildRequires: kdoctools-devel -BuildRequires: kguiaddons-devel BuildRequires: kwidgetsaddons-devel BuildRequires: knewstuff-devel -BuildRequires: kdbusaddons-devel -BuildRequires: ki18n-devel -BuildRequires: kinit-devel -BuildRequires: kcrash-devel -BuildRequires: kjobwidgets-devel BuildRequires: knotifications-devel +BuildRequires: ki18n-devel BuildRequires: kio-devel -BuildRequires: kwindowsystem-devel BuildRequires: kxmlgui-devel BuildRequires: kplotting-devel -BuildRequires: ktexteditor-devel -BuildRequires: kiconthemes-devel Recommends: libindi Recommends: xplanet Obsoletes: %{name}5 < %{version} @@ -94,14 +85,12 @@ %{_kf5_applicationsdir}/org.kde.kstars.desktop %{_kf5_appsdir}/kstars/ %{_kf5_bindir}/kstars -%{_kf5_configdir}/kstars.knsrc %dir %{_kf5_configkcfgdir} %{_kf5_configkcfgdir}/kstars.kcfg %doc %{_kf5_htmldir}/en/kstars/ %{_kf5_iconsdir}/hicolor/*/*/* %dir %_datadir/appdata %_datadir/appdata/org.kde.kstars.appdata.xml -%_kf5_kxmlguidir/kstars/ %_kf5_notifydir/kstars.notifyrc %_datadir/sounds/ ++++++ kstars-16.04.3.tar.xz -> kstars-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kstars/kstars-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kstars.new/kstars-16.08.0.tar.xz differ: char 26, line 1

1 0

commit ksquares for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package ksquares for openSUSE:Factory checked in at 2016-08-31 00:08:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksquares (Old) and /work/SRC/openSUSE:Factory/.ksquares.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ksquares" Changes: -------- --- /work/SRC/openSUSE:Factory/ksquares/ksquares.changes 2016-07-24 19:48:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ksquares.new/ksquares.changes 2016-08-31 00:08:29.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:24:26 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:23:22 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- ksquares-16.04.3.tar.xz New: ---- ksquares-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksquares.spec ++++++ --- /var/tmp/diff_new_pack.xBlF3Q/_old 2016-08-31 00:08:30.000000000 +0200 +++ /var/tmp/diff_new_pack.xBlF3Q/_new 2016-08-31 00:08:30.000000000 +0200 @@ -43,7 +43,7 @@ License: GPL-2.0+ Group: Amusements/Games/Action/Arcade Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: ksquares-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ ksquares-16.04.3.tar.xz -> ksquares-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksquares-16.04.3/.gitignore new/ksquares-16.08.0/.gitignore --- old/ksquares-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ksquares-16.08.0/.gitignore 2016-06-14 19:42:12.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksquares-16.04.3/CMakeLists.txt new/ksquares-16.08.0/CMakeLists.txt --- old/ksquares-16.04.3/CMakeLists.txt 2016-03-10 11:18:54.000000000 +0100 +++ new/ksquares-16.08.0/CMakeLists.txt 2016-06-14 19:42:12.000000000 +0200 @@ -26,7 +26,7 @@ include(ECMAddAppIcon) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMAddTests) Files old/ksquares-16.04.3/doc/configure-display.png and new/ksquares-16.08.0/doc/configure-display.png differ Files old/ksquares-16.04.3/doc/gameboard.png and new/ksquares-16.08.0/doc/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksquares-16.04.3/doc/index.docbook new/ksquares-16.08.0/doc/index.docbook --- old/ksquares-16.04.3/doc/index.docbook 2016-03-10 11:18:54.000000000 +0100 +++ new/ksquares-16.08.0/doc/index.docbook 2016-06-14 19:42:12.000000000 +0200 @@ -1,9 +1,6 @@ <?xml version="1.0" ?>  <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&ksquares;"> - <!ENTITY kappversion "0.4"> - <!ENTITY package "kdegames">  <!ENTITY % English "INCLUDE" >  <!ENTITY % addindex "IGNORE">  ]> @@ -35,12 +32,12 @@ <holder>Matt Williams</holder> </copyright> <legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-05</date> -<releaseinfo>&kappversion;</releaseinfo> +<date>2016-05-10</date> +<releaseinfo>0.6 (Applications 16.04)</releaseinfo>  <abstract> - <para>This documentation describes the game of &ksquares; version &kappversion;</para> + <para>This documentation describes the game of &ksquares; version 0.6</para> </abstract>  @@ -67,7 +64,7 @@ <chapter id="introduction"><title>Introduction</title>  <note><title>Gametype:</title><para>Board</para></note> <note><title>Number of possible players:</title><para>Four</para></note> - <para>&ksquares; is a fun and exciting game for &kde; desktop environment. &ksquares; is modeled after the well known pen and paper based game of Dots and Boxes.</para> + <para>&ksquares; is a fun and exciting game by &kde;. &ksquares; is modeled after the well known pen and paper based game of Dots and Boxes.</para> <para>The idea behind &ksquares; is to construct squares by interconnecting the dots on the grid. Up to four players can play this game together, taking turns. The trick is – regardless of who has constructed most of the square, it is the player who completes the square that gets the point for it.</para> <para>To win the game round player has to collect the most points by covering the most area with the squares of player's own color.</para> </chapter> @@ -79,7 +76,18 @@ <para> At the start of the game, the game board is empty. There is simply a grid of dots showing where lines can be drawn. </para> -<note><title>Note:</title><para>Depending on the game difficulty chosen, the game field may already contain lines at the beginning of the game round.</para></note> + +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="gameboard.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&ksquares; Game Board</phrase> +</textobject> +</mediaobject> +</screenshot> + <para>Each player takes it in turns to draw a line between two adjacent dots on the board. By hovering the mouse over the game board, a yellow indicator line will show you where your line will be placed when you click. Once you have decided where you want to draw your line, click - and the line will be drawn. If by drawing a line, you completed a square then this square now belongs to you and earns you a point. Each time you complete a square, you must draw another line. If your line did not complete a square then the next player(s) take their turn. @@ -212,6 +220,16 @@ <chapter id="configuration"><title>Game Configuration</title>  <sect1 id="newgame-dialog"> <title>New Game Dialog</title> +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="newgame.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>New game</phrase> +</textobject> +</mediaobject> +</screenshot> <para>The <guilabel>New Game</guilabel> dialog consistes of the following groupboxes:</para> <variablelist> <varlistentry> @@ -230,6 +248,16 @@ </sect1> <sect1 id="configuration-dialog"> <title>Configuration Dialog</title> +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="configure-display.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>Configuration dialog</phrase> +</textobject> +</mediaobject> +</screenshot> <para>The <guilabel>Configure - &ksquares;</guilabel> dialog consists of the following tabs:</para> <variablelist> <varlistentry> @@ -264,20 +292,6 @@ &underGPL; </chapter> - -<appendix id="installation"> -<title>Installation</title> - -&install.intro.documentation; - - -<sect1 id="Compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> &documentation.index; </book> Files old/ksquares-16.04.3/doc/newgame.png and new/ksquares-16.08.0/doc/newgame.png differ

1 0

commit kspaceduel for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kspaceduel for openSUSE:Factory checked in at 2016-08-31 00:08:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kspaceduel (Old) and /work/SRC/openSUSE:Factory/.kspaceduel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kspaceduel" Changes: -------- --- /work/SRC/openSUSE:Factory/kspaceduel/kspaceduel.changes 2016-07-24 19:48:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kspaceduel.new/kspaceduel.changes 2016-08-31 00:08:27.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:24:19 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:23:04 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kspaceduel-16.04.3.tar.xz New: ---- kspaceduel-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kspaceduel.spec ++++++ --- /var/tmp/diff_new_pack.gnIzl5/_old 2016-08-31 00:08:28.000000000 +0200 +++ /var/tmp/diff_new_pack.gnIzl5/_new 2016-08-31 00:08:28.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: Amusements/Games/Action/Arcade Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kspaceduel-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kspaceduel-16.04.3.tar.xz -> kspaceduel-16.08.0.tar.xz ++++++

1 0

commit ksnakeduel for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package ksnakeduel for openSUSE:Factory checked in at 2016-08-31 00:08:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksnakeduel (Old) and /work/SRC/openSUSE:Factory/.ksnakeduel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ksnakeduel" Changes: -------- --- /work/SRC/openSUSE:Factory/ksnakeduel/ksnakeduel.changes 2016-07-24 19:48:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ksnakeduel.new/ksnakeduel.changes 2016-08-31 00:08:26.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:24:12 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:22:45 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- ksnakeduel-16.04.3.tar.xz New: ---- ksnakeduel-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksnakeduel.spec ++++++ --- /var/tmp/diff_new_pack.QwuZqg/_old 2016-08-31 00:08:27.000000000 +0200 +++ /var/tmp/diff_new_pack.QwuZqg/_new 2016-08-31 00:08:27.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: ksnakeduel-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ ksnakeduel-16.04.3.tar.xz -> ksnakeduel-16.08.0.tar.xz ++++++

1 0

commit ksirk for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package ksirk for openSUSE:Factory checked in at 2016-08-31 00:08:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksirk (Old) and /work/SRC/openSUSE:Factory/.ksirk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ksirk" Changes: -------- --- /work/SRC/openSUSE:Factory/ksirk/ksirk.changes 2016-07-24 19:48:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ksirk.new/ksirk.changes 2016-08-31 00:08:23.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:24:01 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:22:24 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- ksirk-16.04.3.tar.xz New: ---- ksirk-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksirk.spec ++++++ --- /var/tmp/diff_new_pack.tvn7y2/_old 2016-08-31 00:08:24.000000000 +0200 +++ /var/tmp/diff_new_pack.tvn7y2/_new 2016-08-31 00:08:24.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ and LGPL-2.0+ Group: Amusements/Games/Strategy/Turn Based Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: ksirk-%{version}.tar.xz BuildRequires: libkdegames4-devel ++++++ ksirk-16.04.3.tar.xz -> ksirk-16.08.0.tar.xz ++++++

1 0

commit kshisen for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kshisen for openSUSE:Factory checked in at 2016-08-31 00:08:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kshisen (Old) and /work/SRC/openSUSE:Factory/.kshisen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kshisen" Changes: -------- --- /work/SRC/openSUSE:Factory/kshisen/kshisen.changes 2016-07-24 19:48:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kshisen.new/kshisen.changes 2016-08-31 00:08:22.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Aug 12 23:19:18 UTC 2016 - wbauer(a)tmo.at + +- Cleanup build requirements + +------------------------------------------------------------------- +Fri Aug 12 10:23:52 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:22:04 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kshisen-16.04.3.tar.xz New: ---- kshisen-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kshisen.spec ++++++ --- /var/tmp/diff_new_pack.yWDUkW/_old 2016-08-31 00:08:23.000000000 +0200 +++ /var/tmp/diff_new_pack.yWDUkW/_new 2016-08-31 00:08:23.000000000 +0200 @@ -21,27 +21,20 @@ BuildRequires: libkmahjongg-devel BuildRequires: extra-cmake-modules BuildRequires: kconfig-devel -BuildRequires: kcoreaddons-devel -BuildRequires: kdeclarative-devel -BuildRequires: kdelibs4support-devel -BuildRequires: kdnssd-framework-devel -BuildRequires: knewstuff-devel +BuildRequires: kcrash-devel +BuildRequires: kdbusaddons-devel +BuildRequires: kdoctools-devel BuildRequires: kxmlgui-devel -BuildRequires: phonon4qt5-devel BuildRequires: update-desktop-files -BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Qml) -BuildRequires: pkgconfig(Qt5Quick) -BuildRequires: pkgconfig(Qt5QuickWidgets) -BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Test) BuildRequires: xz Summary: Shisen-Sho Mahjongg-like game License: GPL-2.0+ Group: Amusements/Games/Board/Other Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kshisen-%{version}.tar.xz Obsoletes: %{name}5 < %{version} @@ -76,7 +69,7 @@ %{_kf5_configkcfgdir}/ %{_kf5_sharedir}/sounds/kshisen/ %{_kf5_kxmlguidir}/ -%dir %_datadir/appdata -%_datadir/appdata/org.kde.kshisen.appdata.xml +%dir %{_kf5_appstreamdir} +%{_kf5_appstreamdir}/org.kde.kshisen.appdata.xml %changelog ++++++ kshisen-16.04.3.tar.xz -> kshisen-16.08.0.tar.xz ++++++ ++++ 3494 lines of diff (skipped)

1 0

commit kross-interpreters for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kross-interpreters for openSUSE:Factory checked in at 2016-08-31 00:08:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kross-interpreters (Old) and /work/SRC/openSUSE:Factory/.kross-interpreters.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kross-interpreters" Changes: -------- --- /work/SRC/openSUSE:Factory/kross-interpreters/kross-interpreters.changes 2016-07-24 19:48:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kross-interpreters.new/kross-interpreters.changes 2016-08-31 00:08:19.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:23:38 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:21:29 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kross-interpreters-16.04.3.tar.xz New: ---- kross-interpreters-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kross-interpreters.spec ++++++ --- /var/tmp/diff_new_pack.L77IL2/_old 2016-08-31 00:08:20.000000000 +0200 +++ /var/tmp/diff_new_pack.L77IL2/_new 2016-08-31 00:08:20.000000000 +0200 @@ -29,7 +29,7 @@ Summary: Diverse bindings for KROSS License: LGPL-2.1+ Group: Development/Libraries/KDE -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kross-interpreters-16.04.3.tar.xz -> kross-interpreters-16.08.0.tar.xz ++++++ ++++ 2902 lines of diff (skipped)

1 0

commit kreversi for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kreversi for openSUSE:Factory checked in at 2016-08-31 00:08:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kreversi (Old) and /work/SRC/openSUSE:Factory/.kreversi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kreversi" Changes: -------- --- /work/SRC/openSUSE:Factory/kreversi/kreversi.changes 2016-07-24 19:48:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kreversi.new/kreversi.changes 2016-08-31 00:08:18.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:23:24 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:20:56 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kreversi-16.04.3.tar.xz New: ---- kreversi-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kreversi.spec ++++++ --- /var/tmp/diff_new_pack.JRO283/_old 2016-08-31 00:08:19.000000000 +0200 +++ /var/tmp/diff_new_pack.JRO283/_new 2016-08-31 00:08:19.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Other Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kreversi-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kreversi-16.04.3.tar.xz -> kreversi-16.08.0.tar.xz ++++++

1 0

commit kremotecontrol for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kremotecontrol for openSUSE:Factory checked in at 2016-08-31 00:08:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kremotecontrol (Old) and /work/SRC/openSUSE:Factory/.kremotecontrol.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kremotecontrol" Changes: -------- --- /work/SRC/openSUSE:Factory/kremotecontrol/kremotecontrol.changes 2016-07-24 19:47:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kremotecontrol.new/kremotecontrol.changes 2016-08-31 00:08:15.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:23:16 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:20:37 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kremotecontrol-16.04.3.tar.xz New: ---- kremotecontrol-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kremotecontrol.spec ++++++ --- /var/tmp/diff_new_pack.QQASeg/_old 2016-08-31 00:08:16.000000000 +0200 +++ /var/tmp/diff_new_pack.QQASeg/_new 2016-08-31 00:08:16.000000000 +0200 @@ -17,7 +17,7 @@ Name: kremotecontrol -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: KDE Frontend for the Linux Infrared Remote Control system License: GPL-2.0+ ++++++ kremotecontrol-16.04.3.tar.xz -> kremotecontrol-16.08.0.tar.xz ++++++

1 0

commit kppp for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kppp for openSUSE:Factory checked in at 2016-08-31 00:08:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kppp (Old) and /work/SRC/openSUSE:Factory/.kppp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kppp" Changes: -------- --- /work/SRC/openSUSE:Factory/kppp/kppp.changes 2016-07-24 19:47:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kppp.new/kppp.changes 2016-08-31 00:08:14.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:22:53 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:19:44 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kppp-16.04.3.tar.xz New: ---- kppp-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kppp.spec ++++++ --- /var/tmp/diff_new_pack.bXvcRq/_old 2016-08-31 00:08:15.000000000 +0200 +++ /var/tmp/diff_new_pack.bXvcRq/_new 2016-08-31 00:08:15.000000000 +0200 @@ -18,7 +18,7 @@ Name: kppp BuildRequires: libkde4-devel -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Internet Dial-Up Tool License: GPL-2.0+ ++++++ kppp-16.04.3.tar.xz -> kppp-16.08.0.tar.xz ++++++

1 0

commit kpat for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kpat for openSUSE:Factory checked in at 2016-08-31 00:08:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpat (Old) and /work/SRC/openSUSE:Factory/.kpat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kpat" Changes: -------- --- /work/SRC/openSUSE:Factory/kpat/kpat.changes 2016-07-24 19:47:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kpat.new/kpat.changes 2016-08-31 00:08:12.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:22:36 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:19:07 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kpat-16.04.3.tar.xz New: ---- kpat-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpat.spec ++++++ --- /var/tmp/diff_new_pack.dhvUac/_old 2016-08-31 00:08:13.000000000 +0200 +++ /var/tmp/diff_new_pack.dhvUac/_new 2016-08-31 00:08:13.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Card Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kpat-%{version}.tar.xz BuildRequires: libkdegames-devel ++++++ kpat-16.04.3.tar.xz -> kpat-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-16.04.3/.gitignore new/kpat-16.08.0/.gitignore --- old/kpat-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kpat-16.08.0/.gitignore 2016-07-07 11:33:23.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-16.04.3/CMakeLists.txt new/kpat-16.08.0/CMakeLists.txt --- old/kpat-16.04.3/CMakeLists.txt 2016-03-20 14:02:02.000000000 +0100 +++ new/kpat-16.08.0/CMakeLists.txt 2016-07-07 11:33:23.000000000 +0200 @@ -30,7 +30,7 @@ include(ECMAddAppIcon) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) Files old/kpat-16.04.3/doc/clubs.png and new/kpat-16.08.0/doc/clubs.png differ Files old/kpat-16.04.3/doc/diamonds.png and new/kpat-16.08.0/doc/diamonds.png differ Files old/kpat-16.04.3/doc/hearts.png and new/kpat-16.08.0/doc/hearts.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-16.04.3/doc/index.docbook new/kpat-16.08.0/doc/index.docbook --- old/kpat-16.04.3/doc/index.docbook 2016-03-20 14:02:02.000000000 +0100 +++ new/kpat-16.08.0/doc/index.docbook 2016-07-07 11:33:23.000000000 +0200 @@ -1,16 +1,13 @@ <?xml version="1.0" ?>  <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&kpatience;"> - <!ENTITY kappversion "3.6"> - <!ENTITY package "kdegames">  <!ENTITY % English "INCLUDE" >  <!ENTITY % addindex "IGNORE">  ]> <book id="kpat" lang="&language;">  <bookinfo> - <title>The &kappname; Handbook</title>  + <title>The &kpatience; Handbook</title>    <authorgroup> @@ -65,12 +62,12 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2012-08-06</date> -<releaseinfo>&kappversion; (&kde; 4.9)</releaseinfo> +<date>2016-05-11</date> +<releaseinfo>3.6 (Applications 16.04)</releaseinfo>  <abstract> - <para>This documentation describes the game of &kappname; version &kappversion;</para> + <para>This documentation describes the game of &kpatience; version 3.6</para> </abstract>  @@ -119,7 +116,7 @@ <note><title>Objective:</title><para>Rearrange the cards by suit in as few moves as possible.</para></note>  <para> - As &kappname; offers you a multiplicity of different solitaire games, there is no straightforward how-to which could fit all of them. Therefore, it is essential that you read each individual subsection of Game Rules, Strategies and Tips section before you start playing a version you are not familiar with.</para> + As &kpatience; offers you a multiplicity of different solitaire games, there is no straightforward how-to which could fit all of them. Therefore, it is essential that you read each individual subsection of Game Rules, Strategies and Tips section before you start playing a version you are not familiar with.</para> <para> Essentially there are two types of solitaire games – the ones that let you arrange the cards by same color and the ones that let you arrange the cards by alternating color. You can easily determine which game you are trying out using trial-and-error method. Once you know which one you are dealing with the rest is easy; keep arranging and rearranging the cards and collecting the matching ones.</para> <para> @@ -178,7 +175,7 @@ </varlistentry> <varlistentry><term>3. Foundation</term> <listitem><para><indexterm><primary>foundation</primary></indexterm>The foundation piles are where you want your cards to end up. Typically, the game is one only once all cards have been moved to the foundation piles in the correct order. The number of foundation piles and the ordering required varies from game to game.</para> - <para>Most games start with the foundation piles empty. Choosing the <guimenuitem>Drop</guimenuitem> action from the menu or toolbar will cause &kpatience; to scan through all the piles move as many cards to the foundation piles as it can. If you have the <guimenuitem>Enabled Autodrop</guimenuitem> setting activated, &kpatience; will attempt to perform a drop whenever possible.</para> + <para>Most games start with the foundation piles empty. Choosing the <guimenuitem>Drop</guimenuitem> action from the menu or toolbar will cause &kpatience; to scan through all the piles move as many cards to the foundation piles as it can. If you have the <guimenuitem>Enabled Autodrop</guimenuitem> setting activated, &kpatience; will attempt to perform a drop whenever possible.</para> </listitem> </varlistentry> <varlistentry><term>4. Playing Piles</term> @@ -622,7 +619,7 @@ <term><menuchoice> <guimenu>Game</guimenu> <guisubmenu>Load Recent</guisubmenu> - <guimenuitem>List of recently accessed files.</guimenuitem> + <guimenuitem><replaceable>List of recently accessed files</replaceable></guimenuitem> </menuchoice></term> <listitem><para><action>List recently accessed save files in order of last use.</action> Selecting a game will load it. This action abandons the deal in progress.</para></listitem> </varlistentry> @@ -647,7 +644,7 @@ <guimenu>Game</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice></term> - <listitem><para><action>Quit</action> &kappname;.</para></listitem> + <listitem><para><action>Quit</action> &kpatience;.</para></listitem> </varlistentry> </variablelist> </sect1> @@ -712,14 +709,17 @@ </varlistentry> </variablelist> </sect1> -<sect1 id="settings-menu"> - <title>The Settings Menu</title> +<sect1 id="settings-help-menu"> + <title>The Settings and Help Menu</title> +<para>Apart from the common &kde; Settings and Help menus described in the <ulink url="help:/fundamentals/ui.html#menus">Menu</ulink> +chapter of the &kde; Fundamentals documentation &kpatience; has these application specific menu entries: +</para> <variablelist> <varlistentry id="settings-menu-game-type-options"> <term><menuchoice> <guimenu>Settings</guimenu> - <guisubmenu>"Game Type" Options</guisubmenu> - <guimenuitem>List of game type specific options.</guimenuitem> + <guisubmenu><replaceable>Game Type Options</replaceable></guisubmenu> + <guimenuitem><replaceable>List of game type specific options</replaceable></guimenuitem> </menuchoice></term> <listitem><para><action>List options specific to the current game type.</action> This menu is available in only certain games (Klondike and Spider).</para></listitem> </varlistentry> @@ -760,26 +760,17 @@ </menuchoice></term> <listitem><para><action>Enable automatic saving of the game state when &kpatience; is shut down.</action> If enabled, &kpatience; will load the previous game state automatically the next time it is started.</para></listitem> </varlistentry> - <varlistentry id="settings-menu-toolbar"> - <term><menuchoice> - <guimenu>Settings</guimenu> - <guimenuitem>Show Toolbar</guimenuitem> - </menuchoice></term> - <listitem><para>Show or hide the toolbar.</para></listitem> - </varlistentry> - <varlistentry id="settings-menu-statusbar"> + <varlistentry id="help-menu-remember"> <term><menuchoice> - <guimenu>Settings</guimenu> - <guimenuitem>Show Statusbar</guimenuitem> + <shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>F1</keycap></keycombo></shortcut> + <guimenu>Help</guimenu> + <guimenuitem>Help with Current Game</guimenuitem> </menuchoice></term> - <listitem><para>Show or hide the statusbar.</para></listitem> + <listitem><para>Opens the section with the Rules for the current game in this handbook </para></listitem> </varlistentry> </variablelist> </sect1> -<sect1 id="help"> -<title>The Help Menu</title> -&help.menu.documentation; -</sect1> + </chapter> <chapter id="faq"><title>Frequently asked questions</title>  @@ -796,7 +787,7 @@ </qandaentry> <qandaentry> <question><para>Can I use the keyboard to play the game?</para></question> - <answer><para>No, &kappname; features no keyboard only play. However, most menu options do have keyboard shortcuts.</para></answer> + <answer><para>No, &kpatience; features no keyboard only play. However, most menu options do have keyboard shortcuts.</para></answer> </qandaentry> <qandaentry> <question><para>Even with hints I still have no clue how to play. Help!</para></question> @@ -809,7 +800,7 @@  <para> -&kappname;  +&kpatience;  </para>  <para> @@ -841,7 +832,7 @@ </para> <para> -Documentation proofread and update for &kpatience; &kappversion; by &Richard.Hawthorne; +Documentation proofread and update for &kpatience; 3.6 by &Richard.Hawthorne; &Richard.Hawthorne.mail; </para> @@ -853,20 +844,6 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -&install.intro.documentation; - - -<sect1 id="Compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - &documentation.index; </book>  -<refsect2> -<title>Qt Options</title> - -<variablelist> -<varlistentry> -<term><option>--display <replaceable>displayname</replaceable></option></term> -<listitem> -<para>Use the X-server display <emphasis>displayname</emphasis>.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><option>--session <replaceable>sessionId</replaceable></option></term> -<listitem> -<para> -Restore the application for the given <replaceable>sessionId</replaceable>. -</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><option>--cmap</option></term> -<listitem> -<para> -Causes the application to install a private -color map on an 8-bit display. -</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><option>--ncols <replaceable>count</replaceable></option></term> -<listitem> -<para> -Limits the number of colors allocated in the -color cube on a 8-bit display, if the application -is using the <methodname>QApplication::ManyColor</methodname> -color specification. -</para> -</listitem> -</varlistentry> -<varlistentry> -<term><option>--nograb</option></term> -<listitem> -<para>tells Qt to never grab the mouse or the keyboard.</para> -</listitem> -</varlistentry> -<varlistentry> -<term><option>--dograb</option></term> -<listitem> -<para> -running under a debugger can cause an implicit -<option>-nograb</option>, use <option>-dograb</option> -to override. -</para> -</listitem> -</varlistentry> -<varlistentry> -<term><option>--sync</option></term> -<listitem> -<para>switches to synchronous mode for debugging.</para> -</listitem> -</varlistentry> -<varlistentry> -<term><option>--fn</option>, <option>--font <replaceable>fontname</replaceable></option></term> -<listitem> -<para>defines the application font.</para> -</listitem> -</varlistentry> -<varlistentry> -<term><option>--bg</option>, <option>--background <replaceable>color</replaceable></option></term> -<listitem> -<para> -sets the default background color and an -application palette (light and dark shades -are calculated). -</para> -</listitem> -</varlistentry> -<varlistentry> -<term><option>--fg</option>,<option>--foreground <replaceable>color</replaceable></option></term> -<listitem> -<para>sets the default foreground color.</para> -</listitem> -</varlistentry> -<varlistentry> -<term><option>--btn</option>, <option>--button <replaceable>color</replaceable></option></term> -<listitem> -<para>sets the default button color.</para> -</listitem> -</varlistentry> -<varlistentry> -<term><option>--name <replaceable>name</replaceable></option></term> -<listitem> -<para>sets the application name.</para> -</listitem> -</varlistentry> -<varlistentry> -<term><option>--title <replaceable>title</replaceable></option></term> -<listitem> -<para>sets the application title (caption).</para> -</listitem> -</varlistentry> -<varlistentry> -<term><option>--visual <replaceable>TrueColor</replaceable></option></term> -<listitem> -<para> -forces the application to use a TrueColor -visual on an 8-bit display. -</para> -</listitem> -</varlistentry> -<varlistentry> -<term><option>--inputstyle</option></term> -<listitem> -<para> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot -and root. -</para> -</listitem> -</varlistentry> -<varlistentry> -<term><option>--im <replaceable>XIM server</replaceable></option></term> -<listitem> -<para>set XIM server.</para> -</listitem> -</varlistentry> -<varlistentry> -<term><option>--noxim</option></term> -<listitem> -<para>disable XIM.</para> -</listitem> -</varlistentry> -<varlistentry> -<term><option>--reverse</option></term> -<listitem> -<para>mirrors the whole layout of widgets.</para> -</listitem> -</varlistentry> -<varlistentry> -<term><option>--stylesheet <replaceable>file.qss</replaceable></option></term> -<listitem> -<para>applies the Qt stylesheet to the application widgets.</para> -</listitem> -</varlistentry> -<varlistentry> -<term><option>--graphicssystem <replaceable>system</replaceable></option></term> -<listitem> -<para>use a different graphics system instead of the default one, -options are <quote>raster</quote> and <quote>opengl</quote> (experimental).</para> -</listitem> -</varlistentry> -</variablelist> -</refsect2> - -<refsect2> -<title>KDE Options</title> -<variablelist> -<varlistentry> -<term><option>--caption <replaceable>caption</replaceable></option></term> -<listitem> -<para>Use <emphasis>caption</emphasis> as name in the titlebar.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><option>--icon <replaceable>icon</replaceable></option></term> -<listitem> -<para>Use <emphasis>icon</emphasis> as the application icon.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><option>--config <replaceable>filename</replaceable></option></term> +<term><option>--solvegame</option> <replaceable> file</replaceable></term> <listitem> -<para> -Use alternative configuration file. -</para> +<para>Try to find a solution to the given savegame</para> </listitem> </varlistentry> <varlistentry> -<term><option>--nocrashhandler</option></term> +<term><option>--solve</option> <replaceable> num</replaceable></term> <listitem> -<para>Disable crash handler, to get core dumps.</para> +<para>Dealer to solve (debug)</para> </listitem> </varlistentry> <varlistentry> -<term><option>--waitforwm</option></term> +<term><option>--start</option> <replaceable> num</replaceable></term> <listitem> -<para> -Waits for a WM_NET compatible windowmanager. -</para> +<para>Game range start (default 0:INT_MAX)</para> </listitem> </varlistentry> <varlistentry> -<term><option>--style <replaceable>style</replaceable></option></term> +<term><option>--end</option> <replaceable> num</replaceable></term> <listitem> -<para>sets the application &GUI; style.</para> +<para>Game range end (default start:start if start given)</para> </listitem> </varlistentry> <varlistentry> -<term><option>--geometry <replaceable>geometry</replaceable></option></term> +<term><option>--gametype</option> <replaceable> game</replaceable></term> <listitem> -<para> -sets the client geometry of the main widget - see the manual page -<ulink url="man:/X">man:/X</ulink> for the argument format (usually WidthxHeight+XPos+YPos). -</para> +<para>Skip the selection screen and load a particular game type. Valid values are: acesup, fortyeight, freecell, golf, grandfather, grandfathersclock, gypsy, klondike, mod3, simplesimon, spider, yukon</para> </listitem> </varlistentry> -</variablelist> -</refsect2> - - - -<refsect2> -<title>Options</title> -<variablelist> <varlistentry> -<term><option>--solvegame</option> <replaceable> file</replaceable></term> +<term><option>--testdir</option> <replaceable> directory</replaceable></term> <listitem> -<para>Try to find a solution to the given savegame</para> +<para>Directory with test cases</para> </listitem> </varlistentry> <varlistentry> -<term><option>--solve</option> <replaceable> num</replaceable></term> -<listitem> -<para>Dealer to solve (debug)</para> +<term><option>--generate</option></term> +<listitem><para>Generate random test cases</para> </listitem> </varlistentry> <varlistentry> -<term><option>--start</option> <replaceable> num</replaceable></term> -<listitem> -<para>Game range start (default 0:INT_MAX)</para> -</listitem> +<term><option>--author</option></term> +<listitem><para>Lists &kpatience;'s authors in the terminal window</para></listitem> </varlistentry> <varlistentry> -<term><option>--end</option> <replaceable> num</replaceable></term> -<listitem> -<para>Game range end (default start:start if start given)</para> -</listitem> +<term><option>--license</option></term> +<listitem><para>Shows license information</para></listitem> </varlistentry> <varlistentry> -<term><option>--gametype</option> <replaceable> game</replaceable></term> -<listitem> -<para>Skip the selection screen and load a particular game type. Valid values are: acesup, fortyeight, freecell, golf, grandfather, grandfathersclock, gypsy, klondike, mod3, simplesimon, spider, yukon</para> -</listitem> +<term><option>--desktopfile</option> <replaceable>file name</replaceable></term> +<listitem><para>The base file name of the desktop entry for this application.</para></listitem> </varlistentry> -</variablelist> -</refsect2> - -<refsect2> -<title>Arguments</title> -<variablelist> - <varlistentry> <term><replaceable> file</replaceable></term> <listitem> @@ -379,10 +142,9 @@ </varlistentry> </variablelist> -</refsect2> </refsect1> - + <refsect1> <title>SEE ALSO</title> <para> @@ -391,7 +153,7 @@ (<filename>$<envar>KDEDIR</envar>/share/doc/HTML/en/kpat/index.html</filename> or enter <userinput>help:/kpat/index.html</userinput> in &konqueror;).</para> - + </refsect1> <refsect1> Files old/kpat-16.04.3/doc/playfield.png and new/kpat-16.08.0/doc/playfield.png differ Files old/kpat-16.04.3/doc/spades.png and new/kpat-16.08.0/doc/spades.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-16.04.3/main.cpp new/kpat-16.08.0/main.cpp --- old/kpat-16.04.3/main.cpp 2016-03-20 14:02:02.000000000 +0100 +++ new/kpat-16.08.0/main.cpp 2016-07-07 11:33:23.000000000 +0200 @@ -21,7 +21,7 @@ * ------------------------------------------------------------------------- * 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 of + * published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -57,7 +57,7 @@ #include <Kdelibs4ConfigMigrator> #include <climits> -#include <time.h> +#include <ctime> #include <QStandardPaths> #include <QApplication> #include <QCommandLineParser> @@ -228,7 +228,7 @@ QString testdir = parser.value(QStringLiteral("testdir")); if ( !testdir.isEmpty() ) { - qsrand(time(0)); + qsrand(std::time(nullptr)); if ( parser.isSet(QStringLiteral("generate")) ) { for (int dealer = 0; dealer < 20; dealer++) { DealerScene *f = getDealer( dealer ); @@ -260,7 +260,7 @@ } } } - } + } return 0; } @@ -311,7 +311,7 @@ } QString gametype = parser.value(QStringLiteral("gametype")).toLower(); - QFile savedState( QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1Char('/') + saved_state_file) ; + QFile savedState( QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QLatin1Char('/') + saved_state_file); MainWindow *w = new MainWindow; if (parser.positionalArguments().count()) @@ -335,6 +335,6 @@ w->show(); const KDBusService dbusService(KDBusService::Multiple); - + return app.exec(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-16.04.3/mainwindow.cpp new/kpat-16.08.0/mainwindow.cpp --- old/kpat-16.04.3/mainwindow.cpp 2016-03-20 14:02:02.000000000 +0100 +++ new/kpat-16.08.0/mainwindow.cpp 2016-07-07 11:33:23.000000000 +0200 @@ -23,7 +23,7 @@ * ------------------------------------------------------------------------- * 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 of + * published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -726,7 +726,7 @@ } -void MainWindow::toggleDemoAction(bool active) +void MainWindow::toggleDemoAction(bool active) { m_demoAction->setChecked( active ); m_demoAction->setIcon( QIcon::fromTheme( QLatin1String( active ? "media-playback-pause" : "media-playback-start" ) ) ); @@ -756,7 +756,7 @@ void MainWindow::closeEvent(QCloseEvent *e) { - QString stateDirName = QStandardPaths::writableLocation(QStandardPaths::DataLocation); + QString stateDirName = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); QString stateFileName = stateDirName + QLatin1Char('/') + saved_state_file ; QDir stateFileDir(stateDirName); if(!stateFileDir.exists()) @@ -768,7 +768,7 @@ // Remove the existing state file, if any. stateFile.remove(); - + if ( m_dealer ) { if ( Settings::rememberStateOnExit() && !m_dealer->isGameWon() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-16.04.3/mimetypes/kpatience.xml new/kpat-16.08.0/mimetypes/kpatience.xml --- old/kpat-16.04.3/mimetypes/kpatience.xml 2016-03-20 14:02:02.000000000 +0100 +++ new/kpat-16.08.0/mimetypes/kpatience.xml 2016-07-07 11:33:23.000000000 +0200 @@ -9,6 +9,7 @@ <comment xml:lang="cs">Uložený soubor staré verze KPatience</comment> <comment xml:lang="da">KPatience gammel gemmefil</comment> <comment xml:lang="de">Veraltete KPatience-Speicherdatei</comment> + <comment xml:lang="el">Παλαιό αρχείο αποθήκευσης πασιέντζας</comment> <comment xml:lang="en_GB">KPatience legacy save file</comment> <comment xml:lang="es">Restos del archivo de salvaguardado de KPatience</comment> <comment xml:lang="fi">Vanha KPatience-tallennustiedosto</comment> @@ -47,6 +48,7 @@ <comment xml:lang="cs">Uložený soubor KPatience</comment> <comment xml:lang="da">KPatience gemmefil</comment> <comment xml:lang="de">KPatience-Speicherdatei</comment> + <comment xml:lang="el">Αρχείο αποθήκευσης πασιέντζας</comment> <comment xml:lang="en_GB">KPatience save file</comment> <comment xml:lang="es">Archivo de salvaguardado de KPatience</comment> <comment xml:lang="fi">KPatience-tallennustiedosto</comment> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-16.04.3/org.kde.kpat.desktop new/kpat-16.08.0/org.kde.kpat.desktop --- old/kpat-16.04.3/org.kde.kpat.desktop 2016-03-20 14:02:02.000000000 +0100 +++ new/kpat-16.08.0/org.kde.kpat.desktop 2016-07-07 11:33:23.000000000 +0200 @@ -102,7 +102,7 @@ GenericName[pl]=Gra karciana Patience GenericName[pt]=Jogo de Paciência GenericName[pt_BR]=Jogo de Cartas Paciência -GenericName[ro]=Joc de pasențe +GenericName[ro]=Joc de cărți de răbdare GenericName[ru]=Карточный пасьянс GenericName[se]=Kabálaspeallu GenericName[sk]=Kartová hra Patience diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-16.04.3/patsolve/simonsolver.cpp new/kpat-16.08.0/patsolve/simonsolver.cpp --- old/kpat-16.04.3/patsolve/simonsolver.cpp 2016-03-20 14:02:02.000000000 +0100 +++ new/kpat-16.08.0/patsolve/simonsolver.cpp 2016-07-07 11:33:23.000000000 +0200 @@ -202,8 +202,6 @@ conti[j]++; } - bool foundgood = false; - for(int i=0; i<10; ++i) { int len = Wlen[i]; @@ -233,10 +231,6 @@ RANK(card) == RANK(*Wp[j]) - 1 ) { allowed = true; -#if 0 - if ( ( SUIT( card ) != SUIT( *Wp[j] ) ) && foundgood ) - allowed = false; // make the tree simpler -#endif } if ( Wlen[j] == 0 && !wasempty ) { @@ -253,11 +247,6 @@ !DOWN( card_below ) && RANK( card_below ) == RANK( card ) + 1 ) { -#if 0 - printcard( card_below, stderr ); - printcard( card, stderr ); - fprintf( stderr, "%d %d %d %d %d\n", i, j, conti[i], conti[j],l ); -#endif if ( conti[j]+l != 13 || conti[i]>conti[j]+l || SUIT( card ) != SUIT( *Wp[j] ) ) { // fprintf( stderr, "continue\n" ); continue; @@ -277,13 +266,13 @@ if ( cont ) cont += l; mp->pri = 8 * cont + qMax( 0, 10 - Wlen[i] ); - if ( Wlen[j] ) - if ( SUIT( card ) != SUIT( *Wp[j] ) ) + if ( Wlen[j] ) { + if ( SUIT( card ) != SUIT( *Wp[j] ) ) { mp->pri /= 2; - else - foundgood = true; - else + } + } else { mp->pri = 2; // TODO: it should depend on the actual stack's order + } if ( Wlen[i] == l+1 ) mp->pri = qMin( 127, mp->pri + 20 ); else @@ -296,12 +285,6 @@ card_t top = W[i][Wlen[i]-l-2]; card_t theone = W[i][Wlen[i]-conti_pos-1]; card_t below = W[i][Wlen[i]-conti_pos-2]; -#if 0 - printcard( top, stderr ); - printcard( theone, stderr ); - printcard( below, stderr ); - fputc( '\n', stderr ); -#endif if ( SUIT( top ) != SUIT( below ) || DOWN( below ) ) break; if ( RANK( theone ) != diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-16.04.3/soundengine.cpp new/kpat-16.08.0/soundengine.cpp --- old/kpat-16.04.3/soundengine.cpp 2016-03-20 14:02:02.000000000 +0100 +++ new/kpat-16.08.0/soundengine.cpp 2016-07-07 11:33:23.000000000 +0200 @@ -3,7 +3,7 @@ * * 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 of + * published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -22,8 +22,8 @@ SoundEngine::SoundEngine( QObject * parent ) : QObject( parent ), - m_cardPickedUp( QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("sounds/card-pickup.ogg") ) ), - m_cardPutDown( QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("sounds/card-down.ogg") ) ) + m_cardPickedUp( QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("sounds/card-pickup.ogg") ) ), + m_cardPutDown( QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("sounds/card-down.ogg") ) ) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-16.04.3/themes/cleangreen.desktop new/kpat-16.08.0/themes/cleangreen.desktop --- old/kpat-16.04.3/themes/cleangreen.desktop 2016-03-20 14:02:02.000000000 +0100 +++ new/kpat-16.08.0/themes/cleangreen.desktop 2016-07-07 11:33:23.000000000 +0200 @@ -73,6 +73,7 @@ Description[pl]=Prosty, zielony wystrój Description[pt]=Um tema simples em verde Description[pt_BR]=Um tema simples em verde +Description[ro]=Tematică simplă de pâslă verde Description[ru]=Простое оформление из зелёного фетра Description[sk]=Jednoduchá zelená téma Description[sl]=Preprosta zelena tema diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-16.04.3/themes/greenblaze.desktop new/kpat-16.08.0/themes/greenblaze.desktop --- old/kpat-16.04.3/themes/greenblaze.desktop 2016-03-20 14:02:02.000000000 +0100 +++ new/kpat-16.08.0/themes/greenblaze.desktop 2016-07-07 11:33:23.000000000 +0200 @@ -29,6 +29,7 @@ Name[pl]=Blask zieleni Name[pt]=Fundo Verde Name[pt_BR]=Fundo verde +Name[ro]=Vâlvătaie verde Name[ru]=Зелёное пламя Name[sk]=Zelená žiara Name[sl]=Zelen žar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpat-16.04.3/themes/oldertheme.desktop new/kpat-16.08.0/themes/oldertheme.desktop --- old/kpat-16.04.3/themes/oldertheme.desktop 2016-03-20 14:02:02.000000000 +0100 +++ new/kpat-16.08.0/themes/oldertheme.desktop 2016-07-07 11:33:23.000000000 +0200 @@ -79,6 +79,7 @@ Description[pl]=Starszy, nienazwany wystrój KPat. Description[pt]=Um tema mais antigo e anónimo do KPat. Description[pt_BR]=Um tema mais antigo e sem nome do KPat. +Description[ro]=Tematică KPat mai veche, fără nume Description[ru]=Старое безымянное оформление для KPat Description[sk]=Staršia, nepomenovaná KPat téma. Description[sl]=Starejša, neimenovana tema za KPata

1 0

commit konquest for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package konquest for openSUSE:Factory checked in at 2016-08-31 00:08:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/konquest (Old) and /work/SRC/openSUSE:Factory/.konquest.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "konquest" Changes: -------- --- /work/SRC/openSUSE:Factory/konquest/konquest.changes 2016-07-24 19:47:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.konquest.new/konquest.changes 2016-08-31 00:08:09.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:21:58 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:17:47 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- konquest-16.04.3.tar.xz New: ---- konquest-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konquest.spec ++++++ --- /var/tmp/diff_new_pack.Qm1kL4/_old 2016-08-31 00:08:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Qm1kL4/_new 2016-08-31 00:08:10.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: konquest-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ konquest-16.04.3.tar.xz -> konquest-16.08.0.tar.xz ++++++

1 0

commit kolourpaint for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kolourpaint for openSUSE:Factory checked in at 2016-08-31 00:08:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kolourpaint (Old) and /work/SRC/openSUSE:Factory/.kolourpaint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kolourpaint" Changes: -------- --- /work/SRC/openSUSE:Factory/kolourpaint/kolourpaint.changes 2016-07-24 19:47:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kolourpaint.new/kolourpaint.changes 2016-08-31 00:08:08.000000000 +0200 @@ -1,0 +2,22 @@ +Fri Aug 12 13:18:15 UTC 2016 - wbauer(a)tmo.at + +- Do not recommend ksaneplugin any more, the KF5 version does not + use it (it hasn't been ported to KF5 anyway) + +------------------------------------------------------------------- +Fri Aug 12 10:21:35 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:17:09 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kolourpaint-16.04.3.tar.xz New: ---- kolourpaint-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kolourpaint.spec ++++++ --- /var/tmp/diff_new_pack.oN8fMH/_old 2016-08-31 00:08:09.000000000 +0200 +++ /var/tmp/diff_new_pack.oN8fMH/_new 2016-08-31 00:08:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: kolourpaint -Version: 16.04.3 +Version: 16.08.0 Release: 0 # See bnc#717722 for license details Summary: Paint Program @@ -25,16 +25,14 @@ Group: Productivity/Graphics/Bitmap Editors Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz +BuildRequires: extra-cmake-modules BuildRequires: fdupes -BuildRequires: libkde4-devel -BuildRequires: libqimageblitz-devel -BuildRequires: oxygen-icon-theme-large +BuildRequires: kdelibs4support-devel +BuildRequires: kf5-filesystem +BuildRequires: libksane-devel +BuildRequires: update-desktop-files BuildRequires: xz -Recommends: ksaneplugin -Provides: kde4-kolourpaint = 4.3.0 -Obsoletes: kde4-kolourpaint < 4.3.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Paint program for KDE @@ -43,15 +41,13 @@ %setup -q -n %{name}-%{version} %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - cd build - %make_install + %kf5_makeinstall -C build %suse_update_desktop_file kolourpaint RasterGraphics %fdupes -s %{buildroot}%{_datadir} - %kde_post_install %post -p /sbin/ldconfig @@ -63,13 +59,16 @@ %files %defattr(-,root,root) %doc COPYING README -%dir %{_kde4_datadir}/appdata -%{_kde4_applicationsdir}/kolourpaint.desktop -%{_kde4_appsdir}/kolourpaint/ -%{_kde4_bindir}/kolourpaint -%{_kde4_datadir}/appdata/kolourpaint.appdata.xml -%{_kde4_htmldir}/en/kolourpaint/ -%{_kde4_iconsdir}/hicolor/*/apps/kolourpaint.* -%{_kde4_libdir}/libkolourpaint_lgpl.so* +%dir %{_kf5_appstreamdir} +%{_kf5_applicationsdir}/kolourpaint.desktop +%{_kf5_sharedir}/kolourpaint/ +%{_kf5_sharedir}/kxmlgui5/ +%{_kf5_bindir}/kolourpaint +%{_kf5_appstreamdir}/kolourpaint.appdata.xml +%dir %{_kf5_htmldir}/en +%dir %{_kf5_htmldir} +%doc %{_kf5_htmldir}/en/*/ +%{_kf5_iconsdir}/hicolor/*/apps/kolourpaint.* +%{_kf5_libdir}/libkolourpaint_lgpl.so* %changelog ++++++ kolourpaint-16.04.3.tar.xz -> kolourpaint-16.08.0.tar.xz ++++++ ++++ 13797 lines of diff (skipped)

1 0

commit kollision for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kollision for openSUSE:Factory checked in at 2016-08-31 00:08:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kollision (Old) and /work/SRC/openSUSE:Factory/.kollision.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kollision" Changes: -------- --- /work/SRC/openSUSE:Factory/kollision/kollision.changes 2016-07-24 19:47:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kollision.new/kollision.changes 2016-08-31 00:08:06.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:21:26 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:16:49 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kollision-16.04.3.tar.xz New: ---- kollision-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kollision.spec ++++++ --- /var/tmp/diff_new_pack.QcLapk/_old 2016-08-31 00:08:07.000000000 +0200 +++ /var/tmp/diff_new_pack.QcLapk/_new 2016-08-31 00:08:07.000000000 +0200 @@ -42,7 +42,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kollision-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ kollision-16.04.3.tar.xz -> kollision-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-16.04.3/.gitignore new/kollision-16.08.0/.gitignore --- old/kollision-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kollision-16.08.0/.gitignore 2016-08-03 14:31:21.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-16.04.3/CMakeLists.txt new/kollision-16.08.0/CMakeLists.txt --- old/kollision-16.04.3/CMakeLists.txt 2016-05-29 14:21:39.000000000 +0200 +++ new/kollision-16.08.0/CMakeLists.txt 2016-08-03 14:31:21.000000000 +0200 @@ -10,7 +10,6 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config - ConfigWidgets CoreAddons Crash DBusAddons @@ -26,7 +25,7 @@ include(ECMAddAppIcon) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) Files old/kollision-16.04.3/doc/gameboard.png and new/kollision-16.08.0/doc/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-16.04.3/doc/index.docbook new/kollision-16.08.0/doc/index.docbook --- old/kollision-16.04.3/doc/index.docbook 2016-05-29 14:21:39.000000000 +0200 +++ new/kollision-16.08.0/doc/index.docbook 2016-08-03 14:31:21.000000000 +0200 @@ -1,15 +1,13 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "<application>Kollision</application>"> - <!ENTITY kappversion "0.1"> - <!ENTITY package "kdegames"> + <!ENTITY kollision "<application>Kollision</application>"> <!ENTITY % English "INCLUDE" > <!ENTITY % addindex "IGNORE"> ]> <book id="kollision" lang="&language;"> <bookinfo> - <title>The &kappname; Handbook</title> + <title>The &kollision; Handbook</title> <authorgroup> <author> <firstname>Paolo</firstname> @@ -22,10 +20,10 @@ </authorgroup> <legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-06</date> -<releaseinfo>&kappversion; (&kde; 4.11)</releaseinfo> +<date>2016-05-10</date> +<releaseinfo>0.3 (applications 16.04)</releaseinfo> <abstract> - <para>This documentation describes the game of &kappname; version &kappversion;</para> + <para>This documentation describes the game of &kollision; version 0.3</para> </abstract> <keywordset> @@ -47,6 +45,18 @@ <chapter id="howto"><title>How to play</title> <note><title>Objective:</title><para>Let the blue ball move in the field without touching the red balls.</para></note> + +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="gameboard.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&kollision; Game Board</phrase> +</textobject> +</mediaobject> +</screenshot> + <para> Click on the empty field to start a game: a blue ball immediately replaces your mouse cursor, and a number of red balls start to fade into the field. </para> @@ -120,7 +130,7 @@ </shortcut> <guimenu>Game</guimenu> <guimenuitem>Quit</guimenuitem></menuchoice></term> -<listitem><para>Selecting this item will end your current game, and exit &kappname;.</para></listitem> +<listitem><para>Selecting this item will end your current game, and exit &kollision;.</para></listitem> </varlistentry> <varlistentry> @@ -147,7 +157,7 @@ </variablelist> <para> -Additionally &kappname; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> +Additionally &kollision; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> menu items, for more information read the sections about the <ulink url="help:/fundamentals/ui.html#menus-settings" >Settings Menu</ulink> and <ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink> of the &kde; Fundamentals. @@ -165,22 +175,22 @@ </qandaentry> <qandaentry> <question><para>Can I use the keyboard to play the game? </para></question> - <answer><para>No. &kappname; can only be played with a mouse.</para></answer> + <answer><para>No. &kollision; can only be played with a mouse.</para></answer> </qandaentry> <qandaentry> <question><para>I cannot figure out what to do here! Are there hints? </para></question> - <answer><para>&kappname; does not have a <quote>Hint</quote> feature.</para></answer> + <answer><para>&kollision; does not have a <quote>Hint</quote> feature.</para></answer> </qandaentry> <qandaentry> <question><para>I have to quit the game now, but I am not finished yet. Can I save my progress?</para></question> - <answer><para>You cannot save games in &kappname;.</para></answer> + <answer><para>You cannot save games in &kollision;.</para></answer> </qandaentry> </qandaset> </chapter> <chapter id="credits"><title>Credits and License</title> <para> -&kappname; +&kollision; </para> <para> Copyright 2007-2008 Paolo Capriotti <email>p.capriotti(a)gmail.com</email> @@ -198,17 +208,7 @@ &underGPL; </chapter> - -<appendix id="installation"> -<title>Compilation and Installation</title> - -&install.intro.documentation; - -&install.compile.documentation; - -</appendix> - &documentation.index; </book> <!-- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-16.04.3/kollision.kcfg new/kollision-16.08.0/kollision.kcfg --- old/kollision-16.04.3/kollision.kcfg 2016-05-29 14:21:39.000000000 +0200 +++ new/kollision-16.08.0/kollision.kcfg 2016-08-03 14:31:21.000000000 +0200 @@ -2,7 +2,7 @@ <kcfg xmlns="http://www.kde.org/standards/kcfg/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">> + http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"> <kcfgfile name="kollisionrc"/> <group name="game_options"> <entry name="IncreaseBallSize" type="Bool"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-16.04.3/mainarea.cpp new/kollision-16.08.0/mainarea.cpp --- old/kollision-16.04.3/mainarea.cpp 2016-05-29 14:21:39.000000000 +0200 +++ new/kollision-16.08.0/mainarea.cpp 2016-08-03 14:31:21.000000000 +0200 @@ -19,17 +19,14 @@ #include <KgDifficulty> #include <KgTheme> #include <KLocalizedString> - +#include <QStandardPaths> #include "ball.h" #include "kollisionconfig.h" -// for rand -#include <math.h> +#include <cmath> +#include <ctime> #include <stdio.h> -#include <time.h> -#include <sys/time.h> -#include <QStandardPaths> struct Collision { @@ -39,10 +36,10 @@ struct Theme : public KgTheme { - Theme() : KgTheme("pictures/theme.desktop") - { - setGraphicsPath(QStandardPaths::locate(QStandardPaths::DataLocation, "pictures/theme.svgz")); - } + Theme() : KgTheme("pictures/theme.desktop") + { + setGraphicsPath(QStandardPaths::locate(QStandardPaths::AppDataLocation, "pictures/theme.svgz")); + } }; MainArea::MainArea() @@ -53,13 +50,13 @@ , m_death(false) , m_game_over(false) , m_paused(false) -, m_pause_time(0) +, m_pauseTime(0) , m_penalty(0) -, m_soundHitWall(QStandardPaths::locate(QStandardPaths::DataLocation, "sounds/hit_wall.ogg")) -, m_soundYouLose(QStandardPaths::locate(QStandardPaths::DataLocation, "sounds/you_lose.ogg")) -, m_soundBallLeaving(QStandardPaths::locate(QStandardPaths::DataLocation, "sounds/ball_leaving.ogg")) -, m_soundStart(QStandardPaths::locate(QStandardPaths::DataLocation, "sounds/start.ogg")) -, m_pause_action(0) +, m_soundHitWall(QStandardPaths::locate(QStandardPaths::AppDataLocation, "sounds/hit_wall.ogg")) +, m_soundYouLose(QStandardPaths::locate(QStandardPaths::AppDataLocation, "sounds/you_lose.ogg")) +, m_soundBallLeaving(QStandardPaths::locate(QStandardPaths::AppDataLocation, "sounds/ball_leaving.ogg")) +, m_soundStart(QStandardPaths::locate(QStandardPaths::AppDataLocation, "sounds/start.ogg")) +, m_pauseAction(0) { // Initialize the sound state @@ -71,13 +68,13 @@ QRect rect(0, 0, m_size, m_size); setSceneRect(rect); - qsrand(time(0)); + qsrand(std::time(nullptr)); m_timer.setInterval(20); connect(&m_timer, &QTimer::timeout, this, &MainArea::tick); - m_msg_font = QApplication::font(); - m_msg_font.setPointSize(15); + m_msgFont = QApplication::font(); + m_msgFont.setPointSize(15); QPixmap pix(rect.size()); { @@ -95,23 +92,23 @@ } -void MainArea::increaseBallSize(bool p_enabled) +void MainArea::increaseBallSize(bool enable) { - m_increaseBallSize = p_enabled; - KollisionConfig::setIncreaseBallSize(p_enabled); + m_increaseBallSize = enable; + KollisionConfig::setIncreaseBallSize(enable); KollisionConfig::self()->save(); } -void MainArea::enableSounds(bool p_enabled) +void MainArea::enableSounds(bool enabled) { - m_soundEnabled = p_enabled; - KollisionConfig::setEnableSounds(p_enabled); + m_soundEnabled = enabled; + KollisionConfig::setEnableSounds(enabled); KollisionConfig::self()->save(); } Animation* MainArea::writeMessage(const QString& text) { - Message* message = new Message(text, m_msg_font, m_size); + Message* message = new Message(text, m_msgFont, m_size); message->setPosition(QPointF(m_size, m_size) / 2.0); addItem(message); message->setOpacityF(0.0); @@ -120,10 +117,7 @@ AnimationGroup* move = new AnimationGroup; move->add(new FadeAnimation(sprite, 1.0, 0.0, 1500)); - move->add(new MovementAnimation(sprite, - sprite->position(), - QPointF(0, -0.1), - 1500)); + move->add(new MovementAnimation(sprite, sprite->position(), QPointF(0, -0.1), 1500)); AnimationSequence* sequence = new AnimationSequence; sequence->add(new PauseAnimation(200)); sequence->add(new FadeAnimation(sprite, 0.0, 1.0, 1000)); @@ -137,19 +131,18 @@ Animation* MainArea::writeText(const QString& text, bool fade) { - m_welcome_msg.clear(); + m_welcomeMsg.clear(); foreach (const QString &line, text.split('\n')) { - m_welcome_msg.append( - QExplicitlySharedDataPointer<Message>(new Message(line, m_msg_font, m_size))); + m_welcomeMsg.append( + QExplicitlySharedDataPointer<Message>(new Message(line, m_msgFont, m_size))); } - displayMessages(m_welcome_msg); + displayMessages(m_welcomeMsg); if (fade) { AnimationGroup* anim = new AnimationGroup; - foreach (QExplicitlySharedDataPointer<Message> message, m_welcome_msg) { + foreach (QExplicitlySharedDataPointer<Message> message, m_welcomeMsg) { message->setOpacityF(0.0); - anim->add(new FadeAnimation( - message, 0.0, 1.0, 1000)); + anim->add(new FadeAnimation(message, 0.0, 1.0, 1000)); } m_animator.add(anim); @@ -201,29 +194,29 @@ if (m_paused) { m_paused = false; m_timer.start(); - m_welcome_msg.clear(); + m_welcomeMsg.clear(); - m_pause_time += m_time.elapsed() - m_last_time; - m_last_time = m_time.elapsed(); + m_pauseTime += m_time.elapsed() - m_lastTime; + m_lastTime = m_time.elapsed(); } else { m_paused = true; m_timer.stop(); - QString shortcut = m_pause_action ? - m_pause_action->shortcut().toString() : + QString shortcut = m_pauseAction ? + m_pauseAction->shortcut().toString() : "P"; writeText(i18n("Game paused\nClick or press %1 to resume", shortcut), false); - if(m_last_game_time >= 5) { + if(m_lastGameTime >= 5) { m_penalty += 5000; - m_last_game_time -= 5; + m_lastGameTime -= 5; } else { - m_penalty += m_last_game_time * 1000; - m_last_game_time = 0; + m_penalty += m_lastGameTime * 1000; + m_lastGameTime = 0; } - emit changeGameTime(m_last_game_time); + emit changeGameTime(m_lastGameTime); } m_man->setVisible(!m_paused); @@ -259,18 +252,18 @@ break; } - m_welcome_msg.clear(); + m_welcomeMsg.clear(); addBall("red_ball"); addBall("red_ball"); addBall("red_ball"); addBall("red_ball"); - m_pause_time = 0; + m_pauseTime = 0; m_penalty = 0; m_time.restart(); - m_last_time = 0; - m_last_game_time = 0; + m_lastTime = 0; + m_lastGameTime = 0; m_timer.start(); @@ -285,19 +278,19 @@ void MainArea::setPauseAction(QAction * action) { - m_pause_action = action; + m_pauseAction = action; } QPointF MainArea::randomPoint() const { - double x = (double)rand() * (m_size - radius() * 2) / RAND_MAX + radius(); - double y = (double)rand() * (m_size - radius() * 2) / RAND_MAX + radius(); + double x = static_cast<double>(qrand()) * (m_size - radius() * 2) / RAND_MAX + radius(); + double y = static_cast<double>(qrand()) * (m_size - radius() * 2) / RAND_MAX + radius(); return QPointF(x, y); } QPointF MainArea::randomDirection(double val) const { - double angle = (double)rand() * 2 * M_PI / RAND_MAX; + double angle = static_cast<double>(qrand()) * 2 * M_PI / RAND_MAX; return QPointF(val * sin(angle), val * cos(angle)); } @@ -317,7 +310,7 @@ } } - Ball* ball = new Ball(&m_renderer, id, (int)(radius()*2)); + Ball* ball = new Ball(&m_renderer, id, static_cast<int>(radius()*2)); ball->setPosition(pos); addItem(ball); @@ -384,13 +377,13 @@ setManPosition(views().first()->mapFromGlobal(QCursor().pos())); } - int t = m_time.elapsed() - m_last_time; - m_last_time = m_time.elapsed(); + int t = m_time.elapsed() - m_lastTime; + m_lastTime = m_time.elapsed(); // compute game time && update statusbar - if ((m_time.elapsed() - m_pause_time - m_penalty) / 1000 > m_last_game_time) { - m_last_game_time = (m_time.elapsed() - m_pause_time - m_penalty) / 1000; - emit changeGameTime(m_last_game_time); + if ((m_time.elapsed() - m_pauseTime - m_penalty) / 1000 > m_lastGameTime) { + m_lastGameTime = (m_time.elapsed() - m_pauseTime - m_penalty) / 1000; + emit changeGameTime(m_lastGameTime); } Collision collision; @@ -525,7 +518,7 @@ } } - if (!m_death && m_time.elapsed() - m_pause_time >= m_ball_timeout * 1000 * + if (!m_death && m_time.elapsed() - m_pauseTime >= m_ball_timeout * 1000 * (m_balls.size() + m_fading.size() - 3)) { if (m_increaseBallSize) { //increase ball size by 4 units @@ -542,7 +535,7 @@ if (m_death && m_balls.isEmpty() && m_fading.isEmpty()) { m_game_over = true; m_timer.stop(); - int time = (m_time.restart() - m_pause_time - m_penalty) / 1000; + int time = (m_time.restart() - m_pauseTime - m_penalty) / 1000; QString text = i18np( "GAME OVER\n" "You survived for %1 second\n" @@ -562,10 +555,10 @@ QPointF pos = p; - if (pos.x() <= radius()) pos.setX((int) radius()); - if (pos.x() >= m_size - radius()) pos.setX(m_size - (int) radius()); - if (pos.y() <= radius()) pos.setY((int) radius()); - if (pos.y() >= m_size - radius()) pos.setY(m_size - (int) radius()); + if (pos.x() <= radius()) pos.setX(static_cast<int>(radius())); + if (pos.x() >= m_size - radius()) pos.setX(m_size - static_cast<int>(radius())); + if (pos.y() <= radius()) pos.setY(static_cast<int>(radius())); + if (pos.y() >= m_size - radius()) pos.setY(m_size - static_cast<int>(radius())); m_man->setPosition(pos); } @@ -578,7 +571,7 @@ setManPosition(e->scenePos()); } else if (!m_man) { - m_man = new Ball(&m_renderer, "blue_ball", (int)(radius()*2)); + m_man = new Ball(&m_renderer, "blue_ball", static_cast<int>(radius()*2)); m_man->setZValue(1.0); setManPosition(e->scenePos()); addItem(m_man); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-16.04.3/mainarea.h new/kollision-16.08.0/mainarea.h --- old/kollision-16.04.3/mainarea.h 2016-05-29 14:21:39.000000000 +0200 +++ new/kollision-16.08.0/mainarea.h 2016-08-03 14:31:21.000000000 +0200 @@ -32,8 +32,8 @@ { Q_OBJECT QTimer m_timer; - int m_last_time; - int m_last_game_time; + int m_lastTime; + int m_lastGameTime; QTime m_time; /// time interval between two balls being added @@ -42,7 +42,7 @@ int m_size; KGameRenderer m_renderer; Animator m_animator; - QFont m_msg_font; + QFont m_msgFont; QList<Ball*> m_balls; QList<Ball*> m_fading; @@ -60,11 +60,11 @@ bool m_game_over; bool m_paused; - int m_pause_time; + int m_pauseTime; int m_penalty; - QList<MessagePtr> m_welcome_msg; - QList<MessagePtr> m_pause_msg; + QList<MessagePtr> m_welcomeMsg; + QList<MessagePtr> m_pauseMsg; // Flag if automatic incremental ball size is enabled. bool m_increaseBallSize; @@ -77,7 +77,7 @@ KgSound m_soundBallLeaving; KgSound m_soundStart; - QAction * m_pause_action; + QAction * m_pauseAction; double radius() const; void setBallDiameter(int val); @@ -90,13 +90,13 @@ double diamA, double diamB, Collision& collision); Animation* writeMessage(const QString& text); - Animation* writeText(const QString& lines, bool fade = true); + Animation* writeText(const QString& text, bool fade = true); void displayMessages(const QList<QExplicitlySharedDataPointer<Message> >& msgs); void playSound(int sound); void onDeath(); void setManPosition(const QPointF& p); protected: - virtual void mousePressEvent(QGraphicsSceneMouseEvent* event); + virtual void mousePressEvent(QGraphicsSceneMouseEvent* e); virtual void focusOutEvent(QFocusEvent*); public: MainArea(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-16.04.3/org.kde.kollision.appdata.xml new/kollision-16.08.0/org.kde.kollision.appdata.xml --- old/kollision-16.04.3/org.kde.kollision.appdata.xml 2016-05-29 14:21:39.000000000 +0200 +++ new/kollision-16.08.0/org.kde.kollision.appdata.xml 2016-08-03 14:31:21.000000000 +0200 @@ -12,6 +12,7 @@ <summary xml:lang="ca">Joc de pilota informal</summary> <summary xml:lang="ca-valencia">Joc de pilota informal</summary> <summary xml:lang="de">Ein einfaches Ausweich-Ballspiel</summary> + <summary xml:lang="el">Συνηθισμένο παιχνίδι με μπάλες</summary> <summary xml:lang="en-GB">Casual ball game</summary> <summary xml:lang="es">Juego de bolas distraído</summary> <summary xml:lang="fi">Rento pallopeli</summary> @@ -31,7 +32,6 @@ <summary xml:lang="uk">Казуальна гра з кульками</summary> <summary xml:lang="x-test">xxCasual ball gamexx</summary> <summary xml:lang="zh-CN">休闲球游戏</summary> - <summary xml:lang="zh-TW">丟球遊戲</summary> <description> Kollision is a casual game where you need to throw your ball and avoid the @@ -41,6 +41,7 @@ El Kollision és un joc informal a on cal llançar la pilota i evitar les altres pilotes de la taula durant tant temps com sigui possible. El Kollision és un joc informal a on cal llançar la pilota i evitar les altres pilotes de la taula durant tant temps com siga possible. Kollision ist ein Spiel, in dem Sie mit Ihrem Ball allen anderen Bällen auf dem Spielfeld solange wie möglich ausweichen müssen. + Το Kollision είναι ένα συνηθισμένο παιχνίδι όπου ρίχνεις τη μπάλα σου και αποφεύγεις τις άλλες μπάλες στον πίνακα όσο το δυνατόν περισσότερο. Kollision is a casual game where you need to throw your ball and avoid the others balls on the table as long as possible. Kollision es un juego de bolas distraído en el que debe lanzar una bola y evitar al resto de bolas del tablero tanto tiempo como sea posible. Kollision on rento peli, jossa heität palloa ja yrität vältellä toisten palloja laudalla niin pitkään kuin mahdollista. @@ -60,7 +61,6 @@ Kollision — казуальна гра, у якій ви кидаєте кульку так, щоб вона якомога довше не стикалася з іншими кульками на полі. xxKollision is a casual game where you need to throw your ball and avoid the others balls on the table as long as possible.xx Kollision 是一个休闲游戏，扔出球的同时并尽量躲避其他在桌子上的球。 - Kollision 是一套簡單的休閒遊戲，您要丟出球並盡量避免碰到桌上的其他球。 </description> <url type="homepage">https://projects.kde.org/projects/kde/kdegames/kollision</url> <screenshots> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-16.04.3/org.kde.kollision.desktop new/kollision-16.08.0/org.kde.kollision.desktop --- old/kollision-16.04.3/org.kde.kollision.desktop 2016-05-29 14:21:39.000000000 +0200 +++ new/kollision-16.08.0/org.kde.kollision.desktop 2016-08-03 14:31:21.000000000 +0200 @@ -57,8 +57,10 @@ GenericName[ca@valencia]=Un joc senzill d'esquivar una bola GenericName[da]=Et enkelt undvigelsesspil med bolde GenericName[de]=Ein einfaches Ausweich-Ballspiel +GenericName[el]=Ένα απλό παιχνίδι ελιγμών με μπάλες GenericName[en_GB]=A simple ball dodging game GenericName[es]=Un juego sencillo de esquivar pelotas +GenericName[et]=Lihtne pallitogimise mäng GenericName[fi]=Yksinkertainen väistelypeli GenericName[gl]=Un xogo de bólas GenericName[nl]=Een eenvoudig "stuiterende bal"-spel

1 0

commit kolf for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kolf for openSUSE:Factory checked in at 2016-08-31 00:08:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kolf (Old) and /work/SRC/openSUSE:Factory/.kolf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kolf" Changes: -------- --- /work/SRC/openSUSE:Factory/kolf/kolf.changes 2016-07-24 19:47:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kolf.new/kolf.changes 2016-08-31 00:08:04.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:21:18 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:16:22 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kolf-16.04.3.tar.xz New: ---- kolf-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kolf.spec ++++++ --- /var/tmp/diff_new_pack.j8Uuqn/_old 2016-08-31 00:08:05.000000000 +0200 +++ /var/tmp/diff_new_pack.j8Uuqn/_new 2016-08-31 00:08:05.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ and LGPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kolf-%{version}.tar.xz BuildRequires: libkdegames4-devel ++++++ kolf-16.04.3.tar.xz -> kolf-16.08.0.tar.xz ++++++

1 0

commit knetwalk for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package knetwalk for openSUSE:Factory checked in at 2016-08-31 00:08:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knetwalk (Old) and /work/SRC/openSUSE:Factory/.knetwalk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "knetwalk" Changes: -------- --- /work/SRC/openSUSE:Factory/knetwalk/knetwalk.changes 2016-07-24 19:53:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.knetwalk.new/knetwalk.changes 2016-08-31 00:08:03.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:21:09 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:15:51 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- knetwalk-16.04.3.tar.xz New: ---- knetwalk-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knetwalk.spec ++++++ --- /var/tmp/diff_new_pack.WVfmNy/_old 2016-08-31 00:08:04.000000000 +0200 +++ /var/tmp/diff_new_pack.WVfmNy/_new 2016-08-31 00:08:04.000000000 +0200 @@ -37,7 +37,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: knetwalk-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ knetwalk-16.04.3.tar.xz -> knetwalk-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knetwalk-16.04.3/.gitignore new/knetwalk-16.08.0/.gitignore --- old/knetwalk-16.04.3/.gitignore 2016-03-10 11:22:08.000000000 +0100 +++ new/knetwalk-16.08.0/.gitignore 2016-05-12 12:06:20.000000000 +0200 @@ -1 +1,3 @@ -build \ No newline at end of file +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knetwalk-16.04.3/CMakeLists.txt new/knetwalk-16.08.0/CMakeLists.txt --- old/knetwalk-16.04.3/CMakeLists.txt 2016-03-10 11:22:08.000000000 +0100 +++ new/knetwalk-16.08.0/CMakeLists.txt 2016-05-12 12:06:20.000000000 +0200 @@ -35,7 +35,7 @@ include(ECMAddAppIcon) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMAddTests) Files old/knetwalk-16.04.3/doc/gameboard.png and new/knetwalk-16.08.0/doc/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knetwalk-16.04.3/doc/index.docbook new/knetwalk-16.08.0/doc/index.docbook --- old/knetwalk-16.04.3/doc/index.docbook 2016-03-10 11:22:08.000000000 +0100 +++ new/knetwalk-16.08.0/doc/index.docbook 2016-05-12 12:06:20.000000000 +0200 @@ -1,7 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ -<!ENTITY kappname "&knetwalk;"> -<!ENTITY package "kdegames"> <!ENTITY % English "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> @@ -31,8 +29,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2013-10-06</date> -<releaseinfo>3.1.0 (&kde; 4.12)</releaseinfo> +<date>2016-05-10</date> +<releaseinfo>3.3.0 (Applications 16.04)</releaseinfo> <abstract> <para> @@ -63,6 +61,17 @@ <chapter id="how-to-play"> <title>How to Play</title> +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="gameboard.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&knetwalk; Game Board</phrase> +</textobject> +</mediaobject> +</screenshot> + <para> The player is presented with a rectangular grid containing a server, several terminals, and pieces of wire. The object of the game is to rotate these elements until every client is connected to the server, and no wires are left unconnected. Optionally, you can try to get a high score by minimizing the number of rotations needed. </para> @@ -166,26 +175,24 @@ <varlistentry> <term><menuchoice> <guimenu>Move</guimenu> -<guimenuitem>Unlock All</guimenuitem> +<guimenuitem>Solve</guimenuitem> </menuchoice></term> <listitem> -<para> - Unlock all cells which were previously locked by the player using <keycap>Space</keycap> or automatically after checking <guilabel>Auto Lock</guilabel> item on <link linkend="config_general">General page</link> of Configure &knetwalk; dialog. -</para> +<para>Use it to give up a game. It shows you the solution, but the record will not be considered as a high score.</para> </listitem> </varlistentry> - <varlistentry> <term><menuchoice> @@ -405,25 +412,6 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-knetwalk"> -<title>How to obtain &knetwalk;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - - &documentation.index; </book> <!-- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knetwalk-16.04.3/src/gameview.cpp new/knetwalk-16.08.0/src/gameview.cpp --- old/knetwalk-16.04.3/src/gameview.cpp 2016-03-10 11:22:08.000000000 +0100 +++ new/knetwalk-16.08.0/src/gameview.cpp 2016-05-12 12:06:20.000000000 +0200 @@ -34,10 +34,10 @@ { m_provider->discoverThemes("appdata", QStringLiteral("themes")); m_provider->setDeclarativeEngine(QStringLiteral("themeProvider"), engine()); - m_soundTurn = new KgSound(QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("sounds/turn.wav")), this); - m_soundClick = new KgSound(QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("sounds/click.wav")), this); - m_soundConnect = new KgSound(QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("sounds/connect.wav")), this); - QString path = QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("qml/main.qml")); + m_soundTurn = new KgSound(QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("sounds/turn.wav")), this); + m_soundClick = new KgSound(QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("sounds/click.wav")), this); + m_soundConnect = new KgSound(QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("sounds/connect.wav")), this); + QString path = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("qml/main.qml")); setSource(QUrl::fromLocalFile(path)); setRotateDuration(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knetwalk-16.04.3/src/mainwindow.cpp new/knetwalk-16.08.0/src/mainwindow.cpp --- old/knetwalk-16.04.3/src/mainwindow.cpp 2016-03-10 11:22:08.000000000 +0100 +++ new/knetwalk-16.08.0/src/mainwindow.cpp 2016-05-12 12:06:20.000000000 +0200 @@ -112,8 +112,8 @@ m_gameClock = new KGameClock(this, KGameClock::MinSecOnly); connect(m_gameClock, &KGameClock::timeChanged, this, &MainWindow::updateStatusBar); - m_soundStart = new KgSound(QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("sounds/start.wav")), this); - m_soundWin = new KgSound(QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("sounds/win.wav")), this); + m_soundStart = new KgSound(QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("sounds/start.wav")), this); + m_soundWin = new KgSound(QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("sounds/win.wav")), this); startNewGame();

1 0

commit knavalbattle for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package knavalbattle for openSUSE:Factory checked in at 2016-08-31 00:07:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knavalbattle (Old) and /work/SRC/openSUSE:Factory/.knavalbattle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "knavalbattle" Changes: -------- --- /work/SRC/openSUSE:Factory/knavalbattle/knavalbattle.changes 2016-07-24 19:47:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.knavalbattle.new/knavalbattle.changes 2016-08-31 00:08:00.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:21:00 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:15:25 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- knavalbattle-16.04.3.tar.xz New: ---- knavalbattle-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knavalbattle.spec ++++++ --- /var/tmp/diff_new_pack.Mh83jU/_old 2016-08-31 00:08:01.000000000 +0200 +++ /var/tmp/diff_new_pack.Mh83jU/_new 2016-08-31 00:08:01.000000000 +0200 @@ -46,7 +46,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Other Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: knavalbattle-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ knavalbattle-16.04.3.tar.xz -> knavalbattle-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-16.04.3/.gitignore new/knavalbattle-16.08.0/.gitignore --- old/knavalbattle-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/knavalbattle-16.08.0/.gitignore 2016-06-13 21:59:47.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-16.04.3/CMakeLists.txt new/knavalbattle-16.08.0/CMakeLists.txt --- old/knavalbattle-16.04.3/CMakeLists.txt 2016-03-29 00:45:23.000000000 +0200 +++ new/knavalbattle-16.08.0/CMakeLists.txt 2016-06-13 21:59:47.000000000 +0200 @@ -25,7 +25,7 @@ include(ECMAddAppIcon) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) Files old/knavalbattle-16.04.3/doc/gameboard.png and new/knavalbattle-16.08.0/doc/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-16.04.3/doc/index.docbook new/knavalbattle-16.08.0/doc/index.docbook --- old/knavalbattle-16.04.3/doc/index.docbook 2016-03-29 00:45:23.000000000 +0200 +++ new/knavalbattle-16.08.0/doc/index.docbook 2016-06-13 21:59:47.000000000 +0200 @@ -1,14 +1,13 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "<application>Naval Battle</application>"> - <!ENTITY package "kdegames"> + <!ENTITY knavalbattle "<application>Naval Battle</application>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE" >  ]> <book id="knavalbattle" lang="&language;"> <bookinfo> -<title>The &kappname; Handbook</title> +<title>The &knavalbattle; Handbook</title> <authorgroup> <author> @@ -52,12 +51,12 @@ <holder>Kevin Krammer</holder> </copyright> -<date>2013-05-05</date> -<releaseinfo>2.0 (&kde; 4.11)</releaseinfo> +<date>2016-05-10</date> +<releaseinfo>2.1 (Applications 16.04)</releaseinfo> <abstract> <para> -&kappname; is a network-enabled implementation of the famous ship sinking game for &kde;.</para> +&knavalbattle; is a network-enabled implementation of the famous ship sinking game by &kde;.</para> </abstract> <keywordset> @@ -76,8 +75,20 @@ <title>Introduction</title> <note><title>Gametype:</title><para>Strategy, Board</para></note> <note><title>Number of possible players:</title><para>Two</para></note> + +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="gameboard.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&knavalbattle; Game Board</phrase> +</textobject> +</mediaobject> +</screenshot> + <para> -&kappname; is a ship sinking game for &kde;. Ships are placed on a board which represents the sea. Players try to hit each others +&knavalbattle; is a ship sinking game by &kde;. Ships are placed on a board which represents the sea. Players try to hit each others ships in turns without knowing where they are placed. The first player to destroy all ships wins the game. </para> </chapter> @@ -86,14 +97,14 @@ <title>How to Play</title> <note><title>Objective:</title><para>Sink all of the opponent’s ships before the opponent sink all the ships of your own.</para></note> <para> -If you want to play &kappname;, you will need two players, either play +If you want to play &knavalbattle;, you will need two players, either play against the computer or in a network against another player. To play against your computer, first select the difficulty level on the right of the status bar, and then select <guibutton>Single Player</guibutton> on the welcome screen, or directly on the <menuchoice><guimenu>Game</guimenu></menuchoice> menu.</para> <para> To start a network game, one player has to host the game by selecting <guilabel>Host Network Game</guilabel> on the welcome screen, or choosing <menuchoice><guimenu>Game</guimenu> <guimenuitem>Host Game...</guimenuitem></menuchoice>. A dialog box opens which asks for a <guilabel>Nickname:</guilabel> and <guilabel>Port:</guilabel>. Normally, -&kappname; will suggest your full name, but you can enter any string +&knavalbattle; will suggest your full name, but you can enter any string you want. The predefined port should be ok. However, if you encounter problems, you can choose any other free port above 1024. </para> @@ -295,7 +306,7 @@ </term> <listitem> <para> -<action>Exit</action> &kappname; +<action>Exit</action> &knavalbattle; </para> </listitem> </varlistentry> @@ -339,7 +350,7 @@ <listitem> <para> <action>Toggle whether the ships can be put on a desk without one empty space between them.</action> -The default is on. This setting should be defined on a host when <link linkend="howtoplay">playing &kappname; via network</link>. +The default is on. This setting should be defined on a host when <link linkend="howtoplay">playing &knavalbattle; via network</link>. </para> </listitem> </varlistentry> @@ -391,7 +402,7 @@ </variablelist> <para> -Additionally &kappname; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> +Additionally &knavalbattle; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> menu items, for more information read the sections about the <ulink url="help:/fundamentals/ui.html#menus-settings" >Settings Menu</ulink> and <ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink> of the &kde; Fundamentals. @@ -413,7 +424,7 @@ </question> <answer> <para> -No, there is no hint system in &kappname;. +No, there is no hint system in &knavalbattle;. </para> </answer> </qandaentry> @@ -450,7 +461,7 @@ <chapter id="credits"> <title>Credits and License</title> -<para>&kappname; Copyright 2000-2007</para> +<para>&knavalbattle; Copyright 2000-2007</para> <itemizedlist> <title>Authors</title> @@ -529,20 +540,6 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -&install.intro.documentation; - - -<sect1 id="Compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - &documentation.index; </book> <!-- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-16.04.3/src/audioplayer.cpp new/knavalbattle-16.08.0/src/audioplayer.cpp --- old/knavalbattle-16.04.3/src/audioplayer.cpp 2016-03-29 00:45:23.000000000 +0200 +++ new/knavalbattle-16.08.0/src/audioplayer.cpp 2016-06-13 21:59:47.000000000 +0200 @@ -1,6 +1,6 @@ /* Copyright (c) 2007 Paolo Capriotti <p.capriotti(a)gmail.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 of the License, or @@ -44,11 +44,11 @@ } } -void AudioPlayer::setActive(bool value) -{ +void AudioPlayer::setActive(bool value) +{ if (value) { if (!m_sink) { - const QDir dir = QStandardPaths::locate(QStandardPaths::DataLocation, QLatin1Literal("sounds/"), QStandardPaths::LocateDirectory); + const QDir dir = QStandardPaths::locate(QStandardPaths::AppDataLocation, QLatin1Literal("sounds/"), QStandardPaths::LocateDirectory); m_sink = new KgSound(dir.filePath("ship-sink.ogg"), this); m_shootA = new KgSound(dir.filePath("ship-player1-shoot.ogg"), this); m_shootB = new KgSound(dir.filePath("ship-player2-shoot.ogg"), this);

1 0

commit kmplot for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kmplot for openSUSE:Factory checked in at 2016-08-31 00:07:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmplot (Old) and /work/SRC/openSUSE:Factory/.kmplot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmplot" Changes: -------- --- /work/SRC/openSUSE:Factory/kmplot/kmplot.changes 2016-07-24 19:47:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kmplot.new/kmplot.changes 2016-08-31 00:07:59.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:20:52 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:14:54 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kmplot-16.04.3.tar.xz New: ---- kmplot-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmplot.spec ++++++ --- /var/tmp/diff_new_pack.baBU9i/_old 2016-08-31 00:08:00.000000000 +0200 +++ /var/tmp/diff_new_pack.baBU9i/_new 2016-08-31 00:08:00.000000000 +0200 @@ -17,7 +17,7 @@ Name: kmplot -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Mathematical Function Plotter License: GPL-2.0+ ++++++ kmplot-16.04.3.tar.xz -> kmplot-16.08.0.tar.xz ++++++ ++++ 4007 lines of diff (skipped)

1 0

commit kmouth for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kmouth for openSUSE:Factory checked in at 2016-08-31 00:07:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmouth (Old) and /work/SRC/openSUSE:Factory/.kmouth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmouth" Changes: -------- --- /work/SRC/openSUSE:Factory/kmouth/kmouth.changes 2016-07-24 19:47:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kmouth.new/kmouth.changes 2016-08-31 00:07:57.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:20:44 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:14:34 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kmouth-16.04.3.tar.xz New: ---- kmouth-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmouth.spec ++++++ --- /var/tmp/diff_new_pack.Xd1Vci/_old 2016-08-31 00:07:58.000000000 +0200 +++ /var/tmp/diff_new_pack.Xd1Vci/_new 2016-08-31 00:07:58.000000000 +0200 @@ -27,7 +27,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kmouth-16.04.3.tar.xz -> kmouth-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-16.04.3/books/de.desktop new/kmouth-16.08.0/books/de.desktop --- old/kmouth-16.04.3/books/de.desktop 2015-07-14 17:54:52.000000000 +0200 +++ new/kmouth-16.08.0/books/de.desktop 2016-06-30 05:36:15.000000000 +0200 @@ -28,6 +28,7 @@ Name[hne]=जर्मन Name[hr]=Njemački Name[hu]=Német +Name[ia]=Germano Name[is]=Þýska Name[it]=Tedesco Name[ja]=ドイツ語 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-16.04.3/books/en.desktop new/kmouth-16.08.0/books/en.desktop --- old/kmouth-16.04.3/books/en.desktop 2015-07-14 17:54:52.000000000 +0200 +++ new/kmouth-16.08.0/books/en.desktop 2016-06-30 05:36:15.000000000 +0200 @@ -29,6 +29,7 @@ Name[hne]=अंगरेजी Name[hr]=Engleski Name[hu]=Angol +Name[ia]=Anglese Name[is]=Enska Name[it]=Inglese Name[ja]=英語 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-16.04.3/books/nl.desktop new/kmouth-16.08.0/books/nl.desktop --- old/kmouth-16.04.3/books/nl.desktop 2015-07-14 17:54:52.000000000 +0200 +++ new/kmouth-16.08.0/books/nl.desktop 2016-06-30 05:36:15.000000000 +0200 @@ -29,6 +29,7 @@ Name[hne]=डच Name[hr]=Nizozemski Name[hu]=Holland +Name[ia]=Hollandese Name[is]=Hollenska Name[it]=Olandese Name[ja]=オランダ語 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-16.04.3/books/sv.desktop new/kmouth-16.08.0/books/sv.desktop --- old/kmouth-16.04.3/books/sv.desktop 2015-07-14 17:54:52.000000000 +0200 +++ new/kmouth-16.08.0/books/sv.desktop 2016-06-30 05:36:15.000000000 +0200 @@ -29,6 +29,7 @@ Name[hne]=स्वीडिस Name[hr]=Švedski Name[hu]=Svéd +Name[ia]=Svedese Name[is]=Sænska Name[it]=Svedese Name[ja]=スウェーデン語 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmouth-16.04.3/kmouth.desktop new/kmouth-16.08.0/kmouth.desktop --- old/kmouth-16.04.3/kmouth.desktop 2015-07-14 17:54:52.000000000 +0200 +++ new/kmouth-16.08.0/kmouth.desktop 2016-06-30 05:36:15.000000000 +0200 @@ -33,6 +33,7 @@ Name[hne]=के-माउथ Name[hr]=KMouth Name[hu]=KMouth +Name[ia]=KMouth Name[is]=KMunnur Name[it]=KMouth Name[ja]=KMouth

1 0

commit kmines for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kmines for openSUSE:Factory checked in at 2016-08-31 00:07:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmines (Old) and /work/SRC/openSUSE:Factory/.kmines.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmines" Changes: -------- --- /work/SRC/openSUSE:Factory/kmines/kmines.changes 2016-07-24 19:47:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kmines.new/kmines.changes 2016-08-31 00:07:54.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:20:22 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:13:29 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kmines-16.04.3.tar.xz New: ---- kmines-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmines.spec ++++++ --- /var/tmp/diff_new_pack.82nwHj/_old 2016-08-31 00:07:55.000000000 +0200 +++ /var/tmp/diff_new_pack.82nwHj/_new 2016-08-31 00:07:55.000000000 +0200 @@ -58,7 +58,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kmines-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ kmines-16.04.3.tar.xz -> kmines-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-16.04.3/.gitignore new/kmines-16.08.0/.gitignore --- old/kmines-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kmines-16.08.0/.gitignore 2016-08-06 14:41:24.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-16.04.3/CMakeLists.txt new/kmines-16.08.0/CMakeLists.txt --- old/kmines-16.04.3/CMakeLists.txt 2016-05-29 14:21:26.000000000 +0200 +++ new/kmines-16.08.0/CMakeLists.txt 2016-08-06 14:41:24.000000000 +0200 @@ -27,7 +27,7 @@ include(ECMAddAppIcon) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) add_subdirectory(data) Files old/kmines-16.04.3/doc/gameboard.png and new/kmines-16.08.0/doc/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-16.04.3/doc/index.docbook new/kmines-16.08.0/doc/index.docbook --- old/kmines-16.04.3/doc/index.docbook 2016-05-29 14:21:26.000000000 +0200 +++ new/kmines-16.08.0/doc/index.docbook 2016-08-06 14:41:24.000000000 +0200 @@ -1,7 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&kmines;"> - <!ENTITY package "kdegames"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE" >  ]> @@ -55,8 +53,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-06</date> -<releaseinfo>3.0 (&kde; 4.11)</releaseinfo> +<date>2016-05-10</date> +<releaseinfo>4.0 (Applications 16.04)</releaseinfo> <abstract><para>&kmines; is the &kde; version of the classic minesweeper game.</para></abstract> @@ -85,11 +83,22 @@ <title>How to Play</title> <note><title>Objective:</title><para>Locate all the mines hidden on the minefield.</para></note> +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="gameboard.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&kmines; Game Board</phrase> +</textobject> +</mediaobject> +</screenshot> + <para> To play &kmines;, you need to use the mouse and its three buttons to uncover or to flag the squares (with two-buttoned mice, clicking the &MMB; is generally achieved by simultaneously pressing the &LMB; and the -&RMB; buttons). +&RMB;). </para> <para>Clicking the &LMB; on your mouse will @@ -349,24 +358,6 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-kmines"> -<title>How to obtain &kmines;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - </book> <!-- Local Variables: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-16.04.3/themes/default.desktop new/kmines-16.08.0/themes/default.desktop --- old/kmines-16.04.3/themes/default.desktop 2016-05-29 14:21:26.000000000 +0200 +++ new/kmines-16.08.0/themes/default.desktop 2016-08-06 14:41:24.000000000 +0200 @@ -65,8 +65,10 @@ Description[cs]=Motiv Oxygen pro KMines Description[da]=Oxygen-tema til KMines Description[de]=„Oxygen“-Design für KMines +Description[el]=Θέμα Oxygen του KMines Description[en_GB]=KMines Oxygen theme Description[es]=Tema Oxígeno de KMines +Description[et]=KMinesi Oxygeni teema Description[fi]=KMinesin Oxygen-teema Description[gl]=Tema Oxygen para KMines. Description[nl]=KMines Oxygen-thema diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-16.04.3/themes/graveyard-mayhem.desktop new/kmines-16.08.0/themes/graveyard-mayhem.desktop --- old/kmines-16.04.3/themes/graveyard-mayhem.desktop 2016-05-29 14:21:26.000000000 +0200 +++ new/kmines-16.08.0/themes/graveyard-mayhem.desktop 2016-08-06 14:41:24.000000000 +0200 @@ -69,7 +69,7 @@ Description[pt_BR]=Tema assustador para o KMines. Não seja pego pelos zumbis no cemitério! Description[ru]=Жуткое оформление для KMines. Не дайте зомби себя поймать! Description[sk]=Strašidelná téma pre KMines. Nenechajte sa chytiť zombie na cintoríne. -Description[sl]=Strašljiva tema za KMine. Ne pustite, da vas na pokopališču zasačijo zombiji! +Description[sl]=Strašljiva tema za KMines. Ne pustite, da vas na pokopališču zasačijo zombiji! Description[sr]=Сабласна тема за К‑мине — не дајте да вас ухвате зомбији на гробљу! Description[sr@ijekavian]=Сабласна тема за К‑мине — не дајте да вас ухвате зомбији на гробљу! Description[sr@ijekavianlatin]=Sablasna tema za K‑mine — ne dajte da vas uhvate zombiji na groblju! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmines-16.04.3/themes/green.desktop new/kmines-16.08.0/themes/green.desktop --- old/kmines-16.04.3/themes/green.desktop 2016-05-29 14:21:26.000000000 +0200 +++ new/kmines-16.08.0/themes/green.desktop 2016-08-06 14:41:24.000000000 +0200 @@ -54,8 +54,10 @@ Description[cs]=Legrační motiv pro KMines Description[da]=Et sjovt tema til KMines Description[de]=Ein lustiges Design für KMines +Description[el]=Ένα διασκεδαστικό θέμα για το KMines Description[en_GB]=A funny theme for KMines Description[es]=Un tema divertido para KMines +Description[et]=Lõbus miinimängu teema Description[fi]=Hassu teema KMinesille Description[gl]=Un tema alegre para KMines. Description[nl]=Een grappig thema voor KMines

1 0

commit kmahjongg for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kmahjongg for openSUSE:Factory checked in at 2016-08-31 00:07:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmahjongg (Old) and /work/SRC/openSUSE:Factory/.kmahjongg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmahjongg" Changes: -------- --- /work/SRC/openSUSE:Factory/kmahjongg/kmahjongg.changes 2016-07-24 19:47:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kmahjongg.new/kmahjongg.changes 2016-08-31 00:07:53.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Aug 12 23:24:05 UTC 2016 - wbauer(a)tmo.at + +- Update/cleanup build requirements + +------------------------------------------------------------------- +Fri Aug 12 10:19:52 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:11:52 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kmahjongg-16.04.3.tar.xz New: ---- kmahjongg-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmahjongg.spec ++++++ --- /var/tmp/diff_new_pack.oGKwSD/_old 2016-08-31 00:07:54.000000000 +0200 +++ /var/tmp/diff_new_pack.oGKwSD/_new 2016-08-31 00:07:54.000000000 +0200 @@ -20,27 +20,24 @@ BuildRequires: extra-cmake-modules BuildRequires: kconfig-devel BuildRequires: kcoreaddons-devel +BuildRequires: kcrash-devel BuildRequires: kdeclarative-devel -BuildRequires: kdelibs4support-devel -BuildRequires: kdnssd-framework-devel +BuildRequires: kdbusaddons-devel +BuildRequires: kdoctools-devel BuildRequires: knewstuff-devel BuildRequires: kxmlgui-devel BuildRequires: libkdegames-devel BuildRequires: libkmahjongg-devel BuildRequires: update-desktop-files BuildRequires: xz -BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Qml) -BuildRequires: pkgconfig(Qt5Quick) -BuildRequires: pkgconfig(Qt5QuickWidgets) +BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: pkgconfig(Qt5Widgets) Summary: Mahjongg game License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kmahjongg-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kmahjongg-16.04.3.tar.xz -> kmahjongg-16.08.0.tar.xz ++++++ ++++ 15725 lines of diff (skipped)

1 0

commit klines for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package klines for openSUSE:Factory checked in at 2016-08-31 00:07:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/klines (Old) and /work/SRC/openSUSE:Factory/.klines.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "klines" Changes: -------- --- /work/SRC/openSUSE:Factory/klines/klines.changes 2016-07-24 19:47:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.klines.new/klines.changes 2016-08-31 00:07:50.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:19:33 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:10:55 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- klines-16.04.3.tar.xz New: ---- klines-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ klines.spec ++++++ --- /var/tmp/diff_new_pack.938ZFn/_old 2016-08-31 00:07:51.000000000 +0200 +++ /var/tmp/diff_new_pack.938ZFn/_new 2016-08-31 00:07:51.000000000 +0200 @@ -50,7 +50,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: klines-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ klines-16.04.3.tar.xz -> klines-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-16.04.3/.gitignore new/klines-16.08.0/.gitignore --- old/klines-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/klines-16.08.0/.gitignore 2016-08-03 14:30:56.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-16.04.3/CMakeLists.txt new/klines-16.08.0/CMakeLists.txt --- old/klines-16.04.3/CMakeLists.txt 2016-05-29 14:21:14.000000000 +0200 +++ new/klines-16.08.0/CMakeLists.txt 2016-08-03 14:30:56.000000000 +0200 @@ -27,7 +27,7 @@ include(ECMAddAppIcon) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) add_definitions( Files old/klines-16.04.3/doc/gamescreen.png and new/klines-16.08.0/doc/gamescreen.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-16.04.3/doc/index.docbook new/klines-16.08.0/doc/index.docbook --- old/klines-16.04.3/doc/index.docbook 2016-05-29 14:21:14.000000000 +0200 +++ new/klines-16.08.0/doc/index.docbook 2016-08-03 14:30:56.000000000 +0200 @@ -1,9 +1,6 @@ <?xml version="1.0" ?>  <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&kolorlines;"> - <!ENTITY kappversion "1.5"> - <!ENTITY package "kdegames">  <!ENTITY % English "INCLUDE" >  <!ENTITY % addindex "IGNORE">  ]> @@ -37,12 +34,12 @@ </copyright> <legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-06</date> -<releaseinfo>&kappversion; (&kde; 4.11)</releaseinfo> +<date>2016-05-10</date> +<releaseinfo>1.6 (Applications 16.04)</releaseinfo>  <abstract> - <para>This documentation describes the game of &kolorlines; version &kappversion;</para> + <para>This documentation describes the game of &kolorlines; version 1.6</para> </abstract>  @@ -64,7 +61,7 @@ <chapter id="introduction"><title>Introduction</title>  <note><title>Gametype:</title><para>Arcade</para></note> <note><title>Number of possible players:</title><para>One</para></note> - <para>&kolorlines; is a simple but highly addictive, one player game for &kde;. &kolorlines; has been inspired by well known game of <application>Color Lines</application>, written for <application>DOS</application>, by Olga Demina, Igor Ivkin and Gennady Denisov back in 1992.</para> + <para>&kolorlines; is a simple but highly addictive, one player game by &kde;. &kolorlines; has been inspired by well known game of <application>Color Lines</application>, written for <application>DOS</application>, by Olga Demina, Igor Ivkin and Gennady Denisov back in 1992.</para> <para>The goal of &kolorlines; is quite plain. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five. Once the line is complete it is removed from the board, therefore freeing precious space. In the same time the new balls keep arriving by three after each move, filling up the game board.</para> <para>&kolorlines; cannot be won, and is played against the high score exclusively. The game ends once the whole game board is filled up with balls.</para> </chapter> @@ -295,20 +292,6 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -&install.intro.documentation; - - -<sect1 id="Compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - &documentation.index; </book> <!-- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-16.04.3/mwidget.cpp new/klines-16.08.0/mwidget.cpp --- old/klines-16.04.3/mwidget.cpp 2016-05-29 14:21:14.000000000 +0200 +++ new/klines-16.08.0/mwidget.cpp 2016-08-03 14:30:56.000000000 +0200 @@ -26,6 +26,8 @@ MainWidget::MainWidget( QWidget* parent ) : QWidget( parent ) + , m_scene( nullptr ) + , m_next_label( nullptr ) { QBoxLayout *mainLay = new QHBoxLayout( this ); mainLay->setMargin( 0 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-16.04.3/previewitem.cpp new/klines-16.08.0/previewitem.cpp --- old/klines-16.04.3/previewitem.cpp 2016-05-29 14:21:14.000000000 +0200 +++ new/klines-16.08.0/previewitem.cpp 2016-08-03 14:30:56.000000000 +0200 @@ -28,6 +28,7 @@ PreviewItem::PreviewItem( QGraphicsScene* scene ) : QGraphicsItem( 0 ) { + Q_UNUSED( scene ); } void PreviewItem::paint( QPainter* p, const QStyleOptionGraphicsItem*, QWidget* ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klines-16.04.3/themes/pool.desktop new/klines-16.08.0/themes/pool.desktop --- old/klines-16.04.3/themes/pool.desktop 2016-05-29 14:21:14.000000000 +0200 +++ new/klines-16.08.0/themes/pool.desktop 2016-08-03 14:30:56.000000000 +0200 @@ -5,8 +5,10 @@ Name[ca@valencia]=Billar Name[da]=Pool Name[de]=Billard +Name[el]=Δεξαμενή Name[en_GB]=Pool Name[es]=Billar +Name[et]=Piljard Name[fi]=Biljardi Name[gl]=Billar Name[nl]=Pool

1 0

commit klickety for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package klickety for openSUSE:Factory checked in at 2016-08-31 00:07:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/klickety (Old) and /work/SRC/openSUSE:Factory/.klickety.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "klickety" Changes: -------- --- /work/SRC/openSUSE:Factory/klickety/klickety.changes 2016-07-24 19:47:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.klickety.new/klickety.changes 2016-08-31 00:07:49.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:19:25 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:10:15 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- klickety-16.04.3.tar.xz New: ---- klickety-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ klickety.spec ++++++ --- /var/tmp/diff_new_pack.7SWiNq/_old 2016-08-31 00:07:50.000000000 +0200 +++ /var/tmp/diff_new_pack.7SWiNq/_new 2016-08-31 00:07:50.000000000 +0200 @@ -38,7 +38,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Other Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: klickety-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ klickety-16.04.3.tar.xz -> klickety-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klickety-16.04.3/.gitignore new/klickety-16.08.0/.gitignore --- old/klickety-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/klickety-16.08.0/.gitignore 2016-06-13 22:09:27.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klickety-16.04.3/CMakeLists.txt new/klickety-16.08.0/CMakeLists.txt --- old/klickety-16.04.3/CMakeLists.txt 2016-04-12 14:31:59.000000000 +0200 +++ new/klickety-16.08.0/CMakeLists.txt 2016-06-13 22:09:27.000000000 +0200 @@ -31,7 +31,7 @@ include(ECMAddAppIcon) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) Files old/klickety-16.04.3/doc/config-background.png and new/klickety-16.08.0/doc/config-background.png differ Files old/klickety-16.04.3/doc/config-customgame.png and new/klickety-16.08.0/doc/config-customgame.png differ Files old/klickety-16.04.3/doc/config-general.png and new/klickety-16.08.0/doc/config-general.png differ Files old/klickety-16.04.3/doc/config-theme.png and new/klickety-16.08.0/doc/config-theme.png differ Files old/klickety-16.04.3/doc/gamescreen.png and new/klickety-16.08.0/doc/gamescreen.png differ Files old/klickety-16.04.3/doc/highscore.png and new/klickety-16.08.0/doc/highscore.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klickety-16.04.3/doc/index.docbook new/klickety-16.08.0/doc/index.docbook --- old/klickety-16.04.3/doc/index.docbook 2016-04-12 14:31:59.000000000 +0200 +++ new/klickety-16.08.0/doc/index.docbook 2016-06-13 22:09:27.000000000 +0200 @@ -1,10 +1,6 @@ <?xml version="1.0" ?>  <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY klickety "<application>Klickety</application>"> - <!ENTITY kappname "&klickety;"> - <!ENTITY package "kdegames"> - <!ENTITY kappversion "2.0"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> ]> @@ -42,11 +38,11 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-06</date> -<releaseinfo>&kappversion; (4.11)</releaseinfo> +<date>2016-05-09</date> +<releaseinfo>2.1+ (Applications 16.04)</releaseinfo> <abstract> -<para>&klickety; is a strategy game for &kde;, an adaption of the <application>Clickomania</application> game.</para> +<para>&klickety; is a strategy game by &kde;, an adaption of the <application>Clickomania</application> game.</para> </abstract>  @@ -250,7 +246,7 @@ <shortcut><keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo></shortcut> <guimenu>Game</guimenu> <guimenuitem>Load...</guimenuitem> -</menuchoice></term> +</menuchoice> (not in KSameMode) </term> <listitem><para>Loads a previously saved game.</para></listitem> </varlistentry> @@ -284,7 +280,7 @@ <shortcut><keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo></shortcut> <guimenu>Game</guimenu> <guimenuitem>Save</guimenuitem> -</menuchoice></term> +</menuchoice> (not in KSameMode)</term> <listitem><para>Saves the current state of the game to the disk.</para></listitem> </varlistentry> @@ -384,7 +380,7 @@ </variablelist> <para> -Additionally &kappname; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> +Additionally &klickety; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> menu items, for more information read the sections about the <ulink url="help:/fundamentals/ui.html#menus-settings" >Settings Menu</ulink> and <ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink> of the &kde; Fundamentals. @@ -529,14 +525,5 @@ &underGPL; </chapter> -<appendix id="installation"> -<title>Installation</title> -&install.intro.documentation; -<sect1 id="Compilation"> -<title>Compilation and Installation</title> -&install.compile.documentation; -</sect1> -</appendix> - &documentation.index; </book> Files old/klickety-16.04.3/doc/ksamemode.png and new/klickety-16.08.0/doc/ksamemode.png differ Files old/klickety-16.04.3/doc/numbered.png and new/klickety-16.08.0/doc/numbered.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klickety-16.04.3/org.kde.klickety.appdata.xml new/klickety-16.08.0/org.kde.klickety.appdata.xml --- old/klickety-16.04.3/org.kde.klickety.appdata.xml 2016-04-12 14:31:59.000000000 +0200 +++ new/klickety-16.08.0/org.kde.klickety.appdata.xml 2016-06-13 22:09:27.000000000 +0200 @@ -9,6 +9,7 @@ <name xml:lang="ca-valencia">Klickety</name> <name xml:lang="cs">Klickety</name> <name xml:lang="de">Klickety</name> + <name xml:lang="el">Klickety</name> <name xml:lang="en-GB">Klickety</name> <name xml:lang="es">Klickety</name> <name xml:lang="fi">Klickety</name> @@ -29,13 +30,13 @@ <name xml:lang="uk">Klickety</name> <name xml:lang="x-test">xxKlicketyxx</name> <name xml:lang="zh-CN">Klickety</name> - <name xml:lang="zh-TW">Klickety</name> <summary>Klickety is an adaptation of the "clickomania" game</summary> <summary xml:lang="ast">Klickety ye una adautación del xuegu «clickomania»</summary> <summary xml:lang="ca">Klickety és una adaptació del joc «Clickomania»</summary> <summary xml:lang="ca-valencia">Klickety és una adaptació del joc «Clickomania»</summary> <summary xml:lang="cs">Klickety je adaptace hry "clickomania"</summary> <summary xml:lang="de">Klickety ist ein Spiel für KDE, das „Clickomania“ nachempfunden ist</summary> + <summary xml:lang="el">Το Klickety είναι μια προσαρμογή του παιχνιδιού "clickomania"</summary> <summary xml:lang="en-GB">Klickety is an adaptation of the "clickomania" game</summary> <summary xml:lang="es">Klickety es una adaptación del juego «clickomania»</summary> <summary xml:lang="fi">Klickety on sovitus Clickomania-pelistä</summary> @@ -55,7 +56,6 @@ <summary xml:lang="sv">Klickety är en anpassning av spelet "clickomania"</summary> <summary xml:lang="uk">Klickety — реалізація гри «клікоманія»</summary> <summary xml:lang="x-test">xxKlickety is an adaptation of the "clickomania" gamexx</summary> - <summary xml:lang="zh-TW">Klickety 是一套 clickomania 的遊戲</summary> <description> Klickety is a strategy game for KDE, an adaption of the Clickomania game. @@ -65,6 +65,7 @@ El Klickety és un joc d'estratègia per al KDE, una adaptació del joc Clickomania. Klickety je strategická hra pro KDE. Je adaptací hry Clickomania. Klickety ist ein Strategiespiel für KDE, das „Clickomania“ nachempfunden ist. + Το Klickety είναι ένα παιχνίδι στρατηγικής για το KDE, μια προσαρμογή του παιχνιδιού Clickomania. Klickety is a strategy game for KDE, an adaption of the Clickomania game. Klickety es un juego de estrategia para KDE, adaptación del juego Clickomania. Klickety on strategiapeli KDE:lle – sovitus Clickomania-pelistä. @@ -84,7 +85,6 @@ Klickety är ett strategispel för KDE, en anpassning av spelet Clickomania. Klickety — стратегічна гра для KDE, варіант гри Clickomania («Клікоманія»). xxKlickety is a strategy game for KDE, an adaption of the Clickomania game.xx - Klickety 是 KDE 上類似 Clickomania 的策略遊戲。 </description> <url type="homepage">http://games.kde.org/game.php?game=klickety</url> <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=klickety</url> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klickety-16.04.3/org.kde.ksame.appdata.xml new/klickety-16.08.0/org.kde.ksame.appdata.xml --- old/klickety-16.04.3/org.kde.ksame.appdata.xml 2016-04-12 14:31:59.000000000 +0200 +++ new/klickety-16.08.0/org.kde.ksame.appdata.xml 2016-06-13 22:09:27.000000000 +0200 @@ -9,6 +9,7 @@ <name xml:lang="ca-valencia">KSame</name> <name xml:lang="cs">KSame</name> <name xml:lang="de">KSame</name> + <name xml:lang="el">KSame</name> <name xml:lang="en-GB">KSame</name> <name xml:lang="es">KSame</name> <name xml:lang="fi">KSame</name> @@ -28,12 +29,12 @@ <name xml:lang="uk">KSame</name> <name xml:lang="x-test">xxKSamexx</name> <name xml:lang="zh-CN">KSame</name> - <name xml:lang="zh-TW">KSame</name> <summary>KSame is a game mode of the game Klickety, which is an adaptation of the "clickomania" game.</summary> <summary xml:lang="ast">KSame ye un mou de xuegu de Klickety que ye una adautación del xuegu «clickomania».</summary> <summary xml:lang="ca">El KSame és un mode de partida del joc Klickety, que és una adaptació del joc «Clickomania».</summary> <summary xml:lang="ca-valencia">El KSame és un mode de partida del joc Klickety, que és una adaptació del joc «Clickomania».</summary> <summary xml:lang="de">KSame ist ein Spielmodus von Klickety, der dem Spiel „Clickomania“ nachempfunden ist.</summary> + <summary xml:lang="el">Το KSame είναι μια παραλλαγή του Klickety, το οποίο είναι προσαρμογή του "clickomania"</summary> <summary xml:lang="en-GB">KSame is a game mode of the game Klickety, which is an adaptation of the "clickomania" game.</summary> <summary xml:lang="es">KSame es un modo de juego de Klickety, que es una adaptación del juego «clickomania».</summary> <summary xml:lang="fi">KSame on pelitila Klickety-pelissä, joka taas on sovellus Clickomania-pelistä.</summary> @@ -52,7 +53,6 @@ <summary xml:lang="sv">Ksame är en spelvariant av spelet Klickety, som är en anpassning av spelet "clickomania".</summary> <summary xml:lang="uk">KSame — режим у грі Klickety, який є адаптацією гри «клікоманія».</summary> <summary xml:lang="x-test">xxKSame is a game mode of the game Klickety, which is an adaptation of the "clickomania" game.xx</summary> - <summary xml:lang="zh-TW">KSame 是 Klickety 的一種遊戲模式，類似 clickomania 遊戲。</summary> <description> KSame is a simple, yet challenging color matching game modeled after once famous game of SameGame. The idea behind KSame is to completely clear the game board filled with the multicolored marbles. @@ -60,6 +60,7 @@ El KSame es un joc senzill però estimulant de correspondències de colors, modelat després del famós joc SameGame. La idea rere el KSame és netejar completament el tauler de partida ple de marbres multicolors. El KSame s'un joc senzill però estimulant de correspondències de colors, modelat després del famós joc SameGame. La idea rere el KSame és netejar completament el tauler de partida ple de marbres multicolors. KSame ist ein einfaches aber herausforderndes Spiel, bei dem passende Farben gefunden werden müssen. Das Spiel ist dem ehemals berühmten Spiel SameGame nachempfunden. Ziel des Spiels ist, das gesamte, mit farbigen Murmeln gefüllte Spielfeld zu leeren. + Το KSame είναι ένα απλό, αλλά απιτητικό παιχνίδι ταιριάσματος χρωμάτων με βάση το κάποτε δημοφιλές παιχνίδι SameGame. Η ιδέα πίσω από το KSame είναι να καθαριστεί πλήρως ο πίνακας του παιχνιδιού που είναι γεμάτος με πολύχρωμες σφαίρες. KSame is a simple, yet challenging colour matching game modelled after once famous game of SameGame. The idea behind KSame is to completely clear the game board filled with the multicoloured marbles. KSame es un juego simple, aunque estimulante, de concordancia de colores modelado a imagen del una vez famoso juego SameGame. El objetivo de KSame es vaciar completamente el tablero de juego que está lleno de bolas multicolor. KSame on yksinkertainen mutta haastava värinsovituspeli, jonka esikuvana on aikanaan suosittu SameGame-peli. KSamen tavoitteena on tyhjentää koko pelilauta monivärisistä marmorilaatoista. @@ -78,7 +79,6 @@ Ksame är ett enkelt, men ändå utmanande färgjämförelsespel modellerat enligt det en gång berömda spelet Samegame. Idén bakom Ksame är att helt och hållet tömma spelbrädet, som är fyllt med mångfärgade kulor. KSame — проста, але захоплива гра у пошук відповідних кольорів. Джерелом натхнення для створення гри була гра SameGame. Дуже проста умова. На дошці будуть кульки. Приберіть їх всі. xxKSame is a simple, yet challenging color matching game modeled after once famous game of SameGame. The idea behind KSame is to completely clear the game board filled with the multicolored marbles.xx - KSame 是一套簡單但也很有挑戰性的遊戲，從知名的 SameGame 演變而來。KSame 目的是完全清除遊戲棋盤上的各種不同顏色。 </description> <url type="homepage">http://games.kde.org/game.php?game=klickety</url> <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=klickety</url>

1 0

commit klettres for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package klettres for openSUSE:Factory checked in at 2016-08-31 00:07:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/klettres (Old) and /work/SRC/openSUSE:Factory/.klettres.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "klettres" Changes: -------- --- /work/SRC/openSUSE:Factory/klettres/klettres.changes 2016-07-24 19:46:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.klettres.new/klettres.changes 2016-08-31 00:07:47.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:19:16 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:09:24 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- klettres-16.04.3.tar.xz New: ---- klettres-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ klettres.spec ++++++ --- /var/tmp/diff_new_pack.zkJTj8/_old 2016-08-31 00:07:48.000000000 +0200 +++ /var/tmp/diff_new_pack.zkJTj8/_new 2016-08-31 00:07:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: klettres -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Alphabet Learning Game License: GPL-2.0+ ++++++ klettres-16.04.3.tar.xz -> klettres-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klettres-16.04.3/doc/index.docbook new/klettres-16.08.0/doc/index.docbook --- old/klettres-16.04.3/doc/index.docbook 2016-04-20 14:34:42.000000000 +0200 +++ new/klettres-16.08.0/doc/index.docbook 2016-07-25 13:33:21.000000000 +0200 @@ -1,7 +1,6 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&klettres;"> - <!ENTITY package "kdeedu"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> ]> @@ -28,8 +27,8 @@ </copyright> <legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-31</date> -<releaseinfo>2.3 (&kde; 4.11)</releaseinfo> +<date>2016-04-20</date> +<releaseinfo>2.3 (Applications 16.04)</releaseinfo> <abstract> <para> @@ -200,7 +199,7 @@ </para> <para>Here is a screenshot of Level 2 with the <emphasis>kid</emphasis> mode, <emphasis>Kid</emphasis> theme and Danish language.</para> -<para>Clicking in the <guilabel>Level</guilabel> combo-box and choosing <guilabel>Level +<para>Clicking in the level combo-box and choosing <guilabel>Level 2</guilabel> or using the <guimenu>Level</guimenu> menu brings you to level 2. In that level, the user only hears the sound of the letter and has to type in the letter. If he is wrong, the letter appears to help him. </para> @@ -249,7 +248,7 @@ </para> <para>The sounds appear in random order. </para> <para>Clicking in the -<guilabel>Level</guilabel> combo-box or using the <guimenu>Level</guimenu> menu in the menubar +level combo-box or using the <guimenu>Level</guimenu> menu in the menubar and choosing <guilabel>Level 4</guilabel> brings you to level 4. In that level, the user only hears the sound of the syllable and has to type in the letters. This level is quite difficult @@ -480,27 +479,8 @@ <term><menuchoice> <guimenu>Look</guimenu> <guisubmenu>Themes</guisubmenu> -<guimenuitem>Kid</guimenuitem> </menuchoice></term> -<listitem><para><action>Switch</action> to the Kid theme</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<guimenu>Look</guimenu> -<guisubmenu>Themes</guisubmenu> -<guimenuitem>Desert</guimenuitem> -</menuchoice></term> -<listitem><para><action>Switch</action> to the Desert theme</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<guimenu>Look</guimenu> -<guisubmenu>Themes</guisubmenu> -<guimenuitem>Savannah</guimenuitem> -</menuchoice></term> -<listitem><para><action>Switch</action> to the Savannah theme</para></listitem> +<listitem><para><action>Switch</action> to the Kid, Desert, Savannah or Aqua theme</para></listitem> </varlistentry> <varlistentry> @@ -599,24 +579,12 @@ </qandaentry> <qandaentry> <question> -<para>I do not see some letters on the icons on the special <guimenuitem>Characters</guimenuitem> toolbar. I see rectangles instead for some languages.</para> -</question> -<answer> -<para>&klettres; in Czech and Slovak needs Arial and if you do not have this font installed, please ask your distribution support how to install it.</para> -<para>If you have &Windows; on your machine, you can use the TTF fonts from -&Windows; (Arial is in those) via &systemsettings; -> <guilabel>System -Administration</guilabel> -> <guilabel>Font Installer</guilabel> and add the &Windows; Font -folder.</para></answer> -</qandaentry> -<qandaentry> -<question> -<para>The letters on the icons on the <guimenuitem>Special Characters</guimenuitem> toolbar are too small for some languages.</para> +<para>I do not see some letters on the icons on the special <guimenuitem>Special Characters</guimenuitem> toolbar. I see rectangles instead or the icons are too small for some languages.</para> </question> <answer> <para>&klettres; in Czech and Slovak needs Arial and if you do not have this font installed, please ask your distribution support how to install it.</para> <para>If you have &Windows; on your machine, you can use the TTF fonts from -&Windows; (Arial is in those) via &systemsettings; -> <guilabel>System -Administration</guilabel> -> <guilabel>Font Installer</guilabel> and add the &Windows; Font +&Windows; (Arial is in those) via <guilabel>Font Management</guilabel> in the <guilabel>Appearance</guilabel> category of the &systemsettings; and add the &Windows; Font folder.</para></answer> </qandaentry> <qandaentry> Files old/klettres-16.04.3/doc/klettres-newstuff.png and new/klettres-16.08.0/doc/klettres-newstuff.png differ Files old/klettres-16.04.3/doc/klettres-newstuff2.png and new/klettres-16.08.0/doc/klettres-newstuff2.png differ Files old/klettres-16.04.3/doc/klettres1.png and new/klettres-16.08.0/doc/klettres1.png differ Files old/klettres-16.04.3/doc/klettres2.png and new/klettres-16.08.0/doc/klettres2.png differ Files old/klettres-16.04.3/doc/klettres3.png and new/klettres-16.08.0/doc/klettres3.png differ Files old/klettres-16.04.3/doc/klettres4.png and new/klettres-16.08.0/doc/klettres4.png differ Files old/klettres-16.04.3/doc/klettres5.png and new/klettres-16.08.0/doc/klettres5.png differ Files old/klettres-16.04.3/doc/klettres6.png and new/klettres-16.08.0/doc/klettres6.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klettres-16.04.3/org.kde.klettres.appdata.xml new/klettres-16.08.0/org.kde.klettres.appdata.xml --- old/klettres-16.04.3/org.kde.klettres.appdata.xml 2016-04-20 14:34:42.000000000 +0200 +++ new/klettres-16.08.0/org.kde.klettres.appdata.xml 2016-07-25 13:33:21.000000000 +0200 @@ -18,6 +18,7 @@ <name xml:lang="fr">KLettres</name> <name xml:lang="gl">KLettres</name> <name xml:lang="hu">KLettres</name> + <name xml:lang="it">KLettres</name> <name xml:lang="ko">KLettres</name> <name xml:lang="nds">KLettres</name> <name xml:lang="nl">KLettres</name> @@ -46,6 +47,7 @@ <summary xml:lang="fr">Apprenez l'alphabet</summary> <summary xml:lang="gl">Aprende o alfabeto.</summary> <summary xml:lang="hu">Tanulja meg az ABC-t</summary> + <summary xml:lang="it">Impara l'alfabeto</summary> <summary xml:lang="ko">알파벳 익히기</summary> <summary xml:lang="nds">Dat Alfabeet lehren</summary> <summary xml:lang="nl">Leer het alfabet</summary> @@ -73,6 +75,7 @@ KLettres on sovellus, joka on suunniteltu erityisesti auttamaan käyttäjää oppimaan uuden kielen aakkoset ja oppimaan sitten lukemaan yksinkertaisia tavuja. Käyttäjä voi olla kaksi ja puoli -vuotiaasta lapsesta aikuiseen, joka haluaa oppia vieraan kielen perusteet. Tällä hetkellä on saatavilla 25 kieltä: alasaksa, amerikanenglanti, arabia, brasilianportugali, brittienglanti, englannin äänteet, espanja, ganda, heprea, hollanti, italia, kannada, latinaistettu hindi, malajalam, norjan bokmål, pandžabi, ranska, saksa, slovakki, tanska, telugu, tšekki, ukraina, unkari ja venäjä. KLettresissä on nuorempia käyttäjiä varten oma käyttöliittymä ja teemoja. KLettres est une application spécialement conçue pour aider l'utilisateur à apprendre l'alphabet d'une nouvelle langue puis l'aider à apprendre à lire des syllabes simples. L'utilisateur peut être un jeune enfant à partir de deux ans et demi ou un adulte qui souhaite apprendre les rudiments d'une langue étrangère. 25 langues sont disponibles : arabe, portugais brésilien, tchèque, danois, néerlandais, anglais britannique, anglais américain, anglais phonétique, français, allemand, hébreu, hongrois, italien, kannada, bas saxon, malayalam, norvégien bokmål, pendjabi, luganda, hindi romanisé, russe, espagnol, slovaque, télougou et ukrainien. KLettres fournit une interface utilisateur spéciale et des thèmes pour les jeunes utilisateurs. KLettres é un programa deseñado especialmente para axudar aos usuarios a aprender o alfabeto nun novo idioma e aprender a continuación a ler sílabas sinxelas. O usuario pode ser por exemplo un rapaz de dous anos e medio ou un adulto que quere aprender a base dun idioma estranxeiro. Actualmente hai 25 idiomas dispoñíbeis: alemán, árabe, baixo saxón, bokmål, canarés, castelán, checo, danés, eslovaco, francés, hebreo, hindi romanizado, holandés, húngaro, inglés británico, inglés estadounidense, inglés silábico, italiano, luganda, malaialam, portugués do Brasil, punjabi, ruso, telugu e ucraíno. KLettres fornece unha interface de usuario e temas especiais para rapaces. + KLettres è un'applicazione progettata specificatamente per aiutare gli utenti ad imparare l'alfabeto di una nuova lingua e quindi a leggere semplici sillabe. L'utente può essere un bambino dai due anni e mezzo in su oppure un adulto che vuole imparare le basi di una lingua straniera. Al momento sono supportate 25 lingue: arabo, portoghese del Brasile, ceco, danese, olandese, inglese britannico, inglese americano, inglese fonetico, francese, tedesco, ebraico, ungherese, italiano, kannada, basso sassone, malese, norvegese bokmål, punjabi, luganda, hindi romanizzato, russo, spagnolo, slovacco, telugu e ucraino. KLettres is en Programm, dat Brukers hölpt, dat Alfabet in en nieg Spraak to lehren un denn ok eenfach Sülven in disse Spraak to lesen. De Bruker kann en lütt Blaag vun tweeenhalf Johr oder en Opwussen wesen, de dat Grundweten vun en nieg Spraak lehren will. Opstunns sünd 25 Spraken verföögbor: Araabsch, Brasiliaansch Portugeesch, Tschechsch, Däänsch, Nedderlannsch, Britsch Engelsch, US Engelsch, Foneetsch Engelsch, Franzöösch, Hoochdüütsch, Hebrääsch, Ungaarsch, Italieensch, Kannadaansch, Plattdüütsch, Malayalaamsch, Norweegsch (Bokmål), Pandschaabsch, Lugandsch, Romaniseert Hindi, Russ'sch, Spaansch, Slowaaksch, Telugu un Ukrainsch. KLetrres hett en besünner Böversiet un Mustern för jünger Brukers. KLettres is een toepassing speciaal ontworpen om de gebruiker te helpen bij het leren van het alfabet van een nieuwe taal en daarna het leren lezen van eenvoudige zinnen. De gebruiker kan een jong kind zijn in de leeftijd van twee en een half of een volwassene die de basis van een vreemde taal wil leren. Er zijn nu 25 talen beschikbaar: Arabisch, Braziliaans Portugees, Tsjechisch, Deens, Nederlands, Brits Engels, VS Engels, Fonetisch Engels, Frans, Duits, Hebreeuws, Hongaars, Italiaans, Kannada, Nedersaksisch, Malayalam, Noors Bokmål, Punjabi, Luganda, Geromaniseerd Hindi, Russisch, Spaans, Slowaaks, Telugu en Oekraïens. KLettres biedt een speciaal gebruikersinterface en thema's voor jonge gebruikers. KLettres jest programem specjalnie zaprojektowanym do pomocy użytkownikowi przy nauce alfabetu w nowym języku, a następnie do nauki prostych sylab. Użytkownik może być małym dzieckiem w wieku dwóch i pół roku lub dorosłym, który chce się nauczyć podstaw obcego języka. Dostępnych jest dwadzieścia języków: Arabski, Czeski, Portugalski Brazylijski, Angielski Brytyjski, Duński, Holenderski, Angielski, Francuski, Niemiecki, Hebrajski, Węgierski, Włoski, Kanadyjski, Dolno saksoński, Luganda, Malayalam, Zromanizowany Hindi, Hiszpański, Słowacki, Telugu i Ukraiński. KLettres zapewnia własny układ sterowania programem i wystroje dla młodszych użytkowników.

1 0

commit kjumpingcube for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kjumpingcube for openSUSE:Factory checked in at 2016-08-31 00:07:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjumpingcube (Old) and /work/SRC/openSUSE:Factory/.kjumpingcube.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kjumpingcube" Changes: -------- --- /work/SRC/openSUSE:Factory/kjumpingcube/kjumpingcube.changes 2016-07-24 19:46:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kjumpingcube.new/kjumpingcube.changes 2016-08-31 00:07:45.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:19:02 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:08:04 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kjumpingcube-16.04.3.tar.xz New: ---- kjumpingcube-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjumpingcube.spec ++++++ --- /var/tmp/diff_new_pack.AdEi2J/_old 2016-08-31 00:07:46.000000000 +0200 +++ /var/tmp/diff_new_pack.AdEi2J/_new 2016-08-31 00:07:46.000000000 +0200 @@ -42,7 +42,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kjumpingcube-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ kjumpingcube-16.04.3.tar.xz -> kjumpingcube-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-16.04.3/.gitignore new/kjumpingcube-16.08.0/.gitignore --- old/kjumpingcube-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kjumpingcube-16.08.0/.gitignore 2016-06-19 12:28:34.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-16.04.3/CMakeLists.txt new/kjumpingcube-16.08.0/CMakeLists.txt --- old/kjumpingcube-16.04.3/CMakeLists.txt 2016-04-07 17:14:47.000000000 +0200 +++ new/kjumpingcube-16.08.0/CMakeLists.txt 2016-06-19 12:28:34.000000000 +0200 @@ -11,13 +11,14 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons Config + ConfigWidgets Crash - WidgetsAddons DBusAddons + DocTools + KIO I18n - ConfigWidgets XmlGui - KDELibs4Support + WidgetsAddons ) find_package(KF5KDEGames 4.9.0 REQUIRED) @@ -26,10 +27,11 @@ include(ECMAddAppIcon) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_subdirectory(pics) add_subdirectory(doc) @@ -58,9 +60,11 @@ target_link_libraries(kjumpingcube KF5KDEGames - KF5::XmlGui + KF5::CoreAddons + KF5::Crash KF5::DBusAddons - KF5::KDELibs4Support + KF5::KIOWidgets + KF5::XmlGui Qt5::Svg ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-16.04.3/ai_box.cpp new/kjumpingcube-16.08.0/ai_box.cpp --- old/kjumpingcube-16.04.3/ai_box.cpp 2016-04-07 17:14:47.000000000 +0200 +++ new/kjumpingcube-16.08.0/ai_box.cpp 2016-06-19 12:28:34.000000000 +0200 @@ -19,7 +19,7 @@ #include "ai_box.h" // #include <QDebug> -#include "stdio.h" +#include <cstdio> AI_Box::AI_Box (QObject * parent, int side) : @@ -56,9 +56,9 @@ void AI_Box::destroyBox() { - delete m_maxValues; - delete m_neighbors; - delete m_stack; + delete[] m_maxValues; + delete[] m_neighbors; + delete[] m_stack; while (! m_undoList.isEmpty()) { discard (m_undoList.takeLast()); } @@ -343,8 +343,8 @@ void AI_Box::discard (Position * pos) { - delete pos->owners; - delete pos->values; + delete[] pos->owners; + delete[] pos->values; delete pos; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-16.04.3/ai_main.cpp new/kjumpingcube-16.08.0/ai_main.cpp --- old/kjumpingcube-16.04.3/ai_main.cpp 2016-04-07 17:14:47.000000000 +0200 +++ new/kjumpingcube-16.08.0/ai_main.cpp 2016-06-19 12:28:34.000000000 +0200 @@ -486,7 +486,7 @@ { if (m_side != side) { qDebug() << "NEW AI_Box SIZE NEEDED: was" << m_side << "now" << side; - delete m_randomSeq; + delete[] m_randomSeq; resizeBox (side); m_randomSeq = new int [side * side]; } @@ -631,7 +631,7 @@ bool won = statsBox->doMove (m->player, m->x * m_side + m->y); statsBox->printBox(); qDeleteAll (*(m->searchStats)); - delete m; + delete[] m; } m_moveStats.clear(); delete statsBox; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-16.04.3/ai_main.h new/kjumpingcube-16.08.0/ai_main.h --- old/kjumpingcube-16.04.3/ai_main.h 2016-04-07 17:14:47.000000000 +0200 +++ new/kjumpingcube-16.08.0/ai_main.h 2016-06-19 12:28:34.000000000 +0200 @@ -25,7 +25,7 @@ #include <QThread> #include <QMutex> -#include <krandomsequence.h> +#include <KRandomSequence> #include "ai_base.h" #include "ai_box.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-16.04.3/doc/index.docbook new/kjumpingcube-16.08.0/doc/index.docbook --- old/kjumpingcube-16.04.3/doc/index.docbook 2016-04-07 17:14:47.000000000 +0200 +++ new/kjumpingcube-16.08.0/doc/index.docbook 2016-06-19 12:28:34.000000000 +0200 @@ -1,9 +1,6 @@ <?xml version="1.0" ?>  <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&kjumpingcube;"> - <!ENTITY kappversion "2.1"> - <!ENTITY package "kdegames">  <!ENTITY % English "INCLUDE" >  <!ENTITY % addindex "IGNORE">  ]> @@ -42,12 +39,12 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2013-06-05</date> -<releaseinfo>&kappversion; (&kde; 4.11)</releaseinfo> +<date>2016-06-09</date> +<releaseinfo>2.1 (Applications 16.04)</releaseinfo>  <abstract> - <para>This documentation describes the game of &kjumpingcube; version &kappversion;</para> + <para>This documentation describes the game of &kjumpingcube; version 2.1</para> </abstract>  @@ -433,20 +430,6 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -&install.intro.documentation; - - -<sect1 id="Compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - &documentation.index; </book> <!-- Files old/kjumpingcube-16.04.3/doc/settings.png and new/kjumpingcube-16.08.0/doc/settings.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-16.04.3/game.cpp new/kjumpingcube-16.08.0/game.cpp --- old/kjumpingcube-16.04.3/game.cpp 2016-04-07 17:14:47.000000000 +0200 +++ new/kjumpingcube-16.08.0/game.cpp 2016-06-19 12:28:34.000000000 +0200 @@ -26,13 +26,16 @@ #include "kcubeboxwidget.h" #include "settingswidget.h" -#include <KConfigDialog> // IDW test. #include <QDebug> -#include <KLocalizedString> -#include <KMessageBox> #include <QFileDialog> #include <QTemporaryFile> -#include <kio/netaccess.h> + +#include <KConfigDialog> // IDW test. +#include <KIO/CopyJob> +#include <KIO/Job> +#include <KJobWidgets/KJobWidgets> +#include <KLocalizedString> +#include <KMessageBox> #include "prefs.h" @@ -565,7 +568,7 @@ QUrl url; do { - url = QFileDialog::getSaveFileUrl (m_view, QString(), m_gameURL.url(), "*.kjc"); + url = QFileDialog::getSaveFileUrl (m_view, QString(), m_gameURL, "*.kjc"); if (url.isEmpty()) return; @@ -576,8 +579,9 @@ url.setPath(url.path() +".kjc"); } - if (KIO::NetAccess::exists (url, KIO::NetAccess::DestinationSide, - m_view)) { + KIO::StatJob* statJob = KIO::stat(url, KIO::StatJob::DestinationSide, 0); + KJobWidgets::setWindow(statJob, m_view); + if (statJob->exec()) { QString mes=i18n("The file %1 exists.\n" "Do you want to overwrite it?", url.url()); result = KMessageBox::warningContinueCancel @@ -599,7 +603,10 @@ saveProperties (game); config.sync(); - if (KIO::NetAccess::upload (tempFile.fileName(), m_gameURL, m_view)) { + KIO::FileCopyJob *job = KIO::file_copy(QUrl::fromLocalFile(tempFile.fileName()), m_gameURL, -1, KIO::Overwrite); + KJobWidgets::setWindow(job, m_view); + job->exec(); + if (! job->error() ) { emit statusMessage (i18n("Game saved as %1", m_gameURL.url()), false); } else { @@ -614,19 +621,25 @@ QUrl url; do { - url = QFileDialog::getOpenFileUrl (m_view, QString(), m_gameURL.url(), "*.kjc"); + url = QFileDialog::getOpenFileUrl (m_view, QString(), m_gameURL, "*.kjc"); if (url.isEmpty()) return; - if (! KIO::NetAccess::exists(url, KIO::NetAccess::SourceSide, m_view)) { + KIO::StatJob* statJob = KIO::stat(url, KIO::StatJob::SourceSide, 0); + KJobWidgets::setWindow(statJob, m_view); + if (! statJob->exec()) { QString mes = i18n("The file %1 does not exist!", url.url()); KMessageBox::sorry (m_view, mes); fileOk = false; } } while (! fileOk); - QString tempFile; - if (KIO::NetAccess::download (url, tempFile, m_view)) { - KConfig config( tempFile, KConfig::SimpleConfig); + QTemporaryFile tempFile; + tempFile.open(); + KIO::FileCopyJob *job = KIO::file_copy(url, QUrl::fromLocalFile(tempFile.fileName()), -1, KIO::Overwrite); + KJobWidgets::setWindow(job, m_view); + job->exec(); + if (! job->error() ) { + KConfig config( tempFile.fileName(), KConfig::SimpleConfig); KConfigGroup main (&config, "KJumpingCube"); if (! main.hasKey ("Version")) { QString mes = i18n("The file %1 is not a KJumpingCube gamefile!", @@ -640,8 +653,6 @@ readProperties (game); emit setAction (UNDO, false); - - KIO::NetAccess::removeTempFile (tempFile); } else KMessageBox::sorry (m_view, i18n("There was an error loading file\n%1", @@ -797,8 +808,8 @@ int index = x * m_side + y; owner.sprintf ("%u", m_box->owner (index)); value.sprintf ("%u", m_box->value (index)); - list.append (owner.toAscii()); - list.append (value.toAscii()); + list.append (owner.toLatin1()); + list.append (value.toLatin1()); config.writeEntry (key, list); list.clear(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-16.04.3/kcubeboxwidget.cpp new/kjumpingcube-16.08.0/kcubeboxwidget.cpp --- old/kjumpingcube-16.04.3/kcubeboxwidget.cpp 2016-04-07 17:14:47.000000000 +0200 +++ new/kjumpingcube-16.08.0/kcubeboxwidget.cpp 2016-06-19 12:28:34.000000000 +0200 @@ -28,7 +28,7 @@ #include <QPainter> #include <assert.h> -#include <kcursor.h> +#include <KCursor> #include <QStandardPaths> #include "prefs.h" @@ -74,7 +74,7 @@ animationTime = Prefs::animationSpeed() * 150; // NOTE: When the box-size (Prefs::cubeDim()) changes, Game::newGame() calls - // KCubeBoxWidget::loadSettings() first, then KCubeBoxWidget::setDim(). + // KCubeBoxWidget::loadSettings() first, then KCubeBoxWidget::setDim(). if (reColorCubes) { makeStatusPixmaps (sWidth); // Make new status pixmaps. @@ -185,7 +185,7 @@ color0 = Prefs::color0(); KgTheme theme((QByteArray())); - theme.readFromDesktopFile(QStandardPaths::locate(QStandardPaths::DataLocation, "pics/default.desktop")); + theme.readFromDesktopFile(QStandardPaths::locate(QStandardPaths::AppDataLocation, "pics/default.desktop")); svg.load (theme.graphicsPath()); initCubes(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-16.04.3/kjumpingcube.cpp new/kjumpingcube-16.08.0/kjumpingcube.cpp --- old/kjumpingcube-16.04.3/kjumpingcube.cpp 2016-04-07 17:14:47.000000000 +0200 +++ new/kjumpingcube-16.08.0/kjumpingcube.cpp 2016-06-19 12:28:34.000000000 +0200 @@ -28,12 +28,12 @@ #include <QSignalMapper> #include <QStatusBar> #include <KLocalizedString> -#include <kmessagebox.h> -#include <kstandardgameaction.h> +#include <KMessageBox> +#include <KStandardGameAction> #include <QAction> -#include <kactioncollection.h> -#include <kstandardaction.h> -#include <kconfigdialog.h> +#include <KActionCollection> +#include <KStandardAction> +#include <KConfigDialog> #include <QWidgetAction> #define MESSAGE_TIME 2000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-16.04.3/kjumpingcube.h new/kjumpingcube-16.08.0/kjumpingcube.h --- old/kjumpingcube-16.04.3/kjumpingcube.h 2016-04-07 17:14:47.000000000 +0200 +++ new/kjumpingcube-16.08.0/kjumpingcube.h 2016-06-19 12:28:34.000000000 +0200 @@ -24,7 +24,7 @@ #include <QLabel> -#include <kxmlguiwindow.h> +#include <KXmlGuiWindow> #include <game.h> class QAction;

1 0

commit kiten for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kiten for openSUSE:Factory checked in at 2016-08-31 00:07:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiten (Old) and /work/SRC/openSUSE:Factory/.kiten.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiten" Changes: -------- --- /work/SRC/openSUSE:Factory/kiten/kiten.changes 2016-07-24 19:46:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiten.new/kiten.changes 2016-08-31 00:07:43.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:18:47 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:07:22 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kiten-16.04.3.tar.xz New: ---- kiten-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiten.spec ++++++ --- /var/tmp/diff_new_pack.j4lDPG/_old 2016-08-31 00:07:45.000000000 +0200 +++ /var/tmp/diff_new_pack.j4lDPG/_new 2016-08-31 00:07:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: kiten -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Japanese Reference/Study Tool License: GPL-2.0+ ++++++ kiten-16.04.3.tar.xz -> kiten-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kiten/kiten-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kiten.new/kiten-16.08.0.tar.xz differ: char 26, line 1

1 0

commit kiriki for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kiriki for openSUSE:Factory checked in at 2016-08-31 00:07:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiriki (Old) and /work/SRC/openSUSE:Factory/.kiriki.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiriki" Changes: -------- --- /work/SRC/openSUSE:Factory/kiriki/kiriki.changes 2016-07-24 19:46:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiriki.new/kiriki.changes 2016-08-31 00:07:41.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:18:36 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:06:56 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kiriki-16.04.3.tar.xz New: ---- kiriki-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiriki.spec ++++++ --- /var/tmp/diff_new_pack.vocPbH/_old 2016-08-31 00:07:42.000000000 +0200 +++ /var/tmp/diff_new_pack.vocPbH/_new 2016-08-31 00:07:42.000000000 +0200 @@ -50,7 +50,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Other Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kiriki-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -79,8 +79,8 @@ %{_kf5_applicationsdir}/org.kde.kiriki.desktop %{_kf5_iconsdir}/hicolor/*/apps/kiriki.* %{_kf5_appsdir}/kiriki/ -%_datadir/kxmlgui5/kiriki/ -%dir %_datadir/appdata -%_datadir/appdata/org.kde.kiriki.appdata.xml +%{_kf5_kxmlguidir}/kiriki/ +%dir %{_kf5_appstreamdir} +%{_kf5_appstreamdir}/org.kde.kiriki.appdata.xml %changelog ++++++ kiriki-16.04.3.tar.xz -> kiriki-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-16.04.3/CMakeLists.txt new/kiriki-16.08.0/CMakeLists.txt --- old/kiriki-16.04.3/CMakeLists.txt 2016-04-12 14:31:40.000000000 +0200 +++ new/kiriki-16.08.0/CMakeLists.txt 2016-06-19 22:37:44.000000000 +0200 @@ -18,7 +18,6 @@ ConfigWidgets IconThemes XmlGui - DocTools ) find_package(KF5KDEGames 4.9.0 REQUIRED) @@ -27,7 +26,7 @@ include(ECMAddAppIcon) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) Files old/kiriki-16.04.3/doc/configuration.png and new/kiriki-16.08.0/doc/configuration.png differ Files old/kiriki-16.04.3/doc/gameboard.png and new/kiriki-16.08.0/doc/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-16.04.3/doc/index.docbook new/kiriki-16.08.0/doc/index.docbook --- old/kiriki-16.04.3/doc/index.docbook 2016-04-12 14:31:40.000000000 +0200 +++ new/kiriki-16.08.0/doc/index.docbook 2016-06-19 22:37:44.000000000 +0200 @@ -1,13 +1,10 @@ <?xml version="1.0" ?>  <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&kiriki;"> - <!ENTITY kappversion "0.2"> - <!ENTITY package "kdegames">  <!ENTITY % English "INCLUDE" >  <!ENTITY % addindex "IGNORE">  ]> - + <book id="kiriki" lang="&language;">  <bookinfo> <title>The &kiriki; Handbook</title> @@ -27,15 +24,15 @@ <year>2007</year> <holder>&Albert.Astals.Cid;</holder> </copyright> -<legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-06</date> -<releaseinfo>&kappversion; (&kde; 4.11)</releaseinfo> - +<legalnotice>&FDLNotice;</legalnotice> +<date>2016-05-09</date> +<releaseinfo>0.3.0 (Applications 16.04)</releaseinfo> +  <abstract> - <para>This documentation describes the game of &kiriki; version &kappversion;</para> + <para>This documentation describes the game of &kiriki; version 0.3.0</para> </abstract> - +  <keywordset> <keyword>KDE</keyword>  @@ -55,11 +52,23 @@ <chapter id="introduction"><title>Introduction</title>  <note><title>Gametype:</title><para>Dice, Arcade</para></note> <note><title>Number of possible players:</title><para>Six</para></note> - <para> - &kiriki; is an addictive and fun dice game for &kde;, designed to be played by as many as six players. Participants have to collect points by rolling five dice for up to three times per single turn. Each roll generates a specific combination of numbers which the player is free to either accept or decline. However, each specific combination of numbers can be accepted only once. After thirteen turns the game ends and the scores are compared. The player with the largest amount of points wins the game. + +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="gameboard.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&kiriki; Game Board</phrase> +</textobject> +</mediaobject> +</screenshot> + +<para> + &kiriki; is an addictive and fun dice game by &kde;, designed to be played by as many as six players. Participants have to collect points by rolling five dice for up to three times per single turn. Each roll generates a specific combination of numbers which the player is free to either accept or decline. However, each specific combination of numbers can be accepted only once. After thirteen turns the game ends and the scores are compared. The player with the largest amount of points wins the game. </para> </chapter> - + <chapter id="howto"><title>How to Play</title>   <note><title>Objective:</title><para>Earn more score points than either of the opponents.</para></note> @@ -77,7 +86,7 @@ <note><title>Note:</title><para>The detailed description of the score pattern values can be found in the <link linkend="rules_and_tips">‘Game Rules, Strategies and Tips’</link> section of this handbook.</para></note> <para>Right after that your turn ends and the next participant’s turn begins. This sequence repeats some thirteen times and then the game ends, the scores are calculated and the high scores are awarded.</para> </chapter> - + <chapter id="rules_and_tips"><title>Game Rules, Strategies and Tips</title>   <sect1><title>Game Rules</title> @@ -115,8 +124,8 @@ <listitem><para>Each individual score pattern can only be used once per game per player. Therefore, once the score pattern has been used by one player it can no longer be used by that same player. However, another player can still use it, unless he has used this same pattern up already.</para></listitem> </itemizedlist> </sect1> -</chapter> - +</chapter> + <chapter id="interface"><title>Interface Overview</title>  <sect1 id="menu"> <title>Menu Items</title> @@ -175,7 +184,7 @@ </variablelist> <para> -Additionally &kappname; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> +Additionally &kiriki; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> menu items, for more information read the sections about the <ulink url="help:/fundamentals/ui.html#menus-settings" >Settings Menu</ulink> and <ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink> of the &kde; Fundamentals. @@ -217,22 +226,38 @@ </chapter> <chapter id="configuration"><title>Game Configuration</title>  + +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="configuration.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>Game Configuration</phrase> +</textobject> +</mediaobject> +</screenshot> + <para>The &kiriki; configuration dialog lets you configure the number of participants, manage their identities, and their response times.</para> <note><title>Note:</title><para>You can change the response times for Artificial Intelligence driven players only.</para></note> <para><guilabel>Number of players:</guilabel> this field defines the number of players for &kiriki;. The values allowed here range between two and six.</para> -<note><title>Note:</title><para>The number of players cannot be less than two.</para></note> + <para><guilabel>1.</guilabel>-<guilabel>6.</guilabel> Numbered fields are the identities of the participating players. You can change their names as well as specify whether they will be human controlled, or driven by the Artificial Intelligence. To define who controls the player use a check box located on the right hand side, right next to the name entry box.</para> -<note><title>Note:</title><para>The first player must always be human controlled.</para></note> +<para>The first player must always be human controlled.</para> + <para>Changes to number of participants and their identities will be applied on the next game.</para> + <para><guilabel>Delay between computers move (msec):</guilabel> lets you specify the delay between Artificial Intelligence's turns. The value of this field is zero by default, meaning that the Artificial Intelligence reacts instantaneously.</para> + <note><title>Note:</title><para>The maximum value for this field is 999 milliseconds.</para></note> + <para>Use <guilabel>Font Size</guilabel> and <guilabel>Row Height</guilabel> to adjust the score board to your liking.</para> <para>If you want to play immediately at &kiriki; startup disable the default option <guilabel>Show demonstration game at startup</guilabel>.</para> </chapter> - + <chapter id="credits"><title>Credits and License</title>   - + <para>&kiriki;</para>  @@ -245,27 +270,13 @@ <para> Documentation copyright 2007 Eugene Trounev <email>eugene.trounev(a)gmail.com</email> </para> - + &underFDL; &underGPL; - + </chapter> - -<appendix id="installation"> -<title>Installation</title> - -&install.intro.documentation; - - -<sect1 id="Compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - -&documentation.index; + +&documentation.index; </book> <!-- Local Variables: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-16.04.3/src/diceswidget.cpp new/kiriki-16.08.0/src/diceswidget.cpp --- old/kiriki-16.04.3/src/diceswidget.cpp 2016-04-12 14:31:40.000000000 +0200 +++ new/kiriki-16.08.0/src/diceswidget.cpp 2016-06-19 22:37:44.000000000 +0200 @@ -28,15 +28,15 @@ m_highlightDice[3] = m_highlightDice[4] = 0; setMinimumSize(90, 450); - - m_images[0] = QPixmap(QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("images/dice-none.png"))); - m_images[1] = QPixmap(QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("images/dice-1.png"))); - m_images[2] = QPixmap(QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("images/dice-2.png"))); - m_images[3] = QPixmap(QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("images/dice-3.png"))); - m_images[4] = QPixmap(QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("images/dice-4.png"))); - m_images[5] = QPixmap(QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("images/dice-5.png"))); - m_images[6] = QPixmap(QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("images/dice-6.png"))); - + + m_images[0] = QPixmap(QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("images/dice-none.png"))); + m_images[1] = QPixmap(QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("images/dice-1.png"))); + m_images[2] = QPixmap(QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("images/dice-2.png"))); + m_images[3] = QPixmap(QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("images/dice-3.png"))); + m_images[4] = QPixmap(QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("images/dice-4.png"))); + m_images[5] = QPixmap(QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("images/dice-5.png"))); + m_images[6] = QPixmap(QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("images/dice-6.png"))); + rollAll(); } @@ -169,7 +169,7 @@ int dicesWidget::totalSum() const { - return m_dice[0] + m_dice[1] + m_dice[2] + m_dice[3] + m_dice[4]; + return m_dice[0] + m_dice[1] + m_dice[2] + m_dice[3] + m_dice[4]; } void dicesWidget::paintEvent(QPaintEvent *) @@ -199,7 +199,7 @@ int x = e -> x(); int y = e -> y(); - + if (x > 5 && x < 85 && y > 10) { y -= 10; @@ -243,6 +243,6 @@ if (getSimilar(i) >= number) have = true; i++; } - if (have) return totalSum(); + if (have) return totalSum(); else return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-16.04.3/src/org.kde.kiriki.appdata.xml new/kiriki-16.08.0/src/org.kde.kiriki.appdata.xml --- old/kiriki-16.04.3/src/org.kde.kiriki.appdata.xml 2016-04-12 14:31:40.000000000 +0200 +++ new/kiriki-16.08.0/src/org.kde.kiriki.appdata.xml 2016-06-19 22:37:44.000000000 +0200 @@ -9,6 +9,7 @@ <name xml:lang="ca-valencia">Kiriki</name> <name xml:lang="cs">Kiriki</name> <name xml:lang="de">Kiriki</name> + <name xml:lang="el">Kiriki</name> <name xml:lang="en-GB">Kiriki</name> <name xml:lang="es">Kiriki</name> <name xml:lang="fi">Kiriki</name> @@ -29,13 +30,13 @@ <name xml:lang="uk">Kiriki</name> <name xml:lang="x-test">xxKirikixx</name> <name xml:lang="zh-CN">Kiriki</name> - <name xml:lang="zh-TW">Kiriki</name> <summary>Yahtzee-like Dice Game</summary> <summary xml:lang="ast">Xuegu de daos paecíu a Yahtzee</summary> <summary xml:lang="ca">Joc de daus com el Yahtzee</summary> <summary xml:lang="ca-valencia">Joc de daus com el Yahtzee</summary> <summary xml:lang="cs">Hra s kostkami podobná Yahtzee</summary> <summary xml:lang="de">„Kniffel“-Würfelspiel</summary> + <summary xml:lang="el">Παιχνίδι με ζάρια όπως το Yahtzee</summary> <summary xml:lang="en-GB">Yahtzee-like Dice Game</summary> <summary xml:lang="es">Juego de dados similar al Yahtzee</summary> <summary xml:lang="fi">Yatzy-mainen noppapeli</summary> @@ -56,7 +57,6 @@ <summary xml:lang="uk">Гра схожа на покер з кістками</summary> <summary xml:lang="x-test">xxYahtzee-like Dice Gamexx</summary> <summary xml:lang="zh-CN">类似 Yahtzee 的骰子游戏</summary> - <summary xml:lang="zh-TW">類似 Yahtzee 的骰子遊戲</summary> <description> Kiriki is an addictive and fun dice game, designed to be played by as many as six players. @@ -65,6 +65,7 @@ El Kiriki és un joc de daus addictiu i divertit, dissenyat per jugar-se fins a sis jugadors. Els participants tenen que recollir punts tirant cinc daus fins a tres vegades per cada torn. El Kiriki és un joc de daus addictiu i divertit, dissenyat per jugar-se fins a sis jugadors. Els participants tenen que recollir punts tirant cinc daus fins a tres vegades per cada torn. Kiriki ist ein Würfelspiel, das mit bis zu sechs Spielern gespielt werden kann. Die Spieler sammeln Punkte, indem Sie die fünf Würfel in einem Zug bis zu drei Mal würfeln. + Το Kiriki είναι ένα εθιστικό και ευχάριστο παιχνίδι με ζάρια, σχεδιασμένο να παίζεται μέχρι και με έξι παίκτες. Οι συμμετέχοντες συλλέγουν πόντους ρίχνοντας πέντε ζάρια μέχρι και τρεις φορές κάθε φορά. Kiriki is an addictive and fun dice game, designed to be played by as many as six players. Participants have to collect points by rolling five dice for up to three times per single turn. Kiriki es un juego de dados divertido y adictivo, en el que pueden participar hasta seis jugadores. Los participantes deben reunir puntos tirando cinco dados hasta tres veces en cada turno. Kiriki on hauska ja koukuttava noppapeli, joka on suunniteltu jopa kuudelle pelaajalle. Pelaajat keräävät pisteitä heittämällä viittä noppaa enintään kolmesti kullakin vuorolla. @@ -85,7 +86,6 @@ Kiriki — захоплива гра у кістки. Її створено для гри, у якій братимуть участь не більше шести гравців. Учасники гри збирають очки, виконуючи до трьох кидків п’яти кісток кожного ходу. xxKiriki is an addictive and fun dice game, designed to be played by as many as six players. Participants have to collect points by rolling five dice for up to three times per single turn.xx Kiriki 是一个吸引人的有趣的骰子游戏，设计最多六人游玩。参与者通过每轮最多重投三次骰子来收集点数。 - Kiriki 是個有趣的骰子遊戲，最多可以六個人玩。玩的人一輪擲五顆骰子，最多三次，並計算總點數。 </description> <url type="homepage">http://games.kde.org/game.php?game=kiriki</url> <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=kiriki</url>

1 0

commit killbots for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package killbots for openSUSE:Factory checked in at 2016-08-31 00:07:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/killbots (Old) and /work/SRC/openSUSE:Factory/.killbots.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "killbots" Changes: -------- --- /work/SRC/openSUSE:Factory/killbots/killbots.changes 2016-07-24 19:46:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.killbots.new/killbots.changes 2016-08-31 00:07:39.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:18:00 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:05:31 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- killbots-16.04.3.tar.xz New: ---- killbots-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ killbots.spec ++++++ --- /var/tmp/diff_new_pack.at3FNo/_old 2016-08-31 00:07:40.000000000 +0200 +++ /var/tmp/diff_new_pack.at3FNo/_new 2016-08-31 00:07:40.000000000 +0200 @@ -38,7 +38,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: killbots-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ killbots-16.04.3.tar.xz -> killbots-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-16.04.3/.gitignore new/killbots-16.08.0/.gitignore --- old/killbots-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/killbots-16.08.0/.gitignore 2016-08-04 14:31:15.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-16.04.3/CMakeLists.txt new/killbots-16.08.0/CMakeLists.txt --- old/killbots-16.04.3/CMakeLists.txt 2016-05-29 14:21:01.000000000 +0200 +++ new/killbots-16.08.0/CMakeLists.txt 2016-08-04 14:31:15.000000000 +0200 @@ -28,7 +28,7 @@ include(ECMAddAppIcon) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMAddTests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-16.04.3/doc/index.docbook new/killbots-16.08.0/doc/index.docbook --- old/killbots-16.04.3/doc/index.docbook 2016-05-29 14:21:01.000000000 +0200 +++ new/killbots-16.08.0/doc/index.docbook 2016-08-04 14:31:15.000000000 +0200 @@ -1,8 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY killbots "<application>Killbots</application>"> - <!ENTITY kappname "&killbots;"> - <!ENTITY package "kdegames"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> ]> @@ -31,8 +28,8 @@ <legalnotice>&FDLNotice;</legalnotice> - <date>2013-05-05</date> - <releaseinfo>1.1.0 (&kde; 4.11)</releaseinfo> + <date>2016-05-09</date> + <releaseinfo>1.2.0 (Applications 16.04)</releaseinfo> <abstract> <para>&killbots; is a &kde; port of the classic BSD console game <command>robots</command>.</para> @@ -250,7 +247,7 @@ <varlistentry id="move-menu"> <term><menuchoice> - <shortcut><keycap>-</keycap></shortcut> + <shortcut><keycap>R</keycap></shortcut> <guimenu>Move</guimenu> <guimenuitem>Teleport</guimenuitem> </menuchoice></term> @@ -258,7 +255,7 @@ </varlistentry> <varlistentry> <term><menuchoice> - <shortcut><keycap>+</keycap></shortcut> + <shortcut><keycap>T</keycap></shortcut> <guimenu>Move</guimenu> <guimenuitem>Teleport Safely</guimenuitem> </menuchoice></term> @@ -274,7 +271,7 @@ </varlistentry> <varlistentry> <term><menuchoice> - <shortcut><keycap>.</keycap></shortcut> + <shortcut><keycap>F</keycap></shortcut> <guimenu>Move</guimenu> <guimenuitem>Vaporizer</guimenuitem> </menuchoice></term> @@ -282,7 +279,7 @@ </varlistentry> <varlistentry> <term><menuchoice> - <shortcut><keycap>*</keycap></shortcut> + <shortcut><keycap>V</keycap></shortcut> <guimenu>Move</guimenu> <guimenuitem>Wait Out Round</guimenuitem> </menuchoice></term> @@ -608,21 +605,6 @@ &underGPL; </chapter> -<appendix id="installation"> - <title>Installation</title> - - <sect1 id="getting-killbots"> - <title>How to obtain &killbots;</title> - &install.intro.documentation; - </sect1> - - <sect1 id="compilation"> - <title>Compilation and Installation</title> - &install.compile.documentation; - </sect1> - -</appendix> - &documentation.index; </book> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-16.04.3/org.kde.killbots.desktop new/killbots-16.08.0/org.kde.killbots.desktop --- old/killbots-16.04.3/org.kde.killbots.desktop 2016-05-29 14:21:01.000000000 +0200 +++ new/killbots-16.08.0/org.kde.killbots.desktop 2016-08-04 14:31:15.000000000 +0200 @@ -36,7 +36,7 @@ Name[ro]=Killbots Name[ru]=Killbots Name[sk]=Killbots -Name[sl]=Ubijalski roboti +Name[sl]=Killbots Name[sq]=Killbots Name[sr]=К‑злоботи Name[sr@ijekavian]=К‑злоботи @@ -54,8 +54,10 @@ GenericName[ca@valencia]=Joc d'estratègia amb robots GenericName[da]=Strategispil med robotter GenericName[de]=Strategiespiel mit Robotern +GenericName[el]=Παιχνίδι στρατηγικής με ρομπότ GenericName[en_GB]=Strategy Game with Robots GenericName[es]=Juego de estrategia con robots +GenericName[et]=Strateegiamäng robotitega GenericName[fi]=Strategiapeli roboteilla GenericName[gl]=Xogo de estratexia con robots GenericName[nl]=Strategisch spel met robots @@ -78,8 +80,10 @@ Comment[ca@valencia]=Un joc del KDE amb robots assassins i teletransport. Comment[da]=Et KDE-spil med dræberrobotter og teleportering. Comment[de]=Ein Spiel für KDE mit Killermaschinen und Teleportieren. +Comment[el]=Ένα παιχνίδι του KDE με ρομπότ δολοφόνους και τηλεμεταφορά. Comment[en_GB]=A KDE game of killer robots and teleportation. Comment[es]=Un juego de KDE de robots asesinos y teletransporte. +Comment[et]=KDE tapjarobotite ja teleportatsiooni mäng. Comment[fi]=KDE-peli tappajaroboteista ja teleportaatiosta. Comment[gl]=Un xogo para KDE de robots asasinos e teleportación. Comment[nl]=Een KDE-spel met dodende robots en tele-porteren. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-16.04.3/rulesets/daleks.desktop new/killbots-16.08.0/rulesets/daleks.desktop --- old/killbots-16.04.3/rulesets/daleks.desktop 2016-05-29 14:21:01.000000000 +0200 +++ new/killbots-16.08.0/rulesets/daleks.desktop 2016-08-04 14:31:15.000000000 +0200 @@ -76,7 +76,7 @@ Description[pt_BR]=<qt>Uma aproximação das regras usadas no Daleks, um jogo de robôs para os primeiros computadores da Apple.É atribuído ao herói um ponto de energia que poderá ser usado para alimentar a chave de parafusos sônica. Todas as outras funcionalidades especiais estão desativadas.</qt> Description[ru]=<qt>Правила подобны тем, что использовались в Daleks, игре типа robots для ранних компьютеров Apple.Герой на каждом раунде получает одну единицу энергии для питания звуковой отвёртки. Никаких других особенностей нет.</qt> Description[sk]=<qt>Aproximácia pravidiel použitých v Daleks, hre s robotmi pre skoré Apple počítače. Hrdina má pridelenú jednu energiu v každom kole, ktorá sa môže použiť na zosilnenie sonického skrutkovača. Všetky ostatné špeciálne funkcie sú zakázané.</qt> -Description[sl]=<qt>Približek pravilom uporabljenih v Daleksu, robotom podobni igri za prve računalnike Apple.Junak dobi eno energijo vsak krog, ki jo lahko porabi za napajanje soničnega izvijača. Vse ostale posebne zmožnosti so onemogočene.</qt> +Description[sl]=<qt>Približek pravilom uporabljenih v Daleksu, robotom podobni igri za prve računalnike Apple.Junak dobi eno energijo vsak krog, ki jo lahko porabi za napajanje zvočnega izvijača. Vse ostale posebne zmožnosti so onemogočene.</qt> Description[sr]=<qt>Правила слична онима из Далека, роботолике игре за ране Еплове рачунаре.Јунак добија по јединицу енергије у свакој рунди, која служи као напајање звучног шрафцигера. Све друге посебне могућности су искључене.</qt> Description[sr@ijekavian]=<qt>Правила слична онима из Далека, роботолике игре за ране Еплове рачунаре.Јунак добија по јединицу енергије у свакој рунди, која служи као напајање звучног шрафцигера. Све друге посебне могућности су искључене.</qt> Description[sr@ijekavianlatin]=<qt>Pravila slična onima iz Daleka, robotolike igre za rane Appleove računare.Junak dobija po jedinicu energije u svakoj rundi, koja služi kao napajanje zvučnog šrafcigera. Sve druge posebne mogućnosti su isključene.</qt> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-16.04.3/rulesets/default.desktop new/killbots-16.08.0/rulesets/default.desktop --- old/killbots-16.04.3/rulesets/default.desktop 2016-05-29 14:21:01.000000000 +0200 +++ new/killbots-16.08.0/rulesets/default.desktop 2016-08-04 14:31:15.000000000 +0200 @@ -36,7 +36,7 @@ Name[ro]=Killbots Name[ru]=Killbots Name[sk]=Killbots -Name[sl]=Ubijalski roboti +Name[sl]=Killbots Name[sq]=Killbots Name[sr]=К‑злоботи Name[sr@ijekavian]=К‑злоботи @@ -82,7 +82,7 @@ Description[pt_BR]=<qt>O jogo padrão do Killbots.Inclui uma grelha de tamanho médio, teleportes seguros, inimigos rápidos e montes de lixo para empurrar.</qt> Description[ru]=<qt>Тип игры по умолчанию.Игровое поле среднего размера, безопасные телепорты, быстрые враги и перемещаемый мусор.</qt> Description[sk]=<qt>Predvolený typ hry Killbots.Zahŕňa mriežku strednej veľkosti, bezpečné teleporty, rýchlych nepriateľov a posúvateľné junkheapy.</qt> -Description[sl]=<qt>Privzeti pravilnik igre UbijalsKi roboti.Mreža je srednje velikosti, vsebuje varne teleportacije, hitre robote in kupe smeti, ki jih je mogoče potiskati.</qt> +Description[sl]=<qt>Privzeti pravilnik igre Killbots.Mreža je srednje velikosti, vsebuje varne teleportacije, hitre robote in kupe smeti, ki jih je mogoče potiskati.</qt> Description[sr]=<qt>Подразумевани тип игре К‑злобота.Укључује средње велико поље, безбедно телепортовање, брзе непријатеље и кршеве који се могу гурати.</qt> Description[sr@ijekavian]=<qt>Подразумијевани тип игре К‑злобота.Укључује средње велико поље, безбједно телепортовање, брзе непријатеље и кршеве који се могу гурати.</qt> Description[sr@ijekavianlatin]=<qt>Podrazumijevani tip igre K‑zlobota.Uključuje srednje veliko polje, bezbjedno teleportovanje, brze neprijatelje i krševe koji se mogu gurati.</qt> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-16.04.3/rulesets/easy.desktop new/killbots-16.08.0/rulesets/easy.desktop --- old/killbots-16.04.3/rulesets/easy.desktop 2016-05-29 14:21:01.000000000 +0200 +++ new/killbots-16.08.0/rulesets/easy.desktop 2016-08-04 14:31:15.000000000 +0200 @@ -35,7 +35,7 @@ Name[ro]=Ușor Name[ru]=Лёгкий Name[sk]=Jednoduchá -Name[sl]=Lahko +Name[sl]=Lahka Name[sq]=E Lehtë Name[sr]=Лако Name[sr@ijekavian]=Лако @@ -81,7 +81,7 @@ Description[pt_BR]=<qt>Uma versão simplificada do jogo "Killbots".Inclui uma grelha de jogo maior, preenchida com montes de lixo, uma determinada quantidade de energia e um teto de energia que vai aumentando.</qt> Description[ru]=<qt>Упрощённая версия типа игры «Killbots».Большее игровое поле, заранее добавляемый на поле мусор, начальный запас и увеличивающийся предел энергии.</qt> Description[sk]=<qt>Jednoduchšia verzia typu hry "Killbots". Zahŕňa väčšiu hernú mriežku vyplnenú junkheapmi, počiatočnou dávkou energiu a zvyšujúci krčah energie.</qt> -Description[sl]=<qt>Lažja različica igre UbijalsKi roboti.Vsebuje večjo igralno mreži, kjer so že v naprej postavljeni kupi smeti. Tu je tudi začetna zaloga energije in povečevanje največje mogoče energije.</qt> +Description[sl]=<qt>Lažja različica igre Killbots.Vsebuje večjo igralno mreži, kjer so že v naprej postavljeni kupi smeti. Tu je tudi začetna zaloga energije in povečevanje največje mogoče energije.</qt> Description[sr]=<qt>Лакша верзија игре К‑злоботи.Укључује веће играчко поље већ прошарано кршевима, почетном залихом енергије и повећавајућим ограничењем енергије.</qt> Description[sr@ijekavian]=<qt>Лакша верзија игре К‑злоботи.Укључује веће играчко поље већ прошарано кршевима, почетном залихом енергије и повећавајућим ограничењем енергије.</qt> Description[sr@ijekavianlatin]=<qt>Lakša verzija igre K‑zloboti.Uključuje veće igračko polje već prošarano krševima, početnom zalihom energije i povećavajućim ograničenjem energije.</qt> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-16.04.3/themes/mountainadventure.desktop new/killbots-16.08.0/themes/mountainadventure.desktop --- old/killbots-16.04.3/themes/mountainadventure.desktop 2016-05-29 14:21:01.000000000 +0200 +++ new/killbots-16.08.0/themes/mountainadventure.desktop 2016-08-04 14:31:15.000000000 +0200 @@ -50,8 +50,10 @@ Description[ca@valencia]=Indiana Gnomes lluita contra fantasmes i ratpenats en un costat de la muntanya bromosa. Description[da]=Indiana Gnomes kæmper mod spøgelser og flagermus på en tåget bjergside. Description[de]=Indiana Gnomes kämpft gegen Geister und Fledermäuse in einer nebligen Bergwand. +Description[el]=O Indiana Gnomes πολεμά φαντάσματα και νυχτερίδες σε μια ομιχλώδη βουνοπλαγιά. Description[en_GB]=Indiana Gnomes battles ghosts and bats on a misty mountainside. Description[es]=Indiana Gnomes lucha contra fantasmas y murciélagos en una ladera de la montaña neblinosa. +Description[et]=Indiana Gnomes võitleb tontide ja nahkhiirtega uduhägustes mägedes. Description[fi]=Indiana Gnomes taistelee aaveita ja lepakoita vastaan sumuisella vuorenrinteellä. Description[gl]=Indiana Gnomes loita con pantasmas e morcegos nunha montaña neboenta. Description[nl]=Indiana Gnomes vecht tegen geesten en vleermuizen op een mistige berg. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-16.04.3/themes/robotkill.desktop new/killbots-16.08.0/themes/robotkill.desktop --- old/killbots-16.04.3/themes/robotkill.desktop 2016-05-29 14:21:01.000000000 +0200 +++ new/killbots-16.08.0/themes/robotkill.desktop 2016-08-04 14:31:15.000000000 +0200 @@ -6,7 +6,7 @@ Name[ca@valencia]=Robot assassí Name[da]=Robot Kill Name[de]=Roboterzerstörung -Name[el]=Σκότωμα ρομπότ +Name[el]=Εξουδετέρωση ρομπότ Name[en_GB]=Robot Kill Name[es]=Robot Kill Name[et]=Robotite tapmine @@ -79,7 +79,7 @@ Description[ro]=Tematica Killbots implicită. Description[ru]=Стандартное оформление Killbots Description[sk]=Štandardná téma Killbots. -Description[sl]=Privzeta tema za igro UbijalsKi roboti. +Description[sl]=Privzeta tema za igro Killbots. Description[sq]=Tema e parazgjedhur Killbots. Description[sr]=Подразумевана тема К‑злобота. Description[sr@ijekavian]=Подразумијевана тема К‑злобота.

1 0

commit kigo for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kigo for openSUSE:Factory checked in at 2016-08-31 00:07:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kigo (Old) and /work/SRC/openSUSE:Factory/.kigo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kigo" Changes: -------- --- /work/SRC/openSUSE:Factory/kigo/kigo.changes 2016-07-24 19:46:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kigo.new/kigo.changes 2016-08-31 00:07:37.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:17:52 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:05:15 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kigo-16.04.3.tar.xz New: ---- kigo-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kigo.spec ++++++ --- /var/tmp/diff_new_pack.wBkhtb/_old 2016-08-31 00:07:38.000000000 +0200 +++ /var/tmp/diff_new_pack.wBkhtb/_new 2016-08-31 00:07:38.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Other Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kigo-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kigo-16.04.3.tar.xz -> kigo-16.08.0.tar.xz ++++++

1 0

commit kig for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kig for openSUSE:Factory checked in at 2016-08-31 00:07:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kig (Old) and /work/SRC/openSUSE:Factory/.kig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kig" Changes: -------- --- /work/SRC/openSUSE:Factory/kig/kig.changes 2016-07-24 19:46:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kig.new/kig.changes 2016-08-31 00:07:36.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:17:43 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:04:50 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kig-16.04.3.tar.xz New: ---- kig-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kig.spec ++++++ --- /var/tmp/diff_new_pack.2bk2c6/_old 2016-08-31 00:07:37.000000000 +0200 +++ /var/tmp/diff_new_pack.2bk2c6/_new 2016-08-31 00:07:37.000000000 +0200 @@ -17,7 +17,7 @@ Name: kig -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Interactive Geometry License: GPL-2.0+ ++++++ kig-16.04.3.tar.xz -> kig-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-16.04.3/misc/common.cpp new/kig-16.08.0/misc/common.cpp --- old/kig-16.04.3/misc/common.cpp 2016-04-28 00:33:28.000000000 +0200 +++ new/kig-16.08.0/misc/common.cpp 2016-04-28 00:34:52.000000000 +0200 @@ -366,7 +366,8 @@ double b2 = xao*xao + yao*yao; double numerator = (xdo * yao - xao * ydo); - if ( numerator == 0 ) + /* mp: note that we should never compare with zero due to floating-point arithmetic */ + if ( isSingular (xdo, ydo, xao, yao) ) { // problem: xdo * yao == xao * ydo <=> xdo/ydo == xao / yao // this means that the lines ac and ab have the same direction, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-16.04.3/misc/kigpainter.cpp new/kig-16.08.0/misc/kigpainter.cpp --- old/kig-16.04.3/misc/kigpainter.cpp 2016-04-28 00:33:28.000000000 +0200 +++ new/kig-16.08.0/misc/kigpainter.cpp 2016-04-28 00:34:52.000000000 +0200 @@ -86,14 +86,14 @@ Coordinate bottomLeft = center - Coordinate(radius, radius); Coordinate topRight = center + Coordinate(radius, radius); Rect r( bottomLeft, topRight ); - QRect qr = toScreen( r ); + QRectF qr = toScreenF( r ); mP.drawEllipse ( qr ); if( mNeedOverlay ) circleOverlay( center, radius ); } void KigPainter::drawSegment( const Coordinate& from, const Coordinate& to ) { - QPoint tF = toScreen(from), tT = toScreen(to); + QPointF tF = toScreenF(from), tT = toScreenF(to); mP.drawLine( tF, tT ); if( mNeedOverlay ) segmentOverlay( from, to ); } @@ -506,6 +506,11 @@ return msi.toScreen( p ); } +QPointF KigPainter::toScreenF( const Coordinate& p ) const +{ + return msi.toScreenF( p ); +} + void KigPainter::drawGrid( const CoordinateSystem& c, bool showGrid, bool showAxes ) { c.drawGrid( *this, showGrid, showAxes ); @@ -549,6 +554,11 @@ return msi.toScreen( r ); } +QRectF KigPainter::toScreenF( const Rect& r ) const +{ + return msi.toScreenF( r ); +} + QRect KigPainter::toScreenEnlarge( const Rect& r ) const { if ( overlayenlarge == 0 ) return msi.toScreen( r ); @@ -973,7 +983,7 @@ { Rect krect( 0, 0, 2*radius, 2*radius ); krect.setCenter( center ); - QRect rect = toScreen( krect ); + QRectF rect = toScreenF( krect ); mP.drawArc( rect, startangle, angle ); setWholeWinOverlay(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-16.04.3/misc/kigpainter.h new/kig-16.08.0/misc/kigpainter.h --- old/kig-16.04.3/misc/kigpainter.h 2016-04-28 00:33:28.000000000 +0200 +++ new/kig-16.08.0/misc/kigpainter.h 2016-04-28 00:34:52.000000000 +0200 @@ -89,6 +89,8 @@ QPoint toScreen( const Coordinate& p ) const; QRect toScreen( const Rect& r ) const; + QPointF toScreenF( const Coordinate& p ) const; + QRectF toScreenF( const Rect& r ) const; QRect toScreenEnlarge( const Rect& r ) const; Coordinate fromScreen( const QPoint& p ) const; Rect fromScreen( const QRect& r ) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-16.04.3/misc/screeninfo.cc new/kig-16.08.0/misc/screeninfo.cc --- old/kig-16.04.3/misc/screeninfo.cc 2016-04-28 00:33:28.000000000 +0200 +++ new/kig-16.08.0/misc/screeninfo.cc 2016-04-28 00:34:52.000000000 +0200 @@ -58,6 +58,23 @@ ).normalized(); } +QPointF ScreenInfo::toScreenF( const Coordinate& p ) const +{ + Coordinate t = p - mkrect.bottomLeft(); + t *= mqrect.width(); + t /= mkrect.width(); + // invert the y-axis: 0 is at the bottom ! + return QPointF( t.x, mqrect.height() - t.y ); +} + +QRectF ScreenInfo::toScreenF( const Rect& r ) const +{ + return QRectF( + toScreenF( r.bottomLeft() ), + toScreenF( r.topRight() ) + ).normalized(); +} + double ScreenInfo::pixelWidth() const { Coordinate a = fromScreen( QPoint( 0, 0 ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-16.04.3/misc/screeninfo.h new/kig-16.08.0/misc/screeninfo.h --- old/kig-16.04.3/misc/screeninfo.h 2016-04-28 00:33:28.000000000 +0200 +++ new/kig-16.08.0/misc/screeninfo.h 2016-04-28 00:34:52.000000000 +0200 @@ -40,6 +40,8 @@ QPoint toScreen( const Coordinate& p ) const; QRect toScreen( const Rect& r ) const; + QPointF toScreenF( const Coordinate& p ) const; + QRectF toScreenF( const Rect& r ) const; double pixelWidth() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-16.04.3/objects/arc_type.cc new/kig-16.08.0/objects/arc_type.cc --- old/kig-16.04.3/objects/arc_type.cc 2016-04-28 00:33:28.000000000 +0200 +++ new/kig-16.08.0/objects/arc_type.cc 2016-04-28 00:34:52.000000000 +0200 @@ -41,7 +41,7 @@ #include <qstringlist.h> /* - * arc by three points + * oriented arc by three points */ static const char constructarcstartingstat[] = I18N_NOOP( "Construct an arc starting at this point" ); @@ -85,12 +85,14 @@ Coordinate center; double angle = 0.; double startangle = 0.; + int orientation = 1; if ( args.size() == 3 ) { Coordinate c = static_cast<const PointImp*>( args[2] )->coordinate(); center = calcCenter( a, b, c ); if ( ! center.valid() ) { +/* TODO: return correctly oriented segment! */ if ( fabs( a.x - c.x ) > fabs( a.y - c.y ) ) { if ( ( b.x - a.x)*(c.x - b.x) > 1e-12 ) return new SegmentImp(a, c); @@ -100,6 +102,15 @@ } return new InvalidImp; } + /* this is also done in calcCenter... should optimize in some way */ + double xdo = b.x-a.x; + double ydo = b.y-a.y; + + double xao = c.x-a.x; + double yao = c.y-a.y; + + if ( xdo * yao - xao * ydo < 0.0 ) orientation = -1; + Coordinate ad = a - center; Coordinate bd = b - center; Coordinate cd = c - center; @@ -138,7 +149,7 @@ }; double radius = ( a - center ).length(); - return new ArcImp( center, radius, startangle, angle ); + return new ArcImp( center, orientation*radius, startangle, angle ); } const ObjectImpType* ArcBTPType::impRequirement( const ObjectImp*, const Args& ) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-16.04.3/objects/arc_type.h new/kig-16.08.0/objects/arc_type.h --- old/kig-16.04.3/objects/arc_type.h 2016-04-28 00:33:28.000000000 +0200 +++ new/kig-16.08.0/objects/arc_type.h 2016-04-28 00:34:52.000000000 +0200 @@ -23,6 +23,7 @@ /** * an arc by a start point, an intermediate point and an end point + * (with orientation) */ class ArcBTPType : public ArgsParserObjectType diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-16.04.3/objects/circle_imp.cc new/kig-16.08.0/objects/circle_imp.cc --- old/kig-16.04.3/objects/circle_imp.cc 2016-04-28 00:33:28.000000000 +0200 +++ new/kig-16.08.0/objects/circle_imp.cc 2016-04-28 00:34:52.000000000 +0200 @@ -59,12 +59,12 @@ void CircleImp::draw( KigPainter& p ) const { - p.drawCircle( mcenter, mradius ); + p.drawCircle( mcenter, fabs( mradius ) ); } bool CircleImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { - return fabs((mcenter - p).length() - mradius) <= w.screenInfo().normalMiss( width ); + return fabs((mcenter - p).length() - fabs( mradius )) <= w.screenInfo().normalMiss( width ); } bool CircleImp::inRect( const Rect& r, int width, const KigWidget& w ) const @@ -78,9 +78,9 @@ // we allow a miss of some pixels .. double miss = w.screenInfo().normalMiss( width ); - double bigradius = mradius + miss; + double bigradius = fabs( mradius ) + miss; bigradius *= bigradius; - double smallradius = mradius - miss; + double smallradius = fabs( mradius ) - miss; smallradius *= smallradius; const int in = -1; @@ -212,7 +212,12 @@ double CircleImp::radius() const { - return mradius; + return fabs( mradius ); +} + +double CircleImp::orientation() const +{ + return (mradius > 0)?1:(-1); } double CircleImp::surface() const @@ -369,6 +374,6 @@ Rect CircleImp::surroundingRect() const { - Coordinate d( mradius, mradius ); + Coordinate d( fabs( mradius ), fabs( mradius ) ); return Rect( mcenter - d, mcenter + d ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-16.04.3/objects/circle_imp.h new/kig-16.08.0/objects/circle_imp.h --- old/kig-16.04.3/objects/circle_imp.h 2016-04-28 00:33:28.000000000 +0200 +++ new/kig-16.08.0/objects/circle_imp.h 2016-04-28 00:34:52.000000000 +0200 @@ -74,6 +74,10 @@ */ double radius() const; /** + * Return the orientation of this circle. + */ + double orientation() const; + /** * Return the square radius of this circle. Use this in preference * to sqr( radius() ). */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-16.04.3/objects/circle_type.cc new/kig-16.08.0/objects/circle_type.cc --- old/kig-16.04.3/objects/circle_type.cc 2016-04-28 00:33:28.000000000 +0200 +++ new/kig-16.08.0/objects/circle_type.cc 2016-04-28 00:34:52.000000000 +0200 @@ -61,12 +61,6 @@ return new CircleImp( a, ( b - a ).length() ); } -const CircleBTPType* CircleBTPType::instance() -{ - static const CircleBTPType t; - return &t; -} - static const ArgsParser::spec argsspecCircleBTP[] = { { PointImp::stype(), constructcirclethroughpointstat, @@ -88,6 +82,12 @@ { } +const CircleBTPType* CircleBTPType::instance() +{ + static const CircleBTPType t; + return &t; +} + ObjectImp* CircleBTPType::calc( const Args& args, const KigDocument& ) const { if ( ! margsparser.checkArgs( args, 2 ) ) return new InvalidImp; @@ -131,7 +131,18 @@ const Coordinate center = calcCenter( a, b, c ); if ( center.valid() ) - return new CircleImp( center, (center - a ).length() ); + { + /* this is also done in calcCenter... should optimize in some way */ + double xdo = b.x-a.x; + double ydo = b.y-a.y; + + double xao = c.x-a.x; + double yao = c.y-a.y; + + double determinant = (xdo * yao - xao * ydo); + if (determinant > 0) return new CircleImp( center, (center - a ).length() ); + else return new CircleImp( center, -(center - a ).length() ); + } /* * case of collinear points, we need to identify the intermediate one @@ -141,7 +152,7 @@ double xmax = fmax( a.x, fmax( b.x, c.x) ); double ymin = fmin( a.y, fmin( b.y, c.y) ); double ymax = fmax( a.y, fmax( b.y, c.y) ); - double axy, bxy, cxy; + double d, axy, bxy, cxy; /* decide whether to work with x coordinate or y coordinate */ @@ -150,30 +161,30 @@ axy = a.x; bxy = b.x; cxy = c.x; + d = xmax - xmin; } else { axy = a.y; bxy = b.y; cxy = c.y; + d = ymax - ymin; } - /* - * compute baricentric coordinate of c with respect to a and b - * (if a and c are not coincident) - */ - if ( fabs( cxy - axy ) < 1e-6*fabs( bxy - axy ) ) return new InvalidImp; - double t = (bxy - axy)/(cxy - axy); + if ( fabs( axy - cxy ) >= d ) // b between a and c + return new LineImp( a, c ); + if ( fabs( cxy - bxy ) >= d ) // a between c and b + return new LineImp( c, b ); - if ( fabs( t ) < 1e-6 || fabs( 1.0 - t ) < 1e-6 ) return new InvalidImp; + // otherwise: c between b and a + return new LineImp( b, a); /* - * t < 0: a between c and b - * 0 < t < 1: b between a and c - * t > 1: c between a and b + * mp: note that the orientation of the new line is from a to c + * if b is intermediate, otherwise it is reversed whenever + * two of the three points cross each-other. + * This should give consistent results when intersecting circles that + * degenerate into lines */ - if ( t < 0.0 ) return new LineImp( c, b ); - if ( t > 1.0 ) return new LineImp( a, b ); - return new LineImp( a, c ); } const ObjectImpType* CircleBCPType::resultId() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-16.04.3/objects/circle_type.h new/kig-16.08.0/objects/circle_type.h --- old/kig-16.04.3/objects/circle_type.h 2016-04-28 00:33:28.000000000 +0200 +++ new/kig-16.08.0/objects/circle_type.h 2016-04-28 00:34:52.000000000 +0200 @@ -51,7 +51,7 @@ }; /** - * Circle by three points + * Circle by three points (with orientation) */ class CircleBTPType : public ArgsParserObjectType @@ -66,4 +66,5 @@ const ObjectImpType* resultId() const; }; + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-16.04.3/objects/intersection_types.cc new/kig-16.08.0/objects/intersection_types.cc --- old/kig-16.04.3/objects/intersection_types.cc 2016-04-28 00:33:28.000000000 +0200 +++ new/kig-16.08.0/objects/intersection_types.cc 2016-04-28 00:34:52.000000000 +0200 @@ -57,6 +57,32 @@ ObjectImp* ConicLineIntersectionType::calc( const Args& parents, const KigDocument& doc ) const { + /* + * special case of a circle that degenerates into a line. This is possible e.g. for + * circles by three points when the points get aligned. + */ + if ( parents.size() == 3 && parents[0]->inherits( AbstractLineImp::stype() ) && + parents[1]->inherits( AbstractLineImp::stype() ) && + parents[2]->inherits( IntImp::stype() ) ) + { + int side = static_cast<const IntImp*>( parents[2] )->data(); + assert( side == 1 || side == -1 ); + const LineData degline = static_cast<const AbstractLineImp*>( parents[0] )->data(); + const LineData line = static_cast<const AbstractLineImp*>( parents[1] )->data(); + const double vecprod = degline.dir().y * line.dir().x - degline.dir().x * line.dir().y; + /* + * mp: In this case only one of the two points must be valid (the other is "pushed" + * to infinity). The choice of which one is done such that we avoid abrupt points exchange + * when dinamically movint points + */ + if (side*vecprod < 0) + { + Coordinate p = calcIntersectionPoint( degline, line ); + return new PointImp( p ); + } + return new InvalidImp(); + } + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; int side = static_cast<const IntImp*>( parents[2] )->data(); @@ -70,7 +96,7 @@ // easy case.. const CircleImp* c = static_cast<const CircleImp*>( parents[0] ); ret = calcCircleLineIntersect( - c->center(), c->squareRadius(), line, side ); + c->center(), c->squareRadius(), line, c->orientation()*side ); } else { @@ -493,6 +519,41 @@ ObjectImp* CircleCircleIntersectionType::calc( const Args& parents, const KigDocument& ) const { + if ( parents.size() == 3 && + ( parents[0]->inherits( LineImp::stype() ) || parents[1]->inherits( LineImp::stype() ) ) && + parents[2]->inherits( IntImp::stype() ) ) + { + /* This the special case when one or both circles degenerate into a line + */ + int il = 0; + int ori = 1; + if ( parents[1]->inherits( LineImp::stype() ) ) { il = 1; ori = -1; } + const LineData line = static_cast<const AbstractLineImp*>( parents[il] )->data(); + int side = static_cast<const IntImp*>( parents[2] )->data(); + assert( side == 1 || side == -1 ); + if ( parents[1 - il]->inherits( CircleImp::stype() ) ) + { + const CircleImp* c = static_cast<const CircleImp*>( parents[1 - il] ); + const Coordinate o = c->center(); + const double rsq = c->squareRadius(); + ori *= c->orientation(); + Coordinate ret = calcCircleLineIntersect( o, rsq, line, ori*side ); + if ( ret.valid() ) return new PointImp( ret ); + else return new InvalidImp; + } else { + // same code as for ConicLineIntersection with degenerate conic + assert (il == 1); + const LineData degline = static_cast<const AbstractLineImp*>( parents[0] )->data(); + const double vecprod = degline.dir().y * line.dir().x - degline.dir().x * line.dir().y; + if (side*vecprod > 0) + { + Coordinate p = calcIntersectionPoint( degline, line ); + return new PointImp( p ); + } + return new InvalidImp(); + } + } + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; int side = static_cast<const IntImp*>( parents[2] )->data(); @@ -501,12 +562,13 @@ const CircleImp* c2 = static_cast<const CircleImp*>( parents[1] ); const Coordinate o1 = c1->center(); const Coordinate o2 = c2->center(); + const int ori = ( c1->orientation()*c2->orientation() < 0 )?(-1):(1); const double r1sq = c1->squareRadius(); const Coordinate a = calcCircleRadicalStartPoint( o1, o2, r1sq, c2->squareRadius() ); const LineData line = LineData (a, Coordinate ( a.x -o2.y + o1.y, a.y + o2.x - o1.x )); - Coordinate ret = calcCircleLineIntersect( o1, r1sq, line, side ); + Coordinate ret = calcCircleLineIntersect( o1, r1sq, line, ori*side ); if ( ret.valid() ) return new PointImp( ret ); else return new InvalidImp; } @@ -544,6 +606,32 @@ ObjectImp* ArcLineIntersectionType::calc( const Args& parents, const KigDocument& ) const { + /* + * special case of an arc that degenerates into a line. This is possible e.g. for + * arcs by three points when the points get aligned. + */ + if ( parents.size() == 3 && parents[0]->inherits( AbstractLineImp::stype() ) && + parents[1]->inherits( AbstractLineImp::stype() ) && + parents[2]->inherits( IntImp::stype() ) ) + { + int side = static_cast<const IntImp*>( parents[2] )->data(); + assert( side == 1 || side == -1 ); + const LineData degline = static_cast<const AbstractLineImp*>( parents[0] )->data(); + const LineData line = static_cast<const AbstractLineImp*>( parents[1] )->data(); + const double vecprod = degline.dir().y * line.dir().x - degline.dir().x * line.dir().y; + /* + * mp: In this case only one of the two points must be valid (the other is "pushed" + * to infinity). The choice of which one is done such that we avoid abrupt points exchange + * when dinamically movint points + */ + if (side*vecprod < 0) + { + Coordinate p = calcIntersectionPoint( degline, line ); + return new PointImp( p ); + } + return new InvalidImp(); + } + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; int side = static_cast<const IntImp*>( parents[2] )->data(); @@ -553,7 +641,7 @@ const ArcImp* c = static_cast<const ArcImp*>( parents[0] ); const double r = c->radius(); Coordinate ret = calcArcLineIntersect( c->center(), r*r, c->startAngle(), - c->angle(), line, side ); + c->angle(), line, c->orientation()*side ); if ( ret.valid() ) return new PointImp( ret ); else return new InvalidImp; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-16.04.3/objects/other_imp.cc new/kig-16.08.0/objects/other_imp.cc --- old/kig-16.04.3/objects/other_imp.cc 2016-04-28 00:33:28.000000000 +0200 +++ new/kig-16.08.0/objects/other_imp.cc 2016-04-28 00:34:52.000000000 +0200 @@ -346,7 +346,7 @@ if ( ! t.isHomothetic() ) { //CircleImp support = CircleImp( mcenter, mradius ); - ConicCartesianData data = CircleImp( mcenter, mradius ).cartesianData(); + ConicCartesianData data = CircleImp( mcenter, fabs( mradius ) ).cartesianData(); //return new InvalidImp(); ConicArcImp conicarc = ConicArcImp( data, msa, ma ); return conicarc.transform ( t ); @@ -373,7 +373,7 @@ void ArcImp::draw( KigPainter& p ) const { - p.drawArc( mcenter, mradius, msa, ma ); + p.drawArc( mcenter, fabs( mradius ), msa, ma ); } bool ArcImp::contains( const Coordinate& p, int width, const KigWidget& w ) const @@ -467,7 +467,7 @@ else if ( which == Parent::numberOfProperties() + numprop++ ) return new PointImp( mcenter ); else if ( which == Parent::numberOfProperties() + numprop++ ) - return new DoubleImp( mradius ); + return new DoubleImp( fabs( mradius ) ); else if ( which == Parent::numberOfProperties() + numprop++ ) return new AngleImp( mcenter, msa, ma, false ); else if ( which == Parent::numberOfProperties() + numprop++ ) @@ -477,7 +477,7 @@ else if ( which == Parent::numberOfProperties() + numprop++ ) return new DoubleImp( sectorSurface() ); else if ( which == Parent::numberOfProperties() + numprop++ ) - return new DoubleImp( mradius * ma ); + return new DoubleImp( fabs( mradius ) * ma ); else if ( which == Parent::numberOfProperties() + numprop++ ) return new CircleImp( mcenter, mradius ); else if ( which == Parent::numberOfProperties() + numprop++ ) @@ -517,13 +517,15 @@ // angle = max( 0., min( angle, ma ) ); angle /= ma; + if ( mradius < 0 ) angle = 1.0 - angle; // this is to avoid abrupt jumps when an ArcBTPType changes concavity return angle; } const Coordinate ArcImp::getPoint( double p, const KigDocument& ) const { + if ( mradius < 0 ) p = 1.0 - p; // this is to avoid abrupt jumps when an ArcBTPType changes concavity double angle = msa + p * ma; - Coordinate d = Coordinate( cos( angle ), sin( angle ) ) * mradius; + Coordinate d = Coordinate( cos( angle ), sin( angle ) ) * fabs( mradius ); return mcenter + d; } @@ -534,7 +536,12 @@ double ArcImp::radius() const { - return mradius; + return fabs( mradius ); +} + +double ArcImp::orientation() const +{ + return ( mradius >= 0)?1:(-1); } double ArcImp::startAngle() const @@ -549,14 +556,18 @@ Coordinate ArcImp::firstEndPoint() const { - double angle = msa; - return mcenter + Coordinate( cos( angle ), sin( angle ) ) * mradius; + /** + * mp: We take advantage of the arc orientation (mainly for the benefit of arc through 3 points) + * in order to avoid abrupt jumps when moving points + */ + const double angle = mradius >= 0 ? msa : msa+ma; + return mcenter + Coordinate( cos( angle ), sin( angle ) ) * fabs( mradius ); } Coordinate ArcImp::secondEndPoint() const { - double angle = msa + ma; - return mcenter + Coordinate( cos( angle ), sin( angle ) ) * mradius; + const double angle = mradius >= 0 ? msa+ma : msa; + return mcenter + Coordinate( cos( angle ), sin( angle ) ) * fabs( mradius ); } const Coordinate VectorImp::a() const @@ -663,7 +674,7 @@ bool ArcImp::internalContainsPoint( const Coordinate& p, double threshold ) const { - return isOnArc( p, mcenter, mradius, msa, ma, threshold ); + return isOnArc( p, mcenter, fabs( mradius ), msa, ma, threshold ); } bool AngleImp::isPropertyDefinedOnOrThroughThisImp( int which ) const @@ -724,13 +735,13 @@ // points, and all extreme x and y positions in between. //Rect ret( mcenter, 0, 0 ); double a = msa; - //ret.setContains( mcenter + mradius*Coordinate( cos( a ), sin( a ) ) ); - Rect ret ( mcenter + mradius*Coordinate( cos( a ), sin( a ) ), 0, 0 ); + //ret.setContains( mcenter + fabs( mradius )*Coordinate( cos( a ), sin( a ) ) ); + Rect ret ( mcenter + fabs( mradius )*Coordinate( cos( a ), sin( a ) ), 0, 0 ); a = msa + ma; - ret.setContains( mcenter + mradius*Coordinate( cos( a ), sin( a ) ) ); + ret.setContains( mcenter + fabs( mradius )*Coordinate( cos( a ), sin( a ) ) ); for ( a = -2*M_PI; a <= 2*M_PI; a+=M_PI/2 ) { - Coordinate d = mcenter + mradius*Coordinate( cos( a ), sin( a ) ); + Coordinate d = mcenter + fabs( mradius )*Coordinate( cos( a ), sin( a ) ); if ( msa <= a && a <= msa + ma ) ret.setContains( d ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-16.04.3/objects/other_imp.h new/kig-16.08.0/objects/other_imp.h --- old/kig-16.04.3/objects/other_imp.h 2016-04-28 00:33:28.000000000 +0200 +++ new/kig-16.08.0/objects/other_imp.h 2016-04-28 00:34:52.000000000 +0200 @@ -220,6 +220,10 @@ */ double radius() const; /** + * Return the orientation of this arc (usually > 0) + */ + double orientation() const; + /** * Return the start angle in radians of this arc. */ double startAngle() const;

1 0

commit khangman for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package khangman for openSUSE:Factory checked in at 2016-08-31 00:07:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/khangman (Old) and /work/SRC/openSUSE:Factory/.khangman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "khangman" Changes: -------- --- /work/SRC/openSUSE:Factory/khangman/khangman.changes 2016-07-24 19:46:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.khangman.new/khangman.changes 2016-08-31 00:07:33.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:17:18 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:03:52 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- khangman-16.04.3.tar.xz New: ---- khangman-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ khangman.spec ++++++ --- /var/tmp/diff_new_pack.3KSbXl/_old 2016-08-31 00:07:34.000000000 +0200 +++ /var/tmp/diff_new_pack.3KSbXl/_new 2016-08-31 00:07:34.000000000 +0200 @@ -17,7 +17,7 @@ Name: khangman -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Hangman Game License: GPL-2.0+ ++++++ khangman-16.04.3.tar.xz -> khangman-16.08.0.tar.xz ++++++ Files old/khangman-16.04.3/doc/about-kde.png and new/khangman-16.08.0/doc/about-kde.png differ Files old/khangman-16.04.3/doc/application-exit.png and new/khangman-16.08.0/doc/application-exit.png differ Files old/khangman-16.04.3/doc/dialog-information.png and new/khangman-16.08.0/doc/dialog-information.png differ Files old/khangman-16.04.3/doc/document-new.png and new/khangman-16.08.0/doc/document-new.png differ Files old/khangman-16.04.3/doc/games-hint.png and new/khangman-16.08.0/doc/games-hint.png differ Files old/khangman-16.04.3/doc/get-hot-new-stuff.png and new/khangman-16.08.0/doc/get-hot-new-stuff.png differ Files old/khangman-16.04.3/doc/getnewstuff.png and new/khangman-16.08.0/doc/getnewstuff.png differ Files old/khangman-16.04.3/doc/go-next.png and new/khangman-16.08.0/doc/go-next.png differ Files old/khangman-16.04.3/doc/handbook.png and new/khangman-16.08.0/doc/handbook.png differ Files old/khangman-16.04.3/doc/help-hint.png and new/khangman-16.08.0/doc/help-hint.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khangman-16.04.3/doc/index.docbook new/khangman-16.08.0/doc/index.docbook --- old/khangman-16.04.3/doc/index.docbook 2016-07-03 23:33:49.000000000 +0200 +++ new/khangman-16.08.0/doc/index.docbook 2016-07-03 23:35:31.000000000 +0200 @@ -2,7 +2,6 @@ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&khangman;"> - <!ENTITY package "kdeedu"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> ]> @@ -32,12 +31,12 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-31</date> -<releaseinfo>2.5 (&kde; 4.11)</releaseinfo> +<date>2016-04-25</date> +<releaseinfo>3.0 (Applications 16.04)</releaseinfo> <abstract> <para> -&khangman; is the classic hangman game for children, adapted for &kde;. +&khangman; is the classic hangman game for children. </para> </abstract> @@ -59,9 +58,7 @@ <para> &khangman; is a game based on the well-known hangman game. It is aimed at children aged six and over. The game has several categories of words to play -with and among them: <guimenuitem>Animals</guimenuitem> (animals words) and -three difficulty categories: <guimenuitem>Easy</guimenuitem>, -<guimenuitem>Medium</guimenuitem> and <guimenuitem>Hard</guimenuitem>. +with and among them: Animals, Clothing, Computers, Currencies, Easy and Fruits. A word is picked at random, the letters are hidden, and you must guess the word by trying one letter after another. Each time you guess a wrong letter, part of a picture of a hangman is drawn. You must guess the word @@ -74,30 +71,29 @@ <title>Using &khangman;</title> <screenshot> -<screeninfo>Here's a screenshot of &khangman; when you start it for the first -time</screeninfo> - <mediaobject> - <imageobject> - <imagedata fileref="khangman-main.png" format="PNG"/> - </imageobject> - <textobject> - <phrase>&khangman; screenshot</phrase> - </textobject> - </mediaobject> +<screeninfo>Here's a screenshot of &khangman; when you start it for the first time +</screeninfo><mediaobject> +<imageobject> +<imagedata fileref="khangman-main.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&khangman; screenshot</phrase> +</textobject> +</mediaobject> </screenshot> <para> Here you can see &khangman; as it is the first time you run it. Category is Animals, language is default (English here, the default is your current &kde; -language if the data exists), the theme is "Sea". Any changes in category, +language if the data exists), the theme is <quote>Notes</quote>. Any changes in category, language or theme (background) are written in the configuration file and restored in your next game. </para> <para> -Please note how easy it is to change the theme, just click on the combo box on -the toolbar. Getting a new word and quitting the game are also easily done by -clicking on the corresponding buttons on the toolbar. +Please note how easy it is to change the theme, just click on the button on +the bottom toolbar. Getting a new word and quitting the game are also easily done by +clicking on the corresponding buttons on the toolbars. </para> <sect1 id="general-usage"> @@ -105,10 +101,12 @@ <para>A word is chosen and its letters are displayed as an underscore (_) symbol. You know how many letters there are in the word. You have to guess the -word by trying one letter after another. You enter the letter in the text box -and you either press the &Enter; key or click on the -<guibutton>Guess</guibutton> button to see if the -letter belongs or not to the word. </para> +word by trying one letter after another. You type the letter on the keyboard +or select them with the &LMB;. If the letter belongs to the word the background +color of the letter will change to green, otherwise to red.</para> + +<para>The letter keys in the game window allow you to play &khangman; in foreign +languages without changing your keyboard layout.</para> <para>The word is picked at random and it is not the same as the previous word. </para> @@ -116,22 +114,21 @@ <important><para>All the words are nouns (there are no verbs or adjectives, &etc;).</para></important> -<para>If you need help guessing the word, you can click on the <guiicon>Show -Hint</guiicon> icon <inlinemediaobject><imageobject> <imagedata -fileref="games-hint.png" format="PNG"/></imageobject></inlinemediaobject> in the +<para>If you need help guessing the word, you can click on the <inlinemediaobject><imageobject> <imagedata +fileref="help-hint.png" format="PNG"/></imageobject></inlinemediaobject> icon in the toolbar and a hint will be displayed to give you some clue about the word. -Clicking the <guiicon>Show Hint</guiicon> icon again will hide the hint. +Clicking this icon again will hide the hint. </para> -<para>Hints are not displayed in default start mode. +<para>Hints are not displayed by default. </para> <para> Usually, it is not important whether you type in lowercase or uppercase. -The program converts all input into lowercase (except for German words beginning -with an uppercase letter). The program does that automatically. </para> +The program converts all input into an uppercase letter. The program does that +automatically. </para> <para> -The current category, wins and losses are displayed in the statusbar. +The current category, wins and losses are displayed in the window. </para> <para> @@ -141,12 +138,11 @@ </para> <para> -There are 4 categories: easy, medium, hard and animals, plus categories for -other -topics in some languages. The program scans for all data files in all +There are several categories of words available, depending on the selected +language. The program scans for all data files in all languages and uses &kanagram; words files as well. - </para> - +</para> + <para>After a word is guessed (or the hangman is completed), you are -congratulated and prompted for another word. You can either click on -<guilabel>Play again</guilabel> and another word is ready to be guessed or -select -another <guimenu>Category</guimenu> to play. -To quit the game now select -<menuchoice><guimenu>Game</guimenu><guimenuitem>Quit</guimenuitem> -</menuchoice> or click the <guiicon>Quit</guiicon> icon in the toolbar. -</para> - -<para>You type the letter you want to try in the text box (the mouse cursor is -ready in the text box) and you hit the &Enter; key or click the -<guibutton>Guess</guibutton> button. If -the letter belongs to the word, it takes its place, as many times as it appears -in the word. If the letter does not belong to the word, it goes in the -<guilabel>Misses</guilabel> -field and a further part of the hangman is drawn on the right. You have ten +congratulated and the next word is presented. +To quit the game click the <inlinemediaobject><imageobject><imagedata +fileref="quit.png" format="PNG"/></imageobject></inlinemediaobject> icon in the top toolbar. +</para> + +<para>You type the letter you want to try on the keyboard or select it +with the &LMB;. If the letter belongs to the word the key is highlighted in green +and the letter its place, as many times as it appears in the word. +If the letter does not belong to the word, the key is highlighted red. You have ten tries and after that you lose and the correct word is displayed. </para> -<para>During the game, you can choose to start a new game by going in the -<guimenu>Game</guimenu> menu and choosing <guimenuitem>New</guimenuitem> or -clicking on the <guiicon>New</guiicon> icon <inlinemediaobject><imageobject> -<imagedata -fileref="document-new.png" format="PNG"/></imageobject></inlinemediaobject> on -the toolbar. You can also change -the category of words using the <guimenu>Category</guimenu> menu (this -will bring you a new word for the new category).</para> - -<para>The look can easily be changed with the <guimenuitem>Look</guimenuitem> -toolbar holding the look dropdown box.</para> - -<para>The <guiicon>Quit</guiicon> button on the toolbar -<inlinemediaobject><imageobject> <imagedata -fileref="application-exit.png" -format="PNG"/></imageobject></inlinemediaobject> allows you to easily quit the -game.</para> +<para>During the game, you can choose to start a new game by clicking on the +<inlinemediaobject><imageobject><imagedata fileref="go-next.png" format="PNG"/></imageobject></inlinemediaobject> +on the bottom toolbar. You can also change the category of words clicking the current category.</para> +<para>The look can easily be changed with theme button on the bottom toolbar.</para> + + </sect1> <sect1 id="languages"> @@ -214,33 +192,31 @@ (Nynorsk), Polish, Portuguese, Romanian, Spanish, Serbian (Latin and Cyrillic), Slovenian, Tajik, Swedish, Russian and Turkish. You can even try Chinese if you install -the files from &kanagram;!! +the files from &kanagram;. </para> <para> By default, after the first installation of &khangman;, only English and your &kde; language if it is one of the above and if you have the corresponding kde-i18n package will be installed. For example if you are a Danish user and if -you have &kde; in Danish, in <guimenu>Language</guimenu> you will see two +you have &kde; in Danish, in Language you will see two items: English and Danish and Danish will be the default. </para> <para> You can still play &khangman; in other languages. It is very easy to add new data in &khangman;. All you need is a working Internet connection. You click on -the <guimenu>Game</guimenu> menu and then on <guimenuitem>Get Words in New -Language...</guimenuitem>. A dialog appears, similar to this one: +<inlinemediaobject><imageobject><imagedata fileref="get-hot-new-stuff.png" format="PNG"/></imageobject></inlinemediaobject> +and a dialog appears, similar to this one: </para> <screenshot> <screeninfo>The Get New Words dialog for &khangman;</screeninfo> - <mediaobject> - <imageobject> - <imagedata fileref="getnewstuff.png" format="PNG"/> - </imageobject> - <textobject> - <phrase>The Get New Words dialog for &khangman;</phrase> - </textobject> - </mediaobject> +<mediaobject><imageobject> +<imagedata fileref="getnewstuff.png" format="PNG"/> +</imageobject><textobject> +<phrase>The Get New Words dialog for &khangman;</phrase> +</textobject> +</mediaobject> </screenshot> <para> @@ -253,46 +229,37 @@ want another data file, you can repeat these steps). </para> <para> -You can then easily change the language by going in the -<guimenu>Language</guimenu> and choose the new language. </para> +You can then easily change the language by clicking the language button +and choose the new language. </para> <para> -Please note that you can now type the special characters in a language by -displaying the <interface>Special Characters</interface> toolbar. This toolbar -holds buttons with an icon of each special character per language like é -in French for example. Clicking on such a button will write the corresponding -letter in the input line and you validate your choice with &Enter;. You can of -course also use the keyboard layout corresponding to the language. This toolbar -can be shown or hidden. The setting is restored next time you play &khangman;. +Please note that the special characters in a language are displayed on the keyboard. +Here you see buttons with an icon of each special character per language like é +in French for example. Clicking on such a button will select the corresponding +letter. You can of course also use the keyboard layout corresponding to the language. </para> + </sect1> + <sect1 id="few-tips"> <title>A few tips</title> <para> In English, try to guess the vowels first. Then have a go with the most common consonants: -l, t, r, n, s +l, t, r, n, s. </para> <para>When you see <quote>io</quote>, try n after that, in French and English. </para> -<para> -In Brazilian Portuguese, Catalan, Spanish and Portuguese, the accented -vowels can be discovered when you type the non accented corresponding -vowel. For example, all the accented <quote>a</quote> are displayed in -the word when you type <quote>a</quote>. This is when <guilabel>Type accented -letters</guilabel> on the <guilabel>Languages</guilabel> page of &khangman;'s -configuration dialog is not checked. When <guilabel>Type accented -letters</guilabel> is checked, then you have to type -the accented letters yourself. When you type <quote>a</quote>, only + +<para>You have to either type the accented letters yourself or click on them. When you type <quote>a</quote>, only <quote>a</quote> is displayed and you have to type for example ã for this letter to be displayed. </para> @@ -300,116 +267,71 @@ by t (9.1%) then a (8.2%), i (7.0%) and n (6.7%). </para> </sect1> - </chapter> <chapter id="menus"> -<title>Menubar and toolbars</title> +<title>Menubar and Toolbars</title> <sect1 id="mainwindow"> <title>The Main &khangman; Window</title> -<para>The <guimenu>Game</guimenu> menu has 3 items: -<guimenuitem>New</guimenuitem>, <guimenuitem>Get Words in New -Language...</guimenuitem> and <guimenuitem>Quit</guimenuitem>.</para> - -<para><guimenuitem>New</guimenuitem> brings you a new game, &ie; a new word to -guess, in the same category you already are. <guimenuitem>Get Words in New -Language...</guimenuitem> will display the Get New Stuff dialog to allow you to -download data in a new language. <guimenuitem>Quit</guimenuitem> quits the game -by closing the main window and writing the actual settings in the configuration -file.</para> - -<para> -The <guimenu>Category</guimenu> menu allows you to choose the category of words -you want to play with and also three difficulty categories. -</para> - -<para> -The <guimenu>Language</guimenu> menu allows you to change the language the -words are displayed in. -</para> - -<para> -The <guimenu>Look</guimenu> menu proposes four themes: the <guimenuitem>Sea -Theme</guimenuitem>, the <guimenuitem>Winter Theme</guimenuitem>, the -<guimenuitem>Bee Theme</guimenuitem> and the <guimenuitem>Desert -Theme</guimenuitem>. The background and the font colors change for each theme. -</para> - -<para> -The <guimenu>Settings</guimenu> menu allows you to configure -&khangman; easily. First, <guimenuitem>Toolbars</guimenuitem>, -<guimenuitem>Show Hint</guimenuitem> and -<guimenuitem>Show Statusbar</guimenuitem> give you the possibility to -hide or show the toolbars, hints and the statusbar. -</para> - -<para>There are four toolbars: the <guimenuitem>Main</guimenuitem>, -<guimenuitem>Look</guimenuitem> -and <guimenuitem>Language</guimenuitem> toolbars which are the one on top -with the buttons and combo boxes and the -<guilabel>Special Characters</guilabel> toolbar which, when it is shown, is -on the bottom. This toolbar has buttons with the special characters -for each language: accented letters and other special characters. This -allows users to easily play in another language without having to configure -a new keyboard layout. You click on a special letter and it is -displayed as the letter to try. Pressing &Enter; will make the program -see if the letter is present in the word or not. The toolbar can be -hidden if you don't want it. This is saved in the configuration file -so if the toolbar is hidden, it will be hidden next time you run -&khangman;. -</para> - -<tip> -<para> -It is of course possible to move the toolbars around. Put the mouse -cursor on the small handle on the left of the toolbar, press the &LMB; -and drag the toolbar to position it on the screen where you want -it. If you point the mouse on one of the toolbars and press the right -mouse button, a context menu appears to let you choose different -options for the toolbar. -</para> -</tip> - -<para> -<guimenuitem>Configure Shortcuts...</guimenuitem> is a standard &kde; setting -dialog that allows you to choose different shortcut keys for different actions. -For example, <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> is the -standard shortcut for <guimenuitem>Quit</guimenuitem>.</para> -<para><guimenuitem>Configure Toolbars...</guimenuitem> is also a standard &kde; -menu item that allows you to add or suppress items from the toolbar. -</para> - <screenshot> <screeninfo>&khangman; Desert theme</screeninfo> - <mediaobject> - <imageobject> - <imagedata fileref="khangman-desert.png" format="PNG"/> - </imageobject> - <textobject> - <phrase>&khangman; Desert theme</phrase> - </textobject> - </mediaobject> +<mediaobject> +<imageobject> +<imagedata fileref="khangman-desert.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&khangman; Desert theme</phrase> +</textobject> +</mediaobject> </screenshot> <para> Here you have &khangman; with the Desert theme, French language and -category -Easy. The <interface>Special Characters</interface> toolbar is shown -here.</para> +category <quote>Animaux</quote>. The special characters for French are shown here.</para> -<para> -The category is chosen with a combo box in the toolbar or via the -<guimenu>Category</guimenu> menu in the menubar. Available are -<guimenuitem>Easy</guimenuitem>, <guimenuitem>Medium</guimenuitem>, -<guimenuitem>Animals</guimenuitem> and <guimenuitem>Hard</guimenuitem> and some -more. -<guimenuitem>Easy</guimenuitem> is related to common objects a child -aged six or seven knows. <guimenuitem>Medium</guimenuitem> regards nouns -a bit more challenging, <guimenuitem>Hard</guimenuitem> is quite difficult and -<guimenuitem>Animals</guimenuitem> is only animals nouns. There are also some -other categories of words, depending on the language. -</para> +<para>The game has the main toolbar at the top of the window:</para> + +<simplelist> +<member> +<inlinemediaobject><imageobject><imagedata fileref="play.png" format="PNG"/></imageobject></inlinemediaobject> or +<inlinemediaobject><imageobject><imagedata fileref="pause.png" format="PNG"/></imageobject></inlinemediaobject> +Start or stop a game +</member> +<member><inlinemediaobject><imageobject><imagedata fileref="settings_icon.png" format="PNG"/></imageobject></inlinemediaobject> +Open the settings dialog +</member> +<member><inlinemediaobject><imageobject><imagedata fileref="dialog-information.png" format="PNG"/></imageobject></inlinemediaobject> +About &khangman; +</member> +<member><inlinemediaobject><imageobject><imagedata fileref="about-kde.png" format="PNG"/></imageobject></inlinemediaobject> +About &kde; +</member> +<member><inlinemediaobject><imageobject><imagedata fileref="handbook.png" format="PNG"/></imageobject></inlinemediaobject> +View the &khangman; handbook +</member> +<member><inlinemediaobject><imageobject><imagedata fileref="get-hot-new-stuff.png" format="PNG"/></imageobject></inlinemediaobject> +Download new language files from the Internet +</member> +<member><inlinemediaobject><imageobject><imagedata fileref="quit.png" format="PNG"/></imageobject></inlinemediaobject> +Quit &khangman; +</member> +</simplelist> + +<para>The bottom toolbar is displayed only when playing a game, if you pause the game this toolbar is hidden:</para> + +<simplelist> +<member><inlinemediaobject><imageobject><imagedata fileref="help-hint.png" format="PNG"/></imageobject></inlinemediaobject> +- Display a hint about the word to guess +</member> +<member>A button to change the category</member> +<member>Language selection</member> +<member>Theme selection</member> +<member>Reveal the word to guess</member> +<member><inlinemediaobject><imageobject><imagedata fileref="go-next.png" format="PNG"/></imageobject></inlinemediaobject> +Load the next word and start a new game +</member> +</simplelist> <para> All words are nouns. No verbs, no adjectives. The chosen category is then displayed on the statusbar.</para> @@ -417,308 +339,58 @@ </sect1> <sect1 id="settings"> -<title>Available Settings</title> -<para> -A toolbar is provided for quick access to some settings. You can click on a -button to have a new game (i.e. a new word), to see the hint or to quit the -game. The theme is easily changed via a combo box on the toolbar. -</para> -<para> -In <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure -&khangman;...</guimenuitem> </menuchoice> you will find tree pages. The first -one is for <guilabel>General</guilabel> settings. -</para> - -<sect2 id="general-settings"> -<title>General Settings</title> +<title>Settings</title> <screenshot> -<screeninfo>&khangman; General settings</screeninfo> - <mediaobject> - <imageobject> - <imagedata fileref="settings-general.png" format="PNG"/> - </imageobject> - <textobject> - <phrase>&khangman; General settings</phrase> - </textobject> - </mediaobject> +<screeninfo>&khangman; settings</screeninfo> +<mediaobject> +<imageobject> +<imagedata fileref="settings.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&khangman; settings</phrase> +</textobject> +</mediaobject> </screenshot> -<para><guilabel>Require more guesses for duplicate letters</guilabel>: this is -unchecked as default. When unchecked, if you try the letter "a" and the word has -several as, they will be all displayed. For example if the word is "potato" and -you try "o", both os will be diaplayed. If you check this option however, only -the first "o" will be displayed and you will have to try it one more time to -display the second "o" in "potato". This increases the difficulty. -</para> - -<para><guilabel>Enable animations</guilabel>: the default is checked, that means -that when you win a game, a message box will be displayed to tell you that you -won and ask you if you want to play again. If you uncheck this option, this -dialog is not displayed anymore, instead a new game starts directly after 3 -seconds. -</para> - -<para><guilabel>Enable hints globally</guilabel>: the default is unchecked. -Hints are not shown. If you check this (or use the <guilabel>Show -Hints</guilabel> icon or -the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Show -Hint</guimenuitem></menuchoice> menu or use the shortcut -<keycombo action="simul">&Ctrl;<keycap>H</keycap></keycombo>), a hint will be -displayed above the word to guess to help you find the word more easily. -</para> - -<para> -In the <guilabel>Sounds</guilabel> section, if you check <guilabel>Enable -sounds</guilabel> then a sound will be played on new game and another sound will -be played when you win a game. -</para> - -</sect2> -<sect2 id="languages-settings"> -<title>Languages Settings</title> -<para>The <guilabel>Languages</guilabel> Settings tab allows you to set some -settings specific to some languages. If the settings are not available for the -language you are playing in then those settings will be grayed and disabled so -you cannot choose them. + +<para>The <guilabel>Word resolve time in seconds</guilabel> sets the +maximum allowed time for resolving the word in &khangman;. Default value is 120 seconds. +Young children will need more time to understand the game, for adults reduce +the resolve time to keep the game exciting. </para> -<screenshot> -<screeninfo>&khangman; Languages Settings</screeninfo> - <mediaobject> - <imageobject> - <imagedata fileref="settings-languages.png" format="PNG"/> - </imageobject> - <textobject> - <phrase>&khangman; Languages Settings</phrase> - </textobject> - </mediaobject> -</screenshot> - -<para><guilabel>Type accented letters</guilabel> is available for Spanish, -Portuguese and Catalan in &khangman;'s configuration dialog. If you check -<guilabel>Type accented letters</guilabel> then you will have to type all -accented vowels (like ã). If this remains unchecked, when you type any -vowel, all accented vowels will be displayed as well. +<para>  +<guilabel>Score Multiplying Factor</guilabel> determines the factor by which +the scores will be multiplied. </para> -</sect2> - -<sect2 id="timers-settings"> -<title>Timers Settings</title> -<para>The <guilabel>Timers</guilabel> Settings tab allows you to set -<guilabel>Time for displaying the Already Guessed Letter tooltip</guilabel>. -</para> - -<screenshot> -<screeninfo>&khangman; Timers Settings</screeninfo> - <mediaobject> - <imageobject> - <imagedata fileref="settings-timers.png" format="PNG"/> - </imageobject> - <textobject> - <phrase>&khangman; Timers Settings</phrase> - </textobject> - </mediaobject> -</screenshot> - -<para><guilabel>Time for displaying the Already Guessed Letter -tooltip</guilabel> allows you to increase or decrease the time for displaying -the Already Guessed Letter tooltip. This tooltip is a label which appears when -you tried a letter that was already tried. Some people will want not to see it -for long while children will need time to understand it and thus will need to -set the display for a longer duration. +<para> +If you check <guilabel>Sounds</guilabel> then a sound will be played on new game +and another sound will be played when you win a game. </para> -</sect2> - </sect1> </chapter> -<chapter id="commands"> -<title>Command Reference</title> - -<sect1 id="khangman-mainwindow"> -<title>Menus and Shortcut Keys</title> - -<sect2> -<title>The Game Menu</title> - -<variablelist> -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo> -</shortcut> -<guimenu>Game</guimenu> -<guimenuitem>New</guimenuitem> -</menuchoice></term> -<listitem><para><action>New</action> game (&ie; new word)</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo> -</shortcut> -<guimenu>Game</guimenu> -<guimenuitem>Open</guimenuitem> -</menuchoice></term> -<listitem><para><action>Open</action> a local file to play with the -words</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo action="simul">&Ctrl;<keycap>G</keycap></keycombo> -</shortcut> -<guimenu>Game</guimenu> -<guimenuitem>Get Words in New Language...</guimenuitem> -</menuchoice></term> -<listitem><para><action>Display</action> the <guilabel>Get Hot New -Stuff!</guilabel> dialog which lists all the data available in the different -languages. </para></listitem> -</varlistentry> -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> -</shortcut> -<guimenu>Game</guimenu> -<guimenuitem>Quit</guimenuitem> -</menuchoice></term> -<listitem><para><action>Quits</action> &khangman;</para></listitem> -</varlistentry> -</variablelist> - -</sect2> - -<sect2> -<title>The Category Menu</title> - -<variablelist> -<varlistentry> -<term><menuchoice> -<guimenu>Category</guimenu> -<guimenuitem>Animals</guimenuitem> -</menuchoice></term> -<listitem><para><action>Choose</action> the list of animals words to -guess</para> -<para>All other installed categories are displayed as items in this menu as -well.</para></listitem> -</varlistentry> -<varlistentry> -<term><menuchoice> -<guimenu>Category</guimenu> -<guimenuitem>Easy</guimenuitem> -</menuchoice></term> -<listitem><para><action>Choose</action> the list of easy words to -guess</para></listitem> -</varlistentry> -<varlistentry> -<term><menuchoice> -<guimenu>Category</guimenu> -<guimenuitem>Medium</guimenuitem> -</menuchoice></term> -<listitem><para><action>Choose</action> the list of medium difficulty words to -guess</para></listitem> -</varlistentry> -<varlistentry> -<term><menuchoice> -<guimenu>Category</guimenu> -<guimenuitem>Hard</guimenuitem> -</menuchoice></term> -<listitem><para><action>Choose</action> the list of difficult words to -guess</para></listitem> -</varlistentry> -</variablelist> - -</sect2> - -<sect2> -<title>The Language Menu</title> - -<variablelist> -<varlistentry> -<term><menuchoice> -<guimenu>Language</guimenu> -<guimenuitem>English</guimenuitem> -</menuchoice></term> -<listitem><para><action>Choose</action> the English language for the words to -guess.</para> -<para>All other installed languages are displayed as items in this menu as -well.</para></listitem> -</varlistentry> -</variablelist> - -</sect2> - -<sect2> -<title>The Look Menu</title> - -<variablelist> -<varlistentry> -<term><menuchoice> -<guimenu>Look</guimenu> -<guimenuitem>Sea Theme</guimenuitem> -</menuchoice></term> -<listitem><para><action>Choose</action> the Sea background picture and -associated font colors</para></listitem> -</varlistentry> -<varlistentry> -<term><menuchoice> -<guimenu>Look</guimenu> -<guimenuitem>Winter Theme</guimenuitem> -</menuchoice></term> -<listitem><para><action>Choose</action> the Winter background picture and -associated font colors</para></listitem> -</varlistentry> -<varlistentry> -<term><menuchoice> -<guimenu>Look</guimenu> -<guimenuitem>Bee Theme</guimenuitem> -</menuchoice></term> -<listitem><para><action>Choose</action> the Bee background picture and -associated font colors</para></listitem> -</varlistentry> -<varlistentry> -<term><menuchoice> -<guimenu>Look</guimenu> -<guimenuitem>Desert Theme</guimenuitem> -</menuchoice></term> -<listitem><para><action>Choose</action> the Desert background picture and -associated font colors</para></listitem> -</varlistentry> -</variablelist> - -<para> -Additionally &khangman; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> -menu items, for more information read the sections about the <ulink url="help:/fundamentals/ui.html#menus-settings" ->Settings Menu</ulink> and <ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink> -of the &kde; Fundamentals. -</para> - -</sect2> - -</sect1> -</chapter> - <chapter id="developers"> <title>Developer's Guide to &khangman;</title> <sect1 id="changing-words"> <title>How to translate words in a new language for the game</title> -<para>Please follow the procedure and then send me the files tarred and gzipped -to &Anne-Marie.Mahfouf.mail;. +<para>Please follow the procedure and then send the files tarred and gzipped +to the <ulink url="https://mail.kde.org/mailman/listinfo/kde-edu">kde-edu mailinglist</ulink>. </para> <para> -Please have a look in &khangman; <guimenuitem>Get Words in New -Language...</guimenuitem> in the <guimenu>Game</guimenu> menu to see if your -language is available yet. If it is, then you can check if it contains -<emphasis>hints</emphasis>. +Please have a look in &khangman; <inlinemediaobject><imageobject><imagedata +fileref="get-hot-new-stuff.png" format="PNG"/></imageobject></inlinemediaobject> +in the top toolbar to see if your language is available yet. +If it is, then you can check if it contains <emphasis>hints</emphasis>. </para> <para>The standard list words are stored in 4 separate files, so to make different categories. The files are in @@ -809,7 +481,8 @@ </para> <para>You can include words with white space or - in them, in that case the -white space or the - will be shown instead of the _. Please contact me if +white space or the - will be shown instead of the _. Please contact the +<ulink url="https://mail.kde.org/mailman/listinfo/kde-edu">kde-edu mailinglist</ulink> if there is anything special related to your language so I can adapt the code to it (especially the special and accented characters). </para> @@ -829,10 +502,10 @@ <step> <para>You can then commit your files in -<emphasis>l10n-kde4/<lang_code>/data/kdeedu/khangman</emphasis>. Don't -forget to update the CMakeLists.txt file as well. -Please contact me by email if you need further -information. When you send me the files, please don't forget to mention any +<emphasis>l10n-kf5/<lang_code>/data/kdeedu/kdeedu-data/</emphasis>. Do not +forget to update the CMakeLists.txt file as well. Please contact the +<ulink url="https://mail.kde.org/mailman/listinfo/kde-edu">kde-edu mailinglist</ulink> if you need further +information. When you send the files, please do not forget to mention any <emphasis role="bold">special characters</emphasis> used in your language (put them in a text file, one per line and add this file in the tarball) and please mention any other specificity.</para> @@ -849,69 +522,29 @@ When you get a new language via <menuchoice><guimenu>Game</guimenu> <guimenuitem>Get Words in New Language...</guimenuitem></menuchoice>, the new language data is stored in <filename -class="directory">$KDEHOME/share/apps/kvtml/</filename> in the language code +class="directory">$XDG_DATA_HOME/share/apps/kvtml/</filename> in the language code folder. The available language dir names are also stored in the &khangman; -config file in <filename>$KDEHOME/share/config/khangmanrc</filename>. +config file in <filename>$XDG_DATA_HOME/share/config/khangmanrc</filename>. </para> <para> The provider name (i.e. the address of the website where to download the new languages) is stored in -<filename>$KDEDIR/share/apps/khangman/khangmanrc</filename>. +<filename>$XDG_DATA_DIRS/share/apps/khangman/khangmanrc</filename>. </para> <para> The English language (default) and the user language from his i18n package(s) (if available) are stored in <filename -class="directory">$KDEDIR/share/apps/kvtml</filename>. +class="directory">$XDG_DATA_DIRS/share/apps/kvtml</filename>. </para> <para> In the configuration file, stored for each user in -<filename>$KDEHOME/share/config/khangmanrc</filename> are saved all the game +<filename>$XDG_DATA_HOME/share/config/khangmanrc</filename> are saved all the game settings such as the background, last category played, ... plus the files that were downloaded from the <guilabel>Get Hot New Stuff!</guilabel> dialog. </para> </sect1> </chapter> -<chapter id="faq"> -<title>Questions and Answers</title> - -&reporting.bugs; -&updating.documentation; - -<qandaset id="faqlist"> -<qandaentry> -<question> -<para>I have an error message telling me the pictures cannot be found.</para> -</question> -<answer> -<para>The game installs by default in <filename -class="directory">/usr/local/kde</filename> so add <filename -class="directory">/usr/local/kde/bin</filename> to your path and set -the <envar>KDEDIR</envar> variable to <filename -class="directory">/usr/local/kde</filename> before running the -game. An easy way is to configure &khangman; with the option -<option>--prefix</option>=$<envar>KDEDIR</envar> where -$<envar>KDEDIR</envar> is where the rest of &kde; is installed. This -could vary widely, depending on the distribution and operating system -you have. Better install &khangman; from your distribution!</para> -</answer> -</qandaentry> -<qandaentry> -<question> -<para>&khangman; does not start correctly after I upgraded from an earlier -version to the &kde; 4 version</para> -</question> -<answer> -<para> -There might be a problem due to the change of the configuration file. Please -remove the <filename>khangmanrc</filename> file in your <filename -class="directory">$KDEHOME/share/config</filename> folder. -</para> -</answer> -</qandaentry> -</qandaset> -</chapter> - <chapter id="credits"> <title>Credits and License</title> @@ -1016,24 +649,6 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-khangman"> -<title>How to obtain &khangman;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - &documentation.index; </book> <!-- Files old/khangman-16.04.3/doc/khangman-desert.png and new/khangman-16.08.0/doc/khangman-desert.png differ Files old/khangman-16.04.3/doc/khangman-main.png and new/khangman-16.08.0/doc/khangman-main.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khangman-16.04.3/doc/man-khangman.6.docbook new/khangman-16.08.0/doc/man-khangman.6.docbook --- old/khangman-16.04.3/doc/man-khangman.6.docbook 2016-07-03 23:33:49.000000000 +0200 +++ new/khangman-16.08.0/doc/man-khangman.6.docbook 2016-07-03 23:35:31.000000000 +0200 @@ -5,11 +5,11 @@ <refentry lang="&language;"> <refentryinfo> -<title>KDE User's Manual</title> +<title>KHangman User's Manual</title> <author><firstname>Ben</firstname><surname>Burton</surname> <contrib>&khangman; man page.</contrib> <email>bab(a)debian.org</email></author> -<date>2010-10-06</date> -<productname>K Desktop Environment</productname> +<date>2016-04-25</date> +<productname>KDE Applications</productname> </refentryinfo> <refmeta> @@ -22,19 +22,11 @@ <refpurpose>The classical hangman game for KDE</refpurpose> </refnamediv> -<refsynopsisdiv> -<cmdsynopsis> -<command>khangman</command> -<arg choice="opt">KDE Generic Options</arg> -<arg choice="opt">Qt Generic Options</arg> -</cmdsynopsis> -</refsynopsisdiv> - <refsect1> <title>Description</title> <para>&khangman; is a game based on the well known hangman game. It is -aimed for children 6 and above. It has several levels of difficulty: A lot of categories like Animals -(animals words) and Easy, Medium and Hard.</para><para>A word is picked at +aimed for children 6 and above. It has several word categories like Animals, +Clothing, Computers, Currencies and more.</para><para>A word is picked at random and the letters are hidden. You must guess the word by trying one letter after another. Each time you guess a wrong letter, part of a picture of a hangman is drawn. You must guess the word before getting hanged! You Files old/khangman-16.04.3/doc/pause.png and new/khangman-16.08.0/doc/pause.png differ Files old/khangman-16.04.3/doc/play.png and new/khangman-16.08.0/doc/play.png differ Files old/khangman-16.04.3/doc/quit.png and new/khangman-16.08.0/doc/quit.png differ Files old/khangman-16.04.3/doc/settings-general.png and new/khangman-16.08.0/doc/settings-general.png differ Files old/khangman-16.04.3/doc/settings-languages.png and new/khangman-16.08.0/doc/settings-languages.png differ Files old/khangman-16.04.3/doc/settings-timers.png and new/khangman-16.08.0/doc/settings-timers.png differ Files old/khangman-16.04.3/doc/settings.png and new/khangman-16.08.0/doc/settings.png differ Files old/khangman-16.04.3/doc/settings_icon.png and new/khangman-16.08.0/doc/settings_icon.png differ Files old/khangman-16.04.3/doc/statusbar.png and new/khangman-16.08.0/doc/statusbar.png differ Files old/khangman-16.04.3/doc/toolbar.png and new/khangman-16.08.0/doc/toolbar.png differ Files old/khangman-16.04.3/src/qml/Images/handbook.png and new/khangman-16.08.0/src/qml/Images/handbook.png differ

1 0

commit kgoldrunner for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kgoldrunner for openSUSE:Factory checked in at 2016-08-31 00:07:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kgoldrunner (Old) and /work/SRC/openSUSE:Factory/.kgoldrunner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kgoldrunner" Changes: -------- --- /work/SRC/openSUSE:Factory/kgoldrunner/kgoldrunner.changes 2016-07-24 19:46:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kgoldrunner.new/kgoldrunner.changes 2016-08-31 00:07:31.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:16:57 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:03:07 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kgoldrunner-16.04.3.tar.xz New: ---- kgoldrunner-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kgoldrunner.spec ++++++ --- /var/tmp/diff_new_pack.q8KBFr/_old 2016-08-31 00:07:32.000000000 +0200 +++ /var/tmp/diff_new_pack.q8KBFr/_new 2016-08-31 00:07:32.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: Amusements/Games/Action/Arcade Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kgoldrunner-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kgoldrunner-16.04.3.tar.xz -> kgoldrunner-16.08.0.tar.xz ++++++

1 0

commit kgeography for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kgeography for openSUSE:Factory checked in at 2016-08-31 00:07:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kgeography (Old) and /work/SRC/openSUSE:Factory/.kgeography.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kgeography" Changes: -------- --- /work/SRC/openSUSE:Factory/kgeography/kgeography.changes 2016-07-24 19:46:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kgeography.new/kgeography.changes 2016-08-31 00:07:29.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:16:34 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:02:09 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kgeography-16.04.3.tar.xz New: ---- kgeography-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kgeography.spec ++++++ --- /var/tmp/diff_new_pack.D1MaGc/_old 2016-08-31 00:07:30.000000000 +0200 +++ /var/tmp/diff_new_pack.D1MaGc/_new 2016-08-31 00:07:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: kgeography -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Geography Trainer License: GPL-2.0+ ++++++ kgeography-16.04.3.tar.xz -> kgeography-16.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kgeography/kgeography-16.04.3.tar.xz /work/SRC/openSUSE:Factory/.kgeography.new/kgeography-16.08.0.tar.xz differ: char 26, line 1

1 0

commit kfourinline for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kfourinline for openSUSE:Factory checked in at 2016-08-31 00:07:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfourinline (Old) and /work/SRC/openSUSE:Factory/.kfourinline.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kfourinline" Changes: -------- --- /work/SRC/openSUSE:Factory/kfourinline/kfourinline.changes 2016-07-24 19:53:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kfourinline.new/kfourinline.changes 2016-08-31 00:07:27.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:16:24 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:01:39 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kfourinline-16.04.3.tar.xz New: ---- kfourinline-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfourinline.spec ++++++ --- /var/tmp/diff_new_pack.BY5pOH/_old 2016-08-31 00:07:28.000000000 +0200 +++ /var/tmp/diff_new_pack.BY5pOH/_new 2016-08-31 00:07:28.000000000 +0200 @@ -35,7 +35,7 @@ License: LGPL-2.0+ Group: Amusements/Toys/Other Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kfourinline-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ kfourinline-16.04.3.tar.xz -> kfourinline-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-16.04.3/.gitignore new/kfourinline-16.08.0/.gitignore --- old/kfourinline-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kfourinline-16.08.0/.gitignore 2016-06-19 12:32:04.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-16.04.3/CMakeLists.txt new/kfourinline-16.08.0/CMakeLists.txt --- old/kfourinline-16.04.3/CMakeLists.txt 2016-03-20 12:01:05.000000000 +0100 +++ new/kfourinline-16.08.0/CMakeLists.txt 2016-06-19 12:32:04.000000000 +0200 @@ -26,12 +26,13 @@ include(FeatureSummary) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMAddAppIcon) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_subdirectory(src) add_subdirectory(grafix) Files old/kfourinline-16.04.3/doc/gameboard.png and new/kfourinline-16.08.0/doc/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-16.04.3/doc/index.docbook new/kfourinline-16.08.0/doc/index.docbook --- old/kfourinline-16.04.3/doc/index.docbook 2016-03-20 12:01:05.000000000 +0100 +++ new/kfourinline-16.08.0/doc/index.docbook 2016-06-19 12:32:04.000000000 +0200 @@ -1,14 +1,12 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ -<!ENTITY kappname "&kfourinline;"> -<!ENTITY package "kdegames"> -<!ENTITY % English "INCLUDE"> +<!ENTITY % English "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> <book id="kfourinline" lang="&language;"> <bookinfo> -<title>The KFourInLine Handbook</title> +<title>The &kfourinline; Handbook</title> <authorgroup> <author> @@ -48,15 +46,15 @@ <year>1995</year><year>2007</year> <holder>&Martin.Heni;</holder> </copyright> - + <legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-05</date> -<releaseinfo>1.4.0 (&kde; 4.11)</releaseinfo> +<date>2016-05-09</date> +<releaseinfo>v1.4.1 (Applications 16.04)</releaseinfo> <abstract> <para> -&kfourinline; is a four-in-a-row game for &kde;.</para> +&kfourinline; is a four-in-a-row game by &kde;.</para> </abstract> <keywordset> @@ -96,15 +94,27 @@ <chapter id="howtoplay"> <title>How to Play</title> + +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="gameboard.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&kfourinline; Game Board</phrase> +</textobject> +</mediaobject> +</screenshot> + <para> When &kfourinline; loads, you can select the difficulty or start a two player game. If you like, you can also pick your color and select which color starts the game. </para> <para> -Each player is represented by a color (for example yellow or white for player one and red for player two). +Each player is represented by a color (for example yellow or white for player one and red for player two). The goal of the game is to get four connected pieces of your color into any row, column or -diagonal. +diagonal. The players move in turns. Each turn the player can place one of his or her pieces into any of the seven columns where each piece will fall to the lowest possible free place &ie; it will fall down until it reaches the ground level or another piece. @@ -139,7 +149,7 @@ </para> <para> -The <firstterm>status display</firstterm> shows which player +The <firstterm>status display</firstterm> shows which player is controlled by which input device. A local player can input moves using keyboard or mouse, a remote player is shown as network input and finally the computer can control the input for a player. @@ -158,10 +168,10 @@ <para> It is possible to play the game over a network connection with another -computer. +computer. One of the computers will act as game server. This one can determine who should play which color. You can configure the network options -in the menu +in the menu <menuchoice><guimenu>Settings</guimenu><guimenuitem>Network Configuration...</guimenuitem></menuchoice>. In the menu <menuchoice><guimenu>Game</guimenu><guimenuitem>Network Chat...</guimenuitem></menuchoice>. @@ -201,7 +211,7 @@ <para> Starts a new game. In a network game this option is only available for the network server. The network client will be automatically started by -the server. +the server. </para> </listitem> </varlistentry> @@ -358,7 +368,7 @@ <para> Pops up a dialog for the network configuration. You can choose to be server or client. If you are server you can also choose what color the -remote player should take over. If a network game is running you can +remote player should take over. If a network game is running you can also disconnect it in this menu. </para> </listitem> @@ -367,7 +377,7 @@ </variablelist> <para> -Additionally &kappname; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> +Additionally &kfourinline; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> menu items, for more information read the sections about the <ulink url="help:/fundamentals/ui.html#menus-settings" >Settings Menu</ulink> and <ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink> of the &kde; Fundamentals. @@ -380,9 +390,21 @@ <chapter id="config"> <title>Game Configuration</title> <para>&kfourinline; can be configured using the configuration dialog with <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kfourinline;...</guimenuitem></menuchoice> </para> + +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="settings.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>Game Configuration</phrase> +</textobject> +</mediaobject> +</screenshot> + <para><guilabel>Starting Player Color</guilabel>: Determine which player color (<guilabel>Red</guilabel> or <guilabel>Black</guilabel>) has the first move in the next game.</para> <para><guilabel>Player Names</guilabel>: Change the names of the players.</para> -<para><guilabel>Black Plays With</guilabel>: +<para><guilabel>Black Plays With</guilabel>: Choose who should play for player 1. It can be either <guilabel>Mouse</guilabel> or <guilabel>Keyboard</guilabel>, &ie; a local player using the mouse or keyboard @@ -433,7 +455,7 @@ </question> <answer> <para> -Yes, you can see statistics by opening the <guimenu>Game</guimenu> menu and +Yes, you can see statistics by opening the <guimenu>Game</guimenu> menu and selecting <guimenuitem>Show Statistics</guimenuitem>. </para> </answer> @@ -468,26 +490,7 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-kfourinline"> -<title>How to obtain &kfourinline;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - - -&documentation.index; +&documentation.index; </book> <!-- Local Variables: Files old/kfourinline-16.04.3/doc/settings.png and new/kfourinline-16.08.0/doc/settings.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-16.04.3/src/kwin4.cpp new/kfourinline-16.08.0/src/kwin4.cpp --- old/kfourinline-16.04.3/src/kwin4.cpp 2016-03-20 12:01:05.000000000 +0100 +++ new/kfourinline-16.08.0/src/kwin4.cpp 2016-06-19 12:32:04.000000000 +0200 @@ -501,7 +501,7 @@ QString filter(QStringLiteral("*")); QString file(QStringLiteral("/tmp/kwin.save")); if (global_debug < 1) - file=KFileDialog::getOpenFileName(dir,filter,this); + file=KFileDialog::getOpenFileName(QUrl(dir),filter,this); mDoc->load(file,true); checkMenus(); } @@ -513,7 +513,7 @@ QString filter(QStringLiteral("*")); QString file(QStringLiteral("/tmp/kwin.save")); if (global_debug < 1) - file=KFileDialog::getSaveFileName(dir,filter,this); + file=KFileDialog::getSaveFileName(QUrl(dir),filter,this); mDoc->save(file); }

1 0

commit kfloppy for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kfloppy for openSUSE:Factory checked in at 2016-08-31 00:07:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfloppy (Old) and /work/SRC/openSUSE:Factory/.kfloppy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kfloppy" Changes: -------- --- /work/SRC/openSUSE:Factory/kfloppy/kfloppy.changes 2016-07-24 19:46:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kfloppy.new/kfloppy.changes 2016-08-31 00:07:24.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:16:16 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:01:17 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kfloppy-16.04.3.tar.xz New: ---- kfloppy-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfloppy.spec ++++++ --- /var/tmp/diff_new_pack.Cl9R5S/_old 2016-08-31 00:07:25.000000000 +0200 +++ /var/tmp/diff_new_pack.Cl9R5S/_new 2016-08-31 00:07:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: kfloppy -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Floppy Formatter License: GPL-2.0+ ++++++ kfloppy-16.04.3.tar.xz -> kfloppy-16.08.0.tar.xz ++++++

1 0

commit kdiamond for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kdiamond for openSUSE:Factory checked in at 2016-08-31 00:07:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdiamond (Old) and /work/SRC/openSUSE:Factory/.kdiamond.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdiamond" Changes: -------- --- /work/SRC/openSUSE:Factory/kdiamond/kdiamond.changes 2016-07-24 19:46:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdiamond.new/kdiamond.changes 2016-08-31 00:07:22.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:15:58 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:00:33 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kdiamond-16.04.3.tar.xz New: ---- kdiamond-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiamond.spec ++++++ --- /var/tmp/diff_new_pack.buAX5D/_old 2016-08-31 00:07:23.000000000 +0200 +++ /var/tmp/diff_new_pack.buAX5D/_new 2016-08-31 00:07:23.000000000 +0200 @@ -38,7 +38,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kdiamond-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ kdiamond-16.04.3.tar.xz -> kdiamond-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-16.04.3/.gitignore new/kdiamond-16.08.0/.gitignore --- old/kdiamond-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kdiamond-16.08.0/.gitignore 2016-05-29 20:39:06.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-16.04.3/CMakeLists.txt new/kdiamond-16.08.0/CMakeLists.txt --- old/kdiamond-16.04.3/CMakeLists.txt 2016-02-29 12:18:51.000000000 +0100 +++ new/kdiamond-16.08.0/CMakeLists.txt 2016-05-29 20:39:06.000000000 +0200 @@ -28,7 +28,7 @@ include(FeatureSummary) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMAddAppIcon) Files old/kdiamond-16.04.3/doc/gameboard.png and new/kdiamond-16.08.0/doc/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-16.04.3/doc/index.docbook new/kdiamond-16.08.0/doc/index.docbook --- old/kdiamond-16.04.3/doc/index.docbook 2016-02-29 12:18:51.000000000 +0100 +++ new/kdiamond-16.08.0/doc/index.docbook 2016-05-29 20:39:06.000000000 +0200 @@ -1,9 +1,6 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ -<!ENTITY kdiamond "<application>KDiamond</application>"> -<!ENTITY kappname "&kdiamond;"> -<!ENTITY package "kdegames"> -<!ENTITY % English "INCLUDE"> +<!ENTITY % English "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> @@ -24,11 +21,11 @@ <year>2008, 2009, 2010</year> <holder>Stefan Majewsky</holder> </copyright> - + <legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-05</date> -<releaseinfo>1.4 (&kde; 4.11)</releaseinfo> +<date>2016-05-09</date> +<releaseinfo>1.5 (Applications 16.04)</releaseinfo> <abstract> <para> @@ -51,6 +48,17 @@ &kdiamond; is a single player puzzle game. </para> +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="gameboard.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&kdiamond; gameboard</phrase> +</textobject> +</mediaobject> +</screenshot> + <para> The object of the game is to build lines of three similar diamonds. </para> @@ -110,7 +118,8 @@ <term><menuchoice> <shortcut><keycap>P</keycap></shortcut> <guimenu>Game</guimenu> -<guimenuitem>Pause</guimenuitem></menuchoice></term> +<guimenuitem>Pause</guimenuitem> +</menuchoice></term> <listitem> <para> Pauses the game time. Click on the menu item again to make the game resume. Note that the board disappears when the game is paused as it would be unfair if you could search for good moves without the time pressure. @@ -124,7 +133,8 @@ <keycombo action="simul">&Ctrl;<keycap>H</keycap></keycombo> </shortcut> <guimenu>Game</guimenu> -<guimenuitem>Show High Scores</guimenuitem></menuchoice></term> +<guimenuitem>Show High Scores</guimenuitem> +</menuchoice></term> <listitem> <para> Shows a dialog containing the High Scores for the various difficulty levels. @@ -179,8 +189,10 @@ </varlistentry> <varlistentry> -<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure -Notifications...</guimenuitem></menuchoice></term> +<term><menuchoice> +<guimenu>Settings</guimenu> +<guimenuitem>Configure Notifications...</guimenuitem> +</menuchoice></term> <listitem><para>This item displays a standard &kde; notifications configuration dialog, where you can change the notifications (sounds, visible messages, &etc;) used by &kdiamond;.</para></listitem> @@ -197,7 +209,7 @@ </variablelist> <para> -Additionally &kappname; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> +Additionally &kdiamond; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> menu items, for more information read the sections about the <ulink url="help:/fundamentals/ui.html#menus-settings" >Settings Menu</ulink> and <ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink> of the &kde; Fundamentals. @@ -280,26 +292,7 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-kdiamond"> -<title>How to obtain &kdiamond;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - - -&documentation.index; +&documentation.index; </book> <!-- Local Variables: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-16.04.3/src/main.cpp new/kdiamond-16.08.0/src/main.cpp --- old/kdiamond-16.04.3/src/main.cpp 2016-02-29 12:18:51.000000000 +0100 +++ new/kdiamond-16.08.0/src/main.cpp 2016-05-29 20:39:06.000000000 +0200 @@ -65,7 +65,7 @@ app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kdiamond"))); //resource directory for KNewStuff2 (this call causes the directory to be created; its existence is necessary for the downloader) - QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/themes/"); + QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QLatin1String("/themes/"); Kg::difficulty()->addStandardLevelRange( KgDifficultyLevel::VeryEasy,

1 0

commit kdewebdev4 for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kdewebdev4 for openSUSE:Factory checked in at 2016-08-31 00:07:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdewebdev4 (Old) and /work/SRC/openSUSE:Factory/.kdewebdev4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdewebdev4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdewebdev4/kdewebdev4.changes 2016-07-24 19:45:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdewebdev4.new/kdewebdev4.changes 2016-08-31 00:07:20.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:15:38 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:59:44 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kdewebdev-16.04.3.tar.xz New: ---- kdewebdev-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdewebdev4.spec ++++++ --- /var/tmp/diff_new_pack.zgeLYa/_old 2016-08-31 00:07:21.000000000 +0200 +++ /var/tmp/diff_new_pack.zgeLYa/_new 2016-08-31 00:07:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdewebdev4 -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Base package for kdewebdev License: GPL-2.0+ ++++++ kdewebdev-16.04.3.tar.xz -> kdewebdev-16.08.0.tar.xz ++++++

1 0

commit kdesdk4-scripts for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kdesdk4-scripts for openSUSE:Factory checked in at 2016-08-31 00:07:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesdk4-scripts (Old) and /work/SRC/openSUSE:Factory/.kdesdk4-scripts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdesdk4-scripts" Changes: -------- --- /work/SRC/openSUSE:Factory/kdesdk4-scripts/kdesdk4-scripts.changes 2016-07-24 19:45:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdesdk4-scripts.new/kdesdk4-scripts.changes 2016-08-31 00:07:16.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:15:29 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:59:20 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kde-dev-scripts-16.04.3.tar.xz New: ---- kde-dev-scripts-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk4-scripts.spec ++++++ --- /var/tmp/diff_new_pack.U8cZmL/_old 2016-08-31 00:07:17.000000000 +0200 +++ /var/tmp/diff_new_pack.U8cZmL/_new 2016-08-31 00:07:17.000000000 +0200 @@ -24,7 +24,7 @@ License: GPL-2.0 and GFDL-1.2 Group: System/GUI/KDE Url: http://www.kde.org/ -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{rname}-%{version}.tar.xz Patch0: %{rname}-4.14.3-fix-bashisms.patch ++++++ kde-dev-scripts-16.04.3.tar.xz -> kde-dev-scripts-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-16.04.3/createtarball/config.ini new/kde-dev-scripts-16.08.0/createtarball/config.ini --- old/kde-dev-scripts-16.04.3/createtarball/config.ini 2016-05-31 00:30:55.000000000 +0200 +++ new/kde-dev-scripts-16.08.0/createtarball/config.ini 2016-07-14 00:37:47.000000000 +0200 @@ -62,9 +62,18 @@ kde_release = no remove = mailody.kdevelop makechangelog TODO +[libktorrent] +gitModule = yes +mainmodule = extragear +submodule = network +version = 2.0 +docs = no + [ktorrent] +gitModule = yes mainmodule = extragear submodule = network +version = 5.0 [kcoloredit] mainmodule = extragear @@ -376,3 +385,10 @@ translations= yes docs = yes custompo = libmuon,muon,muon-discover,muon-installer,muon-notifier,muon-updater + +[kronometer] +gitModule = yes +gitTag = v2.1.0 +mainmodule = extragear +submodule = utils +version = 2.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-16.04.3/createtarball/create_tarball.rb new/kde-dev-scripts-16.08.0/createtarball/create_tarball.rb --- old/kde-dev-scripts-16.04.3/createtarball/create_tarball.rb 2016-05-31 00:30:55.000000000 +0200 +++ new/kde-dev-scripts-16.08.0/createtarball/create_tarball.rb 2016-07-14 00:37:47.000000000 +0200 @@ -1,7 +1,9 @@ #!/usr/bin/ruby # -# Ruby script for generating amaroK tarball releases from KDE SVN +# Ruby script for generating tarball releases of KDE repositories (git or SVN). +# This script can create tarballs with source code, translations and documentation +# for the given KDE4-based project(s). For KF5-based projects, use create_tarball_kf5. # # (c) 2005 Mark Kretschmann <markey(a)web.de> # (c) 2006-2008 Tom Albers <tomalbers(a)kde.nl> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-16.04.3/createtarball/create_tarball_kf5.rb new/kde-dev-scripts-16.08.0/createtarball/create_tarball_kf5.rb --- old/kde-dev-scripts-16.04.3/createtarball/create_tarball_kf5.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-16.08.0/createtarball/create_tarball_kf5.rb 2016-07-14 00:37:47.000000000 +0200 @@ -0,0 +1,481 @@ +#!/usr/bin/ruby + +# +# Ruby script for generating tarball releases of KDE repositories (git or SVN). +# This script can create tarballs with source code, translations and documentation +# for the given KF5-based project(s). For KDE4-based projects, use create_tarball. +# +# (c) 2005 Mark Kretschmann <markey(a)web.de> +# (c) 2006-2008 Tom Albers <tomalbers(a)kde.nl> +# (c) 2007 Angelo Naselli <anaselli(a)linux.it> (command line parameters) +# Some parts of this code taken from cvs2dist +# License: GNU General Public License V2 + +require 'optparse' +require 'ostruct' +require 'find' +require 'fileutils' + +# check command line parameters +options = OpenStruct.new +options.help = false +options.https = false +options.ask = true +options.translations = true + +opts = OptionParser.new do |opts| + opts.on("-u", "--user USERNAME", "svn account") do |u| + options.username = u + end + opts.on("-w", "--https", "Using https instead of svn+ssh") do |w| + options.https = w + end + opts.on("-n", "--noaccount", "Using svn://anonsvn.kde.org/ instead of svn+ssh") do |n| + options.anonsvn = n + end + opts.on("-a", "--application APPL", "Application name (all for all, kde_release for apps that have kde_release=yes)") do |a| + options.application = a + options.ask = false + end + opts.on("-v", "--version VER", "Overwrite package version set in config.ini") do |v| + options.ver = v + end + opts.on_tail("-h", "--help", "Show this usage statement") do |h| + options.help = true + end + opts.on("-r", "--revision REV", "Use a specific revision of the repository") do |r| + options.rev = r + end + opts.on("-t", "--no-translations", "Don't include translations") do |t| + options.translations = false + end +end + +begin + opts.parse!(ARGV) +rescue Exception => e + puts e, "", opts + puts + exit +end + +if (options.username) + username = options.username + "@" +end + +if (options.application) + apps = Array.new + apps << options.application +end + +if (options.https) + if (username) + svnbase = "https://#{username}svn.kde.org/home/kde" + else + puts opts + puts + puts "Username is mandatory with https" + exit + end +else + svnbase = "svn+ssh://#{username}svn.kde.org/home/kde" +end + +if (options.anonsvn) + if (options.https) + puts opts + puts + puts "https or anonsvn please, not both" + exit + end + svnbase = "svn://anonsvn.kde.org/home/kde" +end + +if (options.help) + puts opts + exit +end + +############# START ############# + +kde_version = `svn ls svn://anonsvn.kde.org/home/kde/tags/KDE | sort | tail -n1 | cut -d "/" -f1`.chomp + +#---------------------------------------------------------------- +# initiate. +#---------------------------------------------------------------- + +f = File.new("config.ini") +app = Array.new +begin + while (line = f.readline) + aline = line.chomp + if aline[0,1] == "[" + app << aline[1,(aline.length-2)] + end + end +rescue EOFError + f.close +end + +puts "Last KDE version found: " + kde_version +if (options.ask) + puts "Which apps (multiple sep by space, posibilities: all kde_release " + app.join(" ") + ")?" + apps = gets.split(" ") +end + +kde_release = false; +if apps[0] == "all" + apps = app +elsif apps[0] == "kde_release" + apps = app + kde_release = true; +end + +puts "-> Considering " + apps.join(" & ") +if kde_release + puts " -> Only applications which have kde_release = yes in config " +end +puts + +#---------------------------------------------------------------- +# retrieve apps. +#---------------------------------------------------------------- + +apps.each do |app| + puts + puts "-> Processing " + app + + found = false; + appdata = Hash.new + f = File.new("config.ini") + begin + while (line = f.readline) + aline = line.chomp + if aline == "[" + app + "]" + found = true; + elsif aline.length > 0 && found + data = aline.split("="); + temp = { data[0].strip => data[1].strip } + appdata = appdata.merge(temp) + else + found = false + end + end + rescue EOFError + f.close + end + + if (kde_release && appdata["kde_release"] != "yes") + puts " -> Skipping because kde_release is not set in the config.ini" + next + end + + if (options.ver) + temp = { "version" => options.ver } + appdata = appdata.merge(temp) + else + if !appdata["version"] + temp = { "version" => kde_version } + appdata = appdata.merge(temp) + else + if kde_release + temp = { "version" => appdata["version"] + "-kde" + kde_version } + appdata = appdata.merge(temp) + end + end + end + + if !appdata["name"] + temp = { "name" => app } + appdata = appdata.merge(temp) + end + + if appdata["folder"] + app = appdata["folder"] + end + + if !appdata["folder"] || appdata["name"] + temp = { "folder" => appdata["name"] + "-" + appdata["version"] } + else + temp = { "folder" => appdata["folder"] + "-" + appdata["version"] } + end + appdata = appdata.merge(temp) + + if appdata["addPo"] && appdata["addPo"].length > 0 + temp = { "addPo" => (appdata["addPo"]+" "+app).split(" ") } + else + temp = { "addPo" => [app] } + end + appdata = appdata.merge(temp) + + if appdata["addDocs"] && appdata["addDocs"].length > 0 + temp = { "addDocs" => (appdata["addDocs"]+" "+app).split(" ") } + else + temp = { "addDocs" => [app] } + end + appdata = appdata.merge(temp) + + tmpl10nmodule = appdata["l10nmodule"] + + if appdata["submodule"] && appdata["submodule"].length > 0 + if appdata["mainmodule"] == "extragear" || appdata["mainmodule"] == "playground" + temp = { "submodulepath" => appdata["submodule"] + "/", "l10nmodule" => appdata["mainmodule"] + "-" + appdata["submodule"] } + else + temp = { "submodulepath" => appdata["submodule"] + "/", "l10nmodule" => appdata["mainmodule"] } + end + else + temp = { "submodulepath" => "", "l10nmodule" => appdata["mainmodule"] } + end + appdata = appdata.merge(temp) + + # if l10nmodule is specified in the config file, then use it + if tmpl10nmodule + temp = { "l10nmodule" => tmpl10nmodule } + appdata = appdata.merge(temp) + end + + if !appdata["customlang"] + temp = { "customlang" => [] } + end + appdata = appdata.merge(temp) + + # Preparing + rev = "" + revString = "" + if (options.rev) + rev = "-r " + options.rev + revString = " Rev " + options.rev + end + + if appdata["gitModule"] + if !appdata["gitTag"] + temp = { "gitTag" => "HEAD" } + appdata = appdata.merge(temp) + end + puts "-> Fetching git://anongit.kde.org/" + app + ".git " + appdata["gitTag"] + " into " + appdata["folder"] + "..." + else + puts "-> Fetching " + appdata["mainmodule"] + "/" + appdata["submodulepath"] + app + revString + " into " + appdata["folder"] + "..." + end + # Remove old folder, if exists + `rm -rf #{appdata["folder"]} 2> /dev/null` + `rm -f #{appdata["folder"]}.tar.xz 2> /dev/null` + Dir.mkdir( appdata["folder"] ) + Dir.chdir( appdata["folder"] ) + + if appdata["mainmodule"][0,5] == "trunk" || appdata["mainmodule"][0,8] == "branches" + svnroot = "#{svnbase}/" + else + #trunk is assumed for all mainmodules that don't start with "trunk" or "branches" + svnroot = "#{svnbase}/trunk/" + end + + if !appdata["l10npath"] + temp = { "l10npath" => "." } + appdata = appdata.merge(temp) + end + + # Do the main checkouts. + if appdata["gitModule"] + `git archive --remote git://anongit.kde.org/#{app}.git #{appdata["gitTag"]} | tar -x` + else + if appdata["wholeModule"] + `svn co #{svnroot}/#{appdata["mainmodule"]}/#{appdata["submodulepath"]} #{rev} #{app}-tmp` + else + `svn co #{svnroot}/#{appdata["mainmodule"]}/#{appdata["submodulepath"]}#{app} #{rev} #{app}-tmp` + end + Dir.chdir( app + "-tmp" ) + + if appdata["docs"] != "no" + if !appdata["docpath"] + temp = { "docpath" => "doc/#{app}" } + appdata = appdata.merge(temp) + end + `svn co #{svnroot}/#{appdata["mainmodule"]}/#{appdata["submodulepath"]}/#{appdata["docpath"]} #{rev} doc` + end + + # Move them to the toplevel + `/bin/mv * ..` + Dir.chdir( ".." ) + + `find -name ".svn" | xargs rm -rf` + `rm -rf #{app}-tmp` + end + + # translations + if appdata["translations"] != "no" && options.translations + puts "-> Fetching l10n docs for #{appdata["submodulepath"]}#{app} #{revString}..." + + i18nlangs = `svn cat #{svnroot}/#{appdata["l10npath"]}/l10n-kf5/subdirs #{rev}`.split + i18nlangsCleaned = [] + for lang in i18nlangs + l = lang.chomp + if (l != "x-test") && (appdata["customlang"].empty? || appdata["customlang"].include?(l)) + i18nlangsCleaned += [l]; + end + end + i18nlangs = i18nlangsCleaned + + Dir.mkdir( "po" ) + + Dir.mkdir( "l10n" ) + Dir.chdir( "l10n" ) + + # docs + for lang in i18nlangs + lang.chomp! + + for dg in appdata["addDocs"] + dg.chomp! + `rm -rf #{dg}` + docdirname = "#{appdata["l10npath"]}/l10n-kf5/#{lang}/docs/#{appdata["l10nmodule"]}/#{dg}" + if ( appdata["docs"] != "no" ) + puts " -> Checking if #{lang} has translated documentation...\n" + if dg.include? "/" + `svn co -q #{rev} #{svnroot}/#{docdirname} #{dg} > /dev/null 2>&1` + else + `svn co -q #{rev} #{svnroot}/#{docdirname} > /dev/null 2>&1` + end + end + next unless FileTest.exists?( dg + '/index.docbook' ) + + print " -> Copying #{lang}'s #{dg} documentation over... " + if dg.include? "/" + FileUtils.mkdir_p( "../po/#{lang}/docs/#{dg}" ) + `cp -R #{dg}/* ../po/#{lang}/docs/#{dg}` + else + FileUtils.mkdir_p( "../po/#{lang}/docs/#{dg}/" ) + `cp -R #{dg}/ ../po/#{lang}/docs` + end + + puts( "done.\n" ) + end + end + + # app translations + puts "-> Fetching l10n po for #{appdata["submodulepath"]}#{app}...\n" + + Dir.chdir( ".." ) # in submodule now + + $subdirs = false + + for lang in i18nlangs + lang.chomp! + dest = "po/#{lang}" + + for dg in appdata["addPo"] + dg.chomp! + if appdata["wholeModule"] + print " -> Copying #{lang}'s over ..\n" + pofolder = "#{appdata["l10npath"]}/l10n-kf5/#{lang}/messages/#{appdata["l10nmodule"]}" + `svn co #{svnroot}/#{pofolder} #{dest}` + next if !FileTest.exist?( dest ) + + elsif appdata["custompo"] + valid = false + for sp in appdata["custompo"].split(/,/) + pofilename = "#{appdata["l10npath"]}/l10n-kf5/#{lang}/messages/#{appdata["l10nmodule"]}/#{sp}.po" + `svn cat #{svnroot}/#{pofilename} #{rev} 2> /dev/null | tee l10n/#{sp}.po` + if not FileTest.size( "l10n/#{sp}.po" ) == 0 + valid=true + if !FileTest.exist?( dest ) + Dir.mkdir( dest ) + end + print "\n -> Copying #{lang}'s #{sp}.po over .. " + `mv l10n/#{sp}.po #{dest}` + end + end + next if not valid + else + pofilename = "#{appdata["l10npath"]}/l10n-kf5/#{lang}/messages/#{appdata["l10nmodule"]}/#{dg}.po" + `svn cat #{svnroot}/#{pofilename} #{rev} 2> /dev/null | tee l10n/#{dg}.po` + next if FileTest.size( "l10n/#{dg}.po" ) == 0 + + if !FileTest.exist?( dest ) + Dir.mkdir( dest ) + end + + print " -> Copying #{lang}'s #{dg}.po over .. " + `mv l10n/#{dg}.po #{dest}` + puts( "done.\n" ) + end + end + end + + `rm -rf l10n` + + # add l10n to compilation. + `echo "find_package(KF5I18n CONFIG REQUIRED)" >> CMakeLists.txt` + `echo "ki18n_install(po)" >> CMakeLists.txt` + + if appdata["docs"] != "no" + # add docs to compilation. + `echo "find_package(KF5DocTools CONFIG REQUIRED)" >> CMakeLists.txt` + `echo "kdoctools_install(po)" >> CMakeLists.txt` + end + end + + datafolder = appdata["l10ndata"] + if datafolder + if !FileTest.exists?( "l10ndata_temp" ) + puts "-> Fetching l10n data from #{datafolder} #{revString}..." + + i18nlangs = `svn cat #{svnroot}/#{appdata["l10npath"]}/l10n-kf5/subdirs #{rev}`.split + i18nlangsCleaned = [] + for lang in i18nlangs + l = lang.chomp + if (l != "x-test") && (appdata["customlang"].empty? || appdata["customlang"].include?(l)) + i18nlangsCleaned += [l]; + end + end + i18nlangs = i18nlangsCleaned + + Dir.mkdir( "l10ndata" ) + topmakefile = File.new( "l10ndata/CMakeLists.txt", File::CREAT | File::RDWR | File::TRUNC ) + + # data + for lang in i18nlangs + lang.chomp! + + docdirname = "#{appdata["l10npath"]}/l10n-kf5/#{lang}/data/#{datafolder}" + puts " -> Checking if #{lang} has localized data...\n" + `rm -rf l10ndata_temp` + `svn co -q #{rev} #{svnroot}/#{docdirname} l10ndata_temp 2> /dev/null 2>&1` + next unless FileTest.exists?( 'l10ndata_temp/CMakeLists.txt' ) + + topmakefile << "add_subdirectory( #{lang} )\n" + + print " -> Copying #{lang}'s data over .. " + `mv l10ndata_temp l10ndata/#{lang}` + + puts( "done.\n" ) + end + topmakefile.close() + + # add data to compilation. + `echo "add_subdirectory( l10ndata )" >> CMakeLists.txt` + else + puts "l10ndata_temp folder exists in source, could not add l10ndata" + end + end + + # add doc generation to compilation + if (appdata["docs"] != "no") && (!appdata["gitModule"]) + `echo "add_subdirectory( doc )" >> CMakeLists.txt` + end + + # Remove cruft + `find -name ".svn" | xargs rm -rf` + if ( appdata["remove"] != "") + `/bin/rm -rf #{appdata["remove"]}` + end + + print "-> Compressing .. " + Dir.chdir( ".." ) # root folder + `tar -Jcf #{appdata["folder"]}.tar.xz --group=root --owner=root #{appdata["folder"]}` + #`rm -rf #{appdata["folder"]}` + puts " done." + puts "" + print "md5sum: ", `md5sum #{appdata["folder"]}.tar.xz` + print "sha256sum: ", `sha256sum #{appdata["folder"]}.tar.xz` +end + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-16.04.3/kf5/convert-kabc-to-kcontacts.pl new/kde-dev-scripts-16.08.0/kf5/convert-kabc-to-kcontacts.pl --- old/kde-dev-scripts-16.04.3/kf5/convert-kabc-to-kcontacts.pl 2016-05-31 00:30:55.000000000 +0200 +++ new/kde-dev-scripts-16.08.0/kf5/convert-kabc-to-kcontacts.pl 2016-07-14 00:37:47.000000000 +0200 @@ -3,11 +3,62 @@ # Aleix Pol Gonzalez <aleixpol(a)kde.org> for FS in `find $PWD -name '*.cpp' -or -name '*.h'`; do - perl -p -i -e 's$#include <KABC/$#include <KContacts/$g' $FS - perl -p -i -e 's$#include <kabc/$#include <kcontacts/$g' $FS - perl -p -i -e 's$#include "kabc/$#include "kcontacts/$g' $FS - perl -p -i -e 's$KABC::$KContacts::$g' $FS - perl -p -i -e 's/namespace KABC/namespace KContacts/g' $FS + perl -p -i -e 's$#include <kabc/addressbook.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/addressbook.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/addresseedialog.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/addresseedialog.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/addresslineedit.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/addresslineedit.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/distributionlistdialog.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/distributionlistdialog.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/distributionlist.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/distributionlist.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/emailselectordialog.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/emailselectordialog.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/errorhandler.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/errorhandler.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/formatfactory.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/formatfactory.h>$$gi' $FS + + perl -p -i -e 's$#include <kabc/format.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/format.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/lock.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/lock.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/locknull.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/locknull.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/stdaddressbook.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/stdaddressbook.h>$$gi' $FS + + perl -p -i -e 's$#include <kabc/vcardformat.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/vcardformat.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/vcard.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/vcard.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/vcardline.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/vcardline.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/vcardparser.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/vcardparser.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/resource.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/resource.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/$#include <kcontacts/$gi' $FS + perl -p -i -e 's$#include "kabc/$#include "kcontacts/$gi' $FS + + perl -p -i -e 's$KABC::$KContacts::$gi' $FS + perl -p -i -e 's/namespace KABC/namespace KContacts/gi' $FS done for FS in `find $PWD -name '*.cmake' -or -name 'CMakeLists.txt'`; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-16.04.3/kf5/convert-kstandarddirs.pl new/kde-dev-scripts-16.08.0/kf5/convert-kstandarddirs.pl --- old/kde-dev-scripts-16.04.3/kf5/convert-kstandarddirs.pl 2016-05-31 00:30:55.000000000 +0200 +++ new/kde-dev-scripts-16.08.0/kf5/convert-kstandarddirs.pl 2016-07-14 00:37:47.000000000 +0200 @@ -191,7 +191,7 @@ if (`grep QStandardPaths $file | grep -v '#include'`) { functionUtilkde::addIncludeInFile($file, "QStandardPaths"); } - if (`grep KSharedConfig $file | grep -v '#include'`) { + if (`grep KSharedConfig $file | grep -v '#include'` and not `grep ksharedconfig\.h $file`) { functionUtilkde::addIncludeInFile($file, "KSharedConfig"); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-16.04.3/kf5/convert-kurl.pl new/kde-dev-scripts-16.08.0/kf5/convert-kurl.pl --- old/kde-dev-scripts-16.04.3/kf5/convert-kurl.pl 2016-05-31 00:30:55.000000000 +0200 +++ new/kde-dev-scripts-16.08.0/kf5/convert-kurl.pl 2016-07-14 00:37:47.000000000 +0200 @@ -4,6 +4,11 @@ # KUrl -> QUrl # Usage: convert-kurl.pl *.h *.cpp +# VERY IMPORTANT: add add_definitions(-DQT_NO_URL_CAST_FROM_STRING) to your CMakeLists.txt, to catch +# passing a path to a QUrl via an implicit constructor (and port to QUrl(url) or QUrl::fromLocalFile(path)). + +# See https://community.kde.org/Frameworks/Porting_Notes#URL for more advice + use strict; use File::Basename; use lib dirname($0); @@ -134,15 +139,17 @@ my $url = $1; s/$url\.directory/$url\.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).path()/g; } + # url.url(KUrl::RemoveTrailingSlash) + if (/\.url$[KQ]Url::RemoveTrailingSlash$/) { + s/\.url$[KQ]Url::RemoveTrailingSlash$/\.adjusted(QUrl::StripTrailingSlash).toString()/g; + } # url.path(KUrl::RemoveTrailingSlash) - if (/(\w+)\.path$KUrl::RemoveTrailingSlash$/ && defined $urls{$1}) { - my $url = $1; - s/$url\.path$KUrl::RemoveTrailingSlash$/$url\.adjusted(QUrl::StripTrailingSlash).path()/g; + if (/\.path$KUrl::RemoveTrailingSlash$/) { + s/\.path$KUrl::RemoveTrailingSlash$/\.adjusted(QUrl::StripTrailingSlash).path()/g; } # url.toLocalFile(KUrl::RemoveTrailingSlash) - if (/(\w+)\.toLocalFile$KUrl::RemoveTrailingSlash$/ && defined $urls{$1}) { - my $url = $1; - s/$url\.toLocalFile$KUrl::RemoveTrailingSlash$/$url\.adjusted(QUrl::StripTrailingSlash).toLocalFile()/g; + if (/\.toLocalFile$KUrl::RemoveTrailingSlash$/) { + s/\.toLocalFile$KUrl::RemoveTrailingSlash$/\.adjusted(QUrl::StripTrailingSlash).toLocalFile()/g; } # url.adjustPath(KUrl::RemoveTrailingSlash) if (/(\w+)\.adjustPath$KUrl::RemoveTrailingSlash$/ && defined $urls{$1}) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-16.04.3/relicensecheck.pl new/kde-dev-scripts-16.08.0/relicensecheck.pl --- old/kde-dev-scripts-16.04.3/relicensecheck.pl 2016-05-31 00:30:55.000000000 +0200 +++ new/kde-dev-scripts-16.08.0/relicensecheck.pl 2016-07-14 00:37:47.000000000 +0200 @@ -65,6 +65,7 @@ 'chani' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'chehrlic' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'clee' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], + 'cmollekopf' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'coates' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'codrea' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'cordlandwehr' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], @@ -85,9 +86,11 @@ 'domi' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'djarvie' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'dyp' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], + 'dvratil' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'egorov' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'ehamberg' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'eliasp' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], + 'elvisangelaccio'=>['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'epignet' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'ereslibre' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'eros' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], @@ -180,6 +183,7 @@ 'nsams' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'ogoffart' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'pdamsten' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], + 'peifengyu' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'pgquiles' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'pino' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'pletourn' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], @@ -352,6 +356,7 @@ my %secondary_mail_addresses = ( 'aleixpol(a)kde.org' => 'apol', 'asmond(a)gmx.com' => 'asensi', + 'aetf(a)unlimitedcodeworks.xyz' => 'peifengyu', 'devel(a)the-user.org' => 'schmidt-domine', 'git(a)the-user.org' => 'schmidt-domine', 'kde(a)randomguy3.me.uk' => 'alexmerry',

1 0

commit kdesdk-thumbnailers for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kdesdk-thumbnailers for openSUSE:Factory checked in at 2016-08-31 00:07:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesdk-thumbnailers (Old) and /work/SRC/openSUSE:Factory/.kdesdk-thumbnailers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdesdk-thumbnailers" Changes: -------- --- /work/SRC/openSUSE:Factory/kdesdk-thumbnailers/kdesdk-thumbnailers.changes 2016-07-24 19:45:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdesdk-thumbnailers.new/kdesdk-thumbnailers.changes 2016-08-31 00:07:15.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:15:21 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:58:59 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kdesdk-thumbnailers-16.04.3.tar.xz New: ---- kdesdk-thumbnailers-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk-thumbnailers.spec ++++++ --- /var/tmp/diff_new_pack.tRYOZj/_old 2016-08-31 00:07:16.000000000 +0200 +++ /var/tmp/diff_new_pack.tRYOZj/_new 2016-08-31 00:07:16.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdesdk-thumbnailers -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Translation file thumbnail generators License: GPL-2.0+ ++++++ kdesdk-thumbnailers-16.04.3.tar.xz -> kdesdk-thumbnailers-16.08.0.tar.xz ++++++

1 0

commit kdegraphics-thumbnailers for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kdegraphics-thumbnailers for openSUSE:Factory checked in at 2016-08-31 00:07:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdegraphics-thumbnailers (Old) and /work/SRC/openSUSE:Factory/.kdegraphics-thumbnailers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdegraphics-thumbnailers" Changes: -------- --- /work/SRC/openSUSE:Factory/kdegraphics-thumbnailers/kdegraphics-thumbnailers.changes 2016-07-24 19:45:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdegraphics-thumbnailers.new/kdegraphics-thumbnailers.changes 2016-08-31 00:07:12.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:14:03 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:54:20 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kdegraphics-thumbnailers-16.04.3.tar.xz New: ---- kdegraphics-thumbnailers-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics-thumbnailers.spec ++++++ --- /var/tmp/diff_new_pack.8yC6pG/_old 2016-08-31 00:07:13.000000000 +0200 +++ /var/tmp/diff_new_pack.8yC6pG/_new 2016-08-31 00:07:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdegraphics-thumbnailers -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Graphics file thumbnail generators License: LGPL-2.1+ ++++++ kdegraphics-thumbnailers-16.04.3.tar.xz -> kdegraphics-thumbnailers-16.08.0.tar.xz ++++++

1 0

commit kdeedu-data for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kdeedu-data for openSUSE:Factory checked in at 2016-08-31 00:07:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeedu-data (Old) and /work/SRC/openSUSE:Factory/.kdeedu-data.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdeedu-data" Changes: -------- --- /work/SRC/openSUSE:Factory/kdeedu-data/kdeedu-data.changes 2016-07-24 19:45:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdeedu-data.new/kdeedu-data.changes 2016-08-31 00:07:11.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:13:49 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:53:31 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kdeedu-data-16.04.3.tar.xz New: ---- kdeedu-data-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeedu-data.spec ++++++ --- /var/tmp/diff_new_pack.mqi8wl/_old 2016-08-31 00:07:12.000000000 +0200 +++ /var/tmp/diff_new_pack.mqi8wl/_new 2016-08-31 00:07:12.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdeedu-data -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Data files for KDE Education Applications License: GPL-2.0+ ++++++ kdeedu-data-16.04.3.tar.xz -> kdeedu-data-16.08.0.tar.xz ++++++

1 0

commit kdebugsettings for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kdebugsettings for openSUSE:Factory checked in at 2016-08-31 00:07:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebugsettings (Old) and /work/SRC/openSUSE:Factory/.kdebugsettings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebugsettings" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebugsettings/kdebugsettings.changes 2016-07-24 19:45:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebugsettings.new/kdebugsettings.changes 2016-08-31 00:07:08.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:13:42 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:53:10 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kdebugsettings-16.04.3.tar.xz New: ---- kdebugsettings-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebugsettings.spec ++++++ --- /var/tmp/diff_new_pack.44TWVJ/_old 2016-08-31 00:07:09.000000000 +0200 +++ /var/tmp/diff_new_pack.44TWVJ/_new 2016-08-31 00:07:09.000000000 +0200 @@ -20,7 +20,7 @@ Summary: A KDebug settings module for KDE License: LGPL-2.0+ Group: System/GUI/KDE -Version: 16.04.3 +Version: 16.08.0 Release: 0 Url: https://www.kde.org Source0: kdebugsettings-%{version}.tar.xz ++++++ kdebugsettings-16.04.3.tar.xz -> kdebugsettings-16.08.0.tar.xz ++++++ ++++ 3015 lines of diff (skipped)

1 0

commit kde-dev-utils for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kde-dev-utils for openSUSE:Factory checked in at 2016-08-31 00:07:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde-dev-utils (Old) and /work/SRC/openSUSE:Factory/.kde-dev-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kde-dev-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/kde-dev-utils/kde-dev-utils.changes 2016-07-24 19:45:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kde-dev-utils.new/kde-dev-utils.changes 2016-08-31 00:07:06.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:12:39 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:51:08 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kde-dev-utils-16.04.3.tar.xz New: ---- kde-dev-utils-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde-dev-utils.spec ++++++ --- /var/tmp/diff_new_pack.koe6Az/_old 2016-08-31 00:07:07.000000000 +0200 +++ /var/tmp/diff_new_pack.koe6Az/_new 2016-08-31 00:07:07.000000000 +0200 @@ -22,7 +22,7 @@ License: GPL-2.0 and GFDL-1.2 and LGPL-2.0 Group: System/GUI/KDE Url: http://www.kde.org/ -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kde-dev-utils-16.04.3.tar.xz -> kde-dev-utils-16.08.0.tar.xz ++++++

1 0

commit kcron for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kcron for openSUSE:Factory checked in at 2016-08-31 00:07:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcron (Old) and /work/SRC/openSUSE:Factory/.kcron.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kcron" Changes: -------- --- /work/SRC/openSUSE:Factory/kcron/kcron.changes 2016-07-24 19:45:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcron.new/kcron.changes 2016-08-31 00:07:04.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:12:31 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:50:54 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kcron-16.04.3.tar.xz New: ---- kcron-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcron.spec ++++++ --- /var/tmp/diff_new_pack.DpKKnF/_old 2016-08-31 00:07:05.000000000 +0200 +++ /var/tmp/diff_new_pack.DpKKnF/_new 2016-08-31 00:07:05.000000000 +0200 @@ -27,7 +27,7 @@ BuildRequires: kio-devel BuildRequires: kxmlgui-devel Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Cron job configuration tool License: GPL-2.0+ @@ -60,7 +60,7 @@ %files %defattr(-,root,root) %doc COPYING README -%{_kf5_htmldir}/en/kcron/ +%{_kf5_htmldir}/en/kcontrol/ %{_kf5_servicesdir}/kcm_cron.desktop %_kf5_plugindir/kcm_cron.so ++++++ kcron-16.04.3.tar.xz -> kcron-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcron-16.04.3/doc/CMakeLists.txt new/kcron-16.08.0/doc/CMakeLists.txt --- old/kcron-16.04.3/doc/CMakeLists.txt 2016-03-07 11:38:06.000000000 +0100 +++ new/kcron-16.08.0/doc/CMakeLists.txt 2016-05-31 13:04:45.000000000 +0200 @@ -1,3 +1,3 @@ ########### install files ############### - -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcron) + +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kcron) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcron-16.04.3/src/kcm_cron.desktop new/kcron-16.08.0/src/kcm_cron.desktop --- old/kcron-16.04.3/src/kcm_cron.desktop 2016-03-07 11:38:06.000000000 +0100 +++ new/kcron-16.08.0/src/kcm_cron.desktop 2016-05-31 13:04:45.000000000 +0200 @@ -2,14 +2,14 @@ Exec=kcmshell5 kcm_cron Icon=preferences-system-cron -X-DocPath=kcron/index.html +X-DocPath=kcontrol/kcron/index.html Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kcm_cron X-KDE-ParentApp=kcontrol -X-KDE-System-Settings-Parent-Category=system-administration +X-KDE-System-Settings-Parent-Category=session Name=Task Scheduler Name[ar]=مجدول المهامّ @@ -90,6 +90,7 @@ Comment[fr]=Configurer et planifier les tâches Comment[ga]=Cumraigh agus sceideal tascanna Comment[gl]=Configura e planifica tarefas +Comment[he]=הגדר משימות מתוזמנות Comment[hne]=काम मन ल जमाव अउ कान्फिगर करव Comment[hr]=Podesi i rasporedi zadatke Comment[hu]=Időzített feladatok beállítása

1 0

commit kcachegrind for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kcachegrind for openSUSE:Factory checked in at 2016-08-31 00:07:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcachegrind (Old) and /work/SRC/openSUSE:Factory/.kcachegrind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kcachegrind" Changes: -------- --- /work/SRC/openSUSE:Factory/kcachegrind/kcachegrind.changes 2016-07-24 19:45:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcachegrind.new/kcachegrind.changes 2016-08-31 00:07:02.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:11:27 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:49:28 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kcachegrind-16.04.3.tar.xz New: ---- kcachegrind-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcachegrind.spec ++++++ --- /var/tmp/diff_new_pack.MVFdPK/_old 2016-08-31 00:07:03.000000000 +0200 +++ /var/tmp/diff_new_pack.MVFdPK/_new 2016-08-31 00:07:03.000000000 +0200 @@ -22,7 +22,7 @@ License: GPL-2.0 and BSD-4-Clause and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kcachegrind-16.04.3.tar.xz -> kcachegrind-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-16.04.3/libviews/callgraphview.cpp new/kcachegrind-16.08.0/libviews/callgraphview.cpp --- old/kcachegrind-16.04.3/libviews/callgraphview.cpp 2015-11-05 05:25:27.000000000 +0100 +++ new/kcachegrind-16.08.0/libviews/callgraphview.cpp 2016-07-06 23:50:15.000000000 +0200 @@ -754,6 +754,8 @@ if (_go->clusterGroups() && i) { QString iabr = GlobalConfig::shortenSymbol(i->prettyName()); + // escape quotation marks in symbols to avoid invalid dot syntax + iabr.replace("\"", "\\\""); *stream << QString("subgraph \"cluster%1\" { label=\"%2\";\n") .arg(cluster).arg(iabr); } @@ -762,6 +764,8 @@ TraceFunction* f = np->function(); QString abr = GlobalConfig::shortenSymbol(f->prettyName()); + // escape quotation marks to avoid invalid dot syntax + abr.replace("\"", "\\\""); *stream << QString(" F%1 [").arg((qptrdiff)f, 0, 16); if (_useBox) { // we want a minimal size for cost display diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-16.04.3/libviews/callmapview.cpp new/kcachegrind-16.08.0/libviews/callmapview.cpp --- old/kcachegrind-16.04.3/libviews/callmapview.cpp 2015-11-05 05:25:27.000000000 +0100 +++ new/kcachegrind-16.08.0/libviews/callmapview.cpp 2016-07-06 23:50:15.000000000 +0200 @@ -54,7 +54,7 @@ CallMapView::CallMapView(bool showCallers, TraceItemView* parentView, QWidget* parent, const char* name) - : TreeMapWidget(new CallMapBaseItem(), parent), TraceItemView(parentView) + : TreeMapWidget(new CallMapRootItem(), parent), TraceItemView(parentView) { setObjectName(name); _showCallers = showCallers; @@ -139,7 +139,7 @@ { TraceItemView::setData(d); - ((CallMapBaseItem*)base())->setFunction(0); + ((CallMapRootItem*)base())->setFunction(0); } void CallMapView::addItemListMenu(QMenu* menu, TreeMapItem* item) @@ -149,7 +149,7 @@ QMenu* m = menu->addMenu(tr("Go To")); int count = 0; while (count<GlobalConfig::maxSymbolCount() && item) { - QString name = item->text(0); + QString name = item->text(IDX_FUNCNAME); a = m->addAction(GlobalConfig::shortenSymbol(name)); a->setData(QVariant::fromValue( (void*)item )); item = item->parent(); @@ -229,8 +229,8 @@ m->addSeparator(); int count = 0; while (count<GlobalConfig::maxSymbolCount() && item) { - QString name = GlobalConfig::shortenSymbol(item->text(0)); - a = addStopFunctionAction(m, name, item->text(0)); + QString name = GlobalConfig::shortenSymbol(item->text(IDX_FUNCNAME)); + a = addStopFunctionAction(m, name, item->text(IDX_FUNCNAME)); if (a->isChecked()) foundStopName = true; item = item->parent(); count++; @@ -320,7 +320,7 @@ QString shortCurrentName; if (i) { - shortCurrentName = GlobalConfig::shortenSymbol(i->text(0)); + shortCurrentName = GlobalConfig::shortenSymbol(i->text(IDX_FUNCNAME)); } if (i) { @@ -416,7 +416,7 @@ if (!item) return; if (item->rtti() == 1) { - CallMapBaseItem* bi = (CallMapBaseItem*)item; + CallMapRootItem* bi = (CallMapRootItem*)item; activated(bi->function()); } else if (item->rtti() == 2) { @@ -432,10 +432,10 @@ void CallMapView::selectedSlot(TreeMapItem* item, bool kbd) { if (!item) return; - if (item->text(0).isEmpty()) return; + if (item->text(IDX_FUNCNAME).isEmpty()) return; if (kbd) { - QString msg = tr("Call Map: Current is '%1'").arg(item->text(0)); + QString msg = tr("Call Map: Current is '%1'").arg(item->text(IDX_FUNCNAME)); if (_topLevel) _topLevel->showMessage(msg, 5000); } @@ -443,7 +443,7 @@ TraceFunction* f = 0; if (item->rtti() == 1) { - CallMapBaseItem* bi = (CallMapBaseItem*)item; + CallMapRootItem* bi = (CallMapRootItem*)item; f = bi->function(); } else if (item->rtti() == 2) { @@ -515,7 +515,7 @@ break; } } - ((CallMapBaseItem*)base())->setFunction(f); + ((CallMapRootItem*)base())->setFunction(f); } else if ( ((changeType & partsChanged) && GlobalConfig::showCycles()) || (changeType & dataChanged) || @@ -553,10 +553,10 @@ // first, SubPartItem's while (i && count<GlobalConfig::maxSymbolCount()) { - itemTip = GlobalConfig::shortenSymbol(i->text(0)); + itemTip = GlobalConfig::shortenSymbol(i->text(IDX_FUNCNAME)); - if (!i->text(1).isEmpty()) - itemTip += " (" + i->text(1) + ')'; + if (!i->text(IDX_COST).isEmpty()) + itemTip += " (" + i->text(IDX_COST) + ')'; if (!tip.isEmpty()) tip += '\n'; @@ -572,7 +572,7 @@ ProfileCostArray* CallMapView::totalCost() { - TraceFunction* f = ((CallMapBaseItem*)base())->function(); + TraceFunction* f = ((CallMapRootItem*)base())->function(); if (!f) return 0; return GlobalConfig::showExpanded() ? f->inclusive() : f->data(); @@ -580,15 +580,42 @@ +// CallMapItemBase -// CallMapBaseItem +int CallMapItemBase::maxLines(int i) const +{ + if ((i == IDX_FUNCNAME) || (i == IDX_LOCATION)) return 1; + return 0; +} + +bool CallMapItemBase::allowBreak(int i) const +{ + if ((i == IDX_COST) || (i == IDX_CALLCOUNT)) return false; + return true; +} -CallMapBaseItem::CallMapBaseItem() +bool CallMapItemBase::allowTruncation(int i) const +{ + if ((i == IDX_COST) || (i == IDX_CALLCOUNT)) return false; + return true; +} + +DrawParams::Position CallMapItemBase::position(int i) const +{ + if ((i == IDX_FUNCNAME) || (i == IDX_LOCATION)) return TopLeft; + return TopRight; +} + + + +// CallMapRootItem + +CallMapRootItem::CallMapRootItem() { _f = 0; } -void CallMapBaseItem::setFunction(TraceFunction* f) +void CallMapRootItem::setFunction(TraceFunction* f) { if (f == _f) return; @@ -597,9 +624,9 @@ } -QString CallMapBaseItem::text(int textNo) const +QString CallMapRootItem::text(int i) const { - if (textNo == 0) { + if (i == IDX_FUNCNAME) { if (!_f) return QObject::tr("(no function)"); @@ -608,12 +635,15 @@ if (!_f) return QString(); - if (textNo == 2) return _f->prettyLocation(); - if (textNo == 3) return _f->calledCount().pretty(); - if (textNo != 1) return QString(); + if (i == IDX_LOCATION) + return _f->prettyLocation(); + if (i == IDX_CALLCOUNT) + return QString("%1 x").arg(_f->calledCount().pretty()); + if (i != IDX_COST) + return QString(); EventType* ct = ((CallMapView*)widget())->eventType(); - ProfileCostArray* t = ((CallMapView*)widget())->totalCost(); + ProfileCostArray* t = ((CallMapView*)widget())->totalCost(); if (GlobalConfig::showPercentage()) { double sum, total = t->subCost(ct); @@ -628,9 +658,10 @@ return _f->inclusive()->prettySubCost(ct); } -QPixmap CallMapBaseItem::pixmap(int i) const + +QPixmap CallMapRootItem::pixmap(int i) const { - if ((i != 1) || !_f) return QPixmap(); + if ((i != IDX_COST) || !_f) return QPixmap(); EventType* ct = ((CallMapView*)widget())->eventType(); ProfileCostArray* t = ((CallMapView*)widget())->totalCost(); @@ -640,7 +671,7 @@ } -double CallMapBaseItem::value() const +double CallMapRootItem::value() const { if (!_f) return 0.0; @@ -650,7 +681,7 @@ } -double CallMapBaseItem::sum() const +double CallMapRootItem::sum() const { if (!_f) return 0.0; @@ -663,19 +694,19 @@ } -bool CallMapBaseItem::isMarked(int) const +bool CallMapRootItem::isMarked(int) const { return ((CallMapView*)widget())->selectedItem() == _f; } -TreeMapItemList* CallMapBaseItem::children() +TreeMapItemList* CallMapRootItem::children() { if (_f && !initialized()) { CallMapView* w = (CallMapView*)widget(); if (0) qDebug("Create Function %s (%s)", w->showCallers() ? "Callers":"Callees", - qPrintable(text(0))); + qPrintable(text(IDX_FUNCNAME))); setSorting(-1); if (w->showCallers()) { @@ -708,7 +739,7 @@ return _children; } -QColor CallMapBaseItem::backColor() const +QColor CallMapRootItem::backColor() const { return ((CallMapView*)widget())->groupColor(_f); } @@ -735,16 +766,19 @@ QString CallMapCallingItem::text(int textNo) const { - if (textNo == 0) { + if (textNo == IDX_FUNCNAME) { if (!_c) return QObject::tr("(no call)"); return _c->calledName(); } - if (textNo == 2) return _c->called()->prettyLocation(); - if (textNo == 3) return SubCost(_factor * _c->callCount()).pretty(); - if (textNo != 1) return QString(); + if (textNo == IDX_LOCATION) + return _c->called()->prettyLocation(); + if (textNo == IDX_CALLCOUNT) + return QString("%1 x").arg(SubCost(_factor * _c->callCount()).pretty()); + if (textNo != IDX_COST) + return QString(); EventType* ct; ct = ((CallMapView*)widget())->eventType(); @@ -760,13 +794,14 @@ return val.pretty(); } + QPixmap CallMapCallingItem::pixmap(int i) const { - if (i != 1) return QPixmap(); + if (i != IDX_COST) return QPixmap(); // Cost pixmap EventType* ct = ((CallMapView*)widget())->eventType(); - ProfileCostArray* t = ((CallMapView*)widget())->totalCost(); + ProfileCostArray* t = ((CallMapView*)widget())->totalCost(); // colored level meter with frame return costPixmap( ct, _c, t->subCost(ct) / _factor, true); @@ -848,18 +883,21 @@ _c = c; } -QString CallMapCallerItem::text(int textNo) const +QString CallMapCallerItem::text(int i) const { - if (textNo == 0) { + if (i == IDX_FUNCNAME) { if (!_c) return QObject::tr("(no call)"); return _c->callerName(); } - if (textNo == 2) return _c->caller()->prettyLocation(); - if (textNo == 3) return SubCost(_factor * _c->callCount()).pretty(); - if (textNo != 1) return QString(); + if (i == IDX_LOCATION) + return _c->caller()->prettyLocation(); + if (i == IDX_CALLCOUNT) + return QString("%1 x").arg(SubCost(_factor * _c->callCount()).pretty()); + if (i != IDX_COST) + return QString(); EventType* ct; ct = ((CallMapView*)widget())->eventType(); @@ -874,14 +912,13 @@ return val.pretty(); } - QPixmap CallMapCallerItem::pixmap(int i) const { - if (i != 1) return QPixmap(); + if (i != IDX_COST) return QPixmap(); // Cost pixmap EventType* ct = ((CallMapView*)widget())->eventType(); - ProfileCostArray* t = ((CallMapView*)widget())->totalCost(); + ProfileCostArray* t = ((CallMapView*)widget())->totalCost(); // colored level meter with frame return costPixmap( ct, _c, t->subCost(ct) / _factor, true ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-16.04.3/libviews/callmapview.h new/kcachegrind-16.08.0/libviews/callmapview.h --- old/kcachegrind-16.04.3/libviews/callmapview.h 2015-11-05 05:25:27.000000000 +0100 +++ new/kcachegrind-16.08.0/libviews/callmapview.h 2016-07-06 23:50:15.000000000 +0200 @@ -82,18 +82,34 @@ -// Subitems of CallMap +// Subitems in CallMapView -class CallMapBaseItem: public TreeMapItem +// text field indexes: lower indexes get priority if space is not enough +#define IDX_COST 0 +#define IDX_FUNCNAME 1 +#define IDX_LOCATION 2 +#define IDX_CALLCOUNT 3 + +// base class providing same layout configuration +class CallMapItemBase: public TreeMapItem { public: - CallMapBaseItem(); + int maxLines(int) const; + bool allowBreak(int) const; + bool allowTruncation(int) const; + Position position(int) const; +}; + +class CallMapRootItem: public CallMapItemBase +{ +public: + CallMapRootItem(); void setFunction(TraceFunction* f); TraceFunction* function() { return _f; } int rtti() const { return 1; } double sum() const; - double value() const ; + double value() const; bool isMarked(int) const; QString text(int) const; QPixmap pixmap(int) const; @@ -105,7 +121,7 @@ }; -class CallMapCallingItem: public TreeMapItem +class CallMapCallingItem: public CallMapItemBase { public: CallMapCallingItem(double factor, TraceCall* c); @@ -126,7 +142,7 @@ double _factor; }; -class CallMapCallerItem: public TreeMapItem +class CallMapCallerItem: public CallMapItemBase { public: CallMapCallerItem(double factor, TraceCall* c); @@ -135,7 +151,7 @@ TraceFunction* function() { return _c->caller(); } double value() const; bool isMarked(int) const; - QString text(int) const; + QString text(int i) const; QPixmap pixmap(int) const; TreeMapItemList* children(); QColor backColor() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-16.04.3/libviews/treemap.cpp new/kcachegrind-16.08.0/libviews/treemap.cpp --- old/kcachegrind-16.04.3/libviews/treemap.cpp 2015-11-05 05:25:27.000000000 +0100 +++ new/kcachegrind-16.08.0/libviews/treemap.cpp 2016-07-06 23:50:15.000000000 +0200 @@ -428,7 +428,7 @@ while(1) { int halfPos = (breakPos + topPos)/2; int halfWidth = fm->width(text.mid(halfPos)); - if (halfWidth > maxWidth) { + if (halfWidth < maxWidth) { topPos = halfPos-1; continue; } @@ -587,6 +587,9 @@ } if (lines<1) return false; + // keep some space between fields if part of line already used + if (unused > 0 && unused < width) + unused -= _fm->averageCharWidth(); int y = isBottom ? height - h : 0; @@ -639,9 +642,13 @@ if (0) qDebug() << " For '" << name << "': Unused " << unused << ", StrW " << w << ", Width " << width; + // adjust available lines according to maxLines + int max = dp->maxLines(f); + if ((max > 0) && (lines>max)) lines = max; + // if we have limited space at 1st line: // use it only if whole name does fit in last line... - if ((unused < width) && (w > unused)) { + if ((lines>1) && (unused < width) && (w > unused)) { y = isBottom ? (y-h) : (y+h); lines--; @@ -652,6 +659,7 @@ _usedBottomLeft = _usedBottomCenter = _usedBottomRight = 0; else _usedTopLeft = _usedTopCenter = _usedTopRight = 0; + unused = width; } p->save(); @@ -665,11 +673,6 @@ else p->translate(r.x()+2, r.y()); - - // adjust available lines according to maxLines - int max = dp->maxLines(f); - if ((max > 0) && (lines>max)) lines = max; - /* loop over name parts to break up string depending on available width. * every char category change is supposed a possible break, * with the exception Uppercase=>Lowercase. @@ -680,14 +683,15 @@ */ QString remaining; int origLines = lines; + int unusedWidth = unused; while (lines>0) { // more than one line: search for line break - if (w>width && lines>1) { + if (dp->allowBreak(f) && w>unusedWidth && lines>1) { int breakPos; if (!isBottom) { - w = pixW + findBreak(breakPos, name, _fm, width - pixW); + w = pixW + findBreak(breakPos, name, _fm, unusedWidth - pixW); remaining = name.mid(breakPos); // remove space on break point @@ -697,7 +701,7 @@ name = name.left(breakPos); } else { // bottom - w = pixW + findBreakBackwards(breakPos, name, _fm, width - pixW); + w = pixW + findBreakBackwards(breakPos, name, _fm, unusedWidth - pixW); remaining = name.left(breakPos); // remove space on break point @@ -711,11 +715,16 @@ remaining = QString(); /* truncate and add ... if needed */ - if (w > width) { - name = _fm->elidedText(name, Qt::ElideRight, width - pixW); + if (dp->allowTruncation(f) && w > unusedWidth) { + name = _fm->elidedText(name, Qt::ElideRight, unusedWidth - pixW); w = _fm->width(name) + pixW; } + if (w > unusedWidth) { + name = QString(); + w = pixW; + } + int x = 0; if (isCenter) x = (width - w)/2; @@ -738,7 +747,7 @@ << x+pixW << "/" << y; p->drawText( x+pixW, y, - width - pixW, h, + unusedWidth - pixW, h, Qt::AlignLeft, name); y = isBottom ? (y-h) : (y+h); lines--; @@ -746,6 +755,7 @@ if (remaining.isEmpty()) break; name = remaining; w = pixW + _fm->width(name); + unusedWidth = width; } // make sure the pix stays visible @@ -2367,7 +2377,10 @@ if ((r.height() < _fontHeight) || (r.width() < _fontHeight)) return; RectDrawing d(r); - item->setRotated(_allowRotation && (r.height() > r.width())); + // draw text fields rotated to split direction + bool rotate = !horizontal(item, r); + if (_allowRotation) rotate = (r.height() > r.width()); + item->setRotated(rotate); for (int no=0;no<(int)_attr.size();no++) { if (!fieldVisible(no)) continue; d.drawField(p, no, item); @@ -2399,7 +2412,10 @@ if ((r.height() >= _fontHeight) && (r.width() >= _fontHeight)) { RectDrawing d(r); - item->setRotated(_allowRotation && (r.height() > r.width())); + // draw text fields rotated to split direction + bool rotate = !horizontal(item, r); + if (_allowRotation) rotate = (r.height() > r.width()); + item->setRotated(rotate); for (int no=0;no<(int)_attr.size();no++) { if (!fieldVisible(no)) continue; if (!fieldForced(no)) continue; @@ -2425,8 +2441,6 @@ self = 0; } else { - self = user_sum - child_sum; - if (user_sum < child_sum) { //qDebug() << "TreeMWidget " << // item->path() << ": User sum " << user_sum << " < Child Items sum " << child_sum; @@ -2436,30 +2450,17 @@ self = 0.0; } else { - // Try to put the border waste in self - // percent of wasted space on border... - float borderArea = origRect.width() * origRect.height(); - borderArea = (borderArea - r.width()*r.height())/borderArea; - unsigned borderValue = (unsigned)(borderArea * user_sum); - - if (borderValue > self) { - if (_skipIncorrectBorder) { - r = origRect; - // should add my self to nested self and set my self =0 - } - else - self = 0.0; - } - else - self -= borderValue; - - user_sum = child_sum + self; + self = user_sum - child_sum; } } - bool rotate = (_allowRotation && (r.height() > r.width())); + // use requested splitting algorithm: we rotate for horizontal splits + bool rotate = horizontal(item, r); int self_length = (int)( ((rotate) ? r.width() : r.height()) * - self / user_sum + .5); + self / user_sum + .5); + // drawn border belongs to self (TODO: option _skipIncorrectBorder) + self_length -= 2 * item->borderWidth(); + if (self_length > 0) { // take space for self cost QRect sr = r; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-16.04.3/libviews/treemap.h new/kcachegrind-16.08.0/libviews/treemap.h --- old/kcachegrind-16.04.3/libviews/treemap.h 2015-11-05 05:25:27.000000000 +0100 +++ new/kcachegrind-16.08.0/libviews/treemap.h 2016-07-06 23:50:15.000000000 +0200 @@ -76,6 +76,10 @@ virtual Position position(int) const = 0; // 0: no limit, negative: leave at least -maxLines() free virtual int maxLines(int) const { return 0; } + // allow breaking up content into multiple lines? + virtual bool allowBreak(int) const { return true; } + // truncate or show nothing if space not enough? + virtual bool allowTruncation(int) const { return true; } virtual int fieldCount() const { return 0; } virtual QColor backColor() const { return Qt::white; }

1 0

commit kbruch for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kbruch for openSUSE:Factory checked in at 2016-08-31 00:06:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbruch (Old) and /work/SRC/openSUSE:Factory/.kbruch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kbruch" Changes: -------- --- /work/SRC/openSUSE:Factory/kbruch/kbruch.changes 2016-07-24 19:52:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kbruch.new/kbruch.changes 2016-08-31 00:07:00.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:11:17 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:49:13 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kbruch-16.04.3.tar.xz New: ---- kbruch-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbruch.spec ++++++ --- /var/tmp/diff_new_pack.SlfEjy/_old 2016-08-31 00:07:01.000000000 +0200 +++ /var/tmp/diff_new_pack.SlfEjy/_new 2016-08-31 00:07:01.000000000 +0200 @@ -17,7 +17,7 @@ Name: kbruch -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Excercise Fractions License: GPL-2.0+ ++++++ kbruch-16.04.3.tar.xz -> kbruch-16.08.0.tar.xz ++++++ Files old/kbruch-16.04.3/doc/checked.png and new/kbruch-16.08.0/doc/checked.png differ Files old/kbruch-16.04.3/doc/compare.png and new/kbruch-16.08.0/doc/compare.png differ Files old/kbruch-16.04.3/doc/convert.png and new/kbruch-16.08.0/doc/convert.png differ Files old/kbruch-16.04.3/doc/factorize.png and new/kbruch-16.08.0/doc/factorize.png differ Files old/kbruch-16.04.3/doc/gui_main.png and new/kbruch-16.08.0/doc/gui_main.png differ Files old/kbruch-16.04.3/doc/gui_mode.png and new/kbruch-16.08.0/doc/gui_mode.png differ Files old/kbruch-16.04.3/doc/learning.png and new/kbruch-16.08.0/doc/learning.png differ Files old/kbruch-16.04.3/doc/mixed.png and new/kbruch-16.08.0/doc/mixed.png differ Files old/kbruch-16.04.3/doc/percentage.png and new/kbruch-16.08.0/doc/percentage.png differ Files old/kbruch-16.04.3/doc/reduced.png and new/kbruch-16.08.0/doc/reduced.png differ Files old/kbruch-16.04.3/doc/settings.png and new/kbruch-16.08.0/doc/settings.png differ Files old/kbruch-16.04.3/doc/statistics.png and new/kbruch-16.08.0/doc/statistics.png differ

1 0

commit kbreakout for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kbreakout for openSUSE:Factory checked in at 2016-08-31 00:06:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbreakout (Old) and /work/SRC/openSUSE:Factory/.kbreakout.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kbreakout" Changes: -------- --- /work/SRC/openSUSE:Factory/kbreakout/kbreakout.changes 2016-07-24 19:53:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kbreakout.new/kbreakout.changes 2016-08-31 00:06:58.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:11:07 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:48:58 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kbreakout-16.04.3.tar.xz New: ---- kbreakout-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbreakout.spec ++++++ --- /var/tmp/diff_new_pack.Ra4IFE/_old 2016-08-31 00:06:59.000000000 +0200 +++ /var/tmp/diff_new_pack.Ra4IFE/_new 2016-08-31 00:06:59.000000000 +0200 @@ -37,7 +37,7 @@ License: GPL-2.0+ Group: Amusements/Games/Action/Breakout Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kbreakout-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ kbreakout-16.04.3.tar.xz -> kbreakout-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/.gitignore new/kbreakout-16.08.0/.gitignore --- old/kbreakout-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kbreakout-16.08.0/.gitignore 2016-07-23 20:45:38.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/CMakeLists.txt new/kbreakout-16.08.0/CMakeLists.txt --- old/kbreakout-16.04.3/CMakeLists.txt 2016-04-22 14:50:26.000000000 +0200 +++ new/kbreakout-16.08.0/CMakeLists.txt 2016-07-23 20:45:38.000000000 +0200 @@ -26,7 +26,7 @@ include(FeatureSummary) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMAddAppIcon) Files old/kbreakout-16.04.3/doc/gameboard.png and new/kbreakout-16.08.0/doc/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/doc/index.docbook new/kbreakout-16.08.0/doc/index.docbook --- old/kbreakout-16.04.3/doc/index.docbook 2016-04-22 14:50:26.000000000 +0200 +++ new/kbreakout-16.08.0/doc/index.docbook 2016-07-23 20:45:38.000000000 +0200 @@ -1,8 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ -<!ENTITY kbreakout "<application>KBreakout</application>"> -<!ENTITY kappname "&kbreakout;"> -<!ENTITY package "kdegames"> <!ENTITY % English "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> @@ -35,12 +32,12 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-03</date> -<releaseinfo>1.0.0 (&kde; 4.11)</releaseinfo> +<date>2016-05-09</date> +<releaseinfo>1.2.0 (Applications 16.04)</releaseinfo> <abstract> <para> -&kappname;, a Breakout-like game.</para> +&kbreakout;, a Breakout-like game.</para> </abstract> <keywordset> @@ -59,9 +56,20 @@ <title>Introduction</title> <para> -&kappname; is a Breakout-like game. +&kbreakout; is a Breakout-like game. </para> +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="gameboard.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&kbreakout; gameboard</phrase> +</textobject> +</mediaobject> +</screenshot> + <para> The object of the game is to destroy as many bricks as possible without losing the ball. </para> @@ -82,6 +90,11 @@ To fire the ball press the spacebar, to move the bar use the mouse or the arrow keys. The ball will bounce in the direction of the side of the bar it bounced on hit, the more it bounces near the left end of the bar the more it will bounce toward the left, the same applies for the right side; if it bounces in the middle of the bar it will bounce straight toward the top. </para> +<para> +If you enable the option <guilabel>Fire on mouse click</guilabel> in the settings dialog, you can click with the &LMB; to fire. +Enabling the option will make the game steal the mouse cursor, pause the game to get the cursor back. +</para> + </chapter> <chapter id="rules-strategies-tips"> @@ -599,7 +612,7 @@ <varlistentry> <term><menuchoice> <shortcut> -<keycap>&Esc;</keycap> +<keycap>P</keycap> </shortcut> <guimenu>Game</guimenu> <guimenuitem>Pause</guimenuitem> @@ -682,7 +695,7 @@ <row> <entry>Pause/Resume</entry> <entry> -<keycap>&Esc;</keycap> +<keycap>P</keycap> </entry> </row> <row> @@ -729,7 +742,7 @@ <title>Credits and License</title> <para> -&kappname; +&kbreakout; </para> <para> Program copyright 2008 by Fela Winkelmolen <email>fela.kde(a)gmail.com</email> @@ -745,25 +758,6 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-kbreakout"> -<title>How to obtain &kappname;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - - &documentation.index; </book> <!-- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/src/CMakeLists.txt new/kbreakout-16.08.0/src/CMakeLists.txt --- old/kbreakout-16.04.3/src/CMakeLists.txt 2016-04-22 14:50:26.000000000 +0200 +++ new/kbreakout-16.08.0/src/CMakeLists.txt 2016-07-23 20:45:38.000000000 +0200 @@ -5,6 +5,7 @@ mainwindow.cpp canvaswidget.cpp gameengine.cpp + kbreakout_debug.cpp levelloader.cpp #generalsettings.cpp ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/src/canvaswidget.cpp new/kbreakout-16.08.0/src/canvaswidget.cpp --- old/kbreakout-16.04.3/src/canvaswidget.cpp 2016-04-22 14:50:26.000000000 +0200 +++ new/kbreakout-16.08.0/src/canvaswidget.cpp 2016-07-23 20:45:38.000000000 +0200 @@ -17,6 +17,7 @@ #include "canvaswidget.h" #include "globals.h" +#include "kbreakout_debug.h" #include "settings.h" #include <QGraphicsObject> @@ -33,7 +34,10 @@ { m_provider->discoverThemes("appdata", QStringLiteral("themes")); m_provider->setDeclarativeEngine(QStringLiteral("themeProvider"), engine()); - QString path = QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("qml/main.qml")); + QString path = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("qml/main.qml")); + + qCDebug(KBREAKOUT_General) << "QtQuick QML file: " << path; + setSource(QUrl::fromLocalFile(path)); // forward signals from QML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/src/gameengine.cpp new/kbreakout-16.08.0/src/gameengine.cpp --- old/kbreakout-16.04.3/src/gameengine.cpp 2016-04-22 14:50:26.000000000 +0200 +++ new/kbreakout-16.08.0/src/gameengine.cpp 2016-07-23 20:45:38.000000000 +0200 @@ -17,11 +17,11 @@ #include "gameengine.h" +#include "kbreakout_debug.h" #include "levelloader.h" #include <QTimer> #include <QTime> -#include <QDebug> GameEngine::GameEngine(QObject *parent) : QObject(parent) @@ -64,7 +64,7 @@ inline void GameEngine::deleteAllObjects() { - /*qDebug() << "all object deleted"; + /*qCDebug(KBREAKOUT_General) << "all object deleted"; deleteMovingObjects(); qDeleteAll(m_bricks); m_bricks.clear(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/src/kbreakout_debug.cpp new/kbreakout-16.08.0/src/kbreakout_debug.cpp --- old/kbreakout-16.04.3/src/kbreakout_debug.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kbreakout-16.08.0/src/kbreakout_debug.cpp 2016-07-23 20:45:38.000000000 +0200 @@ -0,0 +1,20 @@ +/* + Copyright 2016 Julian Helfferich <julian.helfferich(a)gmail.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 of the License, 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/>. +*/ + +#include "kbreakout_debug.h" + +Q_LOGGING_CATEGORY(KBREAKOUT_General, "KBreakout") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/src/kbreakout_debug.h new/kbreakout-16.08.0/src/kbreakout_debug.h --- old/kbreakout-16.04.3/src/kbreakout_debug.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kbreakout-16.08.0/src/kbreakout_debug.h 2016-07-23 20:45:38.000000000 +0200 @@ -0,0 +1,25 @@ +/* + Copyright 2016 Julian Helfferich <julian.helfferich(a)gmail.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 of the License, 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/>. +*/ + +#ifndef KBREAKOUT_DEBUG_H +#define KBREAKOUT_DEBUG_H + +// Define logging category +#include <QLoggingCategory> +Q_DECLARE_LOGGING_CATEGORY(KBREAKOUT_General) + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/src/levelloader.cpp new/kbreakout-16.08.0/src/levelloader.cpp --- old/kbreakout-16.04.3/src/levelloader.cpp 2016-04-22 14:50:26.000000000 +0200 +++ new/kbreakout-16.08.0/src/levelloader.cpp 2016-07-23 20:45:38.000000000 +0200 @@ -17,6 +17,7 @@ #include "levelloader.h" #include "globals.h" +#include "kbreakout_debug.h" #include <QDomDocument> #include <QFile> @@ -26,8 +27,6 @@ #include <KConfig> #include <KConfigGroup> -#include <QDebug> - LevelLoader::LevelLoader(QObject *parent) : QObject(parent) { @@ -65,8 +64,8 @@ // Loading document model // Locating the path in the filesystem - QString path = QLatin1String("levelsets/") + m_levelname + QLatin1String(".levelset"); - path = QStandardPaths::locate(QStandardPaths::DataLocation, path); + QString path = QStringLiteral("levelsets/%1.levelset").arg(m_levelname); + path = QStandardPaths::locate(QStandardPaths::AppDataLocation, path); // -- delete m_levelset; @@ -257,8 +256,8 @@ m_level++; // Loading the levelset - QString path = QLatin1String("levelsets/") + m_levelname + QLatin1String(".levelset"); - path = QStandardPaths::locate(QStandardPaths::DataLocation, path); + QString path = QStringLiteral("levelsets/%1.levelset").arg(m_levelname); + path = QStandardPaths::locate(QStandardPaths::AppDataLocation, path); KConfig file(path, KConfig::SimpleConfig); QString levelName(QLatin1String("level") + QString::number(m_level)); @@ -284,7 +283,7 @@ return; } - qDebug() << line << endl; + qCDebug(KBREAKOUT_General) << line << endl; if (line.size() > WIDTH) { qCritical() << "Invalid file: too many bricks\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/src/qml/logic.js new/kbreakout-16.08.0/src/qml/logic.js --- old/kbreakout-16.04.3/src/qml/logic.js 2016-04-22 14:50:26.000000000 +0200 +++ new/kbreakout-16.08.0/src/qml/logic.js 2016-07-23 20:45:38.000000000 +0200 @@ -601,12 +601,12 @@ var r1 = createRect(bricks[0]); var r2 = createRect(bricks[1]); - var area1 = intersectArea(ball, r1); - var area2 = intersectArea(ball, r2); + var area1 = intersectArea(ballRect, r1); + var area2 = intersectArea(ballRect, r2); if (area1 > area2) { // the area of intersection with the first brick is bigger - collideWithBrick(ball, bricsk[0]); + collideWithBrick(ball, bricks[0]); } else { collideWithBrick(ball, bricks[1]); }

1 0

commit kbounce for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kbounce for openSUSE:Factory checked in at 2016-08-31 00:06:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbounce (Old) and /work/SRC/openSUSE:Factory/.kbounce.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kbounce" Changes: -------- --- /work/SRC/openSUSE:Factory/kbounce/kbounce.changes 2016-07-24 19:45:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kbounce.new/kbounce.changes 2016-08-31 00:06:56.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:10:54 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:48:43 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kbounce-16.04.3.tar.xz New: ---- kbounce-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbounce.spec ++++++ --- /var/tmp/diff_new_pack.FxF7AG/_old 2016-08-31 00:06:57.000000000 +0200 +++ /var/tmp/diff_new_pack.FxF7AG/_new 2016-08-31 00:06:57.000000000 +0200 @@ -58,7 +58,7 @@ License: LGPL-2.0+ Group: Amusements/Games/Action/Other Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kbounce-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ kbounce-16.04.3.tar.xz -> kbounce-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-16.04.3/.gitignore new/kbounce-16.08.0/.gitignore --- old/kbounce-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kbounce-16.08.0/.gitignore 2016-06-01 11:28:17.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-16.04.3/CMakeLists.txt new/kbounce-16.08.0/CMakeLists.txt --- old/kbounce-16.04.3/CMakeLists.txt 2016-02-09 01:20:36.000000000 +0100 +++ new/kbounce-16.08.0/CMakeLists.txt 2016-06-01 11:28:17.000000000 +0200 @@ -27,7 +27,7 @@ include(FeatureSummary) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMAddAppIcon) Files old/kbounce-16.04.3/doc/button-new.png and new/kbounce-16.08.0/doc/button-new.png differ Files old/kbounce-16.04.3/doc/button-pause.png and new/kbounce-16.08.0/doc/button-pause.png differ Files old/kbounce-16.04.3/doc/document-new.png and new/kbounce-16.08.0/doc/document-new.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-16.04.3/doc/index.docbook new/kbounce-16.08.0/doc/index.docbook --- old/kbounce-16.04.3/doc/index.docbook 2016-02-09 01:20:36.000000000 +0100 +++ new/kbounce-16.08.0/doc/index.docbook 2016-06-01 11:28:17.000000000 +0200 @@ -1,8 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&kbounce;"> - <!ENTITY kappversion "0.11"> - <!ENTITY package "kdegames"> <!ENTITY % English "INCLUDE" > <!ENTITY % addindex "IGNORE"> ]> @@ -37,11 +34,11 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-05</date> -<releaseinfo>&kappversion; (&kde; 4.11)</releaseinfo> +<date>2016-05-09</date> +<releaseinfo>0.11 (Applications 16.04)</releaseinfo> <abstract> - <para>This documentation describes the game of &kbounce; version &kappversion;</para> + <para>This documentation describes the game of &kbounce; version 0.11</para> </abstract> @@ -211,13 +208,6 @@ <sect1 id="the-tool-bar"> <title>The Tool Bar</title> -<mediaobject> -<imageobject> -<imagedata format="PNG" fileref="toolbar.png"/> -</imageobject> -<textobject><phrase>Toolbar</phrase></textobject> -</mediaobject> - <para> The toolbar provides buttons for the commonly used functions. </para> @@ -240,7 +230,7 @@ <entry> <inlinemediaobject> <imageobject> -<imagedata format="PNG" fileref="button-new.png"/> +<imagedata format="PNG" fileref="document-new.png"/> </imageobject> <textobject><phrase>New Game Button</phrase></textobject> </inlinemediaobject> @@ -268,7 +258,7 @@ <entry> <inlinemediaobject> <imageobject> -<imagedata format="PNG" fileref="button-pause.png"/> +<imagedata format="PNG" fileref="media-playback-pause.png"/> </imageobject> <textobject> <phrase>Pause Button</phrase></textobject> @@ -299,20 +289,12 @@ <title>The Menu Items</title> <sect2> -<title>The <guimenu>Game</guimenu> Menu</title> - -<mediaobject> -<imageobject> -<imagedata format="PNG" fileref="menu-game.png"/> -</imageobject> -<textobject> -<phrase><guimenu>Game</guimenu> Menu</phrase></textobject> -</mediaobject> +<title>The Game Menu</title> <variablelist> <varlistentry id="game-new"> -<term> -<menuchoice><shortcut> +<term><menuchoice> +<shortcut> <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo> </shortcut> <guimenu>Game</guimenu> @@ -324,10 +306,9 @@ </varlistentry> <varlistentry id="game-end"> -<term> -<menuchoice><shortcut> -<keycombo action="simul">&Ctrl;<keycap>End</keycap> -</keycombo> +<term><menuchoice> +<shortcut> +<keycombo action="simul">&Ctrl;<keycap>End</keycap></keycombo> </shortcut> <guimenu>Game</guimenu> <guimenuitem>End Game</guimenuitem> @@ -338,9 +319,10 @@ </varlistentry> <varlistentry id="game-pause"> -<term> -<menuchoice><shortcut> -<keycap>P</keycap></shortcut> +<term><menuchoice> +<shortcut> +<keycap>P</keycap> +</shortcut> <guimenu>Game</guimenu> <guimenuitem>Pause</guimenuitem> </menuchoice></term> @@ -350,8 +332,8 @@ </varlistentry> <varlistentry id="game-highscores"> -<term> -<menuchoice><shortcut> +<term><menuchoice> +<shortcut> <keycombo action="simul">&Ctrl;<keycap>H</keycap></keycombo> </shortcut> <guimenu>Game</guimenu> @@ -365,7 +347,8 @@ </varlistentry> <varlistentry id="game-quit"> -<term><menuchoice><shortcut> +<term><menuchoice> +<shortcut> <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> </shortcut> <guimenu>Game</guimenu> @@ -380,15 +363,7 @@ </sect2> <sect2 id="settings-menu"> -<title>The <guimenu>Settings</guimenu> Menu</title> - -<mediaobject> -<imageobject> -<imagedata format="PNG" fileref="menu-settings.png"/> -</imageobject> -<textobject> -<phrase>Settings Menu</phrase></textobject> -</mediaobject> +<title>The Settings Menu</title> <variablelist> @@ -451,17 +426,20 @@ </chapter> <chapter id="configuration"><title>Game Configuration</title>  - <para>The &kbounce; configuration dialog allows you to select visual themes for &kbounce;.</para> - <para> - To select a new theme simply choose the theme from - the selection list. Each item in the list shows a small - preview left to the theme name. A selection is immediately applied. - </para> - <para> - Once you are satisfied with the theme you have selected you - can click the <guibutton>OK</guibutton> - button, located at the bottom part of this dialog. - </para> +<para>The &kbounce; configuration dialog allows you to select visual themes for &kbounce;.</para> +<para> +To select a new theme simply choose the theme from +the selection list. Each item in the list shows a small +preview left to the theme name. A selection is immediately applied. +</para> +<para> +You can select random background pictures from a user defined folder with images. +</para> +<para> +Once you are satisfied with the theme you have selected you +can click the <guibutton>OK</guibutton> +button, located at the bottom part of this dialog. +</para> </chapter> <chapter id="credits-and-license"> @@ -507,15 +485,6 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -&install.intro.documentation; - -&install.compile.documentation; - -</appendix> - &documentation.index; </book> <!-- Files old/kbounce-16.04.3/doc/kbounce_corridor1.png and new/kbounce-16.08.0/doc/kbounce_corridor1.png differ Files old/kbounce-16.04.3/doc/kbounce_corridor2.png and new/kbounce-16.08.0/doc/kbounce_corridor2.png differ Files old/kbounce-16.04.3/doc/media-playback-pause.png and new/kbounce-16.08.0/doc/media-playback-pause.png differ Files old/kbounce-16.04.3/doc/menu-game.png and new/kbounce-16.08.0/doc/menu-game.png differ Files old/kbounce-16.04.3/doc/menu-settings.png and new/kbounce-16.08.0/doc/menu-settings.png differ Files old/kbounce-16.04.3/doc/toolbar.png and new/kbounce-16.08.0/doc/toolbar.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-16.04.3/gamewidget.cpp new/kbounce-16.08.0/gamewidget.cpp --- old/kbounce-16.04.3/gamewidget.cpp 2016-02-09 01:20:36.000000000 +0100 +++ new/kbounce-16.08.0/gamewidget.cpp 2016-06-01 11:28:17.000000000 +0200 @@ -44,7 +44,7 @@ , m_lives( 0 ) , m_time( 0 ) , m_vertical( false ) - , m_soundTimeout( QStandardPaths::locate( QStandardPaths::DataLocation, QStringLiteral("sounds/timeout.wav") ) ) + , m_soundTimeout( QStandardPaths::locate( QStandardPaths::AppDataLocation, QStringLiteral("sounds/timeout.wav") ) ) { m_board = new KBounceBoard( &m_renderer ); connect(m_board, &KBounceBoard::fillChanged, this, &KBounceGameWidget::onFillChanged); @@ -304,7 +304,7 @@ void KBounceGameWidget::closeLevel() -{ +{ m_bonus = 0; if ( m_board->filled() >= MIN_FILL_PERCENT ) { @@ -337,7 +337,7 @@ m_renderer.loadNewBackgroundPixmap(); redraw(); -} +} void KBounceGameWidget::redraw() @@ -438,7 +438,7 @@ textWidth = p.boundingRect( p.viewport(), Qt::AlignCenter | Qt::AlignVCenter, text ).width(); } KColorScheme kcs = KColorScheme( QPalette::Normal, KColorScheme::Window ); - p.setPen( kcs.foreground(KColorScheme::NormalText).color()); + p.setPen( kcs.foreground(KColorScheme::NormalText).color()); p.drawText( p.viewport(), Qt::AlignCenter | Qt::AlignVCenter, text ); p.end(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-16.04.3/org.kde.kbounce.desktop new/kbounce-16.08.0/org.kde.kbounce.desktop --- old/kbounce-16.04.3/org.kde.kbounce.desktop 2016-02-09 01:20:36.000000000 +0100 +++ new/kbounce-16.08.0/org.kde.kbounce.desktop 2016-06-01 11:28:17.000000000 +0200 @@ -112,7 +112,7 @@ GenericName[ro]=Joc cu o minge săritoare GenericName[ru]=Неуёмные шарики GenericName[sk]=Hra s poskakujúcou loptou -GenericName[sl]=Odbijajoča se žogica +GenericName[sl]=Igra odbijajočih se žogic GenericName[sq]=Lojë me top që kërcen GenericName[sr]=Игра одбијајућих лопти GenericName[sr@ijekavian]=Игра одбијајућих лопти diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-16.04.3/wall.cpp new/kbounce-16.08.0/wall.cpp --- old/kbounce-16.04.3/wall.cpp 2016-02-09 01:20:36.000000000 +0100 +++ new/kbounce-16.08.0/wall.cpp 2016-06-01 11:28:17.000000000 +0200 @@ -38,8 +38,8 @@ : KGameRenderedItem( renderer,QLatin1String(""),board ) , m_board( board ) , m_dir( dir ) - , m_soundWallstart( QStandardPaths::locate( QStandardPaths::DataLocation, QStringLiteral("sounds/wallstart.wav") ) ) - , m_soundReflect( QStandardPaths::locate( QStandardPaths::DataLocation, QStringLiteral("sounds/reflect.wav") ) ) + , m_soundWallstart( QStandardPaths::locate( QStandardPaths::AppDataLocation, QStringLiteral("sounds/wallstart.wav") ) ) + , m_soundReflect( QStandardPaths::locate( QStandardPaths::AppDataLocation, QStringLiteral("sounds/reflect.wav") ) ) { // The wall velocity would initialised on every new level. m_wallVelocity = 0.0; @@ -253,7 +253,7 @@ bool safeEdgeHit = false; QPointF p1, p2, p3; - switch ( m_dir ) + switch ( m_dir ) { case Up: p1 = m_nextBoundingRect.topLeft();

1 0

commit kblocks for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kblocks for openSUSE:Factory checked in at 2016-08-31 00:06:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kblocks (Old) and /work/SRC/openSUSE:Factory/.kblocks.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kblocks" Changes: -------- --- /work/SRC/openSUSE:Factory/kblocks/kblocks.changes 2016-07-24 19:45:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kblocks.new/kblocks.changes 2016-08-31 00:06:53.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:10:35 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:48:10 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kblocks-16.04.3.tar.xz New: ---- kblocks-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kblocks.spec ++++++ --- /var/tmp/diff_new_pack.iKe1rc/_old 2016-08-31 00:06:54.000000000 +0200 +++ /var/tmp/diff_new_pack.iKe1rc/_new 2016-08-31 00:06:54.000000000 +0200 @@ -42,7 +42,7 @@ License: LGPL-2.1+ Group: Amusements/Games/Strategy/Real Time Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kblocks-%{version}.tar.xz Obsoletes: %{name}5 < %{version} @@ -77,8 +77,8 @@ %dir %{_kf5_configkcfgdir} %{_kf5_configkcfgdir}/kblocks.kcfg %{_kf5_configdir}/kblocks.knsrc -%dir %_datadir/appdata -%_datadir/appdata/org.kde.kblocks.appdata.xml -%_datadir/kxmlgui5/kblocks/ +%dir %{_kf5_appstreamdir} +%{_kf5_appstreamdir}/org.kde.kblocks.appdata.xml +%{_kf5_kxmlguidir}/kblocks/ %changelog ++++++ kblocks-16.04.3.tar.xz -> kblocks-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/.gitignore new/kblocks-16.08.0/.gitignore --- old/kblocks-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kblocks-16.08.0/.gitignore 2016-06-12 09:35:45.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/AI/EvaluationInterface.h new/kblocks-16.08.0/AI/EvaluationInterface.h --- old/kblocks-16.04.3/AI/EvaluationInterface.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/AI/EvaluationInterface.h 2016-06-12 09:35:45.000000000 +0200 @@ -1,11 +1,11 @@ /*************************************************************************** -* KBlocks, a falling blocks game for KDE * -* Copyright (C) 2010 University Freiburg * -* * -* 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 of the License, or * -* (at your option) any later version. * +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2010 University Freiburg <squall.leonhart.cai(a)gmail.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 of the License, or * +* (at your option) any later version. * ***************************************************************************/ #ifndef EVALUATIONINTERFACE_H #define EVALUATIONINTERFACE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/AI/KBlocksAIEvaluation.cpp new/kblocks-16.08.0/AI/KBlocksAIEvaluation.cpp --- old/kblocks-16.04.3/AI/KBlocksAIEvaluation.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/AI/KBlocksAIEvaluation.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -1,11 +1,11 @@ /*************************************************************************** -* KBlocks, a falling blocks game for KDE * -* Copyright (C) 2010 University Freiburg * -* * -* 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 of the License, or * -* (at your option) any later version. * +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2010 University Freiburg <squall.leonhart.cai(a)gmail.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 of the License, or * +* (at your option) any later version. * ***************************************************************************/ #include "KBlocksAIEvaluation.h" #include "KBlocksAIFeature.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/AI/KBlocksAIEvaluation.h new/kblocks-16.08.0/AI/KBlocksAIEvaluation.h --- old/kblocks-16.04.3/AI/KBlocksAIEvaluation.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/AI/KBlocksAIEvaluation.h 2016-06-12 09:35:45.000000000 +0200 @@ -1,11 +1,11 @@ /*************************************************************************** -* KBlocks, a falling blocks game for KDE * -* Copyright (C) 2010 University Freiburg * -* * -* 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 of the License, or * -* (at your option) any later version. * +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2010 University Freiburg <squall.leonhart.cai(a)gmail.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 of the License, or * +* (at your option) any later version. * ***************************************************************************/ #ifndef KBLOCKSAIEVALUATION_H #define KBLOCKSAIEVALUATION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/AI/KBlocksAIFeature.cpp new/kblocks-16.08.0/AI/KBlocksAIFeature.cpp --- old/kblocks-16.04.3/AI/KBlocksAIFeature.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/AI/KBlocksAIFeature.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -1,11 +1,11 @@ /*************************************************************************** -* KBlocks, a falling blocks game for KDE * -* Copyright (C) 2010 University Freiburg * -* * -* 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 of the License, or * -* (at your option) any later version. * +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2010 University Freiburg <squall.leonhart.cai(a)gmail.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 of the License, or * +* (at your option) any later version. * ***************************************************************************/ #include "KBlocksAIFeature.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/AI/KBlocksAIFeature.h new/kblocks-16.08.0/AI/KBlocksAIFeature.h --- old/kblocks-16.04.3/AI/KBlocksAIFeature.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/AI/KBlocksAIFeature.h 2016-06-12 09:35:45.000000000 +0200 @@ -1,11 +1,11 @@ /*************************************************************************** -* KBlocks, a falling blocks game for KDE * -* Copyright (C) 2010 University Freiburg * -* * -* 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 of the License, or * -* (at your option) any later version. * +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2010 University Freiburg <squall.leonhart.cai(a)gmail.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 of the License, or * +* (at your option) any later version. * ***************************************************************************/ #ifndef KBLOCKSAIFEATURE_H #define KBLOCKSAIFEATURE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/AI/KBlocksAILog.cpp new/kblocks-16.08.0/AI/KBlocksAILog.cpp --- old/kblocks-16.04.3/AI/KBlocksAILog.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/AI/KBlocksAILog.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -1,11 +1,11 @@ /*************************************************************************** -* KBlocks, a falling blocks game for KDE * -* Copyright (C) 2010 University Freiburg * -* * -* 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 of the License, or * -* (at your option) any later version. * +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2010 University Freiburg <squall.leonhart.cai(a)gmail.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 of the License, or * +* (at your option) any later version. * ***************************************************************************/ #include "KBlocksAILog.h" #include <string.h> @@ -73,7 +73,6 @@ void gotoXY(int x, int y) { #ifdef DEBUG - y++; char essq[100]; char xstr[100]; char ystr[100]; @@ -207,19 +206,19 @@ { if (full) { if (x != -1) { - gotoXY(x, y++); + gotoXY(x, ++y); } println(piece); if (x != -1) { - gotoXY(x, y++); + gotoXY(x, ++y); } println("STATE"); if (x != -1) { - gotoXY(x, y++); + gotoXY(x, ++y); } print("Rotation Id :"); println(piece->getRotation()); if (x != -1) { - gotoXY(x, y++); + gotoXY(x, ++y); } print("pos: ("); print(piece->getPosX()); @@ -229,7 +228,7 @@ println("Cells: "); for (int i = 0; i < KBlocksPiece_CellCount; ++i) { if (x != -1) { - gotoXY(x, y++); + gotoXY(x, ++y); } print("["); print(piece->getCellPosX(i)); @@ -251,7 +250,7 @@ int h = field->getHeight(); for (int j = 0; j < h; ++j) { if (x != -1) { - gotoXY(x, y + j); + gotoXY(x, y + j + 1); } print("|"); for (int i = 0; i < w; ++i) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/AI/KBlocksAILog.h new/kblocks-16.08.0/AI/KBlocksAILog.h --- old/kblocks-16.04.3/AI/KBlocksAILog.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/AI/KBlocksAILog.h 2016-06-12 09:35:45.000000000 +0200 @@ -1,11 +1,11 @@ /*************************************************************************** -* KBlocks, a falling blocks game for KDE * -* Copyright (C) 2010 University Freiburg * -* * -* 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 of the License, or * -* (at your option) any later version. * +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2010 University Freiburg <squall.leonhart.cai(a)gmail.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 of the License, or * +* (at your option) any later version. * ***************************************************************************/ #ifndef KBLOCKSAILOG_H #define KBLOCKSAILOG_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/AI/KBlocksAIPlanner.cpp new/kblocks-16.08.0/AI/KBlocksAIPlanner.cpp --- old/kblocks-16.04.3/AI/KBlocksAIPlanner.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/AI/KBlocksAIPlanner.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -1,11 +1,11 @@ /*************************************************************************** -* KBlocks, a falling blocks game for KDE * -* Copyright (C) 2010 University Freiburg * -* * -* 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 of the License, or * -* (at your option) any later version. * +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2010 University Freiburg <squall.leonhart.cai(a)gmail.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 of the License, or * +* (at your option) any later version. * ***************************************************************************/ #include "KBlocksAIPlanner.h" #include "KBlocksAILog.h" @@ -14,9 +14,8 @@ ##### Definition ######################################### ############################################################ */ struct Span { - Span() + Span() : Span(0,0) { - Span(0, 0); } Span(int mn, int mx) { @@ -90,7 +89,7 @@ for (int i = 0; i < KBlocksPiece_CellCount; i++) { int cx = piece.getCellPosX(i); int cy = piece.getCellPosY(i); - if (mpField->getCell(cx, cy)) { + if (cx < 0 || cx >= w || mpField->getCell(cx, cy)) { invalidPos = true; break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/AI/KBlocksAIPlanner.h new/kblocks-16.08.0/AI/KBlocksAIPlanner.h --- old/kblocks-16.04.3/AI/KBlocksAIPlanner.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/AI/KBlocksAIPlanner.h 2016-06-12 09:35:45.000000000 +0200 @@ -1,11 +1,11 @@ /*************************************************************************** -* KBlocks, a falling blocks game for KDE * -* Copyright (C) 2010 University Freiburg * -* * -* 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 of the License, or * -* (at your option) any later version. * +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2010 University Freiburg <squall.leonhart.cai(a)gmail.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 of the License, or * +* (at your option) any later version. * ***************************************************************************/ #ifndef KBLOCKSAIPLANNER_H #define KBLOCKSAIPLANNER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/AI/KBlocksAIPlannerExtend.cpp new/kblocks-16.08.0/AI/KBlocksAIPlannerExtend.cpp --- old/kblocks-16.04.3/AI/KBlocksAIPlannerExtend.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/AI/KBlocksAIPlannerExtend.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -1,11 +1,11 @@ /*************************************************************************** -* KBlocks, a falling blocks game for KDE * -* Copyright (C) 2010 University Freiburg * -* * -* 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 of the License, or * -* (at your option) any later version. * +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2010 University Freiburg <squall.leonhart.cai(a)gmail.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 of the License, or * +* (at your option) any later version. * ***************************************************************************/ #include "KBlocksAIPlannerExtend.h" #include "KBlocksAILog.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/AI/KBlocksAIPlannerExtend.h new/kblocks-16.08.0/AI/KBlocksAIPlannerExtend.h --- old/kblocks-16.04.3/AI/KBlocksAIPlannerExtend.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/AI/KBlocksAIPlannerExtend.h 2016-06-12 09:35:45.000000000 +0200 @@ -1,11 +1,11 @@ /*************************************************************************** -* KBlocks, a falling blocks game for KDE * -* Copyright (C) 2010 University Freiburg * -* * -* 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 of the License, or * -* (at your option) any later version. * +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2010 University Freiburg <squall.leonhart.cai(a)gmail.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 of the License, or * +* (at your option) any later version. * ***************************************************************************/ #ifndef KBLOCKSAIPLANNEREXTEND_H #define KBLOCKSAIPLANNEREXTEND_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/AI/KBlocksAIPlayer.cpp new/kblocks-16.08.0/AI/KBlocksAIPlayer.cpp --- old/kblocks-16.04.3/AI/KBlocksAIPlayer.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/AI/KBlocksAIPlayer.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -1,11 +1,11 @@ /*************************************************************************** -* KBlocks, a falling blocks game for KDE * -* Copyright (C) 2010 University Freiburg * -* * -* 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 of the License, or * -* (at your option) any later version. * +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2010 University Freiburg <squall.leonhart.cai(a)gmail.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 of the License, or * +* (at your option) any later version. * ***************************************************************************/ #include "KBlocksAIPlayer.h" @@ -13,6 +13,9 @@ #include "KBlocksAIFeature.h" #include "KBlocksAIPlannerExtend.h" #include "KBlocksAILog.h" +#include "KBlocksAITypeDefine.h" + +#include "KBlocks_debug.h" #include <utility> #include <vector> @@ -48,7 +51,6 @@ mAIStarted = false; mAIPaused = false; - mpGame = 0; mpAIField = 0; mpCurPiece = 0; mpNextPiece = 0; @@ -175,11 +177,18 @@ /* Phase II - Planning ----------------------------------*/ void KBlocksAIPlayer::planning() { + if (!mpPlanner) { + qCWarning(KBlocksAI) << "No planner set for AI evaluation!"; + return; + } #ifdef TWO_PIECE_PLANNER AIPlanner_PieceValue_Sequence mPieceSequence = AIPlanner_PieceValue_Sequence(0); mPieceSequence.push_back(KBlocks_PieceType_Detail(mpCurPiece->toValue())); mPieceSequence.push_back(KBlocks_PieceType_Detail(mpNextPiece->toValue())); - mNextCount = (dynamic_cast<KBlocksAIPlannerExtend *>(mpPlanner))->process(mPieceSequence); + KBlocksAIPlannerExtend *extendedPlanner = dynamic_cast<KBlocksAIPlannerExtend *>(mpPlanner); + if (extendedPlanner != nullptr) { + mNextCount = extendedPlanner->process(mPieceSequence); + } #else KBlocks_PieceType_Detail type = KBlocks_PieceType_Detail(mpCurPiece->toValue()); mNextCount = mpPlanner->process(type); @@ -289,7 +298,7 @@ value = evaluator->evaluate(field); #endif #endif - result.push_back(Result(piece, value)); + result.push_back(Result(KBlocksPiece(piece), value)); #ifdef MAX_UTILITY bool better = (best_value < value); #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/AI/KBlocksAIPlayer.h new/kblocks-16.08.0/AI/KBlocksAIPlayer.h --- old/kblocks-16.04.3/AI/KBlocksAIPlayer.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/AI/KBlocksAIPlayer.h 2016-06-12 09:35:45.000000000 +0200 @@ -1,11 +1,11 @@ /*************************************************************************** -* KBlocks, a falling blocks game for KDE * -* Copyright (C) 2010 University Freiburg * -* * -* 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 of the License, or * -* (at your option) any later version. * +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2010 University Freiburg <squall.leonhart.cai(a)gmail.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 of the License, or * +* (at your option) any later version. * ***************************************************************************/ #ifndef KBLOCKSAIPLAYER_H #define KBLOCKSAIPLAYER_H @@ -48,7 +48,6 @@ bool mAIPaused; // Phase I - State Update - SingleGameInterface *mpGame; KBlocksField *mpAIField; KBlocksPiece *mpCurPiece; KBlocksPiece *mpNextPiece; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/AI/KBlocksAITypeDefine.h new/kblocks-16.08.0/AI/KBlocksAITypeDefine.h --- old/kblocks-16.04.3/AI/KBlocksAITypeDefine.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/AI/KBlocksAITypeDefine.h 2016-06-12 09:35:45.000000000 +0200 @@ -1,18 +1,17 @@ /*************************************************************************** -* KBlocks, a falling blocks game for KDE * -* Copyright (C) 2010 University Freiburg * -* * -* 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 of the License, or * -* (at your option) any later version. * +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2010 University Freiburg <squall.leonhart.cai(a)gmail.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 of the License, or * +* (at your option) any later version. * ***************************************************************************/ #ifndef KBLOCKSAITYPEDEFINE_H #define KBLOCKSAITYPEDEFINE_H #include <utility> #include <stdlib.h> -#include <time.h> #define KSIRTET diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/AI/PlannerInterface.h new/kblocks-16.08.0/AI/PlannerInterface.h --- old/kblocks-16.04.3/AI/PlannerInterface.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/AI/PlannerInterface.h 2016-06-12 09:35:45.000000000 +0200 @@ -1,11 +1,11 @@ /*************************************************************************** -* KBlocks, a falling blocks game for KDE * -* Copyright (C) 2010 University Freiburg * -* * -* 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 of the License, or * -* (at your option) any later version. * +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2010 University Freiburg <squall.leonhart.cai(a)gmail.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 of the License, or * +* (at your option) any later version. * ***************************************************************************/ #ifndef PLANNERINTERFACE_H #define PLANNERINTERFACE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/CMakeLists.txt new/kblocks-16.08.0/CMakeLists.txt --- old/kblocks-16.04.3/CMakeLists.txt 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/CMakeLists.txt 2016-06-12 09:35:45.000000000 +0200 @@ -25,7 +25,7 @@ include(FeatureSummary) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMAddAppIcon) @@ -41,6 +41,7 @@ set(kblocks_SRCS main.cpp + KBlocks_debug.cpp KBlocksDefine.cpp KBlocksNetServer.cpp KBlocksNetClient.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/FieldInterface.h new/kblocks-16.08.0/FieldInterface.h --- old/kblocks-16.04.3/FieldInterface.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/FieldInterface.h 2016-06-12 09:35:45.000000000 +0200 @@ -12,8 +12,10 @@ class FieldInterface { +protected: + FieldInterface() : maBoard(nullptr), mHeight(0), mWidth(0) {}; + public: - FieldInterface() {}; virtual ~FieldInterface() {}; public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/GameLogicInterface.h new/kblocks-16.08.0/GameLogicInterface.h --- old/kblocks-16.04.3/GameLogicInterface.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/GameLogicInterface.h 2016-06-12 09:35:45.000000000 +0200 @@ -15,7 +15,7 @@ class GameLogicInterface { public: - GameLogicInterface() {}; + GameLogicInterface() : maGameList(nullptr) {}; virtual ~GameLogicInterface() {}; public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/GamePlayerInterface.h new/kblocks-16.08.0/GamePlayerInterface.h --- old/kblocks-16.04.3/GamePlayerInterface.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/GamePlayerInterface.h 2016-06-12 09:35:45.000000000 +0200 @@ -31,7 +31,7 @@ class GamePlayerInterface { public: - GamePlayerInterface() {}; + GamePlayerInterface() : mpGame(nullptr) {}; virtual ~GamePlayerInterface() {}; public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksDisplay.h new/kblocks-16.08.0/KBlocksDisplay.h --- old/kblocks-16.04.3/KBlocksDisplay.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksDisplay.h 2016-06-12 09:35:45.000000000 +0200 @@ -49,7 +49,7 @@ private: int mGameCount; - int mGamesPerWidth; + //int mGamesPerWidth; int mUpdateInterval; QTimer mUpdateTimer; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksDummyAI.cpp new/kblocks-16.08.0/KBlocksDummyAI.cpp --- old/kblocks-16.04.3/KBlocksDummyAI.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksDummyAI.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -9,11 +9,10 @@ ***************************************************************************/ #include "KBlocksDummyAI.h" -#include <stdlib.h> +#include <QtGlobal> KBlocksDummyAI::KBlocksDummyAI() { - mpGame = 0; mPauseFlag = false; mFieldWidth = 0; @@ -49,8 +48,8 @@ return; } - int rotation = rand() % (mRotateCount + 1) - mRotateCount / 2; - int motionx = rand() % (mFieldWidth + 1) - mFieldWidth / 2; + int rotation = qrand() % (mRotateCount + 1) - mRotateCount / 2; + int motionx = qrand() % (mFieldWidth + 1) - mFieldWidth / 2; if (rotation > 0) { for (int i = 0; i < rotation; i++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksDummyAI.h new/kblocks-16.08.0/KBlocksDummyAI.h --- old/kblocks-16.04.3/KBlocksDummyAI.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksDummyAI.h 2016-06-12 09:35:45.000000000 +0200 @@ -27,7 +27,6 @@ void think(GamePlayer_ActionList *actionList); protected: - SingleGameInterface *mpGame; bool mPauseFlag; int mFieldWidth; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksGameLogic.cpp new/kblocks-16.08.0/KBlocksGameLogic.cpp --- old/kblocks-16.04.3/KBlocksGameLogic.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksGameLogic.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -9,6 +9,8 @@ ***************************************************************************/ #include "KBlocksGameLogic.h" +#include <QtGlobal> + KBlocksGameLogic::KBlocksGameLogic(int capacity, bool record) { mGameCount = 0; @@ -20,6 +22,9 @@ mStandbyMode = false; mGameInterval = 0; + mInitialInterval = 0; + mLevelUpInterval = 0; + maGameList = new KBlocksSingleGame*[capacity]; if (record) { @@ -41,6 +46,9 @@ mStandbyMode = false; mGameInterval = 0; + mInitialInterval = 0; + mLevelUpInterval = 0; + maGameList = new KBlocksSingleGame*[mGameMax]; mpGameRecorder = 0; @@ -170,7 +178,7 @@ lineList[i] = tmpTotal; if ((mPunishFlag) && (tmpPunishCount > 0)) { - int punishSeed = rand() % 256; + int punishSeed = qrand() % 256; for (int j = 0; j < i; j++) { maGameList[j]->punishGame(tmpPunishCount, punishSeed); } @@ -276,9 +284,9 @@ int *seedList = new int[mGameCount]; if (mGameSeed < 0) { mGameSeed = -mGameSeed; - srand(mGameSeed); + qsrand(mGameSeed); for (int i = 0; i < mGameCount; i++) { - seedList[i] = rand() % 256; + seedList[i] = qrand() % 256; } } else { for (int i = 0; i < mGameCount; i++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksGameReplayer.cpp new/kblocks-16.08.0/KBlocksGameReplayer.cpp --- old/kblocks-16.04.3/KBlocksGameReplayer.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksGameReplayer.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -9,24 +9,51 @@ ***************************************************************************/ #include "KBlocksGameReplayer.h" +#include <sstream> +#include <string> + +#include "KBlocksDefine.h" +#include "KBlocks_debug.h" + KBlocksGameReplayer::KBlocksGameReplayer(const char *fileName, bool isBinaryMode) { + // Map data types to strings for reading text file for (int i = 0; i < RecordDataType_Max_Count; ++i) { mRTMap[ KBlocksRecordText[i] ] = i; } mRTMap[string("MaxCount")] = -1; - FILE *pFile = fopen(fileName, "r"); + // Set default variables in case loading the file fails + mGameCount = 0; + mGameSeed = 0; + mSameSeed = false; + mStepLength = 1; + + // Open replay file + std::ifstream replayFile; + if (isBinaryMode) { + replayFile.open(fileName, std::ios::binary); + } else { + replayFile.open(fileName); + } - if (!pFile) { - mGameCount = 0; + // Check that replay file was opened successfully + if (!replayFile.is_open()) { + qCWarning(KBReplay) << "Unable to open file " << fileName; return; } if (isBinaryMode) { - loadBinary(pFile); + loadBinary(replayFile); } else { - loadText(pFile); + loadText(replayFile); + } + + // Check that more than two Replay steps have been loaded + // The two first steps set the required variables. + if (mReplayList.size() < 2) { + qCWarning(KBReplay) << "Problem loading replay file" << fileName; + return; } mGameCount = mReplayList.front().value; @@ -35,9 +62,7 @@ mSameSeed = (mReplayList.front().index == 1); mReplayList.pop_front(); - mStepLength = 1; - - fclose(pFile); + replayFile.close(); } KBlocksGameReplayer::~KBlocksGameReplayer() @@ -93,48 +118,54 @@ return true; } -void KBlocksGameReplayer::loadText(FILE *pFile) +void KBlocksGameReplayer::loadText(std::ifstream &replayFile) { - int count = 0; - char tmpString[256]; + std::string line; + std::istringstream inStream; + std::string tmpString; KBlocksReplayData tmpData; mReplayList.clear(); - while (1) { - count = fscanf(pFile, "%d %s %d %d", &(tmpData.time), tmpString, &(tmpData.index), &(tmpData.value)); - tmpData.type = mRTMap[string(tmpString)]; - if ((tmpData.type == -1) || (count != 4)) { + do { + std::getline(replayFile, line); + inStream.str(line); + inStream >> tmpData.time >> tmpString >> tmpData.index >> tmpData.value; + tmpData.type = mRTMap[tmpString]; + if ((tmpData.type == -1) || inStream.fail()) { break; } mReplayList.push_back(tmpData); - } + inStream.clear(); + } while (!replayFile.eof()); } -void KBlocksGameReplayer::loadBinary(FILE *pFile) +void KBlocksGameReplayer::loadBinary(std::ifstream &replayFile) { KBlocksReplayData tmpData; mReplayList.clear(); - tmpData.time = fgetc(pFile); - tmpData.type = fgetc(pFile); - tmpData.index = fgetc(pFile); - tmpData.value = fgetc(pFile); - while (tmpData.time != EOF) { + + tmpData.time = replayFile.get(); + tmpData.type = replayFile.get(); + tmpData.index = replayFile.get(); + tmpData.value = replayFile.get(); + + do { if (tmpData.type == RecordDataType_Skipped) { int tmpTime = tmpData.time; while (tmpData.type == RecordDataType_Skipped) { - tmpData.time = fgetc(pFile); - tmpData.type = fgetc(pFile); - tmpData.index = fgetc(pFile); - tmpData.value = fgetc(pFile); + tmpData.time = replayFile.get(); + tmpData.type = replayFile.get(); + tmpData.index = replayFile.get(); + tmpData.value = replayFile.get(); tmpTime += tmpData.time; } tmpData.time = tmpTime; } mReplayList.push_back(tmpData); - tmpData.time = fgetc(pFile); - tmpData.type = fgetc(pFile); - tmpData.index = fgetc(pFile); - tmpData.value = fgetc(pFile); - } + tmpData.time = replayFile.get(); + tmpData.type = replayFile.get(); + tmpData.index = replayFile.get(); + tmpData.value = replayFile.get(); + } while (!replayFile.eof()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksGameReplayer.h new/kblocks-16.08.0/KBlocksGameReplayer.h --- old/kblocks-16.04.3/KBlocksGameReplayer.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksGameReplayer.h 2016-06-12 09:35:45.000000000 +0200 @@ -12,7 +12,7 @@ #include "KBlocksDefine.h" -#include <stdio.h> +#include <fstream> #include <string> #include <vector> #include <list> @@ -46,8 +46,8 @@ bool getNextRecords(vector<KBlocksReplayData> *data); private: - void loadText(FILE *pFile); - void loadBinary(FILE *pFile); + void loadText(std::ifstream &pFile); + void loadBinary(std::ifstream &pFile); private: int mGameCount; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksGraphics.cpp new/kblocks-16.08.0/KBlocksGraphics.cpp --- old/kblocks-16.04.3/KBlocksGraphics.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksGraphics.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -9,7 +9,7 @@ * (at your option) any later version. * ***************************************************************************/ #include "KBlocksGraphics.h" -#include <QDebug> +#include "KBlocks_debug.h" #include <QPixmapCache> #include <QPainter> @@ -18,7 +18,8 @@ { m_theme = new KGameTheme(); if (!m_theme->load(themeFile)) { - qWarning() << "Error loading KBlocks .desktop theme" << themeFile << endl; + qCWarning(KBGraphics) << "Error loading KBlocks .desktop theme" + << themeFile << endl; m_theme->loadDefault(); } m_renderer = new QSvgRenderer(m_theme->graphics()); @@ -34,11 +35,13 @@ bool KBlocksGraphics::loadTheme(const QString &themeFile) { if (!m_theme->load(themeFile)) { - qWarning() << "Error loading KBlocks .desktop theme" << themeFile << endl; + qCWarning(KBGraphics) << "Error loading KBlocks .desktop theme" + << themeFile << endl; return false; } if (!m_renderer->load(m_theme->graphics())) { - qWarning() << "Error loading SVG theme" << m_theme->graphics() << endl; + qCWarning(KBGraphics) << "Error loading SVG theme" + << m_theme->graphics() << endl; return false; } //clear the cache or pixmaps from the old theme will be returned @@ -69,7 +72,7 @@ } else { aspectratio = nh/origh; } - //qWarning() << aspectratio; + //qCDebug(KBGraphics) << aspectratio; m_Block_Size = (int) (aspectratio*(qreal)m_Block_Size); m_View_Size_Width = (int) (aspectratio*(double)m_View_Size_Width); m_View_Size_Height = (int) (aspectratio*(double)m_View_Size_Height); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksNetPlayer.cpp new/kblocks-16.08.0/KBlocksNetPlayer.cpp --- old/kblocks-16.04.3/KBlocksNetPlayer.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksNetPlayer.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -16,7 +16,9 @@ mpNetClient = new KBlocksNetClient(serverIP.c_str(), localPort); mpPlayer = player; + mpGame = nullptr; + mSendLength = 0; mActionList.clear(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksNetServer.cpp new/kblocks-16.08.0/KBlocksNetServer.cpp --- old/kblocks-16.04.3/KBlocksNetServer.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksNetServer.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -20,14 +20,19 @@ KBlocksNetServer::KBlocksNetServer(KBlocksGameLogic *p, const QString &localIP) { mpGameLogic = p; + maGameScoreList = nullptr; mGameCount = 0; mGameStarted = false; mWaitForAll = false; + mTopGameLevel = -1; mInitSendLength = 0; mLvUpSendLength = 0; parseIPString(localIP, &mLocalAddress, &mLocalPort); + // mRemoteAddress and mRemotePort are only used in recvRemoteData + // and will be set there. + mRemotePort = 0; mpServerSocket = new QUdpSocket(this); mpServerSocket->bind(mLocalAddress, mLocalPort); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksNetServer.h new/kblocks-16.08.0/KBlocksNetServer.h --- old/kblocks-16.04.3/KBlocksNetServer.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksNetServer.h 2016-06-12 09:35:45.000000000 +0200 @@ -62,8 +62,8 @@ KBlocksScore **maGameScoreList; bool mWaitForAll; - bool mSpeedMode; - int mTimeOut; + //bool mSpeedMode; + //int mTimeOut; int mTopGameLevel; int mInitSendLength; int mLvUpSendLength; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksPiece.cpp new/kblocks-16.08.0/KBlocksPiece.cpp --- old/kblocks-16.04.3/KBlocksPiece.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksPiece.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -127,10 +127,6 @@ KBlocksPiece::KBlocksPiece() { - mType = 0; - mPosX = 0; - mPosY = 0; - mRotation = 0; } KBlocksPiece::KBlocksPiece(PieceInterface *p) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksPiece.h new/kblocks-16.08.0/KBlocksPiece.h --- old/kblocks-16.04.3/KBlocksPiece.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksPiece.h 2016-06-12 09:35:45.000000000 +0200 @@ -84,7 +84,7 @@ { public: KBlocksPiece(); - KBlocksPiece(PieceInterface *p); + explicit KBlocksPiece(PieceInterface *p); ~KBlocksPiece(); public: @@ -117,12 +117,6 @@ void encodeData(unsigned char *data); void decodeData(unsigned char *data); - -protected: - int mType; - int mPosX; - int mPosY; - int mRotation; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksPieceGenerator.cpp new/kblocks-16.08.0/KBlocksPieceGenerator.cpp --- old/kblocks-16.04.3/KBlocksPieceGenerator.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksPieceGenerator.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -9,7 +9,7 @@ ***************************************************************************/ #include "KBlocksPieceGenerator.h" -#include <stdlib.h> +#include <QtGlobal> #include <stdio.h> #include "KBlocksPiece.h" @@ -28,10 +28,10 @@ void KBlocksPieceGenerator::genList(int seed) { - srand(seed); + qsrand(seed); for (int i = 0; i < maxCapacity; i++) { - maPieceList[i] = rand() % PieceType_Detail_Max_Count; + maPieceList[i] = qrand() % PieceType_Detail_Max_Count; } pieceIndex = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksPlayNetwork.cpp new/kblocks-16.08.0/KBlocksPlayNetwork.cpp --- old/kblocks-16.04.3/KBlocksPlayNetwork.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksPlayNetwork.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -20,6 +20,8 @@ mServerIP = serverIP; mLocalPort = localPort; + mRunning = false; + mPlayerCount = 0; mMaxCapacity = capacity; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksRepWin.cpp new/kblocks-16.08.0/KBlocksRepWin.cpp --- old/kblocks-16.04.3/KBlocksRepWin.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksRepWin.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -15,15 +15,22 @@ #include <qdatetime.h> +#include "KBlocks_debug.h" + KBlocksRepWin::KBlocksRepWin(const char *replayFile, bool binaryMode) : KMainWindow() { //Use up to 3MB for global application pixmap cache QPixmapCache::setCacheLimit(3 * 1024); + mUpdateInterval = 1000; + mpGameReplayer = new KBlocksGameReplayer(replayFile, binaryMode); mGameCount = mpGameReplayer->getGameCount(); if (mGameCount == 0) { + mpGameScene = nullptr; + mpGameView = nullptr; + mpGameLogic = nullptr; return; } @@ -44,7 +51,6 @@ mpGameView->show(); setCentralWidget(mpGameView); - mUpdateInterval = 1000; mUpdateTimer.setInterval(mUpdateInterval); connect(&mUpdateTimer, &QTimer::timeout, this, &KBlocksRepWin::replayOneStep); mUpdateTimer.stop(); @@ -63,14 +69,18 @@ void KBlocksRepWin::setGamesPerLine(int count) { - mpGameScene->setGamesPerLine(count); + if (mpGameScene) { + mpGameScene->setGamesPerLine(count); + } } void KBlocksRepWin::setUpdateInterval(int interval) { - mUpdateInterval = interval; - mUpdateTimer.setInterval(mUpdateInterval); - mpGameScene->setUpdateInterval(interval); + if (mpGameScene) { + mUpdateInterval = interval; + mUpdateTimer.setInterval(mUpdateInterval); + mpGameScene->setUpdateInterval(interval); + } } void KBlocksRepWin::setReplayStepLength(int stepLen) @@ -95,10 +105,14 @@ void KBlocksRepWin::startReplay() { - mpGameLogic->startGame(mGameCount); + if (mpGameLogic) { + mpGameLogic->startGame(mGameCount); + } - mpGameScene->createGameItemGroups(mGameCount); - mpGameScene->startGame(); + if (mpGameScene) { + mpGameScene->createGameItemGroups(mGameCount); + mpGameScene->startGame(); + } mUpdateTimer.start(); } @@ -107,10 +121,14 @@ { mUpdateTimer.stop(); - mpGameScene->stopGame(); - mpGameScene->deleteGameItemGroups(); + if (mpGameScene) { + mpGameScene->stopGame(); + mpGameScene->deleteGameItemGroups(); + } - mpGameLogic->stopGame(); + if (mpGameLogic) { + mpGameLogic->stopGame(); + } } QString KBlocksRepWin::getTimeString() @@ -144,7 +162,7 @@ { int tmpPieceChanged = 0; if (!mpGameLogic->playRecordOneStep(&tmpPieceChanged)) { - printf("Finished Replay!\n"); + qCDebug(KBReplay) << "Finished Replay!"; mUpdateTimer.stop(); } if (tmpPieceChanged != 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksRepWin.h new/kblocks-16.08.0/KBlocksRepWin.h --- old/kblocks-16.04.3/KBlocksRepWin.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksRepWin.h 2016-06-12 09:35:45.000000000 +0200 @@ -54,7 +54,7 @@ private: int mGameCount; - int mGamesPerWidth; + //int mGamesPerWidth; int mUpdateInterval; QTimer mUpdateTimer; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksScene.cpp new/kblocks-16.08.0/KBlocksScene.cpp --- old/kblocks-16.04.3/KBlocksScene.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksScene.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -47,6 +47,8 @@ mUpdateTimer.setInterval(mUpdateInterval); connect(&mUpdateTimer, &QTimer::timeout, this, &KBlocksScene::updateGame); mUpdateTimer.stop(); + + mMessageBox = nullptr; } KBlocksScene::~KBlocksScene() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksSingleGame.cpp new/kblocks-16.08.0/KBlocksSingleGame.cpp --- old/kblocks-16.04.3/KBlocksSingleGame.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksSingleGame.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -11,7 +11,7 @@ #include "KBlocksField.h" #include "KBlocksPiece.h" -#include <stdlib.h> +#include <QtGlobal> KBlocksSingleGame::KBlocksSingleGame(int gameIndex, int fieldWidth, int fieldHeight, int showPieceCount, int messagePoolSize) { @@ -125,11 +125,11 @@ mpGameRecorder->append(mGameIndex, RecordDataType_PunishLineSeed, punishSeed); } - srand(punishSeed); + qsrand(punishSeed); int punishIndex = 0; for (int i = 0; i < lineCount; i++) { setCurrentPiece(0, -1, 0); - punishIndex = rand() % width; + punishIndex = qrand() % width; mpField->addPunishLine(lineCount, punishIndex); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksSound.cpp new/kblocks-16.08.0/KBlocksSound.cpp --- old/kblocks-16.04.3/KBlocksSound.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksSound.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -11,21 +11,22 @@ //Uses routines from Kapman sound manager (game.cpp) #include "KBlocksSound.h" -#include "settings.h" #include <kgsound.h> -#include <QDebug> #include <QStandardPaths> +#include "KBlocks_debug.h" +#include "settings.h" + KBlocksSound::KBlocksSound() { m_blockFallSound = new KgSound(QStandardPaths::locate( - QStandardPaths::DataLocation, "sounds/block-fall.ogg")); + QStandardPaths::AppDataLocation, "sounds/block-fall.ogg")); m_blockMoveSound = new KgSound(QStandardPaths::locate( - QStandardPaths::DataLocation, "sounds/block-move.ogg")); + QStandardPaths::AppDataLocation, "sounds/block-move.ogg")); m_blockRemoveSound = new KgSound(QStandardPaths::locate( - QStandardPaths::DataLocation, "sounds/block-remove.ogg")); + QStandardPaths::AppDataLocation, "sounds/block-remove.ogg")); setSoundsEnabled(Settings::sounds()); } @@ -55,7 +56,7 @@ m_blockRemoveSound->start(); break; default: - qDebug() << "Unknown Sound requested for playback."; + qCWarning(KBSound) << "Unknown Sound requested for playback."; break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocksWin.cpp new/kblocks-16.08.0/KBlocksWin.cpp --- old/kblocks-16.04.3/KBlocksWin.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/KBlocksWin.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -11,7 +11,6 @@ #include "KBlocksWin.h" #include <limits.h> -#include <stdlib.h> #include <KConfigDialog> #include <kstandardgameaction.h> @@ -24,6 +23,7 @@ #include <QStatusBar> #include <KgDifficulty> +#include <QtGlobal> #include <QPixmapCache> #include <QPointer> #include <QLabel> @@ -103,8 +103,8 @@ void KBlocksWin::startGame() { - srand(time(0)); - mpGameLogic->setGameSeed(rand()); + qsrand(time(0)); + mpGameLogic->setGameSeed(qrand()); if (mpGameLogic->startGame(mGameCount)) { mpPlayManager->startGame(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocks_debug.cpp new/kblocks-16.08.0/KBlocks_debug.cpp --- old/kblocks-16.04.3/KBlocks_debug.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kblocks-16.08.0/KBlocks_debug.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -0,0 +1,16 @@ +/*************************************************************************** +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2016 Julian Helfferich <julian.helfferich(a)gmail.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 of the License, or * +* (at your option) any later version. * +***************************************************************************/ +#include "KBlocks_debug.h" + +Q_LOGGING_CATEGORY(KBlocksAI,"KBlocks.AI") +Q_LOGGING_CATEGORY(KBGeneral, "KBlocks.General") +Q_LOGGING_CATEGORY(KBGraphics, "KBlocks.Graphics") +Q_LOGGING_CATEGORY(KBReplay, "KBlocks.Replay") +Q_LOGGING_CATEGORY(KBSound, "KBlocks.Sound") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/KBlocks_debug.h new/kblocks-16.08.0/KBlocks_debug.h --- old/kblocks-16.04.3/KBlocks_debug.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kblocks-16.08.0/KBlocks_debug.h 2016-06-12 09:35:45.000000000 +0200 @@ -0,0 +1,21 @@ +/*************************************************************************** +* KBlocks, a falling blocks game for KDE * +* Copyright (C) 2016 Julian Helfferich <julian.helfferich(a)gmail.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 of the License, or * +* (at your option) any later version. * +***************************************************************************/ + +#ifndef KBLOCKS_DEBUG_H +#define KBLOCKS_DEBUG_H + +#include <QLoggingCategory> +Q_DECLARE_LOGGING_CATEGORY(KBlocksAI) +Q_DECLARE_LOGGING_CATEGORY(KBGeneral) +Q_DECLARE_LOGGING_CATEGORY(KBGraphics) +Q_DECLARE_LOGGING_CATEGORY(KBReplay) +Q_DECLARE_LOGGING_CATEGORY(KBSound) + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/PieceInterface.h new/kblocks-16.08.0/PieceInterface.h --- old/kblocks-16.04.3/PieceInterface.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/PieceInterface.h 2016-06-12 09:35:45.000000000 +0200 @@ -13,7 +13,7 @@ class PieceInterface { public: - PieceInterface() {}; + PieceInterface() : mType(0), mPosX(0), mPosY(0), mRotation(0) {}; virtual ~PieceInterface() {}; public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/SingleGameInterface.h new/kblocks-16.08.0/SingleGameInterface.h --- old/kblocks-16.04.3/SingleGameInterface.h 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/SingleGameInterface.h 2016-06-12 09:35:45.000000000 +0200 @@ -18,7 +18,8 @@ class SingleGameInterface { public: - SingleGameInterface() {}; + SingleGameInterface() + : mpField(nullptr), mPieceCount(0), mpPieceList(nullptr) {}; virtual ~SingleGameInterface() {}; public: Files old/kblocks-16.04.3/doc/gameboard.png and new/kblocks-16.08.0/doc/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/doc/index.docbook new/kblocks-16.08.0/doc/index.docbook --- old/kblocks-16.04.3/doc/index.docbook 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/doc/index.docbook 2016-06-12 09:35:45.000000000 +0200 @@ -1,7 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&kblocks;"> - <!ENTITY package "kdegames"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE" >  ]> @@ -29,8 +27,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-05</date> -<releaseinfo>0.3 (&kde; 4.11)</releaseinfo> +<date>2016-05-09</date> +<releaseinfo>0.4 (Applications 16.04)</releaseinfo> <abstract><para>&kblocks; is the &kde; version of the classic falling blocks game.</para></abstract> @@ -55,6 +53,18 @@ <chapter id="how-to-play"> <title>How to Play</title> + +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="gameboard.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&kblocks; gameboard</phrase> +</textobject> +</mediaobject> +</screenshot> + <note><title>Objective:</title><para>Rotate the falling blocks, and fit them together to complete lines and clear the playfield.</para></note> <para> @@ -141,17 +151,7 @@ <guimenuitem>Quit</guimenuitem> </menuchoice></term> <listitem><para><action>Quits</action> &kblocks;</para></listitem> </varlistentry> - + <varlistentry> <term><menuchoice> <guimenu>Settings</guimenu> @@ -196,6 +196,7 @@ <row><entry><keycap>Down arrow</keycap></entry><entry>Move the block down</entry></row> <row><entry><keycap>Z</keycap></entry><entry>Rotate the block clockwise</entry></row> <row><entry><keycap>Up arrow</keycap></entry><entry>Rotate the block counter clockwise</entry></row> +<row><entry><keysym>Space</keysym></entry><entry>Drop the block</entry></row> </tbody> </tgroup> @@ -271,24 +272,6 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-kblocks"> -<title>How to obtain &kblocks;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - </book> <!-- Local Variables: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/main.cpp new/kblocks-16.08.0/main.cpp --- old/kblocks-16.04.3/main.cpp 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/main.cpp 2016-06-12 09:35:45.000000000 +0200 @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ -#include <time.h> +#include <ctime> #include <string> #include <vector> @@ -66,7 +66,7 @@ { // Desktop User Mode mpKBlocksGameLogic = new KBlocksGameLogic(2); - mpKBlocksGameLogic->setGameSeed(time(0)); + mpKBlocksGameLogic->setGameSeed(std::time(nullptr)); mpKBlocksGameLogic->setGamePunish(true); mpKBlocksGameLogic->setGameStandbyMode(true); mpKBlocksGameLogic->setInitInterval(500); @@ -118,7 +118,7 @@ printf("\tHas Human = %s\n", hasHuman ? "true" : "false"); printf("\tSpeed Limit = %s\n", sendLimit ? "true" : "false"); mpKBlocksGameLogic = new KBlocksGameLogic(gameCount, true); - mpKBlocksGameLogic->setGameSeed(sameSeq ? time(0) : -time(0)); + mpKBlocksGameLogic->setGameSeed(sameSeq ? std::time(nullptr) : -std::time(nullptr)); mpKBlocksGameLogic->setGamePunish(hasAttack); mpKBlocksGameLogic->setGameStandbyMode(standbyMode); mpKBlocksGameLogic->setInitInterval(hasHuman ? 500 : 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblocks-16.04.3/org.kde.kblocks.appdata.xml new/kblocks-16.08.0/org.kde.kblocks.appdata.xml --- old/kblocks-16.04.3/org.kde.kblocks.appdata.xml 2016-03-28 14:16:41.000000000 +0200 +++ new/kblocks-16.08.0/org.kde.kblocks.appdata.xml 2016-06-12 09:35:45.000000000 +0200 @@ -11,6 +11,7 @@ <name xml:lang="cs">KBlocks</name> <name xml:lang="da">KBlocks</name> <name xml:lang="de">KBlocks</name> + <name xml:lang="el">KBlocks</name> <name xml:lang="en-GB">KBlocks</name> <name xml:lang="es">KBlock</name> <name xml:lang="fi">KBlocks</name> @@ -43,6 +44,7 @@ <summary xml:lang="ca-valencia">Joc de blocs que cauen</summary> <summary xml:lang="cs">Hra s padajícími bloky</summary> <summary xml:lang="de">„Tetris“-Spiel</summary> + <summary xml:lang="el">Παιχνίδι πτώσης τούβλων</summary> <summary xml:lang="en-GB">Falling Blocks Game</summary> <summary xml:lang="es">Juego de caída de bloques</summary> <summary xml:lang="fi">Putoavien kappaleiden peli</summary> @@ -78,6 +80,7 @@ El KBlocks és el joc clàssic de blocs que cauen. La idea és apilar els blocs que cauen per crear línies horitzontals sense cap forat. Quan s'ha completat una línia, aquesta s'elimina i queda més espai disponible a l'àrea de joc. Quan no hi ha espai suficient per als blocs que cauen el joc finalitza. El KBlocks és el joc clàssic de blocs que cauen. La idea és apilar els blocs que cauen per crear línies horitzontals sense cap forat. Quan s'ha completat una línia, esta s'elimina i queda més espai disponible a l'àrea de joc. Quan no hi ha espai suficient per als blocs que cauen el joc finalitza. KBlocks ist ein klassisches Tetris-Spiel. Die herunterfallenden Blöcke müssen so gestapelt werden, dass sie waagerechte Zeilen ohne Lücken bilden. Eine solche Zeile verschwindet dann, und im Spielfeld ist wieder mehr Platz. Wenn es keinen Platz mehr für herunterfallende Blöcke gibt, ist das Spiel zu Ende. + Το KBlocks είναι το κλασικό παιχνίδι πτώσης τούβλων. Η ιδέα είναι να δημιουργηθούν με τα τούβλα οριζόντιες γραμμές χωρίς κενά. Όταν μια γραμμή συμπληρωθεί, αφαιρείται και περισσότερος χώρος γίνεται διαθέσιμος στην περιοχή του παιχνιδιού. Όταν δεν υπάρχει αρκετός χώρος για να πέσουν τα τούβλα, το ταιχνίδι τελειώνει.να δημιουργήσουν KBlocks is the classic falling blocks game. The idea is to stack the falling blocks to create horizontal lines without any gaps. When a line is completed it is removed, and more space is available in the play area. When there is not enough space for blocks to fall, the game is over. KBlocks es un juego clásico de caída de bloques. La idea es apilar los bloques que van cayendo para crear líneas horizontaes sin huecos. Cuando se completa una línea se elimina, y hay más espacio disponible en la zona de juego. Cuando no queda más sitio para que los bloques caigan, se termina el juego. KBlock on perinteinen putoavien kappaleiden peli. Tavoitteena on kasata putoavat kappaleet aukottomiksi vaakariveiksi. Kun rivi on valmis, se poistetaan ja pelialue kasvaa. Kun kappaleilla ei ole enää tilaa pudota, peli on lopussa. @@ -110,4 +113,7 @@ </screenshot> </screenshots> <project_group>KDE</project_group> + <provides> + <binary>kblocks</binary> + </provides> </component>

1 0

commit kblackbox for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kblackbox for openSUSE:Factory checked in at 2016-08-31 00:06:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kblackbox (Old) and /work/SRC/openSUSE:Factory/.kblackbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kblackbox" Changes: -------- --- /work/SRC/openSUSE:Factory/kblackbox/kblackbox.changes 2016-07-24 19:45:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kblackbox.new/kblackbox.changes 2016-08-31 00:06:52.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:10:25 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:47:53 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kblackbox-16.04.3.tar.xz New: ---- kblackbox-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kblackbox.spec ++++++ --- /var/tmp/diff_new_pack.ShpfRE/_old 2016-08-31 00:06:53.000000000 +0200 +++ /var/tmp/diff_new_pack.ShpfRE/_new 2016-08-31 00:06:53.000000000 +0200 @@ -39,7 +39,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kblackbox-%{version}.tar.xz Obsoletes: %{name}5 < %{version} @@ -73,8 +73,8 @@ %{_kf5_htmldir}/en/kblackbox/ %{_kf5_iconsdir}/hicolor/*/apps/kblackbox.* %{_kf5_appsdir}/kblackbox/ -%dir %_datadir/appdata -%_datadir/appdata/org.kde.kblackbox.appdata.xml -%_datadir/kxmlgui5/kblackbox/ +%dir %{_kf5_appstreamdir} +%{_kf5_appstreamdir}/org.kde.kblackbox.appdata.xml +%{_kf5_kxmlguidir}/kblackbox/ %changelog ++++++ kblackbox-16.04.3.tar.xz -> kblackbox-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblackbox-16.04.3/.gitignore new/kblackbox-16.08.0/.gitignore --- old/kblackbox-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kblackbox-16.08.0/.gitignore 2016-06-12 09:35:28.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblackbox-16.04.3/CMakeLists.txt new/kblackbox-16.08.0/CMakeLists.txt --- old/kblackbox-16.04.3/CMakeLists.txt 2016-01-29 14:29:36.000000000 +0100 +++ new/kblackbox-16.08.0/CMakeLists.txt 2016-06-12 09:35:28.000000000 +0200 @@ -25,7 +25,7 @@ include(FeatureSummary) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMAddAppIcon) Files old/kblackbox-16.04.3/doc/gameboard.png and new/kblackbox-16.08.0/doc/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblackbox-16.04.3/doc/index.docbook new/kblackbox-16.08.0/doc/index.docbook --- old/kblackbox-16.04.3/doc/index.docbook 2016-01-29 14:29:36.000000000 +0100 +++ new/kblackbox-16.08.0/doc/index.docbook 2016-06-12 09:35:28.000000000 +0200 @@ -1,9 +1,5 @@ <?xml version="1.0" ?> - <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&kblackbox;"> - <!ENTITY kappversion "0.4.0"> - <!ENTITY package "kdegames">  <!ENTITY % English "INCLUDE" >  <!ENTITY % addindex "IGNORE">  ]> @@ -39,12 +35,12 @@ <holder>&Nicolas.Roffet;</holder> </copyright> <legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-05</date> -<releaseinfo>&kappversion; (&kde; 4.11)</releaseinfo> +<date>2016-05-09</date> +<releaseinfo>0.5.0 (Applications 16.04)</releaseinfo>  <abstract> - <para>This documentation describes the game of &kblackbox; version &kappversion;</para> + <para>This documentation describes the game of &kblackbox; version 0.5.0</para> </abstract>  @@ -301,30 +297,26 @@ </varlistentry> <varlistentry> - <term> - <menuchoice> - <shortcut> - <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> - </shortcut> - <guimenu>Game</guimenu> - <guimenuitem>Quit</guimenuitem> - </menuchoice> - </term> - <listitem> - <para>This closes the window and quits &kblackbox;.</para> - </listitem> +<term><menuchoice> +<shortcut> +<keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> +</shortcut> +<guimenu>Game</guimenu> +<guimenuitem>Quit</guimenuitem> +</menuchoice></term> +<listitem> +<para>This closes the window and quits &kblackbox;.</para> +</listitem> </varlistentry> <varlistentry> - <term> - <menuchoice> - <guimenu>Move</guimenu> - <guimenuitem>Solve</guimenuitem> - </menuchoice> - </term> - <listitem> - <para>Use it to give up a game. It shows you the solution: the right positions of the balls.</para> - </listitem> +<term><menuchoice> +<guimenu>Move</guimenu> +<guimenuitem>Solve</guimenuitem> +</menuchoice></term> +<listitem> +<para>Use it to give up a game. It shows you the solution: the right positions of the balls.</para> +</listitem> </varlistentry> <varlistentry> @@ -394,20 +386,6 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -&install.intro.documentation; - - -<sect1 id="Compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - &documentation.index; </book> <!-- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblackbox-16.04.3/kbbmainwindow.cpp new/kblackbox-16.08.0/kbbmainwindow.cpp --- old/kblackbox-16.04.3/kbbmainwindow.cpp 2016-01-29 14:29:36.000000000 +0100 +++ new/kblackbox-16.08.0/kbbmainwindow.cpp 2016-06-12 09:35:28.000000000 +0200 @@ -129,10 +129,10 @@ // Theme manager QString svgzFile = KBBPrefs::theme(); if (!QFile(svgzFile).exists()) - svgzFile = QStandardPaths::locate(QStandardPaths::DataLocation, QLatin1Literal("pics/kblackbox.svgz")); + svgzFile = QStandardPaths::locate(QStandardPaths::AppDataLocation, QLatin1Literal("pics/kblackbox.svgz")); m_themeManager = new KBBThemeManager(svgzFile); - - + + // Tutorial widget m_tutorial = new KBBTutorial(this); @@ -164,31 +164,31 @@ connect(action, &QAction::triggered, m_gameWidget, &KBBScalableGraphicWidget::keyboardMoveDown); actionCollection()->setDefaultShortcut(action, Qt::Key_Down); addAction(action); - + action = actionCollection()->addAction( QLatin1String( "move_up" ) ); action->setText( i18n("Move Up") ); connect(action, &QAction::triggered, m_gameWidget, &KBBScalableGraphicWidget::keyboardMoveUp); actionCollection()->setDefaultShortcut(action,Qt::Key_Up); addAction(action); - + action = actionCollection()->addAction( QLatin1String( "move_left" ) ); action->setText( i18n("Move Left") ); connect(action, &QAction::triggered, m_gameWidget, &KBBScalableGraphicWidget::keyboardMoveLeft); actionCollection()->setDefaultShortcut(action, Qt::Key_Left); addAction(action); - + action = actionCollection()->addAction( QLatin1String( "move_right" ) ); action->setText( i18n("Move Right") ); connect(action, &QAction::triggered, m_gameWidget, &KBBScalableGraphicWidget::keyboardMoveRight); actionCollection()->setDefaultShortcut(action, Qt::Key_Right); addAction(action); - + action = actionCollection()->addAction( QLatin1String( "switch_ball" )); action->setText(i18n("Switch Ball or Shoot Laser")); connect(action, &QAction::triggered, m_gameWidget, &KBBScalableGraphicWidget::keyboardEnter); actionCollection()->setDefaultShortcut(action, Qt::Key_Return); addAction(action); - + action = actionCollection()->addAction( QLatin1String( "switch_marker" )); action->setText(i18n("Switch Marker")); connect(action, &QAction::triggered, m_gameWidget, &KBBScalableGraphicWidget::keyboardSpace); @@ -319,7 +319,7 @@ //QT5 statusBar()->changeItem(i18n("No more balls to place"), SRUN); } else if (ballsLeftToPlace>0) { //QT5 statusBar()->changeItem(i18np("1 ball to place", "%1 balls to place", ballsLeftToPlace), SRUN); - } + } } else { //QT5 statusBar()->changeItem(i18n("Game over"), SRUN ); } @@ -328,8 +328,8 @@ //QT5 statusBar()->changeItem(i18n("Time: %1", m_gameClock->timeString()), STIME); //QT5 statusBar()->changeItem( i18n("Size: %1 x %2", m_gameDoc->columns(), m_gameDoc->rows()), SSIZE ); - - + + // 2. Info Widget m_gameWidget->setScore(m_gameDoc->score()); } @@ -400,7 +400,7 @@ m_customBallNumber = m_levelConfig->balls(); m_customColumns = m_levelConfig->columns(); m_customRows = m_levelConfig->rows(); - + if (m_level==KgDifficultyLevel::Custom) { bool mayRestart = true; if (m_gameDoc->gameReallyStarted()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kblackbox-16.04.3/org.kde.kblackbox.appdata.xml new/kblackbox-16.08.0/org.kde.kblackbox.appdata.xml --- old/kblackbox-16.04.3/org.kde.kblackbox.appdata.xml 2016-01-29 14:29:36.000000000 +0100 +++ new/kblackbox-16.08.0/org.kde.kblackbox.appdata.xml 2016-06-12 09:35:28.000000000 +0200 @@ -11,6 +11,7 @@ <name xml:lang="cs">KBlackBox</name> <name xml:lang="da">KBlackbox</name> <name xml:lang="de">KBlackbox</name> + <name xml:lang="el">KBlackbox</name> <name xml:lang="en-GB">KBlackbox</name> <name xml:lang="es">KBlackbox</name> <name xml:lang="fi">KBlackbox</name> @@ -43,6 +44,7 @@ <summary xml:lang="ca-valencia">Joc de lògica Blackbox</summary> <summary xml:lang="cs">Logická hra s černou skříňkou</summary> <summary xml:lang="de">„Blackbox“-Spiel</summary> + <summary xml:lang="el">Παιχνίδι λογικής Blackbox</summary> <summary xml:lang="en-GB">Blackbox Logic Game</summary> <summary xml:lang="es">Juego de lógica Blackbox</summary> <summary xml:lang="fi">Logiikkapeli</summary> @@ -77,6 +79,7 @@ El KBlackbox és un joc de fet i amagar que es juga en una graella de quadres a on l'ordinador ha amagat diverses boles. La posició de les boles amagades es pot deduir disparant feixos en el quadre. El KBlackbox és un joc de fet i amagar que es juga en una graella de quadres a on l'ordinador ha amagat diverses boles. La posició de les boles amagades es pot deduir disparant feixos en el quadre. KBlackbox ist ein Versteckspiel, das auf einem Spielfeld gespielt wird, auf dem Schachteln in Reihen und Spalten mit darin versteckten Kugeln angeordnet sind.Um die Kugeln zu entdecken, müssen Sie Laserstrahlen in die Schachteln schießen und den Verlauf der Strahlen beobachten. + Το KBlackbox είναι ένα παιχνίδι τύπου «κρυφτό» και παίζεται σε έναν κάνναβο κουτιών, όπου ο υπολογιστής έχει κρύψει πολλές σφαίρες. Η θέση των κρυμμένων σφαιρών μπορεί να εξαχθεί εκτοξεύοντας ακτίνες στο κουτί. KBlackbox is a game of hide and seek played on a grid of boxes where the computer has hidden several balls. The position of the hidden balls can be deduced by shooting beams into the box. KBlackbox es un juego de escondite consistente en una retícula de cajas en las que la máquina ha escondido varias bolas. La posición de estas bolas puede ser deducida disparando rayos a las cajas. KBlackBoxissä leikitään piilosta laatikoista koostuvasta ruudukossa, johon tietokone on piilottanut palloja. Piilopallojen sijainnin voi päätellä ampumalla laatikkoon säteitä.

1 0

commit katomic for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package katomic for openSUSE:Factory checked in at 2016-08-31 00:06:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/katomic (Old) and /work/SRC/openSUSE:Factory/.katomic.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "katomic" Changes: -------- --- /work/SRC/openSUSE:Factory/katomic/katomic.changes 2016-07-24 19:45:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.katomic.new/katomic.changes 2016-08-31 00:06:48.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:10:10 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:47:35 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- katomic-16.04.3.tar.xz New: ---- katomic-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ katomic.spec ++++++ --- /var/tmp/diff_new_pack.rtJS3H/_old 2016-08-31 00:06:49.000000000 +0200 +++ /var/tmp/diff_new_pack.rtJS3H/_new 2016-08-31 00:06:49.000000000 +0200 @@ -39,7 +39,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: katomic-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ katomic-16.04.3.tar.xz -> katomic-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-16.04.3/.gitignore new/katomic-16.08.0/.gitignore --- old/katomic-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/katomic-16.08.0/.gitignore 2016-06-12 09:35:11.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-16.04.3/CMakeLists.txt new/katomic-16.08.0/CMakeLists.txt --- old/katomic-16.04.3/CMakeLists.txt 2016-01-29 14:30:14.000000000 +0100 +++ new/katomic-16.08.0/CMakeLists.txt 2016-06-12 09:35:11.000000000 +0200 @@ -24,7 +24,7 @@ include(FeatureSummary) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMAddAppIcon) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-16.04.3/chooselevelsetdialog.cpp new/katomic-16.08.0/chooselevelsetdialog.cpp --- old/katomic-16.04.3/chooselevelsetdialog.cpp 2016-01-29 14:30:14.000000000 +0100 +++ new/katomic-16.08.0/chooselevelsetdialog.cpp 2016-06-12 09:35:11.000000000 +0200 @@ -84,7 +84,7 @@ { m_ui.m_lwLevelSets->clear(); QStringList fileList; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::DataLocation, QStringLiteral("levels"), QStandardPaths::LocateDirectory); + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::AppDataLocation, QStringLiteral("levels"), QStandardPaths::LocateDirectory); Q_FOREACH (const QString& dir, dirs) { const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.dat")); Q_FOREACH (const QString& file, fileNames) { @@ -139,7 +139,7 @@ { QListWidgetItem* item = m_ui.m_lwLevelSets->currentItem(); if (item) - { + { QString levelSetName = item->data(KAtomic::LevelSetNameRole).toString(); emit levelSetChanged(levelSetName); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-16.04.3/doc/index.docbook new/katomic-16.08.0/doc/index.docbook --- old/katomic-16.04.3/doc/index.docbook 2016-01-29 14:30:14.000000000 +0100 +++ new/katomic-16.08.0/doc/index.docbook 2016-06-12 09:35:11.000000000 +0200 @@ -1,16 +1,12 @@ <?xml version="1.0" ?> - <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&katomic;"> - <!ENTITY kappversion "3.0"> - <!ENTITY package "kdegames">  <!ENTITY % English "INCLUDE" >  <!ENTITY % addindex "IGNORE">  ]> <book id="katomic" lang="&language;">  <bookinfo> -<title>The &kappname; Handbook</title>  +<title>The &katomic; Handbook</title>    <authorgroup> @@ -30,12 +26,12 @@  </authorgroup> <legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-05</date> -<releaseinfo>&kappversion; (&kde; 4.11)</releaseinfo> +<date>2016-05-09</date> +<releaseinfo>4.0 (Applications 16.04)</releaseinfo>  <abstract> - <para>This documentation describes the game of &katomic; version &kappversion;</para> + <para>This documentation describes the game of &katomic; version 4.0</para> </abstract>  @@ -68,6 +64,16 @@ </chapter> <chapter id="howto"><title>How to Play</title>  +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="mainscreen.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&katomic; main screen</phrase> +</textobject> +</mediaobject> +</screenshot>  <note><title>Objective:</title><para>Reassemble molecules from compound atoms by sliding them around.</para></note>  @@ -385,21 +391,6 @@ </chapter> - -<appendix id="installation"> -<title>Installation</title> - -&install.intro.documentation; - - -<sect1 id="Compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - &documentation.index; </book> <!-- Files old/katomic-16.04.3/doc/mainscreen.png and new/katomic-16.08.0/doc/mainscreen.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-16.04.3/highscores.cpp new/katomic-16.08.0/highscores.cpp --- old/katomic-16.04.3/highscores.cpp 2016-01-29 14:30:14.000000000 +0100 +++ new/katomic-16.08.0/highscores.cpp 2016-06-12 09:35:11.000000000 +0200 @@ -28,7 +28,7 @@ KUser user; m_playerName = user.property(KUser::FullName).toString().isEmpty() ? user.loginName() : user.property(KUser::FullName).toString(); - m_hsFile = KSharedConfig::openConfig( QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1Char('/') + "highscores", KConfig::SimpleConfig); + m_hsFile = KSharedConfig::openConfig( QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QLatin1Char('/') + "highscores", KConfig::SimpleConfig); } bool KAtomicHighscores::addScore( int numMoves, const QString& levelSetName, int level ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-16.04.3/levelset.cpp new/katomic-16.08.0/levelset.cpp --- old/katomic-16.04.3/levelset.cpp 2016-01-29 14:30:14.000000000 +0100 +++ new/katomic-16.08.0/levelset.cpp 2016-06-12 09:35:11.000000000 +0200 @@ -100,7 +100,7 @@ bool LevelSet::load(const QString& levelSetName) { - QString file = QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("levels/%1.dat").arg(levelSetName)); + QString file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("levels/%1.dat").arg(levelSetName)); if (file.isEmpty()) { qDebug() << "level set \"" << levelSetName << "\" data file not found. Check your installation"; @@ -288,7 +288,7 @@ bool LevelSet::isDefaultLevelsAvailable() { - QString file = QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("levels/%1.dat").arg(DEFAULT_LEVELSET_NAME)); + QString file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("levels/%1.dat").arg(DEFAULT_LEVELSET_NAME)); if (file.isEmpty()) { //qDebug() << "default level set \"" << DEFAULT_LEVELSET_NAME << "\" data file not found. Check your installation"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-16.04.3/org.kde.katomic.appdata.xml new/katomic-16.08.0/org.kde.katomic.appdata.xml --- old/katomic-16.04.3/org.kde.katomic.appdata.xml 2016-01-29 14:30:14.000000000 +0100 +++ new/katomic-16.08.0/org.kde.katomic.appdata.xml 2016-06-12 09:35:11.000000000 +0200 @@ -10,6 +10,7 @@ <name xml:lang="cs">KAtomic</name> <name xml:lang="da">KAtomic</name> <name xml:lang="de">KAtomic</name> + <name xml:lang="el">KAtomic</name> <name xml:lang="en-GB">KAtomic</name> <name xml:lang="es">KAtomic</name> <name xml:lang="fi">KAtomic</name> @@ -39,6 +40,7 @@ <summary xml:lang="ca-valencia">Joc de lògica similar al Sokoban</summary> <summary xml:lang="cs">Logická hra jako Sokoban</summary> <summary xml:lang="de">„Sokoban“-Spiel</summary> + <summary xml:lang="el">Παιχνίδι λογικής όπως το Sokoban</summary> <summary xml:lang="en-GB">Sokoban-like Logic Game</summary> <summary xml:lang="es">Juego de lógica parecido al Sokoban</summary> <summary xml:lang="fi">Sokoban-tyylinen logiikkapeli</summary> @@ -71,6 +73,7 @@ El KAtomic és un joc educatiu divertit construït al voltant de la geometria molecular. Fa servir aparences bidimensionals simplificades d'elements químics diferents. El KAtomic és un joc educatiu divertit construït al voltant de la geometria molecular. Fa servir aparences bidimensionals simplificades d'elements químics diferents. KAtomic ist sowohl ein unterhaltsames als auch lehrreiches Spiel über molekulare Strukturen. Es verwendet eine vereinfachte zweidimensionale Ansicht der zum Molekül gehörenden Elemente. + Το KAtomic είναι ένα ευχάριστο εκπαιδευτικό παιχνίδι με βάση τη μοριακή γεωμετρία. Χρησιμοποιεί απλουστευτικές δισδιάστατες όψεις διαφόρων χημικών στοιχείων. KAtomic is a fun educational game built around molecular geometry. It employs simplistic two-dimensional looks at different chemical elements. KAtomic es un divertido juego educativo basado en la geometría molecular. Emplea vistas bidimensionales simplificadas de diferentes elementos químicos. KAtomic on hauska ja opettavainen peli, joka perustuu molekyylien avaruusrakenteeseen. Se näyttää kemiallisia aineita kaksiulotteisesti ja pelkistetysti. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-16.04.3/playfield.cpp new/katomic-16.08.0/playfield.cpp --- old/katomic-16.04.3/playfield.cpp 2016-01-29 14:30:14.000000000 +0100 +++ new/katomic-16.08.0/playfield.cpp 2016-06-12 09:35:11.000000000 +0200 @@ -45,7 +45,7 @@ { Theme() : KgTheme("pics/default_theme.desktop") { - setGraphicsPath(QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("pics/default_theme.svgz"))); + setGraphicsPath(QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("pics/default_theme.svgz"))); } };

1 0

commit kapptemplate for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kapptemplate for openSUSE:Factory checked in at 2016-08-31 00:06:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kapptemplate (Old) and /work/SRC/openSUSE:Factory/.kapptemplate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kapptemplate" Changes: -------- --- /work/SRC/openSUSE:Factory/kapptemplate/kapptemplate.changes 2016-07-24 19:45:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kapptemplate.new/kapptemplate.changes 2016-08-31 00:06:47.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:09:46 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:46:55 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kapptemplate-16.04.3.tar.xz New: ---- kapptemplate-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kapptemplate.spec ++++++ --- /var/tmp/diff_new_pack.i6T2qw/_old 2016-08-31 00:06:48.000000000 +0200 +++ /var/tmp/diff_new_pack.i6T2qw/_new 2016-08-31 00:06:48.000000000 +0200 @@ -33,7 +33,7 @@ License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/IDE Url: http://www.kde.org/ -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{name}-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ kapptemplate-16.04.3.tar.xz -> kapptemplate-16.08.0.tar.xz ++++++ ++++ 1846 lines of diff (skipped)

1 0

commit kapman for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kapman for openSUSE:Factory checked in at 2016-08-31 00:06:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kapman (Old) and /work/SRC/openSUSE:Factory/.kapman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kapman" Changes: -------- --- /work/SRC/openSUSE:Factory/kapman/kapman.changes 2016-07-24 19:45:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kapman.new/kapman.changes 2016-08-31 00:06:44.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:09:31 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:46:33 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kapman-16.04.3.tar.xz New: ---- kapman-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kapman.spec ++++++ --- /var/tmp/diff_new_pack.PJr4hH/_old 2016-08-31 00:06:45.000000000 +0200 +++ /var/tmp/diff_new_pack.PJr4hH/_new 2016-08-31 00:06:45.000000000 +0200 @@ -42,7 +42,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kapman-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ kapman-16.04.3.tar.xz -> kapman-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapman-16.04.3/.gitignore new/kapman-16.08.0/.gitignore --- old/kapman-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kapman-16.08.0/.gitignore 2016-06-12 09:34:55.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapman-16.04.3/CMakeLists.txt new/kapman-16.08.0/CMakeLists.txt --- old/kapman-16.04.3/CMakeLists.txt 2016-03-08 18:43:14.000000000 +0100 +++ new/kapman-16.08.0/CMakeLists.txt 2016-06-12 09:34:55.000000000 +0200 @@ -25,7 +25,7 @@ include(FeatureSummary) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMAddAppIcon) Files old/kapman-16.04.3/doc/config.png and new/kapman-16.08.0/doc/config.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapman-16.04.3/doc/index.docbook new/kapman-16.08.0/doc/index.docbook --- old/kapman-16.04.3/doc/index.docbook 2016-03-08 18:43:14.000000000 +0100 +++ new/kapman-16.08.0/doc/index.docbook 2016-06-12 09:34:55.000000000 +0200 @@ -1,7 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&kapman;"> - <!ENTITY package "kdegames"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> ]> @@ -27,8 +25,8 @@ </copyright> <legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-05</date> -<releaseinfo>1.0.1 (&kde; 4.11)</releaseinfo> +<date>2016-05-09</date> +<releaseinfo>1.1.0 (Applications 16.04)</releaseinfo> <abstract> <para>&kapman; is a clone of the well known game <application>Pac-Man</application>.</para> @@ -307,19 +305,6 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -&install.intro.documentation; - -<sect1 id="Compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - &documentation.index; </book> Files old/kapman-16.04.3/doc/kapman.png and new/kapman-16.08.0/doc/kapman.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapman-16.04.3/game.cpp new/kapman-16.08.0/game.cpp --- old/kapman-16.04.3/game.cpp 2016-03-08 18:43:14.000000000 +0100 +++ new/kapman-16.08.0/game.cpp 2016-06-12 09:34:55.000000000 +0200 @@ -63,7 +63,7 @@ // This also creates all the characters KapmanParser kapmanParser(this); // Set the XML file as input source for the parser - QFile mazeXmlFile(QStandardPaths::locate(QStandardPaths::DataLocation, QLatin1Literal("defaultmaze.xml"))); + QFile mazeXmlFile(QStandardPaths::locate(QStandardPaths::AppDataLocation, QLatin1Literal("defaultmaze.xml"))); QXmlInputSource source(&mazeXmlFile); // Create the XML file reader QXmlSimpleReader reader; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapman-16.04.3/ghost.cpp new/kapman-16.08.0/ghost.cpp --- old/kapman-16.04.3/ghost.cpp 2016-03-08 18:43:14.000000000 +0100 +++ new/kapman-16.08.0/ghost.cpp 2016-06-12 09:34:55.000000000 +0200 @@ -17,11 +17,11 @@ */ #include "ghost.h" -#include "time.h" #include <QPointF> #include <KgDifficulty> #include <cstdlib> +#include <ctime> const qreal Ghost::MAX_SPEED_RATIO = 2.0; const int Ghost::POINTS = 200; @@ -35,7 +35,7 @@ m_state = Ghost::HUNTER; m_maxSpeed = m_normalSpeed * MAX_SPEED_RATIO; // Initialize the random-number generator - qsrand(time(NULL)); + qsrand(std::time(nullptr)); // Makes the ghost move as soon as the game is created goLeft(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapman-16.04.3/org.kde.kapman.appdata.xml new/kapman-16.08.0/org.kde.kapman.appdata.xml --- old/kapman-16.04.3/org.kde.kapman.appdata.xml 2016-03-08 18:43:14.000000000 +0100 +++ new/kapman-16.08.0/org.kde.kapman.appdata.xml 2016-06-12 09:34:55.000000000 +0200 @@ -11,6 +11,7 @@ <name xml:lang="cs">Kapman</name> <name xml:lang="da">Kapman</name> <name xml:lang="de">Kapman</name> + <name xml:lang="el">Kapman</name> <name xml:lang="en-GB">Kapman</name> <name xml:lang="es">Kapman</name> <name xml:lang="fi">Kapman</name> @@ -42,6 +43,7 @@ <summary xml:lang="ca-valencia">Un clon del Pac-Man</summary> <summary xml:lang="cs">Klon Pacmana</summary> <summary xml:lang="de">Pac-Man-Klone</summary> + <summary xml:lang="el">Κλώνος του Pac-Man</summary> <summary xml:lang="en-GB">Pac-Man Clone</summary> <summary xml:lang="es">Clon de Pac-Man</summary> <summary xml:lang="fi">Pac-Man-klooni</summary> @@ -74,6 +76,7 @@ El Kapman és un clon del ben conegut joc Pac-Man. El Kapman és un clon del ben conegut joc Pac-Man. Kapman ist eine Kopie des sehr bekannten Spiels Pac-Man. + Το Kapman είναι ένας κλώνος του γνωστού παιχνιδιού Pac-Man. Kapman is a clone of the well known game Pac-Man. Kapman es un clon del conocido juego Pac-Man. Kapman on tunnetun Pac-Man-pelin klooni. @@ -107,6 +110,7 @@ Heu de recórrer el laberint per menjar les píndoles sense ser capturat per cap fantasma. Si menja un energitzant, el Kapman aconsegueix la capacitat de menjar els fantasmes durant uns segons. Quan una etapa es neteja de píndoles i energitzants, el jugador es porta a l'etapa següent amb un lleuger increment de la velocitat de joc. Heu de recórrer el laberint per menjar les píndoles sense ser capturat per cap fantasma. Si menja un energitzant, el Kapman aconsegueix la capacitat de menjar els fantasmes durant uns segons. Quan una etapa es neteja de píndoles i energitzants, el jugador es porta a l'etapa següent amb un lleuger increment de la velocitat de joc. Sie müssen durch ein Labyrinth rennen und alle „Pillen“ fressen ohne von einem Geist erwischt zu werden. Nach dem Fressen eines „Appetitanregers“ können Sie für einige Sekunden auch Geister fressen. Wenn alle „Pillen“ und „Appetitanreger“ in der jeweiligen Ebene gefressen wurden, steigt man in die nächste Ebene auf, in der die Geschwindigkeit der Figur und Geister steigt. + Πρέπει να τρέξεις στο λαβύρινθο και να φας όλα τα χάπια χωρίς να σε πιάσει κάποιο φαντασματάκι. Τρώγοντας ένα τονωτικό, ο Kapman αποκτάει την ικανότητα να τρώει φαντασματάκια για λίγα δευτερόλεπτα. Όταν το επίπεδο έχει καθαριστεί από χάπια και τονωτικά, ο παίκτης πηγαίνει σε επόμενο επίπεδο ελάχιστα αυξημένης ταχύτητας. You must run through the maze to eat all pills without being captured by a ghost. By eating an energiser, Kapman gets the ability to eat ghosts for a few seconds. When a stage is cleared of pills and energiser the player is taken to the next stage with slightly increased game speed. Debes correr a través de un laberinto para comerte todas las pastillas sin que te capture un fantasma. Al tomarse un vigorizador, Kapman adquiere la habilidad de comer a los fantasmas durante algnos segundos. Cuando en un nivel se acaban las pastillas y vigorizantes, el jugador es llevado al siguiente nivel que tendrá la velocidad del juego ligeramente aumentada. Pelissä täytyy juosta sokkelon läpi, syödä palloja ja olla aaveiden saavuttamattomissa. Piristeen syömällä Kapman pystyy syömään aaveita muutaman sekunnin ajan. Kun kaikki tason pallot ja piristeet on syöty, pelaaja pääsee seuraavalle tasolle, jossa peli etenee hiukan nopeammin.

1 0

commit kanagram for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kanagram for openSUSE:Factory checked in at 2016-08-31 00:06:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kanagram (Old) and /work/SRC/openSUSE:Factory/.kanagram.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kanagram" Changes: -------- --- /work/SRC/openSUSE:Factory/kanagram/kanagram.changes 2016-07-24 19:44:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kanagram.new/kanagram.changes 2016-08-31 00:06:42.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:09:15 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:46:12 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kanagram-16.04.3.tar.xz New: ---- kanagram-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kanagram.spec ++++++ --- /var/tmp/diff_new_pack.YtkKHf/_old 2016-08-31 00:06:43.000000000 +0200 +++ /var/tmp/diff_new_pack.YtkKHf/_new 2016-08-31 00:06:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: kanagram -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Anagram Game License: GPL-2.0+ ++++++ kanagram-16.04.3.tar.xz -> kanagram-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanagram-16.04.3/CMakeLists.txt new/kanagram-16.08.0/CMakeLists.txt --- old/kanagram-16.04.3/CMakeLists.txt 2016-04-16 22:11:55.000000000 +0200 +++ new/kanagram-16.08.0/CMakeLists.txt 2016-06-25 17:13:53.000000000 +0200 @@ -42,6 +42,7 @@ find_package(LibKEduVocDocument REQUIRED) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_subdirectory( doc ) add_subdirectory( src ) Files old/kanagram-16.04.3/doc/answer-highlight.png and new/kanagram-16.08.0/doc/answer-highlight.png differ Files old/kanagram-16.04.3/doc/general-settings.png and new/kanagram-16.08.0/doc/general-settings.png differ Files old/kanagram-16.04.3/doc/helpstates.png and new/kanagram-16.08.0/doc/helpstates.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanagram-16.04.3/doc/index.docbook new/kanagram-16.08.0/doc/index.docbook --- old/kanagram-16.04.3/doc/index.docbook 2016-04-16 22:11:55.000000000 +0200 +++ new/kanagram-16.08.0/doc/index.docbook 2016-06-25 17:13:53.000000000 +0200 @@ -30,8 +30,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2014-06-28</date> -<releaseinfo>0.2 (&kde; 4.14)</releaseinfo> +<date>2016-04-27</date> +<releaseinfo>1.2 (Applications 16.04)</releaseinfo> <abstract> <para> @@ -51,7 +51,11 @@ </keywordset> </bookinfo> - + <chapter id="introduction"> <title>Introduction</title> @@ -84,7 +88,7 @@ <orderedlist> <listitem> <para> -The <interface>Vocabulary Switcher</interface> allows the user to quickly <action>change the active vocabulary</action> by clicking on it: the &LMB; <action>advances to the next vocabulary</action>, with the &RMB; allowing you to <action>return to the previously-played vocabulary</action>. +The <interface>Vocabulary Switcher</interface> (<keysym>PgUp</keysym> / <keysym>PgDown</keysym>) allows the user to quickly <action>change the active vocabulary</action> by clicking with the &LMB; on the arrows to <action>advance to the next vocabulary</action> or to <action>return to the previously-played vocabulary</action>. </para> </listitem> <listitem> @@ -94,17 +98,17 @@ </listitem> <listitem> <para> -This is the <guiicon>Start/Stop Timer</guiicon> button, and allows you to <action>start or stop scoring timer</action>. +This is the <guiicon>Start Timer</guiicon> (<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>) button, and allows you to <action>start or stop scoring timer</action>. </para> </listitem> <listitem> <para> -When the <guibutton>Hint</guibutton> button is clicked, a short sentence will appear, <action>describing the current word puzzle</action>. +When the <guibutton>Hint</guibutton> (<keycombo action="simul">&Ctrl;<keycap>H</keycap></keycombo>) button is clicked, a short sentence will appear, <action>describing the current word puzzle</action>. </para> </listitem> <listitem> <para> -The <guibutton>Reveal Word</guibutton> button <action>solves the current word puzzle</action>. +The <guibutton>Reveal Word</guibutton> (<keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo>) button <action>solves the current word puzzle</action>. </para> </listitem> <listitem> @@ -114,7 +118,7 @@ </listitem> <listitem> <para> -The <interface>Enter</interface> button lets you <action>check if your answer is correct</action>. This function is also provided by the &Enter; key. +The <interface>Next Anagram</interface> (<keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo>) button lets you switch to the next guess. </para> </listitem> <listitem> @@ -141,6 +145,11 @@ </listitem> <listitem> <para> +Use the <guiicon>Change mode</guiicon> button to switch between 1 and 2 player mode. +</para> +</listitem> +<listitem> +<para> The <guiicon>Quit</guiicon> button <action>closes the application</action>. </para> </listitem> @@ -178,25 +187,7 @@ <step> <para> -Once you think you know the correct answer, type it into the <interface>Entry Box</interface> below the <interface>blackboard</interface>. Either press the &Enter; key, or click on the <interface>Enter</interface> button to the right of the <interface>Entry Box</interface> to check your answer: it will <action>change green on a correct answer</action>, and <action>red on an incorrect attempt</action>: -</para> - -<screenshot> -<screeninfo>answer highlighted</screeninfo> -<mediaobject> -<imageobject> -<imagedata fileref="answer-highlight.png" format="PNG"/> -</imageobject> -<textobject> -<phrase>answer highlighted</phrase> -</textobject> -</mediaobject> -</screenshot> -</step> - -<step> -<para> -If you were correct, try and guess the next word! Alternatively, you can attempt one of the many other vocabularies bundled with &kanagram;. +Once you think you know the correct answer, type the letters into the <interface>Entry Box</interface> below the <interface>blackboard</interface> or click them with the &LMB; and the letters move down to the entry box. If you were correct, the next anagram appears, otherwise all letters jump back into the blackboard. </para> </step> </procedure> @@ -253,7 +244,7 @@ <listitem> <para> -The <guilabel>Advanced Settings</guilabel> checkbox can be used to reveal or hide options to configure scoring of answers. +The <guilabel>Score Point Settings</guilabel> checkbox can be used to reveal or hide options to configure scoring of answers. </para> </listitem> @@ -394,28 +385,7 @@ </sect1> -<sect1 id="shortcuts-config"> -<title>Shortcuts</title> - -<para> -The <guilabel>Shortcut</guilabel> configuration page allows you to assign shortcuts -to &kanagram; action, and configure the shortcuts already assigned.</para> - -<screenshot> -<screeninfo>&kanagram; shortcuts settings</screeninfo> -<mediaobject> -<imageobject> -<imagedata fileref="shortcuts-settings.png" format="PNG"/> -</imageobject> -<textobject> -<phrase>&kanagram; shortcuts settings</phrase> -</textobject> -</mediaobject> -</screenshot> - -</sect1> - -<sect1 id="newstuff-config"> +<sect1 id="newstuff"> <title>New Stuff</title> <para> @@ -424,22 +394,6 @@ </para> <screenshot> -<screeninfo>&kanagram; new stuff settings</screeninfo> -<mediaobject> -<imageobject> -<imagedata fileref="newstuff-settings.png" format="PNG"/> -</imageobject> -<textobject> -<phrase>&kanagram; newstuff settings</phrase> -</textobject> -</mediaobject> -</screenshot> - -<para> -Click the <guibutton>Download new vocabulary</guibutton> button to browse the available online content: -</para> - -<screenshot> <screeninfo>&kanagram; new stuff dialog</screeninfo> <mediaobject> <imageobject> @@ -493,25 +447,6 @@ </chapter> - -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-kanagram"> -<title>How to obtain &kanagram;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - &documentation.index; </book> <!-- Files old/kanagram-16.04.3/doc/kanagram-hint.png and new/kanagram-16.08.0/doc/kanagram-hint.png differ Files old/kanagram-16.04.3/doc/kanagram.png and new/kanagram-16.08.0/doc/kanagram.png differ Files old/kanagram-16.04.3/doc/main_overlay.svgz and new/kanagram-16.08.0/doc/main_overlay.svgz differ Files old/kanagram-16.04.3/doc/newstuff-dialog.png and new/kanagram-16.08.0/doc/newstuff-dialog.png differ Files old/kanagram-16.04.3/doc/newstuff-settings.png and new/kanagram-16.08.0/doc/newstuff-settings.png differ Files old/kanagram-16.04.3/doc/shortcuts-settings.png and new/kanagram-16.08.0/doc/shortcuts-settings.png differ Files old/kanagram-16.04.3/doc/vocab-editor.png and new/kanagram-16.08.0/doc/vocab-editor.png differ Files old/kanagram-16.04.3/doc/vocab-settings.png and new/kanagram-16.08.0/doc/vocab-settings.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanagram-16.04.3/src/kanagramgame.cpp new/kanagram-16.08.0/src/kanagramgame.cpp --- old/kanagram-16.04.3/src/kanagramgame.cpp 2016-04-16 22:11:55.000000000 +0200 +++ new/kanagram-16.08.0/src/kanagramgame.cpp 2016-06-25 17:13:53.000000000 +0200 @@ -249,8 +249,8 @@ // this file has no entries m_originalWord = ""; m_hint = ""; - m_picHintUrl = ""; - m_audioUrl = ""; + m_picHintUrl = QUrl(); + m_audioUrl = QUrl(); // TODO: add some error reporting here } emit userAnswerChanged();

1 0

commit kalgebra for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kalgebra for openSUSE:Factory checked in at 2016-08-31 00:06:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kalgebra (Old) and /work/SRC/openSUSE:Factory/.kalgebra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kalgebra" Changes: -------- --- /work/SRC/openSUSE:Factory/kalgebra/kalgebra.changes 2016-07-24 19:44:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kalgebra.new/kalgebra.changes 2016-08-31 00:06:39.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:08:20 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:45:10 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kalgebra-16.04.3.tar.xz New: ---- kalgebra-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kalgebra.spec ++++++ --- /var/tmp/diff_new_pack.hTj3fG/_old 2016-08-31 00:06:40.000000000 +0200 +++ /var/tmp/diff_new_pack.hTj3fG/_new 2016-08-31 00:06:40.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: Productivity/Scientific/Math Url: http://edu.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRequires: analitza-devel ++++++ kalgebra-16.04.3.tar.xz -> kalgebra-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-16.04.3/CMakeLists.txt new/kalgebra-16.08.0/CMakeLists.txt --- old/kalgebra-16.04.3/CMakeLists.txt 2016-04-06 19:57:19.000000000 +0200 +++ new/kalgebra-16.08.0/CMakeLists.txt 2016-06-25 17:17:42.000000000 +0200 @@ -37,6 +37,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kalgebra.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config-kalgebra.h) add_definitions (-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) if(${MOBILE_BACKEND} STREQUAL "kde") find_package(KF5I18n ${KF5_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-16.04.3/doc/commands.docbook new/kalgebra-16.08.0/doc/commands.docbook --- old/kalgebra-16.04.3/doc/commands.docbook 2016-04-06 19:57:19.000000000 +0200 +++ new/kalgebra-16.08.0/doc/commands.docbook 2016-06-25 17:17:42.000000000 +0200 @@ -330,6 +330,30 @@ <listitem><para>Parameters: log(par1)</para></listitem> <listitem><para>Example: x->log(x)</para></listitem> </itemizedlist></sect1> + <sect1 id='conjugate'><title>conjugate</title><itemizedlist> + <listitem><para>Name: conjugate</para></listitem> + <listitem><para>Description: Conjugate</para></listitem> + <listitem><para>Parameters: conjugate(par1)</para></listitem> + <listitem><para>Example: x->conjugate(x*i)</para></listitem> + </itemizedlist></sect1> + <sect1 id='arg'><title>arg</title><itemizedlist> + <listitem><para>Name: arg</para></listitem> + <listitem><para>Description: Arg</para></listitem> + <listitem><para>Parameters: arg(par1)</para></listitem> + <listitem><para>Example: x->arg(x*i)</para></listitem> + </itemizedlist></sect1> + <sect1 id='real'><title>real</title><itemizedlist> + <listitem><para>Name: real</para></listitem> + <listitem><para>Description: Real</para></listitem> + <listitem><para>Parameters: real(par1)</para></listitem> + <listitem><para>Example: x->real(x*i)</para></listitem> + </itemizedlist></sect1> + <sect1 id='imaginary'><title>imaginary</title><itemizedlist> + <listitem><para>Name: imaginary</para></listitem> + <listitem><para>Description: Imaginary</para></listitem> + <listitem><para>Parameters: imaginary(par1)</para></listitem> + <listitem><para>Example: x->imaginary(x*i)</para></listitem> + </itemizedlist></sect1> <sect1 id='sum'><title>sum</title><itemizedlist> <listitem><para>Name: sum</para></listitem> <listitem><para>Description: Summatory</para></listitem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-16.04.3/doc/index.docbook new/kalgebra-16.08.0/doc/index.docbook --- old/kalgebra-16.04.3/doc/index.docbook 2016-04-06 19:57:19.000000000 +0200 +++ new/kalgebra-16.08.0/doc/index.docbook 2016-06-25 17:17:42.000000000 +0200 @@ -1,8 +1,6 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&kalgebra;"> - <!ENTITY package "kdeedu"> - <!ENTITY commands SYSTEM "commands.docbook"> <!ENTITY % addindex "IGNORE"> @@ -33,8 +31,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2013-06-27</date> -<releaseinfo>0.11 (&kde; 4.11)</releaseinfo> +<date>2016-04-19</date> +<releaseinfo>0.10 (Applications 16.04)</releaseinfo> <abstract> <para> @@ -496,25 +494,6 @@ </chapter> - -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-kapptemplate"> -<title>How to obtain &kalgebra;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and installation</title> - -&install.compile.documentation; - -</sect1> - -</appendix> &documentation.index; </book> Files old/kalgebra-16.04.3/doc/kalgebra-2dgraph-window.png and new/kalgebra-16.08.0/doc/kalgebra-2dgraph-window.png differ Files old/kalgebra-16.04.3/doc/kalgebra-3dgraph-window.png and new/kalgebra-16.08.0/doc/kalgebra-3dgraph-window.png differ Files old/kalgebra-16.04.3/doc/kalgebra-console-window.png and new/kalgebra-16.08.0/doc/kalgebra-console-window.png differ Files old/kalgebra-16.04.3/doc/kalgebra-dictionary-window.png and new/kalgebra-16.08.0/doc/kalgebra-dictionary-window.png differ Files old/kalgebra-16.04.3/doc/kalgebra-main-window.png and new/kalgebra-16.08.0/doc/kalgebra-main-window.png differ Files old/kalgebra-16.04.3/doc/view-fullscreen.png and new/kalgebra-16.08.0/doc/view-fullscreen.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-16.04.3/mobile/plugins/Tables.qml new/kalgebra-16.08.0/mobile/plugins/Tables.qml --- old/kalgebra-16.04.3/mobile/plugins/Tables.qml 2016-04-06 19:57:19.000000000 +0200 +++ new/kalgebra-16.08.0/mobile/plugins/Tables.qml 2016-06-25 17:17:42.000000000 +0200 @@ -5,7 +5,6 @@ KAlgebraPage { - ListModel { id: resultsModel } Analitza { id: a variables: app.variables @@ -86,7 +85,7 @@ currentIndex: -1 clip: true - model: resultsModel + model: ListModel { id: resultsModel } role: "element" title: "Results:" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-16.04.3/mobile/plugins/widgets/kde/Button.qml new/kalgebra-16.08.0/mobile/plugins/widgets/kde/Button.qml --- old/kalgebra-16.04.3/mobile/plugins/widgets/kde/Button.qml 2016-04-06 19:57:19.000000000 +0200 +++ new/kalgebra-16.08.0/mobile/plugins/widgets/kde/Button.qml 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -import org.kde.plasma.components 2.0 - -Button {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-16.04.3/mobile/plugins/widgets/kde/CMakeLists.txt new/kalgebra-16.08.0/mobile/plugins/widgets/kde/CMakeLists.txt --- old/kalgebra-16.04.3/mobile/plugins/widgets/kde/CMakeLists.txt 2016-04-06 19:57:19.000000000 +0200 +++ new/kalgebra-16.08.0/mobile/plugins/widgets/kde/CMakeLists.txt 2016-06-25 17:17:42.000000000 +0200 @@ -1,7 +1,13 @@ install( FILES - Label.qml Button.qml CalcButton.qml ExpressionInput.qml - Keyboard.qml RealInput.qml SimpleListView.qml + Keyboard.qml SimpleListView.qml - KAlgebraPage.qml KAlgebraMobile.qml + KAlgebraPage.qml KAlgebraMobile.qml + DESTINATION ${KDE_INSTALL_DATADIR}/kalgebramobile/plugins/widgets/ +) + +install(FILES + ../qtcontrols/AddButton.qml ../qtcontrols/ComboBox.qml ../qtcontrols/Dialog.qml ../qtcontrols/Label.qml + ../qtcontrols/Button.qml ../qtcontrols/CalcButton.qml ../qtcontrols/RealInput.qml ../qtcontrols/ExpressionInput.qml + DESTINATION ${KDE_INSTALL_DATADIR}/kalgebramobile/plugins/widgets/ ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-16.04.3/mobile/plugins/widgets/kde/CalcButton.qml new/kalgebra-16.08.0/mobile/plugins/widgets/kde/CalcButton.qml --- old/kalgebra-16.04.3/mobile/plugins/widgets/kde/CalcButton.qml 2016-04-06 19:57:19.000000000 +0200 +++ new/kalgebra-16.08.0/mobile/plugins/widgets/kde/CalcButton.qml 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -import QtQuick 2.0 - -Button -{ - onClicked: doOp(text) -} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-16.04.3/mobile/plugins/widgets/kde/ExpressionInput.qml new/kalgebra-16.08.0/mobile/plugins/widgets/kde/ExpressionInput.qml --- old/kalgebra-16.04.3/mobile/plugins/widgets/kde/ExpressionInput.qml 2016-04-06 19:57:19.000000000 +0200 +++ new/kalgebra-16.08.0/mobile/plugins/widgets/kde/ExpressionInput.qml 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -import org.kde.plasma.components 2.0 - -TextField -{ - id: input - - placeholderText: "Enter the expression to calculate..." - -// Keys.onPressed: { -// console.log("bum :: "+text); -// hints.text=text; -// } -// -// ToolTip { -// id: hints -// } -// height: input.font.pixelSize+5 -} - -// Rectangle -// { -// color: "green" -// } \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-16.04.3/mobile/plugins/widgets/kde/KAlgebraMobile.qml new/kalgebra-16.08.0/mobile/plugins/widgets/kde/KAlgebraMobile.qml --- old/kalgebra-16.04.3/mobile/plugins/widgets/kde/KAlgebraMobile.qml 2016-04-06 19:57:19.000000000 +0200 +++ new/kalgebra-16.08.0/mobile/plugins/widgets/kde/KAlgebraMobile.qml 2016-06-25 17:17:42.000000000 +0200 @@ -1,122 +1,65 @@ -import QtQuick 2.0 -import QtQuick.Window 2.1 -import org.kde.plasma.components 2.0 -import org.kde.kquickcontrolsaddons 2.0 +import QtQuick 2.2 +import QtQuick.Layouts 1.2 +import org.kde.kirigami 1.0 import org.kde.analitza 1.0 import org.kde.kalgebra.mobile 1.0 -import org.kde.plasma.core 2.0 -Window { - height: 400 - width: 300 +ApplicationWindow +{ + id: rootItem + height: 600 + width: 600 visible: true - - Rectangle { - anchors.fill: parent - color: "black" - opacity: .2 - } - - function goToPage(path, deco) { -// var toOpen = plugins.pluginPath(idx) - - try { - var component = Qt.createComponent(path) - if (component.status == Component.Ready) - pageStack.push(component); - else - console.log("Error loading component:", component.errorString()); - } catch (e) { - console.log("error: "+e) - } - } - - Page { - id: init - anchors.margins: 10 - - ListView { - anchors.fill: parent - spacing: 5 - - move: Transition { - NumberAnimation { - properties: "x,y" - easing.type: Easing.InOutQuad - } - } - - delegate: ListItem { - height: 100 - enabled: true - Column { - anchors.fill: parent - spacing: 10 - - QIconItem { - id: icon - width: 50 - height: 50 - anchors.horizontalCenter: parent.horizontalCenter - icon: decoration - } - - Text { - id: description - anchors.left: parent.left - anchors.right: parent.right - horizontalAlignment: Text.AlignHCenter - text: i18n("%1 \n%2", title, subtitle) - } + + globalDrawer: GlobalDrawer { + id: drawer + + title: "KAlgebra" + titleIcon: "kalgebra" + + Instantiator { + delegate: Action { + text: title + iconName: decoration + onTriggered: { + var component = Qt.createComponent(model.path); + if (component.status == Component.Error) { + console.log("error", component.errorString()); + return; } - onClicked: goToPage(model.path, decoration) + try { + rootItem.pageStack.clear(); + var obj = component.createObject(component); + rootItem.pageStack.push(obj) + } catch(e) { + console.log("error", e) + } } - - model: PluginsModel { id: plugins } - } - - tools: ToolBarLayout {} - } - - ToolBar { - id: toolBar - z: 10 - width: parent.width - height: 40 - anchors.top: parent.top - - - Image { - anchors { - left: parent.left - verticalCenter: parent.verticalCenter - leftMargin: 5 } - - source: "qrc:/kde-edu-logo.png" - height: parent.height - fillMode: Image.PreserveAspectFit - smooth: true - - MouseArea { - anchors.fill: parent - onClicked: Qt.openUrlExternally("http://edu.kde.org") + model: PluginsModel {} + onObjectAdded: { + var acts = []; + for(var v in drawer.actions) { + acts.push(drawer.actions[v]); + } + acts.splice(index, 0, object) + drawer.actions = acts; + } + onObjectRemoved: { + var acts = []; + for(var v in drawer.actions) { + acts.push(drawer.actions[v]); + } + drawer.actions.splice(drawer.actions.indexOf(object), 1) + drawer.actions = acts; } } + + actions: [] } - - PageStack - { - id: pageStack - width: parent.width - anchors { - top: toolBar.bottom - bottom: parent.bottom - } - - initialPage: init - - toolBar: toolBar + + Component.onCompleted: { + drawer.actions[0].trigger() } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-16.04.3/mobile/plugins/widgets/kde/KAlgebraPage.qml new/kalgebra-16.08.0/mobile/plugins/widgets/kde/KAlgebraPage.qml --- old/kalgebra-16.04.3/mobile/plugins/widgets/kde/KAlgebraPage.qml 2016-04-06 19:57:19.000000000 +0200 +++ new/kalgebra-16.08.0/mobile/plugins/widgets/kde/KAlgebraPage.qml 2016-06-25 17:17:42.000000000 +0200 @@ -1,18 +1,14 @@ -import org.kde.plasma.components 2.0 +import org.kde.kirigami 1.0 +import QtQuick 2.1 -Page { - id: page - height: 100 - width: 100 - - anchors.margins: 10 - - tools: ToolBarLayout { - ToolButton { - iconSource: "go-previous" - text: i18n("Back") - - onClicked: page.pageStack.pop() - } +Page +{ + readonly property real dp: Units.devicePixelRatio + title: "KAlgebra" + default property alias contents: item.data + + Item { + id: item + anchors.fill: parent } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-16.04.3/mobile/plugins/widgets/kde/Label.qml new/kalgebra-16.08.0/mobile/plugins/widgets/kde/Label.qml --- old/kalgebra-16.04.3/mobile/plugins/widgets/kde/Label.qml 2016-04-06 19:57:19.000000000 +0200 +++ new/kalgebra-16.08.0/mobile/plugins/widgets/kde/Label.qml 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -import org.kde.plasma.components 2.0 -import QtQuick 2.0 - -Label { - onLinkActivated: Qt.openUrlExternally(link) -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-16.04.3/mobile/plugins/widgets/kde/RealInput.qml new/kalgebra-16.08.0/mobile/plugins/widgets/kde/RealInput.qml --- old/kalgebra-16.04.3/mobile/plugins/widgets/kde/RealInput.qml 2016-04-06 19:57:19.000000000 +0200 +++ new/kalgebra-16.08.0/mobile/plugins/widgets/kde/RealInput.qml 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -import QtQuick 2.0 -import org.kde.plasma.components 2.0 - -TextField -{ - property double value: parseFloat(text) - property alias minimumValue: realvalidator.bottom - property alias maximumValue: realvalidator.top - inputMethodHints: Qt.ImhDigitsOnly | Qt.ImhNoPredictiveText - - text: value.toString() - - validator: DoubleValidator { id: realvalidator } - - onTextChanged: value=parseFloat(text) - - Component.onCompleted: text=value -} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-16.04.3/mobile/plugins/widgets/kde/SimpleListView.qml new/kalgebra-16.08.0/mobile/plugins/widgets/kde/SimpleListView.qml --- old/kalgebra-16.04.3/mobile/plugins/widgets/kde/SimpleListView.qml 2016-04-06 19:57:19.000000000 +0200 +++ new/kalgebra-16.08.0/mobile/plugins/widgets/kde/SimpleListView.qml 2016-06-25 17:17:42.000000000 +0200 @@ -1,4 +1,5 @@ -import org.kde.plasma.components 2.0 +import org.kde.kirigami 1.0 +import QtQuick.Controls 1.1 import QtQuick 2.0 ListView @@ -6,21 +7,8 @@ id: scrollList property string role: "" property string title: "" - delegate: Label { text: model[role] } + delegate: BasicListItem { label: model[role] } header: Label { visible: ListView.view.title!=""; text: ListView.view.title } clip: true - - ScrollBar { - id: scrollBar - orientation: Qt.Vertical - flickableItem: scrollList - stepSize: 40 - scrollButtonInterval: 50 - anchors { - top: scrollList.top - right: scrollList.right - bottom: scrollList.bottom - } - } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-16.04.3/src/kalgebra.cpp new/kalgebra-16.08.0/src/kalgebra.cpp --- old/kalgebra-16.04.3/src/kalgebra.cpp 2016-04-06 19:57:19.000000000 +0200 +++ new/kalgebra-16.08.0/src/kalgebra.cpp 2016-06-25 17:17:42.000000000 +0200 @@ -167,7 +167,7 @@ connect(c_results, SIGNAL(paste(QString)), c_exp, SLOT(insertText(QString))); connect(c_variables, &QAbstractItemView::clicked, this, &KAlgebra::edit_var); ////////menu - c_menu = menuBar()->addMenu(i18n("C&onsole")); + c_menu = menuBar()->addMenu(i18n("C&alculator")); c_menu->addAction(QIcon::fromTheme(QStringLiteral("document-open")), i18nc("@item:inmenu", "&Load Script..."), this, SLOT(loadScript()), Qt::CTRL+Qt::Key_L);

1 0

commit kajongg for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kajongg for openSUSE:Factory checked in at 2016-08-31 00:06:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kajongg (Old) and /work/SRC/openSUSE:Factory/.kajongg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kajongg" Changes: -------- --- /work/SRC/openSUSE:Factory/kajongg/kajongg.changes 2016-07-24 19:44:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kajongg.new/kajongg.changes 2016-08-31 00:06:37.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:08:04 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:44:33 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kajongg-16.04.3.tar.xz New: ---- kajongg-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kajongg.spec ++++++ --- /var/tmp/diff_new_pack.ItAQf4/_old 2016-08-31 00:06:38.000000000 +0200 +++ /var/tmp/diff_new_pack.ItAQf4/_new 2016-08-31 00:06:38.000000000 +0200 @@ -25,7 +25,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kajongg-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kajongg-16.04.3.tar.xz -> kajongg-16.08.0.tar.xz ++++++

1 0

commit kaccessible for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package kaccessible for openSUSE:Factory checked in at 2016-08-31 00:06:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kaccessible (Old) and /work/SRC/openSUSE:Factory/.kaccessible.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kaccessible" Changes: -------- --- /work/SRC/openSUSE:Factory/kaccessible/kaccessible.changes 2016-07-24 19:44:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kaccessible.new/kaccessible.changes 2016-08-31 00:06:35.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:07:41 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:43:38 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kaccessible-16.04.3.tar.xz New: ---- kaccessible-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kaccessible.spec ++++++ --- /var/tmp/diff_new_pack.9cj5us/_old 2016-08-31 00:06:36.000000000 +0200 +++ /var/tmp/diff_new_pack.9cj5us/_new 2016-08-31 00:06:36.000000000 +0200 @@ -27,7 +27,7 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kaccessible-16.04.3.tar.xz -> kaccessible-16.08.0.tar.xz ++++++

1 0

commit khelpcenter5 for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package khelpcenter5 for openSUSE:Factory checked in at 2016-08-31 00:06:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/khelpcenter5 (Old) and /work/SRC/openSUSE:Factory/.khelpcenter5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "khelpcenter5" Changes: -------- --- /work/SRC/openSUSE:Factory/khelpcenter5/khelpcenter5.changes 2016-07-24 19:44:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.khelpcenter5.new/khelpcenter5.changes 2016-08-31 00:06:32.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:07:33 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:43:16 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- khelpcenter-16.04.3.tar.xz New: ---- khelpcenter-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ khelpcenter5.spec ++++++ --- /var/tmp/diff_new_pack.9Q1cZD/_old 2016-08-31 00:06:33.000000000 +0200 +++ /var/tmp/diff_new_pack.9Q1cZD/_new 2016-08-31 00:06:33.000000000 +0200 @@ -39,7 +39,7 @@ Summary: KDE Documentation Application License: GPL-2.0+ Group: Productivity/Other -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source: khelpcenter-%{version}.tar.xz # PATCH-FIX-OPENSUSE khelpcenter-use-susehelp.patch -- use susehelp wrapper instead of directly starting khelpcenter @@ -81,6 +81,8 @@ %{_kf5_applicationsdir}/org.kde.Help.desktop %{_kf5_configkcfgdir}/ %{_kf5_servicesdir}/ +%dir %{_kf5_appstreamdir} +%{_kf5_appstreamdir}/org.kde.Help.appdata.xml %exclude %{_kf5_sharedir}/kde4/services/khelpcenter.desktop %{_kf5_sharedir}/kde4/ %{_kf5_sharedir}/kxmlgui5/ ++++++ khelpcenter-16.04.3.tar.xz -> khelpcenter-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/CMakeLists.txt new/khelpcenter-16.08.0/CMakeLists.txt --- old/khelpcenter-16.04.3/CMakeLists.txt 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/CMakeLists.txt 2016-08-06 13:08:24.000000000 +0200 @@ -55,6 +55,8 @@ URL "http://www.xmlsoft.org/" TYPE REQUIRED) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + add_subdirectory( plugins ) add_subdirectory( searchhandlers ) add_subdirectory( tests ) @@ -107,5 +109,6 @@ install( FILES table-of-contents.xslt glossary.xslt DESTINATION ${DATA_INSTALL_DIR}/khelpcenter ) install( FILES khelpcenterui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/khelpcenter ) install( FILES khelpcenter.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) +install( FILES org.kde.Help.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} ) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/application.cpp new/khelpcenter-16.08.0/application.cpp --- old/khelpcenter-16.04.3/application.cpp 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/application.cpp 2016-08-06 13:08:24.000000000 +0200 @@ -93,7 +93,9 @@ KAboutLicense::GPL, i18n("(c) 1999-2011, The KHelpCenter developers") ); - aboutData.addAuthor( "Cornelius Schumacher", QString(), "schumacher(a)kde.org" ); + aboutData.addAuthor( "Luigi Toscano", QString("Current maintainer"), "luigi.toscano(a)tiscali.it" ); + aboutData.addAuthor( "Pino Toscano", QString("Xapian-based search, lot of bugfixes"), "pino(a)kde.org" ); + aboutData.addAuthor( "Cornelius Schumacher", QString("Former maintainer"), "schumacher(a)kde.org" ); aboutData.addAuthor( "Frerich Raabe", QString(), "raabe(a)kde.org" ); aboutData.addAuthor( "Matthias Elter", i18n("Original Author"), "me(a)kde.org" ); aboutData.addAuthor( "Wojciech Smigaj", i18n("Info page support"), "achu(a)klub.chip.pl" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/doc/fundamentals/config.docbook new/khelpcenter-16.08.0/doc/fundamentals/config.docbook --- old/khelpcenter-16.04.3/doc/fundamentals/config.docbook 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/doc/fundamentals/config.docbook 2016-08-06 13:08:24.000000000 +0200 @@ -283,8 +283,8 @@ <sect2 id="shortcuts-reset"> <title>Resetting Shortcuts</title> -<para>There is a button at the bottom of the window, called <guibutton>Reset to -Defaults</guibutton>. Clicking on this button will reset all your custom shortcuts +<para>There is a button at the bottom of the window, called <guibutton>Defaults</guibutton>. +Clicking on this button will reset all your custom shortcuts to their default values.</para> <para>You can also reset an individual shortcut to its default value by selecting @@ -308,9 +308,6 @@ several profiles with different shortcuts and switch between these profiles easily.</para> -<warning><para>This feature is under development. It is not possible to import -schemes using a &GUI; at this time.</para></warning> - <screenshot id="screenshot-shortcuts-schemes"> <screeninfo>Working with Schemes</screeninfo> <mediaobject> @@ -322,7 +319,7 @@ </screenshot> <para>To see a menu allowing you to edit schemes, click on the -<guibutton>Details</guibutton> button at the bottom of the form. The following +<guibutton>Manage Schemes</guibutton> button at the bottom of the form. The following options will appear:</para> <variablelist> @@ -350,17 +347,20 @@ <variablelist> <varlistentry> -<term><guimenuitem>Save as Scheme Defaults</guimenuitem></term> -<listitem><para>Sets the current scheme as the default for all new schemes.</para></listitem> +<term><guimenuitem>Save Shortcuts to scheme</guimenuitem></term> +<listitem><para>Save the current shortcuts to the current scheme.</para></listitem> </varlistentry> <varlistentry> <term><guimenuitem>Export Scheme...</guimenuitem></term> -<listitem><para>Exports the current scheme to a file named <filename><replaceable>applicationname</replaceable><replaceable>schemename</replaceable>shortcuts.rc</filename>.</para> -<para> -Move this file to the folder <filename class="directory">$KDEDIR/apps/applicationname/</filename> -and the exported scheme will be available in the drop down box labelled <guilabel>Current Scheme</guilabel> -</para></listitem> +<listitem><para>Exports the current scheme to a file .</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><guimenuitem>Import Scheme...</guimenuitem></term> +<listitem><para>Imports a scheme from a file .</para> +</listitem> </varlistentry> </variablelist> Files old/khelpcenter-16.04.3/doc/fundamentals/find-find-inline.png and new/khelpcenter-16.08.0/doc/fundamentals/find-find-inline.png differ Files old/khelpcenter-16.04.3/doc/fundamentals/find-replace-inline.png and new/khelpcenter-16.08.0/doc/fundamentals/find-replace-inline.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/doc/fundamentals/index.docbook new/khelpcenter-16.08.0/doc/fundamentals/index.docbook --- old/khelpcenter-16.04.3/doc/fundamentals/index.docbook 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/doc/fundamentals/index.docbook 2016-08-06 13:08:24.000000000 +0200 @@ -1,21 +1,9 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&kde-sc;"> <!ENTITY % addindex "IGNORE"> -  - <!ENTITY plasma-workspaces "&i18n-plasma-workspaces;"> - <!ENTITY plasma-desktop "&i18n-plasma-desktop;"> - <!ENTITY plasma-active "&i18n-plasma-active;"> - <!ENTITY gwenview '<application>Gwenview</application>'> - <!ENTITY Meta "&i18n-Meta;"> -  -  - <!ENTITY i18n-plasma-workspaces "&kde; &plasma; Workspaces"> - <!ENTITY i18n-plasma-desktop "<application>&kde; &plasma; Desktop</application>"> - <!ENTITY i18n-plasma-active "<application>&plasma; Active</application>"> + <!ENTITY Meta "&i18n-Meta;">  <!ENTITY i18n-Meta "<keysym>Meta</keysym>"> -  <!ENTITY ui-chapter SYSTEM "ui.docbook"> <!ENTITY tasks-chapter SYSTEM "tasks.docbook"> <!ENTITY config-chapter SYSTEM "config.docbook"> @@ -47,8 +35,8 @@ </copyright> <legalnotice>&FDLNotice;</legalnotice> -<date>2015-07-30</date> -<releaseinfo>&plasma; 5.4</releaseinfo> +<date>2016-06-06</date> +<releaseinfo>&plasma; 5.6</releaseinfo> <abstract> <para>This guide provides an introduction to the &kde; workspace and applications and describes many diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/doc/fundamentals/install.docbook new/khelpcenter-16.08.0/doc/fundamentals/install.docbook --- old/khelpcenter-16.04.3/doc/fundamentals/install.docbook 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/doc/fundamentals/install.docbook 2016-08-06 13:08:24.000000000 +0200 @@ -1,7 +1,8 @@ <chapter id="install"> -<title>Installing the &kde; Workspace and Applications</title> +<title>Installing &plasma-desktop; and &kde; Applications</title> -<para>You can install the &kde; workspace and applications on a variety of different platforms, ranging from +<para>You can install &kde; applications, including &plasma-desktop;, on a +variety of different platforms, ranging from smartphones and tablets to computers running &Microsoft; &Windows;, &MacOS;, &UNIX;, &BSD; or &Linux;. Binary packages are available for many different platforms and distributions, or advanced users may build the source code.</para> @@ -16,23 +17,23 @@ <title>&Linux;</title> <para>Nearly every &Linux; distribution provides binary packages for individual -applications and the &plasma-workspaces; as a whole.</para> +applications and the &plasma-desktop; as a whole.</para> <para>To install an individual application, look for its name in your distribution's package collection. To install one of the &plasma-workspaces;, like &plasma-desktop;, look for a metapackage or package -group, typically <literal>kde-desktop</literal>.</para> +group, typically <literal>plasma-desktop</literal>.</para> <note> -<para>Some core applications may be installed together with other core +<para>Some applications may be installed together with other applications in a combined package named after the &kde; package they are -provided in. For instance, &dolphin; might be found in the +provided in. For instance, &konqueror; might be found in the <literal>kde-baseapps</literal> package.</para> </note> <para>If you have trouble locating &kde; packages for your distribution, please contact their support resources. Many distributions also have a team dedicated -to packaging &kde; that can provide assistance specific to &kde;</para> +to packaging applications by &kde; that can provide assistance specific to them. </para>  @@ -70,7 +71,7 @@ <title>&BSD;</title> <para>Most &BSD; distributions allows you to install &kde; applications -and the &plasma-workspaces; as a whole through their <quote>ports</quote> +and the &plasma-desktop; through their <quote>ports</quote> system.</para> <para>For more information on installing ports, see your &BSD; distribution's @@ -82,13 +83,12 @@ <sect2 id="install-mobile"> <title>Mobile Devices</title> - -<para>&plasma-active; is an exciting initiative to bring a new &kde; +<para><productname>Plasma Mobile</productname> is an exciting initiative to bring a new &kde; experience to mobile devices like smartphones or tablets. Binary releases are provided for several different devices.</para> <para>For more information, visit -<ulink url="http://plasma-active.org/">&plasma-active;</ulink>.</para> +<ulink url="http://plasma-mobile.org/"><productname>Plasma Mobile</productname></ulink>.</para> </sect2> @@ -96,7 +96,7 @@ <title>Live Media</title> <para>Several &Linux; and &BSD; distributions offer live media. This permits you -to try out the &plasma-workspaces; without installing anything to your system. +to try out the &plasma-desktop; without installing anything to your system. All you have to do insert a CD or connect a USB drive and boot from it. If you like what you see, most offer an option to install it to your hard drive.</para> @@ -107,15 +107,15 @@ <sect2 id="install-source"> <title>Building from Source Code</title> -<para>For detailed information on how to compile and install &kde; workspace and -applications see <ulink url="http://techbase.kde.org/">&kde; TechBase</ulink>.</para> +<para>For detailed information on how to compile and install &plasma-desktop; and +applications see <ulink url="https://community.kde.org/Guidelines_and_HOWTOs/Build_from_source">Build from source</ulink>.</para> <para>Since &kde; software uses <command>cmake</command> you should have no trouble compiling it. Should you run into problems please report them to the &kde; mailing lists.</para> -<para>The recommended tool to build Frameworks and &plasma; Workspace 5 and Applications is -<ulink url="https://projects.kde.org/projects/extragear/utils/kdesrc-build">kdesrc-build</ulink> +<para>The recommended tool to build Frameworks, &plasma-desktop; and all the other applications is +<ulink url="https://commits.kde.org/kdesrc-build">kdesrc-build</ulink> </para> </sect2>  <para>For more information on configuring &sonnet;, see the -<ulink url="help:kcontrol/spellchecking">Spell Checker &systemsettings; module +<ulink url="help:/kcontrol/spellchecking">Spell Checker &systemsettings; module documentation</ulink></para> </sect2> @@ -1075,7 +1075,7 @@ <title>Choosing Colors</title> <para>The color chooser appears in many &kde; applications, whenever you need - to select a color. It lets you pick from a <quote>palette</quote> consisting of many +to select a color. It lets you pick from a <guilabel>Basic colors</guilabel> consisting of many predefined colors or mix your own when you want a specific color.</para> <screenshot id="screenshot-colors"> @@ -1088,24 +1088,14 @@ </mediaobject> </screenshot> -<sect2 id="colors-palette"> -<title>Using Palettes</title> +<sect2 id="basic-colors"> +<title>Using Basic Colors</title> -<para>A palette is a set of predefined colors. You can find it on the right +<para>The basic colors group is a set of predefined colors. You can find it on the top side of the color chooser window.</para> -<para>To select a color from a palette, simply click on it. The color will be -displayed below the palette, along with its &HTML; hexadecimal code and name, if -any.</para> - -<para>To switch between them, use the drop down box above the color palette. -Most palettes will display a grid consisting of the colors, except for the -<guilabel>Named Colors</guilabel>, which lets you select from a list of names. -Other special palettes include <guilabel>* Recent Colors *</guilabel>, which -will display colors that you have recently selected, and -<guilabel>* Custom Colors *</guilabel>, which will display custom colors that -you have saved. For more information on setting custom colors, see -<xref linkend="colors-custom"/></para> +<para>To select a color from the basic colors, simply click on it. The color will be +displayed at the right of the palette, along with its &HTML; hexadecimal code</para> </sect2> @@ -1118,11 +1108,11 @@ <sect3 id="colors-mixing-select"> <title>Using the Grid</title> -<para>The left side of the color chooser contains a large box, and a thinner box +<para>The right side of the color chooser contains a large box, and a thinner box immediately to its right. You can use the left box to select the Hue and Saturation of the desired color based on the visual guide provided in the box. The right bar adjusts the Value. Adjust these to select the desired color, -which is displayed in the lower-right corner of the window.</para> +which is displayed in the middle of the window.</para> <para>For more information on Hue, Saturation, and Value, see <xref linkend="colors-mixing-hsv"/></para> @@ -1130,11 +1120,11 @@ </sect3> <sect3 id="colors-mixing-eyedropper"> -<title>Using the Eyedropper</title> +<title>Using the Screen Colors</title> <para>The eyedropper tool allows you to select a color from your screen. To use -it, select the <guibutton>eyedropper</guibutton> button to the right of the -<guibutton>Add to Custom Colors</guibutton> button, and then click anywhere on +it, select the <guibutton>Pick Screen Color</guibutton> button below the +basic colors, and then click anywhere on your screen to select that color.</para> </sect3> @@ -1142,7 +1132,7 @@ <sect3 id="colors-mixing-hsv"> <title>Hue/Saturation/Value</title> -<para>The lower-left corner of the screen allows you to manually enter the +<para>The lower-right corner of the screen allows you to manually enter the coordinates of the desired color in the Hue/Saturation/Value (<acronym>HSV</acronym>) color space. For more information on this, see <ulink url="https://en.wikipedia.org/wiki/HSL_and_HSV">the <quote>HSL and @@ -1156,7 +1146,7 @@ <sect3 id="colors-mixing-rgb"> <title>Red/Green/Blue</title> -<para>The lower-left corner of the screen also allows you to manually enter the +<para>The lower-right corner of the screen also allows you to manually enter the coordinates of the desired color in the Red/Green/Blue (<acronym>RGB</acronym>) color model. For more information on this, see <ulink url="https://en.wikipedia.org/wiki/RGB_color_model">the <quote>RGB color @@ -1182,14 +1172,11 @@ </sect2> <sect2 id="colors-custom"> -<title>Saving Custom Colors</title> +<title>Custom Colors</title> -<para>After selecting a color, you may save it to the Custom Colors palette so -you can find it later. To do so, click the -<guibutton>Add to Custom Colors</guibutton> button. You can then find it by -selecting the <guilabel>* Custom Colors *</guilabel> palette from the drop -down box in the upper-right corner of the screen. For more information on using -palettes, see <xref linkend="colors-palette"/>.</para> +<para>After selecting a color, you may add it to the Custom Colors group so +you can use it later. To do so, click the +<guibutton>Add to Custom Colors</guibutton> button.</para> </sect2> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/doc/fundamentals/ui.docbook new/khelpcenter-16.08.0/doc/fundamentals/ui.docbook --- old/khelpcenter-16.04.3/doc/fundamentals/ui.docbook 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/doc/fundamentals/ui.docbook 2016-08-06 13:08:24.000000000 +0200 @@ -1127,6 +1127,17 @@ <varlistentry> <term><menuchoice> +<guimenu>Settings</guimenu><guimenuitem>Show +Statusbar</guimenuitem></menuchoice></term> +<listitem> +<para>When checked, this displays a small bar at the bottom of the application +containing information about the status. When unchecked +the status bar is hidden.</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><menuchoice> <guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice></term> <listitem><para> @@ -1332,7 +1343,7 @@ </row> <row> -<entry><keycombo action="simul">&Alt;<keycap>Space</keycap></keycombo></entry> +<entry><keycombo action="simul">&Alt;<keycap>Space</keycap></keycombo> / <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo></entry> <entry><ulink url="help:/plasma-desktop/krunner.html">Run Command Interface</ulink></entry> </row> @@ -1365,67 +1376,67 @@ <tbody> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>F10</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F10</keycap></keycombo></entry> <entry>Present Windows</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>F9</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F9</keycap></keycombo></entry> <entry>Present Windows on current desktop</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>F7</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F7</keycap></keycombo></entry> <entry>Present Windows of current application only</entry> </row> - + <row> -<entry><keycombo action="simul">&Ctrl;<keycap>F12</keycap></keycombo></entry> -<entry>Show Dashboard</entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F12</keycap></keycombo></entry> +<entry>Show Desktop</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;&Alt;<keycap>A</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;&Alt;<keycap>A</keycap></keycombo></entry> <entry>Activate Window Demanding Attention</entry> </row> <row> -<entry><keycombo action="simul">&Alt;&Tab;</keycombo></entry> +<entry><keycombo action="simul">&Alt;&Tab;</keycombo></entry> <entry>Walk through windows</entry> </row> <row> -<entry><keycombo action="simul">&Alt;<keycap>`</keycap></keycombo></entry> -<entry>Walk through windows of the current application</entry> +<entry><keycombo action="simul">&Alt;&Shift;&Tab;</keycombo></entry> +<entry>Walk through windows (Reverse)</entry> </row> <row> -<entry><keycombo action="simul">&Alt;<keycap>F3</keycap></keycombo></entry> +<entry><keycombo action="simul">&Alt;<keycap>F3</keycap></keycombo></entry> <entry>Open the Window Operations menu</entry> </row> <row> -<entry><keycombo action="simul">&Meta;&Alt;<keysym>Up</keysym></keycombo></entry> +<entry><keycombo action="simul">&Meta;&Alt;<keysym>Up</keysym></keycombo></entry> <entry>Switch to Window Above</entry> </row> <row> -<entry><keycombo action="simul">&Meta;&Alt;<keysym>Down</keysym></keycombo></entry> +<entry><keycombo action="simul">&Meta;&Alt;<keysym>Down</keysym></keycombo></entry> <entry>Switch to Window Below</entry> </row> <row> -<entry><keycombo action="simul">&Meta;&Alt;<keysym>Left</keysym></keycombo></entry> +<entry><keycombo action="simul">&Meta;&Alt;<keysym>Left</keysym></keycombo></entry> <entry>Switch to Window to the Left</entry> </row> <row> -<entry><keycombo action="simul">&Meta;&Alt;<keysym>Right</keysym></keycombo></entry> +<entry><keycombo action="simul">&Meta;&Alt;<keysym>Right</keysym></keycombo></entry> <entry>Switch to Window to the Right</entry> </row> @@ -1435,7 +1446,7 @@ </sect3> <sect3 id="kbd-activity-pan-zoom"> -<title>Panning and Zooming</title> +<title>Panning and Zooming</title> <para>Need to get a closer look? The &plasma-workspaces; allow you to zoom in and out and move your entire desktop around, so you can zoom in even when the @@ -1461,37 +1472,37 @@ --> <row> -<entry><keycombo action="simul">&Meta;<keycap>=</keycap></keycombo></entry> +<entry><keycombo action="simul">&Meta;<keycap>=</keycap></keycombo></entry> <entry>Zoom In</entry> </row> <row> -<entry><keycombo action="simul">&Meta;<keycap>-</keycap></keycombo></entry> +<entry><keycombo action="simul">&Meta;<keycap>-</keycap></keycombo></entry> <entry>Zoom Out</entry> </row> <row> -<entry><keycombo action="simul">&Meta;<keycap>0</keycap></keycombo></entry> +<entry><keycombo action="simul">&Meta;<keycap>0</keycap></keycombo></entry> <entry>Zoom Normal</entry> </row> <row> -<entry><keycombo action="simul">&Meta;<keysym>Up</keysym></keycombo></entry> +<entry><keycombo action="simul">&Meta;<keysym>Up</keysym></keycombo></entry> <entry>Pan Up</entry> </row> <row> -<entry><keycombo action="simul">&Meta;<keysym>Down</keysym></keycombo></entry> +<entry><keycombo action="simul">&Meta;<keysym>Down</keysym></keycombo></entry> <entry>Pan Down</entry> </row> <row> -<entry><keycombo action="simul">&Meta;<keysym>Left</keysym></keycombo></entry> +<entry><keycombo action="simul">&Meta;<keysym>Left</keysym></keycombo></entry> <entry>Pan left</entry> </row> <row> -<entry><keycombo action="simul">&Meta;<keysym>Right</keysym></keycombo></entry> +<entry><keycombo action="simul">&Meta;<keysym>Right</keysym></keycombo></entry> <entry>Pan Right</entry> </row> @@ -1505,7 +1516,7 @@ <title>Working with Activities and Virtual Desktops</title> <para>These shortcuts allow you to switch between and manage -<ulink url="help:/plasma-desktop/zooming-user-interface.html">Activities</ulink> +<ulink url="help:/plasma-desktop/activities.html">Activities</ulink> and <ulink url="help:/kcontrol/desktop/">virtual desktops</ulink>.</para> <informaltable> @@ -1521,53 +1532,39 @@ <tbody> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo></entry> -<entry>View all your Activities</entry> +<entry><keycombo action="simul">&Meta;<keycap>Q</keycap></keycombo> / +<keycombo action="simul">&Alt;<keycap>D</keycap></keycombo>,<keycombo action="simul">&Alt;<keycap>A</keycap></keycombo> +</entry> +<entry>Manage Activities</entry> </row> <row> -<entry><keycombo action="simul">&Meta;&Tab;</keycombo></entry> +<entry><keycombo action="simul">&Meta;&Tab;</keycombo></entry> <entry>Next Activity</entry> </row> <row> -<entry><keycombo action="simul">&Meta;&Shift;&Tab;</keycombo></entry> +<entry><keycombo action="simul">&Meta;&Shift;&Tab;</keycombo></entry> <entry>Previous Activity</entry> </row> <row> -<entry><keycombo action="seq"> - <keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> - <keycap>R</keycap> -</keycombo></entry> -<entry>Remove this Activity</entry> -</row> - -<row> -<entry><keycombo action="seq"> - <keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> - <keycap>S</keycap> -</keycombo></entry> -<entry>Activities Settings</entry> -</row> - -<row> -<entry><keycombo action="simul">&Ctrl;<keycap>F1</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F1</keycap></keycombo></entry> <entry>Switch to Desktop 1</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>F2</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F2</keycap></keycombo></entry> <entry>Switch to Desktop 2</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>F3</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F3</keycap></keycombo></entry> <entry>Switch to Desktop 3</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>F4</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F4</keycap></keycombo></entry> <entry>Switch to Desktop 4</entry> </row> @@ -1596,73 +1593,81 @@ <row> <entry><keycombo action="seq"> - <keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> - <keycap>A</keycap> +<keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> +<keycap>A</keycap> </keycombo></entry> <entry>Add Widgets</entry> </row> <row> <entry><keycombo action="seq"> - <keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> - <keycap>R</keycap> +<keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> +<keycap>R</keycap> </keycombo></entry> -<entry>Remove Widgets</entry> +<entry>Remove this <replaceable>Widget</replaceable></entry> </row> <row> <entry><keycombo action="seq"> - <keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> - <keycap>L</keycap> +<keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> +<keycap>L</keycap> </keycombo></entry> <entry>Lock/Unlock Widgets</entry> </row> - + <row> <entry><keycombo action="seq"> - <keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> - <keycap>S</keycap> +<keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> +<keycap>S</keycap> </keycombo></entry> -<entry>Widget Settings</entry> +<entry><replaceable>Widget</replaceable> Settings</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>F12</keycap></keycombo></entry> -<entry>Show Dashboard</entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F12</keycap></keycombo></entry> +<entry>Show Desktop</entry> </row> <row> <entry><keycombo action="seq"> - <keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> - <keycap>T</keycap> +<keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> +<keycap>T</keycap> </keycombo></entry> <entry>Run the Associated Application</entry> </row> - + + +<row> +<entry><keycombo action="simul">&Alt;<keycap>D</keycap></keycombo>,<keycombo action="simul">&Alt;<keycap>S</keycap></keycombo> +</entry> +<entry>Desktop Settings</entry> +</row> </tbody> </tgroup> </informaltable> + </sect2> <sect2 id="kbd-help"> @@ -1904,34 +1909,34 @@ </thead> <tbody> - + <row> -<entry><keycombo action="simul">&Ctrl;&Alt;<keycap>L</keycap></keycombo></entry> -<entry>Lock Session</entry> +<entry><keycombo action="simul">&Ctrl;&Alt;<keycap>L</keycap></keycombo></entry> +<entry>Lock Screen</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;&Alt;<keycap>Delete</keycap></keycombo></entry> -<entry>Logout</entry> +<entry><keycombo action="simul">&Ctrl;&Alt;<keycap>Del</keycap></keycombo></entry> +<entry>Leave</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;&Alt;&Shift;<keycap>Delete</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;&Alt;&Shift;<keycap>Del</keycap></keycombo></entry> <entry>Logout without confirmation</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;&Alt;&Shift;<keycap>Page Down</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;&Alt;&Shift;<keycap>Page Down</keycap></keycombo></entry> <entry>Shut Down without confirmation</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;&Alt;&Shift;<keycap>Page Up</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;&Alt;&Shift;<keycap>Page Up</keycap></keycombo></entry> <entry>Reboot without confirmation</entry> </row> @@ -1944,18 +1949,17 @@ <title>Modifying Shortcuts</title> <para>The shortcuts described in <link linkend="kbd-windows">Working With -Windows</link>, <link linkend="kbd-leaving">Leaving Your Computer</link>, and -<link linkend="kbd-vol-bright">Changing Volume and Brightness</link> are called +Windows</link>, <link linkend="kbd-leaving">Leaving Your Computer</link>, +<link linkend="kbd-vol-bright">Changing Volume and Brightness</link> and +<link linkend="kbd-activities">Working with +Activities and Virtual Desktops</link> are called <emphasis>global shortcuts</emphasis>, since they work regardless of which window you have open on your screen. These can be modified in the <ulink url="help:/kcontrol/keys/">Global Shortcuts panel of &systemsettings;</ulink>, where they are separated by &kde; component.</para> -<para>The shortcuts described in <link linkend="kbd-activities">Working with -Activities and Virtual Desktops</link> and <link linkend="kbd-desktop">Working -with the Desktop</link> can be modified by clicking on the -<ulink url="help:/plasma-desktop/using-kapp.html">Desktop Toolbox</ulink> and -selecting <guimenuitem>Shortcut Settings</guimenuitem>.</para> +<para>The shortcuts described <link linkend="kbd-desktop">Working +with the Desktop</link> are immutable and cannot be modified.</para> <para>The shortcuts described in <link linkend="kbd-docs">Working with Documents</link> and <link linkend="kbd-help">Getting Help</link> are set by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/doc/khelpcenter/index.docbook new/khelpcenter-16.08.0/doc/khelpcenter/index.docbook --- old/khelpcenter-16.04.3/doc/khelpcenter/index.docbook 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/doc/khelpcenter/index.docbook 2016-08-06 13:08:24.000000000 +0200 @@ -1,7 +1,6 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "customization/dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&khelpcenter;"> <!ENTITY % English "INCLUDE" >  <!ENTITY % addindex "IGNORE"> ]> @@ -14,8 +13,8 @@  </authorgroup> <legalnotice>&FDLNotice;</legalnotice> -<date>2015-07-24</date> -<releaseinfo>Plasma 5.4</releaseinfo> +<date>2016-04-17</date> +<releaseinfo>Applications 16.04</releaseinfo> <abstract> <para> @@ -40,23 +39,21 @@ </keywordset> </bookinfo> - - <chapter id="help-system-handbook"> <title>&kde; Help System Handbook</title> <anchor id="help"/> <sect1 id="help-introduction"> -<title>&plasma; Help System</title> +<title>Help System</title> -<para>The &plasma; help system is designed to make accessing the common +<para>The help system is designed to make accessing the common &UNIX; help systems (<application>man</application> and -<application>info</application>) simple, as well as the native &plasma; and applications -documentation (&XML;). +<application>info</application>) simple, as well as the user documentation of +applications including &plasma-workspaces; from the &kde; community (&XML;). </para> <para> -All &plasma; workspace and base &kde; applications come fully documented, thanks to the efforts of the +All applications (including &plasma-workspaces;) from the &kde; community come fully documented, thanks to the efforts of the Documentation team. If you are interested in helping with the documentation efforts, join the <ulink url="https://mail.kde.org/mailman/listinfo/kde-doc-english">mailing @@ -74,7 +71,7 @@ <title>Installation</title> <para> -&khelpcenter; is a part of the &plasma; workspace. +&khelpcenter; is a part of the &applications;. It can be found on the <ulink url="http://download.kde.org/"> download site</ulink> of the &kde; project, or will be found in your operating system's &khelpcenter; package. @@ -108,12 +105,13 @@ </varlistentry> <varlistentry> -<term>From the Kickoff Application Launcher</term> +<term>From the Application Launcher</term> <listitem> <para> -Choose the big <guiicon>K</guiicon> in your panel, and select the -<guimenuitem>Applications</guimenuitem> tab followed by selecting -<guimenuitem>Help</guimenuitem> to open &khelpcenter;, which will open up to the +Choose the big <guiicon>K</guiicon> in your panel, and select +<guimenuitem>Help</guimenuitem> from the <guimenuitem>Applications</guimenuitem> tab +or type <userinput>help</userinput> followed by selecting +<guimenuitem>Help</guimenuitem>. This will open &khelpcenter; with the default start page. </para> </listitem> @@ -227,11 +225,12 @@ </para> <para> -The contents pane is further divided into two +The contents pane is further divided into three tabs, one containing a <link linkend="contents-tab">tree view</link> showing all the help information &khelpcenter; is aware of, and the other contains the &kde; <link linkend="kde-glossary">glossary</link> of terms. +On the third tab you can configure the <guilabel>Search Options</guilabel>. </para> <sect3 id="contents-tab"> @@ -245,10 +244,10 @@ <variablelist> <varlistentry> -<term><guilabel>&kde; Fundamentals</guilabel></term> +<term><guilabel>Fundamentals</guilabel></term> <listitem> -<para>The Fundamentals introduce you to the many features of the &kde; Software Collection and -describe many common tasks you can perform in all &kde; applications. +<para>The Fundamentals introduce you to the many features of the &plasma-workspaces; and &applications; and +describe many common tasks you can perform in all &applications;. </para> </listitem> </varlistentry> @@ -257,8 +256,7 @@ <term><guilabel>Plasma Manual</guilabel></term> <listitem> <para> -The &plasma; Manual is the documentation for the most visible pillar of &kde;, -the core interface to the desktop. +The &plasma; Manual is the documentation for the &plasma-workspaces;. </para> </listitem> </varlistentry> @@ -290,11 +288,11 @@ </varlistentry> <varlistentry> -<term><guilabel>Control Center Modules</guilabel></term> +<term><guilabel>Settings Modules</guilabel> entities</term> <listitem> <para> -Provides a list of links to various modules that are located in the &kde; -&systemsettings; application. +Provide a list of links to various modules in the &systemsettings; application or +to modules for &konqueror;, Filemanager or Browser. </para> </listitem> </varlistentry> @@ -351,9 +349,9 @@ </variablelist> </sect3> - <para>The options available are:</para> @@ -411,28 +413,17 @@ search.</para></listitem> </varlistentry> <varlistentry> -<term><guilabel>Format</guilabel></term> -<listitem><para>Decide if you want just a short link to the page -containing your search terms, or do you want a longer -summary.</para></listitem> -</varlistentry> -<varlistentry> -<term><guilabel>Sort</guilabel></term> -<listitem><para>Sort the results in order of <guilabel>Score</guilabel> (how -closely your search terms were matched,) alphabetically by -<guilabel>Title</guilabel> or by <guilabel>Date</guilabel>. Selecting the -<guilabel>Reverse order</guilabel> check box, naturally enough, reverses the -sort order of the results.</para></listitem> -</varlistentry> -<varlistentry> -<term><guilabel>Update index</guilabel></term> -<listitem><para>Update the search index, to incorporate new documents, -or if you think your database is incomplete or damaged. This may take -some time.</para></listitem> +<term><guilabel>Scope selection</guilabel></term> +<listitem><para>This is used to select the sections where the search will be done. +The available options quickly select the most common option, while +<guimenuitem>Custom</guimenuitem> allows one to select single sections. +</para></listitem> </varlistentry> + </variablelist> + </sect3> ---> + </sect2> @@ -801,49 +792,66 @@ entry.</para> </listitem> </varlistentry> - </variablelist> </listitem> </varlistentry> </variablelist> +<variablelist id="bookmarks-menu"> + +<varlistentry> +<term><guimenu>Bookmarks</guimenu></term> +<listitem> <variablelist> <varlistentry> -<term><guimenu>Settings</guimenu></term> +<term><menuchoice> +<shortcut><keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo></shortcut> +<guimenu>Bookmarks</guimenu> +<guimenuitem>Add Bookmark</guimenuitem></menuchoice></term> <listitem> +<para> +Add a bookmark for the current page, the title of the pages is appended to the bookmarks menu. +Use the action <guimenuitem>Delete Bookmark</guimenuitem> in the context menu of an item to remove it from the menu. +</para> +</listitem> +</varlistentry> -<variablelist> <varlistentry> -<term> -<menuchoice> -<guimenu>Settings</guimenu> -<guimenuitem>Configure Fonts...</guimenuitem> -</menuchoice> -</term> +<term><menuchoice> +<guimenu>Bookmarks</guimenu> +<guimenuitem>New Bookmarks Folder</guimenuitem></menuchoice></term> <listitem> <para> -Allows you to configure the font family and size used by &khelpcenter;. +Open the <guilabel>New Folder</guilabel> dialog where you can add new submenuitems to the bookmarks menu. </para> </listitem> </varlistentry> - </variablelist> </listitem> </varlistentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/doc/onlinehelp/index.docbook new/khelpcenter-16.08.0/doc/onlinehelp/index.docbook --- old/khelpcenter-16.04.3/doc/onlinehelp/index.docbook 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/doc/onlinehelp/index.docbook 2016-08-06 13:08:24.000000000 +0200 @@ -8,8 +8,8 @@ <title>Online Help</title> <articleinfo> -<date>2010-05-13</date> -<releaseinfo>&kde; 4.5</releaseinfo> +<date>2016-04-17</date> +<releaseinfo>Applications 16.04</releaseinfo> </articleinfo> @@ -88,9 +88,10 @@ <ulink url="http://docs.kde.org/">KDE Documentation site</ulink> </term> <listitem> <para>This page holds the complete KDE User Documentation in over 25 languages -for the released and the development version of KDE SC.</para> +for the released and the development version of &kde-frameworks;, &plasma-workspaces; +and &applications;.</para> </listitem> </varlistentry> </variablelist> -</article> \ No newline at end of file +</article> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/docentry.h new/khelpcenter-16.08.0/docentry.h --- old/khelpcenter-16.04.3/docentry.h 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/docentry.h 2016-08-06 13:08:24.000000000 +0200 @@ -97,18 +97,19 @@ mutable QString mIdentifier; QString mIndexer; QString mIndexTestFile; - int mWeight; QString mSearchMethod; - bool mSearchEnabled; - bool mSearchEnabledDefault; QString mDocumentType; - bool mDirectory; QString mKhelpcenterSpecial; List mChildren; DocEntry *mParent; DocEntry *mNextSibling; + + int mWeight; + bool mSearchEnabled : 1; + bool mSearchEnabledDefault : 1; + bool mDirectory : 1; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/khelpcenter.desktop new/khelpcenter-16.08.0/khelpcenter.desktop --- old/khelpcenter-16.04.3/khelpcenter.desktop 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/khelpcenter.desktop 2016-08-06 13:08:24.000000000 +0200 @@ -2,6 +2,7 @@ Name=KHelpCenter Name[af]=Khulpsentrum Name[ar]=مركز المساعدة في كدي +Name[ast]=KHelpcenter Name[be]=Цэнтр дапамогі KDE Name[be@latin]=KHelpCenter Name[bg]=Помощен център @@ -91,6 +92,7 @@ Name[zh_CN]=KHelpcenter Name[zh_TW]=KHelpCenter Comment=Help for applications +Comment[ast]=Ayuda p'aplicaciones Comment[ca]=Ajuda per les aplicacions Comment[ca@valencia]=Ajuda per les aplicacions Comment[cs]=Nápověda pro aplikace @@ -99,8 +101,10 @@ Comment[el]=Βοήθεια για τις εφαρμογές Comment[en_GB]=Help for applications Comment[es]=Ayuda de las aplicaciones +Comment[et]=Rakenduste abi Comment[fi]=Ohjeita sovellusten käyttöön Comment[gl]=Axuda de programas +Comment[ia]=Adjuta pro applicationes Comment[it]=Guida per le applicazioni Comment[nl]=Hulp voor toepassingen Comment[nn]=Hjelp for program diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/navigator.cpp new/khelpcenter-16.08.0/navigator.cpp --- old/khelpcenter-16.04.3/navigator.cpp 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/navigator.cpp 2016-08-06 13:08:24.000000000 +0200 @@ -562,7 +562,7 @@ // We have to reparse the configuration here in order to get a // language-specific StartUrl, e.g. "StartUrl[de]". cfg->reparseConfiguration(); - mHomeUrl = cfg->group("General").readPathEntry( "StartUrl", QLatin1String("khelpcenter:home") ); + mHomeUrl = QUrl(cfg->group("General").readPathEntry( "StartUrl", QLatin1String("khelpcenter:home") )); return mHomeUrl; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/navigatorappitem.cpp new/khelpcenter-16.08.0/navigatorappitem.cpp --- old/khelpcenter-16.04.3/navigatorappitem.cpp 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/navigatorappitem.cpp 2016-08-06 13:08:24.000000000 +0200 @@ -67,7 +67,7 @@ return; } - const QUrl url = entry()->url(); + const QUrl url(entry()->url()); if ( url.scheme() == QLatin1String( "help" ) ) { mToc = new TOC( this ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/org.kde.Help.appdata.xml new/khelpcenter-16.08.0/org.kde.Help.appdata.xml --- old/khelpcenter-16.04.3/org.kde.Help.appdata.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/khelpcenter-16.08.0/org.kde.Help.appdata.xml 2016-08-06 13:08:24.000000000 +0200 @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="utf-8"?> +<component type="desktop"> + <id>org.kde.Help.desktop</id> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0+</project_license> + <name>KHelpCenter</name> + <name xml:lang="ca">KHelpCenter</name> + <name xml:lang="ca-valencia">KHelpCenter</name> + <name xml:lang="cs">Centrum nápovědy</name> + <name xml:lang="de">KHelpCenter</name> + <name xml:lang="en-GB">KHelpCenter</name> + <name xml:lang="es">KHelpCenter</name> + <name xml:lang="fi">KHelpCenter</name> + <name xml:lang="it">KHelpCenter</name> + <name xml:lang="nl">KHelpCenter</name> + <name xml:lang="nn">KHelpCenter</name> + <name xml:lang="pl">KOśrodekPomocy</name> + <name xml:lang="pt">KHelpCenter</name> + <name xml:lang="sk">KHelpCenter</name> + <name xml:lang="sl">KHelpCenter</name> + <name xml:lang="sr">К‑центар-помоћи</name> + <name xml:lang="sr-Latn">K‑centar-pomoći</name> + <name xml:lang="sr-ijekavian">К‑центар-помоћи</name> + <name xml:lang="sr-ijekavianlatin">K‑centar-pomoći</name> + <name xml:lang="sv">Hjälpcentralen</name> + <name xml:lang="uk">KHelpCenter</name> + <name xml:lang="x-test">xxKHelpCenterxx</name> + <summary>Help Center</summary> + <summary xml:lang="ca">Centre d'ajuda</summary> + <summary xml:lang="ca-valencia">Centre d'ajuda</summary> + <summary xml:lang="cs">Centrum nápovědy</summary> + <summary xml:lang="de">Hilfezentrum</summary> + <summary xml:lang="en-GB">Help Centre</summary> + <summary xml:lang="es">Centro de ayuda</summary> + <summary xml:lang="fi">Ohjekeskus</summary> + <summary xml:lang="it">Centro documentazione</summary> + <summary xml:lang="nl">Hulpcentrum</summary> + <summary xml:lang="nn">Hjelpesenter</summary> + <summary xml:lang="pl">Ośrodek Pomocy</summary> + <summary xml:lang="pt">Centro de Ajuda</summary> + <summary xml:lang="sk">Pomocník KDE</summary> + <summary xml:lang="sl">Središče za pomoč</summary> + <summary xml:lang="sr">Центар помоћи</summary> + <summary xml:lang="sr-Latn">Centar pomoći</summary> + <summary xml:lang="sr-ijekavian">Центар помоћи</summary> + <summary xml:lang="sr-ijekavianlatin">Centar pomoći</summary> + <summary xml:lang="sv">Hjälpcentral</summary> + <summary xml:lang="uk">Центр довідки</summary> + <summary xml:lang="x-test">xxHelp Centerxx</summary> + <description> + + Documentation viewer + + Visualitzador de documentació + Visualitzador de documentació + Prohlížeč dokumentace + Dokumentationsbetrachter + Documentation viewer + Visor de documentación + Ohjeiden katseluohjelma + Visualizzatore della documentazione + Documentatieviewer + Hjelpetekstvising + Przeglądarka dokumentacji + Visualizador de documentação + Prehliadač dokumentácie + Pregledovalnik dokumentacije + Приказивач документације + Prikazivač dokumentacije + Приказивач документације + Prikazivač dokumentacije + Dokumentationsvisning + Програма для перегляду довідки + xxDocumentation viewerxx + Features: + Característiques: + Característiques: + Vlastnosti: + Funktionen: + Features: + Funciones: + Ominaisuuksia: + Funzionalità: + Mogelijkheden: + Funksjonar: + Możliwości: + Funcionalidades: + Funkcie: + Zmožnosti: + Могућности: + Mogućnosti: + Могућности: + Mogućnosti: + Funktioner: + Можливості: + xxFeatures:xx + <ul> + <li>Show documentation from various sources (applications from KDE community, man pages, etc)</li> + <li xml:lang="ca">Mostra la documentació de diverses fonts (aplicacions de la comunitat KDE, pàgines «man», etc.)</li> + <li xml:lang="ca-valencia">Mostra la documentació de diverses fonts (aplicacions de la comunitat KDE, pàgines «man», etc.)</li> + <li xml:lang="de">Dokumentation aus unterschiedlichen Quellen anzeigen (KDE-Anwendungen, Man-Pages usw.)</li> + <li xml:lang="en-GB">Show documentation from various sources (applications from KDE community, man pages, etc)</li> + <li xml:lang="es">Mostrar documentación de diversas fuentes (aplicaciones de la comunidad KDE, páginas man, etc.)</li> + <li xml:lang="fi">Katsele ohjeita useista lähteistä (KDE-yhteisön sovelluksista, man-sivuista jne.)</li> + <li xml:lang="it">Mostra la documentazione da varie fonti (applicazioni dalla comunità KDE, pagine di manuale, ecc)</li> + <li xml:lang="nl">Toon documentatie uit verschillende bronnen (toepassingen uit de KDE gemeenschap, manpagina's, etc)</li> + <li xml:lang="nn">Vis hjelpetekstar frå ulike kjelder (KDE-program, man-sider o.l.)</li> + <li xml:lang="pl">Wyświetlanie dokumentacji z różnych źródeł (aplikacje ze społeczności KDE, strony instrukcji, itp.)</li> + <li xml:lang="pt">Mostra a documentação de várias fontes (aplicações das comunidades do KDE, páginas de manual do 'man', etc.)</li> + <li xml:lang="sk">Zobraziť dokumentáciu z rôznych zdrojov (aplikácie z KDE komunity, man stránky atď.)</li> + <li xml:lang="sl">Pokaže dokumentacijo iz različnih virov (programov skupnosti KDE, strani man, itd.)</li> + <li xml:lang="sr">приказ документације из различитих извора (програми заједнице КДЕ, упутне странице, итд.)</li> + <li xml:lang="sr-Latn">prikaz dokumentacije iz različitih izvora (programi zajednice KDE, uputne stranice, itd.)</li> + <li xml:lang="sr-ijekavian">приказ документације из различитих извора (програми заједнице КДЕ, упутне странице, итд.)</li> + <li xml:lang="sr-ijekavianlatin">prikaz dokumentacije iz različitih izvora (programi zajednice KDE, uputne stranice, itd.)</li> + <li xml:lang="sv">Visa dokumentation från olika källor (program från KDE-gemenskapen, manualsidor, etc.)</li> + <li xml:lang="uk">Показ документації з різних джерел (програми спільноти KDE, сторінки man тощо)</li> + <li xml:lang="x-test">xxShow documentation from various sources (applications from KDE community, man pages, etc)xx</li> + <li>Search through the available documentation</li> + <li xml:lang="ca">Cerca a la documentació disponible</li> + <li xml:lang="ca-valencia">Cerca a la documentació disponible</li> + <li xml:lang="de">Die verfügbare Dokumentation durchsuchen</li> + <li xml:lang="en-GB">Search through the available documentation</li> + <li xml:lang="es">Buscar en la documentación disponible</li> + <li xml:lang="fi">Etsi saatavilla olevista ohjeista</li> + <li xml:lang="it">Cerca nella documentazione disponibile</li> + <li xml:lang="nl">Zoeken in de beschikbare documentatie</li> + <li xml:lang="nn">Søk gjennom tilgjengelege hjelpetekstar</li> + <li xml:lang="pl">Wyszukiwanie w dostępnej dokumentacji</li> + <li xml:lang="pt">Pesquisa pela documentação disponível</li> + <li xml:lang="sk">Prehľadávať v dostupnej dokumentácii</li> + <li xml:lang="sl">Iščite po razpoložljivi dokumentaciji</li> + <li xml:lang="sr">тражење кроз доступну документацију</li> + <li xml:lang="sr-Latn">traženje kroz dostupnu dokumentaciju</li> + <li xml:lang="sr-ijekavian">тражење кроз доступну документацију</li> + <li xml:lang="sr-ijekavianlatin">traženje kroz dostupnu dokumentaciju</li> + <li xml:lang="sv">Sök igenom tillgänglig dokumentation</li> + <li xml:lang="uk">Пошук у доступній документації</li> + <li xml:lang="x-test">xxSearch through the available documentationxx</li> + </ul> + </description> + <screenshots> + <screenshot type="default"> + <image width="1920" height="1044">http://kde.org/images/screenshots/khelpcenter.png</image> + </screenshot> + </screenshots> + <url type="homepage">http://kde.org/applications/utilities/khelpcenter/</url> + <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=khelpcenter</url> + <project_group>KDE</project_group> + <provides> + <binary>khelpcenter</binary> + </provides> +</component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/org.kde.Help.desktop new/khelpcenter-16.08.0/org.kde.Help.desktop --- old/khelpcenter-16.04.3/org.kde.Help.desktop 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/org.kde.Help.desktop 2016-08-06 13:08:24.000000000 +0200 @@ -98,17 +98,21 @@ Name[xh]=Uncedo Name[x-test]=xxHelpxx Name[zh_CN]=帮助 -Name[zh_TW]=說明 +Name[zh_TW]=求助 GenericName=Help Center +GenericName[ast]=Centru d'ayuda GenericName[ca]=Centre d'ajuda GenericName[ca@valencia]=Centre d'ajuda GenericName[cs]=Centrum nápovědy GenericName[da]=Hjælpecenter GenericName[de]=Hilfezentrum +GenericName[el]=Κέντρο αρωγής GenericName[en_GB]=Help Centre GenericName[es]=Centro de ayuda +GenericName[et]=Abikeskus GenericName[fi]=Ohjekeskus GenericName[gl]=Centro de axuda +GenericName[ia]=Centro de Adjuta GenericName[it]=Centro documentazione GenericName[nl]=Helpcentrum GenericName[nn]=Hjelpesenter @@ -126,17 +130,20 @@ GenericName[uk]=Центр довідки GenericName[x-test]=xxHelp Centerxx GenericName[zh_CN]=帮助中心 -GenericName[zh_TW]=說明中心 +GenericName[zh_TW]=輔助中心 Comment=Browse and search documentation Comment[ca]=Explora i cerca documentació Comment[ca@valencia]=Explora i cerca documentació Comment[cs]=Procházejte a prohledávejte dokumentaci Comment[da]=Gennemse og søg i dokumentationen Comment[de]=Dokumentation lesen und durchsuchen +Comment[el]=Περιήγηση και αναζήτηση στην τεκμηρίωση Comment[en_GB]=Browse and search documentation Comment[es]=Explorar y buscar documentación +Comment[et]=Dokumentatsiooni sirvimine ja otsimine Comment[fi]=Selaa dokumentaatiota ja etsi sieltä Comment[gl]=Explorar e buscar na documentación +Comment[ia]=Naviga e cerca in le documentation Comment[it]=Sfoglia e cerca nella documentazione Comment[nl]=Blader in en doorzoek documentatie Comment[nn]=Søk og bla gjennom hjelpetekstar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/plugins/browsercontrolmodules.desktop new/khelpcenter-16.08.0/plugins/browsercontrolmodules.desktop --- old/khelpcenter-16.04.3/plugins/browsercontrolmodules.desktop 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/plugins/browsercontrolmodules.desktop 2016-08-06 13:08:24.000000000 +0200 @@ -9,6 +9,7 @@ Name[el]=Αρθρώματα ρυθμίσεων του περιηγητή Name[en_GB]=Browser Settings Modules Name[es]=Módulos de preferencias del navegador +Name[et]=Brauseriseadistuste moodulid Name[eu]=Arakatzaile-ezarpenen moduluak Name[fa]=مرور پیمانه‌های تنظیمات Name[fi]=Selaimen asetusosiot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/plugins/filemanagercontrolmodules.desktop new/khelpcenter-16.08.0/plugins/filemanagercontrolmodules.desktop --- old/khelpcenter-16.04.3/plugins/filemanagercontrolmodules.desktop 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/plugins/filemanagercontrolmodules.desktop 2016-08-06 13:08:24.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Filemanager Settings Modules +Name[ast]=Módulos d'axustes del xestor de ficheros Name[bs]=UpraviteljDatotekom postavke modula Name[ca]=Mòduls de configuració del gestor de fitxers Name[ca@valencia]=Mòduls de configuració del gestor de fitxers @@ -9,6 +10,7 @@ Name[el]=Αρθρώματα ρυθμίσεων του διαχειριστή αρχείων Name[en_GB]=Filemanager Settings Modules Name[es]=Módulos de preferencias del gestor de archivos +Name[et]=Failihalduri seadistuste moodulid Name[eu]=Fitxategi-kudeatzaile-ezarpenen moduluak Name[fa]=پیمانه‌های تنظیمات مدیر پنجره Name[fi]=Tiedostonhallinnan asetusosiot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/plugins/fundamentals.desktop new/khelpcenter-16.08.0/plugins/fundamentals.desktop --- old/khelpcenter-16.04.3/plugins/fundamentals.desktop 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/plugins/fundamentals.desktop 2016-08-06 13:08:24.000000000 +0200 @@ -10,8 +10,10 @@ Name[el]=Βασικά Name[en_GB]=Fundamentals Name[es]=Fundamentos +Name[et]=Põhialused Name[fi]=Perusasiat Name[gl]=Esenciais +Name[ia]=Essentiales Name[it]=Fondamentali Name[nl]=Fundamentals Name[nn]=Det grunnleggjande diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/plugins/kcontrolmodules.desktop new/khelpcenter-16.08.0/plugins/kcontrolmodules.desktop --- old/khelpcenter-16.04.3/plugins/kcontrolmodules.desktop 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/plugins/kcontrolmodules.desktop 2016-08-06 13:08:24.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=System Settings Modules +Name[ast]=Módulos d'axustes del sistema Name[bs]=Moduli sistmskih postavki Name[ca]=Mòduls de configuració del sistema Name[ca@valencia]=Mòduls de configuració del sistema @@ -9,6 +10,7 @@ Name[el]=Αρθρώματα ρυθμίσεων του συστήματος Name[en_GB]=System Settings Modules Name[es]=Módulos de preferencias del sistema +Name[et]=Süsteemi seadistuste moodulid Name[eu]=Sistema-ezarpenen moduluak Name[fa]=پیمانه‌های تنظیمات سیستم Name[fi]=Järjestelmäasetusosiot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/plugins/konquerorcontrolmodules.desktop new/khelpcenter-16.08.0/plugins/konquerorcontrolmodules.desktop --- old/khelpcenter-16.04.3/plugins/konquerorcontrolmodules.desktop 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/plugins/konquerorcontrolmodules.desktop 2016-08-06 13:08:24.000000000 +0200 @@ -9,6 +9,7 @@ Name[el]=Αρθρώματα ρυθμίσεων του Konqueror Name[en_GB]=Konqueror Settings Modules Name[es]=Módulos de preferencias de Konqueror +Name[et]=Konquerori seadistuste moodulid Name[eu]=Konqueror-ezarpenen moduluak Name[fa]=پیمانه‌های تنظیمات کانکرر Name[fi]=Konquerorin asetusosiot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/plugins/othercontrolmodules.desktop new/khelpcenter-16.08.0/plugins/othercontrolmodules.desktop --- old/khelpcenter-16.04.3/plugins/othercontrolmodules.desktop 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/plugins/othercontrolmodules.desktop 2016-08-06 13:08:24.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Other Settings Modules +Name[ast]=Otros módulos d'axustes Name[bs]=Moduli ostalih postavki Name[ca]=Altres mòduls de configuració Name[ca@valencia]=Altres mòduls de configuració @@ -9,6 +10,7 @@ Name[el]=Λοιπά αρθρώματα ρυθμίσεων Name[en_GB]=Other Settings Modules Name[es]=Módulos de otras preferencias +Name[et]=Muude seadistuste moodulid Name[eu]=Beste ezarpen batzuen moduluak Name[fa]=پیمانه‌های تنظیمات دیگر Name[fi]=Muut asetusosiot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khelpcenter-16.04.3/searchengine.cpp new/khelpcenter-16.08.0/searchengine.cpp --- old/khelpcenter-16.04.3/searchengine.cpp 2016-06-26 16:25:38.000000000 +0200 +++ new/khelpcenter-16.08.0/searchengine.cpp 2016-08-06 13:08:24.000000000 +0200 @@ -1,8 +1,6 @@ #include "searchengine.h" -#include <QMessageBox> - #include "docmetainfo.h" #include "view.h" #include "searchhandler.h" @@ -209,7 +207,7 @@ khcDebug() << "SearchEngine::initSearchHandlers(): " << filename; QSharedPointer<SearchHandler> handler( SearchHandler::initFromFile( filename ) ); if ( !handler ) { - QMessageBox::warning( mView->widget(), i18n("Handler"), i18n("Unable to initialize SearchHandler from file '%1'.", filename ) ); + khcWarning() << "Unable to initialize SearchHandler from" << filename; } else { QStringList documentTypes = handler->documentTypes(); QStringList::ConstIterator it;

1 0

commit juk for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package juk for openSUSE:Factory checked in at 2016-08-31 00:06:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/juk (Old) and /work/SRC/openSUSE:Factory/.juk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "juk" Changes: -------- --- /work/SRC/openSUSE:Factory/juk/juk.changes 2016-07-24 19:44:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.juk.new/juk.changes 2016-08-31 00:06:29.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:04:00 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:36:47 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- juk-16.04.3.tar.xz New: ---- juk-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ juk.spec ++++++ --- /var/tmp/diff_new_pack.8U6KxI/_old 2016-08-31 00:06:30.000000000 +0200 +++ /var/tmp/diff_new_pack.8U6KxI/_new 2016-08-31 00:06:30.000000000 +0200 @@ -25,7 +25,7 @@ License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ juk-16.04.3.tar.xz -> juk-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-16.04.3/collectionlist.cpp new/juk-16.08.0/collectionlist.cpp --- old/juk-16.04.3/collectionlist.cpp 2016-06-19 08:29:58.000000000 +0200 +++ new/juk-16.08.0/collectionlist.cpp 2016-07-12 00:12:01.000000000 +0200 @@ -350,6 +350,9 @@ m_columnTags[PlaylistItem::ArtistColumn] = new TagCountDict; m_columnTags[PlaylistItem::AlbumColumn] = new TagCountDict; m_columnTags[PlaylistItem::GenreColumn] = new TagCountDict; + + // Even set to true it wouldn't work with this class due to other checks + setAllowDuplicates(false); } CollectionList::~CollectionList() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-16.04.3/dynamicplaylist.cpp new/juk-16.08.0/dynamicplaylist.cpp --- old/juk-16.04.3/dynamicplaylist.cpp 2016-06-19 08:29:58.000000000 +0200 +++ new/juk-16.08.0/dynamicplaylist.cpp 2016-07-12 00:12:01.000000000 +0200 @@ -55,6 +55,7 @@ if(setupPlaylist) collection->setupPlaylist(this, iconName); setName(name); + setAllowDuplicates(false); setSorting(columns() + 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-16.04.3/folderplaylist.cpp new/juk-16.08.0/folderplaylist.cpp --- old/juk-16.04.3/folderplaylist.cpp 2016-06-19 08:29:58.000000000 +0200 +++ new/juk-16.08.0/folderplaylist.cpp 2016-07-12 00:12:01.000000000 +0200 @@ -29,6 +29,7 @@ Playlist(collection, name, "folder"), m_folder(folder) { + setAllowDuplicates(false); QTimer::singleShot(0, this, SLOT(slotReload())); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-16.04.3/juk.appdata.xml new/juk-16.08.0/juk.appdata.xml --- old/juk-16.04.3/juk.appdata.xml 2016-06-19 08:29:58.000000000 +0200 +++ new/juk-16.08.0/juk.appdata.xml 2016-07-12 00:12:01.000000000 +0200 @@ -55,6 +55,7 @@ <summary xml:lang="fr">Lecteur de musique</summary> <summary xml:lang="gl">Reprodutor de música</summary> <summary xml:lang="hu">Zenelejátszó</summary> + <summary xml:lang="ia">Executor de musica</summary> <summary xml:lang="it">Lettore musicale</summary> <summary xml:lang="ko">음악 재생기</summary> <summary xml:lang="nds">Musikafspeler</summary> @@ -122,6 +123,7 @@ Fonctionnalités : Funcionalidades: Szolgáltatások: + Characteristicas: Funzionalità: 기능: Markmalen: @@ -155,6 +157,7 @@ <li xml:lang="fr">Listes de collections et listes de lectures multiples</li> <li xml:lang="gl">Lista de coleccións e múltiplas listas de reprodución definidas polo usuario.</li> <li xml:lang="hu">Gyűjteménylista és több felhasználó által megadott lejátszólista</li> + <li xml:lang="ia">Lista de collection e multiple listas de reproduction definite per le usator</li> <li xml:lang="it">Elenco di raccolte e scalette multiple definite dall'utente</li> <li xml:lang="ko">모음집 관리 및 사용자 정의 재생 목록</li> <li xml:lang="nds">Sammelnlist un en Reeg Bruker-Afspeellisten</li> @@ -187,6 +190,7 @@ <li xml:lang="fr">Peut parcourir les dossiers pour importer automatiquement les listes de lecture et fichiers musicaux au démarrage</li> <li xml:lang="gl">Pode explorar cartafoles para importar automaticamente listas de reprodución e ficheiros de música ao iniciar o programa.</li> <li xml:lang="hu">Könyvtárak átvizsgálásának képessége zenefájlok és lejátszólisták automatikus importálásához a program indulásakor</li> + <li xml:lang="ia">habilitate de scander directorios pro importar automaticamente listas de reproduction e files de musica quando on initia</li> <li xml:lang="it">Capacità di scansionare cartelle per importare automaticamente scalette e file musicali all'avvio</li> <li xml:lang="ko">시작 시 디렉터리를 검사하여 자동으로 재생 목록과 음악 파일 가져오기</li> <li xml:lang="nds">Kann Ornern bi't Starten automaatsch op Afspeellisten un Musikdateien dörkieken</li> @@ -219,6 +223,7 @@ <li xml:lang="fr">Des listes de lecture à recherche dynamique qui sont mises à jour automatiquement alors que les champs dans la collection changent</li> <li xml:lang="gl">Busca dinámica de listas de reprodución que se actualizan automaticamente tras cambias campos da colección.</li> <li xml:lang="hu">Lejátszólisták dinamikus keresése, amelyek automatikusan frissítésre kerülnek mezőkként a gyűjtemény módosításban</li> + <li xml:lang="ia">Listas de reproduction de cerca dynamic que es automaticamente actualisate como campos in le modification de collection</li> <li xml:lang="it">Scalette a ricerca dinamica, aggiornate automaticamente al cambiare dei campi nella raccolta</li> <li xml:lang="ko">모음집 필드 변경 사항에 따라 자동으로 업데이트되는 동적 재생 목록</li> <li xml:lang="nds">Dünaamsch Söök na Afspeellisten, de automaatsch topasst warrt, wenn sik Feller binnen de Sammeln ännern doot</li> @@ -251,6 +256,7 @@ <li xml:lang="fr">Un mode d'aperçu en arbre dans lequel les listes de lecture sont générées automatiquement pour des ensembles d'albums, d'artistes et de genres</li> <li xml:lang="gl">Un modo de vista de árbore onde se xeran automaticamente listas de reprodución para grupos de albums, intérpretes e estilos.</li> <li xml:lang="hu">Egy fanézet mód, ahol a lejátszólisták automatikusan kerülnek előállításra albumok, előadók és műfajok halmazához</li> + <li xml:lang="ia">Un modo de vista a arbore ubi le listas de reproduction es generate automaticamente pro insimul de albums, artistas e generes</li> <li xml:lang="it">Modalità di vista ad albero in cui le scalette sono automaticamente generate per insiemi di album, artisti o generi</li> <li xml:lang="ko">음악가, 앨범, 장르별 자동 생성 트리 보기 모드</li> <li xml:lang="nds">En Boomansicht, över de sik Afspeellisten automaatsch för Setten vun Albums, Künstlers un Musikoorden opstellen laat</li> @@ -283,6 +289,7 @@ <li xml:lang="fr">Historique de la liste de lecture pour indiquer quels fichiers ont été joués et quand</li> <li xml:lang="gl">Historial de listas re reprodución para indicar que ficheiros se reproduciron e cando.</li> <li xml:lang="hu">Lejátszólista előzmények annak jelölésére, hogy mely fájlok lettek már lejátszva és mikor</li> + <li xml:lang="ia">Chronologia de lista de reproduction per indicar qual files ha essite reproducite e quando</li> <li xml:lang="it">Cronologia delle scalette per indicare quali file sono stati letti e quando</li> <li xml:lang="ko">재생 목록 내 파일의 재생 이력 관리</li> <li xml:lang="nds">Afspeellist-Vörgeschicht, över de sik wiesen lett, welk Dateien Du wannehr afspeelt hest</li> @@ -315,6 +322,7 @@ <li xml:lang="fr">Recherche en ligne pour filtrer la liste des éléments visibles</li> <li xml:lang="gl">Permite filtrar a lista de elementos visíbeis mediante termos de busca.</li> <li xml:lang="hu">Beágyazott keresés a látható elemek listájának szűréséhez</li> + <li xml:lang="ia">cerca interne pro filtrar le lista de elementos visibile</li> <li xml:lang="it">Ricerca in linea per filtrare l'elenco di elementi visibili</li> <li xml:lang="ko">재생 목록 내 빠른 검색</li> <li xml:lang="nds">Binnenreegs-Söök, mit de sik de List vun sichtbor Indrääg filtern lett</li> @@ -347,6 +355,7 @@ <li xml:lang="fr">Possibilité de deviner les informations de balise basées sur le nom du fichier</li> <li xml:lang="gl">Pode deducir información das etiquetas a partir do nome do ficheiro da pista de música.</li> <li xml:lang="hu">Címkeinformációk kitalálásának képessége a szám fájlneve alapján</li> + <li xml:lang="ia">Le habilitate de conjecturar information de etiquetta basate sur le nomine de file del tracia</li> <li xml:lang="it">Capacità di indovinare informazioni per le etichette in base al nome del file audio</li> <li xml:lang="ko">파일 이름을 기반으로 한 태그 내용 추측</li> <li xml:lang="nds">Kann Slötelwöör ut dat Stück sien Dateinaam raden</li> @@ -411,6 +420,7 @@ <li xml:lang="fr">Prise en charge de la lecture et de la modification des balises pour de nombreux formats incluant ID3v1, ID3v2 et Ogg Vorbis</li> <li xml:lang="gl">Pode ler e editar as etiquetas de ficheiros en diversos formatos, como ID3v1, ID3v2 ou Ogg Vorbis.</li> <li xml:lang="hu">Címkeolvasás és szerkesztés támogatás számos formátumhoz, beleértve az ID3v1, az ID3v2 és az Ogg Vorbis formátumokat</li> + <li xml:lang="ia">Supporto de modification e lectura de etiquetta per multe formatos includente ID3v1, ID3v2 e Ogg Vorbis</li> <li xml:lang="it">Supporto per lettura e modifica delle etichette per molti formati, tra cui ID3v1, ID3v2 e Ogg Vorbis</li> <li xml:lang="ko">ID3v1, ID3v2, Ogg Vorbis 태그 읽기 및 쓰기 지원</li> <li xml:lang="nds">Kann Slötelwöör mit vele Formaten lesen un bewerken, so as ID3v1, ID3v2 un Ogg-Vorbis</li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-16.04.3/juk.notifyrc new/juk-16.08.0/juk.notifyrc --- old/juk-16.04.3/juk.notifyrc 2016-06-19 08:29:58.000000000 +0200 +++ new/juk-16.08.0/juk.notifyrc 2016-07-12 00:12:01.000000000 +0200 @@ -318,7 +318,6 @@ Name[gl]=JuK está no modo acoplado Name[hu]=A JuK dokkolt módban fut Name[ia]=Juck executante de modo dock -Name[is]=JuK keyrandi í tengikvíarham Name[it]=JuK in esecuzione nel vassoio di sistema Name[kk]=JuK бүктелген күйде жегілген Name[ko]=도킹 모드에서 JuK 실행 중 @@ -358,7 +357,6 @@ Comment[gl]=Use o menú contextual na bandexa do sistema para restauralo. Comment[hu]=Helyi menü használata a rendszertálcán a visszaállításhoz. Comment[ia]=Usa menu de contexto in tabuliero de systema pro restabilir. -Comment[is]=Notaðu samhengisvalmynd í kerfisbakka til að endurheimta. Comment[it]=Usa il menu contestuale nel vassoio di sistema per ripristinare. Comment[kk]=Қалпына келтіруге жүйелік сөре контекстті мәзірін пайдаланыңыз. Comment[ko]=시스템 트레이의 컨텍스트 메뉴를 사용하여 복원하십시오. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-16.04.3/main.cpp new/juk-16.08.0/main.cpp --- old/juk-16.04.3/main.cpp 2016-06-19 08:29:58.000000000 +0200 +++ new/juk-16.08.0/main.cpp 2016-07-12 00:12:01.000000000 +0200 @@ -51,8 +51,8 @@ int main(int argc, char *argv[]) { KAboutData aboutData("juk", 0, ki18n("JuK"), - "3.12.1", ki18n(description), KAboutData::License_GPL, - ki18n("© 2002–2014, Scott Wheeler, Michael Pyne, and others"), + "3.14", ki18n(description), KAboutData::License_GPL, + ki18n("© 2002–2016, Scott Wheeler, Michael Pyne, and others"), KLocalizedString(), "http://www.kde.org/applications/multimedia/juk/"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-16.04.3/mpris2/mediaplayer2.cpp new/juk-16.08.0/mpris2/mediaplayer2.cpp --- old/juk-16.04.3/mpris2/mediaplayer2.cpp 2016-06-19 08:29:58.000000000 +0200 +++ new/juk-16.08.0/mpris2/mediaplayer2.cpp 2016-07-12 00:12:01.000000000 +0200 @@ -82,7 +82,7 @@ QString MediaPlayer2::DesktopEntry() const { - return QLatin1String("kde4-juk"); + return QLatin1String("juk"); } QStringList MediaPlayer2::SupportedUriSchemes() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-16.04.3/playermanager.cpp new/juk-16.08.0/playermanager.cpp --- old/juk-16.04.3/playermanager.cpp 2016-06-19 08:29:58.000000000 +0200 +++ new/juk-16.08.0/playermanager.cpp 2016-07-12 00:12:01.000000000 +0200 @@ -570,8 +570,11 @@ if(!output) return; - if(output != m_output[m_curOutputPath]) + if(output != m_output[m_curOutputPath] || + m_output[m_curOutputPath]->isMuted() == muted) + { return; + } emit mutedChanged(muted); } @@ -583,8 +586,11 @@ if(!output) return; - if(output != m_output[m_curOutputPath]) + if(output != m_output[m_curOutputPath] || + qFuzzyCompare(m_output[m_curOutputPath]->volume(), volume)) + { return; + } emit volumeChanged(volume); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-16.04.3/playlist.cpp new/juk-16.08.0/playlist.cpp --- old/juk-16.04.3/playlist.cpp 2016-06-19 08:29:58.000000000 +0200 +++ new/juk-16.08.0/playlist.cpp 2016-07-12 00:12:01.000000000 +0200 @@ -331,7 +331,7 @@ m_collection(collection), m_fetcher(new WebImageFetcher(this)), m_selectedCount(0), - m_allowDuplicates(false), + m_allowDuplicates(true), m_applySharedSettings(true), m_columnWidthModeChanged(false), m_disableColumnWidthUpdates(true), @@ -354,7 +354,7 @@ m_collection(collection), m_fetcher(new WebImageFetcher(this)), m_selectedCount(0), - m_allowDuplicates(false), + m_allowDuplicates(true), m_applySharedSettings(true), m_columnWidthModeChanged(false), m_disableColumnWidthUpdates(true), @@ -378,7 +378,7 @@ m_collection(collection), m_fetcher(new WebImageFetcher(this)), m_selectedCount(0), - m_allowDuplicates(false), + m_allowDuplicates(true), m_applySharedSettings(true), m_columnWidthModeChanged(false), m_disableColumnWidthUpdates(true), @@ -401,7 +401,7 @@ m_collection(collection), m_fetcher(new WebImageFetcher(this)), m_selectedCount(0), - m_allowDuplicates(false), + m_allowDuplicates(true), m_applySharedSettings(true), m_columnWidthModeChanged(false), m_disableColumnWidthUpdates(true),

1 0

commit jovie for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package jovie for openSUSE:Factory checked in at 2016-08-31 00:06:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jovie (Old) and /work/SRC/openSUSE:Factory/.jovie.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jovie" Changes: -------- --- /work/SRC/openSUSE:Factory/jovie/jovie.changes 2016-07-24 19:44:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jovie.new/jovie.changes 2016-08-31 00:06:28.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:03:45 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:36:23 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- jovie-16.04.3.tar.xz New: ---- jovie-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jovie.spec ++++++ --- /var/tmp/diff_new_pack.KaOH5y/_old 2016-08-31 00:06:29.000000000 +0200 +++ /var/tmp/diff_new_pack.KaOH5y/_new 2016-08-31 00:06:29.000000000 +0200 @@ -26,7 +26,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: jovie-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ jovie-16.04.3.tar.xz -> jovie-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jovie-16.04.3/jovie/jovie.appdata.xml new/jovie-16.08.0/jovie/jovie.appdata.xml --- old/jovie-16.04.3/jovie/jovie.appdata.xml 2016-03-15 05:05:44.000000000 +0100 +++ new/jovie-16.08.0/jovie/jovie.appdata.xml 2016-06-30 05:35:40.000000000 +0200 @@ -17,6 +17,7 @@ <name xml:lang="fi">Jovie</name> <name xml:lang="fr">Jovie</name> <name xml:lang="gl">Jovie</name> + <name xml:lang="ia">Jovie</name> <name xml:lang="it">Jovie</name> <name xml:lang="ko">Jovie</name> <name xml:lang="nl">Jovie</name> @@ -47,6 +48,7 @@ <summary xml:lang="fi">KDE:n puhesyntetisaattoripalvelu</summary> <summary xml:lang="fr">Démon de synthèse vocale de KDE</summary> <summary xml:lang="gl">Servizo de texto-para-voz de KDE</summary> + <summary xml:lang="ia">Demon de texto a discurso de KDE</summary> <summary xml:lang="it">Il demone di pronuncia di KDE</summary> <summary xml:lang="ko">KDE 텍스트 음성 변환 데몬</summary> <summary xml:lang="nl">Daemon van KDE voor tekst naar spraak</summary> @@ -111,6 +113,7 @@ Ominaisuuksia käyttäjille: Fonctionnalités pour l'utilisateur : Funcionalidades para usuarios: + Characteristicas de usator: Funzionalità per gli utenti: 사용자 기능: Mogelijkheden voor de gebruiker: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jovie-16.04.3/jovie/jovie.desktop new/jovie-16.08.0/jovie/jovie.desktop --- old/jovie-16.04.3/jovie/jovie.desktop 2016-03-15 05:05:44.000000000 +0100 +++ new/jovie-16.08.0/jovie/jovie.desktop 2016-06-30 05:35:40.000000000 +0200 @@ -70,6 +70,7 @@ Name[gl]=Jovie Name[hr]=Jovie Name[hu]=Jovie +Name[ia]=Jovie Name[is]=Jovie Name[it]=Jovie Name[ja]=Jovie diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jovie-16.04.3/jovie/jovieapp.desktop new/jovie-16.08.0/jovie/jovieapp.desktop --- old/jovie-16.04.3/jovie/jovieapp.desktop 2016-03-15 05:05:44.000000000 +0100 +++ new/jovie-16.08.0/jovie/jovieapp.desktop 2016-06-30 05:35:40.000000000 +0200 @@ -24,6 +24,7 @@ Name[gl]=Jovie Name[hr]=Jovie Name[hu]=Jovie +Name[ia]=Jovie Name[is]=Jovie Name[it]=Jovie Name[ja]=Jovie diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jovie-16.04.3/jovie/kttsd.desktop new/jovie-16.08.0/jovie/kttsd.desktop --- old/jovie-16.04.3/jovie/kttsd.desktop 2016-03-15 05:05:44.000000000 +0100 +++ new/jovie-16.08.0/jovie/kttsd.desktop 2016-06-30 05:35:40.000000000 +0200 @@ -24,6 +24,7 @@ Name[gl]=Jovie Name[hr]=Jovie Name[hu]=Jovie +Name[ia]=Jovie Name[is]=Jovie Name[it]=Jovie Name[ja]=Jovie diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jovie-16.04.3/kcmkttsmgr/kcmkttsd.desktop new/jovie-16.08.0/kcmkttsmgr/kcmkttsd.desktop --- old/jovie-16.04.3/kcmkttsmgr/kcmkttsd.desktop 2016-03-15 05:05:44.000000000 +0100 +++ new/jovie-16.08.0/kcmkttsmgr/kcmkttsd.desktop 2016-06-30 05:35:40.000000000 +0200 @@ -39,6 +39,7 @@ Name[hne]=पाठ-से-वार्ता Name[hr]=Tekst u govor Name[hu]=Szövegfelolvasó +Name[ia]=Texto-a-Discurso (TextToSpeech) Name[is]=Texti-í-tal Name[it]=Pronuncia Name[ja]=テキスト読み上げ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jovie-16.04.3/libkttsd/kttsd_synthplugin.desktop new/jovie-16.08.0/libkttsd/kttsd_synthplugin.desktop --- old/jovie-16.04.3/libkttsd/kttsd_synthplugin.desktop 2016-03-15 05:05:44.000000000 +0100 +++ new/jovie-16.08.0/libkttsd/kttsd_synthplugin.desktop 2016-06-30 05:35:40.000000000 +0200 @@ -18,6 +18,7 @@ Name[gl]=Jovie Name[hr]=Jovie Name[hu]=Jovie +Name[ia]=Jovie Name[is]=Jovie Name[it]=Jovie Name[ja]=Jovie

1 0

commit granatier for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package granatier for openSUSE:Factory checked in at 2016-08-31 00:06:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/granatier (Old) and /work/SRC/openSUSE:Factory/.granatier.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "granatier" Changes: -------- --- /work/SRC/openSUSE:Factory/granatier/granatier.changes 2016-07-24 19:44:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.granatier.new/granatier.changes 2016-08-31 00:06:25.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:03:23 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:35:37 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- granatier-16.04.3.tar.xz New: ---- granatier-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ granatier.spec ++++++ --- /var/tmp/diff_new_pack.ecNxUb/_old 2016-08-31 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.ecNxUb/_new 2016-08-31 00:06:26.000000000 +0200 @@ -41,7 +41,7 @@ License: GPL-2.0+ Group: Amusements/Games/Action/Arcade Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: granatier-%{version}.tar.xz Obsoletes: %{name}5 < %{version} @@ -77,7 +77,7 @@ %{_kf5_appsdir}/granatier/ %dir %{_kf5_configkcfgdir} %{_kf5_configkcfgdir}/granatier.kcfg -%_datadir/appdata/ +%_kf5_appstreamdir/ %_kf5_kxmlguidir/granatier/ %changelog ++++++ granatier-16.04.3.tar.xz -> granatier-16.08.0.tar.xz ++++++ ++++ 6861 lines of diff (skipped)

1 0

commit filelight for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package filelight for openSUSE:Factory checked in at 2016-08-31 00:06:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/filelight (Old) and /work/SRC/openSUSE:Factory/.filelight.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "filelight" Changes: -------- --- /work/SRC/openSUSE:Factory/filelight/filelight.changes 2016-07-24 19:44:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.filelight.new/filelight.changes 2016-08-31 00:06:23.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:03:05 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:34:52 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- filelight-16.04.3.tar.xz New: ---- filelight-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ filelight.spec ++++++ --- /var/tmp/diff_new_pack.c8MNnW/_old 2016-08-31 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.c8MNnW/_new 2016-08-31 00:06:24.000000000 +0200 @@ -17,7 +17,7 @@ Name: filelight -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Graphical disk usage viewer License: GPL-2.0 or GPL-3.0 ++++++ filelight-16.04.3.tar.xz -> filelight-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/CMakeLists.txt new/filelight-16.08.0/CMakeLists.txt --- old/filelight-16.04.3/CMakeLists.txt 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/CMakeLists.txt 2016-07-02 15:21:38.000000000 +0200 @@ -36,13 +36,12 @@ include(KDECompilerSettings NO_POLICY_SCOPE) -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets) +find_package(Qt5 5.4 CONFIG REQUIRED Core Widgets) find_package(KF5 REQUIRED - KIO + XmlGui # For app + KIO # For part + Solid # For part Parts - Solid - XmlGui - CoreAddons DocTools I18n ) @@ -52,6 +51,7 @@ -DQT_USE_FAST_OPERATOR_PLUS -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII + -DQT_NO_URL_CAST_FROM_STRING ) add_definitions(-DTRANSLATION_DOMAIN=\"filelight\") Files old/filelight-16.04.3/doc/config_appear.png and new/filelight-16.08.0/doc/config_appear.png differ Files old/filelight-16.04.3/doc/config_scan.png and new/filelight-16.08.0/doc/config_scan.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/doc/index.docbook new/filelight-16.08.0/doc/index.docbook --- old/filelight-16.04.3/doc/index.docbook 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/doc/index.docbook 2016-07-02 15:21:38.000000000 +0200 @@ -1,7 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY package "kdeutils"> - <!ENTITY kappname "&filelight;"> <!ENTITY filelight "<application>Filelight</application>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> @@ -28,8 +26,8 @@ <copyright><year>2009</year><holder>Martin Sandsmark</holder></copyright>  <legalnotice>&FDLNotice;</legalnotice> - <date>2013-05-25</date> - <releaseinfo>1.20 (&kde; 4.11)</releaseinfo> + <date>2015-08-04</date> + <releaseinfo>&filelight; 1.21 (Applications 15.08)</releaseinfo> <abstract><para>&filelight; creates an interactive map of concentric segmented-rings that helps visualize disk usage on your computer.</para></abstract>  <keywordset> @@ -50,7 +48,7 @@ <textobject><phrase>Screenshot</phrase></textobject> </mediaobject> </screenshot> - <para>&filelight; allows you to quickly understand exactly where your diskspace is being used by graphically representing your file system as a set of concentric segmented-rings. You can use it to locate hotspots of disk usage and then manipulate those areas using &konqueror;.</para> + <para>&filelight; allows you to quickly understand exactly where your diskspace is being used by graphically representing your file system as a set of concentric segmented-rings. You can use it to locate hotspots of disk usage and then manipulate those areas using &dolphin; or &konqueror;.</para> </chapter> @@ -103,14 +101,12 @@ <sect1 id="starting"> <title>Starting &filelight;</title> -<para>&filelight; can be started from the K-Menu, or from the command-line</para> +<para>&filelight; can be started from the application launcher, or from the command-line</para> <sect2 id="starting-from-the-menu"> -<title>From the K-Menu</title> +<title>From the Application Launcher</title> <para> -Open the &kde; program menu by clicking on the -<guiicon>big K</guiicon> icon on your -panel. This will raise the <guimenu>program menu</guimenu>. Move your +Open the application menu and move your cursor up the menu to the <guimenu>Utilities</guimenu> menu item. Choose <guimenuitem>&filelight;</guimenuitem>. </para> @@ -170,7 +166,6 @@ </menuchoice></term> <listitem><para><action>Offers a folder selection dialog so you can choose a folder to scan.</action></para></listitem> </varlistentry> - <varlistentry> <term><menuchoice> <shortcut> @@ -190,15 +185,6 @@ <listitem><para><action>Starts a scan of the root folder.</action></para></listitem> </varlistentry> - - <varlistentry> <term><menuchoice> <shortcut> @@ -276,11 +262,6 @@ <varlistentry> <term><menuchoice> - <guimenu>Go</guimenu> <guimenuitem>Back</guimenuitem> </menuchoice></term> @@ -289,11 +270,6 @@ <varlistentry> <term><menuchoice> - <guimenu>Go</guimenu> <guimenuitem>Forward</guimenuitem> </menuchoice></term> @@ -327,21 +303,6 @@ </sect1> </chapter> - -<appendix id="installation"> - <title>Installation</title> - - <sect1 id="getting-kapp"> - <title>How to obtain &filelight;</title> - &install.intro.documentation; - </sect1> - - <sect1 id="Compilation"> - <title>Compilation and Installation</title> - &install.compile.documentation; - </sect1> -</appendix> - &documentation.index; </book> Files old/filelight-16.04.3/doc/radial_map.png and new/filelight-16.08.0/doc/radial_map.png differ Files old/filelight-16.04.3/doc/radial_map_context_menu.png and new/filelight-16.08.0/doc/radial_map_context_menu.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/misc/org.kde.filelight.desktop new/filelight-16.08.0/misc/org.kde.filelight.desktop --- old/filelight-16.04.3/misc/org.kde.filelight.desktop 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/misc/org.kde.filelight.desktop 2016-07-02 15:21:38.000000000 +0200 @@ -70,6 +70,7 @@ GenericName[fr]=Statistiques d'utilisation de disques GenericName[ga]=Staitisticí maidir le húsáid diosca GenericName[gl]=Estatísticas de uso do disco +GenericName[he]=סטטיסטיקות שימוש בכונן GenericName[hr]=Statistika o upotrebi diska GenericName[hu]=Lemezhasználati statisztika GenericName[ia]=Statisticas de uso de disco diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/app/CMakeLists.txt new/filelight-16.08.0/src/app/CMakeLists.txt --- old/filelight-16.04.3/src/app/CMakeLists.txt 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/app/CMakeLists.txt 2016-07-02 15:21:38.000000000 +0200 @@ -22,6 +22,9 @@ add_executable(filelight ${filelight_SRCS}) -target_link_libraries(filelight KF5::Parts KF5::XmlGui KF5::KIOWidgets KF5::CoreAddons) +target_link_libraries(filelight + KF5::Parts + KF5::XmlGui +) install(TARGETS filelight ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/app/historyAction.cpp new/filelight-16.08.0/src/app/historyAction.cpp --- old/filelight-16.04.3/src/app/historyAction.cpp 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/app/historyAction.cpp 2016-07-02 15:21:38.000000000 +0200 @@ -80,8 +80,8 @@ { ac->addAction(QLatin1String( "go_back" ), m_b); ac->addAction(QLatin1String( "go_forward" ), m_f); - connect(m_b, SIGNAL(triggered(bool)), SLOT(pop())); - connect(m_f, SIGNAL(triggered(bool)), SLOT(pop())); + connect(m_b, &QAction::triggered, this, &HistoryCollection::pop); + connect(m_f, &QAction::triggered, this, &HistoryCollection::pop); } void HistoryCollection::push(const QUrl& url) //slot @@ -94,7 +94,7 @@ m_receiver = m_b; } - m_receiver->push(url.path()); + m_receiver->push(url); } m_receiver = 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/app/historyAction.h new/filelight-16.08.0/src/app/historyAction.h --- old/filelight-16.04.3/src/app/historyAction.h 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/app/historyAction.h 2016-07-02 15:21:38.000000000 +0200 @@ -31,6 +31,8 @@ class HistoryAction : QAction { + Q_OBJECT + HistoryAction(const QIcon &icon, const QString &text, KActionCollection *ac); friend class HistoryCollection; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/app/main.cpp new/filelight-16.08.0/src/app/main.cpp --- old/filelight-16.04.3/src/app/main.cpp 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/app/main.cpp 2016-07-02 15:21:38.000000000 +0200 @@ -70,6 +70,7 @@ app.setApplicationVersion(QStringLiteral(APP_VERSION)); app.setOrganizationDomain(QStringLiteral("kde.org")); app.setOrganizationName(QStringLiteral("KDE")); + app.setWindowIcon(QIcon::fromTheme(QLatin1String(APP_NAME))); KAboutData::setApplicationData(about); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/app/mainWindow.cpp new/filelight-16.08.0/src/app/mainWindow.cpp --- old/filelight-16.04.3/src/app/mainWindow.cpp 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/app/mainWindow.cpp 2016-07-02 15:21:38.000000000 +0200 @@ -50,6 +50,7 @@ #include <KStandardAction> #include <KActionCollection> #include <KIO/Global> // upUrl +#include <KIO/Job> // Connection of the Part::started signal #include <KService> #include <KLocalizedString> @@ -83,12 +84,12 @@ stateChanged(QStringLiteral( "scan_failed" )); //bah! doesn't affect the parts' actions, should I add them to the actionCollection here? - connect(m_part, SIGNAL(started(KIO::Job*)), SLOT(scanStarted())); - connect(m_part, SIGNAL(completed()), SLOT(scanCompleted())); - connect(m_part, SIGNAL(canceled(QString)), SLOT(scanFailed())); + connect(m_part, &KParts::ReadOnlyPart::started, this, &MainWindow::scanStarted); + connect(m_part, static_cast<void (KParts::ReadOnlyPart::*)()>(&KParts::ReadOnlyPart::completed), this, &MainWindow::scanCompleted); + connect(m_part, &KParts::ReadOnlyPart::canceled, this, &MainWindow::scanFailed); - connect(m_part, SIGNAL(canceled(QString)), m_histories, SLOT(stop())); - connect(BrowserExtension::childObject(m_part), SIGNAL(openUrlNotify()), SLOT(urlAboutToChange())); + connect(m_part, &KParts::ReadOnlyPart::canceled, m_histories, &HistoryCollection::stop); + connect(BrowserExtension::childObject(m_part), &KParts::BrowserExtension::openUrlNotify, this, &MainWindow::urlAboutToChange); const KConfigGroup config = KSharedConfig::openConfig()->group("general"); m_combo->setHistoryItems(config.readPathEntry("comboHistory", QStringList())); @@ -157,9 +158,9 @@ m_recentScans->loadEntries(KSharedConfig::openConfig()->group("general")); - connect(m_recentScans, SIGNAL(urlSelected(QUrl)), SLOT(slotScanUrl(QUrl))); - connect(m_combo, SIGNAL(returnPressed()), SLOT(slotComboScan())); - connect(m_histories, SIGNAL(activated(QUrl)), SLOT(slotScanUrl(QUrl))); + connect(m_recentScans, &KRecentFilesAction::urlSelected, this, &MainWindow::slotScanUrl); + connect(m_combo, static_cast<void (KHistoryComboBox::*)()>(&KHistoryComboBox::returnPressed), this, &MainWindow::slotComboScan); + connect(m_histories, &HistoryCollection::activated, this, &MainWindow::slotScanUrl); } void MainWindow::closeEvent(QCloseEvent *event) @@ -270,8 +271,8 @@ action("go_up")->setToolTip(QString()); } else { - action("go_up")->setStatusTip(KIO::upUrl(url).toString()); - action("go_up")->setToolTip(KIO::upUrl(url).toString()); + action("go_up")->setStatusTip(KIO::upUrl(url).path()); + action("go_up")->setToolTip(KIO::upUrl(url).path()); } m_recentScans->addUrl(url); //FIXME doesn't set the tick diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/CMakeLists.txt new/filelight-16.08.0/src/part/CMakeLists.txt --- old/filelight-16.04.3/src/part/CMakeLists.txt 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/CMakeLists.txt 2016-07-02 15:21:38.000000000 +0200 @@ -38,6 +38,10 @@ add_library(filelightpart MODULE ${filelight_PART_SRCS}) -target_link_libraries(filelightpart KF5::Parts KF5::KIOCore KF5::KIOWidgets KF5::Solid KF5::CoreAddons KF5::Service) +target_link_libraries(filelightpart + KF5::Parts + KF5::KIOCore + KF5::Solid +) install(TARGETS filelightpart DESTINATION ${PLUGIN_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/Config.cpp new/filelight-16.08.0/src/part/Config.cpp --- old/filelight-16.04.3/src/part/Config.cpp 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/Config.cpp 2016-07-02 15:21:38.000000000 +0200 @@ -34,7 +34,7 @@ bool Config::showSmallFiles; bool Config::antialias; uint Config::contrast; -uint Config::minFontPitch; +int Config::minFontPitch; uint Config::defaultRingDepth; Filelight::MapScheme Config::scheme; QStringList Config::skipList; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/Config.h new/filelight-16.08.0/src/part/Config.h --- old/filelight-16.04.3/src/part/Config.h 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/Config.h 2016-07-02 15:21:38.000000000 +0200 @@ -47,7 +47,7 @@ static bool showSmallFiles; static uint contrast; static bool antialias; - static uint minFontPitch; + static int minFontPitch; static uint defaultRingDepth; static MapScheme scheme; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/localLister.cpp new/filelight-16.08.0/src/part/localLister.cpp --- old/filelight-16.04.3/src/part/localLister.cpp 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/localLister.cpp 2016-07-02 15:21:38.000000000 +0200 @@ -90,7 +90,7 @@ tree = 0; } qDebug() << "Emitting signal to cache results ..."; - emit branchCompleted(tree, true); + emit branchCompleted(tree); qDebug() << "Thread terminating ..."; } @@ -241,13 +241,16 @@ partition = device.as<Solid::StorageAccess>(); if (!partition->isAccessible() || partition->filePath() == QLatin1String( "/" ) || partition->filePath().isEmpty()) continue; + QString filePath = partition->filePath(); + if (!filePath.endsWith(QLatin1String("/"))) + filePath.append(QLatin1String("/")); volume = device.as<Solid::StorageVolume>(); if (remoteFsTypes.contains(volume->fsType())) { - if (!s_remoteMounts.contains(partition->filePath())) { - s_remoteMounts.append(partition->filePath()); + if (!s_remoteMounts.contains(filePath)) { + s_remoteMounts.append(filePath); } - } else if (!s_localMounts.contains(partition->filePath())) { - s_localMounts.append(partition->filePath()); + } else if (!s_localMounts.contains(filePath)) { + s_localMounts.append(filePath); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/localLister.h new/filelight-16.08.0/src/part/localLister.h --- old/filelight-16.04.3/src/part/localLister.h 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/localLister.h 2016-07-02 15:21:38.000000000 +0200 @@ -42,7 +42,7 @@ static void readMounts(); signals: - void branchCompleted(Folder* tree, bool finished); + void branchCompleted(Folder* tree); private: QString m_path; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/part.cpp new/filelight-16.08.0/src/part/part.cpp --- old/filelight-16.04.3/src/part/part.cpp 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/part.cpp 2016-07-02 15:21:38.000000000 +0200 @@ -78,7 +78,6 @@ QString(), QStringLiteral("http://utils.kde.org/projects/filelight"), QStringLiteral("martin.sandsmark(a)kde.org")); - aboutData.setProgramIconName(QStringLiteral(APP_NAME)); setComponentData(aboutData); setXMLFile(QStringLiteral( "filelightpartui.rc" )); @@ -113,18 +112,18 @@ QAction *action = actionCollection()->addAction(QStringLiteral("configure_filelight")); action->setText(i18n("Configure Filelight...")); action->setIcon(QIcon::fromTheme(QStringLiteral("configure"))); - connect(action, SIGNAL(triggered()), this, SLOT(configFilelight())); + connect(action, &QAction::triggered, this, &Part::configFilelight); - connect(m_map, SIGNAL(created(const Folder*)), SIGNAL(completed())); - connect(m_map, SIGNAL(created(const Folder*)), SLOT(mapChanged(const Folder*))); - connect(m_map, SIGNAL(activated(QUrl)), SLOT(updateURL(QUrl))); + connect(m_map, &RadialMap::Widget::folderCreated, this, static_cast<void (Part::*)()>(&Part::completed)); + connect(m_map, &RadialMap::Widget::folderCreated, this, &Part::mapChanged); + connect(m_map, &RadialMap::Widget::activated, this, &Part::updateURL); // TODO make better system - connect(m_map, SIGNAL(giveMeTreeFor(QUrl)), SLOT(updateURL(QUrl))); - connect(m_map, SIGNAL(giveMeTreeFor(QUrl)), SLOT(openUrl(QUrl))); + connect(m_map, &RadialMap::Widget::giveMeTreeFor, this, &Part::updateURL); + connect(m_map, &RadialMap::Widget::giveMeTreeFor, this, &Part::openUrl); - connect(m_manager, SIGNAL(completed(Folder*)), SLOT(scanCompleted(Folder*))); - connect(m_manager, SIGNAL(aboutToEmptyCache()), m_map, SLOT(invalidate())); + connect(m_manager, &ScanManager::completed, this, &Part::scanCompleted); + connect(m_manager, &ScanManager::aboutToEmptyCache, m_map, &RadialMap::Widget::invalidate); QTimer::singleShot(0, this, SLOT(postInit())); } @@ -227,10 +226,10 @@ void Part::configFilelight() { - QWidget *dialog = new SettingsDialog(widget()); + SettingsDialog *dialog = new SettingsDialog(widget()); - connect(dialog, SIGNAL(canvasIsDirty(int)), m_map, SLOT(refresh(int))); - connect(dialog, SIGNAL(mapIsInvalid()), m_manager, SLOT(emptyCache())); + connect(dialog, &SettingsDialog::canvasIsDirty, m_map, &RadialMap::Widget::refresh); + connect(dialog, &SettingsDialog::mapIsInvalid, m_manager, &ScanManager::emptyCache); dialog->show(); //deletes itself } @@ -240,7 +239,7 @@ { if (!m_started) { connect(m_map, SIGNAL(mouseHover(QString)), statusBar(), SLOT(showMessage(const QString&))); - connect(m_map, SIGNAL(created(const Folder*)), statusBar(), SLOT(clearMessage())); + connect(m_map, &RadialMap::Widget::folderCreated, statusBar(), &QStatusBar::clearMessage); m_started = true; } @@ -303,6 +302,11 @@ statusBar()->clearMessage(); + m_map->hide(); + m_stateWidget->hide(); + + showSummary(); + setUrl(QUrl()); } } @@ -328,7 +332,7 @@ if (m_summary == 0) { m_summary = new SummaryWidget(widget()); m_summary->setObjectName(QStringLiteral( "summaryWidget" )); - connect(m_summary, SIGNAL(activated(QUrl)), SLOT(openUrl(QUrl))); + connect(m_summary, &SummaryWidget::activated, this, &Part::openUrl); m_summary->show(); m_layout->addWidget(m_summary); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/part.h new/filelight-16.08.0/src/part/part.h --- old/filelight-16.04.3/src/part/part.h 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/part.h 2016-07-02 15:21:38.000000000 +0200 @@ -39,9 +39,12 @@ namespace Filelight { class Part; +class SummaryWidget; class BrowserExtension : public KParts::BrowserExtension { + Q_OBJECT + public: explicit BrowserExtension(Part*); }; @@ -80,7 +83,7 @@ void showSummary(); QLayout *m_layout; - QWidget *m_summary; + SummaryWidget *m_summary; BrowserExtension *m_ext; StatusBarExtension *m_statusbar; RadialMap::Widget *m_map; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/progressBox.cpp new/filelight-16.08.0/src/part/progressBox.cpp --- old/filelight-16.04.3/src/part/progressBox.cpp 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/progressBox.cpp 2016-07-02 15:21:38.000000000 +0200 @@ -22,6 +22,7 @@ #include "progressBox.h" #include "scan.h" +#include "part.h" #include <KColorScheme> #include <KIO/Job> @@ -36,9 +37,9 @@ #include <math.h> -ProgressBox::ProgressBox(QWidget *parent, QObject *part, Filelight::ScanManager *m) +ProgressBox::ProgressBox(QWidget *parent, Filelight::Part *part, Filelight::ScanManager *scanManager) : QWidget(parent) - , m_manager(m) + , m_manager(scanManager) { hide(); @@ -51,10 +52,10 @@ setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); setMinimumSize(200, 200); - connect(&m_timer, SIGNAL(timeout()), SLOT(report())); - connect(part, SIGNAL(started(KIO::Job*)), SLOT(start())); - connect(part, SIGNAL(completed()), SLOT(stop())); - connect(part, SIGNAL(canceled(QString)), SLOT(halt())); + connect(&m_timer, &QTimer::timeout, this, &ProgressBox::report); + connect(part, &Filelight::Part::started, this, &ProgressBox::start); + connect(part, static_cast<void (Filelight::Part::*)()>(&Filelight::Part::completed), this, &ProgressBox::stop); + connect(part, &Filelight::Part::canceled, this, &ProgressBox::halt); } void @@ -97,7 +98,6 @@ #define PIECES_NUM 4 static const float angleFactor[] = { -0.75, 0.5, 1.0, -0.3 }; static const int length[] = { 30, 40, 50, 60 }; -static const int angleOffset[] = { 5760, 0, 0, -5760 }; static const int aLength[] = { 300, 2000, 200, 2000 }; void ProgressBox::paintEvent(QPaintEvent*) @@ -123,9 +123,10 @@ paint.setBrush(view.background(KColorScheme::ActiveBackground)); paint.setPen(view.foreground().color()); paint.translate(0.5, 0.5); - paint.drawRoundedRect(95-m_textWidth/2, 85, m_textWidth+10, m_textHeight+10, 5, 5); + QRectF textRect(100 - m_textWidth/2 - 5, 100 - m_textHeight - 5, m_textWidth + 10, m_textHeight + 10); + paint.drawRoundedRect(textRect, 5, 5); paint.translate(-0.5, -0.5); - paint.drawText(100 - m_textWidth/2, 100, m_text); + paint.drawText(textRect, Qt::AlignCenter, m_text); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/progressBox.h new/filelight-16.08.0/src/part/progressBox.h --- old/filelight-16.04.3/src/part/progressBox.h 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/progressBox.h 2016-07-02 15:21:38.000000000 +0200 @@ -27,6 +27,7 @@ namespace Filelight { class ScanManager; +class Part; } class ProgressBox : public QWidget @@ -34,7 +35,7 @@ Q_OBJECT public: - ProgressBox(QWidget*, QObject*, Filelight::ScanManager*); + ProgressBox(QWidget *parent, Filelight::Part *part, Filelight::ScanManager *scanManager); void setText(int); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/radialMap/widget.cpp new/filelight-16.08.0/src/part/radialMap/widget.cpp --- old/filelight-16.04.3/src/part/radialMap/widget.cpp 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/radialMap/widget.cpp 2016-07-02 15:21:38.000000000 +0200 @@ -48,9 +48,8 @@ setAcceptDrops(true); setMinimumSize(350, 250); - connect(this, SIGNAL(created(const Folder*)), SLOT(sendFakeMouseEvent())); - connect(this, SIGNAL(created(const Folder*)), SLOT(update())); - connect(&m_timer, SIGNAL(timeout()), SLOT(resizeTimeout())); + connect(this, &Widget::folderCreated, this, &Widget::sendFakeMouseEvent); + connect(&m_timer, &QTimer::timeout, this, &Widget::resizeTimeout); } RadialMap::Widget::~Widget() @@ -119,7 +118,7 @@ m_tree = tree; //tell rest of Filelight - emit created(tree); + emit folderCreated(tree); } void @@ -135,6 +134,7 @@ { QMouseEvent me(QEvent::MouseMove, mapFromGlobal(QCursor::pos()), Qt::NoButton, Qt::NoButton, Qt::NoModifier); QApplication::sendEvent(this, &me); + update(); } void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/radialMap/widget.h new/filelight-16.08.0/src/part/radialMap/widget.h --- old/filelight-16.04.3/src/part/radialMap/widget.h 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/radialMap/widget.h 2016-07-02 15:21:38.000000000 +0200 @@ -82,7 +82,7 @@ signals: void activated(const QUrl&); void invalidated(const QUrl&); - void created(const Folder*); + void folderCreated(const Folder*); void mouseHover(const QString&); void giveMeTreeFor(const QUrl&); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/radialMap/widgetEvents.cpp new/filelight-16.08.0/src/part/radialMap/widgetEvents.cpp --- old/filelight-16.04.3/src/part/radialMap/widgetEvents.cpp 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/radialMap/widgetEvents.cpp 2016-07-02 15:21:38.000000000 +0200 @@ -199,98 +199,104 @@ //m_focus is set correctly (I've been strict, I assure you it is correct!) - if (m_focus && !m_focus->isFake()) - { - const QUrl url = Widget::url(m_focus->file()); - const bool isDir = m_focus->file()->isFolder(); - - // Actions in the right click menu - QAction* openFileManager = 0; - QAction* openTerminal = 0; - QAction* centerMap = 0; - QAction* openFile = 0; - QAction* copyClipboard = 0; - QAction* deleteItem = 0; - - if (e->button() == Qt::RightButton) - { - QMenu popup; - popup.setTitle(m_focus->file()->fullPath(m_tree)); - - if (isDir) { - openFileManager = popup.addAction(QIcon::fromTheme(QLatin1String("system-file-manager")), i18n("Open &File Manager Here")); - - if (url.scheme() == QLatin1String("file" )) - openTerminal = popup.addAction(QIcon::fromTheme(QLatin1String( "utilities-terminal" )), i18n("Open &Terminal Here")); - - if (m_focus->file() != m_tree) { - popup.addSeparator(); - centerMap = popup.addAction(QIcon::fromTheme(QLatin1String( "zoom-in" )), i18n("&Center Map Here")); - } - } - else - openFile = popup.addAction(QIcon::fromTheme(QLatin1String("document-open")), i18nc("Scan/open the path of the selected element", "&Open")); + if (!m_focus || m_focus->isFake()) { + return; + } - popup.addSeparator(); - copyClipboard = popup.addAction(QIcon::fromTheme(QLatin1String( "edit-copy" )), i18n("&Copy to clipboard")); + const QUrl url = Widget::url(m_focus->file()); + const bool isDir = m_focus->file()->isFolder(); + + // Open file + if (e->button() == Qt::MidButton || (e->button() == Qt::LeftButton && !isDir)) { + new KRun(url, this, true); - if (m_focus->file() != m_tree) { - popup.addSeparator(); - deleteItem = popup.addAction(QIcon::fromTheme(QLatin1String( "edit-delete" )), i18n("&Delete")); - } - - QAction* clicked = popup.exec(e->globalPos(), 0); - - if (openFileManager && clicked == openFileManager) { - KRun::runUrl(url.url(),QLatin1String( "inode/directory" ), this); - } else if (openTerminal && clicked == openTerminal) { - KToolInvocation::invokeTerminal(QString(),url.path()); - } else if (centerMap && clicked == centerMap) { - goto section_two; - } else if (openFile && clicked == openFile) { - goto section_two; - } else if (clicked == copyClipboard) { - QMimeData* mimedata = new QMimeData(); - mimedata->setUrls(QList<QUrl>() << url); - QApplication::clipboard()->setMimeData(mimedata , QClipboard::Clipboard); - } else if (clicked == deleteItem && m_focus->file() != m_tree) { - m_toBeDeleted = m_focus; - const QUrl url = Widget::url(m_toBeDeleted->file()); - const QString message = m_toBeDeleted->file()->isFolder() - ? i18n("<qt>The folder at '%1' will be recursively and permanently deleted.</qt>", url.toString()) - : i18n("<qt>'%1' will be permanently deleted.</qt>", url.toString()); - const int userIntention = KMessageBox::warningContinueCancel( - this, message, - QString(), KGuiItem(i18n("&Delete"), QLatin1String("edit-delete"))); - - if (userIntention == KMessageBox::Continue) { - KIO::Job *job = KIO::del(url); - connect(job, SIGNAL(finished(KJob*)), this, SLOT(deleteJobFinished(KJob*))); - QApplication::setOverrideCursor(Qt::BusyCursor); - setEnabled(false); - } - } else { - //ensure m_focus is set for new mouse position - sendFakeMouseEvent(); - } + return; + } + + if (e->button() == Qt::LeftButton) { + if (m_focus->file() != m_tree) { + emit activated(url); //activate first, this will cause UI to prepare itself + createFromCache((Folder *)m_focus->file()); + } else if (KIO::upUrl(url) != url) { + emit giveMeTreeFor(KIO::upUrl(url)); } - else { // not right mouse button -section_two: - const QRect rect(e->x() - 20, e->y() - 20, 40, 40); + return; + } + + if (e->button() != Qt::RightButton) { + // Ignore other mouse buttons + return; + } + + // Actions in the right click menu + QAction* openFileManager = 0; + QAction* openTerminal = 0; + QAction* centerMap = 0; + QAction* openFile = 0; + QAction* copyClipboard = 0; + QAction* deleteItem = 0; + + QMenu popup; + popup.setTitle(m_focus->file()->fullPath(m_tree)); + + if (isDir) { + openFileManager = popup.addAction(QIcon::fromTheme(QLatin1String("system-file-manager")), i18n("Open &File Manager Here")); + + if (url.scheme() == QLatin1String("file")) { + openTerminal = popup.addAction(QIcon::fromTheme(QLatin1String( "utilities-terminal" )), i18n("Open &Terminal Here")); + } + + if (m_focus->file() != m_tree) { + popup.addSeparator(); + centerMap = popup.addAction(QIcon::fromTheme(QLatin1String( "zoom-in" )), i18n("&Center Map Here")); + } + } else { + openFile = popup.addAction(QIcon::fromTheme(QLatin1String("document-open")), i18nc("Scan/open the path of the selected element", "&Open")); + } + + popup.addSeparator(); + copyClipboard = popup.addAction(QIcon::fromTheme(QLatin1String( "edit-copy" )), i18n("&Copy to clipboard")); + + if (m_focus->file() != m_tree) { + popup.addSeparator(); + deleteItem = popup.addAction(QIcon::fromTheme(QLatin1String( "edit-delete" )), i18n("&Delete")); + } + + QAction* clicked = popup.exec(e->globalPos(), 0); - if (!isDir || e->button() == Qt::MidButton) { - // KIconEffect::visualActivate(this, rect); // TODO: recreate this - new KRun(url, this, true); //FIXME see above - } - else if (m_focus->file() != m_tree) { // is left click - // KIconEffect::visualActivate(this, rect); // TODO: recreate this - emit activated(url); //activate first, this will cause UI to prepare itself - createFromCache((Folder *)m_focus->file()); - } - else if (KIO::upUrl(url) != url) - emit giveMeTreeFor(KIO::upUrl(url)); + if (openFileManager && clicked == openFileManager) { + KRun::runUrl(url, QLatin1String( "inode/directory" ), this); + } else if (openTerminal && clicked == openTerminal) { + KToolInvocation::invokeTerminal(QString(),url.path()); + } else if (centerMap && clicked == centerMap) { + emit activated(url); //activate first, this will cause UI to prepare itself + createFromCache((Folder *)m_focus->file()); + } else if (openFile && clicked == openFile) { + new KRun(url, this, true); + } else if (clicked == copyClipboard) { + QMimeData* mimedata = new QMimeData(); + mimedata->setUrls(QList<QUrl>() << url); + QApplication::clipboard()->setMimeData(mimedata , QClipboard::Clipboard); + } else if (clicked == deleteItem && m_focus->file() != m_tree) { + m_toBeDeleted = m_focus; + const QUrl url = Widget::url(m_toBeDeleted->file()); + const QString message = m_toBeDeleted->file()->isFolder() + ? i18n("<qt>The folder at '%1' will be recursively and permanently deleted.</qt>", url.toString()) + : i18n("<qt>'%1' will be permanently deleted.</qt>", url.toString()); + const int userIntention = KMessageBox::warningContinueCancel( + this, message, + QString(), KGuiItem(i18n("&Delete"), QLatin1String("edit-delete"))); + + if (userIntention == KMessageBox::Continue) { + KIO::Job *job = KIO::del(url); + connect(job, &KJob::finished, this, &RadialMap::Widget::deleteJobFinished); + QApplication::setOverrideCursor(Qt::BusyCursor); + setEnabled(false); } + } else { + //ensure m_focus is set for new mouse position + sendFakeMouseEvent(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/remoteLister.cpp new/filelight-16.08.0/src/part/remoteLister.cpp --- old/filelight-16.04.3/src/part/remoteLister.cpp 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/remoteLister.cpp 2016-07-02 15:21:38.000000000 +0200 @@ -44,22 +44,21 @@ /// location of the folder const QUrl url; /// the folder on which we are operating - Folder *folder; + Folder *folder = nullptr; /// so we can reference the parent store - Store *parent; + Store *parent = nullptr; /// directories in this folder that need to be scanned before we can propagate() List stores; - Store() : folder(0), parent(0) {} Store(const QUrl &u, const QString &name, Store *s) - : url(u), folder(new Folder(name.toUtf8() + '/')), parent(s) {} + : url(u), folder(new Folder(name.toUtf8() + '/')), parent(s) { } Store* propagate() { /// returns the next store available for scanning - qDebug() << "propagate: " << url << endl; + qDebug() << "propagate: " << url; if (parent) { parent->folder->append(folder); @@ -90,37 +89,24 @@ setMainWindow(parent); // Use SIGNAL(result(KIO::Job*)) instead and then use Job::error() - connect(this, SIGNAL(completed()), SLOT(completed())); - connect(this, SIGNAL(canceled()), SLOT(canceled())); + connect(this, static_cast<void (KCoreDirLister::*)()>(&KCoreDirLister::completed), this, &RemoteLister::completed); + connect(this, static_cast<void (KCoreDirLister::*)()>(&KCoreDirLister::canceled), this, &RemoteLister::canceled); } RemoteLister::~RemoteLister() { - Folder *tree = isFinished() ? m_store->folder : 0; - - emit branchCompleted(tree, false); delete m_root; } void -RemoteLister::completed() -{ - qDebug() << "completed: " << url().toString() << endl; - - // Delay the call to _completed since it can do a "delete this" - QTimer::singleShot(0, this, SLOT(_completed())); -} - -void RemoteLister::canceled() { - qDebug() << "canceled: " << url().toString() << endl; - - QTimer::singleShot(0, this, SLOT(_completed())); + qDebug() << "Canceled"; + emit branchCompleted(nullptr); + deleteLater(); } -void -RemoteLister::_completed() +void RemoteLister::completed() { //m_folder is set to the folder we should operate on @@ -136,10 +122,17 @@ } - if (m_store->stores.isEmpty()) + if (m_store->stores.isEmpty()) { //no directories to scan, so we need to append ourselves to the parent folder - //propagate() will return the next ancestor that has stores left to be scanned, or root if we are done - m_store = m_store->propagate(); + //propagate() will return the next ancestor that has stores left to be + //scanned, or root if we are done + Store *newStore = m_store->propagate(); + if (newStore != m_store) { + // We need to clean up old stores + delete m_store; + m_store = newStore; + } + } if (!m_store->stores.isEmpty()) { @@ -154,15 +147,16 @@ currentStore->stores.erase(first); //this returns _immediately_ - qDebug() << "scanning: " << url << endl; + qDebug() << "scanning: " << url; openUrl(url); } else { - qDebug() << "I think we're done\n"; + qDebug() << "I think we're done"; Q_ASSERT(m_root == m_store); + emit branchCompleted(m_store->folder); - delete this; + deleteLater(); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/remoteLister.h new/filelight-16.08.0/src/part/remoteLister.h --- old/filelight-16.04.3/src/part/remoteLister.h 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/remoteLister.h 2016-07-02 15:21:38.000000000 +0200 @@ -38,15 +38,14 @@ ~RemoteLister(); signals: - void branchCompleted(Folder* tree, bool finished); + void branchCompleted(Folder* tree); private slots: void completed(); - void _completed(); void canceled(); private: - class Store *m_root, *m_store; + struct Store *m_root, *m_store; ScanManager* m_manager; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/scan.cpp new/filelight-16.08.0/src/part/scan.cpp --- old/filelight-16.04.3/src/part/scan.cpp 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/scan.cpp 2016-07-02 15:21:38.000000000 +0200 @@ -42,14 +42,13 @@ , m_cache(new Chain<Folder>) { Filelight::LocalLister::readMounts(); - connect(this, SIGNAL(branchCompleted(Folder*,bool)), this, SLOT(cacheTree(Folder*,bool)), Qt::QueuedConnection); - connect(this, SIGNAL(branchCacheHit(Folder*)), this, SLOT(foundCached(Folder*)), Qt::QueuedConnection); + connect(this, &ScanManager::branchCacheHit, this, &ScanManager::foundCached, Qt::QueuedConnection); } ScanManager::~ScanManager() { if (m_thread) { - qDebug() << "Attempting to abort scan operation..." << endl; + qDebug() << "Attempting to abort scan operation..."; m_abort = true; m_thread->wait(); } @@ -70,7 +69,7 @@ //url is guaranteed clean and safe - qDebug() << "Scan requested for: " << url << endl; + qDebug() << "Scan requested for: " << url; if (running()) { qWarning() << "Tried to launch two concurrent scans, aborting old one..."; @@ -80,14 +79,24 @@ m_files = 0; m_abort = false; - if (url.isLocalFile()) { - QString path = url.toLocalFile(); + if (!url.isLocalFile()) { + QGuiApplication::changeOverrideCursor(Qt::BusyCursor); + //will start listing straight away + Filelight::RemoteLister *remoteLister = new Filelight::RemoteLister(url, (QWidget*)parent(), this); + connect(remoteLister, &Filelight::RemoteLister::branchCompleted, this, &ScanManager::cacheTree, Qt::QueuedConnection); + remoteLister->setParent(this); + remoteLister->setObjectName(QLatin1String( "remote_lister" )); + remoteLister->openUrl(url); + return true; + } + + QString path = url.toLocalFile(); - if (!path.endsWith(QDir::separator())) path += QDir::separator(); + if (!path.endsWith(QDir::separator())) path += QDir::separator(); - Chain<Folder> *trees = new Chain<Folder>; + Chain<Folder> *trees = new Chain<Folder>; - /* CHECK CACHE + /* CHECK CACHE * user wants: /usr/local/ * cached: /usr/ * @@ -95,97 +104,68 @@ * cached: /usr/local/, /usr/include/ */ - for (Iterator<Folder> it = m_cache->iterator(); it != m_cache->end(); ++it) - { - QString cachePath = (*it)->name(); - - if (path.startsWith(cachePath)) //then whole tree already scanned - { - //find a pointer to the requested branch - - qDebug() << "Cache-(a)hit: " << cachePath << endl; - -#if QT_VERSION >= 0x050400 - QVector<QStringRef> split = path.midRef(cachePath.length()).split(QLatin1Char( '/' )); -#else - QStringList split = path.mid(cachePath.length()).split(QLatin1Char( '/' )); -#endif - Folder *d = *it; - Iterator<File> jt; - - while (!split.isEmpty() && d != NULL) //if NULL we have got lost so abort!! - { - jt = d->iterator(); - - const Link<File> *end = d->end(); -#if QT_VERSION >= 0x050400 - if (split.first().isEmpty()) //found the dir - break; - QString s = split.first() % QLatin1Char( '/' ); -#else - QString s = split.first(); - if (s.isEmpty()) //found the dir - break; - s += QLatin1Char( '/' ); -#endif + for (Iterator<Folder> it = m_cache->iterator(); it != m_cache->end(); ++it) { + QString cachePath = (*it)->name(); - for (d = 0; jt != end; ++jt) - if (s == (*jt)->name()) - { - d = (Folder*)*jt; - break; - } + if (path.startsWith(cachePath)) { //then whole tree already scanned + //find a pointer to the requested branch - split.pop_front(); - } + qDebug() << "Cache-(a)hit: " << cachePath; - if (d) - { - delete trees; + QVector<QStringRef> split = path.midRef(cachePath.length()).split(QLatin1Char('/')); + Folder *d = *it; + Iterator<File> jt; - //we found a completed tree, thus no need to scan - qDebug() << "Found cache-handle, generating map.." << endl; + while (!split.isEmpty() && d != NULL) { //if NULL we have got lost so abort!! + jt = d->iterator(); - emit branchCacheHit(d); - - return true; + const Link<File> *end = d->end(); + if (split.first().isEmpty()) { //found the dir + break; } - else - { - //something went wrong, we couldn't find the folder we were expecting - qWarning() << "Didn't find " << path << " in the cache!\n"; - delete it.remove(); //safest to get rid of it - break; //do a full scan + QString s = split.first() % QLatin1Char('/'); // % is the string concatenation operator for QStringBuilder + + for (d = 0; jt != end; ++jt) { + if (s == (*jt)->name()) { + d = (Folder*)*jt; + break; + } } + + split.pop_front(); } - else if (cachePath.startsWith(path)) //then part of the requested tree is already scanned - { - qDebug() << "Cache-(b)hit: " << cachePath << endl; - it.transferTo(*trees); - } - } - QGuiApplication::changeOverrideCursor(QCursor(Qt::BusyCursor)); - //starts listing by itself - m_thread = new Filelight::LocalLister(path, trees, this); - connect(m_thread, SIGNAL(branchCompleted(Folder*,bool)), this, SLOT(cacheTree(Folder*,bool)), Qt::QueuedConnection); - m_thread->start(); + if (d) { + delete trees; - return true; + //we found a completed tree, thus no need to scan + qDebug() << "Found cache-handle, generating map.."; + + emit branchCacheHit(d); + + return true; + } else { + //something went wrong, we couldn't find the folder we were expecting + qWarning() << "Didn't find " << path << " in the cache!\n"; + delete it.remove(); //safest to get rid of it + break; //do a full scan + } + } else if (cachePath.startsWith(path)) { //then part of the requested tree is already scanned + qDebug() << "Cache-(b)hit: " << cachePath; + it.transferTo(*trees); + } } QGuiApplication::changeOverrideCursor(QCursor(Qt::BusyCursor)); - //will start listing straight away - Filelight::RemoteLister *remoteLister = new Filelight::RemoteLister(url, (QWidget*)parent(), this); - connect(remoteLister, SIGNAL(branchCompleted(Folder*,bool)), this, SLOT(cacheTree(Folder*,bool)), Qt::QueuedConnection); - remoteLister->setParent(this); - remoteLister->setObjectName(QLatin1String( "remote_lister" )); - remoteLister->openUrl(url); + //starts listing by itself + m_thread = new Filelight::LocalLister(path, trees, this); + connect(m_thread, &LocalLister::branchCompleted, this, &ScanManager::cacheTree, Qt::QueuedConnection); + m_thread->start(); + return true; } -bool -ScanManager::abort() +bool ScanManager::abort() { m_abort = true; @@ -194,21 +174,20 @@ return m_thread && m_thread->wait(); } -void -ScanManager::emptyCache() +void ScanManager::emptyCache() { m_abort = true; - if (m_thread && m_thread->isRunning()) + if (m_thread && m_thread->isRunning()) { m_thread->wait(); + } emit aboutToEmptyCache(); m_cache->empty(); } -void -ScanManager::cacheTree(Folder *tree, bool finished) +void ScanManager::cacheTree(Folder *tree) { QMutexLocker locker(&m_mutex); // This gets released once it is destroyed. @@ -225,18 +204,15 @@ if (tree) { //we don't cache foreign stuff //we don't recache stuff (thus only type 1000 events) - if (finished) - //TODO sanity check the cache - m_cache->append(tree); - } - else //scan failed + m_cache->append(tree); + } else { //scan failed m_cache->empty(); //FIXME this is safe but annoying + } QGuiApplication::restoreOverrideCursor(); } -void -ScanManager::foundCached(Folder *tree) +void ScanManager::foundCached(Folder *tree) { emit completed(tree); QGuiApplication::restoreOverrideCursor(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/scan.h new/filelight-16.08.0/src/part/scan.h --- old/filelight-16.04.3/src/part/scan.h 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/scan.h 2016-07-02 15:21:38.000000000 +0200 @@ -32,6 +32,9 @@ namespace Filelight { + +class LocalLister; + class ScanManager : public QObject { Q_OBJECT @@ -53,13 +56,12 @@ public slots: bool abort(); void emptyCache(); - void cacheTree(Folder*, bool); + void cacheTree(Folder*); void foundCached(Folder*); signals: void completed(Folder*); void aboutToEmptyCache(); - void branchCompleted(Folder* tree, bool finished); void branchCacheHit(Folder* tree); private: @@ -67,7 +69,7 @@ uint m_files; QMutex m_mutex; - QThread *m_thread; + LocalLister *m_thread; Chain<Folder> *m_cache; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/settingsDialog.cpp new/filelight-16.08.0/src/part/settingsDialog.cpp --- old/filelight-16.04.3/src/part/settingsDialog.cpp 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/settingsDialog.cpp 2016-07-02 15:21:38.000000000 +0200 @@ -64,32 +64,29 @@ //read in settings before you make all those nasty connections! reset(); //makes dialog reflect global settings - connect(&m_timer, SIGNAL(timeout()), SIGNAL(mapIsInvalid())); + connect(&m_timer, &QTimer::timeout, this, &SettingsDialog::mapIsInvalid); - connect(m_addButton, SIGNAL(clicked()), SLOT(addFolder())); - connect(m_removeButton, SIGNAL(clicked()), SLOT(removeFolder())); - connect(resetButton, SIGNAL(clicked()), SLOT(reset())); - connect(closeButton, SIGNAL(clicked()), SLOT(close())); - - connect(m_schemaGroup, SIGNAL(buttonClicked(int)), SLOT(changeScheme(int))); - connect(contrastSlider, SIGNAL(valueChanged(int)), SLOT(changeContrast(int))); - connect(contrastSlider, SIGNAL(sliderReleased()), SLOT(slotSliderReleased())); - - connect(scanAcrossMounts, SIGNAL(toggled(bool)), SLOT(startTimer())); - connect(dontScanRemoteMounts, SIGNAL(toggled(bool)), SLOT(startTimer())); - connect(dontScanRemovableMedia, SIGNAL(toggled(bool)), SLOT(startTimer())); - connect(scanAcrossMounts, SIGNAL(toggled(bool)), - SLOT(toggleScanAcrossMounts(bool))); - connect(dontScanRemoteMounts, SIGNAL(toggled(bool)), - SLOT(toggleDontScanRemoteMounts(bool))); - connect(dontScanRemovableMedia, SIGNAL(toggled(bool)), - SLOT(toggleDontScanRemovableMedia(bool))); - - connect(useAntialiasing, SIGNAL(toggled(bool)), SLOT(toggleUseAntialiasing(bool))); - connect(varyLabelFontSizes, SIGNAL(toggled(bool)), SLOT(toggleVaryLabelFontSizes(bool))); - connect(showSmallFiles, SIGNAL(toggled(bool)), SLOT(toggleShowSmallFiles(bool))); + connect(m_addButton, &QPushButton::clicked, this, &SettingsDialog::addFolder); + connect(m_removeButton, &QPushButton::clicked, this, &SettingsDialog::removeFolder); + connect(resetButton, &QPushButton::clicked, this, &SettingsDialog::reset); + connect(closeButton, &QPushButton::clicked, this, &SettingsDialog::close); + + connect(m_schemaGroup, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), this, &SettingsDialog::changeScheme); + connect(contrastSlider, &QSlider::valueChanged, this, &SettingsDialog::changeContrast); + connect(contrastSlider, &QSlider::sliderReleased, this, &SettingsDialog::slotSliderReleased); + + connect(scanAcrossMounts, &QCheckBox::toggled, this, &SettingsDialog::startTimer); + connect(dontScanRemoteMounts, &QCheckBox::toggled, this, &SettingsDialog::startTimer); + connect(dontScanRemovableMedia, &QCheckBox::toggled, this, &SettingsDialog::startTimer); + connect(scanAcrossMounts, &QCheckBox::toggled, this, &SettingsDialog::toggleScanAcrossMounts); + connect(dontScanRemoteMounts, &QCheckBox::toggled, this, &SettingsDialog::toggleDontScanRemoteMounts); + connect(dontScanRemovableMedia, &QCheckBox::toggled, this, &SettingsDialog::toggleDontScanRemovableMedia); + + connect(useAntialiasing, &QCheckBox::toggled, this, &SettingsDialog::toggleUseAntialiasing); + connect(varyLabelFontSizes, &QCheckBox::toggled, this, &SettingsDialog::toggleVaryLabelFontSizes); + connect(showSmallFiles, &QCheckBox::toggled, this, &SettingsDialog::toggleShowSmallFiles); - connect(minFontPitch, SIGNAL (valueChanged(int)), SLOT(changeMinFontPitch(int))); + connect(minFontPitch, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &SettingsDialog::changeMinFontPitch); m_addButton->setIcon(QIcon::fromTheme(QLatin1String("folder-open"))); m_removeButton->setIcon(QIcon::fromTheme(QLatin1String("list-remove"))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/summaryWidget.cpp new/filelight-16.08.0/src/part/summaryWidget.cpp --- old/filelight-16.04.3/src/part/summaryWidget.cpp 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/summaryWidget.cpp 2016-07-02 15:21:38.000000000 +0200 @@ -41,6 +41,9 @@ #include <QMouseEvent> #include <QLayout> +namespace Filelight +{ + struct Disk { QString mount; @@ -60,6 +63,8 @@ class MyRadialMap : public RadialMap::Widget { + Q_OBJECT + public: MyRadialMap(QWidget *parent) : RadialMap::Widget(parent, true) @@ -148,7 +153,7 @@ map->create(tree); //must be done when visible - connect(map, SIGNAL(activated(QUrl)), SIGNAL(activated(QUrl))); + connect(map, &RadialMap::Widget::activated, this, &SummaryWidget::activated); } } @@ -182,3 +187,7 @@ *this += disk; } } + +} + +#include "summaryWidget.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/filelight-16.04.3/src/part/summaryWidget.h new/filelight-16.08.0/src/part/summaryWidget.h --- old/filelight-16.04.3/src/part/summaryWidget.h 2016-04-21 21:31:52.000000000 +0200 +++ new/filelight-16.08.0/src/part/summaryWidget.h 2016-07-02 15:21:38.000000000 +0200 @@ -26,6 +26,8 @@ #include <QWidget> +namespace Filelight { + class SummaryWidget : public QWidget { Q_OBJECT @@ -40,4 +42,6 @@ void createDiskMaps(); }; +} + #endif

1 0

commit dolphin-plugins for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package dolphin-plugins for openSUSE:Factory checked in at 2016-08-31 00:06:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dolphin-plugins (Old) and /work/SRC/openSUSE:Factory/.dolphin-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dolphin-plugins" Changes: -------- --- /work/SRC/openSUSE:Factory/dolphin-plugins/dolphin-plugins.changes 2016-07-24 19:44:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dolphin-plugins.new/dolphin-plugins.changes 2016-08-31 00:06:21.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:02:39 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:33:33 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- dolphin-plugins-16.04.3.tar.xz New: ---- dolphin-plugins-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dolphin-plugins.spec ++++++ --- /var/tmp/diff_new_pack.buTszZ/_old 2016-08-31 00:06:22.000000000 +0200 +++ /var/tmp/diff_new_pack.buTszZ/_new 2016-08-31 00:06:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: dolphin-plugins -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Version control plugins for Dolphin License: GPL-2.0+ ++++++ dolphin-plugins-16.04.3.tar.xz -> dolphin-plugins-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-16.04.3/bazaar/fileviewbazaarplugin.desktop new/dolphin-plugins-16.08.0/bazaar/fileviewbazaarplugin.desktop --- old/dolphin-plugins-16.04.3/bazaar/fileviewbazaarplugin.desktop 2015-12-29 11:14:52.000000000 +0100 +++ new/dolphin-plugins-16.08.0/bazaar/fileviewbazaarplugin.desktop 2016-07-10 11:32:21.000000000 +0200 @@ -17,6 +17,7 @@ Name[fr]=Bazaar Name[gl]=Bazaar Name[hu]=Bazaar +Name[is]=Bazaar Name[it]=Bazaar Name[kk]=Bazaar Name[ko]=Bazaar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-16.04.3/dropbox/fileviewdropboxplugin.desktop new/dolphin-plugins-16.08.0/dropbox/fileviewdropboxplugin.desktop --- old/dolphin-plugins-16.04.3/dropbox/fileviewdropboxplugin.desktop 2015-12-29 11:14:52.000000000 +0100 +++ new/dolphin-plugins-16.08.0/dropbox/fileviewdropboxplugin.desktop 2016-07-10 11:32:21.000000000 +0200 @@ -16,6 +16,7 @@ Name[fr]=DropBox Name[gl]=Dropbox Name[hu]=Dropbox +Name[is]=Dropbox Name[it]=Dropbox Name[ko]=Dropbox Name[lt]=Dropbox @@ -36,6 +37,7 @@ Name[tr]=Dropbox Name[uk]=Dropbox Name[x-test]=xxDropboxxx +Name[zh_CN]=Dropbox Name[zh_TW]=Dropbox X-KDE-ServiceTypes=FileViewVersionControlPlugin MimeType=text/plain; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-16.04.3/git/fileviewgitplugin.cpp new/dolphin-plugins-16.08.0/git/fileviewgitplugin.cpp --- old/dolphin-plugins-16.04.3/git/fileviewgitplugin.cpp 2015-12-29 11:14:52.000000000 +0100 +++ new/dolphin-plugins-16.08.0/git/fileviewgitplugin.cpp 2016-07-10 11:32:21.000000000 +0200 @@ -29,6 +29,8 @@ #include <KLocalizedString> #include <KUrl> +#include <KRun> +#include <KShell> #include <KPluginFactory> #include <QTemporaryFile> @@ -53,12 +55,24 @@ { Q_UNUSED(args); + m_revertAction = new QAction(this); + m_revertAction->setIcon(QIcon::fromTheme("document-revert")); + m_revertAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Revert")); + connect(m_revertAction, SIGNAL(triggered()), + this, SLOT(revertFiles())); + m_addAction = new QAction(this); m_addAction->setIcon(QIcon::fromTheme("list-add")); m_addAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Add")); connect(m_addAction, SIGNAL(triggered()), this, SLOT(addFiles())); + m_showLocalChangesAction = new QAction(this); + m_showLocalChangesAction->setIcon(QIcon::fromTheme("view-split-left-right")); + m_showLocalChangesAction->setText(xi18nd("@item:inmenu", "Show Local <application>Git</application> Changes")); + connect(m_showLocalChangesAction, SIGNAL(triggered()), + this, SLOT(showLocalChanges())); + m_removeAction = new QAction(this); m_removeAction->setIcon(QIcon::fromTheme("list-remove")); m_removeAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Remove")); @@ -281,6 +295,7 @@ //see which actions should be enabled int versionedCount = 0; int addableCount = 0; + int revertCount = 0; foreach(const KFileItem& item, items){ const ItemVersion state = itemVersion(item); if (state != UnversionedVersion && state != RemovedVersion && @@ -291,19 +306,26 @@ state == IgnoredVersion) { ++addableCount; } + if (state == LocallyModifiedVersion || state == LocallyModifiedUnstagedVersion || + state == ConflictingVersion) { + ++revertCount; + } } m_addAction->setEnabled(addableCount == items.count()); + m_revertAction->setEnabled(revertCount == items.count()); m_removeAction->setEnabled(versionedCount == items.count()); } else{ m_addAction->setEnabled(false); + m_revertAction->setEnabled(false); m_removeAction->setEnabled(false); } QList<QAction*> actions; actions.append(m_addAction); actions.append(m_removeAction); + actions.append(m_revertAction); return actions; } @@ -317,19 +339,27 @@ actions.append(m_checkoutAction); bool canCommit = false; + bool showChanges = false; QHash<QString, ItemVersion>::const_iterator it = m_versionInfoHash.constBegin(); while (it != m_versionInfoHash.constEnd()) { const ItemVersion state = it.value(); if (state == LocallyModifiedVersion || state == AddedVersion || state == RemovedVersion) { canCommit = true; } + if (state == LocallyModifiedUnstagedVersion || state == LocallyModifiedVersion) { + showChanges = true; + } if (state == ConflictingVersion) { canCommit = false; + showChanges = true; break; } ++it; } + m_showLocalChangesAction->setEnabled(!m_pendingOperation && showChanges); + actions.append(m_showLocalChangesAction); + m_commitAction->setEnabled(!m_pendingOperation && canCommit); actions.append(m_commitAction); @@ -360,7 +390,21 @@ xi18nd("@info:status", "Removing files from <application>Git</application> repository..."), xi18nd("@info:status", "Removing files from <application>Git</application> repository failed."), xi18nd("@info:status", "Removed files from <application>Git</application> repository.")); +} + +void FileViewGitPlugin::revertFiles() +{ + execGitCommand(QLatin1String("checkout -- "), QStringList(), + xi18nd("@info:status", "Reverting files from <application>Git</application> repository..."), + xi18nd("@info:status", "Reverting files from <application>Git</application> repository failed."), + xi18nd("@info:status", "Reverted files from <application>Git</application> repository.")); +} + +void FileViewGitPlugin::showLocalChanges() +{ + Q_ASSERT(!m_contextDir.isEmpty()); + KRun::runCommand(QLatin1String("git difftool --dir-diff ."), nullptr, m_contextDir); } void FileViewGitPlugin::checkout() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-16.04.3/git/fileviewgitplugin.desktop new/dolphin-plugins-16.08.0/git/fileviewgitplugin.desktop --- old/dolphin-plugins-16.04.3/git/fileviewgitplugin.desktop 2015-12-29 11:14:52.000000000 +0100 +++ new/dolphin-plugins-16.08.0/git/fileviewgitplugin.desktop 2016-07-10 11:32:21.000000000 +0200 @@ -19,6 +19,7 @@ Name[ga]=Git Name[gl]=Git Name[hu]=Git +Name[is]=Git Name[it]=Git Name[kk]=Git Name[km]=Git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-16.04.3/git/fileviewgitplugin.h new/dolphin-plugins-16.08.0/git/fileviewgitplugin.h --- old/dolphin-plugins-16.04.3/git/fileviewgitplugin.h 2015-12-29 11:14:52.000000000 +0100 +++ new/dolphin-plugins-16.08.0/git/fileviewgitplugin.h 2016-07-10 11:32:21.000000000 +0200 @@ -48,6 +48,8 @@ private slots: void addFiles(); + void revertFiles(); + void showLocalChanges(); void removeFiles(); void checkout(); void commit(); @@ -102,6 +104,8 @@ */ QHash<QString, ItemVersion> m_versionInfoHash; QAction* m_addAction; + QAction* m_revertAction; + QAction* m_showLocalChangesAction; QAction* m_removeAction; QAction* m_checkoutAction; QAction* m_commitAction; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-16.04.3/hg/fileviewhgplugin.desktop new/dolphin-plugins-16.08.0/hg/fileviewhgplugin.desktop --- old/dolphin-plugins-16.04.3/hg/fileviewhgplugin.desktop 2015-12-29 11:14:52.000000000 +0100 +++ new/dolphin-plugins-16.08.0/hg/fileviewhgplugin.desktop 2016-07-10 11:32:21.000000000 +0200 @@ -17,6 +17,7 @@ Name[fr]=Mercurial Name[gl]=Mercurial Name[hu]=Mercurial +Name[is]=Mercurial Name[it]=Mercurial Name[kk]=Mercurial Name[ko]=Mercurial diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-16.04.3/svn/fileviewsvnplugin.desktop new/dolphin-plugins-16.08.0/svn/fileviewsvnplugin.desktop --- old/dolphin-plugins-16.04.3/svn/fileviewsvnplugin.desktop 2015-12-29 11:14:52.000000000 +0100 +++ new/dolphin-plugins-16.08.0/svn/fileviewsvnplugin.desktop 2016-07-10 11:32:21.000000000 +0200 @@ -20,6 +20,7 @@ Name[ga]=Subversion Name[gl]=Subversion Name[hu]=Subversion +Name[is]=Subversion Name[it]=Subversion Name[kk]=Subversion Name[km]=កំណែរង

1 0

commit cervisia for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package cervisia for openSUSE:Factory checked in at 2016-08-31 00:06:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cervisia (Old) and /work/SRC/openSUSE:Factory/.cervisia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cervisia" Changes: -------- --- /work/SRC/openSUSE:Factory/cervisia/cervisia.changes 2016-07-24 19:44:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cervisia.new/cervisia.changes 2016-08-31 00:06:19.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:02:19 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:32:42 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- cervisia-16.04.3.tar.xz New: ---- cervisia-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cervisia.spec ++++++ --- /var/tmp/diff_new_pack.INzDKi/_old 2016-08-31 00:06:20.000000000 +0200 +++ /var/tmp/diff_new_pack.INzDKi/_new 2016-08-31 00:06:20.000000000 +0200 @@ -17,19 +17,29 @@ Name: cervisia -BuildRequires: libkde4-devel BuildRequires: subversion-devel +BuildRequires: extra-cmake-modules +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: kparts-devel +BuildRequires: kdbusaddons-devel +BuildRequires: kdoctools-devel +BuildRequires: kinit-devel +BuildRequires: kiconthemes-devel +BuildRequires: knotifications-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kitemviews-devel +BuildRequires: kdesu-devel +BuildRequires: update-desktop-files Summary: CVS Frontend License: GPL-2.0 and GFDL-1.2 and LGPL-2.0 Group: Development/Tools/Version Control Url: http://www.kde.org/ -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: kde4-cervisia = 4.3.0 -Obsoletes: kde4-cervisia < 4.3.0 -%kde4_runtime_requires %description -n cervisia Cervisia is a to work with and browse in CVS repositories. @@ -43,18 +53,12 @@ %endif export CXXFLAGS="$RPM_OPT_FLAGS -fPIC" export CFLAGS="$RPM_OPT_FLAGS -fPIC" - %cmake_kde4 -d build -- -DCMAKE_CXXFLAGS="$RPM_OPT_FLAGS" -DCMAKE_CFLAGS="$RPM_OPT_FLAGS" -#make_jobs - make + %cmake_kf5 -d build -- -DCMAKE_CXXFLAGS="$RPM_OPT_FLAGS" -DCMAKE_CFLAGS="$RPM_OPT_FLAGS" + %make_jobs %install - cd build - %makeinstall - cd .. - %suse_update_desktop_file cervisia Development RevisionControl - # fix conflict with kdesdk3 - rm $RPM_BUILD_ROOT/usr/share/man/man1/cervisia.1 - %kde_post_install + %makeinstall -C build + %suse_update_desktop_file org.kde.cervisia5 Development RevisionControl %post -p /sbin/ldconfig @@ -66,24 +70,25 @@ %files %defattr(-,root,root) %doc COPYING COPYING.DOC COPYING.LIB ChangeLog README -%{_kde4_bindir}/cervisia -%{_kde4_bindir}/cvsaskpass -%{_kde4_bindir}/cvsservice -%{_kde4_modulesdir}/cervisiapart.so -%{_kde4_libdir}/libkdeinit4_cervisia.so -%{_kde4_libdir}/libkdeinit4_cvsaskpass.so -%{_kde4_libdir}/libkdeinit4_cvsservice.so -%{_kde4_applicationsdir}/cervisia.desktop -%{_datadir}/dbus-1/interfaces/org.kde.cervisia.*.xml -%{_kde4_htmldir}/en/cervisia/ -%{_kde4_iconsdir}/hicolor/*/actions/vcs-*.* -%{_kde4_iconsdir}/hicolor/*/apps/cervisia.* -%{_kde4_appsdir}/cervisia/ -%{_kde4_appsdir}/cervisiapart/ -%{_kde4_configkcfgdir}/cervisiapart.kcfg -%{_kde4_servicesdir}/cervisiapart.desktop -%{_kde4_servicesdir}/cvsservice.desktop -%dir %{_kde4_appsdir}/appdata -%{_kde4_appsdir}/appdata/cervisia.appdata.xml +%_bindir/cervisia +%_bindir/cvsaskpass +%_bindir/cvsservice5 +%_libdir/libkdeinit5_cervisia.so +%_libdir/libkdeinit5_cvsaskpass.so +%_libdir/libkdeinit5_cvsservice.so +%_kf5_plugindir/cervisiapart5.so +%dir %{_kf5_sharedir}/appdata +%{_kf5_sharedir}/appdata/org.kde.cervisia.appdata.xml +%_kf5_applicationsdir/org.kde.cervisia5.desktop +%dir %_kf5_configkcfgdir/ +%_kf5_configkcfgdir/cervisiapart.kcfg +%_datadir/dbus-1/interfaces/org.kde.cervisia5.*.xml +%_kf5_htmldir/en/cervisia/ +%_kf5_iconsdir/hicolor/*/*/* +%_kf5_servicesdir/org.kde.cervisiapart5.desktop +%_kf5_servicesdir/org.kde.cvsservice5.desktop +%_kf5_kxmlguidir/cervisia/ +%_kf5_kxmlguidir/cervisiapart/ +%_mandir/man1/cervisia.1.gz %changelog ++++++ cervisia-16.04.3.tar.xz -> cervisia-16.08.0.tar.xz ++++++ ++++ 10470 lines of diff (skipped)

1 0

commit cantor for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package cantor for openSUSE:Factory checked in at 2016-08-31 00:06:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cantor (Old) and /work/SRC/openSUSE:Factory/.cantor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cantor" Changes: -------- --- /work/SRC/openSUSE:Factory/cantor/cantor.changes 2016-07-24 19:44:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cantor.new/cantor.changes 2016-08-31 00:06:16.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:02:10 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:32:23 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- cantor-16.04.3.tar.xz New: ---- cantor-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantor.spec ++++++ --- /var/tmp/diff_new_pack.lzBycr/_old 2016-08-31 00:06:17.000000000 +0200 +++ /var/tmp/diff_new_pack.lzBycr/_new 2016-08-31 00:06:17.000000000 +0200 @@ -16,10 +16,10 @@ # -%global libMAJOR 6 +%global libMAJOR 16 Name: cantor -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Worksheet GUI for mathematical software License: GPL-2.0+ ++++++ cantor-16.04.3.tar.xz -> cantor-16.08.0.tar.xz ++++++ ++++ 2381 lines of diff (skipped)

1 0

commit bovo for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package bovo for openSUSE:Factory checked in at 2016-08-31 00:06:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bovo (Old) and /work/SRC/openSUSE:Factory/.bovo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bovo" Changes: -------- --- /work/SRC/openSUSE:Factory/bovo/bovo.changes 2016-07-24 19:44:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bovo.new/bovo.changes 2016-08-31 00:06:14.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:02:01 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:31:58 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- bovo-16.04.3.tar.xz New: ---- bovo-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bovo.spec ++++++ --- /var/tmp/diff_new_pack.xPnPlV/_old 2016-08-31 00:06:15.000000000 +0200 +++ /var/tmp/diff_new_pack.xPnPlV/_new 2016-08-31 00:06:15.000000000 +0200 @@ -37,7 +37,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Other Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: bovo-%{version}.tar.xz Obsoletes: %{name}5 < %{version} @@ -73,7 +73,7 @@ %{_kf5_htmldir}/en/bovo/ %{_kf5_applicationsdir}/org.kde.bovo.desktop %{_kf5_bindir}/bovo -%{_kf5_sharedir}/appdata/ +%{_kf5_appstreamdir}/ %{_kf5_sharedir}/kxmlgui5/ %changelog ++++++ bovo-16.04.3.tar.xz -> bovo-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bovo-16.04.3/.gitignore new/bovo-16.08.0/.gitignore --- old/bovo-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/bovo-16.08.0/.gitignore 2016-06-12 09:34:21.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bovo-16.04.3/CMakeLists.txt new/bovo-16.08.0/CMakeLists.txt --- old/bovo-16.04.3/CMakeLists.txt 2016-03-08 18:20:36.000000000 +0100 +++ new/bovo-16.08.0/CMakeLists.txt 2016-06-12 09:34:21.000000000 +0200 @@ -1,4 +1,4 @@ -project (BOVO) +project (bovo) cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) set (QT_MIN_VERSION "5.2.0") @@ -8,7 +8,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg Concurrent) -find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS +find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons Crash DBusAddons @@ -19,7 +19,7 @@ include(KDEInstallDirs) include(KDECMakeSettings) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(FeatureSummary) include(ECMInstallIcons) include(ECMAddAppIcon) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bovo-16.04.3/ai/aron/aiboard.cc new/bovo-16.08.0/ai/aron/aiboard.cc --- old/bovo-16.04.3/ai/aron/aiboard.cc 2016-03-08 18:20:36.000000000 +0100 +++ new/bovo-16.08.0/ai/aron/aiboard.cc 2016-06-12 09:34:21.000000000 +0200 @@ -25,7 +25,7 @@ #include "aiboard.h" -#include <time.h> +#include <ctime> #include <vector> #include <iostream> @@ -81,7 +81,7 @@ Coord AiBoard::move() { if (m_cleanBoard) { - qsrand(static_cast<int>(time(0))); + qsrand(static_cast<int>(std::time(nullptr))); usi randX = qrand()%(m_dimension->width()/3) + m_dimension->width()/3; usi randY = qrand()%(m_dimension->height()/3) + m_dimension->height()/3; return Coord(randX, randY); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bovo-16.04.3/ai/gabor/ai_impl.cpp new/bovo-16.08.0/ai/gabor/ai_impl.cpp --- old/bovo-16.04.3/ai/gabor/ai_impl.cpp 2016-03-08 18:20:36.000000000 +0100 +++ new/bovo-16.08.0/ai/gabor/ai_impl.cpp 2016-06-12 09:34:21.000000000 +0200 @@ -27,7 +27,7 @@ #include <cstdlib> #include <memory.h> #include <assert.h> -#include <time.h> +#include <ctime> #include <stdio.h> // hash table @@ -45,7 +45,7 @@ { if (!rand_inited) { rand_inited = true; - qsrand((unsigned int) time(NULL)); + qsrand(static_cast<unsigned int>(std::time(nullptr))); } memset(hashData, 0, sizeof(hashData)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bovo-16.04.3/ai/gabor/node.cpp new/bovo-16.08.0/ai/gabor/node.cpp --- old/bovo-16.04.3/ai/gabor/node.cpp 2016-03-08 18:20:36.000000000 +0100 +++ new/bovo-16.08.0/ai/gabor/node.cpp 2016-06-12 09:34:21.000000000 +0200 @@ -25,7 +25,6 @@ #include "standing.h" #include <assert.h> -#include <time.h> Node::Node(Standing* _standing, AiImpl* ai): standing(_standing), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bovo-16.04.3/doc/index.docbook new/bovo-16.08.0/doc/index.docbook --- old/bovo-16.04.3/doc/index.docbook 2016-03-08 18:20:36.000000000 +0100 +++ new/bovo-16.08.0/doc/index.docbook 2016-06-12 09:34:21.000000000 +0200 @@ -1,13 +1,10 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&bovo;"> - <!ENTITY kappversion "1.0"> - <!ENTITY package "kdegames">  <!ENTITY % English "INCLUDE" >  <!ENTITY % addindex "IGNORE">  ]> - + <book id="bovo" lang="&language;">  <bookinfo> <title>The &bovo; Handbook</title> @@ -28,19 +25,15 @@ <year>2007</year> <holder>Aron Bostrom</holder> </copyright> - - <legalnotice>&FDLNotice;</legalnotice> - -<date>2013-05-03</date> -<releaseinfo>&kappversion; (&kde; 4.11)</releaseinfo> - - + +<date>2016-05-09</date> +<releaseinfo>1.1 (Applications 16.04)</releaseinfo> + <abstract> - <para>This documentation describes the game of &bovo; version &kappversion;</para> + <para>This documentation describes the game of &bovo; version 1.1</para> </abstract> - +  <keywordset> <keyword>KDE</keyword>  @@ -69,7 +62,7 @@ <chapter id="introduction"><title>Introduction</title>  <note><title>Gametype:</title><para>Board, Arcade</para></note> <note><title>Number of possible players:</title><para>Two</para></note> - +  <para> &bovo; is a Gomoku (from Japanese <foreignphrase lang="ja">五目並べ</foreignphrase>lit. "five points") like game for two players, where the opponents alternate in placing their respective pictogram on the game board. @@ -77,8 +70,20 @@ </para> <note><title>Note:</title><para>Also known as: Connect Five, Five in a row, X and O, Noughts and Crosses</para></note> </chapter> - + <chapter id="howto"><title>How to play</title>  + +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="mainscreen.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&bovo; main screen</phrase> +</textobject> +</mediaobject> +</screenshot> +  <note><title>Objective:</title><para>Connect five of your own pieces in an unbroken row vertically, horizontally or diagonally.</para></note> <para> @@ -94,7 +99,7 @@ You have to place your pieces in a way that prevents your opponent from connecting five marks in an unbroken row vertically, horizontally or diagonally. In the same time you have to connect five of your own pieces in an unbroken row vertically, horizontally or diagonally. Whoever succeeds in doing so first – wins the round. </para> </chapter> - + <chapter id="rules_and_tips"><title>Game Rules, Strategies and Tips</title>   <sect1 id="rules"> @@ -124,7 +129,7 @@ </itemizedlist> </sect1> </chapter> - + <chapter id="interface"><title>Interface Overview</title>  <sect1 id="menu"> @@ -200,7 +205,7 @@ <varlistentry> <term><menuchoice><guimenu>Settings</guimenu><guisubmenu>Difficulty</guisubmenu></menuchoice></term> -<listitem><para>Choose the game difficulty from various levels from <guimenuitem>Ridiculously Easy</guimenuitem> +<listitem><para>Choose the game difficulty from various levels from <guimenuitem>Ridiculously Easy</guimenuitem> up to <guimenuitem>Impossible</guimenuitem>.</para></listitem> </varlistentry> @@ -215,36 +220,36 @@ </sect1> </chapter> - + <chapter id="faq"><title>Frequently asked questions</title>   <qandaset>  <qandaentry> <question><para>I want to change the way this game looks. Can I? </para></question> - <answer><para>Yes. To change &kappname;'s visual theme you can use the <menuchoice><guimenu>Settings</guimenu><guisubmenu>Theme</guisubmenu> + <answer><para>Yes. To change &bovo;'s visual theme you can use the <menuchoice><guimenu>Settings</guimenu><guisubmenu>Theme</guisubmenu> </menuchoice> option on the menubar.</para></answer> </qandaentry> <qandaentry> <question><para>Can I use the keyboard to play this game? </para></question> - <answer><para>No. The game of &kappname; cannot be played using keyboard.</para></answer> + <answer><para>No. The game of &bovo; cannot be played using keyboard.</para></answer> </qandaentry> <qandaentry> <question><para>I have to quit the game now, but I am not finished yet. Can I save my progress?</para></question> - <answer><para>No. There is no <quote>Save</quote> feature in &kappname;.</para></answer> + <answer><para>No. There is no <quote>Save</quote> feature in &bovo; but &bovo; restores the latest unfinished game on startup.</para></answer> </qandaentry> <qandaentry> <question><para>Where are the highscores?</para></question> - <answer><para>&kappname; does not have this feature.</para></answer> + <answer><para>&bovo; does not have this feature.</para></answer> </qandaentry>  - + </qandaset> </chapter> - + <chapter id="credits"><title>Credits and License</title>   - + <para> &bovo; </para> @@ -258,20 +263,10 @@  &underFDL; &underGPL; - + </chapter> - -<appendix id="installation"> - -<title>Compilation and Installation</title> - -&install.intro.documentation; - -&install.compile.documentation; - -</appendix> - -&documentation.index; + +&documentation.index; </book> <!-- Local Variables: Files old/bovo-16.04.3/doc/mainscreen.png and new/bovo-16.08.0/doc/mainscreen.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bovo-16.04.3/gui/mainwindow.cc new/bovo-16.08.0/gui/mainwindow.cc --- old/bovo-16.04.3/gui/mainwindow.cc 2016-03-08 18:20:36.000000000 +0100 +++ new/bovo-16.08.0/gui/mainwindow.cc 2016-06-12 09:34:21.000000000 +0200 @@ -120,7 +120,7 @@ void MainWindow::setupThemes() { QStringList themercs; - const QStringList themeDirs = QStandardPaths::locateAll(QStandardPaths::DataLocation, QStringLiteral("themes"), QStandardPaths::LocateDirectory); + const QStringList themeDirs = QStandardPaths::locateAll(QStandardPaths::AppDataLocation, QStringLiteral("themes"), QStandardPaths::LocateDirectory); Q_FOREACH (const QString &themeDir, themeDirs) { const QStringList entries = QDir(themeDir).entryList(QDir::Dirs); Q_FOREACH(const QString &d, entries) { @@ -161,7 +161,7 @@ if (!wins.isEmpty()) { bool ok; updateWins(wins.toUInt(&ok)); - + } const QString losses = lastGroup.readEntry("Losses", QString()); if (!losses.isEmpty()) { @@ -283,7 +283,7 @@ m_game = new Game(dimension, m_lastGame, Kg::difficultyLevel(), m_playbackSpeed, m_aiFactory); } else { - m_game = new Game(dimension, m_computerStarts ? O : X, + m_game = new Game(dimension, m_computerStarts ? O : X, Kg::difficultyLevel(), NotDemo, m_playbackSpeed, m_aiFactory); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bovo-16.04.3/gui/theme.cc new/bovo-16.08.0/gui/theme.cc --- old/bovo-16.04.3/gui/theme.cc 2016-03-08 18:20:36.000000000 +0100 +++ new/bovo-16.08.0/gui/theme.cc 2016-06-12 09:34:21.000000000 +0200 @@ -35,10 +35,10 @@ Theme::Theme() { } -Theme::Theme(const QString& path, const int id) +Theme::Theme(const QString& path, const int id) : m_id(id), m_path(path) { QString themePath = QStringLiteral("themes/%1/").arg(m_path); - themePath = QStandardPaths::locate(QStandardPaths::DataLocation, themePath, QStandardPaths::LocateDirectory); + themePath = QStandardPaths::locate(QStandardPaths::AppDataLocation, themePath, QStandardPaths::LocateDirectory); QString themerc = themePath + QLatin1String("themerc"); KDesktopFile themeConfig(themerc); m_name = themeConfig.readName(); @@ -58,7 +58,7 @@ } else if (gridTypeStr == QLatin1String("squares")) { m_gridType = SquaresGrid; } - + m_svg = themePath + configGroup.readEntry("Svg", "theme.svg"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bovo-16.04.3/org.kde.bovo.appdata.xml new/bovo-16.08.0/org.kde.bovo.appdata.xml --- old/bovo-16.04.3/org.kde.bovo.appdata.xml 2016-03-08 18:20:36.000000000 +0100 +++ new/bovo-16.08.0/org.kde.bovo.appdata.xml 2016-06-12 09:34:21.000000000 +0200 @@ -11,6 +11,7 @@ <name xml:lang="cs">Bovo</name> <name xml:lang="da">Bovo</name> <name xml:lang="de">Bovo</name> + <name xml:lang="el">Bovo</name> <name xml:lang="en-GB">Bovo</name> <name xml:lang="es">Bovo</name> <name xml:lang="fi">Bovo</name> @@ -49,6 +50,7 @@ El Bovo és un joc semblant al Gomoku (del japonès 五目並べ - lit. «cinc punts») per a dos jugadors, a on els oponents situen els seus ideogrames respectius alternativament en el tauler de joc. També conegut com a: Connecta cinc, Cinc en fila, X i O, Zeros i creus. El Bovo és un joc paregut al Gomoku (del japonés 五目並べ - lit. «cinc punts») per a dos jugadors, a on els oponents situen els seus ideogrames respectius alternativament en el tauler de joc. També conegut com a: Connecta cinc, Cinc en fila, X i O, Zeros i creus. Bovo ist ein Gomoku (aus dem japanischen wörtlich „Fünf Punkte“) ähnliches Spiel für zwei Spieler, bei dem die Gegner abwechselnd ihre jeweiligen Piktogramme auf dem Brett platzieren. Auch bekannt als: Fünf verbinden, Fünf in einer Reihe, X und O, Nullen und Kreuze + Το Bovo είναι ένα είδος παιχνιδιού Gomoku (στα Ιαπωνικά 五目並べ - κυρ. "πέντε πόντοι" για δύο παίκτες, στο οποίο οι αντίπαλοι τοποθετούν εναλλάξ ο καθένας το δικό του πικτόγραμμα στον πίνακα του παιχνιδιού. (Είναι επίσης γνωστό ως Σύνδεσε πέντε, Πέντε στη γραμμή, Χ και Ο, κύκλοι και σταυροί) Bovo is a Gomoku (from Japanese 五目並べ - lit. "five points") like game for two players, where the opponents alternate in placing their respective pictogram on the game board. (Also known as: Connect Five, Five in a row, X and O, Naughts and Crosses) Bovo es un juego para dos jugadores similar al Gomoku (del japonés 五目並べ, que significa «cinco puntos»). Los dos oponentes juegan por turnos para colocar su respectivo pictograma en el juego del tablero. (También se conoce como: «Conecta cinco», «Cinco en línea», «X y O» o «Ceros y cruces»). Bovo on Gomokun (japaniksi 五目並べ – kirjaimellisesti ”viisi pistettä”) kaltainen peli kahdelle, jossa vastustajat asettavat vuorotellen merkkinsä pelilaudalle. Tunnetaan myös nimillä viiden suora ja ristinolla.

1 0

commit bomber for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package bomber for openSUSE:Factory checked in at 2016-08-31 00:06:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bomber (Old) and /work/SRC/openSUSE:Factory/.bomber.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bomber" Changes: -------- --- /work/SRC/openSUSE:Factory/bomber/bomber.changes 2016-07-24 19:44:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bomber.new/bomber.changes 2016-08-31 00:06:12.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:01:53 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:31:29 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- bomber-16.04.3.tar.xz New: ---- bomber-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bomber.spec ++++++ --- /var/tmp/diff_new_pack.vcrfq3/_old 2016-08-31 00:06:13.000000000 +0200 +++ /var/tmp/diff_new_pack.vcrfq3/_new 2016-08-31 00:06:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: bomber -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Invading cities with a plane License: GPL-2.0+ @@ -78,7 +78,7 @@ %{_kf5_appsdir}/bomber/ %dir %{_kf5_configkcfgdir} %{_kf5_configkcfgdir}/bomber.kcfg -%{_kf5_appsdir}/appdata/ -%_datadir/kxmlgui5/bomber/ +%{_kf5_appstreamdir}/ +%{_kf5_kxmlguidir}/bomber/ %changelog ++++++ bomber-16.04.3.tar.xz -> bomber-16.08.0.tar.xz ++++++ ++++ 2120 lines of diff (skipped)

1 0

commit blinken for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package blinken for openSUSE:Factory checked in at 2016-08-31 00:06:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blinken (Old) and /work/SRC/openSUSE:Factory/.blinken.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "blinken" Changes: -------- --- /work/SRC/openSUSE:Factory/blinken/blinken.changes 2016-07-24 19:44:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.blinken.new/blinken.changes 2016-08-31 00:06:09.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:01:44 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:31:05 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- blinken-16.04.3.tar.xz New: ---- blinken-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blinken.spec ++++++ --- /var/tmp/diff_new_pack.hjvYZu/_old 2016-08-31 00:06:10.000000000 +0200 +++ /var/tmp/diff_new_pack.hjvYZu/_new 2016-08-31 00:06:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: blinken -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Simon Says Game License: GPL-2.0+ ++++++ blinken-16.04.3.tar.xz -> blinken-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-16.04.3/blinken.appdata.xml new/blinken-16.08.0/blinken.appdata.xml --- old/blinken-16.04.3/blinken.appdata.xml 2016-04-16 09:47:43.000000000 +0200 +++ new/blinken-16.08.0/blinken.appdata.xml 2016-05-30 10:46:58.000000000 +0200 @@ -81,7 +81,7 @@ Blinken is gebaseerd op een elektronisch spelletje uit 1978, waarin de spelers steeds langere reeksen moeten onthouden. Op het apparaat zijn 4 verschillend gekleurde knoppen aanwezig, elk met een eigen geluid. Deze knoppen lichten op in een willekeurige volgorde, waarmee een reeks wordt gemaakt, die de speler moet onthouden. Als de speler erin slaagt zich de reeks te herinneren, in de juiste volgorde, gaat hij/zij naar het volgende niveau, waar een soortgelijke reeks, maar een stap langer, wordt aangeboden. Indien dit niet lukt, heeft hij/zij het spel verloren, en moet hij/zij weer helemaal van voren af aan beginnen. Het doel is een hoge score te behalen - elke stap in de reeks is een punt waard, dus een goede invoer van een reeks van 8 lichtjes is 8 punten waard op de tabel van de hoogste scores. Blinken wywodzi się z elektronicznej gry powstałej w 1978 roku, w której gracze mają za zadanie zapamiętać coraz dłuższe sekwencje. Z przodu urządzenia są cztery różnokolorowe przyciski, każdy wydający dźwięk odmienny od pozostałych. Przyciski zapalają się w sposób losowy, tworząc w ten sposób sekwencję, którą gracz musi zapamiętać. Jeśli gracz poprawnie powtórzy całą sekwencję, wówczas przechodzi do następnego etapu, w którym ta sama sekwencja jest powiększona o kolejny krok. Jeżeli gracz popełni błąd, wówczas przegrywa i musi rozpocząć grę od nowa. Celem gry jest osiągnięcie najlepszego wyniku, a każdy krok w sekwencji to jeden punkt, więc poprawne powtórzenie kolejności 8 zapaleń daje 8 punktów w tabeli najlepszych wyników. O Blinken baseia-se num jogo electrónico lançado em 1978, que desafia os jogadores a recordarem sequências de tamanho cada vez maior. Na face do dispositivo, existem 4 botões de cores diferentes, cada um com o seu som distinto. Estes botões iluminam-se aleatoriamente, criando a sequência que o jogador deverá então recordar. Se o jogador for bem-sucedido a recordar a sequência de luzes pela ordem correcta, passará então à etapa seguinte, onde será apresentada uma sequência idêntica com um passo extra. Se for uma sequência incorrecta, perde o jogo e o jogador terá de começar do início. O objectivo é bater um recorde - cada passo na sequência vale um ponto, pelo que a introdução correcta de uma sequência de 8 luzes vale 8 pontos para a tabela de recordes. - Blinken é baseado num jogo eletrônico lançado em 1978, que desafia os jogadores a lembrar sequências de comprimento crescentes. Na face do dispositivo existem 4 diferentes botões coloridos, cada um com seu som distinto. Esses botões acendem aleatoriamente, criando a sequência que o jogador deverá repetir. Se o jogador obter sucesso ao lembrar a sequência das luzes na ordem correta, ele avança para o próximo estágio, onde uma sequência idêntica com um passo a mais é apresentada. Se ela estiver incorreta, o jogo termina e o jogador deverá iniciar novamente desde o começo. O objetivo é fazer um recorde - cada passo na sequência equivale a um ponto, portanto lembrar a sequência correta de 8 luzes equivale a 8 pontos na tabela de recordes. + Blinken é baseado num jogo eletrônico lançado em 1978, que desafia os jogadores a lembrar sequências de comprimento crescentes. Na face do dispositivo existem 4 botões coloridos diferentes, cada um com seu próprio som. Esses botões iluminam-se aleatoriamente, criando uma sequência que o jogador deverá repetir. Se o jogador conseguir lembrar a sequência das luzes na ordem correta, ele avança para o próximo estágio, onde uma sequência idêntica com um passo a mais é apresentada. Se ela estiver incorreta, o jogo termina e o jogador deverá iniciar novamente desde o começo. O objetivo é obter um recorde - cada passo na sequência equivale a um ponto, portanto lembrar a sequência correta de 8 luzes equivale a 8 pontos na tabela de recordes. Blinken je založený na elektronickej hre z roku 1978, ktorá vyžaduje od hráčov, aby si zapamätali sekvencie zvyšujúcej sa dĺžky. Na zariadení sú 4 rôznofarebné tlačidlá, každé so svojim vlastným zvukom. Tieto tlačidlá sa náhodne rozsvecujú, čím vytvárajú sekvenciu, ktorú si hráč musí zapamätať. Ak je hráč úspešný, postúpi na ďalšiu úroveň, kde sú rovnaké sekvencie s jedným ďalším krokom. Ak je neúspešný, hra je stratená a hráč musí začať od začiatku. Cieľom je dosiahnuť čo najviac bodov, každý krok v sekvencii je za jeden bod, teda správny vstup sekvencie s 8 svetlami je za 8 bodov. Blinken temelji na elektronski igri izšli leta 1978, ki od igralca zahteva, da si zapomni vedno daljša zaporedja. Na prednji strani naprave so štirje različno obarvani gumbi, ki oddajajo različne zvoke. Gumbi se naključno osvetlijo in to zaporedje mora igralec ponoviti. Če igralec uspešno ugane pravilni vrstni red luči v zaporedju, preide na naslednji nivo, kjer je pred njega postavljeno enako zaporedje, le da ima dodan en korak več. Če igralec zaporedja ne ugane, se igra konča in začne znova. Cilj igre je doseči najvišji rezultat. Vsak korak v zaporedju je vreden eno točko, zato je npr. pravilno vneseno zaporedje 8 luči vredno 8 točk. Blinken är baserat på ett elektroniskt spel, utgivet 1978, som utmanar spelare att komma ihåg sekvenser av ökande längd. På apparatens framsida finns fyra olika färgade knappar, var och en med ett eget karakteristiskt ljud. De fyra knapparna lyser upp slumpmässigt, och skapar sekvensen som spelaren därefter måste komma ihåg. Om spelaren lyckas komma ihåg sekvensen av ljus i rätt ordning, går han vidare till nästa nivå, där en identisk sekvens med ytterligare ett steg presenteras. Om spelaren har fel, förloras spelet, och spelaren måste börja om från början igen. Målet är att få högsta poäng: Varje steg i sekvensen är värt ett poäng, och att skriva in en sekvens med åtta ljus är alltså värt 8 poäng i tabellen med högsta poäng. Files old/blinken-16.04.3/doc/blinken_nickprompt.png and new/blinken-16.08.0/doc/blinken_nickprompt.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-16.04.3/doc/index.docbook new/blinken-16.08.0/doc/index.docbook --- old/blinken-16.04.3/doc/index.docbook 2016-04-16 09:47:43.000000000 +0200 +++ new/blinken-16.08.0/doc/index.docbook 2016-05-30 10:46:58.000000000 +0200 @@ -2,7 +2,6 @@ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY blinken "<application>Blinken</application>"> <!ENTITY kappname "&blinken;"> - <!ENTITY package "kdeedu"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> ]> @@ -30,8 +29,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2008-08-23</date> -<releaseinfo>0.2 (&kde; 4.1.2)</releaseinfo> +<date>2016-04-26</date> +<releaseinfo>0.4 (Applications 16.04)</releaseinfo> <abstract> <para> @@ -327,25 +326,6 @@ </chapter> - -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-blinken"> -<title>How to obtain &blinken;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - &documentation.index; </book> <!--

1 0

commit artikulate for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package artikulate for openSUSE:Factory checked in at 2016-08-31 00:06:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/artikulate (Old) and /work/SRC/openSUSE:Factory/.artikulate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "artikulate" Changes: -------- --- /work/SRC/openSUSE:Factory/artikulate/artikulate.changes 2016-07-24 19:52:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.artikulate.new/artikulate.changes 2016-08-31 00:06:07.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:01:25 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:30:13 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- artikulate-16.04.3.tar.xz New: ---- artikulate-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ artikulate.spec ++++++ --- /var/tmp/diff_new_pack.dE6AJR/_old 2016-08-31 00:06:08.000000000 +0200 +++ /var/tmp/diff_new_pack.dE6AJR/_new 2016-08-31 00:06:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: artikulate -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Pronunciation Self-Teaching License: LGPL-3.0+ and GPL-2.0 and BSD-3-Clause @@ -25,7 +25,6 @@ Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz BuildRequires: fdupes -BuildRequires: gstreamer-plugins-qt5-devel BuildRequires: extra-cmake-modules BuildRequires: update-desktop-files BuildRequires: kdoctools-devel @@ -36,6 +35,7 @@ BuildRequires: pkgconfig(Qt5Quick) BuildRequires: pkgconfig(Qt5QuickWidgets) BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5Multimedia) BuildRequires: kconfig-devel BuildRequires: ki18n-devel BuildRequires: kio-devel @@ -80,6 +80,7 @@ %dir %{_kf5_configkcfgdir} %{_kf5_configkcfgdir}/artikulate.kcfg %{_kf5_iconsdir}/hicolor/*/*/artikulate*.* +%{_kf5_iconsdir}/hicolor/scalable/actions/language-artikulate.svg %{_datadir}/appdata/ %_kf5_plugindir/artikulate/ ++++++ artikulate-16.04.3.tar.xz -> artikulate-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-16.04.3/CMakeLists.txt new/artikulate-16.08.0/CMakeLists.txt --- old/artikulate-16.04.3/CMakeLists.txt 2016-05-26 21:13:05.000000000 +0200 +++ new/artikulate-16.08.0/CMakeLists.txt 2016-05-26 22:05:02.000000000 +0200 @@ -60,8 +60,8 @@ ) # options -option(BUILD_QTMULTIMEDIA_PLUGIN "Build QtMultimedia sound backend" OFF) -option(BUILD_GSTREAMER_PLUGIN "Build GStreamer sound backend" ON) +option(BUILD_QTMULTIMEDIA_PLUGIN "Build QtMultimedia sound backend" ON) +option(BUILD_GSTREAMER_PLUGIN "Build GStreamer sound backend" OFF) add_definitions( -DQT_NO_URL_CAST_FROM_STRING Files old/artikulate-16.04.3/icons/16-apps-artikulate.png and new/artikulate-16.08.0/icons/16-apps-artikulate.png differ Files old/artikulate-16.04.3/icons/32-apps-artikulate.png and new/artikulate-16.08.0/icons/32-apps-artikulate.png differ Files old/artikulate-16.04.3/icons/48-apps-artikulate.png and new/artikulate-16.08.0/icons/48-apps-artikulate.png differ Files old/artikulate-16.04.3/icons/64-apps-artikulate.png and new/artikulate-16.08.0/icons/64-apps-artikulate.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-16.04.3/icons/CMakeLists.txt new/artikulate-16.08.0/icons/CMakeLists.txt --- old/artikulate-16.04.3/icons/CMakeLists.txt 2016-05-26 21:13:05.000000000 +0200 +++ new/artikulate-16.08.0/icons/CMakeLists.txt 2016-05-26 22:05:02.000000000 +0200 @@ -31,7 +31,7 @@ 32-apps-artikulate.png 48-apps-artikulate.png 64-apps-artikulate.png - sc-apps-artikulate.svgz + sc-apps-artikulate.svg DESTINATION ${ICON_INSTALL_DIR} THEME hicolor Files old/artikulate-16.04.3/icons/actions/16-actions-artikulate-language.png and new/artikulate-16.08.0/icons/actions/16-actions-artikulate-language.png differ Files old/artikulate-16.04.3/icons/actions/32-actions-artikulate-language.png and new/artikulate-16.08.0/icons/actions/32-actions-artikulate-language.png differ Files old/artikulate-16.04.3/icons/actions/48-actions-artikulate-language.png and new/artikulate-16.08.0/icons/actions/48-actions-artikulate-language.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-16.04.3/icons/actions/CMakeLists.txt new/artikulate-16.08.0/icons/actions/CMakeLists.txt --- old/artikulate-16.04.3/icons/actions/CMakeLists.txt 2016-05-26 21:13:05.000000000 +0200 +++ new/artikulate-16.08.0/icons/actions/CMakeLists.txt 2016-05-26 22:05:02.000000000 +0200 @@ -27,20 +27,17 @@ ICONS 16-actions-artikulate-course.png 16-actions-artikulate-expression.png - 16-actions-artikulate-language.png 16-actions-artikulate-paragraph.png 16-actions-artikulate-sentence.png 16-actions-artikulate-word.png 32-actions-artikulate-course-editor.png 32-actions-artikulate-course.png 32-actions-artikulate-expression.png - 32-actions-artikulate-language.png 32-actions-artikulate-paragraph.png 32-actions-artikulate-sentence.png 32-actions-artikulate-word.png 48-actions-artikulate-course.png 48-actions-artikulate-expression.png - 48-actions-artikulate-language.png 48-actions-artikulate-paragraph.png 48-actions-artikulate-sentence.png 48-actions-artikulate-word.png @@ -49,6 +46,7 @@ 64-actions-artikulate-paragraph.png 64-actions-artikulate-sentence.png 64-actions-artikulate-word.png + sc-actions-language-artikulate.svg sc-actions-artikulate-course-editor.svgz sc-actions-artikulate-expression.svgz sc-actions-artikulate-paragraph.svgz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-16.04.3/icons/actions/sc-actions-language-artikulate.svg new/artikulate-16.08.0/icons/actions/sc-actions-language-artikulate.svg --- old/artikulate-16.04.3/icons/actions/sc-actions-language-artikulate.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/artikulate-16.08.0/icons/actions/sc-actions-language-artikulate.svg 2016-05-26 22:05:02.000000000 +0200 @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg width="32" version="1.1" xmlns="http://www.w3.org/2000/svg" height="32" viewBox="0 0 32 32" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"> + <defs id="defs5455"> + <linearGradient id="linearGradient4232"> + <stop style="stop-color:#3889e9" id="stop4234-0"/> + <stop offset="1" style="stop-color:#5ea5fb" id="stop4236"/> + </linearGradient> + <linearGradient inkscape:collect="always" xlink:href="#linearGradient4232" id="linearGradient3426" y1="545.79797" y2="517.79797" x2="0" gradientUnits="userSpaceOnUse"/> + <linearGradient inkscape:collect="always" id="linearGradient4143"> + <stop style="stop-color:#197cf1" id="stop4145"/> + <stop offset="1" style="stop-color:#20bcfa" id="stop4147"/> + </linearGradient> + <linearGradient inkscape:collect="always" id="linearGradient4290"> + <stop style="stop-color:#7cbaf8" id="stop4292"/> + <stop offset="1" style="stop-color:#f4fcff" id="stop4294"/> + </linearGradient> + <linearGradient inkscape:collect="always" xlink:href="#linearGradient4143" id="linearGradient4229" y1="545.79797" y2="517.79797" gradientUnits="userSpaceOnUse" x2="0"/> + <linearGradient inkscape:collect="always" xlink:href="#linearGradient4290" id="linearGradient4161-1-2" y1="29.999973" y2="1.999974" x2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0501212 0 0 1.0501212 383.71407 514.99087)"/> + </defs> + <metadata id="metadata5458"/> + <g inkscape:label="Capa 1" inkscape:groupmode="layer" id="layer1" transform="matrix(1 0 0 1 -384.57143 -515.798)"> + <circle cx="400.57138" cy="531.79791" style="fill:url(#linearGradient4229);stroke-width:4" id="path3377" r="13.999958"/> + <ellipse cx="400.57138" cy="531.79791" style="fill:url(#linearGradient3426);stroke-width:4" id="ellipse4233"/> + <path inkscape:connector-curvature="0" style="fill:url(#linearGradient4161-1-2);stroke-width:0.7" id="path34-7-3" d="m 400.54266,517.79799 c -1.76581,0 -3.44655,0.33686 -4.99979,0.92831 -0.11294,0.10381 -0.25978,0.18353 -0.37598,0.17365 -0.0159,-0.002 -0.0317,-0.0116 -0.048,-0.0173 -0.76565,0.32032 -1.49196,0.71281 -2.18065,1.15799 0.0895,0.14527 0.11608,0.30699 -0.0683,0.38556 -0.031,0.0131 -0.4204,0.0523 -0.55642,0.0493 -1.95843,1.42304 -3.52947,3.33698 -4.5336,5.57129 0.0162,-0.003 0.0302,-0.01 0.0466,-0.0108 0.15241,-0.003 0.37179,0.0413 0.51816,0.0724 0.13508,0.0277 0.24403,0.11837 0.36092,0.12715 0.33177,0.0252 0.41157,-0.23281 0.68224,-0.37733 0.27965,0.0396 0.46521,-0.0472 0.71777,-0.019 0.17216,0.019 0.29651,0.20296 0.43067,0.2133 0.11282,0.0116 0.21209,-0.10575 0.32129,-0.0891 0.10608,0.0163 0.289,0.24768 0.30626,0.37734 0.022,0.16138 -0.11875,0.30672 -0.0724,0.48399 0.16905,0.17217 0.47621,0.20706 0.71777,0.30625 0.15733,-0.12963 0.0207,-0.37016 0,-0.55782 -0.003,-0.0826 0.0116,-0.1563 0,-0.23242 -0.0145,-0.12922 -0.0701,-0.24759 -0.071,-0.3582 -0.003,-0.51081 0.41206,-0.74986 0.75466,-0.95155 0.14832,-0.0879 0.2651,-0.24191 0.39376,-0.30626 0.18174,-0.0912 0.3171,-0.11234 0.46759,-0.19687 0.27191,-0.15275 0.50514,-0.27536 0.71777,-0.44845 0.0983,-0.23161 0.01,-0.54218 0.0177,-0.77109 0.0984,-0.0603 0.18284,0.0258 0.28713,0.0173 0.16408,-0.0341 0.1777,-0.26574 0.27069,-0.35816 0.0537,-0.0529 0.20219,-0.0909 0.26933,-0.14358 0.16349,-0.12828 0.21676,-0.32205 0.35958,-0.37734 0.0509,-0.0206 0.16943,-0.0149 0.2502,-0.0368 0.10629,-0.0282 0.25753,-0.15391 0.43064,-0.21325 0.11281,-0.0396 0.3712,-0.0468 0.41425,-0.0902 0.0529,-0.0539 -7e-4,-0.20603 0.0177,-0.28709 0.087,-0.40523 0.69742,-0.49111 1.0582,-0.62755 0.2529,-0.0957 0.51238,-0.27126 0.79024,-0.2174 -0.0543,0.19259 -0.31321,0.12434 -0.26934,0.35822 0.0606,0.32453 0.49513,-0.0929 0.60978,-0.14082 0.21899,-0.0923 0.59448,-0.14868 0.88182,-0.25294 0.25196,-0.0923 0.7037,-0.2327 0.46623,-0.52088 -0.19808,-0.0116 -0.29358,0.23243 -0.46623,0.30623 -0.11925,0.0191 -0.0965,-0.0998 -0.19824,-0.10932 -0.0967,-0.0116 -0.15085,0.0892 -0.25021,0.0723 -0.0989,-0.0163 -0.23746,-0.17163 -0.25291,-0.28712 -0.0396,-0.29964 0.25323,-0.42318 0.37733,-0.64668 -0.0821,-0.27104 -0.45699,-0.0551 -0.68358,-0.16132 0.0219,-0.16138 0.18883,-0.27267 0.37734,-0.30352 0.15452,-0.0258 0.50134,-0.0129 0.59336,0.0696 0.0531,0.0456 0.004,0.15851 0.0902,0.23378 0.0916,0.0826 0.20397,0.074 0.32268,0.0547 0.0425,-0.20453 -0.26598,-0.15323 -0.23243,-0.28847 0.24248,-0.15862 0.63692,-0.0285 0.9338,-0.0724 0.17089,-0.0252 0.3503,-0.14583 0.50175,-0.23103 0.14403,-0.0817 0.33116,-0.22448 0.484,-0.0903 0.0411,0.14658 -0.1331,0.19508 -0.21466,0.26796 -0.27467,0.24432 -0.5576,0.52423 -0.77109,0.808 0.13097,0.12775 0.36901,0.0636 0.59062,0.0902 0.0866,0.0116 0.19549,0.0371 0.28709,0.0534 0.10727,0.0191 0.22109,0.0136 0.30489,0.0358 0.15079,0.037 0.19113,0.19823 0.34045,0.19823 0.24557,-4.3e-4 0.2485,-0.26609 0.10931,-0.43203 0.044,-0.16941 0.11282,-0.25731 0.0534,-0.37598 -0.1106,-0.22126 -0.51644,-0.0116 -0.5373,-0.28709 -0.0131,-0.17901 0.14976,-0.171 0.21465,-0.30488 -0.0295,-0.34582 0.28365,-0.37088 0.25019,-0.68085 -0.0145,-0.12968 -0.12383,-0.13145 -0.21464,-0.25295 -0.0456,-0.0593 -0.0693,-0.17418 -0.12168,-0.22558 -0.41888,-0.0369 -0.84254,-0.0601 -1.27147,-0.0601 z m -7.2242,2.8246 0.002,0 c 0.0835,0.0116 0.18452,0.10166 0.28574,0.10944 0.0957,0.003 0.17479,-0.0527 0.23379,-0.0369 0.15009,0.0397 0.2134,0.26624 0.0722,0.37734 -0.11734,0.0145 -0.1631,-0.0513 -0.25156,-0.0359 -0.24381,0.0415 -0.33733,0.51895 -0.51954,0.50314 -0.1718,-0.0145 -0.26481,-0.43317 -0.0901,-0.5578 0.0116,-0.10886 -0.0793,-0.12626 -0.0737,-0.23379 0.0515,-0.0664 0.199,-0.13729 0.3418,-0.12574 z m -0.80799,0.0561 c 0.0495,0.002 0.0873,0.0136 0.10661,0.0356 -0.0237,0.19134 -0.17352,0.17878 -0.32129,0.26796 -0.25522,0.15404 -0.40277,0.38876 -0.48398,0.71778 -0.0234,0.0957 -0.27501,0.34942 -0.39648,0.32404 -0.28465,-0.06 0.0786,-0.58473 0.14356,-0.66447 0.0722,-0.0884 0.1683,-0.16591 0.25292,-0.26797 0.0817,-0.0989 0.13555,-0.23226 0.21465,-0.28709 0.0866,-0.06 0.33404,-0.13155 0.48399,-0.12575 z m 2.12458,0.6453 c 0.0912,0.002 0.17315,0.0163 0.21054,0.0534 -0.0585,0.23706 -0.56928,0.17446 -0.75604,0.0887 0.0116,-0.0894 0.15185,-0.1141 0.26934,-0.12575 0.0826,-0.003 0.18515,-0.0191 0.27616,-0.0163 z m -1.16208,0.43752 c 0.0606,-0.002 0.12217,0.0116 0.18593,0.0285 -0.1652,0.13818 -0.34385,0.21646 -0.62755,0.30623 -0.1364,0.0429 -0.37198,0.0965 -0.39511,-0.0561 -0.0282,-0.1867 0.19947,-0.14326 0.32401,-0.15996 0.15683,-0.0216 0.32899,-0.11305 0.51272,-0.119 z m 17.82809,1.06365 c -0.0212,0.0512 -0.0368,0.10123 -0.0344,0.15038 0.0116,0.0866 0.10597,0.16995 0.12714,0.28712 0.0116,0.0624 -0.0291,0.1963 0,0.25296 0.0864,0.1676 0.31262,0.0471 0.47443,0.0561 -0.18382,-0.25312 -0.36738,-0.50666 -0.5674,-0.74648 z m 0.91737,1.23458 c -0.0257,0.12369 -0.10978,0.28498 -0.17771,0.38828 -0.15648,0.23799 -0.36901,0.24908 -0.59336,0.37598 -0.18711,0.10607 -0.26765,0.28308 -0.37736,0.46757 -0.11887,0.19929 -0.1925,0.31969 -0.14353,0.60843 -0.16041,0.31816 -0.4033,0.5131 -0.73555,0.66443 -0.0983,0.0444 -0.2325,0.061 -0.32266,0.12574 -0.0719,0.0515 -0.11258,0.19025 -0.21464,0.30486 -0.12587,0.1401 -0.25786,0.1992 -0.32405,0.30626 -0.0509,0.0826 -0.0691,0.24722 -0.12574,0.35821 -0.0764,0.15074 -0.23982,0.2246 -0.34045,0.37734 -0.0457,0.0709 -0.0763,0.21376 -0.12714,0.30626 -0.11375,0.20665 -0.30799,0.35553 -0.28713,0.53728 0.0206,0.17566 0.2202,0.20646 0.23379,0.35959 0.003,0.0865 -0.0571,0.13946 -0.0534,0.23379 0.003,0.13774 0.0961,0.23442 0.10662,0.34043 0.0267,0.26649 -0.0906,0.37285 -0.14082,0.55506 -0.0237,0.087 -0.0135,0.18497 -0.0369,0.25295 -0.0442,0.13341 -0.23008,0.25379 -0.23379,0.41152 -0.002,0.11211 0.11504,0.20222 0.12447,0.35957 0.003,0.10862 -0.0533,0.22429 -0.0341,0.32403 0.0383,0.19532 0.38685,0.42245 0.53869,0.57421 0.20306,0.20308 0.46891,0.36024 0.55642,0.57422 0.0737,0.18171 0.0731,0.41811 0.21467,0.55508 0.10468,0.10112 0.27877,0.16414 0.41288,0.2693 0.12512,0.0982 0.26142,0.18296 0.39513,0.28711 0.21847,0.17094 0.5488,0.51165 0.89686,0.48538 0.18177,-0.0131 0.36805,-0.16162 0.57424,-0.19824 0.2121,-0.0381 0.48736,-0.0577 0.70134,-0.0356 0.16391,0.016 0.33274,0.11445 0.50313,0.10661 0.1799,-0.0116 0.38621,-0.14449 0.59063,-0.23378 0.16448,-0.0717 0.36634,-0.15092 0.58788,-0.2092 0.10167,-0.68287 0.15587,-1.38248 0.15587,-2.09452 0,-2.86665 -0.85718,-5.52366 -2.32421,-7.73828 z m -23.15467,4.70449 c -0.29817,0.0162 -0.49356,0.0299 -0.66305,0.10661 -0.38842,0.17674 -0.31336,0.7016 -0.70139,0.82578 -0.13421,0.0429 -0.31847,0.045 -0.46619,0.0723 -0.12753,0.0233 -0.28285,0.0929 -0.41428,0.0901 -0.0369,-4.8e-4 -0.0882,-0.0278 -0.13398,-0.0425 -0.0344,0.24612 -0.0631,0.49499 -0.0849,0.74512 0.36914,0.0709 0.55966,0.56 0.88595,0.72188 0.0894,0.0443 0.2062,0.0467 0.32129,0.0723 0.0928,0.0206 0.16342,0.06 0.2529,0.0904 0.18986,0.0645 0.42238,0.0566 0.57424,0.12447 0.22881,0.10156 0.39658,0.53156 0.59335,0.6467 0.0116,0.11596 -0.0226,0.27171 0.0177,0.35816 0.0929,0.12613 0.2242,0.0983 0.37736,0.18047 0.1832,0.0989 0.23925,0.35404 0.41286,0.43202 0.0599,0.0266 0.21021,0.0229 0.30491,0.052 0.23792,0.0719 0.31559,0.34727 0.51954,0.28711 0.13375,-0.0396 0.1232,-0.17704 0.1449,-0.30489 0.0884,-0.0957 0.18485,-0.2475 0.32267,-0.2502 0.22303,-0.0116 0.24289,0.23046 0.324,0.44706 0.0457,0.12244 0.1656,0.22909 0.19689,0.35822 0.0555,0.22305 0.0279,0.89069 -0.0191,1.02401 -0.0561,0.16356 -0.27772,0.23293 -0.41426,0.41427 -0.0645,0.085 -0.0951,0.20958 -0.14356,0.26932 -0.0879,0.10715 -0.21858,0.13504 -0.28435,0.2338 -0.0373,0.0555 -0.0732,0.17499 -0.10944,0.25018 -0.1078,0.22842 -0.252,0.39026 -0.16135,0.66448 0.0381,0.11282 0.2142,0.18846 0.21466,0.32128 5e-4,0.15629 -0.33241,0.29622 -0.35818,0.46756 -0.0191,0.1275 0.10296,0.35503 0.14352,0.52091 0.0297,0.12537 0.26655,0.20372 0.34046,0.28712 0.126,0.14145 0.22667,0.34185 0.34176,0.51953 0.22762,0.34946 0.40597,0.77567 0.62758,1.11426 0.1171,0.17734 0.28154,0.3368 0.35954,0.52089 0.0401,0.0929 0.0344,0.20363 0.071,0.28711 0.12827,0.28953 0.69477,0.59182 0.9871,0.73555 0.13685,0.0667 0.28867,0.0902 0.41427,0.15995 0.19022,0.10607 0.56705,0.391 0.66308,0.55782 0.0856,0.14993 0.13887,0.51491 0.18046,0.75332 0.0556,0.31507 6.4e-4,0.55698 0.0177,0.89824 0.0116,0.18452 0.0705,0.37007 0.0724,0.55509 7e-4,0.0649 -0.0344,0.11294 -0.0371,0.17909 -1e-4,0.0108 0.004,0.0229 0.004,0.0341 1.76313,0.79793 3.71685,1.25237 5.78456,1.25237 0.37357,0 0.74275,-0.0193 1.10878,-0.048 0.016,-0.0275 0.0308,-0.0562 0.0507,-0.0818 0.0843,-0.1106 0.1591,-0.20746 0.21468,-0.30486 0.0529,-0.32774 -0.13072,-0.55667 -0.0534,-0.84356 0.0857,-0.32226 0.53127,-0.51907 0.84358,-0.66446 0.10737,-0.0495 0.21736,-0.13094 0.30486,-0.16132 0.21613,-0.0751 0.486,-0.0343 0.68359,-0.10662 0.3363,-0.12307 0.37144,-0.48384 0.5373,-0.79026 0.0781,-0.14508 0.18155,-0.29039 0.1969,-0.39372 0.0135,-0.0929 -0.0342,-0.18031 -0.019,-0.28986 0.0161,-0.10838 0.11351,-0.20216 0.14356,-0.3213 0.0396,-0.15546 0.0561,-0.38324 0.0561,-0.55642 0,-0.14217 -0.0667,-0.2669 -0.072,-0.39514 -0.0232,-0.46557 0.16817,-0.51767 0.34045,-0.77106 0.0864,-0.12587 0.11874,-0.26938 0.17908,-0.35959 0.28921,-0.43147 0.79099,-0.63977 0.75469,-1.292 -0.0116,-0.2158 -0.14747,-0.70355 -0.30625,-0.77243 -0.0909,-0.0397 -0.29924,-0.003 -0.43066,-0.0534 -0.42428,-0.15824 -0.67327,-0.68417 -1.11288,-0.71777 -0.0939,-0.0116 -0.18009,0.0387 -0.28575,0.0369 -0.17399,-0.0116 -0.43628,-0.1218 -0.62891,-0.14354 -0.12242,-0.0131 -0.28608,0.0365 -0.35957,0 -0.112,-0.0544 -0.12346,-0.26107 -0.21466,-0.32266 -0.0721,-0.0498 -0.21299,-0.0668 -0.32264,-0.10932 -0.17677,-0.0677 -0.31693,-0.1471 -0.5209,-0.1613 -0.063,-0.003 -0.14135,0.0299 -0.21465,0.0191 -0.11282,-0.0191 -0.20211,-0.15264 -0.30623,-0.21602 -0.13044,-0.0793 -0.25097,-0.11786 -0.30491,-0.23104 0.11785,-0.38664 -0.20784,-0.49439 -0.2871,-0.71778 -0.0381,-0.10468 -0.0203,-0.23065 -0.0534,-0.32403 -0.0467,-0.13375 -0.17905,-0.21105 -0.32404,-0.32264 -0.25972,-0.19992 -0.49013,-0.38762 -0.86131,-0.4334 -0.16321,-0.0206 -0.32511,0.0488 -0.52229,0.0369 -0.20891,-0.0131 -0.47123,-0.19598 -0.62751,-0.3746 -0.15193,-0.17441 -0.22584,-0.33092 -0.35822,-0.41427 -0.12535,-0.0803 -0.29175,-0.0783 -0.37734,-0.15997 -0.0385,-0.0358 -0.0313,-0.0966 -0.0723,-0.18047 -0.0631,-0.13055 -0.16888,-0.20313 -0.0901,-0.35955 -0.14304,-0.0735 -0.14699,0.1365 -0.30351,0.10932 -0.13954,-0.19805 -0.25741,-0.29187 -0.57424,-0.2338 -0.14507,0.0267 -0.22607,0.21012 -0.3951,0.21466 -0.13864,0.0116 -0.24755,-0.15446 -0.43066,-0.18047 -0.13824,-0.0191 -0.29537,0.0374 -0.39377,0.0187 -0.15319,-0.0306 -0.20048,-0.15817 -0.34044,-0.25018 -0.10263,-0.0676 -0.302,-0.1823 -0.35955,-0.18047 -0.18043,0.0116 -0.30899,0.3834 -0.5578,0.25157 -0.12092,-0.15325 0.19695,-0.234 0.0534,-0.37738 -0.10872,-0.10873 -0.20012,0.0493 -0.2871,0.10944 -0.0997,0.069 -0.19337,0.13696 -0.30353,0.17773 -0.24657,0.0923 -0.40067,0.0442 -0.59335,0.14355 -0.17842,0.0924 -0.18602,0.24705 -0.28711,0.43066 -0.0826,0.15042 -0.27092,0.36964 -0.3951,0.37871 -0.15046,0.0116 -0.29424,-0.21033 -0.43067,-0.26932 -0.41109,-0.17806 -0.61022,0.15811 -0.95155,0.16269 -0.3168,0.0116 -0.76927,-0.51155 -0.75332,-0.80938 0.003,-0.18173 0.10446,-0.45741 0.12574,-0.68222 0.0191,-0.17881 0.14152,-0.28659 0.14359,-0.44981 0.003,-0.21802 -0.28921,-0.38566 -0.43069,-0.41153 -0.33535,-0.0617 -0.80098,0.13494 -1.18533,-0.0191 -0.0734,-0.12167 0.086,-0.20571 0.12715,-0.32404 0.0233,-0.0674 0.01,-0.15706 0.0343,-0.23105 0.0429,-0.11433 0.16242,-0.20291 0.21602,-0.32402 0.04,-0.0924 0.0498,-0.22575 0.0901,-0.34042 0.0471,-0.1306 0.13346,-0.21468 0.14356,-0.30627 0.0131,-0.12091 -0.0325,-0.2607 -0.12716,-0.34042 z m 4.79884,3.79941 c 0.12167,0.0116 0.13691,0.26279 0.0127,0.28305 -0.13421,0.0207 -0.20246,-0.21055 -0.0722,-0.27075 0.0218,-0.0116 0.043,-0.0116 0.0601,-0.0108 l 0,-0.002 z"/> + </g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-16.04.3/icons/sc-apps-artikulate.svg new/artikulate-16.08.0/icons/sc-apps-artikulate.svg --- old/artikulate-16.04.3/icons/sc-apps-artikulate.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/artikulate-16.08.0/icons/sc-apps-artikulate.svg 2016-05-26 22:05:02.000000000 +0200 @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg width="48" version="1.1" xmlns="http://www.w3.org/2000/svg" height="48" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"> + <defs id="defs5455"> + <linearGradient inkscape:collect="always" id="linearGradient4277"> + <stop style="stop-color:#2e62f2" id="stop4279"/> + <stop offset="1" style="stop-color:#29cdfa" id="stop4282"/> + </linearGradient> + <linearGradient inkscape:collect="always" id="linearGradient4172"> + <stop style="stop-color:#633677" id="stop4174"/> + <stop offset="1" style="stop-color:#824bac" id="stop4176"/> + </linearGradient> + <linearGradient inkscape:collect="always" id="linearGradient4145"> + <stop style="stop-color:#046526" id="stop4148"/> + <stop offset="1" style="stop-color:#22d156" id="stop4150"/> + </linearGradient> + <linearGradient inkscape:collect="always" id="linearGradient4290"> + <stop style="stop-color:#7cbaf8" id="stop4292"/> + <stop offset="1" style="stop-color:#f4fcff" id="stop4294"/> + </linearGradient> + <linearGradient inkscape:collect="always" id="linearGradient4227"> + <stop style="stop-color:#292c2f" id="stop4229"/> + <stop offset="1" style="stop-opacity:0" id="stop4231"/> + </linearGradient> + <linearGradient inkscape:collect="always" id="linearGradient4283-8"> + <stop id="stop4285-5"/> + <stop offset="1" style="stop-opacity:0" id="stop4287-8"/> + </linearGradient> + <linearGradient inkscape:collect="always" xlink:href="#linearGradient4145" id="linearGradient4303" y1="49.849445" x1="88.49917" y2="2.602173" gradientUnits="userSpaceOnUse" x2="38.19248" gradientTransform="matrix(0.5277778 0 0 0.5 361.45952 497.53212)"/> + <linearGradient inkscape:collect="always" xlink:href="#linearGradient4283-8" id="linearGradient4305" y1="-434.29834" x1="-424.95181" y2="-426.87933" gradientUnits="userSpaceOnUse" x2="-415.03134" gradientTransform="matrix(0.99521603 0.09769877 -0.09769877 0.99521603 387.51534 478.56021)"/> + <linearGradient inkscape:collect="always" xlink:href="#linearGradient4172" id="linearGradient4307" y1="24.09925" x1="77.17793" y2="4.09925" gradientUnits="userSpaceOnUse" x2="57.17793" gradientTransform="matrix(0.81508312 0 0 0.81508312 367.07585 526.58237)"/> + <linearGradient inkscape:collect="always" xlink:href="#linearGradient4283-8" id="linearGradient4309" y1="-434.29834" x1="-424.95181" y2="-426.87933" gradientUnits="userSpaceOnUse" x2="-415.03134" gradientTransform="matrix(0.99521603 0.09769877 -0.09769877 0.99521603 799.05552 1009.5145)"/> + <linearGradient inkscape:collect="always" xlink:href="#linearGradient4277" id="linearGradient4325" y1="545.79797" y2="517.79797" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.2857121 0 0 1.2857121 -106.44818 -159.94116)"/> + <linearGradient inkscape:collect="always" xlink:href="#linearGradient4227" id="linearGradient4327" y1="19.704916" x1="20.804823" y2="12.02693" gradientUnits="userSpaceOnUse" x2="8.864549" gradientTransform="matrix(1.2857121 0 0 1.2857121 387.99997 503.2266)"/> + <linearGradient inkscape:collect="always" xlink:href="#linearGradient4227" id="linearGradient4329" y1="12.505747" x1="23.00004" y2="19.505716" gradientUnits="userSpaceOnUse" x2="30.00001" gradientTransform="matrix(1.2857121 0 0 1.2857121 387.99997 503.2266)"/> + <linearGradient inkscape:collect="always" xlink:href="#linearGradient4290" id="linearGradient4331" y1="29.999973" y2="1.999974" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1.2857121 0 0 1.2857121 387.99997 503.2266)"/> + </defs> + <metadata id="metadata5458"/> + <g inkscape:label="Capa 1" inkscape:groupmode="layer" id="layer1" transform="matrix(1 0 0 1 -384.57143 -499.798)"> + <g id="g4311" transform="matrix(0.94444662 0 0 0.94444662 22.697562 29.09879)"> + <rect width="35.999954" x="390.57141" y="505.798" rx="17.999977" height="35.999973" style="fill:url(#linearGradient4325)" id="rect4130"/> + <path inkscape:connector-curvature="0" style="fill:url(#linearGradient4327);opacity:0.2;fill-rule:evenodd" id="path4286" d="m 411.90618,506.11694 -3.82449,0.48968 -5.31612,3.06863 -1.93107,3.34485 c 0,0 -2.53787,1.7875 -2.92049,1.68499 -3.23586,-0.038 -4.97391,0.85457 -5.88866,1.98884 -0.38682,0.90405 -0.69034,1.85097 -0.92661,2.82505 -0.006,0.97808 0.20842,1.73772 0.20842,1.73772 9.07784,8.17236 18.15567,11.69509 27.2335,17.54043 0.5716,-0.37973 1.11749,-0.79203 1.63978,-1.23298 0.03,-0.0253 0.0581,-0.0524 0.0879,-0.0779 0.46267,-0.39585 0.90369,-0.81761 1.32338,-1.25809 0.0929,-0.0974 0.18045,-0.19939 0.27121,-0.29883 0.36343,-0.39908 0.71063,-0.81206 1.0371,-1.24301 0.0738,-0.0971 0.14663,-0.19515 0.21848,-0.29382 0.35419,-0.48799 0.68743,-0.99306 0.9919,-1.51673 0.0228,-0.039 0.0478,-0.0763 0.0703,-0.11551 1.3691,-2.39635 2.20346,-5.14141 2.34542,-8.07588 4e-4,-0.008 0.002,-0.0167 0.003,-0.0251 l 0,-0.003 -2.34549,-9.81856 c -2.57099,-4.48466 -7.00935,-7.74076 -12.27704,-8.72125 z"/> + <path inkscape:connector-curvature="0" style="fill:url(#linearGradient4329);opacity:0.2;fill-rule:evenodd" id="path4219" d="m 425.30069,517.16602 -5.5371,8.56305 5.29603,5.29603 c 0.96625,-2.21137 1.51172,-4.65155 1.51172,-7.22711 0,-2.34745 -0.46027,-4.57933 -1.27065,-6.63197 z"/> + <path inkscape:connector-curvature="0" style="fill:url(#linearGradient4331)" id="path34" d="m 408.32276,505.81058 c -1.37889,0.0187 -2.71443,0.19773 -4.00027,0.50725 -0.33849,0.30359 -0.83805,0.45751 -1.39872,0.44197 -0.20068,0.19197 -0.15434,0.55009 -0.26366,0.8136 -0.0921,0.2214 -0.41641,0.45831 -0.63784,0.43946 -0.1638,-0.0139 -0.35102,-0.24418 -0.35156,-0.39676 -5.9e-4,-0.18421 0.25602,-0.28689 0.11551,-0.49219 -1.43287,0.5808 -2.7656,1.34657 -3.9852,2.25753 0.3271,-0.12045 0.68782,-0.32294 0.98437,-0.32896 0.0487,-5.8e-4 0.0935,0.004 0.13811,0.015 0.19919,0.0522 0.72412,0.62712 0.28627,0.81362 -0.0415,0.018 -0.64207,0.0833 -0.74581,0.0652 -0.1525,-0.0256 -0.2432,-0.23634 -0.39677,-0.26367 -0.25792,-0.0446 -0.58586,0.22326 -0.80858,0.10296 -2.4529,1.97994 -4.35646,4.59635 -5.49693,7.59875 0.10464,-0.0605 0.21171,-0.12399 0.30636,-0.17326 0.32133,-0.16704 0.5927,-0.43705 0.9668,-0.46205 0.1866,-0.004 0.45612,0.0502 0.63533,0.0878 0.1654,0.0339 0.29884,0.14491 0.44196,0.15569 0.40618,0.031 0.5023,-0.28508 0.8337,-0.46205 0.34236,0.0483 0.56971,-0.0573 0.87891,-0.0226 0.2108,0.0232 0.36308,0.24854 0.52733,0.26115 0.13818,0.0139 0.26055,-0.12844 0.39426,-0.10797 0.12989,0.0201 0.35305,0.30331 0.37416,0.46205 0.0266,0.19759 -0.14463,0.37562 -0.0879,0.59264 0.20698,0.2108 0.58313,0.25271 0.87891,0.37415 0.19259,-0.1587 0.0256,-0.4533 0,-0.68303 -0.004,-0.10118 0.0139,-0.19056 0,-0.28376 -0.018,-0.1582 -0.0869,-0.30404 -0.0878,-0.43945 -0.004,-0.6254 0.5046,-0.91823 0.9241,-1.16518 0.18158,-0.10761 0.32459,-0.29539 0.48215,-0.37416 0.22249,-0.1116 0.38829,-0.13754 0.57254,-0.24107 0.33291,-0.18701 0.6186,-0.33802 0.8789,-0.54995 0.12034,-0.28356 0.0132,-0.66394 0.0226,-0.94419 0.12048,-0.0738 0.22385,0.0331 0.35156,0.0226 0.20091,-0.0419 0.21763,-0.32625 0.33148,-0.43946 0.0662,-0.065 0.24674,-0.11139 0.32896,-0.17578 0.20024,-0.15708 0.26461,-0.39436 0.43945,-0.46205 0.0626,-0.0255 0.20756,-0.0186 0.30636,-0.0452 0.13016,-0.0346 0.3154,-0.18851 0.52735,-0.26117 0.13818,-0.0482 0.45451,-0.0575 0.50725,-0.11049 0.0649,-0.0662 -9e-5,-0.25231 0.0226,-0.35156 0.10658,-0.49611 0.85402,-0.60136 1.29575,-0.76842 0.30961,-0.11737 0.6266,-0.33212 0.9668,-0.26617 -0.0666,0.2358 -0.38269,0.15313 -0.32897,0.43945 0.0742,0.39735 0.60549,-0.11475 0.74582,-0.17328 0.26815,-0.11301 0.72798,-0.18123 1.07979,-0.30887 0.3085,-0.11301 0.86082,-0.28497 0.57004,-0.63783 -0.24247,-0.0139 -0.35866,0.28378 -0.57004,0.37416 -0.14595,0.0233 -0.11901,-0.12135 -0.24357,-0.13308 -0.11842,-0.0139 -0.18473,0.10858 -0.30637,0.0878 -0.12085,-0.0201 -0.28994,-0.21015 -0.30887,-0.35156 -0.0482,-0.36689 0.31011,-0.5174 0.46205,-0.79102 -0.10041,-0.33188 -0.55879,-0.0686 -0.83621,-0.19838 0.0265,-0.19757 0.23126,-0.33388 0.46205,-0.37165 0.18919,-0.0319 0.61306,-0.0154 0.72573,0.0854 0.0652,0.0554 0.005,0.19412 0.11049,0.28627 0.11199,0.10119 0.24891,0.0917 0.39425,0.0678 0.0526,-0.25043 -0.32482,-0.1885 -0.28376,-0.35407 0.29687,-0.19419 0.7791,-0.0339 1.14258,-0.0879 0.20922,-0.031 0.42983,-0.17942 0.61523,-0.28376 0.17634,-0.10041 0.40556,-0.2747 0.59263,-0.11049 0.0508,0.17946 -0.16377,0.23973 -0.26367,0.32897 -0.33628,0.29913 -0.68282,0.64196 -0.94419,0.98939 0.16036,0.15643 0.45187,0.0782 0.72321,0.11049 0.10607,0.0139 0.23939,0.0455 0.35156,0.0653 0.13099,0.0232 0.27155,0.0161 0.37416,0.0427 0.1846,0.0454 0.23408,0.24358 0.41686,0.24358 0.30067,-5.4e-4 0.30341,-0.32669 0.13309,-0.52986 0.0537,-0.20744 0.13797,-0.31424 0.0652,-0.45954 -0.13541,-0.2709 -0.63239,-0.0139 -0.65793,-0.35156 -0.0163,-0.21913 0.18424,-0.21022 0.26368,-0.37417 -0.0361,-0.4234 0.34731,-0.45418 0.30636,-0.83369 -0.018,-0.15874 -0.15255,-0.16015 -0.26368,-0.30888 -0.0577,-0.076 -0.0837,-0.22737 -0.15318,-0.28628 -0.22986,-0.1942 -0.69743,-0.15665 -0.72572,-0.52733 -0.004,-0.12545 0.0138,-0.23791 0.0251,-0.35659 -0.21192,-0.0103 -0.42149,-0.0298 -0.63532,-0.0327 l -0.49721,0 z m -8.56304,4.31165 c 0.1026,0.0139 0.2271,0.12368 0.35156,0.13309 0.11739,0.004 0.2141,-0.0644 0.28627,-0.0452 0.18379,0.0483 0.26057,0.32603 0.0879,0.46205 -0.14368,0.018 -0.20057,-0.0618 -0.30887,-0.0427 -0.29849,0.0508 -0.41226,0.63458 -0.63532,0.61523 -0.21038,-0.018 -0.32409,-0.53044 -0.11049,-0.68303 0.0139,-0.1332 -0.0971,-0.15461 -0.0904,-0.28627 0.0635,-0.0814 0.244,-0.16798 0.41936,-0.15318 z m -0.9894,0.0678 c 0.0612,0.003 0.10715,0.0161 0.13058,0.0427 -0.0292,0.23424 -0.21334,0.21976 -0.39425,0.32896 -0.31244,0.18858 -0.49322,0.47604 -0.59264,0.8789 -0.0288,0.11739 -0.33591,0.42784 -0.48464,0.39677 -0.34849,-0.0734 0.0963,-0.71598 0.17577,-0.81362 0.0878,-0.10825 0.20525,-0.204 0.30887,-0.32896 0.10042,-0.12099 0.16683,-0.28441 0.26368,-0.35156 0.10607,-0.0734 0.40902,-0.16022 0.59263,-0.15318 z m 2.60156,0.79101 c 0.1116,0.003 0.21035,0.0201 0.25614,0.0653 -0.0716,0.29023 -0.69547,0.21284 -0.92411,0.10797 0.0149,-0.10941 0.18507,-0.13873 0.32896,-0.15318 0.10119,-0.004 0.22757,-0.0233 0.33901,-0.0201 z m -1.42382,0.53488 c 0.0742,-0.003 0.15045,0.0145 0.22851,0.0352 -0.20227,0.16917 -0.42108,0.26426 -0.76841,0.37416 -0.16702,0.0528 -0.45636,0.11876 -0.48466,-0.0678 -0.0346,-0.2286 0.24425,-0.17541 0.39676,-0.19586 0.19199,-0.0265 0.40287,-0.13845 0.6278,-0.14565 z m 22.07557,0.32645 c 0.0166,0.16514 0.0193,0.32193 -0.0251,0.49972 -0.0598,0.23809 -0.27415,0.45401 -0.26367,0.66043 0.0139,0.10607 0.12974,0.20811 0.15569,0.35157 0.0139,0.0761 -0.0356,0.23951 0,0.30887 0.1116,0.21641 0.4165,0.033 0.61524,0.0652 0.19415,0.0312 0.41902,0.30976 0.41684,0.52734 -0.003,0.15153 -0.14508,0.40396 -0.24106,0.54995 -0.19158,0.29133 -0.45102,0.30414 -0.72572,0.45954 -0.22911,0.12987 -0.32776,0.34661 -0.46206,0.57254 -0.14552,0.24401 -0.23572,0.39229 -0.17578,0.74581 -0.19639,0.38955 -0.49468,0.62831 -0.90151,0.81362 -0.12033,0.0544 -0.28385,0.0733 -0.39425,0.15318 -0.0878,0.0633 -0.13876,0.2338 -0.26367,0.37417 -0.15413,0.17152 -0.31572,0.2431 -0.39676,0.37415 -0.0626,0.10119 -0.084,0.30354 -0.15318,0.43945 -0.0939,0.18458 -0.29366,0.27503 -0.41685,0.46206 -0.0562,0.0865 -0.0936,0.26094 -0.15569,0.37416 -0.13921,0.25302 -0.37713,0.43542 -0.35157,0.65793 0.0255,0.21508 0.26962,0.25197 0.28627,0.43945 0.004,0.10594 -0.0697,0.17077 -0.0652,0.28627 0.004,0.16863 0.11731,0.28707 0.13058,0.41685 0.0328,0.32632 -0.11192,0.45743 -0.17326,0.68053 -0.0292,0.10658 -0.0169,0.22559 -0.0452,0.30887 -0.0537,0.16331 -0.28178,0.31162 -0.28628,0.50474 -0.003,0.13721 0.1416,0.24684 0.15318,0.43945 0.004,0.13279 -0.0661,0.27469 -0.0427,0.39676 0.0467,0.23916 0.47457,0.51731 0.66044,0.70313 0.24863,0.24861 0.5734,0.44119 0.68052,0.70312 0.0904,0.22249 0.0904,0.5129 0.26367,0.68053 0.12819,0.12381 0.34053,0.20019 0.50475,0.32896 0.15315,0.12021 0.32093,0.22402 0.48465,0.35156 0.26751,0.20925 0.67119,0.62729 1.09738,0.59515 0.2225,-0.0163 0.45068,-0.19874 0.70312,-0.24359 0.25971,-0.0464 0.59683,-0.0697 0.85882,-0.0427 0.20068,0.0201 0.40661,0.14016 0.61523,0.13058 0.22026,-0.0139 0.47291,-0.17695 0.72321,-0.28627 0.39552,-0.17213 0.97073,-0.38603 1.54938,-0.35407 0.11076,-0.81044 0.18834,-1.6317 0.18834,-2.47349 0,-3.40599 -0.95332,-6.57376 -2.58398,-9.28375 -0.0757,-0.005 -0.14537,-0.0156 -0.22852,-0.0126 -0.22299,0.0139 -0.58932,0.0139 -0.59263,-0.26367 -0.002,-0.22796 0.21504,-0.27831 0.4746,-0.29381 -0.48551,-0.7429 -1.03004,-1.44115 -1.61718,-2.10183 z m -27.47456,8.24664 c -0.36508,0.0201 -0.60355,0.0368 -0.81111,0.13058 -0.47554,0.21642 -0.3837,0.85996 -0.85881,1.01199 -0.16432,0.0526 -0.38912,0.0544 -0.57003,0.0879 -0.1561,0.0284 -0.34636,0.11384 -0.50725,0.1105 -0.19037,-0.004 -0.52212,-0.18727 -0.63533,-0.30887 -0.0779,-0.0844 -0.20547,-0.37921 -0.28878,-0.57506 -0.11474,0.63269 -0.19387,1.27674 -0.24108,1.93108 0.039,0.007 0.0802,0.0176 0.11301,0.0176 0.2081,9e-4 0.43072,-0.21469 0.66043,-0.22099 0.53882,-0.0149 0.77276,0.68565 1.20787,0.90151 0.10941,0.0544 0.25335,0.0566 0.39425,0.0879 0.11379,0.0255 0.1993,0.0734 0.30887,0.11049 0.23243,0.0788 0.5172,0.0703 0.70313,0.15318 0.28016,0.12434 0.48481,0.65008 0.72572,0.79102 0.0139,0.14205 -0.0263,0.33355 0.0226,0.43945 0.11379,0.15433 0.27454,0.12036 0.46206,0.22099 0.2243,0.12099 0.29215,0.43187 0.50474,0.52734 0.0733,0.0327 0.25822,0.0297 0.37416,0.0652 0.2913,0.0882 0.38563,0.42526 0.63532,0.35155 0.16377,-0.0482 0.15176,-0.21761 0.17829,-0.37416 0.10826,-0.11738 0.22552,-0.30304 0.39425,-0.30636 0.27305,-0.0139 0.29741,0.28223 0.39677,0.54743 0.0561,0.14987 0.20278,0.28134 0.24107,0.43945 0.068,0.27306 0.035,1.08981 -0.0226,1.25307 -0.0688,0.20023 -0.3401,0.28524 -0.50725,0.50726 -0.0788,0.10401 -0.11631,0.25579 -0.17578,0.32896 -0.10762,0.13099 -0.26855,0.16537 -0.34906,0.28627 -0.0455,0.068 -0.0889,0.21431 -0.13309,0.30636 -0.13195,0.27964 -0.30939,0.47789 -0.19838,0.81362 0.0464,0.13819 0.26313,0.23163 0.26367,0.39425 5.7e-4,0.19138 -0.4079,0.36277 -0.43945,0.57254 -0.0233,0.1561 0.12631,0.43471 0.17578,0.63784 0.0364,0.15348 0.32639,0.24942 0.41685,0.35155 0.1543,0.17316 0.27841,0.4178 0.41937,0.63533 0.27864,0.42786 0.49711,0.94903 0.76841,1.36356 0.14339,0.2171 0.34392,0.41247 0.43945,0.63783 0.0489,0.11379 0.0429,0.24938 0.0879,0.35156 0.15706,0.35451 0.84995,0.72556 1.20786,0.90151 0.16758,0.0815 0.35354,0.11069 0.50726,0.19587 0.23293,0.12987 0.69349,0.4788 0.81111,0.68304 0.10477,0.18357 0.17005,0.62965 0.22097,0.92159 0.068,0.38575 0.004,0.68209 0.0226,1.09989 0.0139,0.22596 0.0854,0.45406 0.0878,0.68052 9e-4,0.0793 -0.0418,0.13753 -0.0452,0.21847 -0.004,0.27416 0.0686,0.58298 0.0452,0.85881 -0.002,0.0591 -0.008,0.10363 -0.0176,0.15569 2.15688,0.91038 4.53041,1.41379 7.02622,1.41379 0.26119,0 0.51501,-0.0293 0.77343,-0.0402 0.005,-0.041 0.0118,-0.0823 0.0201,-0.11551 0.0796,-0.22297 0.28476,-0.29722 0.41685,-0.46205 0.10029,-0.12433 0.14611,-0.26997 0.24108,-0.39425 0.10324,-0.13541 0.19562,-0.25491 0.26366,-0.37416 0.0649,-0.40125 -0.15988,-0.68083 -0.0652,-1.03209 0.10504,-0.39456 0.64973,-0.63559 1.03208,-0.81361 0.13154,-0.0611 0.26704,-0.1612 0.37417,-0.19839 0.26461,-0.0922 0.59426,-0.0424 0.83622,-0.13058 0.41175,-0.1507 0.45486,-0.59165 0.65791,-0.96679 0.0958,-0.17766 0.2223,-0.35561 0.24108,-0.48215 0.0163,-0.11378 -0.0409,-0.21996 -0.0226,-0.35406 0.0201,-0.1328 0.13895,-0.2484 0.17578,-0.39426 0.0482,-0.19038 0.0678,-0.46847 0.0678,-0.68052 0,-0.17405 -0.0806,-0.32766 -0.0879,-0.48465 -0.0284,-0.57005 0.20593,-0.63397 0.41685,-0.9442 0.10581,-0.15413 0.14459,-0.32901 0.21847,-0.43945 0.35405,-0.52827 0.96854,-0.78349 0.92411,-1.58203 -0.0149,-0.26425 -0.1798,-0.86235 -0.37417,-0.9467 -0.11121,-0.0483 -0.36644,-0.004 -0.52734,-0.0652 -0.51944,-0.19377 -0.82533,-0.83778 -1.36356,-0.87891 -0.11494,-0.0139 -0.21969,0.0472 -0.34905,0.0452 -0.21305,-0.0139 -0.53506,-0.14924 -0.77093,-0.17577 -0.14986,-0.0163 -0.34948,0.0445 -0.43945,0 -0.13722,-0.0667 -0.15204,-0.31885 -0.26367,-0.39426 -0.0886,-0.0608 -0.26001,-0.0812 -0.39425,-0.13309 -0.21643,-0.0833 -0.38811,-0.18097 -0.63783,-0.19838 -0.077,-0.004 -0.17395,0.0367 -0.26368,0.0226 -0.13818,-0.0233 -0.24667,-0.18605 -0.37415,-0.26367 -0.15971,-0.0972 -0.30815,-0.14509 -0.37417,-0.28376 0.14431,-0.47335 -0.25453,-0.60542 -0.35156,-0.87891 -0.0464,-0.12819 -0.0247,-0.28246 -0.0652,-0.39677 -0.0572,-0.16379 -0.21927,-0.25764 -0.39676,-0.39425 -0.31804,-0.24478 -0.6002,-0.47379 -1.05469,-0.52986 -0.1998,-0.0255 -0.39645,0.06 -0.63783,0.0452 -0.25582,-0.0163 -0.57706,-0.24084 -0.76842,-0.45954 -0.18601,-0.21351 -0.2774,-0.40517 -0.43945,-0.50726 -0.1535,-0.0986 -0.35721,-0.0961 -0.46206,-0.19586 -0.0467,-0.0436 -0.038,-0.1183 -0.0878,-0.22099 -0.0771,-0.15986 -0.20663,-0.24791 -0.1105,-0.43945 -0.17512,-0.09 -0.18001,0.16633 -0.37164,0.13309 -0.17081,-0.24246 -0.31522,-0.35737 -0.70313,-0.28627 -0.17765,0.0328 -0.27766,0.25809 -0.48465,0.26367 -0.16974,0.0139 -0.30315,-0.18913 -0.52734,-0.22098 -0.1692,-0.0232 -0.3617,0.0456 -0.48215,0.0226 -0.18758,-0.0374 -0.2455,-0.19368 -0.41684,-0.30636 -0.12563,-0.0825 -0.369,-0.22322 -0.43947,-0.22099 -0.2209,0.0139 -0.37839,0.47031 -0.68302,0.30887 -0.14805,-0.1876 0.24099,-0.28653 0.0653,-0.46205 -0.1332,-0.1332 -0.24505,0.0596 -0.35156,0.13309 -0.12201,0.0842 -0.2368,0.16857 -0.37166,0.21848 -0.30188,0.11301 -0.48979,0.0537 -0.72572,0.17578 -0.21846,0.11313 -0.22779,0.30253 -0.35156,0.52734 -0.10118,0.18418 -0.33259,0.45095 -0.48466,0.46205 -0.18417,0.0139 -0.36027,-0.25671 -0.52734,-0.32896 -0.50329,-0.218 -0.74725,0.19279 -1.16518,0.19838 -0.38787,0.0139 -0.94106,-0.62474 -0.92159,-0.9894 0.004,-0.2225 0.12711,-0.56096 0.15318,-0.83621 0.0233,-0.21891 0.17326,-0.35012 0.17578,-0.54995 0.004,-0.26694 -0.35417,-0.47308 -0.52734,-0.50473 -0.4106,-0.0755 -0.98087,0.16572 -1.45145,-0.0226 -0.09,-0.14894 0.10534,-0.25189 0.15569,-0.39677 0.0284,-0.0823 0.0132,-0.19317 0.0427,-0.28375 0.0522,-0.13997 0.19804,-0.24847 0.26367,-0.39677 0.0491,-0.11314 0.0611,-0.27644 0.11049,-0.41685 0.0572,-0.15987 0.16341,-0.26203 0.17578,-0.37416 0.0163,-0.14804 -0.0398,-0.31923 -0.1557,-0.41686 z m 5.87611,4.65317 c 0.14895,0.0139 0.16738,0.32179 0.015,0.34654 -0.16434,0.0256 -0.24715,-0.25774 -0.0879,-0.33147 0.0266,-0.0139 0.0515,-0.0165 0.0728,-0.0151 z"/> + </g> + <g id="g4297" transform="matrix(1 0 0 1 2 2)"> + <path inkscape:connector-curvature="0" style="fill:url(#linearGradient4303);color:#000000" id="path4445-0" d="m 385.57143,500.798 0,15 9,0 6,5 0,-5 5,0 0,-15 z"/> + <path inkscape:connector-curvature="0" style="fill:url(#linearGradient4305);opacity:0.2;color:#000000" id="path4178" d="m 11.375001,4.8749978 6.5,5.6875002 0,4.0625 -5.875,0 -2.3750005,-3 0.8750005,-0.713388 2.796146,3.37381 -0.0625,-0.875 L 9.9816947,9.7979835 11.069433,7.5959688 9.0183063,5.6691921 9.9375005,4.7499978 z" transform="matrix(1 0 0 1 384.57143 499.798)"/> + <path inkscape:connector-curvature="0" style="fill:#68ff88" id="path4167" d="m 388.7867,484.34017 c 0,-0.68073 -0.3436,-1.0211 -1.03079,-1.0211 -0.40005,0 -0.82108,0.13712 -1.26307,0.41134 l -0.17422,-0.59524 c 0.43877,-0.30004 0.94851,-0.45006 1.52924,-0.45006 0.49361,0 0.90496,0.12421 1.23404,0.37263 0.35488,0.27101 0.53233,0.69042 0.53233,1.25824 0,0.47749 -0.15486,0.93077 -0.46458,1.35986 -0.14196,0.19358 -0.28714,0.38715 -0.43554,0.58073 -0.38715,0.50007 -0.66622,1.03078 -0.83721,1.59215 l -0.43555,0 c 0.0226,-0.50007 0.18874,-1.02433 0.49846,-1.5728 0.12905,-0.22906 0.2581,-0.45167 0.38715,-0.66783 0.30649,-0.51297 0.45974,-0.93561 0.45974,-1.26792 m -0.73075,5.41526 c -0.0936,0.10324 -0.23068,0.15486 -0.41134,0.15486 -0.18067,0 -0.3194,-0.0516 -0.41619,-0.15486 -0.0936,-0.10646 -0.14034,-0.2339 -0.14034,-0.38231 0,-0.1484 0.0468,-0.27423 0.14034,-0.37747 0.0968,-0.10324 0.23552,-0.15486 0.41619,-0.15486 0.18066,0 0.31778,0.0516 0.41134,0.15486 0.0936,0.10324 0.14034,0.23068 0.14035,0.38231 -1e-5,0.14841 -0.0468,0.27423 -0.14035,0.37747" transform="matrix(1 0 0 1 7.081214 21.778944)"/> + </g> + <g id="g4291" transform="matrix(1 0 0 1 -2 -2)"> + <path inkscape:connector-curvature="0" style="fill:url(#linearGradient4307);color:#000000" id="path3300" d="m 431.57143,546.798 0,-15 -9,0 -6,-5 0,5 -5,0 0,15 z"/> + <path inkscape:connector-curvature="0" style="fill:url(#linearGradient4309);opacity:0.2;color:#000000" id="path4287" d="m 422.07143,535.64175 6.71875,5.75 0.625,4.1875 -5.875,0 -2.375,-3 0.875,-0.71339 2.79615,3.37381 -0.0625,-0.875 -3.25195,-3.61243 -0.32545,-5.04799 z"/> + <path inkscape:connector-curvature="0" style="fill:#d485ff" id="path4170" d="m 410.5393,487.63829 c -0.0936,0.10647 -0.23068,0.1597 -0.41135,0.1597 -0.18067,0 -0.3194,-0.0549 -0.41619,-0.16454 -0.0936,-0.11292 -0.14034,-0.24358 -0.14034,-0.39199 0,-0.14841 0.0468,-0.27746 0.14034,-0.38715 0.0968,-0.10969 0.23552,-0.16454 0.41619,-0.16454 0.18067,0 0.31778,0.0548 0.41135,0.16454 0.0968,0.10969 0.14517,0.24036 0.14518,0.39199 -1e-5,0.15163 -0.0484,0.2823 -0.14518,0.39199 m -0.57589,-1.92607 -0.28068,-4.46674 0,-0.57589 0.85173,0 0,0.57589 -0.25165,4.46674 -0.3194,0" transform="matrix(1 0 0 1 11.490486 54.977555)"/> + </g> + </g> +</svg> Files old/artikulate-16.04.3/icons/sc-apps-artikulate.svgz and new/artikulate-16.08.0/icons/sc-apps-artikulate.svgz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-16.04.3/images/README new/artikulate-16.08.0/images/README --- old/artikulate-16.04.3/images/README 2016-05-26 21:13:05.000000000 +0200 +++ new/artikulate-16.08.0/images/README 2016-05-26 22:05:02.000000000 +0200 @@ -4,7 +4,5 @@ http://www.oxygen-icons.org/ for more information). We omit the file types in this list as the copyright applies to all file types: -* language -* language-gray * course * course-gray Files old/artikulate-16.04.3/images/language-gray.png and new/artikulate-16.08.0/images/language-gray.png differ Files old/artikulate-16.04.3/images/language.png and new/artikulate-16.08.0/images/language.png differ Files old/artikulate-16.04.3/images/language.svgz and new/artikulate-16.08.0/images/language.svgz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-16.04.3/images/user.svg new/artikulate-16.08.0/images/user.svg --- old/artikulate-16.04.3/images/user.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/artikulate-16.08.0/images/user.svg 2016-05-26 22:05:02.000000000 +0200 @@ -0,0 +1,65 @@ +<?xml version="1.0"?> + +<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="22" height="22" id="svg3049" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="im-user.svg" inkscape:export-filename="/home/uri/.kde/share/icons/NITRUX-KDE/16x16/actions/view-right-new.png" inkscape:export-xdpi="30" inkscape:export-ydpi="30"> + <defs id="defs3051"> + <style type="text/css" id="current-color-scheme"> + .ColorScheme-Text { + color:#4d4d4d; + } + .ColorScheme-Background { + color:#eff0f1; + } + .ColorScheme-Highlight { + color:#3daee9; + } + .ColorScheme-ViewText { + color:#31363b; + } + .ColorScheme-ViewBackground { + color:#fcfcfc; + } + .ColorScheme-ViewHover { + color:#93cee9; + } + .ColorScheme-ViewFocus{ + color:#3daee9; + } + .ColorScheme-ButtonText { + color:#31363b; + } + .ColorScheme-ButtonBackground { + color:#eff0f1; + } + .ColorScheme-ButtonHover { + color:#93cee9; + } + .ColorScheme-ButtonFocus{ + color:#3daee9; + } + </style> + </defs> + <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="51.739549" inkscape:cx="11.50718" inkscape:cy="12.494216" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="2560" inkscape:window-height="957" inkscape:window-x="0" inkscape:window-y="30" inkscape:window-maximized="1" inkscape:showpageshadow="false" borderlayer="true"> + <sodipodi:guide position="1.9999956,20" orientation="18,0" id="guide4067"/> + <sodipodi:guide position="1.9999956,2.0000004" orientation="0,18" id="guide4069"/> + <sodipodi:guide position="19.999996,2.0000004" orientation="-18,0" id="guide4071"/> + <sodipodi:guide position="19.999996,20" orientation="0,-18" id="guide4073"/> + <sodipodi:guide position="2.9999956,19" orientation="16,0" id="guide4077"/> + <sodipodi:guide position="2.9999956,3.0000004" orientation="0,16" id="guide4079"/> + <sodipodi:guide position="18.999996,3.0000004" orientation="-16,0" id="guide4081"/> + <sodipodi:guide position="18.999996,19" orientation="0,-16" id="guide4083"/> + <inkscape:grid type="xygrid" id="grid4085" originx="-8.8635937e-06" originy="-2.9100781e-05"/> + </sodipodi:namedview> + <metadata id="metadata3054"> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g inkscape:label="Capa 1" inkscape:groupmode="layer" id="layer1" transform="translate(-421.71429,-525.79071)"> + <path style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none" d="m 432.71429,528.79032 a 3.9999902,4.0000296 0 0 0 -4,4 3.9999902,4.0000296 0 0 0 4,4 3.9999902,4.0000296 0 0 0 4,-4 3.9999902,4.0000296 0 0 0 -4,-4 z m 0,1 a 3,3.0000296 0 0 1 3,3 3,3.0000296 0 0 1 -3,3 3,3.0000296 0 0 1 -3,-3 3,3.0000296 0 0 1 3,-3 z" id="path4149" inkscape:connector-curvature="0" class="ColorScheme-Text"/> + <path style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none" d="m 12,13 a 7.9999504,8.0000296 0 0 0 -7.9277344,7 l 1.0078125,0 A 6.9999604,7.0000296 0 0 1 12,14 a 6.9999604,7.0000296 0 0 1 6.921875,6 l 1.007813,0 A 7.9999504,8.0000296 0 0 0 12,13 Z" transform="translate(420.71429,524.79071)" id="ellipse4156" inkscape:connector-curvature="0" class="ColorScheme-Text"/> + </g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-16.04.3/src/CMakeLists.txt new/artikulate-16.08.0/src/CMakeLists.txt --- old/artikulate-16.04.3/src/CMakeLists.txt 2016-05-26 21:13:05.000000000 +0200 +++ new/artikulate-16.08.0/src/CMakeLists.txt 2016-05-26 22:05:02.000000000 +0200 @@ -23,7 +23,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ### -ecm_setup_version(0.6.1 +ecm_setup_version(0.6.50 VARIABLE_PREFIX ARTIKULATE VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/ArtikulateConfigVersion.cmake" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-16.04.3/src/main.cpp new/artikulate-16.08.0/src/main.cpp --- old/artikulate-16.04.3/src/main.cpp 2016-05-26 21:13:05.000000000 +0200 +++ new/artikulate-16.08.0/src/main.cpp 2016-05-26 22:05:02.000000000 +0200 @@ -33,27 +33,27 @@ Application app(argc, argv); KAboutData aboutData("artikulate", - ki18nc("@title Displayed program name", "Artikulate").toString(), + i18nc("@title Displayed program name", "Artikulate"), ARTIKULATE_VERSION_STRING, - ki18nc("@title KAboutData: short program description", "Artikulate Pronunciation Trainer").toString(), + i18nc("@title KAboutData: short program description", "Artikulate Pronunciation Trainer"), KAboutLicense::GPL_V2, - ki18nc("@info:credit", "(c) 2013-2016 The Artikulate Developers").toString(), - ki18nc("@title Short program description", "Training your pronunciation in a foreign language.").toString() + i18nc("@info:credit", "(c) 2013-2016 The Artikulate Developers"), + i18nc("@title Short program description", "Training your pronunciation in a foreign language.") ); - aboutData.addAuthor(ki18nc("@info:credit Developer name", "Andreas Cord-Landwehr").toString(), - ki18nc("@info:credit Role", "Original Author").toString(), + aboutData.addAuthor(i18nc("@info:credit Developer name", "Andreas Cord-Landwehr"), + i18nc("@info:credit Role", "Original Author"), "cordlandwehr(a)kde.org"); - aboutData.addAuthor(ki18nc("@info:credit Developer name", "Samikshan Bairagya").toString(), - ki18nc("@info:credit Role", "Developer").toString(), + aboutData.addAuthor(i18nc("@info:credit Developer name", "Samikshan Bairagya"), + i18nc("@info:credit Role", "Developer"), "samikshan(a)gmail.com"); - aboutData.addAuthor(ki18nc("@info:credit Developer name", "Oindrila Gupta").toString(), - ki18nc("@info:credit Role", "Developer and Course Data").toString()); + aboutData.addAuthor(i18nc("@info:credit Developer name", "Oindrila Gupta"), + i18nc("@info:credit Role", "Developer and Course Data")); - aboutData.addAuthor(ki18nc("@info:credit Developer name", "Magdalena Konkiewicz").toString(), - ki18nc("@info:credit Role", "Developer and Course Data").toString()); + aboutData.addAuthor(i18nc("@info:credit Developer name", "Magdalena Konkiewicz"), + i18nc("@info:credit Role", "Developer and Course Data")); aboutData.setTranslator(i18nc("NAME OF TRANSLATORS", "Your names"), i18nc("EMAIL OF TRANSLATORS", "Your emails")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-16.04.3/src/main_editor.cpp new/artikulate-16.08.0/src/main_editor.cpp --- old/artikulate-16.04.3/src/main_editor.cpp 2016-05-26 21:13:05.000000000 +0200 +++ new/artikulate-16.08.0/src/main_editor.cpp 2016-05-26 22:05:02.000000000 +0200 @@ -29,6 +29,8 @@ int main(int argc, char **argv) { + KLocalizedString::setApplicationDomain("artikulate"); + KAboutData aboutData("artikulate_editor", ki18nc("@title Displayed program name", "Artikulate Editor").toString(), ARTIKULATE_VERSION_STRING, @@ -44,7 +46,6 @@ Application app(argc, argv); KAboutData::setApplicationData(aboutData); - KLocalizedString::setApplicationDomain("artikulate"); KCrash::initialize(); MainWindowEditor *mainWindow = new MainWindowEditor(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-16.04.3/src/qml/MainToolBar.qml new/artikulate-16.08.0/src/qml/MainToolBar.qml --- old/artikulate-16.04.3/src/qml/MainToolBar.qml 2016-05-26 21:13:05.000000000 +0200 +++ new/artikulate-16.08.0/src/qml/MainToolBar.qml 2016-05-26 22:05:02.000000000 +0200 @@ -32,7 +32,7 @@ Icon { id: langIcon - icon: "artikulate-language" + icon: "language-artikulate" width: 48 height: 48 }

1 0

commit analitza for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package analitza for openSUSE:Factory checked in at 2016-08-31 00:06:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/analitza (Old) and /work/SRC/openSUSE:Factory/.analitza.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "analitza" Changes: -------- --- /work/SRC/openSUSE:Factory/analitza/analitza.changes 2016-07-24 19:44:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.analitza.new/analitza.changes 2016-08-31 00:06:05.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:01:05 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:29:08 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- analitza-16.04.3.tar.xz New: ---- analitza-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ analitza.spec ++++++ --- /var/tmp/diff_new_pack.7s2Zxu/_old 2016-08-31 00:06:06.000000000 +0200 +++ /var/tmp/diff_new_pack.7s2Zxu/_new 2016-08-31 00:06:06.000000000 +0200 @@ -17,7 +17,7 @@ Name: analitza -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: A library to add mathematical features to programs License: LGPL-2.1+ ++++++ analitza-16.04.3.tar.xz -> analitza-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-16.04.3/CMakeLists.txt new/analitza-16.08.0/CMakeLists.txt --- old/analitza-16.04.3/CMakeLists.txt 2016-03-22 00:37:30.000000000 +0100 +++ new/analitza-16.08.0/CMakeLists.txt 2016-07-03 18:37:28.000000000 +0200 @@ -14,10 +14,10 @@ include(FeatureSummary) include(ECMAddAppIcon) include(ECMSetupVersion) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMAddTests) include(ECMPackageConfigHelpers) include(KDEInstallDirs) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(GenerateExportHeader) include(CheckIncludeFiles) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-16.04.3/analitza/commands/eigencommands.h new/analitza-16.08.0/analitza/commands/eigencommands.h --- old/analitza-16.04.3/analitza/commands/eigencommands.h 2016-03-22 00:37:30.000000000 +0100 +++ new/analitza-16.08.0/analitza/commands/eigencommands.h 2016-07-03 18:37:28.000000000 +0200 @@ -24,7 +24,7 @@ namespace Analitza { class Expression; -}; +} class EigenvaluesCommand: public Analitza::FunctionDefinition { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-16.04.3/analitza/tests/analitzatest.cpp new/analitza-16.08.0/analitza/tests/analitzatest.cpp --- old/analitza-16.04.3/analitza/tests/analitzatest.cpp 2016-03-22 00:37:30.000000000 +0100 +++ new/analitza-16.08.0/analitza/tests/analitzatest.cpp 2016-07-03 18:37:28.000000000 +0200 @@ -76,6 +76,9 @@ QTest::newRow("val.e0") << "12.0e-02" << Cn(12e-2); QTest::newRow("vale") << "12e-2" << Cn(12e-2); QTest::newRow("val") << "12e2" << Cn(12e2); + + QTest::newRow("factorial5") << "factorial(5)" << Cn(120); + QTest::newRow("factorial12") << "factorial(12)" << Cn(12*11*10*9*8*7*6*5*4*3*2*1); QTest::newRow("simple addition") << "2+2" << Cn(4.); QTest::newRow("simple power") << "2**99" << Cn(pow(2., 99.)); @@ -445,7 +448,11 @@ << QStringLiteral("pu:=n->sum( comb(n,i)*p^(n-i)*(1-p)*sum(x:x=0..i) :i=0..(floor((n-1)/2)))") << QStringLiteral("pu(5)"); +#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) + QTest::newRow("bug241047") << script << "2.97495e-5"; +#else QTest::newRow("bug241047") << script << "2.97495e-05"; +#endif script.clear(); script << QStringLiteral("comb:=(n, i)->factorial(n)/(factorial(i)*factorial(n-i))") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-16.04.3/analitzaplot/CMakeLists.txt new/analitza-16.08.0/analitzaplot/CMakeLists.txt --- old/analitza-16.04.3/analitzaplot/CMakeLists.txt 2016-03-22 00:37:30.000000000 +0100 +++ new/analitza-16.08.0/analitzaplot/CMakeLists.txt 2016-07-03 18:37:28.000000000 +0200 @@ -35,6 +35,7 @@ private/abstractspacecurve.cpp private/abstractsurface.cpp private/functiongraphfactory.cpp + private/export3d.cpp private/backends/cartesiansurface.cpp private/backends/implicitcurve.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-16.04.3/analitzaplot/examples/export3dplotdemo.cpp new/analitza-16.08.0/analitzaplot/examples/export3dplotdemo.cpp --- old/analitza-16.04.3/analitzaplot/examples/export3dplotdemo.cpp 2016-03-22 00:37:30.000000000 +0100 +++ new/analitza-16.08.0/analitzaplot/examples/export3dplotdemo.cpp 2016-07-03 18:37:28.000000000 +0200 @@ -42,8 +42,9 @@ QGuiApplication app(argc, argv); QCommandLineParser parser; parser.addPositionalArgument(QStringLiteral("expression"), QGuiApplication::translate("option description", "Expression to plot"), QStringLiteral("expression...")); - parser.addOption(QCommandLineOption(QStringLiteral("output"), QGuiApplication::translate("option description", "Created filename"), QStringLiteral("output.x3d"))); + parser.addPositionalArgument(QStringLiteral("output"), QGuiApplication::translate("option description", "Created filename"), QStringLiteral("output.x3d")); parser.addOption(QCommandLineOption(QStringLiteral("interval"), QGuiApplication::translate("option description", "Specifies an interval"), QStringLiteral("var=num..num"))); + parser.addHelpOption(); parser.process(app); PlotsModel model; @@ -64,7 +65,10 @@ intervals[interval.left(equalIdx)] = qMakePair<double, double>(from, to); } - foreach(const QString& input, parser.positionalArguments()) { + QStringList args = parser.positionalArguments(); + const QString output = args.takeLast(); + + foreach(const QString& input, args) { Expression exp(input); if(!exp.isCorrect()) { std::cerr << "Incorrect expression: " << qPrintable(input) << std::endl; @@ -86,7 +90,7 @@ } ExportPlotter3D plotter(&model); plotter.updatePlots(QModelIndex(), 0, model.rowCount()-1); - plotter.exportSurfaces(parser.value(QStringLiteral("output"))); + plotter.exportSurfaces(output); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-16.04.3/analitzaplot/plotitem.h new/analitza-16.08.0/analitzaplot/plotitem.h --- old/analitza-16.04.3/analitzaplot/plotitem.h 2016-03-22 00:37:30.000000000 +0100 +++ new/analitza-16.08.0/analitzaplot/plotitem.h 2016-07-03 18:37:28.000000000 +0200 @@ -23,6 +23,7 @@ #include <QStringList> #include <QSet> #include <QColor> +#include <QVariant> #include "analitzaplotexport.h" #include "plottingenums.h" @@ -84,4 +85,6 @@ } +Q_DECLARE_METATYPE(Analitza::PlotItem*); + #endif // ANALITZAPLOT_PLOTITEM_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-16.04.3/analitzaplot/plotsmodel.cpp new/analitza-16.08.0/analitzaplot/plotsmodel.cpp --- old/analitza-16.04.3/analitzaplot/plotsmodel.cpp 2016-03-22 00:37:30.000000000 +0100 +++ new/analitza-16.08.0/analitzaplot/plotsmodel.cpp 2016-07-03 18:37:28.000000000 +0200 @@ -33,8 +33,6 @@ using namespace Analitza; -Q_DECLARE_METATYPE(PlotItem*) - PlotsModel::PlotsModel(QObject* parent) : QAbstractListModel(parent) , m_resolution(500) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-16.04.3/analitzaplot/plotter2d.cpp new/analitza-16.08.0/analitzaplot/plotter2d.cpp --- old/analitza-16.04.3/analitzaplot/plotter2d.cpp 2016-03-22 00:37:30.000000000 +0100 +++ new/analitza-16.08.0/analitzaplot/plotter2d.cpp 2016-07-03 18:37:28.000000000 +0200 @@ -38,8 +38,6 @@ using namespace Analitza; -Q_DECLARE_METATYPE(PlotItem*) - // #define DEBUG_GRAPH QColor const Plotter2D::m_axeColor(100,100,255); //TODO convert from const to param/attr and make setAxisColor(Qt::oriantation, qcolor) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-16.04.3/analitzaplot/plotter3d.cpp new/analitza-16.08.0/analitzaplot/plotter3d.cpp --- old/analitza-16.04.3/analitzaplot/plotter3d.cpp 2016-03-22 00:37:30.000000000 +0100 +++ new/analitza-16.08.0/analitzaplot/plotter3d.cpp 2016-07-03 18:37:28.000000000 +0200 @@ -28,7 +28,7 @@ #include <cmath> #include <QDebug> -#include <QFile> +#include "private/export3d.h" #ifdef __APPLE__ #include <OpenGL/gl.h> @@ -44,8 +44,6 @@ using namespace std; using namespace Analitza; -Q_DECLARE_METATYPE(PlotItem*) - void qgluPerspective(GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar) { const GLdouble ymax = zNear * tan(fovy * M_PI / 360.0); @@ -303,82 +301,12 @@ glDisable(GL_LIGHT0); } -template <typename T> -static QByteArray fromNumbers(const QVector<T>& input) -{ - QByteArray ret; - foreach(qreal r, input) { - ret += QByteArray::number(r)+QByteArrayLiteral(" "); - } - ret.chop(1); - return ret; -} - -static QByteArray fromNumbers(const QVector<QVector3D>& input) -{ - QByteArray ret; - foreach(const QVector3D &r, input) { - ret += QByteArray::number(r.x())+QByteArrayLiteral(" "); - ret += QByteArray::number(r.y())+QByteArrayLiteral(" "); - ret += QByteArray::number(r.z())+QByteArrayLiteral(" "); - } - ret.chop(1); - return ret; -} - -static QVector<int> makeTriangles(const QVector<uint>& input) -{ - QVector<int> ret; - int i = 0; - foreach(uint val, input) { - ret += val; - if(i==2) { - ret += -1; - i = 0; - } else - ++i; - } - ret += -1; - return ret; -} - void Plotter3D::exportSurfaces(const QString& path) const { - QFile f(path); - bool b = f.open(QIODevice::WriteOnly | QIODevice::Text); - Q_ASSERT(b); - f.write(QByteArrayLiteral("<?xml version='1.0' encoding='UTF-8'?>\n" - "<!DOCTYPE X3D PUBLIC 'ISO//Web3D//DTD X3D 3.2//EN' 'http://www.web3d.org/specifications/x3d-3.2.dtd'>\n" - "<X3D profile='Interchange' version='3.2' xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance' " - "xsd:noNamespaceSchemaLocation='http://www.web3d.org/specifications/x3d-3.2.xsd'>\n" - "<Scene>\n")); - for (int i = 0; i < m_model->rowCount(); ++i) - { - PlotItem *item = itemAt(i); - - Surface *surf = dynamic_cast<Surface*>(item); - if (!surf || !surf->isVisible()) - continue; - - f.write(QByteArrayLiteral( - "<Shape>\n" - "<Appearance><Material diffuseColor='1 0 0' specularColor='0.8 0.7 0.5'/></Appearance>\n" - "<IndexedFaceSet solid='false' normalPerVertex='false' coordIndex='")); - f.write(fromNumbers(makeTriangles(surf->indexes()))); - f.write(QByteArrayLiteral("'>\n" - "<Coordinate point='")); - f.write(fromNumbers(surf->vertices())); - f.write(QByteArrayLiteral("'/>\n" - "<Normal vector='")); - f.write(fromNumbers(surf->normals())); - f.write(QByteArrayLiteral( - "'/>\n" - "</IndexedFaceSet>\n" - "</Shape>\n")); - } - f.write(QByteArrayLiteral( - "</Scene>\n" - "</X3D>\n")); + if (path.endsWith(".stl", Qt::CaseInsensitive)) + Export3D::exportSTL(path, m_model); + else + Export3D::exportX3D(path, m_model); } void Plotter3D::updatePlots(const QModelIndex & parent, int s, int e) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-16.04.3/analitzaplot/plotter3d_es.cpp new/analitza-16.08.0/analitzaplot/plotter3d_es.cpp --- old/analitza-16.04.3/analitzaplot/plotter3d_es.cpp 2016-03-22 00:37:30.000000000 +0100 +++ new/analitza-16.08.0/analitzaplot/plotter3d_es.cpp 2016-07-03 18:37:28.000000000 +0200 @@ -25,6 +25,7 @@ #include "plotsmodel.h" #include "private/utils/mathutils.h" +#include "private/export3d.h" #include <cmath> #include <QDebug> @@ -40,8 +41,6 @@ using namespace std; using namespace Analitza; -Q_DECLARE_METATYPE(PlotItem*) - const GLubyte Plotter3DES::XAxisArrowColor[] = {250 -1 , 1, 1}; const GLubyte Plotter3DES::YAxisArrowColor[] = {1, 255 - 1, 1}; const GLubyte Plotter3DES::ZAxisArrowColor[] = {1, 1, 255 - 1}; @@ -212,82 +211,9 @@ program.release(); } -template <typename T> -QByteArray fromNumbers(const QVector<T>& input) -{ - QByteArray ret; - foreach(qreal r, input) { - ret += QByteArray::number(r)+QByteArrayLiteral(" "); - } - ret.chop(1); - return ret; -} - -QByteArray fromNumbers(const QVector<QVector3D>& input) -{ - QByteArray ret; - foreach(const QVector3D& r, input) { - ret += QByteArray::number(r.x())+QByteArrayLiteral(" "); - ret += QByteArray::number(r.y())+QByteArrayLiteral(" "); - ret += QByteArray::number(r.z())+QByteArrayLiteral(" "); - } - ret.chop(1); - return ret; -} - -static QVector<int> makeTriangles(const QVector<uint>& input) -{ - QVector<int> ret; - int i = 0; - foreach(uint val, input) { - ret += val; - if(i==2) { - ret += -1; - i = 0; - } else - ++i; - } - ret += -1; - return ret; -} - void Plotter3DES::exportSurfaces(const QString& path) const { - QFile f(path); - bool b = f.open(QIODevice::WriteOnly | QIODevice::Text); - Q_ASSERT(b); - f.write(QByteArrayLiteral("<?xml version='1.0' encoding='UTF-8'?>\n" - "<!DOCTYPE X3D PUBLIC 'ISO//Web3D//DTD X3D 3.2//EN' 'http://www.web3d.org/specifications/x3d-3.2.dtd'>\n" - "<X3D profile='Interchange' version='3.2' xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance' " - "xsd:noNamespaceSchemaLocation='http://www.web3d.org/specifications/x3d-3.2.xsd'>\n" - "<Scene>\n")); - for (int i = 0; i < m_model->rowCount(); ++i) - { - PlotItem *item = itemAt(i); - - Surface *surf = dynamic_cast<Surface*>(item); - if (!surf || !surf->isVisible()) - continue; - - f.write(QByteArrayLiteral( - "<Shape>\n" - "<Appearance><Material diffuseColor='1 0 0' specularColor='0.8 0.7 0.5'/></Appearance>\n" - "<IndexedFaceSet solid='false' normalPerVertex='false' coordIndex='")); - f.write(fromNumbers(makeTriangles(surf->indexes()))); - f.write(QByteArrayLiteral("'>\n" - "<Coordinate point='")); - f.write(fromNumbers(surf->vertices())); - f.write(QByteArrayLiteral("'/>\n" - "<Normal vector='")); - f.write(fromNumbers(surf->normals())); - f.write(QByteArrayLiteral( - "'/>\n" - "</IndexedFaceSet>\n" - "</Shape>\n")); - } - f.write(QByteArrayLiteral( - "</Scene>\n" - "</X3D>\n")); + Export3D::exportX3D(path, m_model); } void Plotter3DES::updatePlots(const QModelIndex & parent, int s, int e) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-16.04.3/analitzaplot/private/abstractsurface.cpp new/analitza-16.08.0/analitzaplot/private/abstractsurface.cpp --- old/analitza-16.04.3/analitzaplot/private/abstractsurface.cpp 2016-03-22 00:37:30.000000000 +0100 +++ new/analitza-16.08.0/analitzaplot/private/abstractsurface.cpp 2016-07-03 18:37:28.000000000 +0200 @@ -85,27 +85,23 @@ void AbstractSurface::doQuad(int n, int m, const QVector3D &p0, const QVector3D &p1, const QVector3D &p2, const QVector3D &p3) { - int i; - - QVector3D A, B, C, D; - - for (i=0; i<m; i++) + for (int i=0; i<m; i++) { - A = QVector3D((p0.x()*(float)(m-i) + p1.x()*(float)i)/(float)m, - (p0.y()*(float)(m-i) + p1.y()*(float)i)/(float)m, - (p0.z()*(float)(m-i) + p1.z()*(float)i)/(float)m); + const QVector3D A((p0.x()*(float)(m-i) + p1.x()*(float)i)/(float)m, + (p0.y()*(float)(m-i) + p1.y()*(float)i)/(float)m, + (p0.z()*(float)(m-i) + p1.z()*(float)i)/(float)m); - B = QVector3D((p0.x()*(float)(m-i-1) + p1.x()*(float)(i+1))/(float)m, - (p0.y()*(float)(m-i-1) + p1.y()*(float)(i+1))/(float)m, - (p0.z()*(float)(m-i-1) + p1.z()*(float)(i+1))/(float)m); - - C = QVector3D((p2.x()*(float)(m-i) + p3.x()*(float)i)/(float)m, - (p2.y()*(float)(m-i) + p3.y()*(float)i)/(float)m, - (p2.z()*(float)(m-i) + p3.z()*(float)i)/(float)m); - - D = QVector3D((p2.x()*(float)(m-i-1) + p3.x()*(float)(i+1))/(float)m, - (p2.y()*(float)(m-i-1) + p3.y()*(float)(i+1))/(float)m, - (p2.z()*(float)(m-i-1) + p3.z()*(float)(i+1))/(float)m); + const QVector3D B((p0.x()*(float)(m-i-1) + p1.x()*(float)(i+1))/(float)m, + (p0.y()*(float)(m-i-1) + p1.y()*(float)(i+1))/(float)m, + (p0.z()*(float)(m-i-1) + p1.z()*(float)(i+1))/(float)m); + + const QVector3D C((p2.x()*(float)(m-i) + p3.x()*(float)i)/(float)m, + (p2.y()*(float)(m-i) + p3.y()*(float)i)/(float)m, + (p2.z()*(float)(m-i) + p3.z()*(float)i)/(float)m); + + const QVector3D D((p2.x()*(float)(m-i-1) + p3.x()*(float)(i+1))/(float)m, + (p2.y()*(float)(m-i-1) + p3.y()*(float)(i+1))/(float)m, + (p2.z()*(float)(m-i-1) + p3.z()*(float)(i+1))/(float)m); doStrip(n, A, B, C, D); } @@ -113,18 +109,18 @@ void AbstractSurface::doStrip(int n, const QVector3D &p0, const QVector3D &p1, const QVector3D &p2, const QVector3D &p3) { - QVector3D A, B, buffer[3]; + QVector3D buffer[3]; QVector3D theStrip[MAXSTRIP][2]; for (int i=0; i<=n; i++) { - A = QVector3D((p0.x()*(float)(n-i) + p2.x()*(float)i)/(float)n, - (p0.y()*(float)(n-i) + p2.y()*(float)i)/(float)n, - (p0.z()*(float)(n-i) + p2.z()*(float)i)/(float)n); - - B = QVector3D((p1.x()*(float)(n-i) + p3.x()*(float)i)/(float)n, - (p1.y()*(float)(n-i) + p3.y()*(float)i)/(float)n, - (p1.z()*(float)(n-i) + p3.z()*(float)i)/(float)n); + const QVector3D A((p0.x()*(float)(n-i) + p2.x()*(float)i)/(float)n, + (p0.y()*(float)(n-i) + p2.y()*(float)i)/(float)n, + (p0.z()*(float)(n-i) + p2.z()*(float)i)/(float)n); + + const QVector3D B((p1.x()*(float)(n-i) + p3.x()*(float)i)/(float)n, + (p1.y()*(float)(n-i) + p3.y()*(float)i)/(float)n, + (p1.z()*(float)(n-i) + p3.z()*(float)i)/(float)n); theStrip[i][0] = A; theStrip[i][1] = B; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-16.04.3/analitzaplot/private/export3d.cpp new/analitza-16.08.0/analitzaplot/private/export3d.cpp --- old/analitza-16.04.3/analitzaplot/private/export3d.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/analitza-16.08.0/analitzaplot/private/export3d.cpp 2016-07-03 18:37:28.000000000 +0200 @@ -0,0 +1,167 @@ +/************************************************************************************* + * Copyright (C) 2016 Aleix Pol Gonzalez <aleixpol(a)kde.org> * + * * + * 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 * + * of the License, 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, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * + *************************************************************************************/ + +#include "export3d.h" + +#include <QFile> +#include <QDebug> +#include <QVector3D> +#include <cmath> + +#include "surface.h" +#include "plotitem.h" +#include "plotsmodel.h" + +using namespace Analitza; + +template <typename T> +static QByteArray fromNumbers(const QVector<T>& input) +{ + QByteArray ret; + foreach(qreal r, input) { + ret += QByteArray::number(r)+' '; + } + ret.chop(1); + return ret; +} + +static QByteArray fromVector3D(const QVector3D &r) +{ + return QByteArray::number(r.x())+' ' + + QByteArray::number(r.y())+' ' + + QByteArray::number(r.z()); +} + +static QByteArray fromNumbers(const QVector<QVector3D>& input) +{ + QByteArray ret; + foreach(const QVector3D &r, input) { + ret += fromVector3D(r); + } + ret.chop(1); + return ret; +} + +static QVector<int> makeTriangles(const QVector<uint>& input) +{ + QVector<int> ret; + int i = 0; + foreach(uint val, input) { + ret += val; + if(i==2) { + ret += -1; + i = 0; + } else + ++i; + } + ret += -1; + return ret; +} + +void Export3D::exportX3D(const QString& path, QAbstractItemModel* model) +{ + QFile f(path); + if (!f.open(QIODevice::WriteOnly | QIODevice::Text)) { + qWarning() << "couldn't open" << path; + return; + } + + f.write(QByteArrayLiteral("<?xml version='1.0' encoding='UTF-8'?>\n" + "<!DOCTYPE X3D PUBLIC 'ISO//Web3D//DTD X3D 3.2//EN' 'http://www.web3d.org/specifications/x3d-3.2.dtd'>\n" + "<X3D profile='Interchange' version='3.2' xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance' " + "xsd:noNamespaceSchemaLocation='http://www.web3d.org/specifications/x3d-3.2.xsd'>\n" + "<Scene>\n")); + for (int i = 0; i < model->rowCount(); ++i) + { + const QModelIndex pi = model->index(i, 0); + + if (!pi.isValid()) + continue; + + PlotItem* item = pi.data(PlotsModel::PlotRole).value<PlotItem*>(); + + Surface *surf = dynamic_cast<Surface*>(item); + if (!surf || !surf->isVisible()) + continue; + + f.write(QByteArrayLiteral( + "<Shape>\n" + "<Appearance><Material diffuseColor='1 0 0' specularColor='0.8 0.7 0.5'/></Appearance>\n" + "<IndexedFaceSet solid='false' normalPerVertex='false' coordIndex='")); + f.write(fromNumbers(makeTriangles(surf->indexes()))); + f.write(QByteArrayLiteral("'>\n" + "<Coordinate point='")); + f.write(fromNumbers(surf->vertices())); + f.write(QByteArrayLiteral("'/>\n" + "<Normal vector='")); + f.write(fromNumbers(surf->normals())); + f.write(QByteArrayLiteral( + "'/>\n" + "</IndexedFaceSet>\n" + "</Shape>\n")); + } + f.write(QByteArrayLiteral( + "</Scene>\n" + "</X3D>\n")); +} + +void Export3D::exportSTL(const QString& path, QAbstractItemModel* model) +{ + QFile f(path); + if (!f.open(QIODevice::WriteOnly | QIODevice::Text)) { + qWarning() << "couldn't open" << path; + return; + } + + f.write(QByteArrayLiteral("solid myplot\n")); + for (int i = 0; i < model->rowCount(); ++i) + { + const QModelIndex pi = model->index(i, 0); + + if (!pi.isValid()) + continue; + + PlotItem* item = pi.data(PlotsModel::PlotRole).value<PlotItem*>(); + + Surface *surf = dynamic_cast<Surface*>(item); + if (!surf || !surf->isVisible()) + continue; + + const auto normals = surf->normals(); + const auto vertices = surf->vertices(); + const auto indexes = surf->indexes(); + + for (int i = 0, c = indexes.count()/3; i<c; ++i) { +// f.write(" facet normal " + fromVector3D(normals[i]) + '\n'); + const QVector3D v1 = vertices[indexes[i*3 + 0]] + , v2 = vertices[indexes[i*3 + 1]] + , v3 = vertices[indexes[i*3 + 2]]; + + //TODO: should be using the normals from Surface + f.write(" facet normal " + fromVector3D(QVector3D::normal(v1, v2, v3)) + '\n'); + f.write(" outer loop\n"); + f.write(" vertex " + fromVector3D(v1) + '\n'); + f.write(" vertex " + fromVector3D(v2) + '\n'); + f.write(" vertex " + fromVector3D(v3) + '\n'); + f.write(" endloop\n"); + f.write(" endfacet\n"); + } + f.write("\n"); + } + f.write("endsolid myplot\n"); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-16.04.3/analitzaplot/private/export3d.h new/analitza-16.08.0/analitzaplot/private/export3d.h --- old/analitza-16.04.3/analitzaplot/private/export3d.h 1970-01-01 01:00:00.000000000 +0100 +++ new/analitza-16.08.0/analitzaplot/private/export3d.h 2016-07-03 18:37:28.000000000 +0200 @@ -0,0 +1,31 @@ +/************************************************************************************* + * Copyright (C) 2016 Aleix Pol Gonzalez <aleixpol(a)kde.org> * + * * + * 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 * + * of the License, 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, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * + *************************************************************************************/ + +#include <QString> + +/* + * Contains exporting algorithms, potentially an intermediate step in a refactoring + */ + +class QAbstractItemModel; + +namespace Export3D +{ +void exportX3D(const QString &path, QAbstractItemModel* model); +void exportSTL(const QString &path, QAbstractItemModel* model); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-16.04.3/analitzaplot/tests/CMakeLists.txt new/analitza-16.08.0/analitzaplot/tests/CMakeLists.txt --- old/analitza-16.04.3/analitzaplot/tests/CMakeLists.txt 2016-03-22 00:37:30.000000000 +0100 +++ new/analitza-16.08.0/analitzaplot/tests/CMakeLists.txt 2016-07-03 18:37:28.000000000 +0200 @@ -7,3 +7,11 @@ LINK_LIBRARIES Qt5::Xml Qt5::Test Qt5::Gui Analitza AnalitzaPlot AnalitzaGui ) + +function(test_export name expression) + add_test(NAME "export-test-${name}-stl" COMMAND export3dplotdemo "${expression}" "output-${name}.stl" ${ARGN}) + add_test(NAME "export-test-${name}-x3d" COMMAND export3dplotdemo "${expression}" "output-${name}.x3d" ${ARGN}) +endfunction() + +test_export(sin "sin x*sin y") +test_export(fancy "piecewise { x^2+y^2+z^2<35 ? 2-(cos(x+(1+5^0.5)/2*y)+cos(x-(1+5^0.5)/2*y)+cos(y+(1+5^0.5)/2*z)+cos(y-(1+5^0.5)/2*z)+cos(z-(1+5^0.5)/2*x)+cos(z+(1+5^0.5)/2*x)), ? 1 }=0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-16.04.3/analitzaplot/tests/plotsdictionarymodeltest.cpp new/analitza-16.08.0/analitzaplot/tests/plotsdictionarymodeltest.cpp --- old/analitza-16.04.3/analitzaplot/tests/plotsdictionarymodeltest.cpp 2016-03-22 00:37:30.000000000 +0100 +++ new/analitza-16.08.0/analitzaplot/tests/plotsdictionarymodeltest.cpp 2016-07-03 18:37:28.000000000 +0200 @@ -30,8 +30,6 @@ QTEST_MAIN( PlotsDictionaryModelTest ) -Q_DECLARE_METATYPE(PlotItem*) - PlotsDictionaryModelTest::PlotsDictionaryModelTest(QObject *parent) : QObject(parent) {}

1 0

commit libgweather for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libgweather for openSUSE:Factory checked in at 2016-08-31 00:05:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgweather (Old) and /work/SRC/openSUSE:Factory/.libgweather.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgweather" Changes: -------- --- /work/SRC/openSUSE:Factory/libgweather/libgweather.changes 2016-08-26 23:15:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgweather.new/libgweather.changes 2016-08-31 00:05:54.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Aug 29 08:32:26 UTC 2016 - zaitor(a)opensuse.org + +- Update to version 3.20.3: + + NOAA shut down their METAR provider service, so libgweather + switched to a different provider (bgo#770321). + + Updates translations. +- Drop libgweather-change-service-provider.patch: Fixed upstream. + +------------------------------------------------------------------- +Fri Aug 26 14:48:50 UTC 2016 - badshah400(a)gmail.com + +- Add libgweather-change-service-provider.patch: The existing + weather service provider was expired, replace by a working + provider instead; patch taken from upstream bug report + (bgo#770321). + +------------------------------------------------------------------- @@ -20,0 +38,9 @@ +Fri Apr 15 02:20:41 UTC 2016 - mgorse(a)suse.com + +- Update to GNOME 3.20 Fate#318572 +- Drop libgweather-location-search-i18n.patch, + libgweather-soup-abort-in-dispose.patch, + libgweather-soup-no-abort-session.patch, and + libgweather-yrno19.patch: fixed upstream. + +------------------------------------------------------------------- @@ -155,0 +182,6 @@ +Thu Dec 18 15:43:21 UTC 2014 - fcrozat(a)suse.com + +- Add libgweather-yrno19.patch: use Yr.no API 1.9, older API is + deprecated (bsc#910688). + +------------------------------------------------------------------- @@ -178,0 +211,6 @@ +Wed Sep 10 17:19:01 UTC 2014 - mgorse(a)suse.com + +- Add libgweather-location-search-i18n.patch: fix searching for + locations in non-ENglish locales (bnc#895068). + +------------------------------------------------------------------- @@ -213,0 +252,5 @@ +Sun Jul 20 22:04:35 UTC 2014 - mgorse(a)suse.com + +- Include vala bindings in devel package.. + +------------------------------------------------------------------- @@ -253,0 +297,8 @@ +Fri Mar 28 00:19:18 UTC 2014 - mgorse(a)suse.com + +- Add libgweather-soup-abort-in-dispose.patch: abort soup session + in dispose, not finalize. From upstream gnome-3-10 branch. +- Add libgweather-soup-no-abort-session.patch: Don't abort entire + soup session. From upstream gnome-3-10 branch. + +------------------------------------------------------------------- Old: ---- libgweather-3.20.2.tar.xz New: ---- libgweather-3.20.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgweather.spec ++++++ --- /var/tmp/diff_new_pack.yrKdzV/_old 2016-08-31 00:05:55.000000000 +0200 +++ /var/tmp/diff_new_pack.yrKdzV/_new 2016-08-31 00:05:55.000000000 +0200 @@ -17,7 +17,7 @@ Name: libgweather -Version: 3.20.2 +Version: 3.20.3 Release: 0 Summary: Library to get online weather information License: GPL-2.0+ @@ -104,7 +104,6 @@ %find_lang libgweather-3.0 %{?no_lang_C} %find_lang libgweather-locations libgweather-3.0.lang %{?no_lang_C} - %post -n libgweather-3-6 -p /sbin/ldconfig %postun -n libgweather-3-6 -p /sbin/ldconfig ++++++ libgweather-3.20.2.tar.xz -> libgweather-3.20.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgweather-3.20.2/Makefile.in new/libgweather-3.20.3/Makefile.in --- old/libgweather-3.20.2/Makefile.in 2016-08-16 01:29:59.000000000 +0200 +++ new/libgweather-3.20.3/Makefile.in 2016-08-29 02:05:37.000000000 +0200 @@ -183,7 +183,8 @@ $(top_srcdir)/build-aux/ltmain.sh \ $(top_srcdir)/build-aux/missing AUTHORS COPYING NEWS README \ build-aux/compile build-aux/config.guess build-aux/config.sub \ - build-aux/install-sh build-aux/ltmain.sh build-aux/missing + build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \ + build-aux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgweather-3.20.2/NEWS new/libgweather-3.20.3/NEWS --- old/libgweather-3.20.2/NEWS 2016-08-16 01:28:45.000000000 +0200 +++ new/libgweather-3.20.3/NEWS 2016-08-29 02:05:13.000000000 +0200 @@ -1,4 +1,12 @@ ============== +Version 3.20.3 +============== + +* NOAA shut down their METAR provider service, so libgweather + switched to a different provider [Frank Dana, #770321] +* Updates translations + +============== Version 3.20.2 ============== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgweather-3.20.2/configure new/libgweather-3.20.3/configure --- old/libgweather-3.20.2/configure 2016-08-16 01:29:58.000000000 +0200 +++ new/libgweather-3.20.3/configure 2016-08-29 02:05:37.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libgweather 3.20.2. +# Generated by GNU Autoconf 2.69 for libgweather 3.20.3. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libgweather>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='libgweather' PACKAGE_TARNAME='libgweather' -PACKAGE_VERSION='3.20.2' -PACKAGE_STRING='libgweather 3.20.2' +PACKAGE_VERSION='3.20.3' +PACKAGE_STRING='libgweather 3.20.3' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=libgweather' PACKAGE_URL='http://live.gnome.org/LibGWeather' @@ -1435,7 +1435,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 libgweather 3.20.2 to adapt to many kinds of systems. +\`configure' configures libgweather 3.20.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1505,7 +1505,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libgweather 3.20.2:";; + short | recursive ) echo "Configuration of libgweather 3.20.3:";; esac cat <<\_ACEOF @@ -1647,7 +1647,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libgweather configure 3.20.2 +libgweather configure 3.20.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2028,7 +2028,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libgweather $as_me 3.20.2, which was +It was created by libgweather $as_me 3.20.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2910,7 +2910,7 @@ # Define the identity of the package. PACKAGE='libgweather' - VERSION='3.20.2' + VERSION='3.20.3' cat >>confdefs.h <<_ACEOF @@ -3162,8 +3162,8 @@ LIBGWEATHER_MAJOR_VERSION=3 LIBGWEATHER_MINOR_VERSION=20 -LIBGWEATHER_MICRO_VERSION=2 -LIBGWEATHER_VERSION=3.20.2 +LIBGWEATHER_MICRO_VERSION=3 +LIBGWEATHER_VERSION=3.20.3 @@ -16991,7 +16991,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libgweather $as_me 3.20.2, which was +This file was extended by libgweather $as_me 3.20.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17058,7 +17058,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libgweather config.status 3.20.2 +libgweather config.status 3.20.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgweather-3.20.2/configure.ac new/libgweather-3.20.3/configure.ac --- old/libgweather-3.20.2/configure.ac 2016-08-16 01:28:53.000000000 +0200 +++ new/libgweather-3.20.3/configure.ac 2016-08-29 02:05:13.000000000 +0200 @@ -1,6 +1,6 @@ m4_define(libgweather_major_version, 3) m4_define(libgweather_minor_version, 20) -m4_define(libgweather_micro_version, 2) +m4_define(libgweather_micro_version, 3) m4_define(libgweather_version, libgweather_major_version.libgweather_minor_version.libgweather_micro_version) AC_INIT([libgweather], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgweather-3.20.2/doc/html/index.html new/libgweather-3.20.3/doc/html/index.html --- old/libgweather-3.20.2/doc/html/index.html 2016-08-16 01:31:26.000000000 +0200 +++ new/libgweather-3.20.3/doc/html/index.html 2016-08-29 02:05:42.000000000 +0200 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle">libgweather Reference Manual</th></tr></table></div> <div> - for libgweather 3.20.2 + for libgweather 3.20.3 . The latest version of this documentation can be found on-line at <a class="ulink" href="http://developer.gnome.org/libgweather/unstable/" target="_top">http://developer.gnome.org/libgweather/unstable/</a>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgweather-3.20.2/doc/html/libgweather-Versioning-information.html new/libgweather-3.20.3/doc/html/libgweather-Versioning-information.html --- old/libgweather-3.20.2/doc/html/libgweather-Versioning-information.html 2016-08-16 01:31:26.000000000 +0200 +++ new/libgweather-3.20.3/doc/html/libgweather-Versioning-information.html 2016-08-29 02:05:42.000000000 +0200 @@ -148,7 +148,7 @@ <hr> <div class="refsect2"> <a name="GWEATHER-MICRO-VERSION:CAPS"></a><h3>GWEATHER_MICRO_VERSION</h3> -<pre class="programlisting">#define GWEATHER_MICRO_VERSION (2) +<pre class="programlisting">#define GWEATHER_MICRO_VERSION (3) </pre> LibGweather micro version component (e.g. 3 if <a class="link" href="libgweather-Versioning-information.html#GWEATHER-VERSION:CAPS" title="GWEATHER_VERSION"><code class="literal">GWEATHER_VERSION</code></a> is 1.2.3) Since: <a class="link" href="ix03.html#api-index-3.12">3.12</a> @@ -156,7 +156,7 @@ <hr> <div class="refsect2"> <a name="GWEATHER-VERSION:CAPS"></a><h3>GWEATHER_VERSION</h3> -<pre class="programlisting">#define GWEATHER_VERSION (3.20.2) +<pre class="programlisting">#define GWEATHER_VERSION (3.20.3) </pre> LibGweather version. Since: <a class="link" href="ix03.html#api-index-3.12">3.12</a> @@ -164,7 +164,7 @@ <hr> <div class="refsect2"> <a name="GWEATHER-VERSION-S:CAPS"></a><h3>GWEATHER_VERSION_S</h3> -<pre class="programlisting">#define GWEATHER_VERSION_S "3.20.2" +<pre class="programlisting">#define GWEATHER_VERSION_S "3.20.3" </pre> LibGweather version, encoded as a string, useful for printing and concatenation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgweather-3.20.2/doc/version.xml new/libgweather-3.20.3/doc/version.xml --- old/libgweather-3.20.2/doc/version.xml 2016-08-16 01:30:01.000000000 +0200 +++ new/libgweather-3.20.3/doc/version.xml 2016-08-29 02:05:39.000000000 +0200 @@ -1 +1 @@ -3.20.2 +3.20.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgweather-3.20.2/libgweather/gweather-version.h new/libgweather-3.20.3/libgweather/gweather-version.h --- old/libgweather-3.20.2/libgweather/gweather-version.h 2016-08-16 01:30:01.000000000 +0200 +++ new/libgweather-3.20.3/libgweather/gweather-version.h 2016-08-29 02:05:39.000000000 +0200 @@ -61,7 +61,7 @@ * * Since: 3.12 */ -#define GWEATHER_MICRO_VERSION (2) +#define GWEATHER_MICRO_VERSION (3) /** * GWEATHER_VERSION @@ -70,7 +70,7 @@ * * Since: 3.12 */ -#define GWEATHER_VERSION (3.20.2) +#define GWEATHER_VERSION (3.20.3) /** * GWEATHER_VERSION_S: @@ -80,7 +80,7 @@ * * Since: 3.12 */ -#define GWEATHER_VERSION_S "3.20.2" +#define GWEATHER_VERSION_S "3.20.3" /** * GWEATHER_VERSION_HEX: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgweather-3.20.2/libgweather/weather-metar.c new/libgweather-3.20.3/libgweather/weather-metar.c --- old/libgweather-3.20.2/libgweather/weather-metar.c 2016-05-29 20:56:55.000000000 +0200 +++ new/libgweather-3.20.3/libgweather/weather-metar.c 2016-08-29 02:05:05.000000000 +0200 @@ -580,7 +580,7 @@ loc = &priv->location; - searchkey = g_strdup_printf ("\n%s", loc->code); + searchkey = g_strdup_printf ("<raw_text>%s", loc->code); p = strstr (msg->response_body->data, searchkey); g_free (searchkey); if (p) { @@ -592,8 +592,8 @@ metar = g_strdup (p); success = metar_parse (metar, info); g_free (metar); - } else if (!strstr (msg->response_body->data, "National Weather Service")) { - /* The response doesn't even seem to have come from NWS... + } else if (!strstr (msg->response_body->data, "aviationweather.gov")) { + /* The response doesn't even seem to have come from NOAA... * most likely it is a wifi hotspot login page. Call that a * network error. */ @@ -620,8 +620,14 @@ loc = &priv->location; msg = soup_form_request_new ( - "GET", "http://weather.noaa.gov/mgetmetar.php", - "cccc", loc->code, + "GET", "https://www.aviationweather.gov/adds/dataserver_current/httpparam", + "dataSource", "metars", + "requestType", "retrieve", + "format", "xml", + "hoursBeforeNow", "3", + "mostRecent", "true", + "fields", "raw_text", + "stationString", loc->code, NULL); _gweather_info_begin_request (info, msg); soup_session_queue_message (priv->session, msg, metar_finish, info); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgweather-3.20.2/po/fi.po new/libgweather-3.20.3/po/fi.po --- old/libgweather-3.20.2/po/fi.po 2015-09-11 19:22:09.000000000 +0200 +++ new/libgweather-3.20.3/po/fi.po 2016-08-29 01:58:29.000000000 +0200 @@ -9,23 +9,23 @@ # Jarkko Ranta <jjranta(a)cc.joensuu.fi>, 2000-2004. # Ilkka Tuohela <hile(a)iki.fi>, 2005. # Tommi Vainikainen <thv(a)iki.fi>, 2009. -# Jiri Grönroos <jiri.gronroos+l10n(a)iki.fi>, 2013, 2014, 2015. +# Jiri Grönroos <jiri.gronroos+l10n(a)iki.fi>, 2013, 2014, 2015, 2016. # msgid "" msgstr "" "Project-Id-Version: gnome-applets\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=libgweather&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-09-05 10:44+0000\n" -"PO-Revision-Date: 2015-09-05 16:25+0300\n" +"POT-Creation-Date: 2016-08-15 23:38+0000\n" +"PO-Revision-Date: 2016-08-21 13:33+0300\n" "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n(a)iki.fi>\n" -"Language-Team: suomi <gnome-fi-laatu(a)lists.sourceforge.net>\n" +"Language-Team: suomi <lokalisointi-lista(a)googlegroups.com>\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../data/glade/libgweather.xml.in.h:1 #, fuzzy @@ -49,7 +49,7 @@ msgid "Loading..." msgstr "Ladataan..." -#: ../libgweather/gweather-timezone.c:340 +#: ../libgweather/gweather-timezone.c:341 msgid "Greenwich Mean Time" msgstr "Greenwichin aika" @@ -668,11 +668,14 @@ #. That's very nice of them! #. #: ../libgweather/weather-yrno.c:507 +#| msgid "" +#| "Weather data from the <a href=\"http://yr.no/\">Norwegian Meteorological " +#| "Institute</a>" msgid "" -"Weather data from the <a href=\"http://yr.no/\">Norwegian Meteorological " -"Institute</a>" +"Weather data from the <a href=\"http://www.met.no/\">Norwegian " +"Meteorological Institute</a>" msgstr "" -"Säätiedot tarjoaa <a href=\"http://yr.no/\">Norwegian Meteorological " +"Säätiedot tarjoaa <a href=\"http://www.met.no/\">Norwegian Meteorological " "Institute</a>" #: ../schemas/org.gnome.GWeather.gschema.xml.h:1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgweather-3.20.2/po/pl.po new/libgweather-3.20.3/po/pl.po --- old/libgweather-3.20.2/po/pl.po 2016-03-21 22:22:24.000000000 +0100 +++ new/libgweather-3.20.3/po/pl.po 2016-08-29 01:58:29.000000000 +0200 @@ -1,9 +1,6 @@ -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl(a)aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Polish translation for libgweather. +# Copyright © 1998-2016 the libgweather authors. +# This file is distributed under the same license as the libgweather package. # Zbigniew Chyla <chyla(a)alice.ci.pwr.wroc.pl>, 1998-2003. # Kuba Winnicki <bw(a)idc.com.pl>, 1999. # Artur Flinta <aflinta(a)at.kernel.pl>, 2003-2006. @@ -11,23 +8,22 @@ # Stanisław Małolepszy <smalolepszy(a)aviary.pl>, 2007. # Tomasz Dominikowski <dominikowski(a)gmail.com>, 2008-2009. # Piotr Drąg <piotrdrag(a)gmail.com>, 2010-2016. -# Aviary.pl <gnomepl(a)aviary.pl>, 2007-2016. +# Aviary.pl <community-poland(a)mozilla.org>, 2007-2016. +# msgid "" msgstr "" "Project-Id-Version: libgweather\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-15 17:23+0100\n" -"PO-Revision-Date: 2016-03-15 17:24+0100\n" +"POT-Creation-Date: 2016-08-16 11:04+0200\n" +"PO-Revision-Date: 2016-08-16 11:05+0200\n" "Last-Translator: Piotr Drąg <piotrdrag(a)gmail.com>\n" -"Language-Team: Polish <gnomepl(a)aviary.pl>\n" +"Language-Team: Polish <community-poland(a)mozilla.org>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" #: ../data/glade/libgweather.xml.in.h:1 msgid "Location Entry" @@ -284,7 +280,7 @@ #: ../libgweather/gweather-weather.c:179 msgid "Sleet storm" -msgstr "Burza z deszczem ze śniegiem" +msgstr "Burza z deszczem i śniegiem" #: ../libgweather/gweather-weather.c:179 msgid "Showers of sleet" @@ -409,7 +405,7 @@ #: ../libgweather/gweather-weather.c:192 msgid "Sandstorm in the vicinity" -msgstr "Bura piaskowa w pobliżu" +msgstr "Bura piaskowa w pobliżu" #: ../libgweather/gweather-weather.c:192 msgid "Heavy sandstorm" @@ -422,7 +418,7 @@ #: ../libgweather/gweather-weather.c:193 msgid "Duststorm in the vicinity" -msgstr "Burza kurzowa w pobliżu" +msgstr "Burza kurzowa w pobliżu" #: ../libgweather/gweather-weather.c:193 msgid "Heavy duststorm" @@ -445,7 +441,7 @@ #: ../libgweather/gweather-weather.c:196 msgid "Dust whirls in the vicinity" -msgstr "Tumany kurzu w pobliżu" +msgstr "Tumany kurzu w pobliżu" #: ../libgweather/gweather-weather.c:705 msgid "%a, %b %d / %H∶%M" @@ -558,7 +554,7 @@ #: ../libgweather/gweather-weather.c:978 #, c-format msgid "Beaufort force %.1f" -msgstr "%.1f w skali Beauforta" +msgstr "%.1f w skali Beauforta" #: ../libgweather/gweather-weather.c:999 msgctxt "wind speed" @@ -658,7 +654,7 @@ "Weather data from the <a href=\"http://openweathermap.org\">Open Weather Map " "project</a>" msgstr "" -"Dane pogodowe z <a href=\"http://openweathermap.org\">projektu Open Weather " +"Dane pogodowe z <a href=\"http://openweathermap.org\">projektu Open Weather " "Map</a>" #. The new (documented but not advertised) API is less strict in the @@ -672,7 +668,7 @@ "Weather data from the <a href=\"http://www.met.no/\">Norwegian " "Meteorological Institute</a>" msgstr "" -"Dane pogodowe z <a href=\"http://www.met.no/\">Norweskiego Instytutu " +"Dane pogodowe z <a href=\"http://www.met.no/\">Norweskiego Instytutu " "Meteorologicznego</a>" #: ../schemas/org.gnome.GWeather.gschema.xml.h:1 @@ -697,8 +693,8 @@ "'centigrade' and 'fahrenheit'." msgstr "" "Jednostka temperatury używana do wyświetlania pogody. Prawidłowe wartości to " -"„kelvin” (skala Kelvina), „centigrade” (skala Celsjusza) i " -"„fahrenheit” (skala Fahrenheita)." +"„kelvin” (skala Kelvina), „centigrade” (skala Celsjusza) " +"i „fahrenheit” (skala Fahrenheita)." #: ../schemas/org.gnome.GWeather.gschema.xml.h:5 msgid "Distance unit" @@ -712,7 +708,7 @@ msgstr "" "Jednostka odległości używana do wyświetlania pogody (na przykład widoczności " "lub odległości od ważnych wydarzeń). Prawidłowe wartości to " -"„meters” (metry), „km” (kilometry) i „miles” (mile)." +"„meters” (metry), „km” (kilometry) i „miles” (mile)." #: ../schemas/org.gnome.GWeather.gschema.xml.h:7 msgid "Speed unit" @@ -726,7 +722,7 @@ msgstr "" "Jednostka prędkości używana do wyświetlania pogody (na przykład prędkości " "wiatru). Prawidłowe wartości to „ms” (metry na sekundę), „kph” (kilometry na " -"godzinę), „mph” (mile na godzinę), „knots” (węzły) i „bft” (skala Beauforta)." +"godzinę), „mph” (mile na godzinę), „knots” (węzły) i „bft” (skala Beauforta)." #: ../schemas/org.gnome.GWeather.gschema.xml.h:9 msgid "Pressure unit" @@ -742,7 +738,7 @@ "Jednostka ciśnienia używana do wyświetlania pogody. Prawidłowe wartości to " "„kpa” (kilopaskal), „hpa” (hektopaskal), „mb” (milibar, matematycznie " "odpowiednik 1 hPa, ale inaczej wyświetlone), „mm-hg” (milimetry słupka " -"rtęci), „inch-hg” (cale słupka rtęci) i „atm” (atmosfery)." +"rtęci), „inch-hg” (cale słupka rtęci) i „atm” (atmosfery)." #: ../schemas/org.gnome.GWeather.gschema.xml.h:11 msgid "Default location" @@ -759,9 +755,9 @@ "calculations, not for weather forecast." msgstr "" "Domyślne położenie dla apletu pogody. Pierwsze pole to wyświetlana nazwa. " -"Jeśli jest puste, to zostanie pobrane z bazy danych położeń. Drugie pole to " -"kod METAR dla domyślnej stacji pogodowej. Nie może być puste i musi " -"odpowiadać znacznikowi <code> w pliku Locations.xml. Trzecie pole jest " -"krotką (szerokość, długość), zastępującą wartość pobraną z bazy danych. Jest " -"to używane tylko do obliczania wschodu słońca i faz księżyca, nie do " +"Jeśli jest puste, to zostanie pobrane z bazy danych położeń. Drugie pole to " +"kod METAR dla domyślnej stacji pogodowej. Nie może być puste i musi " +"odpowiadać znacznikowi <code> w pliku Locations.xml. Trzecie pole jest " +"krotką (szerokość, długość), zastępującą wartość pobraną z bazy danych. Jest " +"to używane tylko do obliczania wschodu słońca i faz księżyca, nie do " "prognozy pogody." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgweather-3.20.2/po/th.po new/libgweather-3.20.3/po/th.po --- old/libgweather-3.20.2/po/th.po 2015-04-14 08:54:16.000000000 +0200 +++ new/libgweather-3.20.3/po/th.po 2016-08-29 01:58:29.000000000 +0200 @@ -1,25 +1,25 @@ # Thai translation for gnome-applets. -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2016 Free Software Foundation, Inc. # This file is distributed under the same license as the gnome-applets package. # Paisa Seeluangsawat <paisa(a)users.sf.net>, 2004. -# Theppitak Karoonboonyanan <thep(a)linux.thai.net>, 2004-2012. -# Akom Chotiphantawanon <knight2000(a)gmail.com>, 2013-2014. +# Theppitak Karoonboonyanan <theppitak(a)gmail.com>, 2004-2012. +# Akom Chotiphantawanon <knight2000(a)gmail.com>, 2013-2016. # msgid "" msgstr "" "Project-Id-Version: gnome-applets\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=libgweather&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-03-08 18:35+0000\n" -"PO-Revision-Date: 2014-03-26 21:33+0700\n" +"POT-Creation-Date: 2016-08-03 12:33+0000\n" +"PO-Revision-Date: 2016-08-26 15:08+0700\n" "Last-Translator: Akom Chotiphantawanon <knight2000(a)gmail.com>\n" -"Language-Team: Thai <thai-10n(a)googlegroups.com>\n" +"Language-Team: Thai <thai-l10n(a)googlegroups.com>\n" "Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.7\n" +"X-Generator: Gtranslator 2.91.6\n" #: ../data/glade/libgweather.xml.in.h:1 msgid "Location Entry" @@ -37,111 +37,115 @@ msgid "GWeather" msgstr "GWeather" -#: ../libgweather/gweather-timezone.c:340 +#: ../libgweather/gweather-location-entry.c:784 +msgid "Loading..." +msgstr "กำลังโหลด..." + +#: ../libgweather/gweather-timezone.c:341 msgid "Greenwich Mean Time" msgstr "เวลามาตรฐานกรีนิช" -#: ../libgweather/timezone-menu.c:275 +#: ../libgweather/gweather-timezone-menu.c:274 msgctxt "timezone" msgid "Unknown" msgstr "ไม่ทราบ" -#: ../libgweather/weather.c:114 +#: ../libgweather/gweather-weather.c:113 msgid "Variable" msgstr "ไม่คงทิศ" -#: ../libgweather/weather.c:115 +#: ../libgweather/gweather-weather.c:114 msgid "North" msgstr "เหนือ" -#: ../libgweather/weather.c:115 +#: ../libgweather/gweather-weather.c:114 msgid "North - NorthEast" msgstr "เหนือ - ตะวันออกเฉียงเหนือ" -#: ../libgweather/weather.c:115 +#: ../libgweather/gweather-weather.c:114 msgid "Northeast" msgstr "ตะวันออกเฉียงเหนือ" -#: ../libgweather/weather.c:115 +#: ../libgweather/gweather-weather.c:114 msgid "East - NorthEast" msgstr "ตะวันออก - ตะวันออกเฉียงเหนือ" -#: ../libgweather/weather.c:116 +#: ../libgweather/gweather-weather.c:115 msgid "East" msgstr "ตะวันออก" -#: ../libgweather/weather.c:116 +#: ../libgweather/gweather-weather.c:115 msgid "East - Southeast" msgstr "ตะวันออก - ตะวันออกเฉียงใต้" -#: ../libgweather/weather.c:116 +#: ../libgweather/gweather-weather.c:115 msgid "Southeast" msgstr "ตะวันออกเฉียงใต้" -#: ../libgweather/weather.c:116 +#: ../libgweather/gweather-weather.c:115 msgid "South - Southeast" msgstr "ใต้ - ตะวันออกเฉียงใต้" -#: ../libgweather/weather.c:117 +#: ../libgweather/gweather-weather.c:116 msgid "South" msgstr "ใต้" -#: ../libgweather/weather.c:117 +#: ../libgweather/gweather-weather.c:116 msgid "South - Southwest" msgstr "ใต้ - ตะวันตกเฉียงใต้" -#: ../libgweather/weather.c:117 +#: ../libgweather/gweather-weather.c:116 msgid "Southwest" msgstr "ตะวันตกเฉียงใต้" -#: ../libgweather/weather.c:117 +#: ../libgweather/gweather-weather.c:116 msgid "West - Southwest" msgstr "ตะวันตก - ตะวันตกเฉียงใต้" -#: ../libgweather/weather.c:118 +#: ../libgweather/gweather-weather.c:117 msgid "West" msgstr "ตะวันตก" -#: ../libgweather/weather.c:118 +#: ../libgweather/gweather-weather.c:117 msgid "West - Northwest" msgstr "ตะวันตก - ตะวันตกเฉียงเหนือ" -#: ../libgweather/weather.c:118 +#: ../libgweather/gweather-weather.c:117 msgid "Northwest" msgstr "ตะวันตกเฉียงเหนือ" -#: ../libgweather/weather.c:118 +#: ../libgweather/gweather-weather.c:117 msgid "North - Northwest" msgstr "เหนือ - ตะวันตกเฉียงเหนือ" -#: ../libgweather/weather.c:125 +#: ../libgweather/gweather-weather.c:124 msgctxt "wind direction" msgid "Invalid" msgstr "ไม่ถูกต้อง" # These are from http://www.tmd.go.th -#: ../libgweather/weather.c:131 +#: ../libgweather/gweather-weather.c:130 msgid "Clear Sky" msgstr "ท้องฟ้าแจ่มใส" -#: ../libgweather/weather.c:132 +#: ../libgweather/gweather-weather.c:131 msgid "Broken clouds" msgstr "ท้องฟ้ามีเมฆเป็นส่วนมาก" -#: ../libgweather/weather.c:133 +#: ../libgweather/gweather-weather.c:132 msgid "Scattered clouds" msgstr "ท้องฟ้ามีเมฆบางส่วน" # Can't think of a better word -#: ../libgweather/weather.c:134 +#: ../libgweather/gweather-weather.c:133 msgid "Few clouds" msgstr "ท้องฟ้าโปร่ง" -#: ../libgweather/weather.c:135 +#: ../libgweather/gweather-weather.c:134 msgid "Overcast" msgstr "ท้องฟ้ามีเมฆเต็มท้องฟ้า" -#: ../libgweather/weather.c:142 ../libgweather/weather.c:214 +#: ../libgweather/gweather-weather.c:141 ../libgweather/gweather-weather.c:213 msgctxt "sky conditions" msgid "Invalid" msgstr "ไม่ถูกต้อง" @@ -150,314 +154,314 @@ #. * etc means, you can go to http://www.weather.com/glossary/ and #. * http://www.crh.noaa.gov/arx/wx.tbl.php #. NONE -#: ../libgweather/weather.c:174 ../libgweather/weather.c:176 +#: ../libgweather/gweather-weather.c:173 ../libgweather/gweather-weather.c:175 msgid "Thunderstorm" msgstr "พายุฝนฟ้าคะนอง" #. DRIZZLE -#: ../libgweather/weather.c:175 +#: ../libgweather/gweather-weather.c:174 msgid "Drizzle" msgstr "ฝนละออง" -#: ../libgweather/weather.c:175 +#: ../libgweather/gweather-weather.c:174 msgid "Light drizzle" msgstr "ฝนละอองเบาบาง" -#: ../libgweather/weather.c:175 +#: ../libgweather/gweather-weather.c:174 msgid "Moderate drizzle" msgstr "ฝนละอองปานกลาง" -#: ../libgweather/weather.c:175 +#: ../libgweather/gweather-weather.c:174 msgid "Heavy drizzle" msgstr "ฝนละอองหนัก" -#: ../libgweather/weather.c:175 +#: ../libgweather/gweather-weather.c:174 msgid "Freezing drizzle" msgstr "ฝนละอองเยือกแข็ง" # What does "ฝนฟ้าคะนอง" mean? #. RAIN -#: ../libgweather/weather.c:176 +#: ../libgweather/gweather-weather.c:175 msgid "Rain" msgstr "ฝนตก" -#: ../libgweather/weather.c:176 +#: ../libgweather/gweather-weather.c:175 msgid "Light rain" msgstr "ฝนตกเล็กน้อย" -#: ../libgweather/weather.c:176 +#: ../libgweather/gweather-weather.c:175 msgid "Moderate rain" msgstr "ฝนตกปานกลาง" -#: ../libgweather/weather.c:176 +#: ../libgweather/gweather-weather.c:175 msgid "Heavy rain" msgstr "ฝนตกหนัก" # What's the difference between ประปราย and เป็นหย่อมๆ ? # Tempted to use ฝนไล่ช้าง :-) # -#: ../libgweather/weather.c:176 +#: ../libgweather/gweather-weather.c:175 msgid "Rain showers" msgstr "ฝนซู่" -#: ../libgweather/weather.c:176 +#: ../libgweather/gweather-weather.c:175 msgid "Freezing rain" msgstr "ฝนเยือกแข็ง" # Guess this hardly ever happen in Thailand :-). #. SNOW -#: ../libgweather/weather.c:177 +#: ../libgweather/gweather-weather.c:176 msgid "Snow" msgstr "หิมะตก" # Make more sense than หิมะตกเบาบาง -#: ../libgweather/weather.c:177 +#: ../libgweather/gweather-weather.c:176 msgid "Light snow" msgstr "หิมะตกเล็กน้อย" -#: ../libgweather/weather.c:177 +#: ../libgweather/gweather-weather.c:176 msgid "Moderate snow" msgstr "หิมะตกปานกลาง" -#: ../libgweather/weather.c:177 +#: ../libgweather/gweather-weather.c:176 msgid "Heavy snow" msgstr "หิมะตกหนัก" -#: ../libgweather/weather.c:177 +#: ../libgweather/gweather-weather.c:176 msgid "Snowstorm" msgstr "พายุหิมะ" # Hope this doesn't confuse with "drifting snow" -#: ../libgweather/weather.c:177 +#: ../libgweather/gweather-weather.c:176 msgid "Blowing snowfall" msgstr "หิมะฟุ้ง" -#: ../libgweather/weather.c:177 +#: ../libgweather/gweather-weather.c:176 msgid "Snow showers" msgstr "หิมะตกประปราย" # Hope this doesn't confuse with "blowing snow" -#: ../libgweather/weather.c:177 +#: ../libgweather/gweather-weather.c:176 msgid "Drifting snow" msgstr "พริ้วหิมะ" # Man, this is getting hard for Thai translation >:-| #. SNOW_GRAINS -#: ../libgweather/weather.c:178 +#: ../libgweather/gweather-weather.c:177 msgid "Snow grains" msgstr "เม็ดหิมะ" -#: ../libgweather/weather.c:178 +#: ../libgweather/gweather-weather.c:177 msgid "Light snow grains" msgstr "เม็ดหิมะ ตกเบาบาง" -#: ../libgweather/weather.c:178 +#: ../libgweather/gweather-weather.c:177 msgid "Moderate snow grains" msgstr "เม็ดหิมะ ตกปานกลาง" -#: ../libgweather/weather.c:178 +#: ../libgweather/gweather-weather.c:177 msgid "Heavy snow grains" msgstr "เม็ดหิมะ ตกหนัก" #. ICE_CRYSTALS -#: ../libgweather/weather.c:179 +#: ../libgweather/gweather-weather.c:178 msgid "Ice crystals" msgstr "ผลึกน้ำแข็ง" #. ICE_PELLETS -#: ../libgweather/weather.c:180 +#: ../libgweather/gweather-weather.c:179 msgid "Sleet" msgstr "ฝนน้ำแข็ง" -#: ../libgweather/weather.c:180 +#: ../libgweather/gweather-weather.c:179 msgid "Little sleet" msgstr "ฝนน้ำแข็งตกเล็กน้อย" -#: ../libgweather/weather.c:180 +#: ../libgweather/gweather-weather.c:179 msgid "Moderate sleet" msgstr "ฝนน้ำแข็งตกปานกลาง" -#: ../libgweather/weather.c:180 +#: ../libgweather/gweather-weather.c:179 msgid "Heavy sleet" msgstr "ฝนน้ำแข็งตกหนัก" -#: ../libgweather/weather.c:180 +#: ../libgweather/gweather-weather.c:179 msgid "Sleet storm" msgstr "พายุฝนน้ำแข็ง" -#: ../libgweather/weather.c:180 +#: ../libgweather/gweather-weather.c:179 msgid "Showers of sleet" msgstr "ฝนน้ำแข็งโปรย" #. HAIL -#: ../libgweather/weather.c:181 +#: ../libgweather/gweather-weather.c:180 msgid "Hail" msgstr "ลูกเห็บ" -#: ../libgweather/weather.c:181 +#: ../libgweather/gweather-weather.c:180 msgid "Hailstorm" msgstr "พายุลูกเห็บ" -#: ../libgweather/weather.c:181 +#: ../libgweather/gweather-weather.c:180 msgid "Hail showers" msgstr "ลูกเห็บโปรย" #. SMALL_HAIL -#: ../libgweather/weather.c:182 +#: ../libgweather/gweather-weather.c:181 msgid "Small hail" msgstr "ลูกเห็บชนิดเล็ก" -#: ../libgweather/weather.c:182 +#: ../libgweather/gweather-weather.c:181 msgid "Small hailstorm" msgstr "พายุลูกเห็บชนิดเล็ก" -#: ../libgweather/weather.c:182 +#: ../libgweather/gweather-weather.c:181 msgid "Showers of small hail" msgstr "ลูกเห็บชนิดเล็กโปรย" #. PRECIPITATION -#: ../libgweather/weather.c:183 +#: ../libgweather/gweather-weather.c:182 msgid "Unknown precipitation" msgstr "หยาดน้ำฟ้าไม่ทราบชนิด" #. MIST -#: ../libgweather/weather.c:184 +#: ../libgweather/gweather-weather.c:183 msgid "Mist" msgstr "หมอกน้ำค้าง" #. FOG -#: ../libgweather/weather.c:185 +#: ../libgweather/gweather-weather.c:184 msgid "Fog" msgstr "หมอก" -#: ../libgweather/weather.c:185 +#: ../libgweather/gweather-weather.c:184 msgid "Fog in the vicinity" msgstr "หมอกในบริเวณรอบข้าง" -#: ../libgweather/weather.c:185 +#: ../libgweather/gweather-weather.c:184 msgid "Shallow fog" msgstr "หมอกตื้น" -#: ../libgweather/weather.c:185 +#: ../libgweather/gweather-weather.c:184 msgid "Patches of fog" msgstr "หมอกเป็นหย่อม" -#: ../libgweather/weather.c:185 +#: ../libgweather/gweather-weather.c:184 msgid "Partial fog" msgstr "หมอกบางส่วน" -#: ../libgweather/weather.c:185 +#: ../libgweather/gweather-weather.c:184 msgid "Freezing fog" msgstr "หมอกเยือกแข็ง" #. SMOKE -#: ../libgweather/weather.c:186 +#: ../libgweather/gweather-weather.c:185 msgid "Smoke" msgstr "ควัน" #. VOLCANIC_ASH -#: ../libgweather/weather.c:187 +#: ../libgweather/gweather-weather.c:186 msgid "Volcanic ash" msgstr "เถ้าภูเขาไฟ" #. SAND -#: ../libgweather/weather.c:188 +#: ../libgweather/gweather-weather.c:187 msgid "Sand" msgstr "ทราย" -#: ../libgweather/weather.c:188 +#: ../libgweather/gweather-weather.c:187 msgid "Blowing sand" msgstr "ทรายปลิว" -#: ../libgweather/weather.c:188 +#: ../libgweather/gweather-weather.c:187 msgid "Drifting sand" msgstr "ทรายฟุ้ง" #. HAZE -#: ../libgweather/weather.c:189 +#: ../libgweather/gweather-weather.c:188 msgid "Haze" msgstr "ฟ้าหลัว" # This is salt sprays blown from the sea #. SPRAY -#: ../libgweather/weather.c:190 +#: ../libgweather/gweather-weather.c:189 msgid "Blowing sprays" msgstr "อนุภาคเกลือ" #. DUST -#: ../libgweather/weather.c:191 +#: ../libgweather/gweather-weather.c:190 msgid "Dust" msgstr "ฝุ่น" -#: ../libgweather/weather.c:191 +#: ../libgweather/gweather-weather.c:190 msgid "Blowing dust" msgstr "ฝุ่นปลิว" -#: ../libgweather/weather.c:191 +#: ../libgweather/gweather-weather.c:190 msgid "Drifting dust" msgstr "ฝุ่นฟุ้ง" #. SQUALL -#: ../libgweather/weather.c:192 +#: ../libgweather/gweather-weather.c:191 msgid "Squall" msgstr "ลมสควอลล์" #. SANDSTORM -#: ../libgweather/weather.c:193 +#: ../libgweather/gweather-weather.c:192 msgid "Sandstorm" msgstr "พายุทราย" -#: ../libgweather/weather.c:193 +#: ../libgweather/gweather-weather.c:192 msgid "Sandstorm in the vicinity" msgstr "พายุทรายในบริเวณใกล้เคียง" -#: ../libgweather/weather.c:193 +#: ../libgweather/gweather-weather.c:192 msgid "Heavy sandstorm" msgstr "พายุทรายพัดหนัก" #. DUSTSTORM -#: ../libgweather/weather.c:194 +#: ../libgweather/gweather-weather.c:193 msgid "Duststorm" msgstr "พายุฝุ่น" -#: ../libgweather/weather.c:194 +#: ../libgweather/gweather-weather.c:193 msgid "Duststorm in the vicinity" msgstr "พายุฝุ่นในบริเวณใกล้เคียง" -#: ../libgweather/weather.c:194 +#: ../libgweather/gweather-weather.c:193 msgid "Heavy duststorm" msgstr "พายุฝุ่นพัดหนัก" #. FUNNEL_CLOUD -#: ../libgweather/weather.c:195 +#: ../libgweather/gweather-weather.c:194 msgid "Funnel cloud" msgstr "เมฆงวงช้าง" # ลมสลาตัน ;-) #. TORNADO -#: ../libgweather/weather.c:196 +#: ../libgweather/gweather-weather.c:195 msgid "Tornado" msgstr "ทอร์นาโด" # FIXME: This could be translated better. #. DUST_WHIRLS -#: ../libgweather/weather.c:197 +#: ../libgweather/gweather-weather.c:196 msgid "Dust whirls" msgstr "ลมฝุ่นหมุน" -#: ../libgweather/weather.c:197 +#: ../libgweather/gweather-weather.c:196 msgid "Dust whirls in the vicinity" msgstr "ลมฝุ่นหมุนในบริเวณใกล้เคียง" -#: ../libgweather/weather.c:706 +#: ../libgweather/gweather-weather.c:705 msgid "%a, %b %d / %H∶%M" msgstr "%a %d %b / %H:%M น." -#: ../libgweather/weather.c:712 +#: ../libgweather/gweather-weather.c:711 msgid "Unknown observation time" msgstr "ไม่ทราบเวลาบันทึกสภาพอากาศ" -#: ../libgweather/weather.c:724 +#: ../libgweather/gweather-weather.c:723 msgctxt "sky conditions" msgid "Unknown" msgstr "ไม่ทราบ" @@ -468,89 +472,89 @@ #. * Do *not* translate it to "predefinito:mm", if it #. * it isn't default:mm or default:inch it will not work #. -#: ../libgweather/weather.c:746 +#: ../libgweather/gweather-weather.c:745 msgid "default:mm" msgstr "default:mm" #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN) -#: ../libgweather/weather.c:791 +#: ../libgweather/gweather-weather.c:797 #, c-format msgid "%.1f °F" msgstr "%.1f °F" #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN) -#: ../libgweather/weather.c:794 +#: ../libgweather/gweather-weather.c:800 #, c-format msgid "%d °F" msgstr "%d °F" #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN) -#: ../libgweather/weather.c:800 +#: ../libgweather/gweather-weather.c:806 #, c-format msgid "%.1f °C" msgstr "%.1f °C" #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN) -#: ../libgweather/weather.c:803 +#: ../libgweather/gweather-weather.c:809 #, c-format msgid "%d °C" msgstr "%d °C" #. TRANSLATOR: This is the temperature in kelvin -#: ../libgweather/weather.c:809 +#: ../libgweather/gweather-weather.c:815 #, c-format msgid "%.1f K" msgstr "%.1f K" #. TRANSLATOR: This is the temperature in kelvin -#: ../libgweather/weather.c:812 +#: ../libgweather/gweather-weather.c:818 #, c-format msgid "%d K" msgstr "%d K" -#: ../libgweather/weather.c:835 ../libgweather/weather.c:851 -#: ../libgweather/weather.c:867 ../libgweather/weather.c:929 +#: ../libgweather/gweather-weather.c:841 ../libgweather/gweather-weather.c:857 +#: ../libgweather/gweather-weather.c:873 ../libgweather/gweather-weather.c:935 msgctxt "temperature" msgid "Unknown" msgstr "ไม่ทราบ" -#: ../libgweather/weather.c:889 +#: ../libgweather/gweather-weather.c:895 msgctxt "dew" msgid "Unknown" msgstr "ไม่ทราบ" -#: ../libgweather/weather.c:909 +#: ../libgweather/gweather-weather.c:915 msgctxt "humidity" msgid "Unknown" msgstr "ไม่ทราบ" #. TRANSLATOR: This is the humidity in percent -#: ../libgweather/weather.c:912 +#: ../libgweather/gweather-weather.c:918 #, c-format msgid "%.f%%" msgstr "%.f%%" # from กรมอุตุนิยมวิทยา www.tmd.go.th #. TRANSLATOR: This is the wind speed in knots -#: ../libgweather/weather.c:958 +#: ../libgweather/gweather-weather.c:964 #, c-format msgid "%0.1f knots" msgstr "%0.1f นอต" #. TRANSLATOR: This is the wind speed in miles per hour -#: ../libgweather/weather.c:961 +#: ../libgweather/gweather-weather.c:967 #, c-format msgid "%.1f mph" msgstr "%.1f ไมล์/ชม." #. TRANSLATOR: This is the wind speed in kilometers per hour -#: ../libgweather/weather.c:964 +#: ../libgweather/gweather-weather.c:970 #, c-format msgid "%.1f km/h" msgstr "%.1f กม./ชม." #. TRANSLATOR: This is the wind speed in meters per second -#: ../libgweather/weather.c:967 +#: ../libgweather/gweather-weather.c:973 #, c-format msgid "%.1f m/s" msgstr "%.1f เมตร/วินาที" @@ -558,104 +562,105 @@ #. TRANSLATOR: This is the wind speed as a Beaufort force factor #. * (commonly used in nautical wind estimation). #. -#: ../libgweather/weather.c:972 +#: ../libgweather/gweather-weather.c:978 #, c-format msgid "Beaufort force %.1f" msgstr "แรงโบฟอร์ต %.1f" -#: ../libgweather/weather.c:993 +#: ../libgweather/gweather-weather.c:999 msgctxt "wind speed" msgid "Unknown" msgstr "ไม่ทราบ" -#: ../libgweather/weather.c:995 +#: ../libgweather/gweather-weather.c:1001 msgid "Calm" msgstr "สงบ" #. TRANSLATOR: This is 'wind direction' / 'wind speed' -#: ../libgweather/weather.c:1003 +#: ../libgweather/gweather-weather.c:1009 #, c-format msgid "%s / %s" msgstr "%s / %s" -#: ../libgweather/weather.c:1039 +#: ../libgweather/gweather-weather.c:1045 msgctxt "pressure" msgid "Unknown" msgstr "ไม่ทราบ" #. TRANSLATOR: This is pressure in inches of mercury -#: ../libgweather/weather.c:1045 +#: ../libgweather/gweather-weather.c:1051 #, c-format msgid "%.2f inHg" msgstr "%.2f นิ้วปรอท" #. TRANSLATOR: This is pressure in millimeters of mercury -#: ../libgweather/weather.c:1048 +#: ../libgweather/gweather-weather.c:1054 #, c-format msgid "%.1f mmHg" msgstr "%.1f มม.ปรอท" #. TRANSLATOR: This is pressure in kiloPascals -#: ../libgweather/weather.c:1051 +#: ../libgweather/gweather-weather.c:1057 #, c-format msgid "%.2f kPa" msgstr "%.2f กิโลปาสคาล" #. TRANSLATOR: This is pressure in hectoPascals -#: ../libgweather/weather.c:1054 +#: ../libgweather/gweather-weather.c:1060 #, c-format msgid "%.2f hPa" msgstr "%.2f เฮกโตปาสคาล" #. TRANSLATOR: This is pressure in millibars -#: ../libgweather/weather.c:1057 +#: ../libgweather/gweather-weather.c:1063 #, c-format msgid "%.2f mb" msgstr "%.2f มิลลิบาร์" #. TRANSLATOR: This is pressure in atmospheres -#: ../libgweather/weather.c:1060 +#: ../libgweather/gweather-weather.c:1066 #, c-format msgid "%.3f atm" msgstr "%.3f บรรยากาศ" -#: ../libgweather/weather.c:1098 +#: ../libgweather/gweather-weather.c:1104 msgctxt "visibility" msgid "Unknown" msgstr "ไม่ทราบ" #. TRANSLATOR: This is the visibility in miles -#: ../libgweather/weather.c:1104 +#: ../libgweather/gweather-weather.c:1110 #, c-format msgid "%.1f miles" msgstr "%.1f ไมล์" #. TRANSLATOR: This is the visibility in kilometers -#: ../libgweather/weather.c:1107 +#: ../libgweather/gweather-weather.c:1113 #, c-format msgid "%.1f km" msgstr "%.1f กม." #. TRANSLATOR: This is the visibility in meters -#: ../libgweather/weather.c:1110 +#: ../libgweather/gweather-weather.c:1116 #, c-format msgid "%.0fm" msgstr "%.0f เมตร" -#: ../libgweather/weather.c:1138 ../libgweather/weather.c:1163 +#: ../libgweather/gweather-weather.c:1144 +#: ../libgweather/gweather-weather.c:1169 msgid "%H∶%M" msgstr "%H∶%M" -#: ../libgweather/weather.c:1257 +#: ../libgweather/gweather-weather.c:1263 msgid "Retrieval failed" msgstr "เรียกอ่านข้อมูลไม่สำเร็จ" -#: ../libgweather/weather-metar.c:574 +#: ../libgweather/weather-metar.c:573 #, c-format msgid "Failed to get METAR data: %d %s.\n" msgstr "อ่านข้อมูล METAR ไม่สำเร็จ: %d %s\n" -#: ../libgweather/weather-owm.c:385 +#: ../libgweather/weather-owm.c:383 msgid "" "Weather data from the <a href=\"http://openweathermap.org\">Open Weather Map " "project</a>" @@ -669,11 +674,12 @@ #. #. That's very nice of them! #. -#: ../libgweather/weather-yrno.c:445 +#: ../libgweather/weather-yrno.c:507 msgid "" -"Weather data from the <a href=\"http://yr.no/\">Norwegian Meteorological " -"Institute</a>" -msgstr "ข้อมูลสภาพอากาศจาก <a href=\"http://yr.no/\">สถาบันอุตุนิยมวิทยานอร์เวย์</a>" +"Weather data from the <a href=\"http://www.met.no/\">Norwegian " +"Meteorological Institute</a>" +msgstr "" +"ข้อมูลสภาพอากาศจาก <a href=\"http://www.met.no/\">สถาบันอุตุนิยมวิทยานอร์เวย์</a>" #: ../schemas/org.gnome.GWeather.gschema.xml.h:1 msgid "URL for the radar map" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgweather-3.20.2/po-locations/pl.po new/libgweather-3.20.3/po-locations/pl.po --- old/libgweather-3.20.2/po-locations/pl.po 2015-08-29 03:56:51.000000000 +0200 +++ new/libgweather-3.20.3/po-locations/pl.po 2016-08-29 01:58:29.000000000 +0200 @@ -1,30 +1,26 @@ -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl(a)aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Polish translation for libgweather-locations. +# Copyright © 2005-2016 the libgweather authors. +# This file is distributed under the same license as the libgweather package. # Bartosz Kosiorek <gang65(a)poczta.onet.pl>, 2005. # Artur Flinta <aflinta(a)at.kernel.pl>, 2006. # Tomasz Dominikowski <dominikowski(a)gmail.com>, 2008-2009. -# Piotr Drąg <piotrdrag(a)gmail.com>, 2010-2015. -# Aviary.pl <gnomepl(a)aviary.pl>, 2008-2015. +# Piotr Drąg <piotrdrag(a)gmail.com>, 2010-2016. +# Aviary.pl <community-poland(a)mozilla.org>, 2008-2016. +# msgid "" msgstr "" "Project-Id-Version: libgweather-locations\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-26 10:41+0000\n" -"PO-Revision-Date: 2015-03-05 00:33+0100\n" +"POT-Creation-Date: 2016-08-15 23:35+0000\n" +"PO-Revision-Date: 2016-08-16 11:00+0200\n" "Last-Translator: Piotr Drąg <piotrdrag(a)gmail.com>\n" -"Language-Team: Polish <gnomepl(a)aviary.pl>\n" +"Language-Team: Polish <community-poland(a)mozilla.org>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" msgid "Africa" msgstr "Afryka" @@ -42,10 +38,10 @@ msgstr "Ocean Atlantycki" msgid "Australasia and Oceania" -msgstr "Australazja i Oceania" +msgstr "Australazja i Oceania" msgid "Central and South America" -msgstr "Ameryka Środkowa i Południowa" +msgstr "Ameryka Środkowa i Południowa" msgid "Europe" msgstr "Europa" @@ -94,7 +90,7 @@ #. AG - Antigua and Barbuda msgid "Antigua and Barbuda" -msgstr "Antigua i Barbuda" +msgstr "Antigua i Barbuda" #. AR - Argentina msgid "Argentina" @@ -173,7 +169,7 @@ #. BA - Bosnia and Herzegovina msgid "Bosnia and Herzegovina" -msgstr "Bośnia i Hercegowina" +msgstr "Bośnia i Hercegowina" #. BW - Botswana msgid "Botswana" @@ -875,7 +871,7 @@ #. KN - Saint Kitts and Nevis msgid "Saint Kitts and Nevis" -msgstr "Saint Kitts i Nevis" +msgstr "Saint Kitts i Nevis" #. LC - Saint Lucia msgid "Saint Lucia" @@ -893,11 +889,11 @@ #. "Saint-Pierre-et-Miquelon". #. msgid "Saint Pierre and Miquelon" -msgstr "Saint Pierre i Miquelon" +msgstr "Saint Pierre i Miquelon" #. VC - Saint Vincent and the Grenadines msgid "Saint Vincent and the Grenadines" -msgstr "Saint Vincent i Grenadyny" +msgstr "Saint Vincent i Grenadyny" #. WS - Samoa, an independent nation not to be confused with #. "American Samoa" @@ -915,7 +911,7 @@ #. name does not have the accents. #. msgid "Sao Tome and Principe" -msgstr "Sao Tome i Principe" +msgstr "Sao Tome i Principe" #. SA - Saudi Arabia msgid "Saudi Arabia" @@ -966,7 +962,7 @@ #. territory in the South Atlantic. #. msgid "South Georgia and the South Sandwich Islands" -msgstr "South Georgia i Wyspy South Sandwich" +msgstr "South Georgia i Wyspy South Sandwich" #. KR - The Republic of Korea, aka South Korea msgid "South Korea" @@ -993,7 +989,7 @@ #. internationally. #. msgid "Svalbard and Jan Mayen" -msgstr "Svalbard i Jan Mayen" +msgstr "Svalbard i Jan Mayen" #. SZ - Swaziland msgid "Swaziland" @@ -1047,7 +1043,7 @@ #. TT - Trinidad and Tobago msgid "Trinidad and Tobago" -msgstr "Trynidad i Tobago" +msgstr "Trynidad i Tobago" #. TN - Tunisia msgid "Tunisia" @@ -1065,7 +1061,7 @@ #. Caribbean #. msgid "Turks and Caicos Islands" -msgstr "Wyspy Turks i Caicos" +msgstr "Wyspy Turks i Caicos" #. TV - Tuvalu msgid "Tuvalu" @@ -1135,7 +1131,7 @@ #. Pacific #. msgid "Wallis and Futuna" -msgstr "Wallis i Futuna" +msgstr "Wallis i Futuna" #. EH - Western Sahara, a disputed territory in western Africa msgid "Western Sahara" @@ -1402,9 +1398,6 @@ msgid "Tahiti / Society Islands" msgstr "Tahiti/Wyspy Towarzystwa" -# To taki bagnisty kawałek półwyspu -# z jakimś parkiem przyrodniczym -# w zatoce Chesapeake #. This refers to the time zone in the Marquesas Islands of #. French Polynesia. This string is only used in places #. where "French Polynesia" is already clear from context. @@ -1824,7 +1817,7 @@ #. in places where "Spain" is already clear from context. #. msgid "Ceuta and Melilla" -msgstr "Ceuta i Melilla" +msgstr "Ceuta i Melilla" #. The time zone used on most of the west coast of North #. America. In Mexico it is called "Tiempo del Pacífico" @@ -1987,7 +1980,7 @@ #. Wallonisch-Brabant. #. msgid "Brussels, Flemish and Walloon Brabant" -msgstr "Bruksela, Flamandia i Prowincja Brabancja Walońska" +msgstr "Bruksela, Flamandia i Prowincja Brabancja Walońska" #. A state/province/territory in Belgium msgid "East-Flanders" @@ -2164,7 +2157,7 @@ #. A state/province/territory in Canada msgid "Newfoundland and Labrador" -msgstr "Nowa Fundlandia i Labrador" +msgstr "Nowa Fundlandia i Labrador" #. A state/province/territory in Canada msgid "Northwest Territories" @@ -2545,7 +2538,7 @@ #. A state/province/territory in United Kingdom msgid "East and South East England" -msgstr "Wschodnia i południowo wschodnia Anglia" +msgstr "Wschodnia i południowo wschodnia Anglia" #. A state/province/territory in United Kingdom msgid "Midlands" @@ -2569,7 +2562,7 @@ #. A state/province/territory in United Kingdom msgid "South and South West England" -msgstr "Południowa i południowo wschodnia Anglia" +msgstr "Południowa i południowo wschodnia Anglia" #. A state/province/territory in United Kingdom msgid "Wales" @@ -12639,7 +12632,7 @@ msgid "Astoria" msgstr "Astoria" -# To nie są Ateny tylko miasto w USA +# To nie są Ateny, tylko miasto w USA #. A city in Georgia in the United States msgctxt "City in Georgia, United States" msgid "Athens" @@ -13880,7 +13873,6 @@ msgid "Decorah" msgstr "Decorah" -# Miasto w USA #. A city in Washington in the United States msgid "Deer Park" msgstr "Deer Park" @@ -16746,8 +16738,8 @@ msgid "Newton" msgstr "Newton" -# To nazwa miasta, a nie wodospadów -# więc chyba ie trzeba tłumaczyć +# To nazwa miasta, a nie wodospadów, +# więc chyba nie trzeba tłumaczyć #. A city in New York in the United States msgid "Niagara Falls" msgstr "Niagara Falls"

1 0

commit cogl for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package cogl for openSUSE:Factory checked in at 2016-08-31 00:05:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cogl (Old) and /work/SRC/openSUSE:Factory/.cogl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cogl" Changes: -------- --- /work/SRC/openSUSE:Factory/cogl/cogl.changes 2016-06-03 16:28:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cogl.new/cogl.changes 2016-08-31 00:05:47.000000000 +0200 @@ -1,0 +2,19 @@ +Mon Aug 29 08:03:28 UTC 2016 - fezhang(a)suse.com + +- Add 0001-fix-build-failure-with-Werror-undef.patch: + Fix build failure for SLE (bgo#770533). + +------------------------------------------------------------------- +Fri Aug 26 19:27:59 UTC 2016 - zaitor(a)opensuse.org + +- Update to version 1.22.2: + + Skip journal dumping if not supported (bgo#728355). + + Support glMapBufferRange from ES3 (bgo#728355). + + Improvements in the KMS winsys (bgo#756926, bgo#758073). + + Require gettext 0.19 to avoid hacks (bgo#760285). + + Respect the Wayland spec for EGL surface creation (bgo#765351). + + Updated translations. +- Drop cogl-GLES-Support-glMapBufferRange.patch and + cogl-fix-black-login-screen.patch: Fixed upstream. + +------------------------------------------------------------------- Old: ---- cogl-1.22.0.tar.xz cogl-GLES-Support-glMapBufferRange.patch cogl-fix-black-login-screen.patch New: ---- 0001-fix-build-failure-with-Werror-undef.patch cogl-1.22.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cogl.spec ++++++ --- /var/tmp/diff_new_pack.9t4D77/_old 2016-08-31 00:05:48.000000000 +0200 +++ /var/tmp/diff_new_pack.9t4D77/_new 2016-08-31 00:05:48.000000000 +0200 @@ -24,7 +24,7 @@ %define with_GLES2 1 Name: cogl -Version: 1.22.0 +Version: 1.22.2 Release: 0 Summary: An object oriented GL/GLES Abstraction/Utility Layer License: MIT @@ -32,10 +32,8 @@ Url: http://clutter-project.org/ Source0: http://download.gnome.org/sources/cogl/1.22/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM cogl-GLES-Support-glMapBufferRange.patch zaitor(a)opensuse.org -- Support glmapbufferrange, patch from upstream git, stable branch. -Patch0: cogl-GLES-Support-glMapBufferRange.patch -# PATCH-FIX-UPSTREAM cogl-fix-black-login-screen.patch boo#958885 zaitor(a)opensuse.org -- Fix black and frozen login screen after logout. -Patch1: cogl-fix-black-login-screen.patch +# PATCH-FIX-UPSTREAM 0001-fix-build-failure-with-Werror-undef.patch bgo#770533 fezhang(a)suse.com -- Fix build failure for SLE. +Patch0: 0001-fix-build-failure-with-Werror-undef.patch BuildRequires: fdupes BuildRequires: gtk-doc >= 1.13 BuildRequires: pkgconfig(cairo) >= 1.10 @@ -189,7 +187,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %configure \ ++++++ 0001-fix-build-failure-with-Werror-undef.patch ++++++ >From da5e0859e15eeb93fa81bd645c93425f6acef0cd Mon Sep 17 00:00:00 2001 From: Felix Zhang <fezhang(a)suse.com> Date: Mon, 29 Aug 2016 15:02:14 +0800 Subject: [PATCH] fix build failure with -Werror=undef --- cogl/winsys/cogl-winsys-egl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogl/winsys/cogl-winsys-egl.c b/cogl/winsys/cogl-winsys-egl.c index 39bfd88..4a9f3aa 100644 --- a/cogl/winsys/cogl-winsys-egl.c +++ b/cogl/winsys/cogl-winsys-egl.c @@ -1029,7 +1029,7 @@ _cogl_egl_create_image (CoglContext *ctx, egl_ctx = EGL_NO_CONTEXT; else #endif -#if COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT +#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT /* The WL_bind_wayland_display spec states that EGL_NO_CONTEXT is to be used * in conjunction with the EGL_WAYLAND_BUFFER_WL target */ if (target == EGL_WAYLAND_BUFFER_WL) -- 2.6.6 ++++++ cogl-1.22.0.tar.xz -> cogl-1.22.2.tar.xz ++++++ ++++ 68626 lines of diff (skipped)

1 0

commit shotwell for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package shotwell for openSUSE:Factory checked in at 2016-08-31 00:05:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shotwell (Old) and /work/SRC/openSUSE:Factory/.shotwell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shotwell" Changes: -------- --- /work/SRC/openSUSE:Factory/shotwell/shotwell.changes 2016-08-22 14:00:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.shotwell.new/shotwell.changes 2016-08-31 00:05:38.000000000 +0200 @@ -153,0 +154,8 @@ +Thu Apr 14 15:34:16 UTC 2016 - mgorse(a)suse.com + +- Update to GNOME 3.20 Fate#318572 +- Drop 0001-Shotwell-flickr-api-change-fix.patch and + 0001-Shotwell-crashes-when-adjusting-date-time-Closes-bug.patch: + fixed upstream. + +------------------------------------------------------------------- @@ -165,0 +174,7 @@ +Fri Aug 28 09:43:01 UTC 2015 - cxiong(a)suse.com + +- Add 0001-Shotwell-flickr-api-change-fix.patch: + Flickr's API has gone to HTTPS only, this patch backport + upstream fix for it (bnc#943559, bgo#732432). + +------------------------------------------------------------------- @@ -194,0 +210,7 @@ + +------------------------------------------------------------------- +Wed Oct 8 23:42:19 UTC 2014 - mgorse(a)suse.com + +- Add + 0001-Shotwell-crashes-when-adjusting-date-time-Closes-bug.patch: + Fix a crash when updating the date/time of a photo (bnc#899715). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit libproxy for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libproxy for openSUSE:Factory checked in at 2016-08-31 00:05:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libproxy (Old) and /work/SRC/openSUSE:Factory/.libproxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libproxy" Changes: -------- --- /work/SRC/openSUSE:Factory/libproxy/libproxy-plugins.changes 2016-07-28 23:43:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libproxy.new/libproxy-plugins.changes 2016-08-31 00:05:29.000000000 +0200 @@ -7,0 +8,5 @@ +Fri May 20 07:34:21 UTC 2016 - alarrosa(a)suse.com + +- Update to GNOME 3.20.2 (Fate#318572, bnc#980527) + +------------------------------------------------------------------- @@ -38,0 +44,5 @@ +Fri Apr 15 22:00:25 UTC 2016 - mgorse(a)suse.com + +- Update to GNOME 3.20 Fate#318572 + +------------------------------------------------------------------- libproxy.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ libproxy.spec: same change

1 0

commit vinagre for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package vinagre for openSUSE:Factory checked in at 2016-08-31 00:05:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vinagre (Old) and /work/SRC/openSUSE:Factory/.vinagre.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vinagre" Changes: -------- --- /work/SRC/openSUSE:Factory/vinagre/vinagre.changes 2016-08-17 12:00:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vinagre.new/vinagre.changes 2016-08-31 00:05:17.000000000 +0200 @@ -14,0 +15,5 @@ +Thu May 26 14:25:12 CDT 2016 - federico(a)suse.com + +- Update to GNOME 3.20.2 Fate#318572 + +------------------------------------------------------------------- @@ -20,0 +26,7 @@ +Fri May 6 10:16:00 UTC 2016 - idonmez(a)suse.com + +- Sync with Factory for new libvte support bsc#978804 +- Drop vinagre-bnc874407-add-advanced-options.patch, rdp support + is disabled. + +------------------------------------------------------------------- @@ -214,0 +227,7 @@ +Mon Jul 14 22:19:57 UTC 2014 - mgorse(a)suse.com + +- Update vinagre-bnc874407-add-advanced-options.patch: + When calling xfreerdp, add advanced options before the host/port + (bnc#874407). + +------------------------------------------------------------------- @@ -225,0 +245,6 @@ +Fri Jul 4 00:06:00 UTC 2014 - mgorse(a)suse.com + +- Add vinagre-bnc874407-add-advanced-options.patch: allow custom + options to be passed to xfreerdp (bnc#874407). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit telepathy-glib for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package telepathy-glib for openSUSE:Factory checked in at 2016-08-31 00:05:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/telepathy-glib (Old) and /work/SRC/openSUSE:Factory/.telepathy-glib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "telepathy-glib" Changes: -------- --- /work/SRC/openSUSE:Factory/telepathy-glib/telepathy-glib.changes 2014-08-30 16:04:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.telepathy-glib.new/telepathy-glib.changes 2016-08-31 00:05:09.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 14 10:28:00 UTC 2016 - idonmez(a)suse.com + +- Update to GNOME 3.20 Fate#318572 +- Remove upstreamed patches: 0001-fix-file-path-leaks.patch + 0001-tp_list_connection_managers_async-terminate-properly.patch + +------------------------------------------------------------------- @@ -32,0 +40,13 @@ +Fri Mar 28 01:47:45 UTC 2014 - mgorse(a)suse.com + +- Add 0001-fix-file-path-leaks.patch: fix leak when calling + g_file_get_path (fdo#76119). + +------------------------------------------------------------------- +Fri Mar 21 16:56:45 UTC 2014 - fcrozat(a)suse.com + +- Add + 0001-tp_list_connection_managers_async-terminate-properly.patch: + terminate properly if there is no CM [fdo#68892] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-glib.spec ++++++ --- /var/tmp/diff_new_pack.qfRdUU/_old 2016-08-31 00:05:10.000000000 +0200 +++ /var/tmp/diff_new_pack.qfRdUU/_new 2016-08-31 00:05:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package telepathy-glib # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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

1 0

commit system-config-printer for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package system-config-printer for openSUSE:Factory checked in at 2016-08-31 00:04:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/system-config-printer (Old) and /work/SRC/openSUSE:Factory/.system-config-printer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "system-config-printer" Changes: -------- --- /work/SRC/openSUSE:Factory/system-config-printer/system-config-printer.changes 2016-07-01 09:57:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.system-config-printer.new/system-config-printer.changes 2016-08-31 00:04:59.000000000 +0200 @@ -12,2 +12,2 @@ -- Add python3-to-python2.diff : Remove all python3 dependencies. - Only applied in SLE12 where python3 is not available. +- Modified python3-to-python2.diff : One of the changes included + there now comes in fix_connect_dialog_focus.diff. @@ -37,0 +38,12 @@ +Fri Apr 22 10:11:53 UTC 2016 - alarrosa(a)suse.com + +- Add python3-to-python2.diff : Remove all python3 dependencies. +- Modified python3 dependencies in the spec file too to use python2 + in SLE12. + +------------------------------------------------------------------- +Fri Apr 15 21:24:52 UTC 2016 - mgorse(a)suse.com + +- Update to GNOME 3.20 Fate#318572 + +------------------------------------------------------------------- @@ -90 +102 @@ ------------------------------------------------------------------- +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit python-gobject for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package python-gobject for openSUSE:Factory checked in at 2016-08-31 00:04:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-gobject (Old) and /work/SRC/openSUSE:Factory/.python-gobject.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-gobject" Changes: -------- --- /work/SRC/openSUSE:Factory/python-gobject/python-gobject.changes 2016-05-05 12:12:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-gobject.new/python-gobject.changes 2016-08-31 00:04:50.000000000 +0200 @@ -21,0 +22,5 @@ +Fri Apr 15 16:58:11 UTC 2016 - mgorse(a)suse.com + +- Update to GNOME 3.20 Fate#318572 + +------------------------------------------------------------------- @@ -1448 +1453 @@ --Wed Feb 9 18:09:19 UTC 2011 - jmatejek(a)novell.com +Wed Feb 9 18:09:19 UTC 2011 - jmatejek(a)novell.com python3-gobject.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ python3-gobject.spec: same change

1 0

commit pixman for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package pixman for openSUSE:Factory checked in at 2016-08-31 00:04:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pixman (Old) and /work/SRC/openSUSE:Factory/.pixman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pixman" Changes: -------- --- /work/SRC/openSUSE:Factory/pixman/pixman.changes 2016-05-08 10:40:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pixman.new/pixman.changes 2016-08-31 00:04:41.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 15 21:23:20 UTC 2016 - mgorse(a)suse.com + +- Update to GNOME 3.20 Fate#318572 + +------------------------------------------------------------------- @@ -173 +178 @@ ------------------------------------------------------------------- +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit orca for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package orca for openSUSE:Factory checked in at 2016-08-31 00:04:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/orca (Old) and /work/SRC/openSUSE:Factory/.orca.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "orca" Changes: -------- --- /work/SRC/openSUSE:Factory/orca/orca.changes 2016-07-28 23:42:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.orca.new/orca.changes 2016-08-31 00:04:34.000000000 +0200 @@ -87,0 +88,5 @@ +Thu Apr 14 15:19:26 UTC 2016 - mgorse(a)suse.com + +- Update to GNOME 3.20 Fate#318572 + +------------------------------------------------------------------- @@ -553,0 +559 @@ + + Fixes to work with newer Firefox, etc (bnc#932719). @@ -1095,0 +1102,20 @@ +Thu Nov 16 04:16:34 UTC 2013 - mgorse(a)suse.com + +- Update to version 3.10.3: + + General: + - Fix for bug 726395 - Sometimes flat review presents + non-localized rolenames + - Fix a mysterious Brltty crash triggered by Orca + - Fix for bug 708664 - Selection and link indicators messing up + braille + - Fix the live region announcment review keybindings + - Fix two hangs when accessing WebKitGtk content + - Fix two hangs when accessing Gecko content + - Fix bug in column header labels for the links list dialog + - Restore the speech server before cleaning up unused servers + in Preferences + - Add a sanity check for broken value-interface implementations + - Fix a possible traceback in eclipse script + + New and updated translations: fr, hu, zh_CN + +------------------------------------------------------------------- @@ -3410 +3435,0 @@ - @@ -3431 +3455,0 @@ - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit libcroco for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libcroco for openSUSE:Factory checked in at 2016-08-31 00:04:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcroco (Old) and /work/SRC/openSUSE:Factory/.libcroco.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcroco" Changes: -------- --- /work/SRC/openSUSE:Factory/libcroco/libcroco.changes 2015-12-23 08:48:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libcroco.new/libcroco.changes 2016-08-31 00:04:26.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 15 22:12:35 UTC 2016 - mgorse(a)suse.com + +- Update to GNOME 3.20 Fate#318572 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcroco.spec ++++++ --- /var/tmp/diff_new_pack.IBwh5h/_old 2016-08-31 00:04:27.000000000 +0200 +++ /var/tmp/diff_new_pack.IBwh5h/_new 2016-08-31 00:04:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libcroco # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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

1 0

commit gupnp-dlna for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package gupnp-dlna for openSUSE:Factory checked in at 2016-08-31 00:04:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gupnp-dlna (Old) and /work/SRC/openSUSE:Factory/.gupnp-dlna.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gupnp-dlna" Changes: -------- --- /work/SRC/openSUSE:Factory/gupnp-dlna/gupnp-dlna.changes 2016-07-01 09:53:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gupnp-dlna.new/gupnp-dlna.changes 2016-08-31 00:04:18.000000000 +0200 @@ -7,0 +8,5 @@ +Fri Apr 15 22:35:28 UTC 2016 - mgorse(a)suse.com + +- Update to GNOME 3.20 Fate#318572 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit gspell for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package gspell for openSUSE:Factory checked in at 2016-08-31 00:04:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gspell (Old) and /work/SRC/openSUSE:Factory/.gspell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gspell" Changes: -------- --- /work/SRC/openSUSE:Factory/gspell/gspell.changes 2016-07-18 21:19:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gspell.new/gspell.changes 2016-08-31 00:04:11.000000000 +0200 @@ -6 +6 @@ - the current word is not checked. + the current word is not checked (bgo#768306). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit gsettings-desktop-schemas for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package gsettings-desktop-schemas for openSUSE:Factory checked in at 2016-08-31 00:04:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gsettings-desktop-schemas (Old) and /work/SRC/openSUSE:Factory/.gsettings-desktop-schemas.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gsettings-desktop-schemas" Changes: -------- --- /work/SRC/openSUSE:Factory/gsettings-desktop-schemas/gsettings-desktop-schemas.changes 2016-03-29 14:35:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gsettings-desktop-schemas.new/gsettings-desktop-schemas.changes 2016-08-31 00:04:05.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 13 09:39:27 UTC 2016 - idonmez(a)suse.com + +- Update to GNOME 3.20 Fate#318572 +- Remove gsettings-desktop-schemas-bnc872820-wm-button-layout.patch + upstreamed. + +------------------------------------------------------------------- @@ -103,0 +111,8 @@ +Thu Sep 25 21:02:15 CDT 2014 - federico(a)suse.com + +- Add gsettings-desktop-schemas-bnc872820-wm-button-layout.patch: + This lets us have the correct defaults for the window manager's + button layout, for the default session mode (i.e. not Classic) + (bnc872820). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit gobject-introspection for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package gobject-introspection for openSUSE:Factory checked in at 2016-08-31 00:03:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gobject-introspection (Old) and /work/SRC/openSUSE:Factory/.gobject-introspection.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gobject-introspection" Changes: -------- --- /work/SRC/openSUSE:Factory/gobject-introspection/gobject-introspection.changes 2016-04-28 16:49:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gobject-introspection.new/gobject-introspection.changes 2016-08-31 00:03:59.000000000 +0200 @@ -7,0 +8,7 @@ +Wed Apr 13 08:36:23 UTC 2016 - idonmez(a)suse.com + +- Update to GNOME 3.20 Fate#318572 +- Remove 0001-typelib-compiler-properly-initialise-memory.patch, + gobject-introspection-bgo729662-ownership-transfer.patch. + +------------------------------------------------------------------- @@ -94,0 +102,7 @@ +Tue May 12 15:16:26 UTC 2015 - olaf(a)aepfle.de + +- Add 0001-typelib-compiler-properly-initialise-memory.patch: + typelib compiler writes uninitialised memory to typelib file + (bnc#930584). + +------------------------------------------------------------------- @@ -138,0 +153,8 @@ + +------------------------------------------------------------------- +Tue Aug 5 19:17:55 CEST 2014 - hpj(a)suse.com + +- Add gobject-introspection-bgo729662-ownership-transfer.patch: + which makes it possible for language bindings to know about + ownership transfer for instance parameters so memory management + can be performed correctly (bgo#729662). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit gnome-packagekit for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package gnome-packagekit for openSUSE:Factory checked in at 2016-08-31 00:03:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-packagekit (Old) and /work/SRC/openSUSE:Factory/.gnome-packagekit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-packagekit" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-packagekit/gnome-packagekit.changes 2016-08-16 13:01:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-packagekit.new/gnome-packagekit.changes 2016-08-31 00:03:52.000000000 +0200 @@ -2,7 +1,0 @@ -Thu Aug 4 01:24:20 CEST 2016 - hpj(a)suse.com - -- Add bnc#881245-update-test-affects-package-manager-should-restart-gpk-update-viewer.patch - (bsc#881245), bnc#939278-gnome-packagekit-asks-for-reboot-password-too-early.patch - (bsc#939278), bnc-946886-install-signatures-in-viewer.patch (bsc#946886). - -------------------------------------------------------------------- @@ -14,0 +8,7 @@ +Thu Apr 14 16:12:30 UTC 2016 - mgorse(a)suse.com + +- Update to GNOME 3.20 Fate#318572 +- Drop patch license-agreement-title.patch: fixed upstream. +- Rebase bnc#881245-update-test-affects-package-manager-should-restart-gpk-update-viewer.patch + +------------------------------------------------------------------- @@ -41,0 +42,6 @@ +Tue Dec 1 10:43:50 UTC 2015 - rlmu(a)suse.com + +- Add bnc#939278-gnome-packagekit-asks-for-reboot-password-too-early.patch + Asks for reboot passwd too early (bnc#939278). + +------------------------------------------------------------------- @@ -47,0 +54,6 @@ +Thu Oct 22 21:06:25 UTC 2015 - mgorse(a)suse.com + +- Add bnc-946886-install-signatures-in-viewer.patch -- install + signatures in gpk-update-viewer if needed (bsc#946886). + +------------------------------------------------------------------- @@ -64,0 +77,6 @@ +Wed Apr 15 15:27:13 UTC 2015 - fcrozat(a)suse.com + +- Add patch license-agreement-title.patch: fix license agreement + title (bsc#927319). + +------------------------------------------------------------------- @@ -124,0 +143,9 @@ +Fri Sep 19 14:59:29 UTC 2014 - fcrozat(a)suse.com + +- Add patch + bnc#881245-update-test-affects-package-manager-should-restart-gpk-update-viewer.patch: + ensure gpk-update-viewer is restarted when restart_suggested is + part of the update flags. Initial patch by Roy Ley Mu + (bnc#881245). + +------------------------------------------------------------------- @@ -171,0 +199,6 @@ +Fri Jun 13 09:19:41 UTC 2014 - fezhang(a)suse.com + +- Add category X-GNOME-SystemSettings to gpk-prefs.desktop so + that gnome-control-center can recongnize and show it (bnc#866235) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-packagekit.spec ++++++ --- /var/tmp/diff_new_pack.acatkQ/_old 2016-08-31 00:03:53.000000000 +0200 +++ /var/tmp/diff_new_pack.acatkQ/_new 2016-08-31 00:03:53.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-packagekit # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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

1 0

commit libsecret for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libsecret for openSUSE:Factory checked in at 2016-08-31 00:03:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsecret (Old) and /work/SRC/openSUSE:Factory/.libsecret.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsecret" Changes: -------- --- /work/SRC/openSUSE:Factory/libsecret/libsecret.changes 2016-04-01 13:02:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsecret.new/libsecret.changes 2016-08-31 00:03:46.000000000 +0200 @@ -18,0 +19,6 @@ +Thu Nov 26 03:02:09 CET 2015 - hpj(a)suse.com + +- Add libsecret-bsc932232-use-libgcrypt-allocators.patch + (bsc#932232). + +------------------------------------------------------------------- New: ---- libsecret-bsc932232-use-libgcrypt-allocators.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsecret.spec ++++++ --- /var/tmp/diff_new_pack.bSTxvr/_old 2016-08-31 00:03:47.000000000 +0200 +++ /var/tmp/diff_new_pack.bSTxvr/_new 2016-08-31 00:03:47.000000000 +0200 @@ -27,6 +27,8 @@ Url: https://wiki.gnome.org/Projects/Libsecret Source0: http://download.gnome.org/sources/libsecret/0.18/%{name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-SLE libsecret-bsc932232-use-libgcrypt-allocators.patch bsc#932232 hpj(a)suse.com -- use libgcrypt allocators for FIPS mode +Patch1: libsecret-bsc932232-use-libgcrypt-allocators.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: gobject-introspection-devel >= 1.29 @@ -90,6 +92,9 @@ %endif %prep %setup -q +%if !0%{?is_opensuse} +%patch1 -p1 +%endif translation-update-upstream %build ++++++ libsecret-bsc932232-use-libgcrypt-allocators.patch ++++++ diff --git a/egg/egg-libgcrypt.c b/egg/egg-libgcrypt.c index 22f005d..a01fb11 100644 --- a/egg/egg-libgcrypt.c +++ b/egg/egg-libgcrypt.c @@ -107,11 +107,6 @@ egg_libgcrypt_initialize (void) gcry_set_log_handler (log_handler, NULL); gcry_set_outofcore_handler (no_mem_handler, NULL); gcry_set_fatalerror_handler (fatal_handler, NULL); - gcry_set_allocation_handler ((gcry_handler_alloc_t)g_malloc, - (gcry_handler_alloc_t)egg_secure_alloc, - egg_secure_check, - (gcry_handler_realloc_t)egg_secure_realloc, - egg_secure_free); gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); }

1 0

commit gcr for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package gcr for openSUSE:Factory checked in at 2016-08-31 00:03:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcr (Old) and /work/SRC/openSUSE:Factory/.gcr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gcr" Changes: -------- --- /work/SRC/openSUSE:Factory/gcr/gcr.changes 2016-03-29 14:50:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gcr.new/gcr.changes 2016-08-31 00:03:37.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 15 20:21:06 CEST 2016 - hpj(a)suse.com + +- Update to GNOME 3.20 -- Fate#318572. + +------------------------------------------------------------------- @@ -13,0 +19,5 @@ + +------------------------------------------------------------------- +Thu Nov 26 02:54:47 CET 2015 - hpj(a)suse.com + +- Add gcr-bsc932232-use-libgcrypt-allocators.patch (bsc#932232). New: ---- gcr-bsc932232-use-libgcrypt-allocators.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcr.spec ++++++ --- /var/tmp/diff_new_pack.pKUl33/_old 2016-08-31 00:03:38.000000000 +0200 +++ /var/tmp/diff_new_pack.pKUl33/_new 2016-08-31 00:03:38.000000000 +0200 @@ -26,6 +26,8 @@ Url: http://www.gnome.org Source0: http://download.gnome.org/sources/gcr/3.20/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-SLE gcr-bsc932232-use-libgcrypt-allocators.patch bsc#932232 hpj(a)suse.com -- use libgcrypt allocators for FIPS mode +Patch1: gcr-bsc932232-use-libgcrypt-allocators.patch # For directory ownership BuildRequires: dbus-1 BuildRequires: gobject-introspection-devel >= 1.34 @@ -171,6 +173,9 @@ sed -i "s:GLib.Object:GObject.Object:g" $file done fi +%if !0%{?is_opensuse} +%patch1 -p1 +%endif %build %configure ++++++ gcr-bsc932232-use-libgcrypt-allocators.patch ++++++ diff --git a/egg/egg-libgcrypt.c b/egg/egg-libgcrypt.c index 0ba84fe..cca36f1 100644 --- a/egg/egg-libgcrypt.c +++ b/egg/egg-libgcrypt.c @@ -105,11 +105,6 @@ egg_libgcrypt_initialize (void) gcry_set_log_handler (log_handler, NULL); gcry_set_outofcore_handler (no_mem_handler, NULL); gcry_set_fatalerror_handler (fatal_handler, NULL); - gcry_set_allocation_handler ((gcry_handler_alloc_t)g_malloc, - (gcry_handler_alloc_t)egg_secure_alloc, - egg_secure_check, - (gcry_handler_realloc_t)egg_secure_realloc, - egg_secure_free); gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); }

1 0

commit NetworkManager for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at 2016-08-31 00:03:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old) and /work/SRC/openSUSE:Factory/.NetworkManager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "NetworkManager" Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes 2016-07-27 16:07:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.NetworkManager.new/NetworkManager.changes 2016-08-31 00:03:29.000000000 +0200 @@ -2 +2 @@ -Tue Jul 19 09:29:32 UTC 2016 - sckang(a)suse.com +Mon Jul 18 03:14:22 UTC 2016 - sckang(a)suse.com @@ -14,0 +15,12 @@ +Fri Apr 8 07:05:23 UTC 2016 - sckang(a)suse.com + +- Update to version 1.0.12 (FATE#318572) +- drop nm-core-fix-crash-during-Wi-Fi-rescan-by-emitting-NM_DE.patch + contained in version 0.9.9.1. +- Rebase NetworkManager-geoclue-interaction.patch +- Rebase nm-don-t-consider-not-needed-secrets-for-has_system_secr.diff +- Rebase nm-treat-not-saved-secrets-just-like-agent-owned-when-cl.diff +- Rebase systemd-network-config.patch +- Rebase nm-probe-radius-server-cert.patch + +------------------------------------------------------------------- @@ -462,0 +475,22 @@ +Fri Sep 19 11:10:49 UTC 2014 - fcrozat(a)suse.com + +- modified patches: + * systemd-network-config.patch: NM-wait-online should block only + network-online.target, not network.target (bnc#889175). + +------------------------------------------------------------------- +Thu Sep 18 15:37:06 UTC 2014 - fcrozat(a)suse.com + +- modified patches: + * systemd-network-config.patch : ensure + NetworkManager-wait-online.service is enabled when + NetworkManager.service is (bnc#889175). + +------------------------------------------------------------------- +Mon Aug 25 16:34:35 CEST 2014 - fcrozat(a)suse.com + +- Add + nm-core-fix-crash-during-Wi-Fi-rescan-by-emitting-NM_DE.patch: + fix regression in 0.9.8.10 causing crash in Wifi rescan. + +------------------------------------------------------------------- @@ -2079 +2113 @@ ------------------------------------------------------------------- +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit yast2-bootloader for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2016-08-31 00:03:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2016-08-03 11:42:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2016-08-31 00:03:09.000000000 +0200 @@ -1,0 +2,28 @@ +Tue Aug 30 13:31:14 UTC 2016 - jreidinger(a)suse.com + +- import properly device map in autoyast profile (found during + debugging bnc#995627) +- log device map entries before written them, to allow easier + debugging of augeas lenses failure (bnc#995627) +- 3.1.203 + +------------------------------------------------------------------- +Tue Aug 30 08:42:25 UTC 2016 - jreidinger(a)suse.com + +- fix crash when activating partition on md raid (bnc#995627) +- 3.1.202 + +------------------------------------------------------------------- +Fri Aug 26 09:25:49 UTC 2016 - jsrain(a)suse.cz + +- warn user if enabling TPM when not available (bsc#994556) +- 3.1.201 + +------------------------------------------------------------------- +Tue Aug 23 14:20:15 UTC 2016 - jreidinger(a)suse.com + +- fix proposing generic mbr if proposed to boot from MBR + ( found during debugging bnc#994348 ) +- 3.1.200 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.199.tar.bz2 New: ---- yast2-bootloader-3.1.203.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.FSTw3j/_old 2016-08-31 00:03:10.000000000 +0200 +++ /var/tmp/diff_new_pack.FSTw3j/_new 2016-08-31 00:03:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.199 +Version: 3.1.203 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.199.tar.bz2 -> yast2-bootloader-3.1.203.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.199/CONTRIBUTING.md new/yast2-bootloader-3.1.203/CONTRIBUTING.md --- old/yast2-bootloader-3.1.199/CONTRIBUTING.md 2016-07-18 17:25:07.000000000 +0200 +++ new/yast2-bootloader-3.1.203/CONTRIBUTING.md 2016-08-30 15:58:39.000000000 +0200 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount… if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.199/package/yast2-bootloader.changes new/yast2-bootloader-3.1.203/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.199/package/yast2-bootloader.changes 2016-07-18 17:25:07.000000000 +0200 +++ new/yast2-bootloader-3.1.203/package/yast2-bootloader.changes 2016-08-30 15:58:39.000000000 +0200 @@ -1,4 +1,32 @@ ------------------------------------------------------------------- +Tue Aug 30 13:31:14 UTC 2016 - jreidinger(a)suse.com + +- import properly device map in autoyast profile (found during + debugging bnc#995627) +- log device map entries before written them, to allow easier + debugging of augeas lenses failure (bnc#995627) +- 3.1.203 + +------------------------------------------------------------------- +Tue Aug 30 08:42:25 UTC 2016 - jreidinger(a)suse.com + +- fix crash when activating partition on md raid (bnc#995627) +- 3.1.202 + +------------------------------------------------------------------- +Fri Aug 26 09:25:49 UTC 2016 - jsrain(a)suse.cz + +- warn user if enabling TPM when not available (bsc#994556) +- 3.1.201 + +------------------------------------------------------------------- +Tue Aug 23 14:20:15 UTC 2016 - jreidinger(a)suse.com + +- fix proposing generic mbr if proposed to boot from MBR + ( found during debugging bnc#994348 ) +- 3.1.200 + +------------------------------------------------------------------- Mon Jul 18 14:56:27 UTC 2016 - jreidinger(a)suse.com - do not fail tests when run in environment connected by serial diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.199/package/yast2-bootloader.spec new/yast2-bootloader-3.1.203/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.199/package/yast2-bootloader.spec 2016-07-18 17:25:07.000000000 +0200 +++ new/yast2-bootloader-3.1.203/package/yast2-bootloader.spec 2016-08-30 15:58:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.199 +Version: 3.1.203 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.199/src/lib/bootloader/autoyast_converter.rb new/yast2-bootloader-3.1.203/src/lib/bootloader/autoyast_converter.rb --- old/yast2-bootloader-3.1.199/src/lib/bootloader/autoyast_converter.rb 2016-07-18 17:25:07.000000000 +0200 +++ new/yast2-bootloader-3.1.203/src/lib/bootloader/autoyast_converter.rb 2016-08-30 15:58:39.000000000 +0200 @@ -3,6 +3,7 @@ require "bootloader/bootloader_factory" Yast.import "BootStorage" +Yast.import "Arch" module Bootloader # Represents unsupported bootloader type error @@ -32,6 +33,7 @@ import_grub2(data, bootloader) import_stage1(data, bootloader) import_default(data, bootloader.grub_default) + import_device_map(data, bootloader) # TODO: import Initrd log.warn "autoyast profile contain sections which won't be processed" if data["sections"] @@ -52,6 +54,9 @@ export_grub2(global, config) if config.name == "grub2" export_stage1(global, config.stage1) if config.respond_to?(:stage1) export_default(global, config.grub_default) + # Do not export device map as device name are very unpredictable and is used only as + # work-around when automatic ones do not work for what-ever reasons ( it can really safe + # your day in L3 ) res end @@ -106,6 +111,19 @@ end end + def import_device_map(data, bootloader) + return unless bootloader.name == "grub2" + return if !Yast::Arch.x86_64 && !Yast::Arch.i386 + + dev_map = data["device_map"] + return unless dev_map + + bootloader.device_map.clear_mapping + dev_map.each do |entry| + bootloader.device_map.add_mapping(entry["firmware"], entry["linux"]) + end + end + STAGE1_DEVICES_MAPPING = { "boot_root" => :RootPartitionDevice, "boot_boot" => :BootPartitionDevice, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.199/src/lib/bootloader/device_map.rb new/yast2-bootloader-3.1.203/src/lib/bootloader/device_map.rb --- old/yast2-bootloader-3.1.199/src/lib/bootloader/device_map.rb 2016-07-18 17:25:07.000000000 +0200 +++ new/yast2-bootloader-3.1.203/src/lib/bootloader/device_map.rb 2016-08-30 15:58:39.000000000 +0200 @@ -33,6 +33,7 @@ end def write + log.info "writing device map: #{self}" @model.save end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.199/src/lib/bootloader/grub2_widgets.rb new/yast2-bootloader-3.1.203/src/lib/bootloader/grub2_widgets.rb --- old/yast2-bootloader-3.1.199/src/lib/bootloader/grub2_widgets.rb 2016-07-18 17:25:07.000000000 +0200 +++ new/yast2-bootloader-3.1.203/src/lib/bootloader/grub2_widgets.rb 2016-08-30 15:58:39.000000000 +0200 @@ -8,6 +8,7 @@ Yast.import "Label" Yast.import "Report" Yast.import "UI" +Yast.import "Mode" module Bootloader # Adds to generic widget grub2 specific helpers @@ -295,7 +296,13 @@ def help # TRANSLATORS: TrustedGRUB2 is a name, don't translate it - _("Trusted Boot will install TrustedGRUB2 instead of regular GRUB2.\n") + _("Trusted Boot will install TrustedGRUB2\n" \ + "instead of regular GRUB2.\n" \ + "It means measuring the integrity of the boot process,\n" \ + "with the help from the hardware (a TPM, Trusted Platform Module,\n" \ + "chip).\n" \ + "First you need to make sure Trusted Boot is enabled in the BIOS\n" \ + "setup (the setting may be named Security Chip, for example).\n") end def init @@ -305,6 +312,20 @@ def store grub2.trusted_boot = value end + + def validate + return true if Yast::Mode.config || !value + tpm_files = Dir.glob("/sys/**/pcrs") + if !tpm_files.empty? + # check for file size does not work, since FS reports it 4096 + # even if the file is in fact empty and a single byte cannot + # be read, therefore testing real reading (details: bsc#994556) + return true unless File.read(tpm_files[0], 1).nil? + end + Yast::Popup.ContinueCancel(_("Trusted Platform Module not found.\n" \ + "Make sure it is enabled in BIOS.\n" \ + "The system will not boot otherwise.")) + end end # Represents grub password protection widget diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.199/src/lib/bootloader/mbr_update.rb new/yast2-bootloader-3.1.203/src/lib/bootloader/mbr_update.rb --- old/yast2-bootloader-3.1.199/src/lib/bootloader/mbr_update.rb 2016-07-18 17:25:07.000000000 +0200 +++ new/yast2-bootloader-3.1.203/src/lib/bootloader/mbr_update.rb 2016-08-30 15:58:39.000000000 +0200 @@ -1,6 +1,7 @@ require "yast" require "bootloader/boot_record_backup" +require "bootloader/stage1_device" require "yast2/execute" Yast.import "Arch" @@ -45,7 +46,7 @@ end def mbr_is_gpt? - mbr_storage_object = Yast::Storage.GetTargetMap[mbr_disk] + mbr_storage_object = target_map[mbr_disk] raise "Cannot find in storage mbr disk #{mbr_disk}" unless mbr_storage_object mbr_type = mbr_storage_object["label"] log.info "mbr type = #{mbr_type}" @@ -138,24 +139,35 @@ ret = [mbr_disk] # Add to disks only if part of raid on base devices lives on mbr_disk ret.concat(mbrs) if mbrs.include?(mbr_disk) + # get only real disks + ret = ret.each_with_object([]) do |disk, res| + res.concat(::Bootloader::Stage1Device.new(disk).real_devices) + end ret.uniq end def first_base_device_to_boot(md_device) - md = Yast::BootStorage.Md2Partitions(md_device) - md.reduce do |res, items| - device, bios_id = items - next device unless res + md = ::Bootloader::Stage1Device.new(md_device) + md.real_devices.min_by { |device| bios_id_for(device) } + end - bios_id < md[res] ? device : res - end + MAX_BIOS_ID = 1000 + def bios_id_for(device) + disk = Yast::Storage.GetDiskPartition(device)["disk"] + disk_info = target_map[disk] + return MAX_BIOS_ID unless disk_info + + bios_id = disk_info["bios_id"] + # prefer device without bios id over ones without disk info + return MAX_BIOS_ID - 1 if !bios_id || bios_id !~ /0x[0-9a-fA-F]+/ + + bios_id[2..-1].to_i(16) - 0x80 end # List of partition for disk that can be used for setting boot flag def activatable_partitions(disk) - tm = Yast::Storage.GetTargetMap - partitions = tm.fetch(disk, {}).fetch("partitions", []) + partitions = target_map.fetch(disk, {}).fetch("partitions", []) # do not select swap and do not select BIOS grub partition # as it clear its special flags (bnc#894040) partitions.select do |p| @@ -173,28 +185,20 @@ end # Given a device name to which we install the bootloader (loader_device), - # get the name of the partition which should be activated. - # Also return the device file name of the disk device that corresponds to - # loader_device (i.e. where the corresponding MBR can be found). + # gets back disk and partition number to activate. If empty Hash is returned + # then no suitable partition to activate found. # @param [String] loader_device string the device to install bootloader to - # @return a map $[ "mbr": string, "num": any] - # containing device (eg. "/dev/hda4"), disk (eg. "/dev/hda") and - # partition number (eg. 4) + # @return a Hash `{ "mbr" => String, "num" => Integer }` + # containing disk (eg. "/dev/hda") and partition number (eg. 4) def partition_to_activate(loader_device) - p_dev = Yast::Storage.GetDiskPartition(loader_device) + real_device = first_base_device_to_boot(loader_device) + log.info "real devices for #{loader_device} is #{real_device}" + + p_dev = Yast::Storage.GetDiskPartition(real_device) num = p_dev["nr"].to_i mbr_dev = p_dev["disk"] raise "Invalid loader device #{loader_device}" unless mbr_dev - # If loader_device is /dev/md* (which means bootloader is installed to - # /dev/md*), then call recursive method with partition that lays on device - # with the lowest bios id number or first one if noone have bios id - # FIXME: use ::storage to detect md devices, not by name! - if loader_device.start_with?("/dev/md") - base_device = first_base_device_to_boot(loader_device) - return partition_to_activate(base_device) if base_device - end - # (bnc # 337742) - Unable to boot the openSUSE (32 and 64 bits) after installation # if loader_device is disk Choose any partition which is not swap to # satisfy such bios (bnc#893449) @@ -234,5 +238,9 @@ result.uniq end + + def target_map + @target_map ||= Yast::Storage.GetTargetMap + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.199/src/lib/bootloader/stage1_proposal.rb new/yast2-bootloader-3.1.203/src/lib/bootloader/stage1_proposal.rb --- old/yast2-bootloader-3.1.199/src/lib/bootloader/stage1_proposal.rb 2016-07-18 17:25:07.000000000 +0200 +++ new/yast2-bootloader-3.1.203/src/lib/bootloader/stage1_proposal.rb 2016-08-30 15:58:39.000000000 +0200 @@ -20,7 +20,7 @@ proposal.new(stage1).propose - log.info "proposed stage1 configuratopn #{stage1.inspect}" + log.info "proposed stage1 configuration #{stage1.inspect}" end protected @@ -119,6 +119,8 @@ end assign_bootloader_device(selected_location) + + selected_location end def separated_boot? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.199/src/modules/BootStorage.rb new/yast2-bootloader-3.1.203/src/modules/BootStorage.rb --- old/yast2-bootloader-3.1.199/src/modules/BootStorage.rb 2016-07-18 17:25:07.000000000 +0200 +++ new/yast2-bootloader-3.1.203/src/modules/BootStorage.rb 2016-08-30 15:58:39.000000000 +0200 @@ -325,7 +325,6 @@ publish :variable => :BootPartitionDevice, :type => "string" publish :variable => :RootPartitionDevice, :type => "string" publish :variable => :ExtendedPartitionDevice, :type => "string" - publish :function => :Md2Partitions, :type => "map <string, integer> (string)" end BootStorage = BootStorageClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.199/test/autoyast_converter_test.rb new/yast2-bootloader-3.1.203/test/autoyast_converter_test.rb --- old/yast2-bootloader-3.1.199/test/autoyast_converter_test.rb 2016-07-18 17:25:07.000000000 +0200 +++ new/yast2-bootloader-3.1.203/test/autoyast_converter_test.rb 2016-08-30 15:58:39.000000000 +0200 @@ -3,6 +3,8 @@ require "bootloader/autoyast_converter" require "bootloader/grub2" +Yast.import "Arch" + describe Bootloader::AutoyastConverter do subject { described_class } @@ -63,6 +65,21 @@ expect(bootloader.trusted_boot).to eq true end + it "imports device map for grub2 on intel architecture" do + allow(Yast::Arch).to receive(:architecture).and_return("x86_64") + data = { + "loader_type" => "grub2", + "device_map" => [ + { "firmware" => "hd0", "linux" => "/dev/vda" }, + { "firmware" => "hd1", "linux" => "/dev/vdb" } + ] + } + + bootloader = subject.import(data) + expect(bootloader.device_map.system_device_for("hd0")).to eq "/dev/vda" + expect(bootloader.device_map.system_device_for("hd1")).to eq "/dev/vdb" + end + it "supports SLE9 format" do data = { "activate" => "true", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.199/test/mbr_update_test.rb new/yast2-bootloader-3.1.203/test/mbr_update_test.rb --- old/yast2-bootloader-3.1.199/test/mbr_update_test.rb 2016-07-18 17:25:07.000000000 +0200 +++ new/yast2-bootloader-3.1.203/test/mbr_update_test.rb 2016-08-30 15:58:39.000000000 +0200 @@ -119,6 +119,20 @@ subject.run(stage1(generic_mbr: true)) end + it "always uses real devices" do + allow(Yast::BootStorage).to receive(:mbr_disk) + .and_return("/dev/md0") + + allow(::Bootloader::Stage1Device).to receive(:new).with("/dev/md0") + .and_return(double(real_devices: ["/dev/sda1", "/dev/sdb1"])) + expect(Yast::Execute).to receive(:on_target).at_least(:twice) do |*args| + next nil unless args.first =~ /dd/ + next nil unless args.include?("of=/dev/sdb") + expect(args).to be_include("of=/dev/sda") + end + subject.run(stage1(generic_mbr: true)) + end + it "install syslinux if non on initial stage" do allow(Yast::Stage).to receive(:initial).and_return(false) expect(Yast::PackageSystem).to receive(:Install).with("syslinux") @@ -188,6 +202,20 @@ subject.run(stage1(activate: true, devices: ["/dev/sda1", "/dev/sdb1"])) end + + it "sets boot flag on boot device with the lowest bios id when stage1 partition is on md" do + allow(Yast::Storage).to receive(:GetTargetMap).and_return( + "/dev/sda" => { "label" => "msdos", "bios_id" => "0x81" }, + "/dev/sdb" => { "label" => "msdos", "bios_id" => "0x80" } + ) + + allow(::Bootloader::Stage1Device).to receive(:new).with("/dev/md1") + .and_return(double(real_devices: ["/dev/sda1", "/dev/sdb1"])) + expect(Yast::Execute).to receive(:locally) + .with(/parted/, "-s", "/dev/sdb", "set", 1, "boot", "on") + + subject.run(stage1(activate: true, devices: ["/dev/md1"])) + end end context "disk label is GPT" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.199/test/stage1_test.rb new/yast2-bootloader-3.1.203/test/stage1_test.rb --- old/yast2-bootloader-3.1.199/test/stage1_test.rb 2016-07-18 17:25:07.000000000 +0200 +++ new/yast2-bootloader-3.1.203/test/stage1_test.rb 2016-08-30 15:58:39.000000000 +0200 @@ -50,6 +50,20 @@ expect(subject.mbr?).to eq true end + it "do not set generic_mbr if proposed boot from mbr" do + allow(Bootloader::Stage1Device).to receive(:new).and_call_original + target_map_stub("storage_mdraid.yaml") + + allow(Yast::BootStorage).to receive(:mbr_disk) + .and_return("/dev/md") + allow(Yast::BootStorage).to receive(:BootPartitionDevice) + .and_return("/dev/md1") + + subject.propose + + expect(subject.generic_mbr?).to eq false + end + context "on ppc64" do before do allow(Yast::Arch).to receive(:architecture).and_return("ppc64")

1 0

commit yast2-installation for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2016-08-31 00:03:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2016-08-22 10:48:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2016-08-31 00:03:02.000000000 +0200 @@ -1,0 +2,26 @@ +Thu Aug 25 14:23:20 UTC 2016 - lslezak(a)suse.cz + +- Move the installer self update step earlier in the workflow + so the user entered values are not lost after restart and avoid + repeating some steps again (bsc#985055) +- This also fixes losing some values due to restaring YaST (bsc#993690), + (bsc#992608) +- Improved the self update URL handling - the boot parameter has + the highest priority, always ask user when a SLP service is found, + in AutoYaST mode SLP needs to be enabled in the profile +- Display progress when downloading and applying the updates +- 3.1.213 + +------------------------------------------------------------------- +Wed Aug 25 12:51:45 UTC 2016 - cwh(a)suse.com + +- Replace unicode bullet char by asterisk for ncurses (bsc#995082) +- 3.1.212 + +------------------------------------------------------------------- +Thu Aug 25 07:33:10 UTC 2016 - jreidinger(a)suse.com + +- fix writing proposals (bnc#994127) +- 3.1.211 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.1.210.tar.bz2 New: ---- yast2-installation-3.1.213.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.y1Ti69/_old 2016-08-31 00:03:03.000000000 +0200 +++ /var/tmp/diff_new_pack.y1Ti69/_new 2016-08-31 00:03:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.210 +Version: 3.1.213 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,8 +66,8 @@ # Lazy loading in ProductLicense Requires: yast2-packager >= 3.1.113 -# Yast::Storage.multipath_off? -Requires: yast2-storage >= 3.1.97 +# Storage::GetDetectedDiskPaths +Requires: yast2-storage >= 2.24.1 # use in startup scripts Requires: initviocons ++++++ yast2-installation-3.1.210.tar.bz2 -> yast2-installation-3.1.213.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/doc/SELF_UPDATE.md new/yast2-installation-3.1.213/doc/SELF_UPDATE.md --- old/yast2-installation-3.1.210/doc/SELF_UPDATE.md 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/doc/SELF_UPDATE.md 2016-08-30 14:17:36.000000000 +0200 @@ -21,6 +21,18 @@ 3. The update will be applied to the installation system. 4. YaST will be restarted and the installation will be resumed. +### Language Selection + +The self-update step is executed before selecting the language +(`inst_complex_welcome` client). That means the self-update progress and +the errors which happens during the self-update process are by default displayed +in English. + +To use another language also for the self-update press `F2` in the DVD boot menu +and select the language from the list. Or use the `language` boot option, e.g. +`language=de_DE`. + + ## Update Format YaST will use RPM packages stored in a rpm-md repository, although they are @@ -46,11 +58,15 @@ ``` 3. Registration server (SCC/SMT), not available in openSUSE. The URL of the registration server which should be used is determined via: - 1. AutoYaST profile ([reg_server element](https://www.suse.com/documentation/sles-12/singlehtml/book_autoyas…) - 2. The `regurl` boot parameter + 1. The `regurl` boot parameter + 2. AutoYaST profile ([reg_server element](https://www.suse.com/documentation/sles-12/singlehtml/book_autoyas…) 3. SLP lookup (this behavior applies to regular and AutoYaST installations): - * If one server is found, it will be used automatically. - * If more than one server is found, it will ask the user to choose one. + * If at least one server is found it will ask the user to choose one. + * In AutoYaST mode SLP is skipped unless enabled in the profile in the + registration section (see [documentation](https://www.suse.com/documentation/sles-12/singlehtml/book_a…) + AutoYaST expects that only one server is reported by SLP, if more + servers are found it is considered as an error and user interaction is + required just like in manual installation. 4. Default SUSE Customer Center API (`https://scc.suse.com/`). 4. Hard-coded in the `control.xml` file on the installation medium (thus it depends on the base product): @@ -63,7 +79,7 @@ The first suitable URL will be used. There are two exceptions: -* Of course, if no update URL is found then the self update is skipped. +* Of course, if no update URL is found then the self-update is skipped. * If SCC/SMT provides multiple URLs, they will be all used. The URL can contain a variable `$arch` that will be replaced by the system's @@ -93,6 +109,14 @@ correct (or is missing), the user will be asked whether she/he wants to apply the update (although it's a security risk). +When using AutoYaST, this behavior can be modified including the +[/general/signature-handling](https://www.suse.com/documentation/sles-12/singlehtml/book_autoyast/book_autoyast.html#idm140139881381840) +section in the profile. + +On the other hand, if SLP discovery is enabled, a popup is displayed to choose the +server to use. SLP by default does not use any authentication, everybody on the +local network can announce a registration server. + ## Self-update and User Updates Changes introduced by the user via Driver Updates (`dud` boot option) will take @@ -103,14 +127,19 @@ ## Resume installation -Any client called before the self update step is responsible to remember its state (if +Any client called before the self-update step is responsible to remember its state (if needed) and automatically going to the next dialog after the YaST restart. -Once the self update step is reached again it will remove the restarting flag. +Once the self-update step is reached again it will remove the restarting flag. + +The self-update step is called very early in the workflow, for the self-update +step only configured network is needed. That is configured either by `linuxrc` +or by the `setup_dhcp` YaST client which does not need to remember any state. + +## Supported URL Schemes -Currently there is no API available for remembering the client states. The easiest -way is to store the configuration into an YAML file and load it when restarting the -installer. See the [example](https://github.com/yast/yast-installation/pull/367/files#diff-4c91… -in the `inst_complex_welcome` client. +Currently only HTTP/HTTPS and FTP URL schemes are supported for downloading +the updates. Some additional schemes might work but are not tested and therefore +not supported. ## Error handling diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/package/yast2-installation.changes new/yast2-installation-3.1.213/package/yast2-installation.changes --- old/yast2-installation-3.1.210/package/yast2-installation.changes 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/package/yast2-installation.changes 2016-08-30 14:17:36.000000000 +0200 @@ -1,4 +1,30 @@ ------------------------------------------------------------------- +Thu Aug 25 14:23:20 UTC 2016 - lslezak(a)suse.cz + +- Move the installer self update step earlier in the workflow + so the user entered values are not lost after restart and avoid + repeating some steps again (bsc#985055) +- This also fixes losing some values due to restaring YaST (bsc#993690), + (bsc#992608) +- Improved the self update URL handling - the boot parameter has + the highest priority, always ask user when a SLP service is found, + in AutoYaST mode SLP needs to be enabled in the profile +- Display progress when downloading and applying the updates +- 3.1.213 + +------------------------------------------------------------------- +Wed Aug 25 12:51:45 UTC 2016 - cwh(a)suse.com + +- Replace unicode bullet char by asterisk for ncurses (bsc#995082) +- 3.1.212 + +------------------------------------------------------------------- +Thu Aug 25 07:33:10 UTC 2016 - jreidinger(a)suse.com + +- fix writing proposals (bnc#994127) +- 3.1.211 + +------------------------------------------------------------------- Wed Aug 17 15:02:02 UTC 2016 - jreidinger(a)suse.com - filter out same repositories from extraurls if they differ only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/package/yast2-installation.spec new/yast2-installation-3.1.213/package/yast2-installation.spec --- old/yast2-installation-3.1.210/package/yast2-installation.spec 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/package/yast2-installation.spec 2016-08-30 14:17:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.210 +Version: 3.1.213 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -63,8 +63,8 @@ # Lazy loading in ProductLicense Requires: yast2-packager >= 3.1.113 -# Yast::Storage.multipath_off? -Requires: yast2-storage >= 3.1.97 +# Storage::GetDetectedDiskPaths +Requires: yast2-storage >= 2.24.1 # use in startup scripts Requires: initviocons diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/src/lib/installation/clients/inst_complex_welcome.rb new/yast2-installation-3.1.213/src/lib/installation/clients/inst_complex_welcome.rb --- old/yast2-installation-3.1.210/src/lib/installation/clients/inst_complex_welcome.rb 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/src/lib/installation/clients/inst_complex_welcome.rb 2016-08-30 14:17:36.000000000 +0200 @@ -45,10 +45,6 @@ @license_id = Ops.get(Pkg.SourceGetCurrent(true), 0, 0) # ------------------------------------- main part of the client ----------- - if Installation.restarting? && data_stored? - apply_data - return :next - end @argmap = GetInstArgs.argmap @@ -127,8 +123,6 @@ setup_final_choice - store_data - return :next when :show_fulscreen_license UI.OpenDialog(all_licenses_dialog) @@ -383,35 +377,6 @@ log.info "Language: '#{@language}', system encoding '#{WFM.GetEncoding}'" end - DATA_PATH = "/var/lib/YaST2/complex_welcome_store.yaml".freeze - - def data_stored? - ::File.exist?(DATA_PATH) - end - - def store_data - data = { - "language" => @language, - "keyboard" => @keyboard, - "license_accepted" => InstData.product_license_accepted - } - - File.write(DATA_PATH, data.to_yaml) - end - - def apply_data - data = YAML.load(File.read(DATA_PATH)) - @language = data["language"] - @keyboard = data["keyboard"] - InstData.product_license_accepted = data["license_accepted"] - ProductLicense.info_seen!(@license_id) - - change_language - setup_final_choice - - ::FileUtils.rm_rf(DATA_PATH) - end - def text_mode? return @text_mode unless @text_mode.nil? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/src/lib/installation/clients/inst_disks_activate.rb new/yast2-installation-3.1.213/src/lib/installation/clients/inst_disks_activate.rb --- old/yast2-installation-3.1.210/src/lib/installation/clients/inst_disks_activate.rb 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/src/lib/installation/clients/inst_disks_activate.rb 2016-08-30 14:17:36.000000000 +0200 @@ -58,8 +58,6 @@ @have_zfcp = false @want_fcoe = false - return :next if Installation.restarting? - if Arch.s390 # popup label UI.OpenDialog(Label(_("Detecting Available Controllers"))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/src/lib/installation/clients/inst_system_analysis.rb new/yast2-installation-3.1.213/src/lib/installation/clients/inst_system_analysis.rb --- old/yast2-installation-3.1.210/src/lib/installation/clients/inst_system_analysis.rb 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/src/lib/installation/clients/inst_system_analysis.rb 2016-08-30 14:17:36.000000000 +0200 @@ -26,19 +26,15 @@ # Lukas Ocilka <locilka(a)suse.cz> require "yast" -require "fileutils" module Yast class InstSystemAnalysisClient < Client - include Yast::Logger - def main Yast.import "UI" textdomain "installation" Yast.import "Arch" - Yast.import "Directory" Yast.import "GetInstArgs" Yast.import "Hotplug" Yast.import "InstData" @@ -60,8 +56,6 @@ Yast.include self, "packager/storage_include.rb" Yast.include self, "packager/load_release_notes.rb" - @multipath_off_file = File.join(Directory.vardir, "multipath_off") - if Mode.autoupgrade Report.Import( @@ -150,9 +144,6 @@ _("YaST is probing computer hardware and installed systems now.") ) - # bug#989770 - Storage.SetMultipathStartup(false) if persisted_multipath_off? - actions_functions.each do |run_function| Progress.NextStage # Bugzilla #298049 @@ -174,12 +165,6 @@ end Installation.probing_done = true - # bug#989770 - if Storage.multipath_off? - log.info "The user decided to not activate multipath" - persist_multipath_off - end - # the last step is hidden return :abort if ProductProfile.CheckCompliance(nil) == false @@ -370,22 +355,5 @@ true end - - protected - - # Sets a mark for the installer (in case it's executed again due to - # self-update) to disable multipath without asking the user - def persist_multipath_off - log.info "Multipath activation pop-up will be skipped if installer restarts" - ::FileUtils.touch(@multipath_off_file) - end - - # Checks if #persist_multipath_off was called in the previous execution of - # the installer. @see #persist_multipath_off - # - # @return [Boolean] - def persisted_multipath_off? - ::File.exist?(@multipath_off_file) - end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/src/lib/installation/clients/inst_update_installer.rb new/yast2-installation-3.1.213/src/lib/installation/clients/inst_update_installer.rb --- old/yast2-installation-3.1.210/src/lib/installation/clients/inst_update_installer.rb 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/src/lib/installation/clients/inst_update_installer.rb 2016-08-30 14:17:36.000000000 +0200 @@ -24,9 +24,14 @@ UPDATED_FLAG_FILENAME = "installer_updated".freeze REMOTE_SCHEMES = ["http", "https", "ftp", "tftp", "sftp", "nfs", "nfs4", "cifs", "smb"].freeze + PROFILE_FORBIDDEN_SCHEMES = ["label"].freeze REGISTRATION_DATA_PATH = "/var/lib/YaST2/inst_update_installer.yaml".freeze Yast.import "Pkg" + Yast.import "Packages" + Yast.import "PackageCallbacks" + Yast.import "InstURL" + Yast.import "Language" Yast.import "GetInstArgs" Yast.import "Directory" Yast.import "Installation" @@ -38,6 +43,9 @@ Yast.import "NetworkService" Yast.import "Mode" Yast.import "Profile" + Yast.import "ProfileLocation" + Yast.import "AutoinstConfig" + Yast.import "AutoinstGeneral" def main textdomain "installation" @@ -49,16 +57,38 @@ Installation.finish_restarting! end + # shortcut - already updated or disabled via boot option + if installer_updated? || disabled_in_linuxrc? + log.info "Self update not needed, skipping" + return :next + end + + initialize_progress + + if Mode.auto + process_profile + Yast::Progress.NextStage + end + + initialize_packager + + # self update disabled or not possible return :next unless try_to_update? log.info("Trying installer update") + installer_updated = update_installer - if update_installer - ::FileUtils.touch(update_flag_file) # Indicates that the installer was updated. + if installer_updated + # Indicates that the installer was updated. + ::FileUtils.touch(update_flag_file) + Yast::Progress.NextStage Installation.restart! else :next end + ensure + finish_packager + finish_progress end # Tries to update the installer @@ -80,6 +110,7 @@ if updated log.info("Applying installer updates") + Yast::Progress.NextStage updates_manager.apply_all end updated @@ -103,7 +134,7 @@ # # @return [Boolean] True if it's enabled; false otherwise. def self_update_enabled? - if Linuxrc.InstallInf("SelfUpdate") == "0" # disabled via Linuxrc + if disabled_in_linuxrc? log.info("self-update was disabled through Linuxrc") false else @@ -111,6 +142,13 @@ end end + # disabled via Linuxrc ? + # @return [Boolean] true if self update has been disabled by "self_update=0" + # boot option + def disabled_in_linuxrc? + Linuxrc.InstallInf("SelfUpdate") == "0" + end + # Return the self-update URLs # # @return [Array<URI>] self-update URLs @@ -132,6 +170,9 @@ # @return [Array<URI>] self-update URLs def default_self_update_urls return @default_self_update_urls if @default_self_update_urls + # load the base product from the installation medium, + # the registration server needs it for evaluating the self update URL + add_installation_repo @default_self_update_urls = self_update_url_from_connect return @default_self_update_urls unless @default_self_update_urls.empty? @default_self_update_urls = Array(self_update_url_from_control) @@ -176,27 +217,42 @@ # # Determined in the following order: # - # * via AutoYaST profile - # * regurl boot parameter + # * "regurl" boot parameter + # * From AutoYaST profile # * SLP look up - # * If there's only 1 SMT server, it will be chosen automatically. - # * If there's more than 1 SMT server, it will ask the user to choose one + # * In AutoYaST mode the SLP needs to be explicitly enabled in the profile, + # if the scan finds *exactly* one SLP service then it is used. If more + # than one service is found then an interactive popup is displayed. + # (This breaks the AY unattended concept but basically more services + # is treated as an error, AytoYaST cannot know which one to use.) + # * In non-AutoYaST mode it will ask the user to choose the found SLP + # servise or the SCC default. + # * Fallbacks to SCC if no SLP service is found. # # @return [URI,:scc,:cancel] Registration URL; :scc if SCC server was selected; # :cancel if dialog was dismissed. # - # @see #registration_server_from_user + # @see #registration_service_from_user def registration_url - url = registration_url_from_profile || ::Registration::UrlHelpers.boot_reg_url + url = ::Registration::UrlHelpers.boot_reg_url || registration_url_from_profile return URI(url) if url + + # do the SLP scan in AutoYast mode only when allowed in the profile + return :scc if Mode.auto && registration_profile["slp_discovery"] != true + services = ::Registration::UrlHelpers.slp_discovery + log.info "SLP discovery result: #{services.inspect}" return :scc if services.empty? + service = - if services.size > 1 - registration_service_from_user(services) - else + if Mode.auto && services.size == 1 services.first + else + registration_service_from_user(services) end + + log.info "Selected SLP service: #{service.inspect}" + return service unless service.respond_to?(:slp_url) URI(::Registration::UrlHelpers.service_url(service.slp_url)) end @@ -208,9 +264,15 @@ def registration_url_from_profile return nil unless Mode.auto + get_url_from(registration_profile["reg_server"]) + end + + # return the registration settings from the loaded AutoYaST profile + # @return [Hash] the current settings, returns empty Hash if the + # registration section is missing in the profile + def registration_profile profile = Yast::Profile.current - profile_url = profile.fetch("suse_register", {})["reg_server"] - get_url_from(profile_url) + profile.fetch("suse_register", {}) end # Ask the user to chose a registration server @@ -434,5 +496,188 @@ Yast::Profile.current.fetch("suse_register", {}) ) end + + # Initialize the package management so we can download the updates from + # the update repository. + def initialize_packager + return if @packager_initialized + log.info "Initializing the package management..." + + # Add the initial installation repository. + # Unfortunately the Packages.InitializeCatalogs call cannot be used here + # as is does too much (adds y2update.tgz, selects the product, selects + # the default patterns, looks for the addon product files...). + + # initialize package callbacks to show a progress while downloading the files + PackageCallbacks.InitPackageCallbacks + + # set the language for the package manager (mainly error messages) + Pkg.SetTextLocale(Language.language) + + # set the target to inst-sys otherwise libzypp complains in the GPG check + Pkg.TargetInitialize("/") + + # load the GPG keys (*.gpg files) from inst-sys + Packages.ImportGPGKeys + + @packager_initialized = true + end + + def add_installation_repo + base_url = InstURL.installInf2Url("") + initial_repository = Pkg.SourceCreateBase(base_url, "") + + until initial_repository + log.error "Adding the installation repository failed" + # ask user to retry + base_url = Packages.UpdateSourceURL(base_url) + + # aborted by user + return false if base_url == "" + + initial_repository = Pkg.SourceCreateBase(base_url, "") + end + end + + # delete all added installation repositories + # to make sure there is no leftover which could affect the installation later + def finish_packager + return unless @packager_initialized + # false = all repositories, even the disabled ones + Pkg.SourceGetCurrent(false).each { |r| Pkg.SourceDelete(r) } + Pkg.SourceSaveAll + Pkg.SourceFinishAll + Pkg.TargetFinish + end + + # Show global self update progress + def initialize_progress + stages = [ + # TRANSLATORS: progress label + _("Add Update Repository"), + _("Download the Packages"), + _("Apply the Packages"), + _("Restart") + ] + + stages.unshift(_("Fetching AutoYast Profile")) if Mode.auto + + # open a new wizard dialog with title on the top + # (the default dialog with title on the left looks ugly with the + # Progress dialog) + Yast::Wizard.CreateDialog + @wizard_open = true + + Yast::Progress.New( + # TRANSLATORS: dialog title + _("Updating the Installer..."), + # TRANSLATORS: progress title + _("Updating the Installer..."), + # max is 100% + 100, + # stages + stages, + # steps + [], + # help text + "" + ) + + # mark the first stage active + Yast::Progress.NextStage + end + + # Finish the self update progress + def finish_progress + return unless @wizard_open + + Yast::Progress.Finish + Yast::Wizard.CloseDialog + end + + private + + # + # TODO: Most of the code responsable of process the profile has been + # obtained from which inst_autoinit client in yast2-autoinstallation. + # We should try to move it to a independent class or to Yast::Profile. + # + + # @return [Boolean] true if the scheme is not forbidden + def profile_valid_scheme? + !PROFILE_FORBIDDEN_SCHEMES.include? AutoinstConfig.scheme + end + + # Obtains the current profile + # + # @return [Hash, nil] current profile if not empty; nil otherwise + # + # @see Yast::Profile.current + def current_profile + return nil if Profile.current == {} + + Profile.current + end + + # Fetch the profile from the given URI + # + # @return [Hash, nil] current profile if fetched or exists; nil otherwise + # + # @see Yast::Profile.current + def fetch_profile + return current_profile if current_profile + + if !profile_valid_scheme? + Report.Warning("The scheme used (#{AutoinstConfig.scheme}), " \ + "is not supported in self update.") + return nil + end + + process_location + + if !current_profile + secure_uri = Yast::URL.HidePassword(AutoinstConfig.OriginalURI) + log.info("Unable to load the profile from: #{secure_uri}") + + return nil + end + + if !Profile.ReadXML(AutoinstConfig.xml_tmpfile) + Report.Warning(_("Error while parsing the control file.\n\n")) + return nil + end + + current_profile + end + + # Imports Report settings from the current profile + def profile_prepare_reports + report = Profile.current["report"] + Report.Import(report) + end + + # Imports general settings from the profile and set signature callbacks + def profile_prepare_signatures + AutoinstGeneral.Import(Profile.current.fetch("general", {})) + AutoinstGeneral.SetSignatureHandling + end + + # Fetch profile and prepare reports and signature callbas in case of + # obtained a valid one. + def process_profile + log.info("Fetching the profile") + return false if !fetch_profile + + profile_prepare_reports + profile_prepare_signatures + end + + # It retrieves the profile and the user rules from the given location + # + # @see ProfileLocation.Process + def process_location + log.info("Processing profile location...") + ProfileLocation.Process + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/src/lib/installation/proposal_runner.rb new/yast2-installation-3.1.213/src/lib/installation/proposal_runner.rb --- old/yast2-installation-3.1.210/src/lib/installation/proposal_runner.rb 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/src/lib/installation/proposal_runner.rb 2016-08-30 14:17:36.000000000 +0200 @@ -261,7 +261,9 @@ def pre_continue_handling @skip = if Yast::UI.WidgetExists(Id(:skip)) - Yast::UI.QueryWidget(Id(:skip), :Value) + val = Yast::UI.QueryWidget(Id(:skip), :Value) + log.info "there is :skip widget with value #{val.inspect}." + val else true end @@ -510,7 +512,9 @@ def write_settings success = true - @store.proposal_names do |submod| + log.info "Writting settings for proposal" + + @store.proposal_names.each do |submod| submod_success = submod_write_settings(submod) submod_success = true if submod_success.nil? log.error "Write() failed for submodule #{submod}" unless submod_success diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/src/lib/installation/proposal_store.rb new/yast2-installation-3.1.213/src/lib/installation/proposal_store.rb --- old/yast2-installation-3.1.210/src/lib/installation/proposal_store.rb 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/src/lib/installation/proposal_store.rb 2016-08-30 14:17:36.000000000 +0200 @@ -100,11 +100,14 @@ return @can_skip unless @can_skip.nil? @can_skip = if properties.key?("enable_skip") + log.info "properties skip available #{properties["enable_skip"].inspect}." properties["enable_skip"] == "yes" else !["initial", "uml"].include?(@proposal_mode) end + log.info "can skip set to #{(a)can_skip.inspect}." + @can_skip end @@ -390,11 +393,17 @@ end def properties - @proposal_properties ||= Yast::ProductControl.getProposalProperties( + return @proposal_properties unless @proposal_properties.nil? + + @proposal_properties = Yast::ProductControl.getProposalProperties( Yast::Stage.stage, Yast::Mode.mode, @proposal_mode ) + + log.info "Properties #{(a)proposal_properties.inspect}" + + @proposal_properties end def make_proposal(client, force_reset: false, language_changed: false, callback: proc {}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/src/lib/installation/select_system_role.rb new/yast2-installation-3.1.213/src/lib/installation/select_system_role.rb --- old/yast2-installation-3.1.210/src/lib/installation/select_system_role.rb 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/src/lib/installation/select_system_role.rb 2016-08-30 14:17:36.000000000 +0200 @@ -1,3 +1,4 @@ +# coding: utf-8 # Copyright (c) 2016 SUSE LLC. # All Rights Reserved. @@ -94,10 +95,12 @@ def role_buttons ui_roles = role_attributes.each_with_object(VBox()) do |r, vbox| + # bsc#995082: System role descriptions use a character that is missing in console font + description = Yast::UI.TextMode ? r[:description].tr("•", "*") : r[:description] vbox << Left(RadioButton(Id(r[:id]), r[:label])) vbox << HBox( HSpacing(Yast::UI.TextMode ? 4 : 2), - Left(Label(r[:description])) + Left(Label(description)) ) vbox << VSpacing(2) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/src/lib/installation/update_repository.rb new/yast2-installation-3.1.213/src/lib/installation/update_repository.rb --- old/yast2-installation-3.1.210/src/lib/installation/update_repository.rb 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/src/lib/installation/update_repository.rb 2016-08-30 14:17:36.000000000 +0200 @@ -39,6 +39,7 @@ # end class UpdateRepository include Yast::Logger + include Yast::I18n # @return [URI] URI of the repository attr_reader :uri @@ -96,6 +97,9 @@ # @param instsys_parts_path [Pathname] Path to instsys.parts registry def initialize(uri, instsys_parts_path = Pathname("/etc/instsys.parts")) Yast.import "Pkg" + Yast.import "Progress" + + textdomain "installation" @uri = uri @repo_id = add_repo @@ -129,6 +133,9 @@ # If a known error occurs, it will be converted to a CouldNotFetchUpdate # exception. # + # A progress is displayed when the packages are downloaded. + # The progress can be disabled by calling `Yast::Progress.set(false)`. + # # @param path [Pathname] Directory to store the updates # @return [Pathname] Paths to the updates # @@ -138,7 +145,10 @@ # # @raise CouldNotFetchUpdate def fetch(path = Pathname("/download")) - packages.each_with_object(update_files) do |package, files| + init_progress + + packages.each_with_object(update_files).with_index do |(package, files), index| + update_progress(100 * index / packages.size) files << fetch_package(package, path) end rescue PackageNotFound, CouldNotExtractPackage, CouldNotSquashPackage => e @@ -166,6 +176,15 @@ # * Mount the squashfs filesystem # * Add files/directories to inst-sys using the /etc/adddir script # + # @note The current implementation creates one squashfs image per package + # and mounting a squashfs image consumes one loop device (/dev/loop*). + # Inst-sys has by default 64 loop devices, but some of them already used, + # in an extreme case we might run out of loop devices. + # + # On the other hand downloading and unpacking all packages at once might + # require a lot of memory, the installer could crash on a system with + # small memory. + # # @param mount_path [Pathname] Directory to mount the update # # @raise UpdatesNotFetched @@ -186,7 +205,10 @@ # # Release the repository def cleanup + Yast::Pkg.SourceReleaseAll Yast::Pkg.SourceDelete(repo_id) + # make sure it's also removed from disk + Yast::Pkg.SourceSaveAll end # Determine whether the repository is empty or not @@ -231,15 +253,15 @@ # Extract a RPM contents to a given directory # - # @param package_path [Pathname] RPM local path + # @param package_file [File] RPM package (local file name) # @param dir [Pathname] Directory to extract the RPM contents # # @raise CouldNotExtractPackage - def extract(package_path, dir) + def extract(package_file, dir) Dir.chdir(dir) do - cmd = format(EXTRACT_CMD, source: package_path.path) + cmd = format(EXTRACT_CMD, source: package_file.path) out = Yast::SCR.Execute(Yast::Path.new(".target.bash_output"), cmd) - log.info("Extracting package #{package_path}: #{out}") + log.info("Extracting package #{package_file.inspect}: #{out}") raise CouldNotExtractPackage unless out["exit"].zero? end end @@ -367,5 +389,17 @@ f.puts "#{path.relative_path_from(Pathname("/"))} #{mountpoint}" end end + + # Initialize the progress + def init_progress + # mark the next stage active + Yast::Progress.NextStage + end + + # Display the current Progress + # @param [Fixnum] percent the current progress in range 0..100 + def update_progress(percent) + Yast::Progress.Step(percent) + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/test/inst_complex_welcome_test.rb new/yast2-installation-3.1.213/test/inst_complex_welcome_test.rb --- old/yast2-installation-3.1.210/test/inst_complex_welcome_test.rb 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/test/inst_complex_welcome_test.rb 2016-08-30 14:17:37.000000000 +0200 @@ -22,6 +22,7 @@ # null object returned above as parameter and it raise exception from # component system stub_const("Yast::UI", double.as_null_object) + allow(Yast::Pkg).to receive(:SourceGetCurrent).and_return([]) end after do @@ -44,105 +45,78 @@ allow(Yast::Installation).to receive(:restarting?) { restarting } end - context "and installer is restarting" do - let(:restarting) { true } - it "applies data if exists and returns next" do - allow(subject).to receive(:data_stored?) { true } - expect(subject).to receive(:apply_data) + it "initializes dialog" do + allow(subject).to receive(:event_loop) + expect(subject).to receive(:initialize_dialog) - expect(subject.main).to eql(:next) - end + subject.main + end - it "does not apply data if not exists and continues as not restarting" do - allow(subject).to receive(:data_stored?) { false } - expect(subject).not_to receive(:apply_data) - allow(subject).to receive(:event_loop) - expect(subject).to receive(:initialize_dialog) + it "starts input loop" do + expect(subject).to receive(:initialize_dialog) + expect(subject).to receive(:event_loop) - subject.main - end + subject.main end - context "and installer is not restarting" do - before do - allow(subject).to receive(:data_stored?) { false } - end + context "when back is selected" do - it "initializes dialog" do - allow(subject).to receive(:event_loop) + it "returns back" do expect(subject).to receive(:initialize_dialog) + expect(Yast::UI).to receive(:UserInput).and_return(:back) - subject.main + expect(subject.main).to eql(:back) end + end - it "starts input loop" do - expect(subject).to receive(:initialize_dialog) - expect(subject).to receive(:event_loop) + context "when next is selected" do + before do + allow(Yast::Mode).to receive(:config).and_return(false) + allow(Yast::Stage).to receive(:initial).and_return(true) - subject.main - end + allow(Yast::Language).to receive(:CheckIncompleteTranslation).and_return(true) + allow(Yast::Language).to receive(:CheckLanguagesSupport) - context "when back is selected" do + allow(Yast::ProductLicense).to receive(:AcceptanceNeeded).and_return(license_needed) + allow(Yast::ProductLicense).to receive(:cache_license_acceptance_needed).and_return(nil) + allow(subject).to receive(:license_accepted?).and_return(license_accepted) + end - it "returns back" do - expect(subject).to receive(:initialize_dialog) - expect(Yast::UI).to receive(:UserInput).and_return(:back) + context "when license is required and not accepted" do + let(:license_needed) { true } + let(:license_accepted) { false } + it "not returns" do + expect(Yast::UI).to receive(:UserInput).and_return(:next, :back) + expect(Yast::Report).to receive(:Message) + .with(_("You must accept the license to install this product")) expect(subject.main).to eql(:back) end end - context "when next is selected" do - before do - allow(Yast::Mode).to receive(:config).and_return(false) - allow(Yast::Stage).to receive(:initial).and_return(true) - - allow(Yast::Language).to receive(:CheckIncompleteTranslation).and_return(true) - allow(Yast::Language).to receive(:CheckLanguagesSupport) - - allow(Yast::ProductLicense).to receive(:AcceptanceNeeded).and_return(license_needed) - allow(Yast::ProductLicense).to receive(:cache_license_acceptance_needed).and_return(nil) - allow(subject).to receive(:license_accepted?).and_return(license_accepted) - end - - context "when license is required and not accepted" do - let(:license_needed) { true } - let(:license_accepted) { false } - - it "not returns" do - expect(Yast::UI).to receive(:UserInput).and_return(:next, :back) - expect(Yast::Report).to receive(:Message) - .with(_("You must accept the license to install this product")) - expect(subject.main).to eql(:back) - end - end - - context "when license is not required" do - let(:license_needed) { false } - let(:license_accepted) { false } - - it "stores selected data and returns next" do - expect(Yast::UI).to receive(:UserInput).and_return(:next) - expect(subject).to receive(:setup_final_choice) - expect(subject).to receive(:store_data) - expect(Yast::Report).to_not receive(:Message) + context "when license is not required" do + let(:license_needed) { false } + let(:license_accepted) { false } + + it "stores selected data and returns next" do + expect(Yast::UI).to receive(:UserInput).and_return(:next) + expect(subject).to receive(:setup_final_choice) + expect(Yast::Report).to_not receive(:Message) - expect(subject.main).to eql(:next) - end + expect(subject.main).to eql(:next) end + end - context "when license is required and accepted" do - let(:license_needed) { true } - let(:license_accepted) { true } - - it "stores selected data and returns next" do - expect(Yast::UI).to receive(:UserInput).and_return(:next) - expect(subject).to receive(:setup_final_choice) - expect(subject).to receive(:store_data) - expect(Yast::Report).to_not receive(:Message) + context "when license is required and accepted" do + let(:license_needed) { true } + let(:license_accepted) { true } + + it "stores selected data and returns next" do + expect(Yast::UI).to receive(:UserInput).and_return(:next) + expect(subject).to receive(:setup_final_choice) + expect(Yast::Report).to_not receive(:Message) - expect(subject.main).to eql(:next) - end + expect(subject.main).to eql(:next) end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/test/inst_disks_activate_test.rb new/yast2-installation-3.1.213/test/inst_disks_activate_test.rb --- old/yast2-installation-3.1.210/test/inst_disks_activate_test.rb 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/test/inst_disks_activate_test.rb 2016-08-30 14:17:37.000000000 +0200 @@ -14,7 +14,6 @@ describe "#main" do let(:probed_disks) { [] } let(:s390) { false } - let(:restarting) { false } before do allow(Yast::Linuxrc).to receive(:InstallInf).with("WithFCoE").and_return("0") @@ -23,19 +22,9 @@ allow(Yast::Popup).to receive(:ConfirmAbort).with(:painless).and_return(true) allow(Yast::Arch).to receive(:s390).and_return(s390) allow(Yast::GetInstArgs).to receive(:going_back) { going_back } - allow(Yast::Installation).to receive(:restarting?) { restarting } stub_const("Yast::Storage", double("Yast::Storage", ReReadTargetMap: true)) end - context "when installation is restarting" do - let(:restarting) { true } - it "returns next" do - expect(Yast::Arch).to_not receive(:s390) - - expect(subject.main).to eql(:next) - end - end - context "when architecture is s390" do let(:s390) { true } before do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/test/inst_finish_test.rb new/yast2-installation-3.1.213/test/inst_finish_test.rb --- old/yast2-installation-3.1.210/test/inst_finish_test.rb 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/test/inst_finish_test.rb 2016-08-30 14:17:37.000000000 +0200 @@ -24,6 +24,10 @@ allow(Yast::PackageCallbacks).to receive(:RegisterEmptyProgressCallbacks) allow(Yast::PackageCallbacks).to receive(:RestorePreviousProgressCallbacks) + allow(Yast::Pkg).to receive(:TargetInitialize) + allow(Yast::Pkg).to receive(:TargetLoad) + allow(Yast::Pkg).to receive(:PkgInstalled).and_return(false) + allow(Yast::Hooks).to receive(:run) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/test/inst_update_installer_test.rb new/yast2-installation-3.1.213/test/inst_update_installer_test.rb --- old/yast2-installation-3.1.210/test/inst_update_installer_test.rb 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/test/inst_update_installer_test.rb 2016-08-30 14:17:37.000000000 +0200 @@ -35,8 +35,10 @@ let(:restarting) { false } let(:profile) { {} } let(:ay_profile) { double("Yast::Profile", current: profile) } + let(:ay_profile_location) { double("Yast::ProfileLocation") } before do + allow(Yast::GetInstArgs).to receive(:going_back).and_return(false) allow(Yast::Pkg).to receive(:GetArchitecture).and_return(arch) allow(Yast::Mode).to receive(:auto).and_return(false) allow(Yast::NetworkService).to receive(:isNetworkRunning).and_return(network_running) @@ -48,6 +50,12 @@ allow(::FileUtils).to receive(:touch) stub_const("Registration::Storage::InstallationOptions", FakeInstallationOptions) stub_const("Registration::Storage::Config", FakeRegConfig) + # skip the libzypp initialization globally, enable in the specific tests + allow(subject).to receive(:initialize_packager).and_return(true) + allow(subject).to receive(:finish_packager) + allow(subject).to receive(:add_installation_repo) + allow(subject).to receive(:fetch_profile).and_return(ay_profile) + allow(subject).to receive(:process_profile) # stub the Profile module to avoid dependency on autoyast2-installation stub_const("Yast::Profile", ay_profile) @@ -64,7 +72,44 @@ end end - context "when update is enabled" do + it "cleans up the package management at the end" do + # override the global stub + expect(subject).to receive(:finish_packager).and_call_original + # pretend the package management has been initialized + # TODO: test the uninitialized case as well + subject.instance_variable_set(:@packager_initialized, true) + + expect(Yast::Pkg).to receive(:SourceGetCurrent).and_return([0]) + expect(Yast::Pkg).to receive(:SourceDelete).with(0) + expect(Yast::Pkg).to receive(:SourceSaveAll) + expect(Yast::Pkg).to receive(:SourceFinishAll) + expect(Yast::Pkg).to receive(:TargetFinish) + + # just a shortcut to avoid mocking the whole update + allow(subject).to receive(:disabled_in_linuxrc?).and_return(true) + subject.main + end + + it "displays a progress" do + expect(Yast::Wizard).to receive(:CreateDialog) + expect(Yast::Progress).to receive(:New) + expect(Yast::Progress).to receive(:NextStage) + + # just a shortcut to avoid mocking the whole update + allow(subject).to receive(:self_update_enabled?).and_return(false) + subject.main + end + + it "finishes the progress at the end" do + expect(Yast::Progress).to receive(:Finish) + expect(Yast::Wizard).to receive(:CloseDialog) + + # just a shortcut to avoid mocking the whole update + allow(subject).to receive(:self_update_enabled?).and_return(false) + subject.main + end + + context "when update URL is configured in control.xml" do before do allow(Yast::ProductFeatures).to receive(:GetStringFeature).and_return(url) end @@ -246,6 +291,23 @@ allow(File).to receive(:write) end + it "initializes the package management" do + # override the global stubs + expect(subject).to receive(:initialize_packager).and_call_original + expect(subject).to receive(:add_installation_repo).and_call_original + + url = "cd:///" + expect(Yast::Pkg).to receive(:SetTextLocale) + expect(Yast::Pkg).to receive(:TargetInitialize).with("/") + expect(Yast::Packages).to receive(:ImportGPGKeys) + expect(Yast::InstURL).to receive(:installInf2Url).and_return(url) + expect(Yast::Pkg).to receive(:SourceCreateBase).with(url, "").and_return(0) + + # just a shortcut to avoid mocking the whole update + allow(subject).to receive(:update_installer).and_return(false) + subject.main + end + it "tries to update the installer using the given URL" do expect(manager).to receive(:add_repository).with(URI(update0.url)) .and_return(true) @@ -324,27 +386,6 @@ end end - context "when only one SMT server exist" do - before do - allow(url_helpers).to receive(:slp_discovery).and_return([smt0]) - end - - it "is selected automatically" do - expect(regservice_selection).to_not receive(:run) - expect(registration_class).to receive(:new).with(smt0.slp_url) - .and_return(registration) - subject.main - end - - it "saves the registration URL to be used later" do - allow(manager).to receive(:add_repository) - expect(FakeInstallationOptions.instance).to receive(:custom_url=).with(smt0.slp_url) - expect(File).to receive(:write).with(/\/inst_update_installer.yaml\z/, - { "custom_url" => smt0.slp_url }.to_yaml) - subject.main - end - end - context "when a registration configuration is specified via AutoYaST profile" do let(:reg_server_url) { "http://ay.test.example.com/update" } let(:profile) { { "suse_register" => { "reg_server" => reg_server_url } } } @@ -376,6 +417,14 @@ allow(::FileUtils).to receive(:touch) end + it "tries to process the profile from the given URL" do + expect(subject).to receive(:process_profile) + expect(manager).to receive(:add_repository).with(URI(profile_url)) + .and_return(true) + + subject.main + end + context "the profile defines the update URL" do it "gets the URL from AutoYaST profile" do expect(manager).to receive(:add_repository).with(URI(profile_url)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/test/test_helper.rb new/yast2-installation-3.1.213/test/test_helper.rb --- old/yast2-installation-3.1.210/test/test_helper.rb 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/test/test_helper.rb 2016-08-30 14:17:37.000000000 +0200 @@ -25,14 +25,34 @@ def second_stage end end + AutoinstConfig = AutoinstConfigClass.new + class AutoinstGeneralClass + # we need at least one non-default methods, otherwise ruby-bindings thinks + # it is just namespace + def SetSignatureHandling + end + + def Import(profile) + end + end + + AutoinstGeneral = AutoinstGeneralClass.new + # Faked Profile module class ProfileClass def current end end Profile = ProfileClass.new + + class ProfileLocationClass + def Process + end + end + + ProfileLocation = ProfileLocationClass.new end if ENV["COVERAGE"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.210/test/update_repository_test.rb new/yast2-installation-3.1.213/test/update_repository_test.rb --- old/yast2-installation-3.1.210/test/update_repository_test.rb 2016-08-19 16:32:01.000000000 +0200 +++ new/yast2-installation-3.1.213/test/update_repository_test.rb 2016-08-30 14:17:37.000000000 +0200 @@ -243,8 +243,11 @@ end describe "#cleanup" do - it "deletes the repository" do + it "deletes and releases the repository" do expect(Yast::Pkg).to receive(:SourceDelete).with(repo_id) + expect(Yast::Pkg).to receive(:SourceReleaseAll) + expect(Yast::Pkg).to receive(:SourceSaveAll) + subject.cleanup end end

1 0

commit yast2-packager for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2016-08-31 00:02:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2016-08-22 10:48:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2016-08-31 00:02:55.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Aug 23 11:17:36 UTC 2016 - jreidinger(a)suse.com + +- Always enable "Next" button in license confirmation dialog, + because even if not accepted, popup is shown to user + (bnc#993530). +- Use the same popup when license not confirmed for base product in + the license confirmation dialog (bnc#993530). +- 3.1.116 + +------------------------------------------------------------------- Old: ---- yast2-packager-3.1.115.tar.bz2 New: ---- yast2-packager-3.1.116.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.daazOE/_old 2016-08-31 00:02:56.000000000 +0200 +++ /var/tmp/diff_new_pack.daazOE/_new 2016-08-31 00:02:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.115 +Version: 3.1.116 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-3.1.115.tar.bz2 -> yast2-packager-3.1.116.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.115/package/yast2-packager.changes new/yast2-packager-3.1.116/package/yast2-packager.changes --- old/yast2-packager-3.1.115/package/yast2-packager.changes 2016-08-19 17:01:17.000000000 +0200 +++ new/yast2-packager-3.1.116/package/yast2-packager.changes 2016-08-29 17:46:36.000000000 +0200 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Tue Aug 23 11:17:36 UTC 2016 - jreidinger(a)suse.com + +- Always enable "Next" button in license confirmation dialog, + because even if not accepted, popup is shown to user + (bnc#993530). +- Use the same popup when license not confirmed for base product in + the license confirmation dialog (bnc#993530). +- 3.1.116 + +------------------------------------------------------------------- Thu Aug 18 10:55:06 CEST 2016 - schubi(a)suse.de - Do not raise an exception if no license is available (no licence diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.115/package/yast2-packager.spec new/yast2-packager-3.1.116/package/yast2-packager.spec --- old/yast2-packager-3.1.115/package/yast2-packager.spec 2016-08-19 17:01:17.000000000 +0200 +++ new/yast2-packager-3.1.116/package/yast2-packager.spec 2016-08-29 17:46:36.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-packager # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,62 +17,63 @@ Name: yast2-packager -Version: 3.1.115 +Version: 3.1.116 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 Url: https://github.com/kobliha/yast-packager -Group: System/YaST -License: GPL-2.0+ -BuildRequires: yast2-country-data yast2-xml update-desktop-files yast2-testsuite +BuildRequires: update-desktop-files +BuildRequires: yast2-country-data BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-storage +BuildRequires: yast2-testsuite +BuildRequires: yast2-xml BuildRequires: yast2_theme BuildRequires: rubygem(rspec) # Packages::Repository and Packages::Product classes -BuildRequires: yast2 >= 3.1.187 +BuildRequires: yast2 >= 3.1.187 # Pkg::SourceRawURL() and Pkg:ExpandedUrl() -BuildRequires: yast2-pkg-bindings >= 3.1.30 +BuildRequires: yast2-pkg-bindings >= 3.1.30 # Newly added RPM -Requires: yast2-country-data >= 2.16.3 +Requires: yast2-country-data >= 2.16.3 # Pkg::SourceRawURL() and Pkg:ExpandedUrl() -Requires: yast2-pkg-bindings >= 3.1.30 +Requires: yast2-pkg-bindings >= 3.1.30 # Packages::Repository and Packages::Product classes -Requires: yast2 >= 3.1.187 +Requires: yast2 >= 3.1.187 # unzipping license file -Requires: unzip +Requires: unzip # HTTP, FTP, HTTPS modules (inst_productsources.ycp) -Requires: yast2-transfer +Requires: yast2-transfer # XML module (inst_productsources.ycp) -Requires: yast2-xml +Requires: yast2-xml # Bugzilla #305503 - storing/checking MD5 of licenses -Requires: /usr/bin/md5sum +Requires: /usr/bin/md5sum # .process agent -Requires: yast2-core >= 2.16.35 +Requires: yast2-core >= 2.16.35 # setenv() builtin -Conflicts: yast2-core < 2.15.10 +Conflicts: yast2-core < 2.15.10 # NotEnoughMemory-related functions moved to misc.ycp import-file -Conflicts: yast2-add-on < 2.15.15 +Conflicts: yast2-add-on < 2.15.15 # One of libyui-qt-pkg, libyui-ncurses-pkg, libyui-gtk-pkg -Requires: libyui_pkg +Requires: libyui_pkg # ensure that 'checkmedia' is on the medium -Recommends: checkmedia +Recommends: checkmedia # for registering media add-ons on SLE # (openSUSE does not contain the registration module) @@ -81,12 +82,13 @@ %endif # force *-webpin subpackage removal at upgrade -Obsoletes: yast2-packager-webpin < %version Obsoletes: yast2-packager-devel-doc +Obsoletes: yast2-packager-webpin < %version Requires: yast2-ruby-bindings >= 1.0.0 -Summary: YaST2 - Package Library - +Summary: YaST2 - Package Library +License: GPL-2.0+ +Group: System/YaST %description This package contains the libraries and modules for software management. @@ -108,7 +110,6 @@ %postun %desktop_database_postun - %files %defattr(-,root,root) %dir %{yast_yncludedir}/checkmedia @@ -125,3 +126,5 @@ %{yast_execcompdir}/servers_non_y2/ag_* %dir %{yast_docdir} %doc %{yast_docdir}/COPYING + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.115/src/modules/ProductLicense.rb new/yast2-packager-3.1.116/src/modules/ProductLicense.rb --- old/yast2-packager-3.1.115/src/modules/ProductLicense.rb 2016-08-19 17:01:17.000000000 +0200 +++ new/yast2-packager-3.1.116/src/modules/ProductLicense.rb 2016-08-29 17:46:36.000000000 +0200 @@ -471,16 +471,13 @@ _GetLicenseDialog_result ) - # If acceptance is not needed, there's no need to disable the button - # by default - default_next_button_state = AcceptanceNeeded(id) ? false : true - Wizard.SetContents( caption, contents, GetLicenseDialogHelp(), back, - default_next_button_state + # always allow next button, as if not accepted, it will raise popup (bnc#993530) + true ) # set the initial license download URL @@ -1082,14 +1079,23 @@ break end - # text changed due to bug #162499 - refuse_popup_text = base_product ? - # text asking whether to refuse a license (Yes-No popup) - _("Refusing the license agreement cancels the installation.\nReally refuse the agreement?") - : - # text asking whether to refuse a license (Yes-No popup) - _("Refusing the license agreement cancels the add-on\nproduct installation. Really refuse the agreement?") - next unless Popup.YesNo(refuse_popup_text) + if base_product + # TODO: refactor to use same widget as in inst_complex_welcome + # NOTE: keep in sync with inst_compex_welcome client, for grabing its translation + # mimic inst_complex_welcome behavior see bnc#993530 + refuse_popup_text = Builtins.dgettext( + 'installation', + 'You must accept the license to install this product' + ) + Popup.Message(refuse_popup_text) + next + else + # text changed due to bug #162499 + # TRANSLATORS: text asking whether to refuse a license (Yes-No popup) + refuse_popup_text = _("Refusing the license agreement cancels the add-on\n" \ + 'product installation. Really refuse the agreement?') + next unless Popup.YesNo(refuse_popup_text) + end log.info "License has been declined." @@ -1308,9 +1314,6 @@ VSpacing(0.5) ) : Empty() ) - # If acceptance is not needed, there's no need to disable the button - # by default - default_next_button_state = true Builtins.foreach(dirs) do |dir| counter = Ops.add(counter, 1) @@ -1360,7 +1363,6 @@ # Display info as a popup if exists InstShowInfo.show_info_txt(@info_file) if @info_file != nil Ops.set(licenses, counter, tmp_licenses) - default_next_button_state = false if AcceptanceNeeded(dir) end Wizard.SetContents( @@ -1368,7 +1370,7 @@ contents, GetLicenseDialogHelp(), enable_back, - default_next_button_state + true # always enable next, as popup is raised if not accepted (bnc#993530) ) Wizard.SetTitleIcon("yast-license") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.115/test/addon_product_test.rb new/yast2-packager-3.1.116/test/addon_product_test.rb --- old/yast2-packager-3.1.115/test/addon_product_test.rb 2016-08-19 17:01:17.000000000 +0200 +++ new/yast2-packager-3.1.116/test/addon_product_test.rb 2016-08-29 17:46:36.000000000 +0200 @@ -282,4 +282,45 @@ end end end + + describe "#AddRepo" do + let(:url) { "ftp://user:mypass@example.net/add-on" } + let(:pth) { "/" } + let(:prio) { 50 } + + context "when the repo is added successfully" do + let(:repo_id) { 1 } + + it "returns the new repository id" do + expect(Yast::Pkg).to receive(:RepositoryAdd) + .with("enabled" => true, "base_urls" => [url], "prod_dir" => pth, "priority" => prio) + .and_return(repo_id) + expect(subject.AddRepo(url, pth, prio)).to eq(repo_id) + end + + it "sets priority if it is greater than -1" do + expect(Yast::Pkg).to receive(:RepositoryAdd) + .with("enabled" => true, "base_urls" => [url], "prod_dir" => pth) + .and_return(repo_id) + expect(subject.AddRepo(url, pth, -2)).to eq(repo_id) + end + + it "refresh packages metadata" do + allow(Yast::Pkg).to receive(:RepositoryAdd).and_return(repo_id) + expect(Yast::Pkg).to receive(:SourceSaveAll) + expect(Yast::Pkg).to receive(:SourceRefreshNow).with(repo_id) + expect(Yast::Pkg).to receive(:SourceLoad) + subject.AddRepo(url, pth, prio) + end + end + + context "when the repo is not added successfully" do + it "reports the error and returns nil" do + allow(Yast::Pkg).to receive(:RepositoryAdd).and_return(nil) + expect(Yast::Report).to receive(:Error) + .with(format(_("Unable to add product %s."), "ftp://user:PASSWORD@example.net/add-on")) + subject.AddRepo(url, pth, prio) + end + end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.115/test/test_helper.rb new/yast2-packager-3.1.116/test/test_helper.rb --- old/yast2-packager-3.1.115/test/test_helper.rb 2016-08-19 17:01:17.000000000 +0200 +++ new/yast2-packager-3.1.116/test/test_helper.rb 2016-08-29 17:46:37.000000000 +0200 @@ -13,3 +13,8 @@ TESTS_PATH = Pathname.new(File.dirname(__FILE__)) FIXTURES_PATH = TESTS_PATH.join("data") + +RSpec.configure do |config| + config.extend Yast::I18n # available in context/describe + config.include Yast::I18n # available in it/let/before/... +end

1 0

commit skelcd-control-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package skelcd-control-openSUSE for openSUSE:Factory checked in at 2016-08-31 00:02:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skelcd-control-openSUSE (Old) and /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skelcd-control-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/skelcd-control-openSUSE/skelcd-control-openSUSE-promo.changes 2016-08-16 13:01:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new/skelcd-control-openSUSE-promo.changes 2016-08-31 00:02:45.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Aug 26 12:45:20 UTC 2016 - igonzalezsosa(a)suse.com + +- Move the YaST self update step earlier in the workflow to avoid + bugs caused by restarting YaST (boo#995771) +- 42.2.4 + +------------------------------------------------------------------- +Thu Aug 25 12:07:32 UTC 2016 - dimstar(a)opensuse.org + +- Drop the 'Minimal Server Selection' which is basically the same + as "Server (Text Mode)" already (boo#962725). +- 42.2.3 + +------------------------------------------------------------------- skelcd-control-openSUSE.changes: same change Old: ---- skelcd-control-openSUSE-42.2.2.tar.bz2 New: ---- skelcd-control-openSUSE-42.2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-openSUSE-promo.spec ++++++ --- /var/tmp/diff_new_pack.m7cuKb/_old 2016-08-31 00:02:46.000000000 +0200 +++ /var/tmp/diff_new_pack.m7cuKb/_new 2016-08-31 00:02:46.000000000 +0200 @@ -27,7 +27,7 @@ # ###################################################################### Name: skelcd-control-openSUSE-promo -Version: 42.2.2 +Version: 42.2.4 Release: 0 Summary: The openSUSE Installation Control file License: MIT skelcd-control-openSUSE.spec: same change ++++++ skelcd-control-openSUSE-42.2.2.tar.bz2 -> skelcd-control-openSUSE-42.2.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-42.2.2/CONTRIBUTING.md new/skelcd-control-openSUSE-42.2.4/CONTRIBUTING.md --- old/skelcd-control-openSUSE-42.2.2/CONTRIBUTING.md 2016-08-15 09:52:10.000000000 +0200 +++ new/skelcd-control-openSUSE-42.2.4/CONTRIBUTING.md 2016-08-26 10:27:10.000000000 +0200 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount… if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-42.2.2/control/control.openSUSE.xml new/skelcd-control-openSUSE-42.2.4/control/control.openSUSE.xml --- old/skelcd-control-openSUSE-42.2.2/control/control.openSUSE.xml 2016-08-11 09:52:13.000000000 +0200 +++ new/skelcd-control-openSUSE-42.2.4/control/control.openSUSE.xml 2016-08-26 15:52:11.000000000 +0200 @@ -236,18 +236,6 @@ <icon>pattern-enlightenment</icon> </one_supported_desktop> - <one_supported_desktop> - <name>textmode</name> - <desktop>twm</desktop> - <label_id>desktop_textmode</label_id> - <logon></logon> - <cursor>DMZ</cursor> - <packages>branding-openSUSE</packages> - <order config:type="integer">8</order> - <patterns>minimal_base minimal_base-conflicts</patterns> - <icon>yast-ssh-server</icon> - </one_supported_desktop> - </supported_desktops>  @@ -372,7 +360,6 @@ <desktop_lxde><label>LXDE Desktop</label></desktop_lxde> <desktop_min_x><label>Minimal X Window</label></desktop_min_x> <desktop_enlightenment><label>Enlightenment Desktop</label></desktop_enlightenment> - <desktop_textmode><label>Minimal Server Selection (Text Mode)</label></desktop_textmode> </texts> @@ -595,6 +582,11 @@ <label>Network Autosetup</label> <name>setup_dhcp</name> </module> +  + <module> + <label>Installer Update</label> + <name>update_installer</name> + </module> <module> <label>Welcome</label> <name>complex_welcome</name> @@ -617,13 +609,6 @@ <label>System Analysis</label> <name>system_analysis</name> </module> -  - <module> - <label>Installer Update</label> - <name>update_installer</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> <module> <label>System Analysis</label> <name>installation_options</name> @@ -843,6 +828,19 @@ <stage>initial</stage> <modules config:type="list"> <module> + <label>Load linuxrc Network Configuration</label> + <name>install_inf</name> + </module> + <module> + <label>Network Autosetup</label> + <name>setup_dhcp</name> + </module> +  + <module> + <label>Installer Update</label> + <name>update_installer</name> + </module> + <module> <name>complex_welcome</name> <label>Welcome</label> <enable_back>no</enable_back> @@ -859,13 +857,6 @@ <label>System Analysis</label> <name>system_analysis</name> </module> -  - <module> - <label>Installer Update</label> - <name>update_installer</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> <module> <label>System for Update</label> <name>update_partition</name> @@ -969,19 +960,19 @@ <enable_next>no</enable_next> </defaults> <modules config:type="list"> +  + <module> + <label>Installer Update</label> + <name>update_installer</name> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> + </module> <module> <label>AutoYaST Settings</label> <name>autoinit</name> <archs>all</archs> <retranslate config:type="boolean">true</retranslate> </module> -  - <module> - <label>Installer Update</label> - <name>update_installer</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> <module> <label>AutoYaST Settings</label> <name>autosetup</name> @@ -1043,6 +1034,13 @@ <mode>autoupgrade</mode> <stage>initial</stage> <modules config:type="list"> +  + <module> + <label>Installer Update</label> + <name>update_installer</name> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> + </module> <module> <label>System Analysis</label> <name>system_analysis</name> @@ -1061,13 +1059,6 @@ <archs>all</archs> <retranslate config:type="boolean">true</retranslate> </module> -  - <module> - <label>Installer Update</label> - <name>update_installer</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> <module> <label>AutoYaST Settings</label> <name>autosetup_upgrade</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-42.2.2/package/skelcd-control-openSUSE.changes new/skelcd-control-openSUSE-42.2.4/package/skelcd-control-openSUSE.changes --- old/skelcd-control-openSUSE-42.2.2/package/skelcd-control-openSUSE.changes 2016-08-15 09:52:10.000000000 +0200 +++ new/skelcd-control-openSUSE-42.2.4/package/skelcd-control-openSUSE.changes 2016-08-26 15:52:11.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Fri Aug 26 12:45:20 UTC 2016 - igonzalezsosa(a)suse.com + +- Move the YaST self update step earlier in the workflow to avoid + bugs caused by restarting YaST (boo#995771) +- 42.2.4 + +------------------------------------------------------------------- +Thu Aug 25 12:07:32 UTC 2016 - dimstar(a)opensuse.org + +- Drop the 'Minimal Server Selection' which is basically the same + as "Server (Text Mode)" already (boo#962725). +- 42.2.3 + +------------------------------------------------------------------- Mon Aug 8 11:01:35 UTC 2016 - dimstar(a)opensuse.org - Use icewm as DEFAULT_WM when installing MinimalX. This in fact diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-42.2.2/package/skelcd-control-openSUSE.spec new/skelcd-control-openSUSE-42.2.4/package/skelcd-control-openSUSE.spec --- old/skelcd-control-openSUSE-42.2.2/package/skelcd-control-openSUSE.spec 2016-08-11 09:52:13.000000000 +0200 +++ new/skelcd-control-openSUSE-42.2.4/package/skelcd-control-openSUSE.spec 2016-08-26 15:52:11.000000000 +0200 @@ -27,7 +27,7 @@ # ###################################################################### Name: skelcd-control-openSUSE -Version: 42.2.2 +Version: 42.2.4 Release: 0 Summary: The openSUSE Installation Control file License: MIT

1 0

commit autoyast2 for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2016-08-31 00:02:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autoyast2" Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2016-08-18 10:20:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2016-08-31 00:02:38.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Aug 26 09:39:55 UTC 2016 - kanderssen(a)suse.com + +- Profile Location: Use Report instead of Popup to not block + AutoYast if not configured to. (bnc#988949) +- 3.1.149 + +------------------------------------------------------------------- +Thu Aug 25 14:10:57 CEST 2016 - schubi(a)suse.de + +- Fixed: Setting timeout for error popups has not been possible. + (bnc#988949) +- 3.1.148 + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.147.tar.bz2 New: ---- autoyast2-3.1.149.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.fSGkd0/_old 2016-08-31 00:02:39.000000000 +0200 +++ /var/tmp/diff_new_pack.fSGkd0/_new 2016-08-31 00:02:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.147 +Version: 3.1.149 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-3.1.147.tar.bz2 -> autoyast2-3.1.149.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.147/CONTRIBUTING.md new/autoyast2-3.1.149/CONTRIBUTING.md --- old/autoyast2-3.1.147/CONTRIBUTING.md 2016-08-17 10:56:40.000000000 +0200 +++ new/autoyast2-3.1.149/CONTRIBUTING.md 2016-08-26 14:10:05.000000000 +0200 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount… if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.147/package/autoyast2.changes new/autoyast2-3.1.149/package/autoyast2.changes --- old/autoyast2-3.1.147/package/autoyast2.changes 2016-08-17 10:56:40.000000000 +0200 +++ new/autoyast2-3.1.149/package/autoyast2.changes 2016-08-26 14:10:05.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Fri Aug 26 09:39:55 UTC 2016 - kanderssen(a)suse.com + +- Profile Location: Use Report instead of Popup to not block + AutoYast if not configured to. (bnc#988949) +- 3.1.149 + +------------------------------------------------------------------- +Thu Aug 25 14:10:57 CEST 2016 - schubi(a)suse.de + +- Fixed: Setting timeout for error popups has not been possible. + (bnc#988949) +- 3.1.148 + +------------------------------------------------------------------- Wed Aug 17 09:56:28 CEST 2016 - schubi(a)suse.de - Improved logging for broken script descriptions. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.147/package/autoyast2.spec new/autoyast2-3.1.149/package/autoyast2.spec --- old/autoyast2-3.1.147/package/autoyast2.spec 2016-08-17 10:56:40.000000000 +0200 +++ new/autoyast2-3.1.149/package/autoyast2.spec 2016-08-26 14:10:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.147 +Version: 3.1.149 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.147/src/clients/inst_autoinit.rb new/autoyast2-3.1.149/src/clients/inst_autoinit.rb --- old/autoyast2-3.1.147/src/clients/inst_autoinit.rb 2016-08-17 10:56:40.000000000 +0200 +++ new/autoyast2-3.1.149/src/clients/inst_autoinit.rb 2016-08-26 14:10:05.000000000 +0200 @@ -198,14 +198,7 @@ Progress.NextStage Progress.Title(_("Initial Configuration")) Builtins.y2milestone("Initial Configuration") - report = Profile.current["report"] - if report && !report.has_key?( "yesno_messages" ) - # Set "yesno_messages", but do not reset the other settings - # (bnc#887397) - report = Report.Export # getting all values - report["yesno_messages"] = report.fetch("errors",{}) - end - Report.Import(report) # setting all values + Report.Import(Profile.current.fetch("report",{})) AutoinstGeneral.Import(Profile.current.fetch("general",{})) AutoinstGeneral.SetSignatureHandling AutoinstGeneral.SetMultipathing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.147/src/clients/report_auto.rb new/autoyast2-3.1.149/src/clients/report_auto.rb --- old/autoyast2-3.1.147/src/clients/report_auto.rb 2016-08-17 10:56:40.000000000 +0200 +++ new/autoyast2-3.1.149/src/clients/report_auto.rb 2016-08-26 14:10:05.000000000 +0200 @@ -64,10 +64,6 @@ # return map or list elsif @func == "Export" @ret = Report.Export - # Set timeout for autoyast to 10 seconds (bnc#887397) - @ret["messages"]["timeout"] = 10 if @ret["messages"]["timeout"] <= 0 - @ret["warnings"]["timeout"] = 10 if @ret["warnings"]["timeout"] <= 0 - @ret["yesno_messages"]["timeout"] = 10 if @ret["yesno_messages"]["timeout"] <= 0 elsif @func == "GetModified" @ret = Report.GetModified elsif @func == "SetModified" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.147/src/include/autoinstall/autoinst_dialogs.rb new/autoyast2-3.1.149/src/include/autoinstall/autoinst_dialogs.rb --- old/autoyast2-3.1.147/src/include/autoinstall/autoinst_dialogs.rb 2016-08-17 10:56:40.000000000 +0200 +++ new/autoyast2-3.1.149/src/include/autoinstall/autoinst_dialogs.rb 2016-08-26 14:10:05.000000000 +0200 @@ -12,6 +12,7 @@ textdomain "autoinst" Yast.import "Label" Yast.import "Storage" + Yast.import "Popup" end # Shows a dialog when 'control file' can't be found diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.147/src/modules/ProfileLocation.rb new/autoyast2-3.1.149/src/modules/ProfileLocation.rb --- old/autoyast2-3.1.147/src/modules/ProfileLocation.rb 2016-08-17 10:56:40.000000000 +0200 +++ new/autoyast2-3.1.149/src/modules/ProfileLocation.rb 2016-08-26 14:10:05.000000000 +0200 @@ -20,7 +20,7 @@ Yast.import "StorageControllers" Yast.import "Mode" Yast.import "Installation" - Yast.import "Popup" + Yast.import "Report" Yast.import "Label" Yast.import "URL" @@ -153,7 +153,7 @@ raise Break if AutoinstConfig.scheme == "device" end if AutoinstConfig.scheme == "label" - Popup.Error(_("label not found while looking for autoyast profile")) + Report.Error(_("label not found while looking for autoyast profile")) end end filename = basename(AutoinstConfig.filepath) @@ -177,7 +177,7 @@ if !ret # autoyast hit an error while fetching it's config file error = _("An error occurred while fetching the profile:\n") - Popup.Error(Ops.add(error, @GET_error)) + Report.Error(Ops.add(error, @GET_error)) return false end tmp = Convert.to_string(SCR.Read(path(".target.string"), localfile))

1 0

commit yast2 for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2016-08-31 00:02:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2016-08-18 10:18:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2016-08-31 00:02:31.000000000 +0200 @@ -1,0 +2,15 @@ +Fri Aug 26 10:37:45 UTC 2016 - kanderssen(a)suse.com + +- Packages: remove warning icon from package callbacks. + (bnc#988949) +- 3.1.205 + +------------------------------------------------------------------- +Thu Aug 25 14:17:13 CEST 2016 - schubi(a)suse.de + +- Set AutoYaST default timeout entries for reporting errors + correctly and do not overwrite AutoYaST profile settings. + (bnc#988949) +- 3.1.204 + +------------------------------------------------------------------- Old: ---- yast2-3.1.203.tar.bz2 New: ---- yast2-3.1.205.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.cGt3yd/_old 2016-08-31 00:02:32.000000000 +0200 +++ /var/tmp/diff_new_pack.cGt3yd/_new 2016-08-31 00:02:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.203 +Version: 3.1.205 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0 ++++++ yast2-3.1.203.tar.bz2 -> yast2-3.1.205.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/CONTRIBUTING.md new/yast2-3.1.205/CONTRIBUTING.md --- old/yast2-3.1.203/CONTRIBUTING.md 2016-08-09 15:21:42.000000000 +0200 +++ new/yast2-3.1.205/CONTRIBUTING.md 2016-08-26 14:04:10.000000000 +0200 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount… if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/library/general/src/modules/Report.rb new/yast2-3.1.205/library/general/src/modules/Report.rb --- old/yast2-3.1.203/library/general/src/modules/Report.rb 2016-08-09 15:21:42.000000000 +0200 +++ new/yast2-3.1.205/library/general/src/modules/Report.rb 2016-08-26 14:04:10.000000000 +0200 @@ -59,10 +59,12 @@ @display_yesno_messages = true # timeouts - @timeout_errors = 0 - @timeout_warnings = 0 - @timeout_messages = 0 - @timeout_yesno_messages = 0 + # AutoYaST has different timeout (bnc#887397) + @default_timeout = (Mode.auto || Mode.config) ? 10 : 0 + @timeout_errors = 0 # default: Errors stop the installation + @timeout_warnings = @default_timeout + @timeout_messages = @default_timeout + @timeout_yesno_messages = @default_timeout # logging flags @log_errors = true @@ -230,12 +232,14 @@ # timeouts @timeout_errors = Ops.get_integer(@error_settings, "timeout", 0) - @timeout_warnings = Ops.get_integer(@warning_settings, "timeout", 0) - @timeout_messages = Ops.get_integer(@message_settings, "timeout", 0) + @timeout_warnings = Ops.get_integer(@warning_settings, "timeout", + @default_timeout) + @timeout_messages = Ops.get_integer(@message_settings, "timeout", + @default_timeout) @timeout_yesno_messages = Ops.get_integer( @yesno_message_settings, "timeout", - 0 + @default_timeout ) # logging flags diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/library/general/test/data/ay_installation.yml new/yast2-3.1.205/library/general/test/data/ay_installation.yml --- old/yast2-3.1.203/library/general/test/data/ay_installation.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.205/library/general/test/data/ay_installation.yml 2016-08-26 14:04:10.000000000 +0200 @@ -0,0 +1,17 @@ +--- +"errors": + log: true + show: true + timeout: 10 +"messages": + log: true + show: true + timeout: 10 +"warnings": + log: true + show: true + timeout: 20 +"yesno_messages": + log: true + show: true + timeout: 40 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/library/general/test/data/ay_profile.yml new/yast2-3.1.205/library/general/test/data/ay_profile.yml --- old/yast2-3.1.203/library/general/test/data/ay_profile.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.205/library/general/test/data/ay_profile.yml 2016-08-26 14:04:10.000000000 +0200 @@ -0,0 +1,13 @@ +--- +"errors": + log: true + show: true + timeout: 10 +"warnings": + log: true + show: true + timeout: 20 +"yesno_messages": + log: true + show: true + timeout: 40 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/library/general/test/data/default_ay_installation.yml new/yast2-3.1.205/library/general/test/data/default_ay_installation.yml --- old/yast2-3.1.203/library/general/test/data/default_ay_installation.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.205/library/general/test/data/default_ay_installation.yml 2016-08-26 14:04:10.000000000 +0200 @@ -0,0 +1,17 @@ +--- +"errors": + log: true + show: true + timeout: 0 +"messages": + log: true + show: true + timeout: 10 +"warnings": + log: true + show: true + timeout: 10 +"yesno_messages": + log: true + show: true + timeout: 10 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/library/general/test/data/default_normal_installation.yml new/yast2-3.1.205/library/general/test/data/default_normal_installation.yml --- old/yast2-3.1.203/library/general/test/data/default_normal_installation.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.205/library/general/test/data/default_normal_installation.yml 2016-08-26 14:04:10.000000000 +0200 @@ -0,0 +1,17 @@ +--- +"errors": + log: true + show: true + timeout: 0 +"messages": + log: true + show: true + timeout: 0 +"warnings": + log: true + show: true + timeout: 0 +"yesno_messages": + log: true + show: true + timeout: 0 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/library/general/test/report_test.rb new/yast2-3.1.205/library/general/test/report_test.rb --- old/yast2-3.1.203/library/general/test/report_test.rb 2016-08-09 15:21:42.000000000 +0200 +++ new/yast2-3.1.205/library/general/test/report_test.rb 2016-08-26 14:04:10.000000000 +0200 @@ -1,8 +1,10 @@ #! /usr/bin/env rspec require_relative "test_helper" +require "yaml" Yast.import "Report" +Yast.import "Mode" describe Yast::Report do before { subject.ClearAll } @@ -121,4 +123,52 @@ expect(subject.GetMessages(0, 1, 0, 0)).to match(/Message/) end end + + describe ".Settings" do + DATA_DIR = File.join(File.expand_path(File.dirname(__FILE__)), "data") + let(:ay_profile) { YAML.load_file(File.join(DATA_DIR, "ay_profile.yml")) } + let(:default_normal) { YAML.load_file(File.join(DATA_DIR, "default_normal_installation.yml")) } + let(:default_ay) { YAML.load_file(File.join(DATA_DIR, "default_ay_installation.yml")) } + let(:result_ay) { YAML.load_file(File.join(DATA_DIR, "ay_installation.yml")) } + + context "while normal installation" do + it "check default entries" do + allow(Yast::Mode).to receive(:mode).and_return("installation") + subject.main + expect(subject.Export()).to match(default_normal) + end + end + + context "while AutoYaST installation" do + before(:each) do + allow(Yast::Mode).to receive(:mode).and_return("autoinstallation") + subject.main + end + + it "sets default entries" do + expect(subject.Export()).to match(default_ay) + end + it "check if default entries are not overwritten by empty import" do + subject.Import({}) + expect(subject.Export()).to match(default_ay) + end + it "set flags via AutoYaST profile" do + subject.Import(ay_profile) + expect(subject.Export()).to match(result_ay) + end + end + + context "while AutoYaST cloning system" do + before(:each) do + allow(Yast::Mode).to receive(:mode).and_return("autoinst_config") + subject.main + end + + it "AutoYaST default entries will be cloned" do + # Set timeout for autoyast to 10 seconds (bnc#887397) + expect(subject.Export()).to match(default_ay) + end + end + end + end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/library/packages/src/modules/PackageCallbacks.rb new/yast2-3.1.205/library/packages/src/modules/PackageCallbacks.rb --- old/yast2-3.1.203/library/packages/src/modules/PackageCallbacks.rb 2016-08-09 15:21:42.000000000 +0200 +++ new/yast2-3.1.205/library/packages/src/modules/PackageCallbacks.rb 2016-08-26 14:04:10.000000000 +0200 @@ -2988,12 +2988,7 @@ VBox( HSpacing(50), # enforce width VSpacing(0.1), - HBox( - # maybe more icon types could be used - # "info, "warning", "error" - Icon.Image("warning", "margin_right" => 2), - Left(Label(message)) - ), + Left(Label(message)), VSpacing(0.1), HBox( HSpacing(0.6), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/package/yast2.changes new/yast2-3.1.205/package/yast2.changes --- old/yast2-3.1.203/package/yast2.changes 2016-08-09 15:21:42.000000000 +0200 +++ new/yast2-3.1.205/package/yast2.changes 2016-08-26 14:04:11.000000000 +0200 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Fri Aug 26 10:37:45 UTC 2016 - kanderssen(a)suse.com + +- Packages: remove warning icon from package callbacks. + (bnc#988949) +- 3.1.205 + +------------------------------------------------------------------- +Thu Aug 25 14:17:13 CEST 2016 - schubi(a)suse.de + +- Set AutoYaST default timeout entries for reporting errors + correctly and do not overwrite AutoYaST profile settings. + (bnc#988949) +- 3.1.204 + +------------------------------------------------------------------- Tue Aug 9 11:31:45 UTC 2016 - igonzalezsosa(a)suse.com - Popup.Error will escape the text when message is too long and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/package/yast2.spec new/yast2-3.1.205/package/yast2.spec --- old/yast2-3.1.203/package/yast2.spec 2016-08-09 15:21:42.000000000 +0200 +++ new/yast2-3.1.205/package/yast2.spec 2016-08-26 14:04:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.203 +Version: 3.1.205 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0

1 0

commit yast2-update for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package yast2-update for openSUSE:Factory checked in at 2016-08-31 00:02:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-update (Old) and /work/SRC/openSUSE:Factory/.yast2-update.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-update" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-update/yast2-update.changes 2016-08-18 10:18:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-update.new/yast2-update.changes 2016-08-31 00:02:24.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Aug 26 08:54:40 UTC 2016 - kanderssen(a)suse.com + +- The update installer has been moved earlier in the workflow. We + don't need to store data to remember selected target/partitions + anymore. (bsc#988287) +- 3.1.42 + +------------------------------------------------------------------- Old: ---- yast2-update-3.1.41.tar.bz2 New: ---- yast2-update-3.1.42.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.VGQLq8/_old 2016-08-31 00:02:25.000000000 +0200 +++ /var/tmp/diff_new_pack.VGQLq8/_new 2016-08-31 00:02:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.41 +Version: 3.1.42 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-update-3.1.41.tar.bz2 -> yast2-update-3.1.42.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.41/CONTRIBUTING.md new/yast2-update-3.1.42/CONTRIBUTING.md --- old/yast2-update-3.1.41/CONTRIBUTING.md 2016-08-09 12:24:39.000000000 +0200 +++ new/yast2-update-3.1.42/CONTRIBUTING.md 2016-08-26 13:34:46.000000000 +0200 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount… if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.41/package/yast2-update.changes new/yast2-update-3.1.42/package/yast2-update.changes --- old/yast2-update-3.1.41/package/yast2-update.changes 2016-08-09 12:24:39.000000000 +0200 +++ new/yast2-update-3.1.42/package/yast2-update.changes 2016-08-26 13:34:46.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Aug 26 08:54:40 UTC 2016 - kanderssen(a)suse.com + +- The update installer has been moved earlier in the workflow. We + don't need to store data to remember selected target/partitions + anymore. (bsc#988287) +- 3.1.42 + +------------------------------------------------------------------- Fri Aug 5 08:55:42 UTC 2016 - kanderssen(a)suse.com - Remember selected target/partitions after an installer update. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.41/package/yast2-update.spec new/yast2-update-3.1.42/package/yast2-update.spec --- old/yast2-update-3.1.41/package/yast2-update.spec 2016-08-09 12:24:39.000000000 +0200 +++ new/yast2-update-3.1.42/package/yast2-update.spec 2016-08-26 13:34:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.41 +Version: 3.1.42 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.41/src/lib/update/clients/inst_update_partition_auto.rb new/yast2-update-3.1.42/src/lib/update/clients/inst_update_partition_auto.rb --- old/yast2-update-3.1.41/src/lib/update/clients/inst_update_partition_auto.rb 2016-08-09 12:24:39.000000000 +0200 +++ new/yast2-update-3.1.42/src/lib/update/clients/inst_update_partition_auto.rb 2016-08-26 13:34:46.000000000 +0200 @@ -41,10 +41,6 @@ Yast.include self, "update/rootpart.rb" - # In case of restarting after a installer update, we restore previous - # data if exists (bsc#988287) - load_data if Installation.restarting? && data_stored? - if RootPart.Mounted log.debug("RootPart is mounted, detaching Update & unmounting partitions") Update.Detach @@ -80,53 +76,15 @@ UmountMountedPartition() Pkg.TargetFinish else - store_data - return :next end end @ret = RootPartitionDialog(:update_dialog) - - store_data if @ret == :next - - @ret end private - # @return [Boolean] true if dumped file data exists. - def data_stored? - ::File.exist?(DATA_PATH) - end - - # Save some important RootPart attributes into a yaml file. - def store_data - data = { - "activated" => RootPart.GetActivated, - "selected" => RootPart.selectedRootPartition, - "previous" => RootPart.previousRootPartition, - "partitions" => RootPart.rootPartitions - } - - File.write(DATA_PATH, data.to_yaml) - end - - # Loads RootPart data from a dump yaml file and delete the file after that. - # It also remember the current root selection as the target_system - def load_data - data = YAML.load(File.read(DATA_PATH)) - - log.debug("Loading data from dump file: #{data}") - RootPart.load_saved(data) - - root_target = RootPart.selectedRootPartition || "" - - @target_system = root_target unless root_target.empty? - - ::FileUtils.rm_rf(DATA_PATH) - end - # Obtains the target system from the install.inf file or use the current # partitions if there is only 1 valid. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.41/test/helpers.rb new/yast2-update-3.1.42/test/helpers.rb --- old/yast2-update-3.1.41/test/helpers.rb 2016-08-09 12:24:39.000000000 +0200 +++ new/yast2-update-3.1.42/test/helpers.rb 2016-08-26 13:34:46.000000000 +0200 @@ -15,6 +15,5 @@ allow(subject).to receive(:target_distribution).and_return("sle-12-x86_64") allow(subject).to receive(:initialize_update_rootpart) allow(subject).to receive(:load_data) - allow(subject).to receive(:store_data) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.41/test/inst_update_partition_auto_test.rb new/yast2-update-3.1.42/test/inst_update_partition_auto_test.rb --- old/yast2-update-3.1.41/test/inst_update_partition_auto_test.rb 2016-08-09 12:24:39.000000000 +0200 +++ new/yast2-update-3.1.42/test/inst_update_partition_auto_test.rb 2016-08-26 13:34:46.000000000 +0200 @@ -10,13 +10,10 @@ describe Yast::InstUpdatePartitionAutoClient do describe "#main" do - let(:restarting) { false } - before do stub_root_part stub_const("Yast::FileSystems", double) allow(Yast::Update) - allow(Yast::Installation).to receive(:restarting?) { restarting } allow(Yast::Installation).to receive(:destdir).and_return("/mnt") allow(Yast::Report).to receive(:error) allow(Yast::Pkg).to receive(:TargetInitializeOptions) @@ -25,17 +22,6 @@ stub_subject(subject) end - context "when installation is restarting" do - let(:restarting) { true } - - it "loads data if it was stored" do - expect(subject).to receive(:data_stored?).and_return(true) - expect(subject).to receive(:load_data) - - subject.main - end - end - context "when root partition is mounted" do before do allow(Yast::RootPart).to receive(:Mounted).and_return(true) @@ -117,7 +103,6 @@ context "when the target system is mounted successfully" do before do allow(Yast::RootPart).to receive(:mount_target).and_return(true) - allow(subject).to receive(:store_data) end context "when it detects an incomplete installation" do @@ -174,13 +159,6 @@ allow(Yast::Pkg).to receive(:TargetInitializeOptions).and_return(true) end - it "saves current data" do - expect(subject).not_to receive(:RootPartitionDialog) - expect(subject).to receive(:store_data) - - subject.main - end - it "returns :next without shown selection dialog" do expect(subject).not_to receive(:RootPartitionDialog) @@ -197,12 +175,6 @@ allow(subject).to receive(:target_system_candidate).and_return(nil) end - it "stores current data" do - expect(subject).to receive(:store_data) - - subject.main - end - it "returns :next" do expect(subject.main).to eql(:next) end

1 0

commit yast2-storage for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2016-08-31 00:02:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-storage" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2016-08-25 09:52:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2016-08-31 00:02:16.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Aug 26 08:18:42 UTC 2016 - igonzalezsosa(a)suse.com + +- Don't check for installer restart as it's not needed anymore + (bsc#985055) +- 3.1.102 + +------------------------------------------------------------------- Old: ---- yast2-storage-3.1.101.tar.bz2 New: ---- yast2-storage-3.1.102.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.K6jWyZ/_old 2016-08-31 00:02:17.000000000 +0200 +++ /var/tmp/diff_new_pack.K6jWyZ/_new 2016-08-31 00:02:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.101 +Version: 3.1.102 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-storage-3.1.101.tar.bz2 -> yast2-storage-3.1.102.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.101/package/yast2-storage.changes new/yast2-storage-3.1.102/package/yast2-storage.changes --- old/yast2-storage-3.1.101/package/yast2-storage.changes 2016-08-19 17:45:33.000000000 +0200 +++ new/yast2-storage-3.1.102/package/yast2-storage.changes 2016-08-26 12:45:12.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 26 08:18:42 UTC 2016 - igonzalezsosa(a)suse.com + +- Don't check for installer restart as it's not needed anymore + (bsc#985055) +- 3.1.102 + +------------------------------------------------------------------- Fri Aug 19 12:27:18 UTC 2016 - jsrain(a)suse.cz - added /var/lib/machines to the list of subvolumes (bsc#992573) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.101/package/yast2-storage.spec new/yast2-storage-3.1.102/package/yast2-storage.spec --- old/yast2-storage-3.1.101/package/yast2-storage.spec 2016-08-19 17:45:33.000000000 +0200 +++ new/yast2-storage-3.1.102/package/yast2-storage.spec 2016-08-26 12:45:12.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.101 +Version: 3.1.102 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.101/src/modules/Storage.rb new/yast2-storage-3.1.102/src/modules/Storage.rb --- old/yast2-storage-3.1.101/src/modules/Storage.rb 2016-08-19 17:45:33.000000000 +0200 +++ new/yast2-storage-3.1.102/src/modules/Storage.rb 2016-08-26 12:45:12.000000000 +0200 @@ -7163,7 +7163,7 @@ protected def skip_activation_popup? - Mode.autoinst || Mode.autoupgrade || Installation.restarting? + Mode.autoinst || Mode.autoupgrade end def propose_new_fsid(part, id)

1 0

commit patterns-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package patterns-openSUSE for openSUSE:Factory checked in at 2016-08-31 00:02:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/patterns-openSUSE (Old) and /work/SRC/openSUSE:Factory/.patterns-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patterns-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/patterns-openSUSE/patterns-openSUSE.changes 2016-08-17 11:57:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.patterns-openSUSE.new/patterns-openSUSE.changes 2016-08-31 00:02:09.000000000 +0200 @@ -1,0 +2,20 @@ +Thu Aug 25 13:48:52 UTC 2016 - badshah400(a)gmail.com + +- Suggest instead of Recommend inkscape for the gnome_imaging_opt + pattern, so that it is not pulled in by default on default GNOME + pattern installs. Inkscape is a specialised app that users + should install on their system if they need it, and the other + desktop patterns (e.g. KDE) do not install it by default either. + +------------------------------------------------------------------- +Thu Aug 25 13:28:46 UTC 2016 - dimstar(a)opensuse.org + +- Add the 'generic_server' pattern to the DVD. + +------------------------------------------------------------------- +Mon Aug 22 18:44:26 UTC 2016 - jengelh(a)inai.de + +- Drop sox, vorbis-tools from console, this does not feel like the + right place for them. Same for wodim. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.RRQr7B/_old 2016-08-31 00:02:10.000000000 +0200 +++ /var/tmp/diff_new_pack.RRQr7B/_new 2016-08-31 00:02:10.000000000 +0200 @@ -259,12 +259,8 @@ # from data/CONSOLE Requires: mc Requires: w3m -# Do not replace wodim with cdrecord before KIWI no longer depends on it -Requires: wodim Recommends: emacs-nox Recommends: mtools -Recommends: sox -Recommends: vorbis-tools Suggests: bsd-games Suggests: grepmail Suggests: irssi @@ -2408,7 +2404,7 @@ Supplements: packageand(patterns-openSUSE-gnome:patterns-openSUSE-imaging) Requires: pattern() = gnome_basis # from data/GNOME-IMAGE-OPT -Recommends: inkscape +Suggests: inkscape Suggests: dia Suggests: gthumb @@ -5514,6 +5510,7 @@ Requires: pattern() = fonts_opt Requires: pattern() = games Requires: pattern() = gateway_server +Requires: pattern() = generic_server Requires: pattern() = gnome Requires: pattern() = gnome_admin Requires: pattern() = gnome_basis

1 0

commit skelcd-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package skelcd-openSUSE for openSUSE:Factory checked in at 2016-08-31 00:01:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skelcd-openSUSE (Old) and /work/SRC/openSUSE:Factory/.skelcd-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skelcd-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/skelcd-openSUSE/skelcd-openSUSE.changes 2016-05-24 09:33:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.skelcd-openSUSE.new/skelcd-openSUSE.changes 2016-08-31 00:02:00.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Aug 25 15:48:55 UTC 2016 - lnussel(a)suse.de + +- Update to version 84.87.20160819.aacef49: + * Translated using Weblate (Swedish) + * Translated using Weblate (Chinese (China)) + * Translated using Weblate (Swedish) + * Translated using Weblate (Arabic) + * Update year + +------------------------------------------------------------------- Old: ---- skelcd-openSUSE-84.87.20160511.ece383f.tar.xz New: ---- skelcd-openSUSE-84.87.20160819.aacef49.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.DL8uwG/_old 2016-08-31 00:02:01.000000000 +0200 +++ /var/tmp/diff_new_pack.DL8uwG/_new 2016-08-31 00:02:01.000000000 +0200 @@ -16,7 +16,7 @@ # -%define version_unconverted 84.87.20160511.ece383f +%define version_unconverted 84.87.20160819.aacef49 Name: skelcd-openSUSE BuildRequires: build-key @@ -27,7 +27,7 @@ BuildRequires: translate-toolkit %endif Conflicts: skelcd-sles skelcd-sled skelcd-openSUSE-non-OSS skelcd-openSUSE-non-OSS-CD -Version: 84.87.20160511.ece383f +Version: 84.87.20160819.aacef49 Release: 0 Summary: Skeleton for openSUSE OSS Media Sets License: MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.DL8uwG/_old 2016-08-31 00:02:01.000000000 +0200 +++ /var/tmp/diff_new_pack.DL8uwG/_new 2016-08-31 00:02:01.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/skelcd-openSUSE.git</param> - <param name="changesrevision">ece383f9ae7e4b9df3ed5ead69c6f55fbc1f681e</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">aacef49ee95d00226846dfa38666811e028b3dbe</param></service></servicedata> \ No newline at end of file ++++++ skelcd-openSUSE-84.87.20160511.ece383f.tar.xz -> skelcd-openSUSE-84.87.20160819.aacef49.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/TEMPLATE new/skelcd-openSUSE-84.87.20160819.aacef49/license/TEMPLATE --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/TEMPLATE 2016-01-20 13:20:41.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/TEMPLATE 2016-08-19 15:19:49.000000000 +0200 @@ -100,7 +100,7 @@ III (June 1987), FAR 52.227-19 (June 1987), or DFARS 252.227-7013 (b)(3) (November 1995), or applicable successor clauses. -Copyright © 2008-2014 The openSUSE Project. All rights +Copyright © 2008-2016 The openSUSE Project. All rights reserved. "SUSE" and "openSUSE" are registered trademarks of SUSE LLC, or its affiliates, which founded, sponsors, and is designated by, The openSUSE Project. "Linux" is a registered trademark of Linus Torvalds. All diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/TEMPLATE.pot new/skelcd-openSUSE-84.87.20160819.aacef49/license/TEMPLATE.pot --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/TEMPLATE.pot 2016-01-20 13:20:41.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/TEMPLATE.pot 2016-08-19 15:19:49.000000000 +0200 @@ -145,7 +145,7 @@ #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.ar.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.ar.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.ar.po 1970-01-01 01:00:00.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.ar.po 2016-08-19 15:19:49.000000000 +0200 @@ -0,0 +1,252 @@ +#. extracted from TEMPLATE +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-01-18 17:46+0200\n" +"PO-Revision-Date: 2016-07-17 10:28+0000\n" +"Last-Translator: George Yacoub <george.yacoub(a)arabize.com>\n" +"Language-Team: Arabic <https://l10n.opensuse.org/projects/skelcd-" +"opensuse/master/ar/>\n" +"Language: ar\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" +"X-Generator: Weblate 2.6\n" + +#: TEMPLATE:1 +msgid "" +"LICENSE AGREEMENT\n" +"openSUSE® #VERSION#" +msgstr "" +"اتفاقية الترخيص\n" +"openSUSE® #VERSION#" + +#: TEMPLATE:4 +msgid "" +"This is an unofficial translation of the openSUSE #VERSION# license into \n" +"$LANGUAGE. It does not legally state the distribution terms for openSUSE \n" +"#VERSION# - only the original English text of the openSUSE #VERSION#\n" +"license does that. However, we hope that this translation will help\n" +"$LANGUAGE speakers understand the license better." +msgstr "" +"هذه الترجمة غير معتمدة لإصدارة أوبن سوزي #VERSION# للغة\n" +"$LANGUAGE. حيث لا تبين من الناحية القانونية شروط توزيع أوبن سوزي\n" +"#VERSION# - فقط النص الإنجليزي الأصلي من رخصة أوبن سوزي #VERSION#\n" +"هو المعتمد. وعلى كل الاحوال، فإننا نأمل أن تساعد هذه الترجمة\n" +"المتحدثين $LANGUAGE فهم رخصة أفضل." + +#: TEMPLATE:10 +msgid "" +"This agreement governs your download, installation, or use\n" +"of openSUSE #VERSION# and its updates, regardless of the delivery\n" +"mechanism. openSUSE #VERSION# is a collective work under US Copyright\n" +"Law. Subject to the following terms, The openSUSE Project grants to\n" +"you a license to this collective work pursuant to the GNU General\n" +"Public License version 2. By downloading, installing, or using\n" +"openSUSE #VERSION#, you agree to the terms of this agreement." +msgstr "" +"يحكم هذا الاتفاق تحميل، تثبيت، أو استخدام\n" +"أوبن سوزي #VERSION# والتحديثات. بغض النظر عن طريقة\n" +"الاستلام. أوبن سوزي #VERSION# نتيجة عمل الجماعي في إطار قوانين حقوق الطبع \n" +"المحفوظة. يخضع استخدام أوبن سوزي للشروط التالية\n" +"ترخيص العمل الجماعي وفقا لجنو العمومية\n" +"الترخيص العام نسخة رقم 2. بتحميل وتثبيت أو استخدام\n" +"أوبن سوزي #VERSION#، فإنك توافق على شروط هذا الاتفاق." + +#: TEMPLATE:18 +msgid "" +"openSUSE #VERSION# is a modular Linux operating system consisting of\n" +"hundreds of software components. The license agreement for each\n" +"component is generally located in the component's source code. With\n" +"the exception of certain files containing the “openSUSE”\n" +"trademark discussed below, the license terms for the components\n" +"permit you to copy and redistribute the component. With the\n" +"potential exception of certain firmware files, the license terms\n" +"for the components permit you to copy, modify, and redistribute the\n" +"component, in both source code and binary code forms. This agreement\n" +"does not limit your rights under, or grant you rights that supersede,\n" +"the license terms of any particular component." +msgstr "" +"أوبن سوزي #VERSION# هو نظام لينكس يتكون من\n" +"مئات من البرامج. اتفاقية الترخيص لكل\n" +"مكون عموما موجودة في الشفرة المصدرية. مع\n" +"باستثناء بعض الملفات التي تحتوي على \"أوبن سوزي\"\n" +"تناقش العلامة التجارية, شروط الترخيص للمكونات أدناه\n" +"يُسمح لك بنسخ وتوزيع المكونات. مع\n" +"الاستثناء المحتمل لبعض ملفات firmware، وشروط الترخيص\n" +"للمكونات تسمح لك نسخ وتعديل وإعادة توزيع\n" +"العناصر، في كل من شفرة المصدر ونماذج الشفرات الثنائية. هذه الإتفاقية\n" +"لا تحد من حقوقك أو يمنحك حقوق تحل محل،\n" +"شروط ترخيص مكون معين." + +#: TEMPLATE:30 +msgid "" +"openSUSE #VERSION# and each of its components, including the source\n" +"code, documentation, appearance, structure, and organization, are\n" +"copyrighted by The openSUSE Project and others and are protected under\n" +"copyright and other laws. Title to openSUSE #VERSION# and any\n" +"component, or to any copy, will remain with the aforementioned or its\n" +"licensors, subject to the applicable license. The \"openSUSE\" trademark\n" +"is a trademark of SUSE, LLC. in the US and other countries and is\n" +"used by permission. This agreement permits you to distribute\n" +"unmodified or modified copies of openSUSE #VERSION# using the\n" +"“openSUSE” trademark on the condition that you follow The openSUSE\n" +"Project’s trademark guidelines located at\n" +"http://en.opensuse.org/Legal. You must abide by these trademark\n" +"guidelines when distributing openSUSE #VERSION#, regardless of whether\n" +"openSUSE #VERSION# has been modified." +msgstr "" +"أوبن سوزي #VERSION# وكل مكون من مكوناته، بما في ذلك الشفرة\n" +"المصدرية، الوثائق، والمظهر، والهيكل، والتنظيم، محمية\n" +"بقوانين حقوق الطبع والنشر من قبل مشروع أوبن سوزي وغيرها \n" +"أوبن سوزي #VERSION# وكل مكوناته في أي نسخة، سيبقى مع ما سبق ذكره\n" +"من الرخص، تخضع لترخيص العلامة التجارية أوبن سوزي #VERSION# \n" +"وهي علامة تجارية لSUSE، LLC. في الولايات المتحدة وبلدان أخرى، و\n" +"تستخدم بإذن. يسمح لك هذا الاتفاق بتوزيع\n" +"نسخ وتعديل أوبن سوزي #VERSION# باستخدام\n" +"العلامة التجارية \"أوبن سوزي\" بشرط أن تتبع\n" +"إرشادات العلامة التجارية للمشروع المبينة في\n" +"http://en.opensuse.org/Legal. يجب التقيد بإرشادات العلامات التجارية\n" +"عند توزيع أوبن سوزي #VERSION# ، بغض النظر عما إذا\n" +"لقد تم تعديل أوبن سوزي #VERSION# ." + +#: TEMPLATE:45 +msgid "" +"Except as specifically stated in this agreement or a license for\n" +"a particular component, TO THE MAXIMUM EXTENT PERMITTED UNDER\n" +"APPLICABLE LAW, OPENSUSE #VERSION# AND THE COMPONENTS ARE PROVIDED\n" +"AND LICENSED \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EXPRESSED OR\n" +"IMPLIED, INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY, TITLE,\n" +"NON-INFRINGEMENT, OR FITNESS FOR A PARTICULAR PURPOSE. The openSUSE\n" +"Project does not warrant that the functions contained in openSUSE\n" +"#VERSION# will meet your requirements or that the operation of openSUSE\n" +"#VERSION# will be entirely error free or appear precisely as described\n" +"in the accompanying documentation. USE OF OPENSUSE #VERSION# IS AT YOUR\n" +"OWN RISK." +msgstr "" +"باستثناء ما تنص عليه هذه الاتفاقية أو الترخيص صراحة\n" +"لمكون معين، يمكنك استخدام أوبن سوزي إلى الحد الأقصى المسموح به بموجب\n" +"القانون، أوبن سوزي #VERSION# والمكونات المقدمة\n" +"مرخصة \"كما هي\" دون أي ضمان من أي نوع، صراحة أو\n" +"ضمنية، بما في ذلك ضمانات الرواج، والعنوان،\n" +"عدم الانتهاك، أو الملاءمة لغرض معين. في أوبن سوزي\n" +"لا نضمن ان الوظائف الواردة في أوبن سوزي\n" +"#VERSION# سوف تلبية الاحتياجات الخاصة بك أو أن تشغيل أوبن سوزي\n" +"#VERSION# سيتم بدون أخطاء كما هو موضح\n" +"في الوثائق المصاحبة. استعمال أوبن سوزي #VERSION# على\n" +"مسئوليتك الخاصة." + +#: TEMPLATE:57 +msgid "" +"TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE OPENSUSE\n" +"PROJECT (AND ITS LICENSORS, SUBSIDIARIES, AND EMPLOYEES) WILL NOT\n" +"BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING DIRECT, INCIDENTAL,\n" +"OR CONSEQUENTIAL DAMAGES, LOST PROFITS, OR LOST SAVINGS ARISING OUT\n" +"OF THE USE OR INABILITY TO USE OPENSUSE #VERSION#, EVEN IF THE OPENSUSE\n" +"PROJECT HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN A\n" +"JURISDICTION THAT LIMITS THE EXCLUSION OR LIMITATION OF DAMAGES,\n" +"THE OPENSUSE PROJECT’S (AND ITS LICENSORS’, SUBSIDIARIES’, AND\n" +"EMPLOYEES’) AGGREGATE LIABILITY IS LIMITED TO $50US, OR IF SUCH A\n" +"LIMITATION IS NOT ALLOWED, IS LIMITED TO THE MAXIMUM EXTENT ALLOWED." +msgstr "" +"يمكنك استخدام أوبن سوزي إلى الحد الأقصى المسموح به بموجب، مشروع\n" +"أوبن سوزي (وشركاتها المرخصة، التابعة والموظفين) لن\n" +"يكونو مسؤولين تجاهك عن أية أضرار، مباشرة أو عرضية،\n" +"أو تبعية، خسارة الأرباح، أو المدخرات الناشئة\n" +"عن استخدام أو عدم القدرة على استخدام أوبن سوزي #VERSION#، حتى لو كان \n" +"قد تم إخطار أوبن سوزي بإمكانية حدوث مثل هذه الأضرار.\n" +"مشروع أوبن سوزي (وتراخيصها، \n" +"التابعة) والموظفين تتحمل بحد أقصى (50 $) أمريكي، وإذا كان مثل هذا\n" +"الحد غير مسموح به، سيقتصر على الحد الأقصى المسموح به." + +#: TEMPLATE:68 +msgid "" +"As required by US law, you represent and warrant that you: (a)\n" +"understand that openSUSE #VERSION# is subject to export controls under\n" +"the Export Administration Regulations (\"EAR\") which are implemented\n" +"and enforced by the US Department of Commerce, Bureau of Industry and\n" +"Security; (b) are not located in a prohibited destination country or are\n" +"specifically prohibited under the EAR or US sanctions regulations; (c) will " +"not export,\n" +"re-export, or transfer openSUSE #VERSION# to any prohibited destination,\n" +"entity, or individual without the necessary export license(s)\n" +"or authorizations(s) from the US Government; (d) will not use or\n" +"transfer openSUSE #VERSION# for use in any sensitive nuclear, chemical,\n" +"or biological weapons or missile technology end-uses unless\n" +"authorized by the US Government by regulation or specific license;\n" +"(e) understand that countries other than the US may restrict the\n" +"import, use, or export of encryption products and that you will be\n" +"solely responsible for compliance with any such import, use, or export\n" +"restrictions." +msgstr "" +"كما يطلب القانون الامريكي، فإنك تقر وتتعهد بأنك: (أ)\n" +"تفهم أن أوبن سوزي #VERSION# تخضع لضوابط التصدير تحت\n" +"لوائح إدارة التصدير ( \"EAR\") التي\n" +"تنفذ من قبل وزارة التجارة الأمريكية، مكتب الصناعة و\n" +"الأمن؛ (ب) لا توجد في بلد المقصد حظر أو\n" +"إدراج في لوائح العقوبات الامريكية. (ج) لن تصدر،\n" +"أو تعيد تصدير، أو تنقل أوبن سوزي #VERSION# إلى أي وجهة محظورة،\n" +"دون رخص التصدير الضرورية\n" +"أو أذن من حكومة الولايات المتحدة. (د) عدم استخدام أو\n" +"نقل أوبن سوزي #VERSION# للاستخدام في المنشآت النووية الحساسة والكيميائية،\n" +"أو البيولوجية أو الاستخدامات النهائية لتكنولوجيا الصواريخ ما لم\n" +"تحصل على أذن من حكومة الولايات المتحدة من خلال تنظيم أو ترخيص محدد.\n" +"(ه) هناك بلدان أخرى غير الولايات المتحدة قد تحد من\n" +"استيراد أو استخدام أو تصدير منتجات التشفير ستتحملو\n" +"وحدكم المسؤولة عن الامتثال لأية قيود استيراد أو استخدام\n" +"أو تصدير." + +#: TEMPLATE:85 +msgid "" +"If any provision of this agreement is held to be unenforceable, that\n" +"will not affect the enforceability of the remaining provisions. This\n" +"agreement will be governed by the laws of the State of Utah and\n" +"of the US, without regard to any conflict of laws provisions,\n" +"except that the United Nations Convention on the International\n" +"Sale of Goods will not apply. This agreement sets forth the entire\n" +"understanding and agreement between you and The openSUSE Project\n" +"regarding its subject matter and may be amended only in a writing\n" +"signed by both parties. No waiver of any right under this agreement\n" +"will be effective unless in writing, signed by a duly authorized\n" +"representative of the party to be bound. No waiver of any past or\n" +"present right arising from any breach or failure to perform will\n" +"be deemed to be a waiver of any future right arising under this\n" +"agreement. Use, duplication, or disclosure by the U.S. Government is\n" +"subject to the restrictions in FAR 52.227-14 (June 1987) Alternate\n" +"III (June 1987), FAR 52.227-19 (June 1987), or DFARS 252.227-7013\n" +"(b)(3) (November 1995), or applicable successor clauses." +msgstr "" +"إذا ثبت أن أي حكم من أحكام هذا الاتفاق غير قابل للتنفيذ،\n" +"فهذا لن يؤثر على قابلية تنفيذ الأحكام المتبقية. هذه\n" +"الاتفاقية تخضع لقوانين ولاية يوتا\n" +"في الولايات المتحدة، بغض النظر عن أي تضارب في نصوص القوانين،\n" +"باستثناء عدم تطبيق اتفاقية الأمم المتحدة\n" +"لبيع السلع. يحدد هذا الاتفاق\n" +"التفاهم والتوافق بينك وبين مشروع أوبن سوزي\n" +"فيما يتعلق بجواز تعديلها في الكتابة\n" +"الذي وقعه الطرفان. أي تنازل عن أي حق بموجب هذه الاتفاقية\n" +"لن تكون فعالة ما لم تكن مكتوبة، وموقعة من مخولين\n" +"من الطرفين. لا تنازل عن أي\n" +"حق ناجمة عن أي خرق أو عدم أداء النظام بشكل جيد\n" +"تخضع لقيود الاستخدام أو النسخ أو الكشف من قبل حكومة الولايات المتحدة\n" +"في FAR 52.227-14 (يونيو 1987) البديل\n" +"الثالث (يونيو 1987)، FAR 52.227-19 (يونيو 1987)، أو DFARS 252.227-7013\n" +"(ب) (3) (نوفمبر 1995)، أو بنود لاحقة معمول بها." + +#: TEMPLATE:103 +msgid "" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" +"reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" +"or its affiliates, which founded, sponsors, and is designated by, The " +"openSUSE\n" +"Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" +"other trademarks are the property of their respective owners." +msgstr "" +"حقوق التأليف والنشر © 2008-2016 مشروع أوبن سوزي جميع الحقوق\n" +"محفوظة. العلامات التجارية \"سوسي\" و\"أوبن سوزي\" تم تسجيلها من SUSE ذ م م،\n" +"أو الشركات التابعة لها، والجهات الراعية، أوبن سوزي\n" +"مشروع. \"لينكس\" هي علامة تجارية مسجلة لينوس تورفالدس. جميع\n" +"العلامات التجارية الأخرى هي ملك لأصحابها." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.cs.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.cs.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.cs.po 2016-05-11 14:55:36.000000000 +0200 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.cs.po 2016-08-19 15:19:49.000000000 +0200 @@ -242,14 +242,14 @@ #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" "Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" "other trademarks are the property of their respective owners." msgstr "" -"Copyright © 2008-2014 Projekt openSUSE. Všechna práva vyhrazena.\n" +"Copyright © 2008-2016 Projekt openSUSE. Všechna práva vyhrazena.\n" "\"SUSE\" a \"openSUSE\" jsou registrované ochranné známky SUSE LLC,\n" "nebo jeho poboček, který založil, sponzoruje a označuje Projekt\n" "openSUSE. \"Linux\" je registrovaná ochranná známka Linuse Torvaldse.\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.de.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.de.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.de.po 2016-01-20 13:20:41.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.de.po 2016-08-19 15:19:49.000000000 +0200 @@ -258,14 +258,14 @@ #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" "Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" "other trademarks are the property of their respective owners." msgstr "" -"Copyright (c) 2008-2014 The openSUSE Project. Alle Rechte\n" +"Copyright (c) 2008-2016 The openSUSE Project. Alle Rechte\n" "vorbehalten. „SUSE“ und „openSUSE“ sind eingetragene Marken von\n" "SUSE, LLC. oder ihren Schwestergesellschaften. Diese sind auch die\n" "ausgewiesenen Gründer und Förderer des openSUSE-Projekts.\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.es.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.es.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.es.po 2016-01-20 13:20:41.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.es.po 2016-08-19 15:19:49.000000000 +0200 @@ -261,14 +261,14 @@ #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" "Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" "other trademarks are the property of their respective owners." msgstr "" -"Copyright © 2008-2014 The openSUSE Project. Todos los derechos reservados. \n" +"Copyright © 2008-2016 The openSUSE Project. Todos los derechos reservados. \n" "\"SUSE\" y \"openSUSE\" son marcas comerciales de SUSE LLC, o sus " "afiliados,\n" "quien fundó, patrocina y ha sido designada por, el Proyecto openSUSE. \n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.fr.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.fr.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.fr.po 2016-01-20 13:20:41.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.fr.po 2016-08-19 15:19:49.000000000 +0200 @@ -257,14 +257,14 @@ #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" "Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" "other trademarks are the property of their respective owners." msgstr "" -"Copyright © 2008-2014 Projet openSUSE. Tous droits\n" +"Copyright © 2008-2016 Projet openSUSE. Tous droits\n" "réservés. « SUSE » et « openSUSE » sont des marques de SUSE, LLC.,\n" "ou des membres de son groupe, qui les ont créées et les sponsorisent, \n" "et sont désignées par l'expression Projet openSUSE. \n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.hu.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.hu.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.hu.po 2016-01-20 13:20:41.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.hu.po 2016-08-19 15:19:49.000000000 +0200 @@ -267,14 +267,14 @@ #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" "Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" "other trademarks are the property of their respective owners." msgstr "" -"Copyright © 2008-2014 The openSUSE Project. Minden jog fenntartva. A \"SUSE" +"Copyright © 2008-2016 The openSUSE Project. Minden jog fenntartva. A \"SUSE" "\"\n" "és az \"openSUSE\" a SUSE, LLC. védjegyei, amely az openSUSE projekt\n" "megalapítója, támogatója, és elnevezője. A \"Linux\" Linus Torvalds\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.it.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.it.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.it.po 2016-01-20 13:20:41.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.it.po 2016-08-19 15:19:49.000000000 +0200 @@ -255,14 +255,14 @@ #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" "Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" "other trademarks are the property of their respective owners." msgstr "" -"Copyright © 2008-2014 The openSUSE Project. Tutti i diritti\n" +"Copyright © 2008-2016 The openSUSE Project. Tutti i diritti\n" "riservati. \"SUSE\" e \"openSUSE\" sono marchi di SUSE, LLC. o sue " "affiliate, che ha\n" "fondato e sponsorizza The openSUSE Project e agisce come società\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.ja.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.ja.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.ja.po 2016-01-20 13:20:41.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.ja.po 2016-08-19 15:19:49.000000000 +0200 @@ -259,14 +259,14 @@ #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" "Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" "other trademarks are the property of their respective owners." msgstr "" -"Copyright (C) 2008-2014 The openSUSE Project. All rights reserved. \"SUSE\" " +"Copyright (C) 2008-2016 The openSUSE Project. All rights reserved. \"SUSE\" " "と\n" "\"openSUSE\"は、The openSUSE Project の設立者、出資者であり、同プロジェクト" "に\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.ko.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.ko.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.ko.po 2016-05-11 14:55:36.000000000 +0200 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.ko.po 2016-08-19 15:19:49.000000000 +0200 @@ -222,14 +222,14 @@ #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" "Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" "other trademarks are the property of their respective owners." msgstr "" -"Copyright (C) 2008-2014 The openSUSE Project. All rights reserved.\n" +"Copyright (C) 2008-2016 The openSUSE Project. All rights reserved.\n" "\"SUSE\" 와 \"openSUSE” 는, The openSUSE Project 의 설립자, 출자자 이며\n" "이 프로젝트에 명시된 SUSE LLC 의 상표입니다.\n" "리눅스는 리누스 토발즈의 등록 상표입니다.\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.nl.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.nl.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.nl.po 2016-01-20 13:20:41.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.nl.po 2016-08-19 15:19:49.000000000 +0200 @@ -263,14 +263,14 @@ #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" "Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" "other trademarks are the property of their respective owners." msgstr "" -"Copyright © 2008-2014 Het openSUSE Project. Alle rechten voorbehouden.\n" +"Copyright © 2008-2016 Het openSUSE Project. Alle rechten voorbehouden.\n" "\"SUSE\" en \"openSUSE\" zijn geregistreerde handelsmerken van SUSE LLC, " "of \n" "aanverwanten, die Het openSUSE Project hebben opgericht, gesponsord en " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.pl.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.pl.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.pl.po 2016-01-20 13:20:41.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.pl.po 2016-08-19 15:19:49.000000000 +0200 @@ -296,14 +296,14 @@ #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" "Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" "other trademarks are the property of their respective owners." msgstr "" -"Prawa autorskie © 2008-2014 projektu openSUSE. Wszelkie prawa zastrzeżone.\n" +"Prawa autorskie © 2008-2016 projektu openSUSE. Wszelkie prawa zastrzeżone.\n" "\"SUSE\" i \"openSUSE\" są znakami handlowymi korporacji SUSE lub jej " "oddziałów, \n" "która założyła, utrzymuje i jest wyznaczona przez projekt openSUSE. \"Linux" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.pt_BR.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.pt_BR.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.pt_BR.po 2016-01-20 13:20:41.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.pt_BR.po 2016-08-19 15:19:49.000000000 +0200 @@ -251,14 +251,14 @@ #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" "Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" "other trademarks are the property of their respective owners." msgstr "" -"Copyright © 2008-2014 The openSUSE Project. Todos os direitos\n" +"Copyright © 2008-2016 The openSUSE Project. Todos os direitos\n" "reservados. \"SUSE\" e \"openSUSE\" são marcas registradas da SUSE LLC \n" "ou suas afiliadas, que fundou, patrocina e é designada pelo The openSUSE\n" "Project. \"Linux\" é marca comercial registrada de Linus Torvalds. Todas\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.ru.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.ru.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.ru.po 2016-02-01 16:52:10.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.ru.po 2016-08-19 15:19:49.000000000 +0200 @@ -251,7 +251,7 @@ #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.sv.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.sv.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.sv.po 2016-05-11 15:11:07.000000000 +0200 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.sv.po 2016-08-19 15:19:49.000000000 +0200 @@ -4,16 +4,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-18 17:46+0200\n" -"PO-Revision-Date: 2016-04-29 15:48+0000\n" +"PO-Revision-Date: 2016-06-04 13:15+0000\n" "Last-Translator: Jonas Svensson <jonas(a)ekhorva.se>\n" -"Language-Team: Swedish <http://l10n.opensuse.org/projects/skelcd-" +"Language-Team: Swedish <https://l10n.opensuse.org/projects/skelcd-" "opensuse/master/sv/>\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5\n" +"X-Generator: Weblate 2.6\n" #: TEMPLATE:1 msgid "" @@ -31,6 +31,13 @@ "license does that. However, we hope that this translation will help\n" "$LANGUAGE speakers understand the license better." msgstr "" +"Detta är en icke-officiell översättning av openSUSE #VERSION# licensen till\n" +"$LANGUAGE. Denna text är ej juridiskt bindande i fråga om villkoren för att " +"\n" +"distribuera openSUSE #VERSION# - endast den engelska originaltexten av \n" +"licensen för openSUSE #VERSION# är det. Likväl hoppas vi att denna \n" +"översättning kan vara till hjälp för användare med $LANGUAGE som \n" +"modersmål att lättare förstå licensen." #: TEMPLATE:10 msgid "" @@ -42,6 +49,14 @@ "Public License version 2. By downloading, installing, or using\n" "openSUSE #VERSION#, you agree to the terms of this agreement." msgstr "" +"Detta avtal reglerar hur du får ladda ned, installera och använda\n" +"openSUSE #VERSION# och dess uppdateringar, oavsett hur de\n" +"leverans. openSUSE #VERSION# är ett kollektivt arbete som står\n" +"under USA:s Copyright Law. I enlighet med följande villkor ger dig \n" +"openSUSE Projektet en licens för detta kollektiva arbete i enlighet\n" +"med GNU General Public License version 2. Genom att ladda hem, \n" +"installera, eller använda openSUSE #VERSION#, accepterar du villkoren\n" +"i detta avtal." #: TEMPLATE:18 msgid "" @@ -57,6 +72,17 @@ "does not limit your rights under, or grant you rights that supersede,\n" "the license terms of any particular component." msgstr "" +"openSUSE #VERSION# är ett modulärt Linux-operativsystem som består av\n" +"hundratals olika mjukvarokompnenter. Varje enskild komponents licensavtal\n" +"hittar du normalt sett i komponentens källkod. Med undantag av vissa filer\n" +"som innehåller openSUSE:s varumärke (diskuteras längre ned), tillåter\n" +"komponenternas licens dig att kopiera och vidaredistribuera dem. Med\n" +"det potentiella undantaget för vissa firmware-filer tillåts du att kopiera, " +"modifiera,\n" +"vidaredistribuera komponenterna i så väl källkods- som binärformat. Detta\n" +"avtal varken begränsar eller utökar dina rättigheter i förhållande till en " +"enskild\n" +"komponents licensavtal." #: TEMPLATE:30 msgid "" @@ -75,6 +101,22 @@ "guidelines when distributing openSUSE #VERSION#, regardless of whether\n" "openSUSE #VERSION# has been modified." msgstr "" +"openSUSE #VERSION# och alla dess komponenter inklusive källkod,\n" +"dokumentation, utseende, struktur och organisation är upphovsrättsskyddade\n" +"av openSUSE-projektet m.fl. och är skyddade under copyright och andra\n" +"lagar. Den lagliga rätten till openSUSE #VERSION# och dess komponenter\n" +"samt kopior av dessa, förblir hos ovanstående eller dess licensgivare, med\n" +"förbehåll för den aktuella licensen. Varumärket \"openSUSE\" är ett " +"varumärke\n" +"av SUSE, LLC. i USA och andra länder, och används med tillstånd. Detta\n" +"avtal tillåter dig att distribuera såväl modifierade som omodifierade kopior " +"av\n" +"openSUSE #VERSION# med varumärket openSUSE under förutsättning att\n" +"du följer The openSUSE-projektets riktlinjer för varumärket som finns att " +"läsa\n" +"på http://en.opensuse.org/Legal. Du måste följa dessa riktlinjer när du\n" +"distribuerar openSUSE #VERSION#, oavsett om du har modifierat\n" +"openSUSE #VERSION# eller ej." #: TEMPLATE:45 msgid "" @@ -90,6 +132,20 @@ "in the accompanying documentation. USE OF OPENSUSE #VERSION# IS AT YOUR\n" "OWN RISK." msgstr "" +"Med undantag för vad som uttryckligen står om en enskild komponent i detta " +"avtal\n" +"eller i komponentens eget licensavtal, LEVERERAS OPENSUSE #VERSION# OCH\n" +"DESS KOMPONENTER, SÅ LÅNGT SOM MÖJLIGT I ENLIGHET GÄLLANDE LAG, \n" +"I \"BEFINTLIGT SKICK\" UTAN NÅGRA UTTRYCKLIGA, ELLER UNDERFÖRSTÅDDA\n" +"GARANTIER, ÖVERENSKOMMELSER OCH VILLKOR OM PROGRAMVARANS\n" +"SÄLJBARHET, TITEL, ICKE-INTRÅNG SAMT TILLFREDSSTÄLLANDE KVALITET\n" +"ELLER LÄMPLIGHET FÖR NÅGOT ALLMÄNT ELLER SÄRSKILT ÄNDAMÅL ELLER\n" +"ANVÄNDNINGSOMRÅDE. openSUSE-projektet garanterar inte på något vis att\n" +"funktionerna i openSUSE #VERSION# motsvarar dina behov eller att funktionen " +"i\n" +"openSUSE #VERSION# är helt felfri eller fungerar exakt som beskrivet i " +"medföljande\n" +"dokumentation. ANVÄND OPENSUSE #VERSION# PÅ DIN EGEN RISK." #: TEMPLATE:57 msgid "" @@ -104,6 +160,17 @@ "EMPLOYEES’) AGGREGATE LIABILITY IS LIMITED TO $50US, OR IF SUCH A\n" "LIMITATION IS NOT ALLOWED, IS LIMITED TO THE MAXIMUM EXTENT ALLOWED." msgstr "" +"I DEN UTSTRÄCKNING TILLÄMPLIGA LAGAR MEDGER, AVSÄGER SIG OPENSUSE-\n" +"PROJEKTET (SAMT DESS LICENSGIVARE, DOTTERBOLAG OCH ANSTÄLLDA)\n" +"ALLT ANSVAR FÖR SKADOR, UTEBLIVEN VINST ELLER FÖRLORADE\n" +"BESPARINGAR TILL FÖLJD AV ANVÄNDANDET ELLER OFÖRMÖGENHET ATT\n" +"KUNNA ANVÄNDA OPENSUSE #VERSION#, ÄVEN OM OPENSUSE-PROJEKTET\n" +"HAFT KÄNNEDOM OM MÖJLIGHETEN FÖR UPPKOMSTEN AV SÅDANA SKADOR.\n" +"I DE FALL ETT LANDS LAGAR INTE TILLÅTER ELLER INSKRÄNKER OVANSTÅENDE\n" +"ANSVARSFRISKRIVNING, BEGRÄNSAS OPENSUSE-PROJEKTETS (OCH DESS\n" +"LICENSGIVARE, DOTTERBOLAG OCH ANSTÄLLDA) TOTALA ANSVAR TILL\n" +"$50US, ELLER OM EN SÅDAN BEGRÄNSNING INTE TILLÅTS, TILL DET LÄGSTA\n" +"TILLÅTNA BELOPP." #: TEMPLATE:68 msgid "" @@ -125,6 +192,25 @@ "solely responsible for compliance with any such import, use, or export\n" "restrictions." msgstr "" +"I enlighet med USA:s lag försäkrar och garanterar du att: (a) är införstådd\n" +"med att openSUSE #VERSION# är underkastad lagen om exportkontroll\n" +"\"Export Administration Regulations\" (EAR) som upprättas och tillämpas av\n" +"\"US Department of Commerce\" samt \"Bureau of Industry and Security\";\n" +"(b) att du inte är befinner inom ett förbjudet destinationsland eller är " +"specifikt\n" +"förbjuden i enlighet med EAR eller USA:s sanktioneringsföreskrifter;\n" +"(c) att inte exportera, vidareexportera eller överföra openSUSE #VERSION#\n" +"till någon förbjuden destination, enhet eller individ utan nödvändiga export-" +"\n" +"licens(er) från USA:s regering; (d) inte använder eller överför openSUSE\n" +"#VERSION# till nukleär, kemisk, eller biologisk vapen- och/eller " +"missilteknisk\n" +"slutanvändning utan godkännande av USA:s regering genom lagstiftning\n" +"eller särskilt tillstånd; (e) är införstådd med att andra länder än USA kan " +"\n" +"ha förbud mot import, användning eller export av krypterade produkter och\n" +"att du är ensamt ansvarig för att uppfylla sådana import, användning eller\n" +"exportrestriktioner." #: TEMPLATE:85 msgid "" @@ -146,13 +232,35 @@ "III (June 1987), FAR 52.227-19 (June 1987), or DFARS 252.227-7013\n" "(b)(3) (November 1995), or applicable successor clauses." msgstr "" +"Om någon del av detta licensavtal visar sig vara ogiltigt eller inte kan\n" +"följas, påverkas inte resterande delar av avtalet. Detta licensavtal lyder\n" +"under delstaten Utah samt USA:s lagar, utan hänsyn till lagvalsregler,\n" +"förutom att FN: s konvention om internationell försäljning av varor inte\n" +"gäller. Detta avtal utgör det enda avtalet mellan dig och openSUSE-" +"projektet\n" +"och kan endast ändras genom skriftlig överenskommelse undertecknad\n" +"av båda parter. Undantag från någon av villkoren i detta avtal gäller\n" +"enbart om de är skriftliga och undertecknade av behörig företrädare\n" +"för part som blir förbunden. Inget undantag från något tidigare eller\n" +"nuvarande villkor till följd av brott eller oförmåga att följa avtal, skall\n" +"kunna ligga till grund för tolkning av framtida undantag. Användning,\n" +"kopiering eller utlämning av den amerikanska regeringen är föremål för\n" +"begränsning enligt FAR 52.227-14 (juni 1987) alternativt III (juni 1987),\n" +"FAR 52.227-19 (juni 1987) eller DFARS 252.227-7013 (b)(3) (november\n" +"1995), eller dess efterföljare." #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" "Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" "other trademarks are the property of their respective owners." msgstr "" +"Copyright © 2008-2016 The openSUSE Project. Alla rättigheter reserverade.\n" +"\"SUSE\" och \"openSUSE\" är registrerade varumärken av SUSE LLC eller dess\n" +"dotterbolag vilka också är grundare, sponsorer och intressenter i openSUSE\n" +"Projektet. \"Linux\" är ett registrerat varumärke av Linus Torvalds. Alla " +"andra\n" +"varumärken och registrerade varumärken tillhör sina respektive ägare." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.txt new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.txt --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.txt 2015-11-25 13:49:01.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.txt 2016-08-19 15:19:49.000000000 +0200 @@ -94,7 +94,7 @@ III (June 1987), FAR 52.227-19 (June 1987), or DFARS 252.227-7013 (b)(3) (November 1995), or applicable successor clauses. -Copyright © 2008-2014 The openSUSE Project. All rights +Copyright © 2008-2016 The openSUSE Project. All rights reserved. "SUSE" and "openSUSE" are registered trademarks of SUSE LLC, or its affiliates, which founded, sponsors, and is designated by, The openSUSE Project. "Linux" is a registered trademark of Linus Torvalds. All diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.uk.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.uk.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.uk.po 2016-04-13 16:02:07.000000000 +0200 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.uk.po 2016-08-19 15:19:49.000000000 +0200 @@ -256,14 +256,14 @@ #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" "Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" "other trademarks are the property of their respective owners." msgstr "" -"© Проект openSUSE, 2008-2014. Усі права захищені. „SUSE“ і „openSUSE“\n" +"© Проект openSUSE, 2008-2016. Усі права захищені. „SUSE“ і „openSUSE“\n" "є торговими марками SUSE, LLC. або її філій, що\n" "заснували проект openSUSE, спонсорують його і несуть за нього\n" "відповідальність. „Linux“ є зареєстрованою торговою\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.zh_CN.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.zh_CN.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.zh_CN.po 2016-01-20 13:20:41.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.zh_CN.po 2016-08-19 15:19:49.000000000 +0200 @@ -1,25 +1,26 @@ #. extracted from TEMPLATE -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-18 17:46+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"PO-Revision-Date: 2016-06-07 09:13+0000\n" +"Last-Translator: Marguerite Su <i(a)marguerite.su>\n" +"Language-Team: Chinese (China) <https://l10n.opensuse.org/projects/skelcd-" +"opensuse/master/zh_CN/>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Translate Toolkit 1.13.0\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Weblate 2.6\n" #: TEMPLATE:1 msgid "" "LICENSE AGREEMENT\n" "openSUSE® #VERSION#" msgstr "" -"许可证协议\n" +"许可协议\n" "openSUSE® #VERSION#" # Note to translators: Please replace $LANGUAGE with your own language. @@ -203,14 +204,14 @@ #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" "Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" "other trademarks are the property of their respective owners." msgstr "" -"版权所有 © 2008-2014 The openSUSE Project。保留所有权" +"版权所有 © 2008-2016 The openSUSE Project。保留所有权" "利。“SUSE”和“openSUSE”是 SUSE, LLC. 的商标，SUSE, Inc. 是 The openSUSE " "Project 的发起人和赞助人，并受 The openSUSE Project 指定。“Linux”是 Linus " "Torvalds 的注册商标。其它所有商标都是其相应所有者的财产。" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.zh_TW.po new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.zh_TW.po --- old/skelcd-openSUSE-84.87.20160511.ece383f/license/license.zh_TW.po 2016-01-20 13:20:41.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160819.aacef49/license/license.zh_TW.po 2016-08-19 15:19:49.000000000 +0200 @@ -201,13 +201,13 @@ #: TEMPLATE:103 msgid "" -"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"Copyright © 2008-2016 The openSUSE Project. All rights\n" "reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" "or its affiliates, which founded, sponsors, and is designated by, The " "openSUSE\n" "Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" "other trademarks are the property of their respective owners." msgstr "" -"Copyright © 2008-2014 The openSUSE Project。保留所有權利。SUSE 和 openSUSE " +"Copyright © 2008-2016 The openSUSE Project。保留所有權利。SUSE 和 openSUSE " "是 SUSE, LLC. 的商標，後者創立、贊助並設計了 The openSUSE Project。Linux 是 " "Linus Torvalds 的註冊商標。所有其他商標均為其各自擁有者的財產。"

1 0

commit yast2-network for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2016-08-31 00:01:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2016-08-25 09:53:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2016-08-31 00:01:52.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Aug 24 10:54:55 UTC 2016 - mfilka(a)suse.com + +- bnc#993587 + - installer is able to newly configured set devices up in case of + ssh/vnc installation +- 3.1.168 + +------------------------------------------------------------------- Old: ---- yast2-network-3.1.167.tar.bz2 New: ---- yast2-network-3.1.168.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.bozskv/_old 2016-08-31 00:01:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bozskv/_new 2016-08-31 00:01:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.167 +Version: 3.1.168 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.167.tar.bz2 -> yast2-network-3.1.168.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.167/package/yast2-network.changes new/yast2-network-3.1.168/package/yast2-network.changes --- old/yast2-network-3.1.167/package/yast2-network.changes 2016-08-23 09:35:26.000000000 +0200 +++ new/yast2-network-3.1.168/package/yast2-network.changes 2016-08-25 16:43:51.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Aug 24 10:54:55 UTC 2016 - mfilka(a)suse.com + +- bnc#993587 + - installer is able to newly configured set devices up in case of + ssh/vnc installation +- 3.1.168 + +------------------------------------------------------------------- Fri Aug 19 08:59:14 UTC 2016 - mfilka(a)suse.com - bnc#991382 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.167/package/yast2-network.spec new/yast2-network-3.1.168/package/yast2-network.spec --- old/yast2-network-3.1.167/package/yast2-network.spec 2016-08-23 09:35:26.000000000 +0200 +++ new/yast2-network-3.1.168/package/yast2-network.spec 2016-08-25 16:43:51.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.167 +Version: 3.1.168 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.167/src/lib/network/network_autoconfiguration.rb new/yast2-network-3.1.168/src/lib/network/network_autoconfiguration.rb --- old/yast2-network-3.1.167/src/lib/network/network_autoconfiguration.rb 2016-08-23 09:35:26.000000000 +0200 +++ new/yast2-network-3.1.168/src/lib/network/network_autoconfiguration.rb 2016-08-25 16:43:51.000000000 +0200 @@ -1,14 +1,15 @@ # encoding: utf-8 require "yast" +require "network/wicked" module Yast # The class is responsible for generating / proposing automatic # configuration during installation workflow class NetworkAutoconfiguration + include Wicked include Singleton include Logger - include Yast Yast.import "Lan" Yast.import "LanItems" @@ -18,8 +19,6 @@ Yast.import "Arch" Yast.import "Host" - BASH_PATH = Path.new(".target.bash") - def configure_dhcp Yast.include self, "network/routines.rb" @@ -142,17 +141,6 @@ LanItems.Commit end - # Reloads configuration for each device named in devs - # - # @devs [Array] list of device names - # @return true if configuration was reloaded - def reload_config(devs) - raise ArgumentError if devs.nil? - return true if devs.empty? - - SCR.Execute(BASH_PATH, "wicked ifreload #{devs.join(" ")}") == 0 - end - def delete_config(devname) LanItems.delete_dev(devname) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.167/src/lib/network/wicked.rb new/yast2-network-3.1.168/src/lib/network/wicked.rb --- old/yast2-network-3.1.167/src/lib/network/wicked.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-3.1.168/src/lib/network/wicked.rb 2016-08-25 16:43:51.000000000 +0200 @@ -0,0 +1,20 @@ +# encoding: utf-8 + +require "yast" + +module Yast + module Wicked + BASH_PATH = Path.new(".target.bash") + + # Reloads configuration for each device named in devs + # + # @devs [Array] list of device names + # @return true if configuration was reloaded + def reload_config(devs) + raise ArgumentError if devs.nil? + return true if devs.empty? + + SCR.Execute(BASH_PATH, "wicked ifreload #{devs.join(" ")}").zero? + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.167/src/modules/Lan.rb new/yast2-network-3.1.168/src/modules/Lan.rb --- old/yast2-network-3.1.167/src/modules/Lan.rb 2016-08-23 09:35:26.000000000 +0200 +++ new/yast2-network-3.1.168/src/modules/Lan.rb 2016-08-25 16:43:51.000000000 +0200 @@ -1120,17 +1120,28 @@ private def activate_network_service - if LanItems.force_restart + # If the second installation stage has been called by yast.ssh via + # ssh, we should not restart network because systemctl + # hangs in that case. (bnc#885640) + action = :reload_restart if Stage.normal || !Linuxrc.usessh + action = :force_restart if LanItems.force_restart + action = :remote_installer if Stage.initial && (Linuxrc.usessh || Linuxrc.vnc) + + case action + when :force_restart log.info("Network service activation forced") NetworkService.Restart - else - log.info "Attempting to reload network service, normal stage " \ - "#{Stage.normal}, ssh: #{Linuxrc.usessh}" - # If the second installation stage has been called by yast.ssh via - # ssh, we should not restart network cause systemctl - # hangs in that case. (bnc#885640) + when :reload_restart + log.info("Attempting to reload network service, normal stage #{Stage.normal}, ssh: #{Linuxrc.usessh}") + NetworkService.ReloadOrRestart if Stage.normal || !Linuxrc.usessh + + when :remote_installer + # last instance handling "special" cases like ssh installation + # FIXME: most probably not everything will be set properly + log.info("Running in ssh/vnc installer -> just setting links up") + LanItems.reload_config(LanItems.GetAllInterfaces()) end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.167/src/modules/LanItems.rb new/yast2-network-3.1.168/src/modules/LanItems.rb --- old/yast2-network-3.1.167/src/modules/LanItems.rb 2016-08-23 09:35:26.000000000 +0200 +++ new/yast2-network-3.1.168/src/modules/LanItems.rb 2016-08-25 16:43:51.000000000 +0200 @@ -24,6 +24,7 @@ require "yast" require "yaml" require "network/install_inf_convertor" +require "network/wicked" module Yast # Does way too many things. @@ -46,6 +47,7 @@ attr_accessor :ipoib_mode include Logger + include Wicked def main Yast.import "UI"

1 0

commit yast2-devtools for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package yast2-devtools for openSUSE:Factory checked in at 2016-08-31 00:01:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-devtools (Old) and /work/SRC/openSUSE:Factory/.yast2-devtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-devtools" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-devtools/yast2-devtools.changes 2016-07-27 16:06:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-devtools.new/yast2-devtools.changes 2016-08-31 00:01:43.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Aug 24 12:36:47 UTC 2016 - jreidinger(a)suse.com + +- ignore in spellcheck 'vc' because used as 'osc vc' suggestion in + CONTRIBUTING.md (needed to submit bnc#995333) +- 3.1.46 + +------------------------------------------------------------------- +Fri Aug 5 10:38:44 UTC 2016 - mvidner(a)suse.com + +- y2makepot, gettextdomains: ignore test/ directories. + +------------------------------------------------------------------- Old: ---- yast2-devtools-3.1.45.tar.bz2 New: ---- yast2-devtools-3.1.46.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-devtools.spec ++++++ --- /var/tmp/diff_new_pack.Ye9iTx/_old 2016-08-31 00:01:44.000000000 +0200 +++ /var/tmp/diff_new_pack.Ye9iTx/_new 2016-08-31 00:01:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.45 +Version: 3.1.46 Release: 0 Url: http://github.com/yast/yast-devtools ++++++ yast2-devtools-3.1.45.tar.bz2 -> yast2-devtools-3.1.46.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.45/CONTRIBUTING.md new/yast2-devtools-3.1.46/CONTRIBUTING.md --- old/yast2-devtools-3.1.45/CONTRIBUTING.md 2016-07-19 09:40:24.000000000 +0200 +++ new/yast2-devtools-3.1.46/CONTRIBUTING.md 2016-08-24 14:43:32.000000000 +0200 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount… if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.45/build-tools/data/YaST2.dict.txt new/yast2-devtools-3.1.46/build-tools/data/YaST2.dict.txt --- old/yast2-devtools-3.1.45/build-tools/data/YaST2.dict.txt 2016-07-19 09:40:24.000000000 +0200 +++ new/yast2-devtools-3.1.46/build-tools/data/YaST2.dict.txt 2016-08-24 14:43:32.000000000 +0200 @@ -134,6 +134,7 @@ Uninstall Uninstalled Uzbekistan +vc VCI VESA VLAN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.45/build-tools/scripts/gettextdomains new/yast2-devtools-3.1.46/build-tools/scripts/gettextdomains --- old/yast2-devtools-3.1.45/build-tools/scripts/gettextdomains 2016-07-19 09:40:24.000000000 +0200 +++ new/yast2-devtools-3.1.46/build-tools/scripts/gettextdomains 2016-08-24 14:43:32.000000000 +0200 @@ -16,6 +16,7 @@ # search for sourcecode-files SRCFILES=`find $SRCDIR -type d -name testsuite -prune , \ + -type d -name test -prune , \ -type d -name .svn -prune , \ -type f -name "*.ycp" \ -o -name "*.pm" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.45/build-tools/scripts/y2makepot new/yast2-devtools-3.1.46/build-tools/scripts/y2makepot --- old/yast2-devtools-3.1.45/build-tools/scripts/y2makepot 2016-07-19 09:40:24.000000000 +0200 +++ new/yast2-devtools-3.1.46/build-tools/scripts/y2makepot 2016-08-24 14:43:32.000000000 +0200 @@ -107,12 +107,10 @@ function usage() { - echo echo -e "create *.pot files from a source tree."; echo -e "\nOptions:\n\t-c\t Check in the newly created files to SVN" echo -e "\t-s\t Specify the source dir where to look for translatable files (recursive)" echo -e "\nYou can specify additional files to .pot creation in $SRCDIR/POTFILES" - echo exit 0 } @@ -124,11 +122,9 @@ get_domains_and_err $SRCDIR # $ERR contains the files without textdomain (see gettextdomains) - echo for F in $ERR; do echo "** WARNING: Missing textdomain in file $F" 1>&2; done - echo # all textdomains found by gettextdomains DOMAINS=`echo -en $DOMAINS | LC_COLLATE=C sort` ; @@ -147,7 +143,6 @@ gettext_call "$MODULE" "$FILES" "$RUBY_FILES" - echo MODULE=$D; FILES="" RUBY_FILES="" @@ -171,11 +166,9 @@ POT_DST="$POT_DST $MODULE.pot" gettext_call "$MODULE" "$FILES" "$RUBY_FILES" - echo } - function checkin_potfiles() { ADDED="" @@ -254,7 +247,6 @@ checkin_potfiles fi -echo exit 0 # -- main -- end --------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.45/package/yast2-devtools.changes new/yast2-devtools-3.1.46/package/yast2-devtools.changes --- old/yast2-devtools-3.1.45/package/yast2-devtools.changes 2016-07-19 09:40:24.000000000 +0200 +++ new/yast2-devtools-3.1.46/package/yast2-devtools.changes 2016-08-24 14:43:32.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Aug 24 12:36:47 UTC 2016 - jreidinger(a)suse.com + +- ignore in spellcheck 'vc' because used as 'osc vc' suggestion in + CONTRIBUTING.md (needed to submit bnc#995333) +- 3.1.46 + +------------------------------------------------------------------- +Fri Aug 5 10:38:44 UTC 2016 - mvidner(a)suse.com + +- y2makepot, gettextdomains: ignore test/ directories. + +------------------------------------------------------------------- Tue Jul 19 07:14:16 UTC 2016 - jreidinger(a)suse.com - Generate simple page if yard is not available (follow-up of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.45/package/yast2-devtools.spec new/yast2-devtools-3.1.46/package/yast2-devtools.spec --- old/yast2-devtools-3.1.45/package/yast2-devtools.spec 2016-07-19 09:40:24.000000000 +0200 +++ new/yast2-devtools-3.1.46/package/yast2-devtools.spec 2016-08-24 14:43:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.45 +Version: 3.1.46 Release: 0 Url: http://github.com/yast/yast-devtools diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.45/travis-tools/travis_setup.sh new/yast2-devtools-3.1.46/travis-tools/travis_setup.sh --- old/yast2-devtools-3.1.45/travis-tools/travis_setup.sh 2016-07-19 09:40:24.000000000 +0200 +++ new/yast2-devtools-3.1.46/travis-tools/travis_setup.sh 2016-08-24 14:43:32.000000000 +0200 @@ -23,21 +23,28 @@ case $OBS_PROJECT in # SLE-12 Devel:YaST:SLE-12) - REPO_URL="http://download.opensuse.org/repositories/YaST:/SLE-12:/GA:/Travis/xUbuntu_…" + REPO_URLS="http://download.opensuse.org/repositories/YaST:/SLE-12:/GA:/Travis/xUbuntu_…" ;; # OpenSUSE 13.2 YaST:openSUSE:13.2) - REPO_URL="http://download.opensuse.org/repositories/YaST:/openSUSE:/13.2:/Travis/xUbu…" + REPO_URLS="http://download.opensuse.org/repositories/YaST:/openSUSE:/13.2:/Travis/xUbu…" + ;; + # storage-ng + YaST:storage-ng) + REPO_URLS="http://download.opensuse.org/repositories/YaST:/Head:/Travis/xUbuntu_12.04 + http://download.opensuse.org/repositories/YaST:/storage-ng:/Travis/xUbuntu_…" ;; # master *) - REPO_URL="http://download.opensuse.org/repositories/YaST:/Head:/Travis/xUbuntu_12.04" + REPO_URLS="http://download.opensuse.org/repositories/YaST:/Head:/Travis/xUbuntu_12.04" ;; esac # prepare the system for installing additional packages from OBS -curl $REPO_URL/Release.key | sudo apt-key add - -echo "deb $REPO_URL/ ./" | sudo tee -a /etc/apt/sources.list +for REPO_URL in $REPO_URLS; do + curl $REPO_URL/Release.key | sudo apt-key add - + echo "deb $REPO_URL/ ./" | sudo tee -a /etc/apt/sources.list +done sudo apt-get update -q

1 0

commit apparmor for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2016-08-31 00:01:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apparmor" Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2016-05-25 21:22:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apparmor.new/apparmor.changes 2016-08-31 00:01:23.000000000 +0200 @@ -1,0 +2,23 @@ +Fri Aug 26 20:21:37 UTC 2016 - suse-beta(a)cboltz.de + +- add changes-since-2.10.1--r3326..3346.diff with upstream changes and + fixes since the 2.10.1 release, including + - allow dac_override in winbindd profile (boo#990006#c5) + - allow mr for /usr/lib*/ldb/*.so in samba abstractions (needed since + Samba 4.4.x, boo#990006) + - abstractions/nameservice: also support ConnMan-managed resolv.conf + - let aa-genprof ask about profiles in extra dir (again) + - fix aa-logprof "add hat" endless loop (lp#1538306) + - honor 'chown' file events in logparser.py + - ignore log file events with a request mask of 'send' or 'receive' + because they are actually network events (lp#1577051, lp#1582374) + - accept hostname with dots when parsing logs (lp#1453300 comments #1 and #2) +- fix python LibAppArmor import failures with swig > 3.0.8 (boo#987607) + (libapparmor-fix-import-path.diff) +- refresh apparmor-abstractions-no-multiline.diff +- drop upstreamed profiles-ping-inet6-r3449.diff +- add %check section - runs libapparmor (including swig bindings), + parser and profiles tests +- add BuildRequires: perl(Locale::gettext) - needed for parser tests + +------------------------------------------------------------------- Old: ---- profiles-ping-inet6-r3449.diff New: ---- changes-since-2.10.1--r3326..3346.diff libapparmor-fix-import-path.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.RsgGjE/_old 2016-08-31 00:01:24.000000000 +0200 +++ /var/tmp/diff_new_pack.RsgGjE/_new 2016-08-31 00:01:24.000000000 +0200 @@ -82,6 +82,9 @@ # split a long string in AppArmor.pm. Not accepted upstream because they want a solution without hardcoded width. Patch3: apparmor-utils-string-split +# upstream changes/fixes from 2.10 branch r3326..3346 +Patch4: changes-since-2.10.1--r3326..3346.diff + # Ruby 2.0 mkmf prefixes everything with $(DESTDIR), bnc#822277, kkaempf(a)suse.de Patch5: ruby-2_0-mkmf-destdir.patch @@ -92,8 +95,8 @@ # bug 906858 - confine lessopen.sh (submitted upstream 2014-12-21) Patch7: apparmor-lessopen-profile.patch -# boo#980596 - latest ping includes IPv6 (commited upstream trunk r3449 / 2.10 branch r3331 / 2.9 branch r3009) -Patch8: profiles-ping-inet6-r3449.diff +# fix import path for LibAppArmor for newer swig versions (boo#987607, not upstreamed yet) +Patch8: libapparmor-fix-import-path.diff Url: https://launchpad.net/apparmor PreReq: sed @@ -110,6 +113,7 @@ BuildRequires: pcre-devel BuildRequires: pkg-config BuildRequires: python +BuildRequires: perl(Locale::gettext) %if 0%{?suse_version} > 1220 BuildRequires: texlive-amsfonts BuildRequires: texlive-cm-super @@ -434,6 +438,7 @@ %patch1 -p1 %patch2 %patch3 -p1 +%patch4 # Ruby 2.0 mkmf prefixes every path with $(DESTDIR) %if 0%{?suse_version} > 1230 @@ -479,12 +484,10 @@ %endif make - #make check ) # Utilities: make -C utils -# make -C utils check # deprecated/utils (perl modules still needed by YaST) %if %{with perl} @@ -495,7 +498,6 @@ make -C parser V=1 # techdoc.txt depends on techdoc.pdf and techdoc/index.html, so make techdoc.txt should be enough make -C parser V=1 techdoc.txt -# make -C parser check # Apache mod_apparmor: %if %{with apache} @@ -509,7 +511,6 @@ # Profiles: make -C profiles -# make -C profiles check ##configure --disable-static --with-pic \ #--with-perl \ @@ -517,6 +518,20 @@ make -C changehat/tomcat_apparmor/tomcat_5_5 CATALINA_HOME=%{CATALINA_HOME} %endif +%check +%if %{with python3} +export PYTHON=/usr/bin/python3 +export PYTHON_VERSIONS=python3 +%endif + +make check -C libraries/libapparmor +make check -C parser +# profiles make check fails for the utils (libapparmor PYTHONPATH issues), therefore only do parser-based checks +# also, check-parser breaks if using 'make -C' (but works if cd'ing into the directory) +(cd profiles && make check-parser) +# utils make check fails if profiles don't exist in /etc/apparmor.d/ +# make check -C utils + %install %if %{with python3} @@ -772,7 +787,9 @@ %dir %{python3_sitearch}/LibAppArmor/__pycache__ %{python3_sitearch}/LibAppArmor/_LibAppArmor.cpython-*.so %{python3_sitearch}/LibAppArmor/__pycache__/__init__.cpython-*.pyc +%{python3_sitearch}/LibAppArmor/__pycache__/LibAppArmor.cpython-*.pyc %{python3_sitearch}/LibAppArmor/__init__.py +%{python3_sitearch}/LibAppArmor/LibAppArmor.py %{python3_sitelib}/apparmor/ %{python3_sitelib}/apparmor-%{version}-py*.egg-info %endif ++++++ apparmor-abstractions-no-multiline.diff ++++++ --- /var/tmp/diff_new_pack.RsgGjE/_old 2016-08-31 00:01:24.000000000 +0200 +++ /var/tmp/diff_new_pack.RsgGjE/_new 2016-08-31 00:01:24.000000000 +0200 @@ -37,7 +37,7 @@ =================================================================== --- profiles/apparmor.d/abstractions/dbus-session-strict.orig 2014-10-18 13:11:18.498652324 +0200 +++ profiles/apparmor.d/abstractions/dbus-session-strict 2014-10-18 13:11:31.098494805 +0200 -@@ -13,13 +13,6 @@ +@@ -13,16 +13,9 @@ /etc/machine-id r, /var/lib/dbus/machine-id r, @@ -46,6 +46,9 @@ - peer=(addr="@/tmp/dbus-*"), + unix (connect, receive, send) type=stream peer=(addr="@/tmp/dbus-*"), + # dbus with systemd and --enable-user-session + owner /run/user/[0-9]*/bus rw, + - dbus send - bus=session - path=/org/freedesktop/DBus ++++++ changes-since-2.10.1--r3326..3346.diff ++++++ ++++ 875 lines (skipped) ++++++ libapparmor-fix-import-path.diff ++++++ Index: libraries/libapparmor/swig/python/Makefile.am =================================================================== --- libraries/libapparmor/swig/python/Makefile.am.orig 2014-01-06 23:08:55.000000000 +0100 +++ libraries/libapparmor/swig/python/Makefile.am 2016-08-26 18:03:52.526582753 +0200 @@ -6,9 +6,8 @@ SUBDIRS = test libapparmor_wrap.c: $(srcdir)/../SWIG/libapparmor.i $(SWIG) -python -I$(srcdir)/../../include -module LibAppArmor -o $@ $(srcdir)/../SWIG/libapparmor.i - mv LibAppArmor.py __init__.py -MOSTLYCLEANFILES=libapparmor_wrap.c __init__.py +MOSTLYCLEANFILES=libapparmor_wrap.c LibAppArmor.py all-local: libapparmor_wrap.c setup.py if test ! -f libapparmor_wrap.c; then cp $(srcdir)/libapparmor_wrap.c . ; fi Index: libraries/libapparmor/swig/python/__init__.py =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ libraries/libapparmor/swig/python/__init__.py 2016-08-26 18:03:16.790763701 +0200 @@ -0,0 +1 @@ +from LibAppArmor.LibAppArmor import * Index: libraries/libapparmor/swig/python/Makefile.in =================================================================== --- libraries/libapparmor/swig/python/Makefile.in.orig 2016-04-20 11:09:04.000000000 +0200 +++ libraries/libapparmor/swig/python/Makefile.in 2016-08-26 18:04:51.770288833 +0200 @@ -326,7 +326,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @HAVE_PYTHON_TRUE@EXTRA_DIST = libapparmor_wrap.c @HAVE_PYTHON_TRUE@SUBDIRS = test -@HAVE_PYTHON_TRUE@MOSTLYCLEANFILES = libapparmor_wrap.c __init__.py +@HAVE_PYTHON_TRUE@MOSTLYCLEANFILES = libapparmor_wrap.c LibAppArmor.py all: all-recursive .SUFFIXES: @@ -648,7 +648,6 @@ uninstall-am: @HAVE_PYTHON_TRUE@libapparmor_wrap.c: $(srcdir)/../SWIG/libapparmor.i @HAVE_PYTHON_TRUE@ $(SWIG) -python -I$(srcdir)/../../include -module LibAppArmor -o $@ $(srcdir)/../SWIG/libapparmor.i -@HAVE_PYTHON_TRUE@ mv LibAppArmor.py __init__.py @HAVE_PYTHON_TRUE@all-local: libapparmor_wrap.c setup.py @HAVE_PYTHON_TRUE@ if test ! -f libapparmor_wrap.c; then cp $(srcdir)/libapparmor_wrap.c . ; fi

1 0

commit gyp for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package gyp for openSUSE:Factory checked in at 2016-08-31 00:01:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gyp (Old) and /work/SRC/openSUSE:Factory/.gyp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gyp" Changes: -------- --- /work/SRC/openSUSE:Factory/gyp/gyp.changes 2016-07-20 09:16:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gyp.new/gyp.changes 2016-08-31 00:01:15.000000000 +0200 @@ -1,0 +2,15 @@ +Sun Aug 28 12:09:58 UTC 2016 - mpluskal(a)suse.com + +- Update to version 0+git.20160810: + * Adds support for a new target spec: 'mac_xcuitest_bundle'. This allows us to create UI testing bundles. + * Enabling /ZW (CompileAsWinRT) option for msvs + * ninja/mac: Add horrible workaround for horrible Xcode 7.3 ld bug. + * [gyp-ninja] Set simulator and device SDKROOT for iOS. + * Ignore more Xcode stderr logging information. + * Only call CopyStringsFile if convert_to_binary is False. + * Fix :rfc1034identifier when the value contains underscore. + * Complete PBXCopyFilesBuildPhase TODO in xcodeproj_file.py. + * Make the ninja backend transitively check for C++ sources to use the C++ compiler for linking + * Add new target type called windows_driver. * Modify GYP to set the PlatformToolset, the DriverType and the TargetVersion * Add msvs_target_version configuration + +------------------------------------------------------------------- Old: ---- gyp-0+git.20160620.tar.xz New: ---- gyp-0+git.20160810.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gyp.spec ++++++ --- /var/tmp/diff_new_pack.Bl5nXM/_old 2016-08-31 00:01:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Bl5nXM/_new 2016-08-31 00:01:16.000000000 +0200 @@ -18,7 +18,7 @@ Name: gyp -Version: 0+git.20160620 +Version: 0+git.20160810 Release: 0 Summary: Generate Your Projects License: BSD-3-Clause ++++++ gyp-0+git.20160620.tar.xz -> gyp-0+git.20160810.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/pylib/gyp/MSVSUtil.py new/gyp-0+git.20160810/pylib/gyp/MSVSUtil.py --- old/gyp-0+git.20160620/pylib/gyp/MSVSUtil.py 2016-07-06 14:15:59.000000000 +0200 +++ new/gyp-0+git.20160810/pylib/gyp/MSVSUtil.py 2016-08-10 22:13:45.000000000 +0200 @@ -14,6 +14,7 @@ 'loadable_module': 'dll', 'shared_library': 'dll', 'static_library': 'lib', + 'windows_driver': 'sys', } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/pylib/gyp/generator/msvs.py new/gyp-0+git.20160810/pylib/gyp/generator/msvs.py --- old/gyp-0+git.20160620/pylib/gyp/generator/msvs.py 2016-07-06 14:15:59.000000000 +0200 +++ new/gyp-0+git.20160810/pylib/gyp/generator/msvs.py 2016-08-10 22:13:45.000000000 +0200 @@ -46,6 +46,8 @@ generator_default_variables = { + 'DRIVER_PREFIX': '', + 'DRIVER_SUFFIX': '.sys', 'EXECUTABLE_PREFIX': '', 'EXECUTABLE_SUFFIX': '.exe', 'STATIC_LIB_PREFIX': '', @@ -272,6 +274,10 @@ tool[setting] = value +def _ConfigTargetVersion(config_data): + return config_data.get('msvs_target_version', 'Windows7') + + def _ConfigPlatform(config_data): return config_data.get('msvs_configuration_platform', 'Win32') @@ -919,6 +925,8 @@ toolset = default_config.get('msbuild_toolset') if not toolset and version.DefaultToolset(): toolset = version.DefaultToolset() + if spec['type'] == 'windows_driver': + toolset = 'WindowsKernelModeDriver10.0' return toolset @@ -1102,6 +1110,7 @@ 'shared_library': '2', # .dll 'loadable_module': '2', # .dll 'static_library': '4', # .lib + 'windows_driver': '5', # .sys 'none': '10', # Utility type }[spec['type']] except KeyError: @@ -1286,6 +1295,7 @@ 'executable': ('VCLinkerTool', 'Link', '$(OutDir)', '.exe'), 'shared_library': ('VCLinkerTool', 'Link', '$(OutDir)', '.dll'), 'loadable_module': ('VCLinkerTool', 'Link', '$(OutDir)', '.dll'), + 'windows_driver': ('VCLinkerTool', 'Link', '$(OutDir)', '.sys'), 'static_library': ('VCLibrarianTool', 'Lib', '$(OutDir)lib\\', '.lib'), } output_file_props = output_file_map.get(spec['type']) @@ -1348,7 +1358,8 @@ def _GetModuleDefinition(spec): def_file = '' - if spec['type'] in ['shared_library', 'loadable_module', 'executable']: + if spec['type'] in ['shared_library', 'loadable_module', 'executable', + 'windows_driver']: def_files = [s for s in spec.get('sources', []) if s.endswith('.def')] if len(def_files) == 1: def_file = _FixPath(def_files[0]) @@ -2710,14 +2721,20 @@ return properties + def _GetMSBuildConfigurationDetails(spec, build_file): properties = {} for name, settings in spec['configurations'].iteritems(): msbuild_attributes = _GetMSBuildAttributes(spec, settings, build_file) condition = _GetConfigurationCondition(name, settings) character_set = msbuild_attributes.get('CharacterSet') + config_type = msbuild_attributes.get('ConfigurationType') _AddConditionalProperty(properties, condition, 'ConfigurationType', - msbuild_attributes['ConfigurationType']) + config_type) + if config_type == 'Driver': + _AddConditionalProperty(properties, condition, 'DriverType', 'WDM') + _AddConditionalProperty(properties, condition, 'TargetVersion', + _ConfigTargetVersion(settings)) if character_set: if 'msvs_enable_winrt' not in spec : _AddConditionalProperty(properties, condition, 'CharacterSet', @@ -2816,6 +2833,7 @@ '1': 'Application', '2': 'DynamicLibrary', '4': 'StaticLibrary', + '5': 'Driver', '10': 'Utility' }[config_type] return config_type @@ -2855,6 +2873,7 @@ 'executable': 'Link', 'shared_library': 'Link', 'loadable_module': 'Link', + 'windows_driver': 'Link', 'static_library': 'Lib', } msbuild_tool = msbuild_tool_map.get(spec['type']) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/pylib/gyp/generator/ninja.py new/gyp-0+git.20160810/pylib/gyp/generator/ninja.py --- old/gyp-0+git.20160620/pylib/gyp/generator/ninja.py 2016-07-06 14:15:59.000000000 +0200 +++ new/gyp-0+git.20160810/pylib/gyp/generator/ninja.py 2016-08-10 22:13:45.000000000 +0200 @@ -148,6 +148,9 @@ # because dependents only link against the lib (not both the lib and the # dll) we keep track of the import library here. self.import_lib = None + # Track if this target contains any C++ files, to decide if gcc or g++ + # should be used for linking. + self.uses_cpp = False def Linkable(self): """Return true if this is a target that can be linked against.""" @@ -375,9 +378,6 @@ self.target = Target(spec['type']) self.is_standalone_static_library = bool( spec.get('standalone_static_library', 0)) - # Track if this target contains any C++ files, to decide if gcc or g++ - # should be used for linking. - self.uses_cpp = False self.target_rpath = generator_flags.get('target_rpath', r'\$$ORIGIN/lib/') @@ -425,6 +425,8 @@ target = self.target_outputs[dep] actions_depends.append(target.PreActionInput(self.flavor)) compile_depends.append(target.PreCompileInput()) + if target.uses_cpp: + self.target.uses_cpp = True actions_depends = filter(None, actions_depends) compile_depends = filter(None, compile_depends) actions_depends = self.WriteCollapsedDependencies('actions_depends', @@ -450,7 +452,12 @@ # Write out the compilation steps, if any. link_deps = [] - sources = extra_sources + spec.get('sources', []) + try: + sources = extra_sources + spec.get('sources', []) + except TypeError: + print 'extra_sources: ', str(extra_sources) + print 'spec.get("sources"): ', str(spec.get('sources')) + raise if sources: if self.flavor == 'mac' and len(self.archs) > 1: # Write subninja file containing compile and link commands scoped to @@ -1027,7 +1034,7 @@ obj_ext = self.obj_ext if ext in ('cc', 'cpp', 'cxx'): command = 'cxx' - self.uses_cpp = True + self.target.uses_cpp = True elif ext == 'c' or (ext == 'S' and self.flavor != 'win'): command = 'cc' elif ext == 's' and self.flavor != 'win': # Doesn't generate .o.d files. @@ -1042,7 +1049,7 @@ command = 'objc' elif self.flavor == 'mac' and ext == 'mm': command = 'objcxx' - self.uses_cpp = True + self.target.uses_cpp = True elif self.flavor == 'win' and ext == 'rc': command = 'rc' obj_ext = '.res' @@ -1178,7 +1185,7 @@ implicit_deps.add(final_output) extra_bindings = [] - if self.uses_cpp and self.flavor != 'win': + if self.target.uses_cpp and self.flavor != 'win': extra_bindings.append(('ld', '$ldxx')) output = self.ComputeOutput(spec, arch) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/pylib/gyp/input.py new/gyp-0+git.20160810/pylib/gyp/input.py --- old/gyp-0+git.20160620/pylib/gyp/input.py 2016-07-06 14:15:59.000000000 +0200 +++ new/gyp-0+git.20160810/pylib/gyp/input.py 2016-08-10 22:13:45.000000000 +0200 @@ -33,6 +33,7 @@ 'shared_library', 'loadable_module', 'mac_kernel_extension', + 'windows_driver', ] # A list of sections that contain links to other targets. @@ -1734,12 +1735,13 @@ dependencies.add(self.ref) return dependencies - # Executables, mac kernel extensions and loadable modules are already fully - # and finally linked. Nothing else can be a link dependency of them, there - # can only be dependencies in the sense that a dependent target might run - # an executable or load the loadable_module. + # Executables, mac kernel extensions, windows drivers and loadable modules + # are already fully and finally linked. Nothing else can be a link + # dependency of them, there can only be dependencies in the sense that a + # dependent target might run an executable or load the loadable_module. if not initial and target_type in ('executable', 'loadable_module', - 'mac_kernel_extension'): + 'mac_kernel_extension', + 'windows_driver'): return dependencies # Shared libraries are already fully linked. They should only be included @@ -2490,7 +2492,7 @@ """ VALID_TARGET_TYPES = ('executable', 'loadable_module', 'static_library', 'shared_library', - 'mac_kernel_extension', 'none') + 'mac_kernel_extension', 'none', 'windows_driver') target_type = target_dict.get('type', None) if target_type not in VALID_TARGET_TYPES: raise GypError("Target %s has an invalid target type '%s'. " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/pylib/gyp/mac_tool.py new/gyp-0+git.20160810/pylib/gyp/mac_tool.py --- old/gyp-0+git.20160620/pylib/gyp/mac_tool.py 2016-07-06 14:15:59.000000000 +0200 +++ new/gyp-0+git.20160810/pylib/gyp/mac_tool.py 2016-08-10 22:13:45.000000000 +0200 @@ -49,6 +49,7 @@ def ExecCopyBundleResource(self, source, dest, convert_to_binary): """Copies a resource file to the bundle/Resources directory, performing any necessary compilation on each resource.""" + convert_to_binary = convert_to_binary == 'True' extension = os.path.splitext(source)[1].lower() if os.path.isdir(source): # Copy tree. @@ -62,14 +63,14 @@ return self._CopyXIBFile(source, dest) elif extension == '.storyboard': return self._CopyXIBFile(source, dest) - elif extension == '.strings': + elif extension == '.strings' and not convert_to_binary: self._CopyStringsFile(source, dest) else: if os.path.exists(dest): os.unlink(dest) shutil.copy(source, dest) - if extension in ('.plist', '.strings') and convert_to_binary == 'True': + if convert_to_binary and extension in ('.plist', '.strings'): self._ConvertToBinary(dest) def _CopyXIBFile(self, source, dest): @@ -174,7 +175,7 @@ # Go through all the environment variables and replace them as variables in # the file. - IDENT_RE = re.compile(r'[/\s]') + IDENT_RE = re.compile(r'[_/\s]') for key in os.environ: if key.startswith('_'): continue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/pylib/gyp/xcode_emulation.py new/gyp-0+git.20160810/pylib/gyp/xcode_emulation.py --- old/gyp-0+git.20160620/pylib/gyp/xcode_emulation.py 2016-07-06 14:15:59.000000000 +0200 +++ new/gyp-0+git.20160810/pylib/gyp/xcode_emulation.py 2016-08-10 22:13:45.000000000 +0200 @@ -312,6 +312,56 @@ return self.GetBundleContentsFolderPath() return os.path.join(self.GetBundleContentsFolderPath(), 'Resources') + def GetBundleExecutableFolderPath(self): + """Returns the qualified path to the bundle's executables folder. E.g. + Chromium.app/Contents/MacOS. Only valid for bundles.""" + assert self._IsBundle() + if self.spec['type'] in ('shared_library') or self.isIOS: + return self.GetBundleContentsFolderPath() + elif self.spec['type'] in ('executable', 'loadable_module'): + return os.path.join(self.GetBundleContentsFolderPath(), 'MacOS') + + def GetBundleJavaFolderPath(self): + """Returns the qualified path to the bundle's Java resource folder. + E.g. Chromium.app/Contents/Resources/Java. Only valid for bundles.""" + assert self._IsBundle() + return os.path.join(self.GetBundleResourceFolder(), 'Java') + + def GetBundleFrameworksFolderPath(self): + """Returns the qualified path to the bundle's frameworks folder. E.g, + Chromium.app/Contents/Frameworks. Only valid for bundles.""" + assert self._IsBundle() + return os.path.join(self.GetBundleContentsFolderPath(), 'Frameworks') + + def GetBundleSharedFrameworksFolderPath(self): + """Returns the qualified path to the bundle's frameworks folder. E.g, + Chromium.app/Contents/SharedFrameworks. Only valid for bundles.""" + assert self._IsBundle() + return os.path.join(self.GetBundleContentsFolderPath(), + 'SharedFrameworks') + + def GetBundleSharedSupportFolderPath(self): + """Returns the qualified path to the bundle's shared support folder. E.g, + Chromium.app/Contents/SharedSupport. Only valid for bundles.""" + assert self._IsBundle() + if self.spec['type'] == 'shared_library': + return self.GetBundleResourceFolder() + else: + return os.path.join(self.GetBundleContentsFolderPath(), + 'SharedSupport') + + def GetBundlePlugInsFolderPath(self): + """Returns the qualified path to the bundle's plugins folder. E.g, + Chromium.app/Contents/PlugIns. Only valid for bundles.""" + assert self._IsBundle() + return os.path.join(self.GetBundleContentsFolderPath(), 'PlugIns') + + def GetBundleXPCServicesFolderPath(self): + """Returns the qualified path to the bundle's XPC services folder. E.g, + Chromium.app/Contents/XPCServices. Only valid for bundles.""" + assert self._IsBundle() + return os.path.join(self.GetBundleContentsFolderPath(), 'XPCServices') + def GetBundlePlistPath(self): """Returns the qualified path to the bundle's plist file. E.g. Chromium.app/Contents/Info.plist. Only valid for bundles.""" @@ -371,11 +421,8 @@ """Returns the name of the bundle binary of by this target. E.g. Chromium.app/Contents/MacOS/Chromium. Only valid for bundles.""" assert self._IsBundle() - if self.spec['type'] in ('shared_library') or self.isIOS: - path = self.GetBundleContentsFolderPath() - elif self.spec['type'] in ('executable', 'loadable_module'): - path = os.path.join(self.GetBundleContentsFolderPath(), 'MacOS') - return os.path.join(path, self.GetExecutableName()) + return os.path.join(self.GetBundleExecutableFolderPath(), \ + self.GetExecutableName()) def _GetStandaloneExecutableSuffix(self): if 'product_extension' in self.spec: @@ -426,8 +473,8 @@ return self._GetStandaloneBinaryPath() def GetExecutablePath(self): - """Returns the directory name of the bundle represented by this target. E.g. - Chromium.app/Contents/MacOS/Chromium.""" + """Returns the qualified path to the primary executable of the bundle + represented by this target. E.g. Chromium.app/Contents/MacOS/Chromium.""" if self._IsBundle(): return self._GetBundleBinaryPath() else: @@ -1541,13 +1588,14 @@ additional_settings: An optional dict with more values to add to the result. """ + if not xcode_settings: return {} # This function is considered a friend of XcodeSettings, so let it reach into # its implementation details. spec = xcode_settings.spec - # These are filled in on a as-needed basis. + # These are filled in on an as-needed basis. env = { 'BUILT_FRAMEWORKS_DIR' : built_products_dir, 'BUILT_PRODUCTS_DIR' : built_products_dir, @@ -1580,10 +1628,27 @@ env['MACH_O_TYPE'] = mach_o_type env['PRODUCT_TYPE'] = xcode_settings.GetProductType() if xcode_settings._IsBundle(): + # xcodeproj_file.py sets the same Xcode subfolder value for this as for + # FRAMEWORKS_FOLDER_PATH so Xcode builds will actually use FFP's value. + env['BUILT_FRAMEWORKS_DIR'] = \ + os.path.join(built_products_dir + os.sep \ + + xcode_settings.GetBundleFrameworksFolderPath()) env['CONTENTS_FOLDER_PATH'] = \ - xcode_settings.GetBundleContentsFolderPath() + xcode_settings.GetBundleContentsFolderPath() + env['EXECUTABLE_FOLDER_PATH'] = \ + xcode_settings.GetBundleExecutableFolderPath() env['UNLOCALIZED_RESOURCES_FOLDER_PATH'] = \ xcode_settings.GetBundleResourceFolder() + env['JAVA_FOLDER_PATH'] = xcode_settings.GetBundleJavaFolderPath() + env['FRAMEWORKS_FOLDER_PATH'] = \ + xcode_settings.GetBundleFrameworksFolderPath() + env['SHARED_FRAMEWORKS_FOLDER_PATH'] = \ + xcode_settings.GetBundleSharedFrameworksFolderPath() + env['SHARED_SUPPORT_FOLDER_PATH'] = \ + xcode_settings.GetBundleSharedSupportFolderPath() + env['PLUGINS_FOLDER_PATH'] = xcode_settings.GetBundlePlugInsFolderPath() + env['XPCSERVICES_FOLDER_PATH'] = \ + xcode_settings.GetBundleXPCServicesFolderPath() env['INFOPLIST_PATH'] = xcode_settings.GetBundlePlistPath() env['WRAPPER_NAME'] = xcode_settings.GetWrapperName() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/pylib/gyp/xcodeproj_file.py new/gyp-0+git.20160810/pylib/gyp/xcodeproj_file.py --- old/gyp-0+git.20160620/pylib/gyp/xcodeproj_file.py 2016-07-06 14:15:59.000000000 +0200 +++ new/gyp-0+git.20160810/pylib/gyp/xcodeproj_file.py 2016-08-10 22:13:45.000000000 +0200 @@ -1945,24 +1945,40 @@ 'name': [0, str, 0, 0], }) - # path_tree_re matches "$(DIR)/path" or just "$(DIR)". Match group 1 is - # "DIR", match group 3 is "path" or None. - path_tree_re = re.compile('^\\$\$(.*)\$(/(.*)|)$') - - # path_tree_to_subfolder maps names of Xcode variables to the associated - # dstSubfolderSpec property value used in a PBXCopyFilesBuildPhase object. - path_tree_to_subfolder = { - 'BUILT_FRAMEWORKS_DIR': 10, # Frameworks Directory - 'BUILT_PRODUCTS_DIR': 16, # Products Directory - # Other types that can be chosen via the Xcode UI. - # TODO(mark): Map Xcode variable names to these. - # : 1, # Wrapper - # : 6, # Executables: 6 - # : 7, # Resources - # : 15, # Java Resources - # : 11, # Shared Frameworks - # : 12, # Shared Support - # : 13, # PlugIns + # path_tree_re matches "$(DIR)/path", "$(DIR)/$(DIR2)/path" or just "$(DIR)". + # Match group 1 is "DIR", group 3 is "path" or "$(DIR2") or "$(DIR2)/path" + # or None. If group 3 is "path", group 4 will be None otherwise group 4 is + # "DIR2" and group 6 is "path". + path_tree_re = re.compile(r'^\$$(.*?)$(/(\$$(.*?)$(/(.*)|)|(.*)|)|)$') + + # path_tree_{first,second}_to_subfolder map names of Xcode variables to the + # associated dstSubfolderSpec property value used in a PBXCopyFilesBuildPhase + # object. + path_tree_first_to_subfolder = { + # Types that can be chosen via the Xcode UI. + 'BUILT_PRODUCTS_DIR': 16, # Products Directory + 'BUILT_FRAMEWORKS_DIR': 10, # Not an official Xcode macro. + # Existed before support for the + # names below was added. Maps to + # "Frameworks". + } + + path_tree_second_to_subfolder = { + 'WRAPPER_NAME': 1, # Wrapper + # Although Xcode's friendly name is "Executables", the destination + # is demonstrably the value of the build setting + # EXECUTABLE_FOLDER_PATH not EXECUTABLES_FOLDER_PATH. + 'EXECUTABLE_FOLDER_PATH': 6, # Executables. + 'UNLOCALIZED_RESOURCES_FOLDER_PATH': 7, # Resources + 'JAVA_FOLDER_PATH': 15, # Java Resources + 'FRAMEWORKS_FOLDER_PATH': 10, # Frameworks + 'SHARED_FRAMEWORKS_FOLDER_PATH': 11, # Shared Frameworks + 'SHARED_SUPPORT_FOLDER_PATH': 12, # Shared Support + 'PLUGINS_FOLDER_PATH': 13, # PlugIns + # For XPC Services, Xcode sets both dstPath and dstSubfolderSpec. + # Note that it re-uses the BUILT_PRODUCTS_DIR value for + # dstSubfolderSpec. dstPath is set below. + 'XPCSERVICES_FOLDER_PATH': 16, # XPC Services. } def Name(self): @@ -1983,14 +1999,61 @@ path_tree_match = self.path_tree_re.search(path) if path_tree_match: - # Everything else needs to be relative to an Xcode variable. - path_tree = path_tree_match.group(1) - relative_path = path_tree_match.group(3) - - if path_tree in self.path_tree_to_subfolder: - subfolder = self.path_tree_to_subfolder[path_tree] + path_tree = path_tree_match.group(1); + if path_tree in self.path_tree_first_to_subfolder: + subfolder = self.path_tree_first_to_subfolder[path_tree] + relative_path = path_tree_match.group(3) if relative_path is None: relative_path = '' + + if subfolder == 16 and path_tree_match.group(4) is not None: + # BUILT_PRODUCTS_DIR (16) is the first element in a path whose + # second element is possibly one of the variable names in + # path_tree_second_to_subfolder. Xcode sets the values of all these + # variables to relative paths so .gyp files must prefix them with + # BUILT_PRODUCTS_DIR, e.g. + # $(BUILT_PRODUCTS_DIR)/$(PLUGINS_FOLDER_PATH). Then + # xcode_emulation.py can export these variables with the same values + # as Xcode yet make & ninja files can determine the absolute path + # to the target. Xcode uses the dstSubfolderSpec value set here + # to determine the full path. + # + # An alternative of xcode_emulation.py setting the values to absolute + # paths when exporting these variables has been ruled out because + # then the values would be different depending on the build tool. + # + # Another alternative is to invent new names for the variables used + # to match to the subfolder indices in the second table. .gyp files + # then will not need to prepend $(BUILT_PRODUCTS_DIR) because + # xcode_emulation.py can set the values of those variables to + # the absolute paths when exporting. This is possibly the thinking + # behind BUILT_FRAMEWORKS_DIR which is used in exactly this manner. + # + # Requiring prepending BUILT_PRODUCTS_DIR has been chosen because + # this same way could be used to specify destinations in .gyp files + # that pre-date this addition to GYP. However they would only work + # with the Xcode generator. The previous version of xcode_emulation.py + # does not export these variables. Such files will get the benefit + # of the Xcode UI showing the proper destination name simply by + # regenerating the projects with this version of GYP. + path_tree = path_tree_match.group(4) + relative_path = path_tree_match.group(6) + separator = '/' + + if path_tree in self.path_tree_second_to_subfolder: + subfolder = self.path_tree_second_to_subfolder[path_tree] + if relative_path is None: + relative_path = '' + separator = '' + if path_tree == 'XPCSERVICES_FOLDER_PATH': + relative_path = '$(CONTENTS_FOLDER_PATH)/XPCServices' \ + + separator + relative_path + else: + # subfolder = 16 from above + # The second element of the path is an unrecognized variable. + # Include it and any remaining elements in relative_path. + relative_path = path_tree_match.group(3); + else: # The path starts with an unrecognized Xcode variable # name like $(SRCROOT). Xcode will still handle this diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/Info.plist new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/Info.plist --- old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/Info.plist 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/Info.plist 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>${EXECUTABLE_NAME}</string> + <key>CFBundleIdentifier</key> + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>${PRODUCT_NAME}</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>1.0</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleVersion</key> + <string>1</string> +</dict> +</plist> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/copies-with-xcode-envvars.gyp new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/copies-with-xcode-envvars.gyp --- old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/copies-with-xcode-envvars.gyp 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/copies-with-xcode-envvars.gyp 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1,97 @@ +# Copyright (c) 2016 Mark Callow. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +# For testing use of the UI settings & environment variables +# available in Xcode's PBXCopyFilesBuildPhase. +{ + 'targets': [ + { + 'target_name': 'copies-with-xcode-envvars', + 'type': 'executable', + 'mac_bundle': 1, + 'xcode_settings': { + 'SDKROOT': 'iphoneos', + 'TARGETED_DEVICE_FAMILY': '1,2', + 'IPHONEOS_DEPLOYMENT_TARGET': '7.0', + 'CODE_SIGNING_REQUIRED': 'NO', + 'INFOPLIST_FILE': 'Info.plist', + # This is where the test framework looks for results. Without + # this line the result will be in build/Default-iphoneos. + 'CONFIGURATION_BUILD_DIR':'build/Default', + }, + 'sources': [ 'empty.c' ], + 'conditions': [ + ['OS == "ios" or OS == "mac"', { + 'copies': [{ + 'destination': '$(BUILT_PRODUCTS_DIR)', + 'files': [ + 'file0', + ], + }, { + 'destination': '$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)', + 'files': [ + 'file1', + ], + }, { + 'destination': '<(PRODUCT_DIR)/$(EXECUTABLE_FOLDER_PATH)', + 'files': [ + 'file2', + ], + }, { + 'destination': '<(PRODUCT_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)', + 'files': [ + 'file3', + ], + }, { + 'destination': '<(PRODUCT_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/testimages', + 'files': [ + 'file4', + ], + }, { + 'destination': '$(BUILT_PRODUCTS_DIR)/$(JAVA_FOLDER_PATH)', + 'files': [ + 'file5', + ], + }, { + 'destination': '<(PRODUCT_DIR)/$(FRAMEWORKS_FOLDER_PATH)', + 'files': [ + 'file6', + ], + }, { + # NOTE: This is not an Xcode macro name but + # xcodeproj_file.py recognizes it and sends + # the output to the same place as + # $(FRAMEWORKS_FOLDER_PATH). xcode_emulation.py + # sets its value to an absolute path. + 'destination': '$(BUILT_FRAMEWORKS_DIR)', + 'files': [ + 'file7', + ], + }, { + 'destination': '<(PRODUCT_DIR)/$(SHARED_FRAMEWORKS_FOLDER_PATH)', + 'files': [ + 'file8', + ], + }, { + 'destination': '<(PRODUCT_DIR)/$(SHARED_SUPPORT_FOLDER_PATH)', + 'files': [ + 'file9', + ], + }, { + 'destination': '<(PRODUCT_DIR)/$(PLUGINS_FOLDER_PATH)', + 'files': [ + 'file10', + ], + }, { + 'destination': '<(PRODUCT_DIR)/$(XPCSERVICES_FOLDER_PATH)', + 'files': [ + 'file11', + ], + }], # copies + }], # OS == "ios" or OS == "mac" + ], # conditions + }], # targets +} + +# vim:ai:ts=4:sts=4:sw=2:expandtab:textwidth=70 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/empty.c new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/empty.c --- old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/empty.c 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/empty.c 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +int main() {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file0 new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file0 --- old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file0 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file0 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file0 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file1 new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file1 --- old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file1 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file1 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file1 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file10 new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file10 --- old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file10 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file10 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file10 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file11 new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file11 --- old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file11 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file11 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file11 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file2 new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file2 --- old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file2 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file2 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file2 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file3 new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file3 --- old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file3 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file3 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file3 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file4 new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file4 --- old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file4 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file4 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file4 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file5 new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file5 --- old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file5 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file5 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file5 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file6 new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file6 --- old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file6 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file6 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file6 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file7 new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file7 --- old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file7 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file7 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file7 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file8 new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file8 --- old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file8 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file8 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file8 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file9 new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file9 --- old/gyp-0+git.20160620/test/ios/copies-with-xcode-envvars/file9 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/ios/copies-with-xcode-envvars/file9 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file9 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/ios/gyptest-copies-with-xcode-envvars.py new/gyp-0+git.20160810/test/ios/gyptest-copies-with-xcode-envvars.py --- old/gyp-0+git.20160620/test/ios/gyptest-copies-with-xcode-envvars.py 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/ios/gyptest-copies-with-xcode-envvars.py 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1,65 @@ +#!/usr/bin/env python + +# Copyright (c) 2016 Mark Callow. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +""" +Verifies that files are copied to the correct destinations when those +destinations are specified using environment variables available in +Xcode's PBXCopyFilesBuildPhase. +""" + +import TestGyp + +import os +import stat +import sys + + +test = TestGyp.TestGyp(formats=['ninja', 'xcode']) + +if sys.platform == 'darwin': + test.run_gyp('copies-with-xcode-envvars.gyp', + chdir='copies-with-xcode-envvars') + + test.build('copies-with-xcode-envvars.gyp', chdir='copies-with-xcode-envvars') + + wrapper_name = 'copies-with-xcode-envvars.app/' + contents_path = wrapper_name + out_path = test.built_file_path('file0', chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file0 contents\n') + out_path = test.built_file_path(wrapper_name + 'file1', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file1 contents\n') + out_path = test.built_file_path(contents_path + 'file2', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file2 contents\n') + out_path = test.built_file_path(contents_path + 'file3', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file3 contents\n') + out_path = test.built_file_path(contents_path + 'testimages/file4', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file4 contents\n') + out_path = test.built_file_path(contents_path + 'Java/file5', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file5 contents\n') + out_path = test.built_file_path(contents_path + 'Frameworks/file6', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file6 contents\n') + out_path = test.built_file_path(contents_path + 'Frameworks/file7', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file7 contents\n') + out_path = test.built_file_path(contents_path + 'SharedFrameworks/file8', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file8 contents\n') + out_path = test.built_file_path(contents_path + 'SharedSupport/file9', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file9 contents\n') + out_path = test.built_file_path(contents_path + 'PlugIns/file10', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file10 contents\n') + out_path = test.built_file_path(contents_path + 'XPCServices/file11', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file11 contents\n') + test.pass_test() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/copies-with-xcode-envvars.gyp new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/copies-with-xcode-envvars.gyp --- old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/copies-with-xcode-envvars.gyp 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/copies-with-xcode-envvars.gyp 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1,87 @@ +# Copyright (c) 2016 Mark Callow. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +# For testing use of the UI settings & environment variables +# available in Xcode's PBXCopyFilesBuildPhase. +{ +'targets': [ + { + 'target_name': 'copies-with-xcode-envvars', + 'type': 'executable', + 'mac_bundle': 1, + 'sources': [ 'empty.c' ], + 'conditions': [ + ['OS == "ios" or OS == "mac"', { + 'copies': [{ + 'destination': '$(BUILT_PRODUCTS_DIR)', + 'files': [ + 'file0', + ], + }, { + 'destination': '$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)', + 'files': [ + 'file1', + ], + }, { + 'destination': '<(PRODUCT_DIR)/$(EXECUTABLE_FOLDER_PATH)', + 'files': [ + 'file2', + ], + }, { + 'destination': '<(PRODUCT_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)', + 'files': [ + 'file3', + ], + }, { + 'destination': '<(PRODUCT_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/testimages', + 'files': [ + 'file4', + ], + }, { + 'destination': '$(BUILT_PRODUCTS_DIR)/$(JAVA_FOLDER_PATH)', + 'files': [ + 'file5', + ], + }, { + 'destination': '<(PRODUCT_DIR)/$(FRAMEWORKS_FOLDER_PATH)', + 'files': [ + 'file6', + ], + }, { + # NOTE: This is not an Xcode macro name but + # xcodeproj_file.py recognizes it and sends + # the output to the same place as + # $(FRAMEWORKS_FOLDER_PATH). xcode_emulation.py + # sets its value to an absolute path. + 'destination': '$(BUILT_FRAMEWORKS_DIR)', + 'files': [ + 'file7', + ], + }, { + 'destination': '<(PRODUCT_DIR)/$(SHARED_FRAMEWORKS_FOLDER_PATH)', + 'files': [ + 'file8', + ], + }, { + 'destination': '<(PRODUCT_DIR)/$(SHARED_SUPPORT_FOLDER_PATH)', + 'files': [ + 'file9', + ], + }, { + 'destination': '<(PRODUCT_DIR)/$(PLUGINS_FOLDER_PATH)', + 'files': [ + 'file10', + ], + }, { + 'destination': '<(PRODUCT_DIR)/$(XPCSERVICES_FOLDER_PATH)', + 'files': [ + 'file11', + ], + }], # copies + }], # OS == "ios" or OS == "mac" + ], # conditions + }], # targets +} + +# vim:ai:ts=4:sts=4:sw=2:expandtab:textwidth=70 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/empty.c new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/empty.c --- old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/empty.c 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/empty.c 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +int main() {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file0 new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file0 --- old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file0 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file0 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file0 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file1 new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file1 --- old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file1 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file1 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file1 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file10 new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file10 --- old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file10 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file10 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file10 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file11 new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file11 --- old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file11 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file11 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file11 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file2 new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file2 --- old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file2 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file2 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file2 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file3 new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file3 --- old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file3 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file3 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file3 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file4 new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file4 --- old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file4 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file4 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file4 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file5 new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file5 --- old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file5 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file5 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file5 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file6 new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file6 --- old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file6 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file6 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file6 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file7 new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file7 --- old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file7 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file7 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file7 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file8 new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file8 --- old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file8 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file8 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file8 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file9 new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file9 --- old/gyp-0+git.20160620/test/mac/copies-with-xcode-envvars/file9 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/mac/copies-with-xcode-envvars/file9 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1 @@ +file9 contents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/gyptest-copies-with-xcode-envvars.py new/gyp-0+git.20160810/test/mac/gyptest-copies-with-xcode-envvars.py --- old/gyp-0+git.20160620/test/mac/gyptest-copies-with-xcode-envvars.py 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/mac/gyptest-copies-with-xcode-envvars.py 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1,65 @@ +#!/usr/bin/env python + +# Copyright (c) 2016 Mark Callow. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +""" +Verifies that files are copied to the correct destinations when those +destinations are specified using environment variables available in +Xcode's PBXCopyFilesBuildPhase. +""" + +import TestGyp + +import os +import stat +import sys + + +test = TestGyp.TestGyp(formats=['make', 'ninja', 'xcode']) + +if sys.platform == 'darwin': + test.run_gyp('copies-with-xcode-envvars.gyp', + chdir='copies-with-xcode-envvars') + + test.build('copies-with-xcode-envvars.gyp', chdir='copies-with-xcode-envvars') + + wrapper_name = 'copies-with-xcode-envvars.app/' + contents_path = wrapper_name + 'Contents/' + out_path = test.built_file_path('file0', chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file0 contents\n') + out_path = test.built_file_path(wrapper_name + 'file1', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file1 contents\n') + out_path = test.built_file_path(contents_path + 'MacOS/file2', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file2 contents\n') + out_path = test.built_file_path(contents_path + 'Resources/file3', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file3 contents\n') + out_path = test.built_file_path(contents_path + 'Resources/testimages/file4', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file4 contents\n') + out_path = test.built_file_path(contents_path + 'Resources/Java/file5', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file5 contents\n') + out_path = test.built_file_path(contents_path + 'Frameworks/file6', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file6 contents\n') + out_path = test.built_file_path(contents_path + 'Frameworks/file7', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file7 contents\n') + out_path = test.built_file_path(contents_path + 'SharedFrameworks/file8', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file8 contents\n') + out_path = test.built_file_path(contents_path + 'SharedSupport/file9', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file9 contents\n') + out_path = test.built_file_path(contents_path + 'PlugIns/file10', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file10 contents\n') + out_path = test.built_file_path(contents_path + 'XPCServices/file11', + chdir='copies-with-xcode-envvars') + test.must_contain(out_path, 'file11 contents\n') + test.pass_test() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/type_envvars/test_bundle_executable.sh new/gyp-0+git.20160810/test/mac/type_envvars/test_bundle_executable.sh --- old/gyp-0+git.20160620/test/mac/type_envvars/test_bundle_executable.sh 2016-07-06 14:15:59.000000000 +0200 +++ new/gyp-0+git.20160810/test/mac/type_envvars/test_bundle_executable.sh 2016-08-10 22:13:45.000000000 +0200 @@ -14,6 +14,16 @@ test "${EXECUTABLE_PATH}" = "My App.app/Contents/MacOS/My App" test "${WRAPPER_NAME}" = "My App.app" +test "${CONTENTS_FOLDER_PATH}" = "My App.app/Contents" +test "${EXECUTABLE_FOLDER_PATH}" = "My App.app/Contents/MacOS" +test "${UNLOCALIZED_RESOURCES_FOLDER_PATH}" = "My App.app/Contents/Resources" +test "${JAVA_FOLDER_PATH}" = "My App.app/Contents/Resources/Java" +test "${FRAMEWORKS_FOLDER_PATH}" = "My App.app/Contents/Frameworks" +test "${SHARED_FRAMEWORKS_FOLDER_PATH}" = "My App.app/Contents/SharedFrameworks" +test "${SHARED_SUPPORT_FOLDER_PATH}" = "My App.app/Contents/SharedSupport" +test "${PLUGINS_FOLDER_PATH}" = "My App.app/Contents/PlugIns" +test "${XPCSERVICES_FOLDER_PATH}" = "My App.app/Contents/XPCServices" + [[ ! $DYLIB_INSTALL_NAME_BASE && ${DYLIB_INSTALL_NAME_BASE-_} ]] [[ ! $LD_DYLIB_INSTALL_NAME && ${LD_DYLIB_INSTALL_NAME-_} ]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/type_envvars/test_bundle_loadable_module.sh new/gyp-0+git.20160810/test/mac/type_envvars/test_bundle_loadable_module.sh --- old/gyp-0+git.20160620/test/mac/type_envvars/test_bundle_loadable_module.sh 2016-07-06 14:15:59.000000000 +0200 +++ new/gyp-0+git.20160810/test/mac/type_envvars/test_bundle_loadable_module.sh 2016-08-10 22:13:45.000000000 +0200 @@ -15,6 +15,20 @@ "bundle_loadable_module.bundle/Contents/MacOS/bundle_loadable_module" test $WRAPPER_NAME = bundle_loadable_module.bundle +test $CONTENTS_FOLDER_PATH = bundle_loadable_module.bundle/Contents +test $EXECUTABLE_FOLDER_PATH = bundle_loadable_module.bundle/Contents/MacOS +test $UNLOCALIZED_RESOURCES_FOLDER_PATH = \ + bundle_loadable_module.bundle/Contents/Resources +test $JAVA_FOLDER_PATH = bundle_loadable_module.bundle/Contents/Resources/Java +test $FRAMEWORKS_FOLDER_PATH = bundle_loadable_module.bundle/Contents/Frameworks +test $SHARED_FRAMEWORKS_FOLDER_PATH = \ + bundle_loadable_module.bundle/Contents/SharedFrameworks +test $SHARED_SUPPORT_FOLDER_PATH = \ + bundle_loadable_module.bundle/Contents/SharedSupport +test $PLUGINS_FOLDER_PATH = bundle_loadable_module.bundle/Contents/PlugIns +test $XPCSERVICES_FOLDER_PATH = \ + bundle_loadable_module.bundle/Contents/XPCServices + [[ ! $DYLIB_INSTALL_NAME_BASE && ${DYLIB_INSTALL_NAME_BASE-_} ]] [[ ! $LD_DYLIB_INSTALL_NAME && ${LD_DYLIB_INSTALL_NAME-_} ]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/type_envvars/test_bundle_shared_library.sh new/gyp-0+git.20160810/test/mac/type_envvars/test_bundle_shared_library.sh --- old/gyp-0+git.20160620/test/mac/type_envvars/test_bundle_shared_library.sh 2016-07-06 14:15:59.000000000 +0200 +++ new/gyp-0+git.20160810/test/mac/type_envvars/test_bundle_shared_library.sh 2016-08-10 22:13:45.000000000 +0200 @@ -15,6 +15,22 @@ "bundle_shared_library.framework/Versions/A/bundle_shared_library" test $WRAPPER_NAME = bundle_shared_library.framework +test $CONTENTS_FOLDER_PATH = bundle_shared_library.framework/Versions/A +test $EXECUTABLE_FOLDER_PATH = bundle_shared_library.framework/Versions/A +test $UNLOCALIZED_RESOURCES_FOLDER_PATH = \ + bundle_shared_library.framework/Versions/A/Resources +test $JAVA_FOLDER_PATH = \ + bundle_shared_library.framework/Versions/A/Resources/Java +test $FRAMEWORKS_FOLDER_PATH = \ + bundle_shared_library.framework/Versions/A/Frameworks +test $SHARED_FRAMEWORKS_FOLDER_PATH = \ + bundle_shared_library.framework/Versions/A/SharedFrameworks +test $SHARED_SUPPORT_FOLDER_PATH = \ + bundle_shared_library.framework/Versions/A/Resources +test $PLUGINS_FOLDER_PATH = bundle_shared_library.framework/Versions/A/PlugIns +test $XPCSERVICES_FOLDER_PATH = \ + bundle_shared_library.framework/Versions/A/XPCServices + test $DYLIB_INSTALL_NAME_BASE = "/Library/Frameworks" test $LD_DYLIB_INSTALL_NAME = \ "/Library/Frameworks/bundle_shared_library.framework/Versions/A/bundle_shared_library" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/type_envvars/test_nonbundle_executable.sh new/gyp-0+git.20160810/test/mac/type_envvars/test_nonbundle_executable.sh --- old/gyp-0+git.20160620/test/mac/type_envvars/test_nonbundle_executable.sh 2016-07-06 14:15:59.000000000 +0200 +++ new/gyp-0+git.20160810/test/mac/type_envvars/test_nonbundle_executable.sh 2016-08-10 22:13:45.000000000 +0200 @@ -16,6 +16,17 @@ test $EXECUTABLE_PATH = nonbundle_executable [[ ! $WRAPPER_NAME && ${WRAPPER_NAME-_} ]] +[[ ! $CONTENTS_FOLDER_PATH && ${CONTENTS_FOLDER_PATH-_} ]] +[[ ! $EXECUTABLE_FOLDER_PATH && ${EXECUTABLE_FOLDER_PATH-_} ]] +[[ ! $UNLOCALIZED_RESOURCES_FOLDER_PATH \ + && ${UNLOCALIZED_RESOURCES_FOLDER_PATH-_} ]] +[[ ! $JAVA_FOLDER_PATH && ${JAVA_FOLDER_PATH-_} ]] +[[ ! $FRAMEWORKS_FOLDER_PATH && ${FRAMEWORKS_FOLDER_PATH-_} ]] +[[ ! $SHARED_FRAMEWORKS_FOLDER_PATH && ${SHARED_FRAMEWORKS_FOLDER_PATH-_} ]] +[[ ! $SHARED_SUPPORT_FOLDER_PATH && ${SHARED_SUPPORT_FOLDER_PATH-_} ]] +[[ ! $PLUGINS_FOLDER_PATH && ${PLUGINS_FOLDER_PATH-_} ]] +[[ ! $XPCSERVICES_FOLDER_PATH && ${XPCSERVICES_FOLDER_PATH-_} ]] + [[ ! $DYLIB_INSTALL_NAME_BASE && ${DYLIB_INSTALL_NAME_BASE-_} ]] [[ ! $LD_DYLIB_INSTALL_NAME && ${LD_DYLIB_INSTALL_NAME-_} ]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/type_envvars/test_nonbundle_loadable_module.sh new/gyp-0+git.20160810/test/mac/type_envvars/test_nonbundle_loadable_module.sh --- old/gyp-0+git.20160620/test/mac/type_envvars/test_nonbundle_loadable_module.sh 2016-07-06 14:15:59.000000000 +0200 +++ new/gyp-0+git.20160810/test/mac/type_envvars/test_nonbundle_loadable_module.sh 2016-08-10 22:13:45.000000000 +0200 @@ -14,6 +14,17 @@ test $EXECUTABLE_PATH = nonbundle_loadable_module.so [[ ! $WRAPPER_NAME && ${WRAPPER_NAME-_} ]] +[[ ! $CONTENTS_FOLDER_PATH && ${CONTENTS_FOLDER_PATH-_} ]] +[[ ! $EXECUTABLE_FOLDER_PATH && ${EXECUTABLE_FOLDER_PATH-_} ]] +[[ ! $UNLOCALIZED_RESOURCES_FOLDER_PATH \ + && ${UNLOCALIZED_RESOURCES_FOLDER_PATH-_} ]] +[[ ! $JAVA_FOLDER_PATH && ${JAVA_FOLDER_PATH-_} ]] +[[ ! $FRAMEWORKS_FOLDER_PATH && ${FRAMEWORKS_FOLDER_PATH-_} ]] +[[ ! $SHARED_FRAMEWORKS_FOLDER_PATH && ${SHARED_FRAMEWORKS_FOLDER_PATH-_} ]] +[[ ! $SHARED_SUPPORT_FOLDER_PATH && ${SHARED_SUPPORT_FOLDER_PATH-_} ]] +[[ ! $PLUGINS_FOLDER_PATH && ${PLUGINS_FOLDER_PATH-_} ]] +[[ ! $XPCSERVICES_FOLDER_PATH && ${XPCSERVICES_FOLDER_PATH-_} ]] + test $DYLIB_INSTALL_NAME_BASE = "/usr/local/lib" test $LD_DYLIB_INSTALL_NAME = "/usr/local/lib/nonbundle_loadable_module.so" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/type_envvars/test_nonbundle_none.sh new/gyp-0+git.20160810/test/mac/type_envvars/test_nonbundle_none.sh --- old/gyp-0+git.20160620/test/mac/type_envvars/test_nonbundle_none.sh 2016-07-06 14:15:59.000000000 +0200 +++ new/gyp-0+git.20160810/test/mac/type_envvars/test_nonbundle_none.sh 2016-08-10 22:13:45.000000000 +0200 @@ -15,6 +15,17 @@ [[ ! $EXECUTABLE_PATH && ${EXECUTABLE_PATH-_} ]] [[ ! $WRAPPER_NAME && ${WRAPPER_NAME-_} ]] +[[ ! $CONTENTS_FOLDER_PATH && ${CONTENTS_FOLDER_PATH-_} ]] +[[ ! $EXECUTABLE_FOLDER_PATH && ${EXECUTABLE_FOLDER_PATH-_} ]] +[[ ! $UNLOCALIZED_RESOURCES_FOLDER_PATH \ + && ${UNLOCALIZED_RESOURCES_FOLDER_PATH-_} ]] +[[ ! $JAVA_FOLDER_PATH && ${JAVA_FOLDER_PATH-_} ]] +[[ ! $FRAMEWORKS_FOLDER_PATH && ${FRAMEWORKS_FOLDER_PATH-_} ]] +[[ ! $SHARED_FRAMEWORKS_FOLDER_PATH && ${SHARED_FRAMEWORKS_FOLDER_PATH-_} ]] +[[ ! $SHARED_SUPPORT_FOLDER_PATH && ${SHARED_SUPPORT_FOLDER_PATH-_} ]] +[[ ! $PLUGINS_FOLDER_PATH && ${PLUGINS_FOLDER_PATH-_} ]] +[[ ! $XPCSERVICES_FOLDER_PATH && ${XPCSERVICES_FOLDER_PATH-_} ]] + [[ ! $DYLIB_INSTALL_NAME_BASE && ${DYLIB_INSTALL_NAME_BASE-_} ]] [[ ! $LD_DYLIB_INSTALL_NAME && ${LD_DYLIB_INSTALL_NAME-_} ]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/type_envvars/test_nonbundle_shared_library.sh new/gyp-0+git.20160810/test/mac/type_envvars/test_nonbundle_shared_library.sh --- old/gyp-0+git.20160620/test/mac/type_envvars/test_nonbundle_shared_library.sh 2016-07-06 14:15:59.000000000 +0200 +++ new/gyp-0+git.20160810/test/mac/type_envvars/test_nonbundle_shared_library.sh 2016-08-10 22:13:45.000000000 +0200 @@ -14,6 +14,17 @@ test $EXECUTABLE_PATH = libnonbundle_shared_library.dylib [[ ! $WRAPPER_NAME && ${WRAPPER_NAME-_} ]] +[[ ! $CONTENTS_FOLDER_PATH && ${CONTENTS_FOLDER_PATH-_} ]] +[[ ! $EXECUTABLE_FOLDER_PATH && ${EXECUTABLE_FOLDER_PATH-_} ]] +[[ ! $UNLOCALIZED_RESOURCES_FOLDER_PATH && \ + ${UNLOCALIZED_RESOURCES_FOLDER_PATH-_} ]] +[[ ! $JAVA_FOLDER_PATH && ${JAVA_FOLDER_PATH-_} ]] +[[ ! $FRAMEWORKS_FOLDER_PATH && ${FRAMEWORKS_FOLDER_PATH-_} ]] +[[ ! $SHARED_FRAMEWORKS_FOLDER_PATH && ${SHARED_FRAMEWORKS_FOLDER_PATH-_} ]] +[[ ! $SHARED_SUPPORT_FOLDER_PATH && ${SHARED_SUPPORT_FOLDER_PATH-_} ]] +[[ ! $PLUGINS_FOLDER_PATH && ${PLUGINS_FOLDER_PATH-_} ]] +[[ ! $XPCSERVICES_FOLDER_PATH && ${XPCSERVICES_FOLDER_PATH-_} ]] + test $DYLIB_INSTALL_NAME_BASE = "/usr/local/lib" test $LD_DYLIB_INSTALL_NAME = "/usr/local/lib/libnonbundle_shared_library.dylib" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/mac/type_envvars/test_nonbundle_static_library.sh new/gyp-0+git.20160810/test/mac/type_envvars/test_nonbundle_static_library.sh --- old/gyp-0+git.20160620/test/mac/type_envvars/test_nonbundle_static_library.sh 2016-07-06 14:15:59.000000000 +0200 +++ new/gyp-0+git.20160810/test/mac/type_envvars/test_nonbundle_static_library.sh 2016-08-10 22:13:45.000000000 +0200 @@ -14,6 +14,17 @@ test $EXECUTABLE_PATH = libnonbundle_static_library.a [[ ! $WRAPPER_NAME && ${WRAPPER_NAME-_} ]] +[[ ! $CONTENTS_FOLDER_PATH && ${CONTENTS_FOLDER_PATH-_} ]] +[[ ! $EXECUTABLE_FOLDER_PATH && ${EXECUTABLE_FOLDER_PATH-_} ]] +[[ ! $UNLOCALIZED_RESOURCES_FOLDER_PATH && \ + ${UNLOCALIZED_RESOURCES_FOLDER_PATH-_} ]] +[[ ! $JAVA_FOLDER_PATH && ${JAVA_FOLDER_PATH-_} ]] +[[ ! $FRAMEWORKS_FOLDER_PATH && ${FRAMEWORKS_FOLDER_PATH-_} ]] +[[ ! $SHARED_FRAMEWORKS_FOLDER_PATH && ${SHARED_FRAMEWORKS_FOLDER_PATH-_} ]] +[[ ! $SHARED_SUPPORT_FOLDER_PATH && ${SHARED_SUPPORT_FOLDER_PATH-_} ]] +[[ ! $PLUGINS_FOLDER_PATH && ${PLUGINS_FOLDER_PATH-_} ]] +[[ ! $XPCSERVICES_FOLDER_PATH && ${XPCSERVICES_FOLDER_PATH-_} ]] + [[ ! $DYLIB_INSTALL_NAME_BASE && ${DYLIB_INSTALL_NAME_BASE-_} ]] [[ ! $LD_DYLIB_INSTALL_NAME && ${LD_DYLIB_INSTALL_NAME-_} ]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/win/gyptest-sys.py new/gyp-0+git.20160810/test/win/gyptest-sys.py --- old/gyp-0+git.20160620/test/win/gyptest-sys.py 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/win/gyptest-sys.py 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1,23 @@ +#!/usr/bin/env python + +# Copyright (c) 2016 Google Inc. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +""" +Verifies that Windows drivers are built correctly. +""" + +import TestGyp + +import sys + +if sys.platform == 'win32': + test = TestGyp.TestGyp(formats=['msvs']) + + CHDIR = 'win-driver-target-type' + test.run_gyp('win-driver-target-type.gyp', chdir=CHDIR) + test.build('win-driver-target-type.gyp', 'win_driver_target_type', + chdir=CHDIR) + + test.pass_test() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/win/win-driver-target-type/win-driver-target-type.c new/gyp-0+git.20160810/test/win/win-driver-target-type/win-driver-target-type.c --- old/gyp-0+git.20160620/test/win/win-driver-target-type/win-driver-target-type.c 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/win/win-driver-target-type/win-driver-target-type.c 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1,10 @@ +// Copyright (c) 2016 Google Inc. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "win-driver-target-type.h" + +NTSTATUS DriverEntry(_In_ struct _DRIVER_OBJECT *DriverObject, + _In_ PUNICODE_STRING RegistryPath) { + return STATUS_SUCCESS; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/win/win-driver-target-type/win-driver-target-type.gyp new/gyp-0+git.20160810/test/win/win-driver-target-type/win-driver-target-type.gyp --- old/gyp-0+git.20160620/test/win/win-driver-target-type/win-driver-target-type.gyp 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/win/win-driver-target-type/win-driver-target-type.gyp 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1,32 @@ +# Copyright (c) 2016 Google Inc. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'targets': [ + { + 'target_name': 'win_driver_target_type', + 'type': 'windows_driver', + 'msvs_target_version': 'Windows7', + 'sources': [ + 'win-driver-target-type.c', + 'win-driver-target-type.h', + 'win-driver-target-type.rc', + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'AdditionalDependencies': [ + 'wdmsec.lib', + 'ntoskrnl.lib', + 'hal.lib', + 'wmilib.lib', + 'bufferoverflowfastfailk.lib', + ], + }, + 'VCCLCompilerTool': { + 'WarnAsError': 'false', + }, + }, + }, + ] +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/win/win-driver-target-type/win-driver-target-type.h new/gyp-0+git.20160810/test/win/win-driver-target-type/win-driver-target-type.h --- old/gyp-0+git.20160620/test/win/win-driver-target-type/win-driver-target-type.h 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/win/win-driver-target-type/win-driver-target-type.h 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1,13 @@ +// Copyright (c) 2016 Google Inc. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE + +#ifndef _WIN_DRIVER_TARGET_TYPE_H_ +#define _WIN_DRIVER_TARGET_TYPE_H_ + +#include <ntifs.h> +#include <ntdddisk.h> + +DRIVER_INITIALIZE DriverEntry; + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0+git.20160620/test/win/win-driver-target-type/win-driver-target-type.rc new/gyp-0+git.20160810/test/win/win-driver-target-type/win-driver-target-type.rc --- old/gyp-0+git.20160620/test/win/win-driver-target-type/win-driver-target-type.rc 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0+git.20160810/test/win/win-driver-target-type/win-driver-target-type.rc 2016-08-10 22:13:45.000000000 +0200 @@ -0,0 +1,14 @@ +// Copyright (c) 2016 Google Inc. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include <windows.h> +#include <ntverp.h> + +#define VER_FILETYPE VFT_DRV +#define VER_FILESUBTYPE VFT2_DRV_SYSTEM +#define VER_FILEDESCRIPTION_STR "Windows Driver GYP target type" +#define VER_INTERNALNAME_STR "win-driver-target-type.sys" +#define VER_ORIGINALFILENAME_STR "win-driver-target-type.sys" + +#include "common.ver"

1 0

commit bctoolbox for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package bctoolbox for openSUSE:Factory checked in at 2016-08-31 00:01:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bctoolbox (Old) and /work/SRC/openSUSE:Factory/.bctoolbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bctoolbox" Changes: -------- --- /work/SRC/openSUSE:Factory/bctoolbox/bctoolbox.changes 2016-08-17 12:05:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bctoolbox.new/bctoolbox.changes 2016-08-31 00:01:07.000000000 +0200 @@ -1,0 +2,13 @@ +Sat Aug 27 14:34:12 UTC 2016 - jengelh(a)inai.de + +- Remove extraneous pkgconfig require + +------------------------------------------------------------------- +Sat Aug 27 11:03:49 UTC 2016 - mpluskal(a)suse.com + +- Merge changes from home:X0F:HSF +- Fix generation of pkgconfig files + * bctoolbox-pkgconfig_1.patch + * bctoolbox-pkgconfig_2.patch + +------------------------------------------------------------------- New: ---- bctoolbox-pkgconfig_1.patch bctoolbox-pkgconfig_2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bctoolbox.spec ++++++ --- /var/tmp/diff_new_pack.1adHmy/_old 2016-08-31 00:01:08.000000000 +0200 +++ /var/tmp/diff_new_pack.1adHmy/_new 2016-08-31 00:01:08.000000000 +0200 @@ -26,11 +26,14 @@ Url: https://linphone.org Source0: https://github.com/BelledonneCommunications/bctoolbox/archive/%{version}.ta… Source1: baselibs.conf +Patch0: bctoolbox-pkgconfig_1.patch +Patch1: bctoolbox-pkgconfig_2.patch BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: mbedtls-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(cunit) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(zlib) %description Utilities library used by Belledonne Communications softwares like @@ -42,6 +45,9 @@ Requires: cmake Requires: lib%{name}%{sover} = %{version} Requires: lib%{name}-tester%{sover} = %{version} +Requires: mbedtls-devel +Requires: pkgconfig(cunit) +Requires: pkgconfig(zlib) %description devel Utilities library used by Belledonne Communications softwares like @@ -71,13 +77,14 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 +sed -i "s|CUnit 3.0|CUnit 2.0|g" CMakeLists.txt %build -sed -i "s|CUnit 3.0|CUnit 2.0|g" CMakeLists.txt %cmake \ - -DENABLE_POLARSSL=no \ - -DENABLE_MBEDTLS=yes \ - -DENABLE_TESTS_COMPONENT=YES \ + -DMBEDTLS_V2=yes \ + -DENABLE_TESTS_COMPONENT=yes \ -DENABLE_TESTS=yes \ -DENABLE_STATIC=no make %{?_smp_mflags} @@ -86,8 +93,8 @@ %cmake_install %post -n lib%{name}%{sover} -p /sbin/ldconfig -%post -n lib%{name}-tester%{sover} -p /sbin/ldconfig %postun -n lib%{name}%{sover} -p /sbin/ldconfig +%post -n lib%{name}-tester%{sover} -p /sbin/ldconfig %postun -n lib%{name}-tester%{sover} -p /sbin/ldconfig %files -n lib%{name}%{sover} @@ -104,10 +111,10 @@ %defattr(-,root,root) %doc COPYING README AUTHORS %{_libdir}/pkgconfig/%{name}.pc -%{_libdir}/pkgconfig/bctoolbox-tester.pc %{_libdir}/lib%{name}.so -%{_libdir}/lib%{name}-tester.so %{_datadir}/%{name}/ %{_includedir}/%{name}/ +%{_libdir}/pkgconfig/bctoolbox-tester.pc +%{_libdir}/lib%{name}-tester.so %changelog ++++++ bctoolbox-pkgconfig_1.patch ++++++ >From 447f0297640881bc1d27c922163aa3aedc14bf20 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini <sylvain.berfini(a)belledonne-communications.com> Date: Tue, 16 Aug 2016 10:02:41 +0200 Subject: [PATCH] Fix .pc generation in configure.ac --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 29c3615..5b90337 100755 --- a/configure.ac +++ b/configure.ac @@ -218,7 +218,7 @@ fi PROJECT_VERSION=$VERSION CMAKE_INSTALL_PREFIX=$install_prefix -CMAKE_INSTALL_FULL_LIBDIR=${install_prefix}/lib +CMAKE_INSTALL_FULL_LIBDIR=${libdir} CMAKE_INSTALL_FULL_INCLUDEDIR=${install_prefix}/include AC_SUBST(PROJECT_VERSION) ++++++ bctoolbox-pkgconfig_2.patch ++++++ >From ad078c2276c5a7ea80a31c754927be13e87eaf6c Mon Sep 17 00:00:00 2001 From: Simon Morlat <simon.morlat(a)linphone.org> Date: Wed, 17 Aug 2016 14:45:24 +0200 Subject: [PATCH] exec_prefix is mandatory, at least for pkg-config 0.26 --- bctoolbox-tester.pc.in | 2 +- bctoolbox.pc.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bctoolbox-tester.pc.in b/bctoolbox-tester.pc.in index f9edaaa..6d8e2c0 100644 --- a/bctoolbox-tester.pc.in +++ b/bctoolbox-tester.pc.in @@ -1,6 +1,6 @@ # This is a comment prefix=@CMAKE_INSTALL_PREFIX@ - +exec_prefix=@CMAKE_INSTALL_PREFIX@ Name: bctoolbox-tester Description: A common set of tester wrappers used by Belledonne Communications's softwares Requires.private: @TESTER_REQUIRES_PRIVATE@ diff --git a/bctoolbox.pc.in b/bctoolbox.pc.in index 642ff75..fc00eb3 100644 --- a/bctoolbox.pc.in +++ b/bctoolbox.pc.in @@ -1,5 +1,6 @@ # This is a comment prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@ Name: @PROJECT_NAME@ Description: A common set of tools used by Belledonne Communications's softwares

1 0

commit cmake for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2016-08-31 00:00:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cmake" Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake-gui.changes 2016-08-08 13:56:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2016-08-31 00:00:57.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 26 08:14:10 UTC 2016 - tchvatal(a)suse.com + +- Remove wrong FIXME from spec +- Require qt5 gui everywhere as it on all supported platforms + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2016-08-18 09:14:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2016-08-31 00:00:57.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Aug 26 08:27:17 UTC 2016 - tchvatal(a)suse.com + +- Respect CFLAGS while bootstraping +- Remove wrong FIXME from the spec +- Add relwithdebinfo as default target to ease living of sci packages +- Add possibility to switch between ninja and cmake by defining + %__builder ninja prior %cmake call bnc#995752 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ --- /var/tmp/diff_new_pack.1Xrlg6/_old 2016-08-31 00:00:58.000000000 +0200 +++ /var/tmp/diff_new_pack.1Xrlg6/_new 2016-08-31 00:00:58.000000000 +0200 @@ -43,21 +43,16 @@ #if 0%{?suse_version} > 1320 #BuildRequires: pkgconfig(jsoncpp) #endif -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: python-sphinx BuildRequires: update-desktop-files BuildRequires: zlib-devel +BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(liblzma) Requires: cmake Recommends: cmake-man BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1320 -BuildRequires: pkg-config -BuildRequires: pkgconfig(Qt5Widgets) -%else -BuildRequires: libqt4-devel -%endif %description This is a Graphical User Interface for CMake, a cross-platform, @@ -80,23 +75,16 @@ %patch6 -p1 %build -EXTRA_FLAGS="--qt-gui" -# FIXME: you should use the %%configure macro +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" +# This is not autotools configure ./configure \ --prefix=%{_prefix} \ --datadir=/share/cmake \ --docdir=/share/doc/packages/cmake \ --mandir=/share/man \ --sphinx-man \ -%if 0%{?suse_version} && !0%{?sles_version} --system-libs \ -%else - --system-curl \ - --system-expat \ - --system-zlib \ - --system-bzip2 \ - --no-system-libarchive \ -%endif --no-system-jsoncpp \ --parallel=0%{jobs} \ --qt-gui ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.1Xrlg6/_old 2016-08-31 00:00:58.000000000 +0200 +++ /var/tmp/diff_new_pack.1Xrlg6/_new 2016-08-31 00:00:58.000000000 +0200 @@ -51,7 +51,7 @@ #if 0%{?suse_version} > 1320 #BuildRequires: pkgconfig(jsoncpp) #endif -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: zlib-devel BuildRequires: pkgconfig(liblzma) Requires: make @@ -75,7 +75,9 @@ %patch7 -p1 %build -# FIXME: you should use the %%configure macro +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" +# This is not autotools configure ./configure \ --prefix=%{_prefix} \ --datadir=/share/%{name} \ ++++++ cmake.macros ++++++ --- /var/tmp/diff_new_pack.1Xrlg6/_old 2016-08-31 00:00:58.000000000 +0200 +++ /var/tmp/diff_new_pack.1Xrlg6/_new 2016-08-31 00:00:58.000000000 +0200 @@ -4,6 +4,7 @@ %__cmake %{_bindir}/cmake %__ctest %{_bindir}/ctest %__builddir build +%__builder %__make %cmake \ find . -name CMakeLists.txt \\\ @@ -11,13 +12,18 @@ mkdir -p %__builddir \ cd %__builddir \ %__cmake .. \\\ +%if "%__builder" == "%__make" \ + -G"Unix Makefiles" \\\ +%else \ + -GNinja \\\ +%endif \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ - -DCMAKE_BUILD_TYPE=None \\\ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\ -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\ -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \\\ -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -DNDEBUG" \\\ @@ -36,10 +42,14 @@ -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules %make_jobs \ - %__make %{?_smp_mflags} VERBOSE=1 +%if "%__builder" == "%__make" \ + %__make %{?_smp_mflags} VERBOSE=1 \ +%else \ + ninja -v %{?_smp_mflags} \ +%endif %cmake_install \ - %__make VERBOSE=1 DESTDIR=%{buildroot} install/fast -C %__builddir + DESTDIR=%{buildroot} %__builder install -C %__builddir %ctest \ cd %__builddir \

1 0

commit libqca2 for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libqca2 for openSUSE:Factory checked in at 2016-08-31 00:00:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqca2 (Old) and /work/SRC/openSUSE:Factory/.libqca2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqca2" Changes: -------- --- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes 2015-12-27 01:57:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2016-08-31 00:00:48.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 25 08:29:08 UTC 2016 - fabian(a)ritter-vogt.de + +- Add new plugin-gcrypt subpackage + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqca2.spec ++++++ --- /var/tmp/diff_new_pack.lRXqXl/_old 2016-08-31 00:00:49.000000000 +0200 +++ /var/tmp/diff_new_pack.lRXqXl/_new 2016-08-31 00:00:49.000000000 +0200 @@ -17,6 +17,12 @@ %bcond_with botan +# Enable gcrypt plugin on TW +%if 0%{?suse_version} > 1320 +%bcond_without gcrypt +%else +%bcond_with gcrypt +%endif %bcond_without nss %bcond_without pkcs11 Name: libqca2 @@ -33,7 +39,6 @@ BuildRequires: cyrus-sasl-devel BuildRequires: gpg2 BuildRequires: libdrm-devel -BuildRequires: libgcrypt-devel BuildRequires: libjpeg-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files @@ -46,6 +51,9 @@ %if %{with botan} BuildRequires: pkgconfig(botan-1.10) %endif +%if %{with gcrypt} +BuildRequires: libgcrypt-devel >= 1.7 +%endif %if %{with nss} BuildRequires: pkgconfig(nss) %endif @@ -87,6 +95,22 @@ It can be extended by further plug-ins, for example, with qca-sasl for SASL support. +%if %{with gcrypt} +%package plugin-gcrypt +Summary: Qt Cryptographic Architecture 2 +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} + +%description plugin-gcrypt +This package provides a generic Qt cryptographic architecture, +including a library and a plug-in for using all supported capabilities +of openssl, like SSL/TLS, X509, RSA, SHA1, MD5, Blowfish, 3DES, and +AES. + +It can be extended by further plug-ins, for example, with qca-sasl for +SASL support. +%endif + %if %{with botan} %package plugin-botan Summary: Qt Cryptographic Architecture 2 @@ -146,7 +170,9 @@ -DQCA_FEATURE_INSTALL_DIR=%{_datadir}/qt4/mkspecs/features/ \ -DQT4_BUILD=ON \ -DWITH_cyrus-sasl_PLUGIN=ON \ +%if %{with gcrypt} -DWITH_gcrypt_PLUGIN=ON \ +%endif -DWITH_gnupg_PLUGIN=ON \ -DWITH_logger_PLUGIN=ON \ %if %{with botan} @@ -193,6 +219,12 @@ %defattr(-,root,root) %{_libdir}/qt4/plugins/crypto/libqca-cyrus-sasl.so +%if %{with gcrypt} +%files plugin-gcrypt +%defattr(-,root,root) +%{_libdir}/qt4/plugins/crypto/libqca-gcrypt.so +%endif + %if %{with botan} %files plugin-botan %defattr(-,root,root)

1 0

commit gpg2 for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package gpg2 for openSUSE:Factory checked in at 2016-08-31 00:00:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpg2 (Old) and /work/SRC/openSUSE:Factory/.gpg2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gpg2" Changes: -------- --- /work/SRC/openSUSE:Factory/gpg2/gpg2.changes 2016-08-06 20:36:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gpg2.new/gpg2.changes 2016-08-31 00:00:38.000000000 +0200 @@ -1,0 +2,71 @@ +Fri Aug 19 21:22:22 UTC 2016 - astieger(a)suse.com + +- GnuPG 2.1.15: + * gpg: Remove the --tofu-db-format option and support for the + split TOFU database. + * gpg: Add option --sender to prepare for coming features. + * gpg: Add option --input-size-hint to help progress indicators. + * gpg: Extend the PROGRESS status line with the counted unit. + * gpg: Avoid publishing the GnuPG version by default with --armor. + * gpg: Properly ignore legacy keys in the keyring cache. + * gpg: Always print fingerprint records in --with-colons mode. + * gpg: Make sure that keygrips are printed for each subkey in + --with-colons mode. + * gpg: New import filter "drop-sig". + * gpgsm: Fix a bug in the machine-readable key listing. + * gpg,gpgsm: Block signals during keyring updates to limits the + effects of a Ctrl-C at the wrong time. + * g13: Add command --umount and other fixes for dm-crypt. + * agent: Fix regression in SIGTERM handling. + * agent: Cleanup of the ssh-agent code. + * agent: Allow import of overly long keys. + * scd: Fix problems with card removal. + * dirmngr: Remove all code for running as a system service. + * tools: Make gpg-wks-client conforming to the specs. + * tests: Improve the output of the new regression test tool. + * tests: Distribute the standalone test runner. + * tests: Run each test in a clean environment. + * Spelling and grammar fixes. +- fix build error, adding + 0001-common-Follow-up-to-14479e2-fix-void-return-in-non-v.patch + +------------------------------------------------------------------- +Sun Aug 14 14:12:40 UTC 2016 - astieger(a)suse.com + +- GnuPG 2.1.14: + * gpg: Removed options --print-dane-records and --print-pka-records. + The new export options "export-pka" and "export-dane" can instead + be used with the export command. + * gpg: New options --import-filter and --export-filter. + * gpg: New import options "import-show" and "import-export". + * gpg: New option --no-keyring. + * gpg: New command --quick-revuid. + * gpg: New options -f/--recipient-file and -F/--hidden-recipient-file + to directly specify encryption keys. + * gpg: New option --mimemode to indicate that the content is a MIME + part. Does only enable --textmode right now. + * gpg: New option --rfc4880bis to allow experiments with proposed + changes to the current OpenPGP specs. + * gpg: Fix regression in the "fetch" sub-command of --card-edit. + * gpg: Fix regression since 2.1 in option --try-all-secrets. + * gpgv: Change default options for extra security. + * gpgsm: No more root certificates are installed by default. + * agent: "updatestartuptty" does now affect more environment + variables. + * scd: The option --homedir does now work with scdaemon. + * scd: Support some more GEMPlus card readers. + * gpgtar: Fix handling of '-' as file name. + * gpgtar: New commands --create and --extract. + * gpgconf: Tweak for --list-dirs to better support shell scripts. + * tools: Add programs gpg-wks-client and gpg-wks-server to implement + a Web Key Service. The configure option --enable-wks-tools is + required to build them; they should be considered Beta software. + * tests: Complete rework of the openpgp part of the test suite. The + test scripts have been changed from Bourne shell scripts to Scheme + programs. A customized scheme interpreter (gpgscm) is included. + This change was triggered by the need to run the test suite on + non-Unix platforms. + * The rendering of the man pages has been improved. +- drop upstream gnupg-make_--try-all-secrets_work.patch + +------------------------------------------------------------------- Old: ---- gnupg-2.1.13.tar.bz2 gnupg-2.1.13.tar.bz2.sig gnupg-make_--try-all-secrets_work.patch New: ---- 0001-common-Follow-up-to-14479e2-fix-void-return-in-non-v.patch gnupg-2.1.15.tar.bz2 gnupg-2.1.15.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpg2.spec ++++++ --- /var/tmp/diff_new_pack.MbMIeW/_old 2016-08-31 00:00:40.000000000 +0200 +++ /var/tmp/diff_new_pack.MbMIeW/_new 2016-08-31 00:00:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: gpg2 -Version: 2.1.13 +Version: 2.1.15 Release: 0 Summary: GnuPG 2 License: GPL-3.0+ @@ -34,18 +34,18 @@ Patch8: gnupg-set_umask_before_open_outfile.patch Patch9: gnupg-detect_FIPS_mode.patch Patch11: gnupg-add_legacy_FIPS_mode_option.patch -Patch12: gnupg-make_--try-all-secrets_work.patch +Patch12: 0001-common-Follow-up-to-14479e2-fix-void-return-in-non-v.patch BuildRequires: expect BuildRequires: fdupes BuildRequires: libadns-devel -BuildRequires: libassuan-devel >= 2.4.1 +BuildRequires: libassuan-devel >= 2.4.3 # patch11 (gnupg-add_legacy_FIPS_mode_option.patch) mentions GCRYCTL_INACTIVATE_FIPS_FLAG # raising gcrypt requirement from 1.4.0 -BuildRequires: libgcrypt-devel >= 1.6.1 -BuildRequires: libgpg-error-devel >= 1.21 -BuildRequires: libksba-devel >= 1.2.0 +BuildRequires: libgcrypt-devel >= 1.7.0 +BuildRequires: libgpg-error-devel >= 1.24 +BuildRequires: libksba-devel >= 1.3.4 BuildRequires: makeinfo -BuildRequires: npth-devel >= 0.91 +BuildRequires: npth-devel >= 1.2 BuildRequires: openldap2-devel BuildRequires: pkg-config BuildRequires: readline-devel ++++++ 0001-common-Follow-up-to-14479e2-fix-void-return-in-non-v.patch ++++++ >From ae52c486ef5e71445aa0adfdac30124abff7da46 Mon Sep 17 00:00:00 2001 From: Andreas Stieger <astieger(a)suse.com> Date: Fri, 19 Aug 2016 23:09:13 +0200 Subject: [PATCH] common: Follow-up to 14479e2, fix void return in non-void function * simple-pwquery.c (agent_open): return -1 in errout label as documented. Signed-off-by: Andreas Stieger <astieger(a)suse.com> --- common/simple-pwquery.c | 1 + 1 file changed, 1 insertion(+) diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c index 240451b..0c3233b 100644 --- a/common/simple-pwquery.c +++ b/common/simple-pwquery.c @@ -285,6 +285,7 @@ agent_open (assuan_context_t *ctx) errout: assuan_release (*ctx); *ctx = NULL; + return -1; } -- 2.6.6 ++++++ gnupg-2.0.18-files-are-digests.patch ++++++ --- /var/tmp/diff_new_pack.MbMIeW/_old 2016-08-31 00:00:40.000000000 +0200 +++ /var/tmp/diff_new_pack.MbMIeW/_new 2016-08-31 00:00:40.000000000 +0200 @@ -4,11 +4,11 @@ g10/sign.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 67 insertions(+), 6 deletions(-) -Index: gnupg-2.1.13/g10/gpg.c +Index: gnupg-2.1.15/g10/gpg.c =================================================================== ---- gnupg-2.1.13.orig/g10/gpg.c -+++ gnupg-2.1.13/g10/gpg.c -@@ -358,6 +358,7 @@ enum cmd_and_opt_values +--- gnupg-2.1.15.orig/g10/gpg.c ++++ gnupg-2.1.15/g10/gpg.c +@@ -368,6 +368,7 @@ enum cmd_and_opt_values oTTYtype, oLCctype, oLCmessages, @@ -16,7 +16,7 @@ oXauthority, oGroup, oUnGroup, -@@ -770,6 +771,7 @@ static ARGPARSE_OPTS opts[] = { +@@ -791,6 +792,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. */ -@@ -2247,6 +2249,7 @@ main (int argc, char **argv) +@@ -2239,6 +2241,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 = 1; /* Limit to the major number. */ + opt.emit_version = 0; opt.weak_digests = NULL; additional_weak_digest("MD5"); -@@ -2797,6 +2800,7 @@ main (int argc, char **argv) +@@ -2807,6 +2810,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.13/g10/options.h +Index: gnupg-2.1.15/g10/options.h =================================================================== ---- gnupg-2.1.13.orig/g10/options.h -+++ gnupg-2.1.13/g10/options.h -@@ -206,6 +206,7 @@ struct +--- gnupg-2.1.15.orig/g10/options.h ++++ gnupg-2.1.15/g10/options.h +@@ -212,6 +212,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.13/g10/sign.c +Index: gnupg-2.1.15/g10/sign.c =================================================================== ---- gnupg-2.1.13.orig/g10/sign.c -+++ gnupg-2.1.13/g10/sign.c +--- gnupg-2.1.15.orig/g10/sign.c ++++ gnupg-2.1.15/g10/sign.c @@ -42,6 +42,8 @@ #include "call-agent.h" #include "mbox-util.h" @@ -65,7 +65,7 @@ #ifdef HAVE_DOSISH_SYSTEM #define LF "\r\n" #else -@@ -694,8 +696,12 @@ write_signature_packets (SK_LIST sk_list +@@ -711,8 +713,12 @@ write_signature_packets (SK_LIST sk_list mk_notation_policy_etc (sig, NULL, pk); } @@ -78,7 +78,7 @@ rc = do_sign (pk, sig, md, hash_for (pk), cache_nonce); gcry_md_close (md); -@@ -753,6 +759,8 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -770,6 +776,8 @@ sign_file (ctrl_t ctrl, strlist_t filena SK_LIST sk_rover = NULL; int multifile = 0; u32 duration=0; @@ -87,7 +87,7 @@ pfx = new_progress_context (); afx = new_armor_context (); -@@ -769,7 +777,16 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -786,7 +794,16 @@ sign_file (ctrl_t ctrl, strlist_t filena fname = NULL; if( fname && filenames->next && (!detached || encryptflag) ) @@ -105,7 +105,7 @@ if(encryptflag==2 && (rc=setup_symkey(&efx.symkey_s2k,&efx.symkey_dek))) -@@ -790,7 +807,7 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -807,7 +824,7 @@ sign_file (ctrl_t ctrl, strlist_t filena goto leave; /* prepare iobufs */ @@ -114,7 +114,7 @@ inp = NULL; /* we do it later */ else { inp = iobuf_open(fname); -@@ -928,7 +945,7 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -945,7 +962,7 @@ sign_file (ctrl_t ctrl, strlist_t filena for (sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next) gcry_md_enable (mfx.md, hash_for (sk_rover->pk)); @@ -123,7 +123,7 @@ iobuf_push_filter( inp, md_filter, &mfx ); if( detached && !encryptflag) -@@ -983,6 +1000,8 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -1000,6 +1017,8 @@ sign_file (ctrl_t ctrl, strlist_t filena write_status_begin_signing (mfx.md); @@ -132,7 +132,7 @@ /* Setup the inner packet. */ if( detached ) { if( multifile ) { -@@ -1023,6 +1042,45 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -1040,6 +1059,45 @@ sign_file (ctrl_t ctrl, strlist_t filena if( opt.verbose ) log_printf ("\n"); } @@ -178,7 +178,7 @@ else { /* read, so that the filter can calculate the digest */ while( iobuf_get(inp) != -1 ) -@@ -1040,8 +1098,8 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -1058,8 +1116,8 @@ sign_file (ctrl_t ctrl, strlist_t filena /* write the signatures */ rc = write_signature_packets (sk_list, out, mfx.md, ++++++ gnupg-2.1.13.tar.bz2 -> gnupg-2.1.15.tar.bz2 ++++++ ++++ 270932 lines of diff (skipped) ++++++ gnupg-add_legacy_FIPS_mode_option.patch ++++++ --- /var/tmp/diff_new_pack.MbMIeW/_old 2016-08-31 00:00:43.000000000 +0200 +++ /var/tmp/diff_new_pack.MbMIeW/_new 2016-08-31 00:00:43.000000000 +0200 @@ -3,11 +3,11 @@ g10/gpg.c | 9 +++++++++ 2 files changed, 27 insertions(+) -Index: gnupg-2.1.13/doc/gpg.texi +Index: gnupg-2.1.15/doc/gpg.texi =================================================================== ---- gnupg-2.1.13.orig/doc/gpg.texi -+++ gnupg-2.1.13/doc/gpg.texi -@@ -1996,6 +1996,24 @@ implies, this option is for experts only +--- gnupg-2.1.15.orig/doc/gpg.texi ++++ gnupg-2.1.15/doc/gpg.texi +@@ -1992,6 +1992,24 @@ implies, this option is for experts only understand the implications of what it allows you to do, leave this off. @option{--no-expert} disables this option. @@ -32,19 +32,19 @@ @end table -Index: gnupg-2.1.13/g10/gpg.c +Index: gnupg-2.1.15/g10/gpg.c =================================================================== ---- gnupg-2.1.13.orig/g10/gpg.c -+++ gnupg-2.1.13/g10/gpg.c -@@ -398,6 +398,7 @@ enum cmd_and_opt_values - oUnwrap, +--- gnupg-2.1.15.orig/g10/gpg.c ++++ gnupg-2.1.15/g10/gpg.c +@@ -409,6 +409,7 @@ enum cmd_and_opt_values oOnlySignTextIDs, oDisableSignerUID, + oSender, + oSetLegacyFips, oNoop }; -@@ -809,6 +810,7 @@ static ARGPARSE_OPTS opts[] = { +@@ -830,6 +831,7 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_n (oAllowMultipleMessages, "allow-multiple-messages", "@"), ARGPARSE_s_n (oNoAllowMultipleMessages, "no-allow-multiple-messages", "@"), ARGPARSE_s_n (oAllowWeakDigestAlgos, "allow-weak-digest-algos", "@"), @@ -52,7 +52,7 @@ /* These two are aliases to help users of the PGP command line product use gpg with minimal pain. Many commands are common -@@ -3330,6 +3332,13 @@ main (int argc, char **argv) +@@ -3373,6 +3375,13 @@ main (int argc, char **argv) case oNoAutostart: opt.autostart = 0; break;

1 0

commit libgcrypt for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libgcrypt for openSUSE:Factory checked in at 2016-08-31 00:00:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgcrypt (Old) and /work/SRC/openSUSE:Factory/.libgcrypt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgcrypt" Changes: -------- --- /work/SRC/openSUSE:Factory/libgcrypt/libgcrypt.changes 2016-08-22 10:06:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgcrypt.new/libgcrypt.changes 2016-08-31 00:00:27.000000000 +0200 @@ -1,0 +2,144 @@ +Sat Aug 20 10:38:15 UTC 2016 - mpluskal,vcizek,astieger}(a)suse.com + +- libgcrypt 1.7.3: + * security issue already fixes with 1.6.6 + * Fix building of some asm modules with older compilers and CPUs. + * ARMv8/AArch32 improvements for AES, GCM, SHA-256, and SHA-1. +- includes changes from libgcrypt 1.7.2: + * Bug fixes: + - Fix setting of the ECC cofactor if parameters are specified. + - Fix memory leak in the ECC code. + - Remove debug message about unsupported getrandom syscall. + - Fix build problems related to AVX use. + - Fix bus errors on ARM for Poly1305, ChaCha20, AES, and SHA-512. + * Internal changes: + - Improved fatal error message for wrong use of gcry_md_read. + - Disallow symmetric encryption/decryption if key is not set. +- includes changes from 1.7.1: + * Bug fixes: + - Fix ecc_verify for cofactor support. + - Fix portability bug when using gcc with Solaris 9 SPARC. + - Build fix for OpenBSD/amd64 + - Add OIDs to the Serpent ciphers. + * Internal changes: + - Use getrandom system call on Linux if available. + - Blinding is now also used for RSA signature creation. + - Changed names of debug envvars +- includes changes from 1.7.0: + * New algorithms and modes: + - SHA3-224, SHA3-256, SHA3-384, SHA3-512, and MD2 hash algorithms. + - SHAKE128 and SHAKE256 extendable-output hash algorithms. + - ChaCha20 stream cipher. + - Poly1305 message authentication algorithm + - ChaCha20-Poly1305 Authenticated Encryption with Associated Data + mode. + - OCB mode. + - HMAC-MD2 for use by legacy applications. + * New curves for ECC: + - Curve25519. + - sec256k1. + - GOST R 34.10-2001 and GOST R 34.10-2012. + * Performance: + - Improved performance of KDF functions. + - Assembler optimized implementations of Blowfish and Serpent on + ARM. + - Assembler optimized implementation of 3DES on x86. + - Improved AES using the SSSE3 based vector permutation method by + Mike Hamburg. + - AVX/BMI is used for SHA-1 and SHA-256 on x86. This is for SHA-1 + about 20% faster than SSSE3 and more than 100% faster than the + generic C implementation. + - 40% speedup for SHA-512 and 72% for SHA-1 on ARM Cortex-A8. + - 60-90% speedup for Whirlpool on x86. + - 300% speedup for RIPE MD-160. + - Up to 11 times speedup for CRC functions on x86. + * Other features: + - Improved ECDSA and FIPS 186-4 compliance. + - Support for Montgomery curves. + - gcry_cipher_set_sbox to tweak S-boxes of the gost28147 cipher + algorithm. + - gcry_mpi_ec_sub to subtract two points on a curve. + - gcry_mpi_ec_decode_point to decode an MPI into a point object. + - Emulation for broken Whirlpool code prior to 1.6.0. [from 1.6.1] + - Flag "pkcs1-raw" to enable PCKS#1 padding with a user supplied + hash part. + - Parameter "saltlen" to set a non-default salt length for RSA PSS. + - A SP800-90A conforming DRNG replaces the former X9.31 alternative + random number generator. + - Map deprecated RSA algo number to the RSA algo number for better + backward compatibility. [from 1.6.2] + - Use ciphertext blinding for Elgamal decryption [CVE-2014-3591]. + See http://www.cs.tau.ac.il/~tromer/radioexp/ for details. + [from 1.6.3] + - Fixed data-dependent timing variations in modular exponentiation + [related to CVE-2015-0837, Last-Level Cache Side-Channel Attacks + are Practical]. [from 1.6.3] + - Flag "no-keytest" for ECC key generation. Due to a bug in + the parser that flag will also be accepted but ignored by older + version of Libgcrypt. [from 1.6.4] + - Speed up the random number generator by requiring less extra + seeding. [from 1.6.4] + - Always verify a created RSA signature to avoid private key leaks + due to hardware failures. [from 1.6.4] + - Mitigate side-channel attack on ECDH with Weierstrass curves + [CVE-2015-7511]. See http://www.cs.tau.ac.IL/~tromer/ecdh/ for + details. [from 1.6.5] + * Internal changes: + - Moved locking out to libgpg-error. + - Support of the SYSROOT envvar in the build system. + - Refactor some code. + - The availability of a 64 bit integer type is now mandatory. + * Bug fixes: + - Fixed message digest lookup by OID (regression in 1.6.0). + - Fixed a build problem on NetBSD + - Fixed some asm build problems and feature detection bugs. + * Interface changes relative to the 1.6.0 release: + gcry_cipher_final NEW macro. + GCRY_CIPHER_MODE_CFB8 NEW constant. + GCRY_CIPHER_MODE_OCB NEW. + GCRY_CIPHER_MODE_POLY1305 NEW. + gcry_cipher_set_sbox NEW macro. + gcry_mac_get_algo NEW. + GCRY_MAC_HMAC_MD2 NEW. + GCRY_MAC_HMAC_SHA3_224 NEW. + GCRY_MAC_HMAC_SHA3_256 NEW. + GCRY_MAC_HMAC_SHA3_384 NEW. + GCRY_MAC_HMAC_SHA3_512 NEW. + GCRY_MAC_POLY1305 NEW. + GCRY_MAC_POLY1305_AES NEW. + GCRY_MAC_POLY1305_CAMELLIA NEW. + GCRY_MAC_POLY1305_SEED NEW. + GCRY_MAC_POLY1305_SERPENT NEW. + GCRY_MAC_POLY1305_TWOFISH NEW. + gcry_md_extract NEW. + GCRY_MD_FLAG_BUGEMU1 NEW [from 1.6.1]. + GCRY_MD_GOSTR3411_CP NEW. + GCRY_MD_SHA3_224 NEW. + GCRY_MD_SHA3_256 NEW. + GCRY_MD_SHA3_384 NEW. + GCRY_MD_SHA3_512 NEW. + GCRY_MD_SHAKE128 NEW. + GCRY_MD_SHAKE256 NEW. + gcry_mpi_ec_decode_point NEW. + gcry_mpi_ec_sub NEW. + GCRY_PK_EDDSA NEW constant. + GCRYCTL_GET_TAGLEN NEW. + GCRYCTL_SET_SBOX NEW. + GCRYCTL_SET_TAGLEN NEW. +- Apply libgcrypt-1.6.3-aliasing.patch only on big-endian + architectures +- update drbg_test.patch and install cavs testing directory again +- As DRBG is upstream, drop pateches: + v9-0001-SP800-90A-Deterministic-Random-Bit-Generator.patch + 0002-Compile-DRBG.patch + 0003-Function-definitions-of-interfaces-for-random.c.patch + 0004-Invoke-DRBG-from-common-libgcrypt-RNG-code.patch + 0005-Function-definitions-for-gcry_control-callbacks.patch + 0006-DRBG-specific-gcry_control-requests.patch + v9-0007-User-interface-to-DRBG.patch + libgcrypt-fix-rng.patch +- drop obsolete: + libgcrypt-fips-dsa.patch + libgcrypt-fips_ecdsa.patch + +------------------------------------------------------------------- Old: ---- 0002-Compile-DRBG.patch 0003-Function-definitions-of-interfaces-for-random.c.patch 0004-Invoke-DRBG-from-common-libgcrypt-RNG-code.patch 0005-Function-definitions-for-gcry_control-callbacks.patch 0006-DRBG-specific-gcry_control-requests.patch libgcrypt-1.6.6.tar.bz2 libgcrypt-1.6.6.tar.bz2.sig libgcrypt-fips-dsa.patch libgcrypt-fips_ecdsa.patch v9-0001-SP800-90A-Deterministic-Random-Bit-Generator.patch v9-0007-User-interface-to-DRBG.patch New: ---- libgcrypt-1.7.3.tar.bz2 libgcrypt-1.7.3.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgcrypt.spec ++++++ --- /var/tmp/diff_new_pack.rWfFai/_old 2016-08-31 00:00:29.000000000 +0200 +++ /var/tmp/diff_new_pack.rWfFai/_new 2016-08-31 00:00:29.000000000 +0200 @@ -19,10 +19,10 @@ %define build_hmac256 1 %define separate_hmac256_binary 0 %define libsoname %{name}20 -%define sosuffix 20.0.6 +%define sosuffix 20.1.3 %define cavs_dir %{_libexecdir}/%{name}/cavs Name: libgcrypt -Version: 1.6.6 +Version: 1.7.3 Release: 0 Summary: The GNU Crypto Library License: GPL-2.0+ and LGPL-2.1+ and GPL-3.0+ @@ -50,28 +50,16 @@ Patch13: libgcrypt-1.6.1-fips-cavs.patch #PATCH-FIX-SUSE: bnc#724841, fix a random device opening routine Patch14: libgcrypt-1.6.1-fips-cfgrandom.patch -# add support for SP800-90A DRBG (fate#316929, bnc#856312) -Patch21: v9-0001-SP800-90A-Deterministic-Random-Bit-Generator.patch -Patch22: 0002-Compile-DRBG.patch -Patch23: 0003-Function-definitions-of-interfaces-for-random.c.patch -Patch24: 0004-Invoke-DRBG-from-common-libgcrypt-RNG-code.patch -Patch25: 0005-Function-definitions-for-gcry_control-callbacks.patch -Patch26: 0006-DRBG-specific-gcry_control-requests.patch -Patch27: v9-0007-User-interface-to-DRBG.patch Patch28: libgcrypt-fix-rng.patch Patch29: libgcrypt-init-at-elf-load-fips.patch #PATCH-FIX-SUSE add FIPS CAVS test app for DRBG Patch30: drbg_test.patch -#PATCH-FIX-SUSE bnc#894216 make DSA compliant with FIPS 186-4 -Patch31: libgcrypt-fips-dsa.patch #PATCH-FIX-SUSE run FIPS self-test from constructor Patch32: libgcrypt-fips_run_selftest_at_constructor.patch -#PATCH-FIX-SUSE bnc#896202 make ECDSA compliant with FIPS 186-4 -Patch33: libgcrypt-fips_ecdsa.patch Patch34: libgcrypt-1.6.3-aliasing.patch BuildRequires: automake >= 1.14 BuildRequires: fipscheck -BuildRequires: libgpg-error-devel >= 1.11 +BuildRequires: libgpg-error-devel >= 1.13 BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -107,7 +95,7 @@ Group: Development/Libraries/C and C++ Requires: %{libsoname} = %{version} Requires: glibc-devel -Requires: libgpg-error-devel >= 1.8 +Requires: libgpg-error-devel >= 1.13 Requires(post): %{install_info_prereq} %description devel @@ -155,20 +143,15 @@ %patch5 -p1 %patch7 -p1 %patch12 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 %patch28 -p1 %patch29 -p1 %patch30 -p1 -%patch31 -p1 %patch32 -p1 -%patch33 -p1 +# This patch breaks x86_64 builds but is needed for big-endian +# architectures +%ifarch ppc ppc64 s390 s390x %patch34 -p1 +%endif %patch13 -p1 %patch14 -p1 @@ -176,7 +159,7 @@ echo building with build_hmac256 set to %{build_hmac256} %{?suse_update_config} autoreconf -fi -date=$(date -u +%Y-%m-%dT%H:%M+0000 -r %{SOURCE99}) +date=$(date -u +%{Y}-%{m}-%{dT}%{H}:%{M}+0000 -r %{SOURCE99}) sed -e "s,BUILD_TIMESTAMP=.*,BUILD_TIMESTAMP=$date," -i configure export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)" %configure --with-pic \ @@ -212,7 +195,7 @@ # make check %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +make %{?_smp_mflags} DESTDIR=%{buildroot} install rm %{buildroot}%{_libdir}/%{name}.la # cavs @@ -220,14 +203,11 @@ install -m 0755 %{SOURCE5} %{buildroot}%{cavs_dir} install -m 0755 %{SOURCE6} %{buildroot}%{cavs_dir} -mv %{buildroot}%{_bindir}/fips186_dsa %{buildroot}%{cavs_dir} mv %{buildroot}%{_bindir}/fipsdrv %{buildroot}%{cavs_dir} mv %{buildroot}%{_bindir}/drbg_test %{buildroot}%{cavs_dir} %post -n %{libsoname} -p /sbin/ldconfig - %postun -n %{libsoname} -p /sbin/ldconfig - %post devel %install_info --info-dir=%{_infodir} %{_infodir}/gcrypt.info.gz @@ -248,7 +228,7 @@ %files devel %defattr(-,root,root) %doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README THANKS TODO -%{_infodir}/gcrypt.info.gz +%{_infodir}/gcrypt.info%{ext_info} %{_bindir}/dumpsexp %{_bindir}/mpicalc %{_bindir}/%{name}-config ++++++ drbg_test.patch ++++++ --- /var/tmp/diff_new_pack.rWfFai/_old 2016-08-31 00:00:29.000000000 +0200 +++ /var/tmp/diff_new_pack.rWfFai/_new 2016-08-31 00:00:29.000000000 +0200 @@ -1,9 +1,9 @@ -Index: libgcrypt-1.6.1/tests/drbg_test.c +Index: libgcrypt-1.7.2/tests/drbg_test.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libgcrypt-1.6.1/tests/drbg_test.c 2014-09-02 16:49:42.279449470 +0200 -@@ -0,0 +1,1279 @@ -+/* DRBG test for libgcryt ++++ libgcrypt-1.7.2/tests/drbg_test.c 2016-08-16 16:04:52.289060124 +0200 +@@ -0,0 +1,1332 @@ ++/* DRBG test for libgcrypt + Copyright (C) 2014 Stephan Mueller <smueller(a)chronox.de> + + Compile: @@ -17,69 +17,155 @@ +#include <config.h> +#endif +#include <getopt.h> ++#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <asm/types.h> ++#include <types.h> ++#include <unistd.h> +#include "gcrypt.h" + ++/* The following definitions are taken verbatim from random/random-drbg.c. ++ * libgcrypt upstream removed the public apis from gcrypt.h in ++ * http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=fd13372f… ++ */ ++/****************************************************************** ++ * Constants ++ ******************************************************************/ ++ ++/* ++ * DRBG flags bitmasks ++ * ++ * 31 (B) 28 19 (A) 0 ++ * +-+-+-+--------+---+-----------+-----+ ++ * |~|~|u|~~~~~~~~| 3 | 2 | 1 | ++ * +-+-+-+--------+- -+-----------+-----+ ++ * ctl flg| |drbg use selection flags ++ * ++ */ ++ ++/* Internal state control flags (B) */ ++#define DRBG_PREDICTION_RESIST ((u32)1<<28) ++ ++/* CTR type modifiers (A.1)*/ ++#define DRBG_CTRAES ((u32)1<<0) ++#define DRBG_CTRSERPENT ((u32)1<<1) ++#define DRBG_CTRTWOFISH ((u32)1<<2) ++#define DRBG_CTR_MASK (DRBG_CTRAES | DRBG_CTRSERPENT \ ++ | DRBG_CTRTWOFISH) ++ ++/* HASH type modifiers (A.2)*/ ++#define DRBG_HASHSHA1 ((u32)1<<4) ++#define DRBG_HASHSHA224 ((u32)1<<5) ++#define DRBG_HASHSHA256 ((u32)1<<6) ++#define DRBG_HASHSHA384 ((u32)1<<7) ++#define DRBG_HASHSHA512 ((u32)1<<8) ++#define DRBG_HASH_MASK (DRBG_HASHSHA1 | DRBG_HASHSHA224 \ ++ | DRBG_HASHSHA256 | DRBG_HASHSHA384 \ ++ | DRBG_HASHSHA512) ++/* type modifiers (A.3)*/ ++#define DRBG_HMAC ((u32)1<<12) ++#define DRBG_SYM128 ((u32)1<<13) ++#define DRBG_SYM192 ((u32)1<<14) ++#define DRBG_SYM256 ((u32)1<<15) ++#define DRBG_TYPE_MASK (DRBG_HMAC | DRBG_SYM128 | DRBG_SYM192 \ ++ | DRBG_SYM256) ++#define DRBG_CIPHER_MASK (DRBG_CTR_MASK | DRBG_HASH_MASK \ ++ | DRBG_TYPE_MASK) ++ ++#define DRBG_PR_CTRAES128 (DRBG_PREDICTION_RESIST | DRBG_CTRAES | DRBG_SYM128) ++#define DRBG_PR_CTRAES192 (DRBG_PREDICTION_RESIST | DRBG_CTRAES | DRBG_SYM192) ++#define DRBG_PR_CTRAES256 (DRBG_PREDICTION_RESIST | DRBG_CTRAES | DRBG_SYM256) ++#define DRBG_NOPR_CTRAES128 (DRBG_CTRAES | DRBG_SYM128) ++#define DRBG_NOPR_CTRAES192 (DRBG_CTRAES | DRBG_SYM192) ++#define DRBG_NOPR_CTRAES256 (DRBG_CTRAES | DRBG_SYM256) ++#define DRBG_PR_HASHSHA1 (DRBG_PREDICTION_RESIST | DRBG_HASHSHA1) ++#define DRBG_PR_HASHSHA256 (DRBG_PREDICTION_RESIST | DRBG_HASHSHA256) ++#define DRBG_PR_HASHSHA384 (DRBG_PREDICTION_RESIST | DRBG_HASHSHA384) ++#define DRBG_PR_HASHSHA512 (DRBG_PREDICTION_RESIST | DRBG_HASHSHA512) ++#define DRBG_NOPR_HASHSHA1 (DRBG_HASHSHA1) ++#define DRBG_NOPR_HASHSHA256 (DRBG_HASHSHA256) ++#define DRBG_NOPR_HASHSHA384 (DRBG_HASHSHA384) ++#define DRBG_NOPR_HASHSHA512 (DRBG_HASHSHA512) ++#define DRBG_PR_HMACSHA1 (DRBG_PREDICTION_RESIST | DRBG_HASHSHA1 \ ++ | DRBG_HMAC) ++#define DRBG_PR_HMACSHA256 (DRBG_PREDICTION_RESIST | DRBG_HASHSHA256 \ ++ | DRBG_HMAC) ++#define DRBG_PR_HMACSHA384 (DRBG_PREDICTION_RESIST | DRBG_HASHSHA384 \ ++ | DRBG_HMAC) ++#define DRBG_PR_HMACSHA512 (DRBG_PREDICTION_RESIST | DRBG_HASHSHA512 \ ++ | DRBG_HMAC) ++#define DRBG_NOPR_HMACSHA1 (DRBG_HASHSHA1 | DRBG_HMAC) ++#define DRBG_NOPR_HMACSHA256 (DRBG_HASHSHA256 | DRBG_HMAC) ++#define DRBG_NOPR_HMACSHA384 (DRBG_HASHSHA384 | DRBG_HMAC) ++#define DRBG_NOPR_HMACSHA512 (DRBG_HASHSHA512 | DRBG_HMAC) ++ ++ ++/* The default DRGB type. */ ++#define DRBG_DEFAULT_TYPE DRBG_NOPR_HMACSHA256 ++ +#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) + -+/* bin/hex conversion stolen from OpenSSL */ -+static int bin2hex(const unsigned char *in,int len,char *out) ++static char hex_char_map_l[] = { '0', '1', '2', '3', '4', '5', '6', '7', ++ '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; ++static char hex_char_map_u[] = { '0', '1', '2', '3', '4', '5', '6', '7', ++ '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; ++static char hex_char(unsigned int bin, int u) +{ -+ int n1, n2; -+ unsigned char ch; ++ if (bin < sizeof(hex_char_map_l)) ++ return (u) ? hex_char_map_u[bin] : hex_char_map_l[bin]; ++ return 'X'; ++} + -+ for (n1=0,n2=0 ; n1 < len ; ++n1) -+ { -+ ch=in[n1] >> 4; -+ if (ch <= 0x09) -+ out[n2++]=ch+'0'; -+ else -+ out[n2++]=ch-10+'a'; -+ ch=in[n1] & 0x0f; -+ if(ch <= 0x09) -+ out[n2++]=ch+'0'; -+ else -+ out[n2++]=ch-10+'a'; ++/* ++ * Convert binary string into hex representation ++ * @bin input buffer with binary data ++ * @binlen length of bin ++ * @hex output buffer to store hex data ++ * @hexlen length of already allocated hex buffer (should be at least ++ * twice binlen -- if not, only a fraction of binlen is converted) ++ * @u case of hex characters (0=>lower case, 1=>upper case) ++ */ ++static void bin2hex(const unsigned char *bin, size_t binlen, ++ char *hex, size_t hexlen, int u) ++{ ++ size_t i = 0; ++ size_t chars = (binlen > (hexlen / 2)) ? (hexlen / 2) : binlen; ++ ++ for (i = 0; i < chars; i++) { ++ hex[(i*2)] = hex_char((bin[i] >> 4), u); ++ hex[((i*2)+1)] = hex_char((bin[i] & 0x0f), u); + } -+ out[n2]='\0'; -+ return n2; +} + -+int hex2bin(const char *in, unsigned char *out) ++static int bin_char(unsigned char hex) +{ -+ int n1, n2; -+ unsigned char ch; ++ if (48 <= hex && 57 >= hex) ++ return (hex - 48); ++ if (65 <= hex && 70 >= hex) ++ return (hex - 55); ++ if (97 <= hex && 102 >= hex) ++ return (hex - 87); ++ return 0; ++} ++/* ++ * Convert hex representation into binary string ++ * @hex input buffer with hex representation ++ * @hexlen length of hex ++ * @bin output buffer with binary data ++ * @binlen length of already allocated bin buffer (should be at least ++ * half of hexlen -- if not, only a fraction of hexlen is converted) ++ */ ++static void hex2bin(const unsigned char *hex, size_t hexlen, ++ unsigned char *bin, size_t binlen) ++{ ++ size_t i = 0; ++ size_t chars = (binlen > (hexlen / 2)) ? (hexlen / 2) : binlen; + -+ for (n1=0,n2=0 ; in[n1] && in[n1] != '\n' ; ) -+ { /* first byte */ -+ if ((in[n1] >= '0') && (in[n1] <= '9')) -+ ch = in[n1++] - '0'; -+ else if ((in[n1] >= 'A') && (in[n1] <= 'F')) -+ ch = in[n1++] - 'A' + 10; -+ else if ((in[n1] >= 'a') && (in[n1] <= 'f')) -+ ch = in[n1++] - 'a' + 10; -+ else -+ return -1; -+ if(!in[n1]) -+ { -+ out[n2++]=ch; -+ break; -+ } -+ out[n2] = ch << 4; -+ /* second byte */ -+ if ((in[n1] >= '0') && (in[n1] <= '9')) -+ ch = in[n1++] - '0'; -+ else if ((in[n1] >= 'A') && (in[n1] <= 'F')) -+ ch = in[n1++] - 'A' + 10; -+ else if ((in[n1] >= 'a') && (in[n1] <= 'f')) -+ ch = in[n1++] - 'a' + 10; -+ else -+ return -1; -+ out[n2++] |= ch; ++ for (i = 0; i < chars; i++) { ++ bin[i] = bin_char(hex[(i*2)]) << 4; ++ bin[i] |= bin_char(hex[((i*2)+1)]); + } -+ return n2; +} + +/* Print a error message and exit the process with an error code. */ @@ -95,7 +181,7 @@ +} + + -+struct drbg_test_vector ++struct gcry_drbg_test_vector +{ + u_int32_t flags; /* flags selecting the DRBG type */ + unsigned char *entropy; /* entropy string for initialization -- this @@ -120,7 +206,7 @@ + size_t expectedlen; /* length of expected random value */ +}; + -+struct drbg_test_vector drbg_test_pr[] = { ++struct gcry_drbg_test_vector drbg_test_pr[] = { + { + .flags = (DRBG_PR_HASHSHA256), + .entropy = (unsigned char *) @@ -549,7 +635,7 @@ + }, +}; + -+struct drbg_test_vector drbg_test_nopr[] = { ++struct gcry_drbg_test_vector drbg_test_nopr[] = { + { + .flags = DRBG_NOPR_HASHSHA256, + .entropy = (unsigned char *) @@ -927,57 +1013,22 @@ + }, +}; + -+ -+/* -+ * CAVS Test driver -+ * -+ * @test: one test vector -+ * @pr: true/false for enabling or disabling prediction resistance -+ */ -+int drbg_cavs_test(struct drbg_test_vector *test, unsigned char *buf, -+ size_t buflen) -+{ -+ int ret = -1; -+ struct drbg_test_data test_data; -+ struct drbg_string addtl, pers, testentropy; -+ -+ test_data.testentropy = &testentropy; -+ drbg_string_fill(&testentropy, test->entropy, test->entropylen); -+ drbg_string_fill(&pers, test->pers, test->perslen); -+ ret = gcry_control(GCRYCTL_DRBG_REINIT, test->flags, &pers, &test_data); -+ if(ret) -+ { -+ printf("Test FAIL: re-init DRBG with test entropy\n"); -+ return ret; -+ } -+ -+ drbg_string_fill(&addtl, test->addtla, test->addtllen); -+ if(test->entpra) -+ drbg_string_fill(&testentropy, test->entpra, test->entprlen); -+ gcry_randomize_drbg_test(buf, buflen, GCRY_STRONG_RANDOM, &addtl, -+ &test_data); -+ -+ drbg_string_fill(&addtl, test->addtlb, test->addtllen); -+ if(test->entpra) -+ drbg_string_fill(&testentropy, test->entprb, test->entprlen); -+ -+ gcry_randomize_drbg_test(buf, buflen, GCRY_STRONG_RANDOM, &addtl, -+ &test_data); -+ -+ return ret; -+} -+ +struct drbg_flags +{ + u_int32_t flags; +}; + ++gpg_err_code_t ++gcry_drbg_cavs_test (struct gcry_drbg_test_vector *test, unsigned char *buf); ++extern gpg_err_code_t ++gcry_drbg_healthcheck_one (struct gcry_drbg_test_vector *test); ++ +void builtin_test(void) +{ + /* this must be larger than 128 as otherwise there is a crash */ +#define OUTLEN 150 + char rndbuf[OUTLEN]; -+ char out[200]; ++ char out[(OUTLEN * 2 + 1)]; + int i = 0; + int ret = 0; + int result = 0; @@ -1013,8 +1064,10 @@ + if(0 == ret) + { + printf("Test PASS: enabling DRBG %d\n", i); ++ memset(rndbuf, 0, OUTLEN); + gcry_randomize(&rndbuf, OUTLEN, GCRY_STRONG_RANDOM); -+ bin2hex(rndbuf, OUTLEN, out); ++ memset(out, 0, sizeof(out)); ++ bin2hex(rndbuf, OUTLEN, out, sizeof(out), 0); + printf("Test PASS: gcry_randomize generated strong random bytes for DRBG %d: %s\n", i, out); + } + else @@ -1033,8 +1086,7 @@ + for(i = 0; ARRAY_SIZE(drbg_test_nopr) > i; i++) + { + memset(rndbuf, 0, drbg_test_nopr[i].expectedlen); -+ drbg_cavs_test(&drbg_test_nopr[i], rndbuf, drbg_test_nopr[i].expectedlen); -+ ret = memcmp(drbg_test_nopr[i].expected, rndbuf, drbg_test_nopr[i].expectedlen); ++ ret = gcry_control(75, &drbg_test_nopr[i], NULL); + if(ret) + printf("CAVS test (nopr) FAILED %d, testdef %d\n", ret, i); + else @@ -1045,8 +1097,7 @@ + for(i = 0; ARRAY_SIZE(drbg_test_pr) > i; i++) + { + memset(rndbuf, 0, drbg_test_pr[i].expectedlen); -+ drbg_cavs_test(&drbg_test_pr[i], rndbuf, drbg_test_pr[i].expectedlen); -+ ret = memcmp(drbg_test_pr[i].expected, rndbuf, drbg_test_pr[i].expectedlen); ++ ret = gcry_control(75, &drbg_test_pr[i], NULL); + if(ret) + printf("CAVS test (pr) FAILED %d, testdef %d\n", ret, i); + else @@ -1076,7 +1127,7 @@ + +} + -+static void generate_test(struct drbg_test_vector *test) ++static void generate_test(struct gcry_drbg_test_vector *test) +{ + unsigned char *buf; +#define DATALEN 10 @@ -1090,7 +1141,7 @@ + + if (test && test->flags) + { -+ if (gcry_control(GCRYCTL_DRBG_REINIT, test->flags, NULL, NULL)) ++ if (gcry_control(GCRYCTL_DRBG_REINIT, test->flags, NULL)) + { + printf("Test FAIL: re-init DRBG with test entropy\n"); + return; @@ -1108,6 +1159,7 @@ + } + + gcry_randomize(buf, len, GCRY_STRONG_RANDOM); ++ write(1, buf, len); + free (buf); + } +} @@ -1140,7 +1192,7 @@ + } + + tmp = drbg_malloc(tmplen); -+ hex2bin(in, tmp); ++ hex2bin(in, strlen(in), tmp, tmplen); + *out = tmp; + *len = tmplen; +} @@ -1167,13 +1219,12 @@ +main (int argc, char **argv) +{ + int c = 0; -+ long len = 0; + unsigned char *buf; + unsigned char *outbuf; -+ struct drbg_test_vector exttest; ++ struct gcry_drbg_test_vector exttest; +#define MAXDATA 256 + -+ memset(&exttest, 0, sizeof(struct drbg_test_vector)); ++ memset(&exttest, 0, sizeof(struct gcry_drbg_test_vector)); + gcry_control (GCRYCTL_SET_VERBOSITY, 2); + gcry_control (GCRYCTL_FORCE_FIPS_MODE, 0); + if (!gcry_check_version ("1.5.0")) @@ -1233,32 +1284,34 @@ + hex2bin_m(optarg, &exttest.pers, &exttest.perslen); + break; + case 'l': -+ len = atol(optarg); ++ exttest.expectedlen = atoi(optarg); + break; + default: + usage(); + } + } + -+ if (0 >= len) ++ if (0 >= exttest.expectedlen) + usage(); + -+ buf = malloc(len); ++ buf = malloc(exttest.expectedlen); + if(!buf) { -+ fprintf(stderr, "Cannot allocate %li bytes\n", len); ++ fprintf(stderr, "Cannot allocate %li bytes\n", exttest.expectedlen); + return -1; + } -+ outbuf = malloc(len * 2 + 1); ++ outbuf = malloc(exttest.expectedlen * 2 + 1); + if(!outbuf) { -+ fprintf(stderr, "Cannot allocate %li bytes\n", (len*2+1)); ++ fprintf(stderr, "Cannot allocate %li bytes\n", ++ (exttest.expectedlen*2+1)); + return -1; + } -+ memset(outbuf, 0, len * 2 + 1); ++ memset(outbuf, 0, exttest.expectedlen * 2 + 1); + if (exttest.entropy) -+ drbg_cavs_test(&exttest, buf, len); ++ gcry_control(75, &exttest, buf); + else -+ gcry_randomize(buf, len, GCRY_STRONG_RANDOM); -+ bin2hex(buf, len, outbuf); ++ gcry_randomize(buf, exttest.expectedlen, GCRY_STRONG_RANDOM); ++ bin2hex(buf, exttest.expectedlen, ++ outbuf, exttest.expectedlen * 2 + 1, 0); + + printf("%s\n", outbuf); + @@ -1282,11 +1335,11 @@ + return 0; +} + -Index: libgcrypt-1.6.1/Makefile.am +Index: libgcrypt-1.7.2/Makefile.am =================================================================== ---- libgcrypt-1.6.1.orig/Makefile.am 2014-01-12 12:19:50.000000000 +0100 -+++ libgcrypt-1.6.1/Makefile.am 2014-09-02 16:51:10.315504510 +0200 -@@ -36,6 +36,14 @@ EXTRA_DIST = autogen.sh autogen.rc READM +--- libgcrypt-1.7.2.orig/Makefile.am 2016-08-16 15:57:43.397736723 +0200 ++++ libgcrypt-1.7.2/Makefile.am 2016-08-16 15:57:44.341752563 +0200 +@@ -42,6 +42,14 @@ EXTRA_DIST = autogen.sh autogen.rc READM DISTCLEANFILES = ++++++ libgcrypt-1.6.1-fips-cavs.patch ++++++ --- /var/tmp/diff_new_pack.rWfFai/_old 2016-08-31 00:00:29.000000000 +0200 +++ /var/tmp/diff_new_pack.rWfFai/_new 2016-08-31 00:00:29.000000000 +0200 @@ -1,6 +1,7 @@ -diff -up libgcrypt-1.6.1/tests/cavs_driver.pl.cavs libgcrypt-1.6.1/tests/cavs_driver.pl ---- libgcrypt-1.6.1/tests/cavs_driver.pl.cavs 2013-03-15 20:25:38.000000000 +0100 -+++ libgcrypt-1.6.1/tests/cavs_driver.pl 2014-02-28 14:46:16.436544639 +0100 +Index: libgcrypt-1.7.2/tests/cavs_driver.pl +=================================================================== +--- libgcrypt-1.7.2.orig/tests/cavs_driver.pl ++++ libgcrypt-1.7.2/tests/cavs_driver.pl @@ -1,9 +1,11 @@ #!/usr/bin/env perl # @@ -674,9 +675,10 @@ $dsa_sign = \&libgcrypt_dsa_sign; $dsa_verify = \&libgcrypt_dsa_verify; $dsa_genpubkey = \&libgcrypt_dsa_genpubkey; -diff -up libgcrypt-1.6.1/tests/cavs_tests.sh.cavs libgcrypt-1.6.1/tests/cavs_tests.sh ---- libgcrypt-1.6.1/tests/cavs_tests.sh.cavs 2013-03-15 20:25:38.000000000 +0100 -+++ libgcrypt-1.6.1/tests/cavs_tests.sh 2014-02-28 14:46:16.437544662 +0100 +Index: libgcrypt-1.7.2/tests/cavs_tests.sh +=================================================================== +--- libgcrypt-1.7.2.orig/tests/cavs_tests.sh ++++ libgcrypt-1.7.2/tests/cavs_tests.sh @@ -55,7 +55,7 @@ function run_one_test () { [ -d "$respdir" ] || mkdir "$respdir" [ -f "$rspfile" ] && rm "$rspfile" @@ -686,10 +688,11 @@ dflag="-D" fi -diff -up libgcrypt-1.6.1/tests/fipsdrv.c.cavs libgcrypt-1.6.1/tests/fipsdrv.c ---- libgcrypt-1.6.1/tests/fipsdrv.c.cavs 2013-12-16 18:44:32.000000000 +0100 -+++ libgcrypt-1.6.1/tests/fipsdrv.c 2014-02-28 14:46:16.437544662 +0100 -@@ -893,6 +893,9 @@ print_mpi_line (gcry_mpi_t a, int no_lz) +Index: libgcrypt-1.7.2/tests/fipsdrv.c +=================================================================== +--- libgcrypt-1.7.2.orig/tests/fipsdrv.c ++++ libgcrypt-1.7.2/tests/fipsdrv.c +@@ -892,6 +892,9 @@ print_mpi_line (gcry_mpi_t a, int no_lz) die ("gcry_mpi_aprint failed: %s\n", gpg_strerror (err)); p = buf; @@ -699,7 +702,7 @@ if (no_lz && p[0] == '0' && p[1] == '0' && p[2]) p += 2; -@@ -1675,14 +1678,14 @@ run_rsa_verify (const void *data, size_t +@@ -1765,14 +1768,14 @@ run_rsa_verify (const void *data, size_t /* Generate a DSA key of size KEYSIZE and return the complete S-expression. */ static gcry_sexp_t @@ -717,7 +720,7 @@ if (err) die ("gcry_sexp_build failed for DSA key generation: %s\n", gpg_strerror (err)); -@@ -1700,7 +1703,7 @@ dsa_gen (int keysize) +@@ -1790,7 +1793,7 @@ dsa_gen (int keysize) /* Generate a DSA key of size KEYSIZE and return the complete S-expression. */ static gcry_sexp_t @@ -726,7 +729,7 @@ { gpg_error_t err; gcry_sexp_t keyspec, key; -@@ -1709,10 +1712,11 @@ dsa_gen_with_seed (int keysize, const vo +@@ -1799,10 +1802,11 @@ dsa_gen_with_seed (int keysize, const vo "(genkey" " (dsa" " (nbits %d)" @@ -740,7 +743,7 @@ if (err) die ("gcry_sexp_build failed for DSA key generation: %s\n", gpg_strerror (err)); -@@ -1720,6 +1724,37 @@ dsa_gen_with_seed (int keysize, const vo +@@ -1810,6 +1814,37 @@ dsa_gen_with_seed (int keysize, const vo err = gcry_pk_genkey (&key, keyspec); if (err) die ("gcry_pk_genkey failed for DSA: %s\n", gpg_strerror (err)); @@ -778,7 +781,7 @@ gcry_sexp_release (keyspec); -@@ -1732,7 +1767,7 @@ dsa_gen_with_seed (int keysize, const vo +@@ -1849,7 +1884,7 @@ ecdsa_gen_key (const char *curve) with one parameter per line in hex format using this order: p, q, g, seed, counter, h. */ static void @@ -787,7 +790,7 @@ { gcry_sexp_t l1, l2; gcry_mpi_t mpi; -@@ -1768,6 +1803,9 @@ print_dsa_domain_parameters (gcry_sexp_t +@@ -1885,6 +1920,9 @@ print_dsa_domain_parameters (gcry_sexp_t } gcry_sexp_release (l1); @@ -797,7 +800,7 @@ /* Extract the seed values. */ l1 = gcry_sexp_find_token (key, "misc-key-info", 0); if (!l1) -@@ -1819,38 +1857,106 @@ print_dsa_domain_parameters (gcry_sexp_t +@@ -1976,38 +2014,106 @@ print_ecdsa_dq (gcry_sexp_t key) } @@ -914,7 +917,7 @@ fp = fopen (filename, "wb"); if (!fp) -@@ -1863,6 +1969,53 @@ run_dsa_gen (int keysize, const char *fi +@@ -2020,6 +2126,53 @@ run_dsa_gen (int keysize, const char *fi } @@ -968,7 +971,7 @@ /* Sign DATA of length DATALEN using the key taken from the S-expression encoded KEYFILE. */ -@@ -1872,11 +2025,16 @@ run_dsa_sign (const void *data, size_t d +@@ -2029,11 +2182,16 @@ run_dsa_sign (const void *data, size_t d { gpg_error_t err; gcry_sexp_t s_data, s_key, s_sig, s_tmp, s_tmp2; @@ -988,7 +991,7 @@ if (!err) { err = gcry_sexp_build (&s_data, NULL, -@@ -1887,8 +2045,6 @@ run_dsa_sign (const void *data, size_t d +@@ -2044,8 +2202,6 @@ run_dsa_sign (const void *data, size_t d die ("gcry_sexp_build failed for DSA data input: %s\n", gpg_strerror (err)); @@ -997,7 +1000,7 @@ err = gcry_pk_sign (&s_sig, s_data, s_key); if (err) { -@@ -1964,13 +2120,18 @@ run_dsa_verify (const void *data, size_t +@@ -2121,13 +2277,18 @@ run_dsa_verify (const void *data, size_t { gpg_error_t err; gcry_sexp_t s_data, s_key, s_sig; @@ -1005,11 +1008,11 @@ + char hash[128]; gcry_mpi_t tmpmpi; + int algo; -+ -+ s_key = read_sexp_from_file (keyfile); -+ algo = dsa_hash_from_key(s_key); - gcry_md_hash_buffer (GCRY_MD_SHA1, hash, data, datalen); ++ s_key = read_sexp_from_file (keyfile); ++ algo = dsa_hash_from_key(s_key); ++ + gcry_md_hash_buffer (algo, hash, data, datalen); /* Note that we can't simply use %b with HASH to build the S-expression, because that might yield a negative value. */ @@ -1019,7 +1022,7 @@ if (!err) { err = gcry_sexp_build (&s_data, NULL, -@@ -1981,7 +2142,6 @@ run_dsa_verify (const void *data, size_t +@@ -2138,7 +2299,6 @@ run_dsa_verify (const void *data, size_t die ("gcry_sexp_build failed for DSA data input: %s\n", gpg_strerror (err)); @@ -1027,24 +1030,24 @@ s_sig = read_sexp_from_file (sigfile); err = gcry_pk_verify (s_sig, s_data, s_key); -@@ -2014,7 +2174,7 @@ usage (int show_help) - "Run a crypto operation using hex encoded input and output.\n" +@@ -2304,7 +2464,7 @@ usage (int show_help) "MODE:\n" " encrypt, decrypt, digest, random, hmac-sha,\n" -- " rsa-{derive,gen,sign,verify}, dsa-{pqg-gen,gen,sign,verify}\n" -+ " rsa-{derive,gen,sign,verify}, dsa-{pq-gen,g-gen,gen,sign,verify}\n" + " rsa-{derive,gen,sign,verify},\n" +- " dsa-{pqg-gen,gen,sign,verify}, ecdsa-{gen-key,sign,verify}\n" ++ " dsa-{pq-gen,g-gen,gen,sign,verify}, ecdsa-{gen-key,sign,verify}\n" "OPTIONS:\n" " --verbose Print additional information\n" " --binary Input and output is in binary form\n" -@@ -2024,6 +2184,7 @@ usage (int show_help) - " --dt DT Use the hex encoded DT for the RNG\n" +@@ -2315,6 +2475,7 @@ usage (int show_help) " --algo NAME Use algorithm NAME\n" + " --curve NAME Select ECC curve spec NAME\n" " --keysize N Use a keysize of N bits\n" + " --qize N Use a DSA q parameter size of N bits\n" " --signature NAME Take signature from file NAME\n" " --chunk N Read in chunks of N bytes (implies --binary)\n" " --pkcs1 Use PKCS#1 encoding\n" -@@ -2050,6 +2211,7 @@ main (int argc, char **argv) +@@ -2344,6 +2505,7 @@ main (int argc, char **argv) const char *dt_string = NULL; const char *algo_string = NULL; const char *keysize_string = NULL; @@ -1052,7 +1055,7 @@ const char *signature_string = NULL; FILE *input; void *data; -@@ -2143,6 +2305,14 @@ main (int argc, char **argv) +@@ -2437,6 +2599,14 @@ main (int argc, char **argv) keysize_string = *argv; argc--; argv++; } @@ -1067,17 +1070,16 @@ else if (!strcmp (*argv, "--signature")) { argc--; argv++; -@@ -2463,23 +2633,49 @@ main (int argc, char **argv) +@@ -2792,23 +2962,49 @@ main (int argc, char **argv) } else if (!strcmp (mode_string, "dsa-pqg-gen")) { - int keysize; + int keysize, qsize; - - keysize = keysize_string? atoi (keysize_string) : 0; - if (keysize < 1024 || keysize > 3072) - die ("invalid keysize specified; needs to be 1024 .. 3072\n"); -- run_dsa_pqg_gen (keysize, datalen? data:NULL, datalen); ++ ++ keysize = keysize_string? atoi (keysize_string) : 0; ++ if (keysize < 1024 || keysize > 3072) ++ die ("invalid keysize specified; needs to be 1024 .. 3072\n"); + qsize = qsize_string? atoi (qsize_string) : 0; + if (qsize < 160 || qsize > 256) + die ("invalid qsize specified; needs to be 160 .. 256\n"); @@ -1086,10 +1088,11 @@ + else if (!strcmp (mode_string, "dsa-g-gen")) + { + int keysize, qsize; -+ -+ keysize = keysize_string? atoi (keysize_string) : 0; -+ if (keysize < 1024 || keysize > 3072) -+ die ("invalid keysize specified; needs to be 1024 .. 3072\n"); + + keysize = keysize_string? atoi (keysize_string) : 0; + if (keysize < 1024 || keysize > 3072) + die ("invalid keysize specified; needs to be 1024 .. 3072\n"); +- run_dsa_pqg_gen (keysize, datalen? data:NULL, datalen); + qsize = qsize_string? atoi (qsize_string) : 0; + if (qsize < 160 || qsize > 256) + die ("invalid qsize specified; needs to be 160 .. 256\n"); ++++++ libgcrypt-1.6.1-fips-cfgrandom.patch ++++++ --- /var/tmp/diff_new_pack.rWfFai/_old 2016-08-31 00:00:29.000000000 +0200 +++ /var/tmp/diff_new_pack.rWfFai/_new 2016-08-31 00:00:29.000000000 +0200 @@ -1,55 +1,8 @@ -Index: libgcrypt-1.6.1/random/random-fips.c +Index: libgcrypt-1.7.2/random/rndlinux.c =================================================================== ---- libgcrypt-1.6.1.orig/random/random-fips.c -+++ libgcrypt-1.6.1/random/random-fips.c -@@ -27,10 +27,10 @@ - There are 3 random context which map to the different levels of - random quality: - -- Generator Seed and Key Kernel entropy (init/reseed) -- ------------------------------------------------------------ -- GCRY_VERY_STRONG_RANDOM /dev/random 256/128 bits -- GCRY_STRONG_RANDOM /dev/random 256/128 bits -+ Generator Seed and Key Kernel entropy (init/reseed) -+ --------------------------------------------------------------------------------------- -+ GCRY_VERY_STRONG_RANDOM /etc/gcrypt/rngseed+/dev/urandom 256/128 bits -+ GCRY_STRONG_RANDOM /etc/gcrypt/rngseed+/dev/urandom 256/128 bits - gcry_create_nonce GCRY_STRONG_RANDOM n/a - - All random generators return their data in 128 bit blocks. If the -@@ -40,8 +40,10 @@ - (SEED_TTL) output blocks; the re-seeding is disabled in test mode. - - The GCRY_VERY_STRONG_RANDOM and GCRY_STRONG_RANDOM generators are -- keyed and seeded from the /dev/random device. Thus these -- generators may block until the kernel has collected enough entropy. -+ keyed and seeded with data that is loaded from the /etc/gcrypt/rngseed -+ if the device or symlink to device exists xored with the data -+ from the /dev/urandom device. This allows the system administrator -+ to always seed the RNGs from /dev/random if it is required. - - The gcry_create_nonce generator is keyed and seeded from the - GCRY_STRONG_RANDOM generator. It may also block if the -@@ -560,9 +562,13 @@ get_entropy (size_t nbytes) - entropy_collect_buffer_len = 0; - - #if USE_RNDLINUX -+ _gcry_rndlinux_gather_random (entropy_collect_cb, 0, -+ X931_AES_KEYLEN, -+ -1); -+ entropy_collect_buffer_len = 0; - rc = _gcry_rndlinux_gather_random (entropy_collect_cb, 0, - X931_AES_KEYLEN, -- GCRY_VERY_STRONG_RANDOM); -+ GCRY_STRONG_RANDOM); - #elif USE_RNDW32 - do - { -Index: libgcrypt-1.6.1/random/rndlinux.c -=================================================================== ---- libgcrypt-1.6.1.orig/random/rndlinux.c -+++ libgcrypt-1.6.1/random/rndlinux.c -@@ -36,7 +36,9 @@ +--- libgcrypt-1.7.2.orig/random/rndlinux.c ++++ libgcrypt-1.7.2/random/rndlinux.c +@@ -40,7 +40,9 @@ #include "g10lib.h" #include "rand-internal.h" @@ -60,7 +13,7 @@ static int -@@ -59,7 +61,7 @@ set_cloexec_flag (int fd) +@@ -63,7 +65,7 @@ set_cloexec_flag (int fd) * a fatal error but retries until it is able to reopen the device. */ static int @@ -69,7 +22,7 @@ { int fd; -@@ -67,6 +69,8 @@ open_device (const char *name, int retry +@@ -71,6 +73,8 @@ open_device (const char *name, int retry _gcry_random_progress ("open_dev_random", 'X', 1, 0); again: fd = open (name, O_RDONLY); @@ -78,7 +31,7 @@ if (fd == -1 && retry) { struct timeval tv; -@@ -111,6 +115,7 @@ _gcry_rndlinux_gather_random (void (*add +@@ -115,6 +119,7 @@ _gcry_rndlinux_gather_random (void (*add { static int fd_urandom = -1; static int fd_random = -1; @@ -86,7 +39,7 @@ static unsigned char ever_opened; int fd; int n; -@@ -134,6 +139,11 @@ _gcry_rndlinux_gather_random (void (*add +@@ -138,6 +143,11 @@ _gcry_rndlinux_gather_random (void (*add close (fd_urandom); fd_urandom = -1; } @@ -98,7 +51,7 @@ return 0; } -@@ -153,20 +163,30 @@ _gcry_rndlinux_gather_random (void (*add +@@ -165,20 +175,30 @@ _gcry_rndlinux_gather_random (void (*add that we always require the device to be existent but want a more graceful behaviour if the rarely needed close operation has been used and the device needs to be re-opened later. */ ++++++ libgcrypt-1.6.3-aliasing.patch ++++++ --- /var/tmp/diff_new_pack.rWfFai/_old 2016-08-31 00:00:29.000000000 +0200 +++ /var/tmp/diff_new_pack.rWfFai/_new 2016-08-31 00:00:29.000000000 +0200 @@ -1,7 +1,8 @@ -diff -up libgcrypt-1.6.3/cipher/bufhelp.h.aliasing libgcrypt-1.6.3/cipher/bufhelp.h ---- libgcrypt-1.6.3/cipher/bufhelp.h.aliasing 2015-02-27 10:54:03.000000000 +0100 -+++ libgcrypt-1.6.3/cipher/bufhelp.h 2015-03-13 15:03:43.301749751 +0100 -@@ -80,7 +80,7 @@ do_bytes: +Index: libgcrypt-1.7.2/cipher/bufhelp.h +=================================================================== +--- libgcrypt-1.7.2.orig/cipher/bufhelp.h ++++ libgcrypt-1.7.2/cipher/bufhelp.h +@@ -91,7 +91,7 @@ do_bytes: for (; len; len--) *dst++ = *src++; #endif /*__GNUC__ >= 4 && (__x86_64__ || __i386__)*/ @@ -10,7 +11,7 @@ /* Optimized function for buffer xoring */ -@@ -117,7 +117,7 @@ do_bytes: +@@ -128,7 +128,7 @@ do_bytes: /* Handle tail. */ for (; len; len--) *dst++ = *src1++ ^ *src2++; @@ -18,8 +19,8 @@ +} __attribute__ ((optimize("no-strict-aliasing"))) - /* Optimized function for buffer xoring with two destination buffers. Used -@@ -155,7 +155,7 @@ do_bytes: + /* Optimized function for in-place buffer xoring. */ +@@ -200,7 +200,7 @@ do_bytes: /* Handle tail. */ for (; len; len--) *dst1++ = (*dst2++ ^= *src++); @@ -28,7 +29,7 @@ /* Optimized function for combined buffer xoring and copying. Used by mainly -@@ -208,7 +208,7 @@ do_bytes: +@@ -253,7 +253,7 @@ do_bytes: *dst_xor++ = *srcdst_cpy ^ *src_xor++; *srcdst_cpy++ = temp; } @@ -37,7 +38,7 @@ /* Optimized function for combined buffer xoring and copying. Used by mainly -@@ -234,7 +234,7 @@ buf_eq_const(const void *_a, const void +@@ -279,7 +279,7 @@ buf_eq_const(const void *_a, const void diff -= !!(a[i] - b[i]); return !diff; @@ -46,7 +47,7 @@ #ifndef BUFHELP_FAST_UNALIGNED_ACCESS -@@ -246,14 +246,14 @@ static inline u32 buf_get_be32(const voi +@@ -291,14 +291,14 @@ static inline u32 buf_get_be32(const voi const byte *in = _buf; return ((u32)in[0] << 24) | ((u32)in[1] << 16) | \ ((u32)in[2] << 8) | (u32)in[3]; @@ -63,7 +64,7 @@ static inline void buf_put_be32(void *_buf, u32 val) { -@@ -262,7 +262,7 @@ static inline void buf_put_be32(void *_b +@@ -307,7 +307,7 @@ static inline void buf_put_be32(void *_b out[1] = val >> 16; out[2] = val >> 8; out[3] = val; @@ -72,16 +73,16 @@ static inline void buf_put_le32(void *_buf, u32 val) { -@@ -271,7 +271,7 @@ static inline void buf_put_le32(void *_b +@@ -316,7 +316,7 @@ static inline void buf_put_le32(void *_b out[2] = val >> 16; out[1] = val >> 8; out[0] = val; -} +} __attribute__ ((optimize("no-strict-aliasing"))) - #ifdef HAVE_U64_TYPEDEF + /* Functions for loading and storing unaligned u64 values of different -@@ -283,7 +283,7 @@ static inline u64 buf_get_be64(const voi +@@ -328,7 +328,7 @@ static inline u64 buf_get_be64(const voi ((u64)in[2] << 40) | ((u64)in[3] << 32) | \ ((u64)in[4] << 24) | ((u64)in[5] << 16) | \ ((u64)in[6] << 8) | (u64)in[7]; @@ -90,7 +91,7 @@ static inline u64 buf_get_le64(const void *_buf) { -@@ -292,7 +292,7 @@ static inline u64 buf_get_le64(const voi +@@ -337,7 +337,7 @@ static inline u64 buf_get_le64(const voi ((u64)in[5] << 40) | ((u64)in[4] << 32) | \ ((u64)in[3] << 24) | ((u64)in[2] << 16) | \ ((u64)in[1] << 8) | (u64)in[0]; @@ -99,7 +100,7 @@ static inline void buf_put_be64(void *_buf, u64 val) { -@@ -305,7 +305,7 @@ static inline void buf_put_be64(void *_b +@@ -350,7 +350,7 @@ static inline void buf_put_be64(void *_b out[5] = val >> 16; out[6] = val >> 8; out[7] = val; @@ -108,70 +109,70 @@ static inline void buf_put_le64(void *_buf, u64 val) { -@@ -318,7 +318,7 @@ static inline void buf_put_le64(void *_b +@@ -363,7 +363,7 @@ static inline void buf_put_le64(void *_b out[2] = val >> 16; out[1] = val >> 8; out[0] = val; -} +} __attribute__ ((optimize("no-strict-aliasing"))) - #endif /*HAVE_U64_TYPEDEF*/ #else /*BUFHELP_FAST_UNALIGNED_ACCESS*/ -@@ -328,24 +328,24 @@ static inline void buf_put_le64(void *_b + +@@ -377,24 +377,24 @@ typedef struct bufhelp_u32_s static inline u32 buf_get_be32(const void *_buf) { - return be_bswap32(*(const u32 *)_buf); + return be_bswap32(((const bufhelp_u32_t *)_buf)->a); -} +} __attribute__ ((optimize("no-strict-aliasing"))) static inline u32 buf_get_le32(const void *_buf) { - return le_bswap32(*(const u32 *)_buf); + return le_bswap32(((const bufhelp_u32_t *)_buf)->a); -} +} __attribute__ ((optimize("no-strict-aliasing"))) static inline void buf_put_be32(void *_buf, u32 val) { - u32 *out = _buf; - *out = be_bswap32(val); + bufhelp_u32_t *out = _buf; + out->a = be_bswap32(val); -} +} __attribute__ ((optimize("no-strict-aliasing"))) static inline void buf_put_le32(void *_buf, u32 val) { - u32 *out = _buf; - *out = le_bswap32(val); + bufhelp_u32_t *out = _buf; + out->a = le_bswap32(val); -} +} __attribute__ ((optimize("no-strict-aliasing"))) - #ifdef HAVE_U64_TYPEDEF - /* Functions for loading and storing unaligned u64 values of different -@@ -353,24 +353,24 @@ static inline void buf_put_le32(void *_b + + typedef struct bufhelp_u64_s +@@ -407,24 +407,24 @@ typedef struct bufhelp_u64_s static inline u64 buf_get_be64(const void *_buf) { - return be_bswap64(*(const u64 *)_buf); + return be_bswap64(((const bufhelp_u64_t *)_buf)->a); -} +} __attribute__ ((optimize("no-strict-aliasing"))) static inline u64 buf_get_le64(const void *_buf) { - return le_bswap64(*(const u64 *)_buf); + return le_bswap64(((const bufhelp_u64_t *)_buf)->a); -} +} __attribute__ ((optimize("no-strict-aliasing"))) static inline void buf_put_be64(void *_buf, u64 val) { - u64 *out = _buf; - *out = be_bswap64(val); + bufhelp_u64_t *out = _buf; + out->a = be_bswap64(val); -} +} __attribute__ ((optimize("no-strict-aliasing"))) static inline void buf_put_le64(void *_buf, u64 val) { - u64 *out = _buf; - *out = le_bswap64(val); + bufhelp_u64_t *out = _buf; + out->a = le_bswap64(val); -} +} __attribute__ ((optimize("no-strict-aliasing"))) - #endif /*HAVE_U64_TYPEDEF*/ + #endif /*BUFHELP_FAST_UNALIGNED_ACCESS*/ ++++++ libgcrypt-1.6.6.tar.bz2 -> libgcrypt-1.7.3.tar.bz2 ++++++ ++++ 94427 lines of diff (skipped) ++++++ libgcrypt-fix-rng.patch ++++++ --- /var/tmp/diff_new_pack.rWfFai/_old 2016-08-31 00:00:30.000000000 +0200 +++ /var/tmp/diff_new_pack.rWfFai/_new 2016-08-31 00:00:30.000000000 +0200 @@ -1,8 +1,8 @@ -Index: libgcrypt-1.6.1/random/random.c +Index: libgcrypt-1.7.2/random/random.c =================================================================== ---- libgcrypt-1.6.1.orig/random/random.c -+++ libgcrypt-1.6.1/random/random.c -@@ -440,6 +440,9 @@ _gcry_create_nonce (void *buffer, size_t +--- libgcrypt-1.7.2.orig/random/random.c ++++ libgcrypt-1.7.2/random/random.c +@@ -419,6 +419,9 @@ _gcry_create_nonce (void *buffer, size_t size_t n; int err; @@ -12,7 +12,7 @@ /* First check whether we shall use the FIPS nonce generator. This is only done in FIPS mode, in all other modes, we use our own nonce generator which is seeded by the RNG actual in use. */ -@@ -455,9 +458,6 @@ _gcry_create_nonce (void *buffer, size_t +@@ -433,9 +436,6 @@ _gcry_create_nonce (void *buffer, size_t FIPS mode (not that this means it is also used if the FIPS RNG has been selected but we are not in fips mode). */ @@ -20,5 +20,5 @@ - _gcry_random_initialize (1); - /* Acquire the nonce buffer lock. */ - err = ath_mutex_lock (&nonce_buffer_lock); + err = gpgrt_lock_lock (&nonce_buffer_lock); if (err) ++++++ libgcrypt-sparcv9.diff ++++++ --- /var/tmp/diff_new_pack.rWfFai/_old 2016-08-31 00:00:30.000000000 +0200 +++ /var/tmp/diff_new_pack.rWfFai/_new 2016-08-31 00:00:30.000000000 +0200 @@ -8,16 +8,16 @@ mpi/longlong.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: libgcrypt-1.6.4/mpi/longlong.h +Index: libgcrypt-1.7.2/mpi/longlong.h =================================================================== ---- libgcrypt-1.6.4.orig/mpi/longlong.h 2015-09-07 15:33:48.000000000 +0200 -+++ libgcrypt-1.6.4/mpi/longlong.h 2015-09-08 10:36:28.124169828 +0200 -@@ -1287,7 +1287,7 @@ typedef unsigned int UTItype __attribute +--- libgcrypt-1.7.2.orig/mpi/longlong.h ++++ libgcrypt-1.7.2/mpi/longlong.h +@@ -1293,7 +1293,7 @@ typedef unsigned int UTItype __attribute "rJ" ((USItype)(al)), \ "rI" ((USItype)(bl)) \ __CLOBBER_CC) --#if defined (__sparc_v8__) || defined(__sparcv8) -+#if defined (__sparc_v8__) || defined(__sparcv8) || defined(__sparc_v9__) +-# if defined (__sparc_v8__) || defined(__sparcv8) ++# if defined (__sparc_v8__) || defined(__sparcv8) || defined(__space_v9__) /* Don't match immediate range because, 1) it is not often useful, 2) the 'I' flag thinks of the range as a 13 bit signed interval, while we want to match a 13 bit interval, sign extended to 32 bits,

1 0

commit xtables-addons for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Aug '16

29 Aug '16

Hello community, here is the log from the commit of package xtables-addons for openSUSE:13.1:Update checked in at 2016-08-29 16:32:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/xtables-addons (Old) and /work/SRC/openSUSE:13.1:Update/.xtables-addons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xtables-addons" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.qOqEtF/_old 2016-08-29 16:32:57.000000000 +0200 +++ /var/tmp/diff_new_pack.qOqEtF/_new 2016-08-29 16:32:57.000000000 +0200 @@ -1 +1 @@ -<link package='xtables-addons.5313' cicount='copy' /> +<link package='xtables-addons.5446' cicount='copy' />

1 0

commit xen for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Aug '16

29 Aug '16

Hello community, here is the log from the commit of package xen for openSUSE:13.1:Update checked in at 2016-08-29 16:32:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/xen (Old) and /work/SRC/openSUSE:13.1:Update/.xen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xen" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.GKdBbC/_old 2016-08-29 16:32:54.000000000 +0200 +++ /var/tmp/diff_new_pack.GKdBbC/_new 2016-08-29 16:32:54.000000000 +0200 @@ -1 +1 @@ -<link package='xen.5313' cicount='copy' /> +<link package='xen.5446' cicount='copy' />

1 0

commit virtualbox for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Aug '16

29 Aug '16

Hello community, here is the log from the commit of package virtualbox for openSUSE:13.1:Update checked in at 2016-08-29 16:32:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/virtualbox (Old) and /work/SRC/openSUSE:13.1:Update/.virtualbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virtualbox" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.qlkI7L/_old 2016-08-29 16:32:35.000000000 +0200 +++ /var/tmp/diff_new_pack.qlkI7L/_new 2016-08-29 16:32:35.000000000 +0200 @@ -1 +1 @@ -<link package='virtualbox.5313' cicount='copy' /> +<link package='virtualbox.5446' cicount='copy' />

1 0

commit vhba-kmp for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Aug '16

29 Aug '16

Hello community, here is the log from the commit of package vhba-kmp for openSUSE:13.1:Update checked in at 2016-08-29 16:32:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/vhba-kmp (Old) and /work/SRC/openSUSE:13.1:Update/.vhba-kmp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vhba-kmp" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.2N9wXe/_old 2016-08-29 16:32:25.000000000 +0200 +++ /var/tmp/diff_new_pack.2N9wXe/_new 2016-08-29 16:32:25.000000000 +0200 @@ -1 +1 @@ -<link package='vhba-kmp.5313' cicount='copy' /> +<link package='vhba-kmp.5446' cicount='copy' />

1 0

commit pcfclock for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Aug '16

29 Aug '16

Hello community, here is the log from the commit of package pcfclock for openSUSE:13.1:Update checked in at 2016-08-29 16:32:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/pcfclock (Old) and /work/SRC/openSUSE:13.1:Update/.pcfclock.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pcfclock" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.z9UFSs/_old 2016-08-29 16:32:18.000000000 +0200 +++ /var/tmp/diff_new_pack.z9UFSs/_new 2016-08-29 16:32:18.000000000 +0200 @@ -1 +1 @@ -<link package='pcfclock.5313' cicount='copy' /> +<link package='pcfclock.5446' cicount='copy' />

1 0

commit openvswitch for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Aug '16

29 Aug '16

Hello community, here is the log from the commit of package openvswitch for openSUSE:13.1:Update checked in at 2016-08-29 16:32:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/openvswitch (Old) and /work/SRC/openSUSE:13.1:Update/.openvswitch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openvswitch" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.DPpaGw/_old 2016-08-29 16:32:09.000000000 +0200 +++ /var/tmp/diff_new_pack.DPpaGw/_new 2016-08-29 16:32:09.000000000 +0200 @@ -1 +1 @@ -<link package='openvswitch.5313' cicount='copy' /> +<link package='openvswitch.5446' cicount='copy' />

1 0

commit ndiswrapper for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Aug '16

29 Aug '16

Hello community, here is the log from the commit of package ndiswrapper for openSUSE:13.1:Update checked in at 2016-08-29 16:32:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/ndiswrapper (Old) and /work/SRC/openSUSE:13.1:Update/.ndiswrapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ndiswrapper" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.XwRQg9/_old 2016-08-29 16:32:02.000000000 +0200 +++ /var/tmp/diff_new_pack.XwRQg9/_new 2016-08-29 16:32:02.000000000 +0200 @@ -1 +1 @@ -<link package='ndiswrapper.5313' cicount='copy' /> +<link package='ndiswrapper.5446' cicount='copy' />

1 0

commit kernel-xen for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Aug '16

29 Aug '16

Hello community, here is the log from the commit of package kernel-xen for openSUSE:13.1:Update checked in at 2016-08-29 16:31:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/kernel-xen (Old) and /work/SRC/openSUSE:13.1:Update/.kernel-xen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-xen" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.puOzqZ/_old 2016-08-29 16:32:00.000000000 +0200 +++ /var/tmp/diff_new_pack.puOzqZ/_new 2016-08-29 16:32:00.000000000 +0200 @@ -1 +1 @@ -<link package='kernel-xen.5313' cicount='copy' /> +<link package='kernel-xen.5446' cicount='copy' />

1 0

commit kernel-vanilla for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Aug '16

29 Aug '16

Hello community, here is the log from the commit of package kernel-vanilla for openSUSE:13.1:Update checked in at 2016-08-29 16:31:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/kernel-vanilla (Old) and /work/SRC/openSUSE:13.1:Update/.kernel-vanilla.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-vanilla" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.jPK43a/_old 2016-08-29 16:31:57.000000000 +0200 +++ /var/tmp/diff_new_pack.jPK43a/_new 2016-08-29 16:31:57.000000000 +0200 @@ -1 +1 @@ -<link package='kernel-vanilla.5313' cicount='copy' /> +<link package='kernel-vanilla.5446' cicount='copy' />

1 0

commit kernel-source for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Aug '16

29 Aug '16

Hello community, here is the log from the commit of package kernel-source for openSUSE:13.1:Update checked in at 2016-08-29 16:31:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/kernel-source (Old) and /work/SRC/openSUSE:13.1:Update/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.YLyb30/_old 2016-08-29 16:31:53.000000000 +0200 +++ /var/tmp/diff_new_pack.YLyb30/_new 2016-08-29 16:31:53.000000000 +0200 @@ -1 +1 @@ -<link package='kernel-source.5313' cicount='copy' /> +<link package='kernel-source.5446' cicount='copy' />

1 0

commit kernel-syms for openSUSE:13.1:Update
by root＠hilbert.suse.de 29 Aug '16

29 Aug '16

Hello community, here is the log from the commit of package kernel-syms for openSUSE:13.1:Update checked in at 2016-08-29 16:31:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/kernel-syms (Old) and /work/SRC/openSUSE:13.1:Update/.kernel-syms.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-syms" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.3gvBlH/_old 2016-08-29 16:31:53.000000000 +0200 +++ /var/tmp/diff_new_pack.3gvBlH/_new 2016-08-29 16:31:53.000000000 +0200 @@ -1 +1 @@ -<link package='kernel-syms.5313' cicount='copy' /> +<link package='kernel-syms.5446' cicount='copy' />

1 0