January 2016 - openSUSE Commits - openSUSE Mailing Lists

commit freetds for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package freetds for openSUSE:Factory checked in at 2016-01-23 01:15:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freetds (Old) and /work/SRC/openSUSE:Factory/.freetds.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "freetds" Changes: -------- --- /work/SRC/openSUSE:Factory/freetds/freetds.changes 2015-12-23 08:48:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.freetds.new/freetds.changes 2016-01-23 01:15:57.000000000 +0100 @@ -1,0 +2,12 @@ +Sun Jan 17 08:41:03 UTC 2016 - mpluskal(a)suse.com + +- Update to 0.95.80 + * See NEWS for complete list of changes + +------------------------------------------------------------------- +Fri Jan 8 10:37:10 UTC 2016 - tchvatal(a)suse.com + +- Version update to 0.95.79: + * See NEWS file for in-depth changes list + +------------------------------------------------------------------- Old: ---- freetds-0.95.76.tar.gz New: ---- freetds-0.95.80.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freetds.spec ++++++ --- /var/tmp/diff_new_pack.haB8Jd/_old 2016-01-23 01:15:58.000000000 +0100 +++ /var/tmp/diff_new_pack.haB8Jd/_new 2016-01-23 01:15:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package freetds # -# 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 @@ -17,7 +17,7 @@ Name: freetds -Version: 0.95.76 +Version: 0.95.80 Release: 0 Summary: A free re-implementation of the TDS (Tabular Data Stream) protocol License: LGPL-2.1+ and GPL-2.0+ ++++++ freetds-0.95.76.tar.gz -> freetds-0.95.80.tar.gz ++++++ ++++ 7669 lines of diff (skipped)

1 0

commit icewm for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package icewm for openSUSE:Factory checked in at 2016-01-23 01:15:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icewm (Old) and /work/SRC/openSUSE:Factory/.icewm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icewm" Changes: -------- --- /work/SRC/openSUSE:Factory/icewm/icewm.changes 2015-11-17 14:22:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icewm.new/icewm.changes 2016-01-23 01:15:53.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Jan 14 09:26:54 UTC 2016 - petr(a)cervinka.net + +- Version bump to 1.3.12: + * various bugfixes collected from all upstream vendors + * added new translations +- Removed upstreamed patches: + * icewm-toolbar-icons-generic.patch + * icewm-fix-local-search.patch +------------------------------------------------------------------- Old: ---- 1.3.11.tar.gz icewm-fix-local-search.patch icewm-toolbar-icons-generic.patch New: ---- 1.3.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icewm.spec ++++++ --- /var/tmp/diff_new_pack.D0rI6J/_old 2016-01-23 01:15:54.000000000 +0100 +++ /var/tmp/diff_new_pack.D0rI6J/_new 2016-01-23 01:15:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package icewm # -# 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 @@ -18,7 +18,7 @@ %global lites icewm icewmhint icewmbg icesh icewm-session Name: icewm -Version: 1.3.11 +Version: 1.3.12 Release: 0 Summary: Window Manager with a Taskbar License: LGPL-2.1+ @@ -26,12 +26,8 @@ Url: http://www.icewm.org/ Source0: https://github.com/bbidulock/icewm/archive/%{version}.tar.gz Source1: icewm.desktop -# PATCH-FIX-UPSTREAM icewm-fix-local-search.patch sor.alexei(a)meowr.ru -- Make icewm-menu-fdo not to search through whole ~/.local/share/. -Patch0: icewm-fix-local-search.patch -# PATCH-FIX-OPENSUSE icewm-toolbar-icons-generic.patch sor.alexei(a)meowr.ru -- Don't specify paths in toolbar icons. -Patch1: icewm-toolbar-icons-generic.patch # PATCH-FIX-OPENSUSE icewm-mate.patch sor.alexei(a)meowr.ru -- Add MATE Menus support. -Patch2: icewm-mate.patch +Patch0: icewm-mate.patch Patch99: icewm-preferences.patch BuildRequires: autoconf BuildRequires: automake @@ -126,10 +122,8 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 # Do not require needlessly new gettext. -sed -i 's/0.19.5/0.18.3/g' configure.ac +sed -i 's/0.19.6/0.18.3/g' configure.ac %build autoreconf -fi ++++++ 1.3.11.tar.gz -> 1.3.12.tar.gz ++++++ ++++ 7347 lines of diff (skipped)

1 0

commit cantarell-fonts for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package cantarell-fonts for openSUSE:Factory checked in at 2016-01-23 01:15:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cantarell-fonts (Old) and /work/SRC/openSUSE:Factory/.cantarell-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cantarell-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/cantarell-fonts/cantarell-fonts.changes 2016-01-09 23:12:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cantarell-fonts.new/cantarell-fonts.changes 2016-01-23 01:15:51.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Jan 7 19:19:29 UTC 2016 - zaitor(a)opensuse.org + +- Update to version 0.0.20.1: + + Fix composited glyph issues. + + Fix parallel build issue. + +------------------------------------------------------------------- Old: ---- cantarell-fonts-0.0.20.tar.xz New: ---- cantarell-fonts-0.0.20.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantarell-fonts.spec ++++++ --- /var/tmp/diff_new_pack.ajdyAw/_old 2016-01-23 01:15:51.000000000 +0100 +++ /var/tmp/diff_new_pack.ajdyAw/_new 2016-01-23 01:15:51.000000000 +0100 @@ -17,7 +17,7 @@ Name: cantarell-fonts -Version: 0.0.20 +Version: 0.0.20.1 Release: 0 Summary: Contemporary Humanist Sans Serif Font License: OFL-1.1 ++++++ cantarell-fonts-0.0.20.tar.xz -> cantarell-fonts-0.0.20.1.tar.xz ++++++ ++++ 3917 lines of diff (skipped)

1 0

commit python-pycparser for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package python-pycparser for openSUSE:Factory checked in at 2016-01-23 01:15:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pycparser (Old) and /work/SRC/openSUSE:Factory/.python-pycparser.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pycparser" Changes: -------- --- /work/SRC/openSUSE:Factory/python-pycparser/python-pycparser.changes 2015-05-18 22:57:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-pycparser.new/python-pycparser.changes 2016-01-23 01:15:49.000000000 +0100 @@ -1,0 +2,31 @@ +Sat Jan 16 14:31:31 UTC 2016 - p.drouand(a)gmail.com + +- Add python-pycparser-rpmlintrc to sources + +------------------------------------------------------------------- +Thu Jan 7 20:52:41 UTC 2016 - mvyskocil(a)opensuse.org + +- Tag added patch better + +------------------------------------------------------------------- +Mon Nov 30 12:56:14 UTC 2015 - mvyskocil(a)opensuse.org + +- Update to version 2.14 + * Added CParser parameter to specify output directory for generated parsing + tables (#84). + * Removed lcc's cpp and its license from the distribution. Using lcc's cpp + is no longer recommended, now that Clang has binary builds available for + Windows. + 2.13: + * Added support for offsetof() the way gcc implements it (special builtin + that takes a type as an argument). + * Added faked va_* macros (these are expected to come from stdarg.h) + * Added a bunch more fake headers and typedefs to support parsing C projects + like Git and SQLite without modifications to pycparser. + * Added support for empty initializer lists (#79). +- Package fake_libc_include + * switch to github release as pypi tarball don't contains all files +- Add 0002-Add-missing-typedef-sa_family_t-from-sys-socket.h.patch + * upstream patch enhancing the fake_libc_include + +------------------------------------------------------------------- Old: ---- pycparser-2.12.tar.gz New: ---- 0002-Add-missing-typedef-sa_family_t-from-sys-socket.h.patch python-pycparser-rpmlintrc release_v2.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pycparser.spec ++++++ --- /var/tmp/diff_new_pack.73wN9V/_old 2016-01-23 01:15:50.000000000 +0100 +++ /var/tmp/diff_new_pack.73wN9V/_new 2016-01-23 01:15:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-pycparser # -# 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 @@ -17,13 +17,17 @@ Name: python-pycparser -Version: 2.12 +Version: 2.14 Release: 0 Summary: C parser in Python License: BSD-3-Clause Group: Development/Languages/Python Url: https://github.com/eliben/pycparser -Source: http://pypi.python.org/packages/source/p/pycparser/pycparser-%{version}.tar… +Source0: https://github.com/eliben/pycparser/archive/release_v%{version}.tar.gz +Source99: %{name}-rpmlintrc +#PATCH-FIX-UPSTREAM +Patch0: 0002-Add-missing-typedef-sa_family_t-from-sys-socket.h.patch +BuildRequires: fdupes BuildRequires: python-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 @@ -38,7 +42,8 @@ front-end for C compilers or analysis tools. %prep -%setup -q -n pycparser-%{version} +%setup -q -n pycparser-release_v%{version} +%patch0 -p1 # fix end of line sed -i 's/\r//' LICENSE @@ -47,6 +52,9 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +mkdir -p %{buildroot}/%{_datadir}/%{name} +cp -r utils/fake_libc_include/ %{buildroot}/%{_datadir}/%{name} +%fdupes -s %{buildroot}/%{_datadir}/%{name}/fake_libc_include/ %check python tests/all_tests.py @@ -55,5 +63,6 @@ %defattr(-,root,root,-) %doc LICENSE README.rst examples %{python_sitelib}/* +%{_datadir}/%{name} %changelog ++++++ 0002-Add-missing-typedef-sa_family_t-from-sys-socket.h.patch ++++++ commit 2acb22c5606cf151ea31859bd5c3810fc0630150 Author: Dubslow <bunslow(a)gmail.com> Date: Thu Sep 10 18:02:30 2015 -0500 Add missing typedef sa_family_t from sys/socket.h diff --git a/utils/fake_libc_include/_fake_typedefs.h b/utils/fake_libc_include/_fake_typedefs.h index 6201cf7..8c8d463 100644 --- a/utils/fake_libc_include/_fake_typedefs.h +++ b/utils/fake_libc_include/_fake_typedefs.h @@ -95,6 +95,7 @@ typedef int pthread_barrier_t; typedef int pthread_barrierattr_t; typedef int jmp_buf; typedef int rlim_t; +typedef int sa_family_t; typedef int sigjmp_buf; typedef int stack_t; typedef int siginfo_t; ++++++ python-pycparser-rpmlintrc ++++++ # Fake libraries for pycparser allowing it to pretend it can parse libc definitions addFilter(".*devel-file-in-non-devel-package.*/usr/share/python-pycparser/fake_libc_include/")

1 0

commit open-iscsi for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2016-01-23 01:15:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old) and /work/SRC/openSUSE:Factory/.open-iscsi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "open-iscsi" Changes: -------- --- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2016-01-11 19:10:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi.changes 2016-01-23 01:15:47.000000000 +0100 @@ -2 +2,42 @@ -Thu Jan 07 01:39:10 UTC 16 - lduncan(a)suse.com +Thu Jan 14 23:56:07 UTC 2016 - lduncan(a)suse.com + +- Synced with current upstream as of today, which included 29 + changes. Most changes were directly from upstream, but + some where to fix small differences that had developed + between our code and theirs, now fixed. As always, see + git@github.com:hreinecke/open-iscsi.git, openSUSE-Factory + branch, for details. + + Change summary: + * Syncing top-level files with upstream. + * Fixed my typo in default CFLAGS. + * Syncing up utils/fwparam_ibft with upstream. + * Adding in missing part of previous commit. + * iscsiuio: Get the library to use based on uio sysfs name + * iscsiuio: Wait for iface to be ready before issuing the ping + * iscsiadm: let ping be tried after iface config is initialized + * iscsiuio: Add ping support through iscsiuio + * iscsid: Changes to support ping through iscsiuio + * iscsiuio: Add QLogic Vendor ID to support newer NX2 HBAs + * iscsid: fix iscsi_host_set_net_params return code + * iscsid/iscsiuio: remove uio poll + * iscsid: make sure actor is delated before rescheduling + * Remove last pieces of building local open-isns. + * iscsi: remove local copy of open-isns + * Use system-wide open-isns, not internal version. + * Fix typo in man page. + * fix typo + * iscsiuio: Correct the handling of Multi Function mode + * Reformat man page synopsis sections + * Spelling and escaping error fixes. + * Remove outdated Debian packaging code. + * buildsys: respect CFLAGS and LDFLAGS from the outside + * buildsys: make 'make clean' idempotent + * Fix small typo in iscsid.conf + * Fix iBFT target flags check. + * Remove duplicate newlines in log messages. + * Kernel include path + * Allow setting host params to return EAGAIN errors. + +------------------------------------------------------------------- +Thu Jan 07 01:39:10 UTC 2016 - lduncan(a)suse.com ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.RzTmWk/_old 2016-01-23 01:15:48.000000000 +0100 +++ /var/tmp/diff_new_pack.RzTmWk/_new 2016-01-23 01:15:48.000000000 +0100 @@ -24,6 +24,7 @@ BuildRequires: flex BuildRequires: libtool BuildRequires: make +BuildRequires: open-isns-devel BuildRequires: openssl-devel %if 0%{?suse_version} >= 1230 BuildRequires: systemd @@ -92,7 +93,6 @@ %build %{__make} OPTFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -DOFFLOAD_BOOT_SUPPORTED -DLOCK_DIR=\\\"/etc/iscsi\\\"" LDFLAGS="" user -%{__make} OPTFLAGS="${RPM_OPT_FLAGS}" -C utils/open-isns programs cd iscsiuio touch NEWS touch AUTHORS ++++++ open-iscsi-Factory-latest.diff.bz2 ++++++ ++++ 56737 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi-Factory-latest.diff.bz2 ++++ and /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi-Factory-latest.diff.bz2

1 0

commit xorg-x11-server for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2016-01-23 01:15:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-server" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2016-01-13 22:43:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2016-01-23 01:15:44.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Jan 15 16:25:36 UTC 2016 - eich(a)suse.com + +- u_Panning-Set-panning-state-in-xf86RandR12ScreenSetSize.patch + Fix panning when configured in xorg.conf* (boo#771521). + +------------------------------------------------------------------- +Fri Jan 15 11:47:17 UTC 2016 - eich(a)suse.com + +- Handle source-file-list in build not prep +- N_xorg-x11-server-rpmmacros.patch: + Delete: Process xorg-x11-server.macros in install + +------------------------------------------------------------------- Old: ---- N_xorg-x11-server-rpmmacros.patch New: ---- u_Panning-Set-panning-state-in-xf86RandR12ScreenSetSize.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.Ovm7si/_old 2016-01-23 01:15:46.000000000 +0100 +++ /var/tmp/diff_new_pack.Ovm7si/_new 2016-01-23 01:15:46.000000000 +0100 @@ -157,7 +157,6 @@ Requires: xkeyboard-config # PATCH-FEATURE-OPENSUSE n_xorg-x11-server-rpmmacros.patch dimstar(a)opensuse.org -- Provide RPM macros to require correct ABI Versions. -Patch0: N_xorg-x11-server-rpmmacros.patch Patch1: N_default-module-path.diff Patch2: N_zap_warning_xserver.diff Patch3: N_driver-autoconfig.diff @@ -184,6 +183,7 @@ Patch205: U_kdrive-UnregisterFd-Fix-off-by-one.patch Patch206: u_busfault_sigaction-Only-initialize-pointer-when-matched.patch Patch207: U_modesetting-should-not-reference-gbm-when-it-s-not-d.patch +Patch208: u_Panning-Set-panning-state-in-xf86RandR12ScreenSetSize.patch Patch1000: n_xserver-optimus-autoconfig-hack.patch @@ -262,8 +262,6 @@ %setup -q -n xorg-server-%{dirsuffix} -a3 # Early verification if the ABI Defines are correct. Let's not waste build cycles if the Provides are wrong at the end. sh %{SOURCE92} --verify . %{SOURCE91} -cp %{SOURCE90} . -%patch0 -p1 %if 0%{?suse_version} < 1315 %patch1 @@ -292,6 +290,7 @@ %patch205 -p1 %patch206 -p1 %patch207 -p1 +%patch208 -p1 %patch1000 -p1 @@ -302,9 +301,11 @@ ### patch222 might not be applicable anymore #%patch1222 -p1 -find . -type f \! -name '*.orig' \! -path ./source-file-list > source-file-list - %build +test -e source-file-list || \ + find . -type f \! -name '*.orig' \! -path ./source-file-list > \ + source-file-list + autoreconf -fi %configure CFLAGS="%{optflags} -fno-strict-aliasing" \ --sysconfdir=/etc \ @@ -402,6 +403,8 @@ %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager-%{name} %endif install -m 755 $RPM_SOURCE_DIR/xorg-backtrace %{buildroot}%{_bindir}/xorg-backtrace +cp %{S:90} . +./config.status --file xorg-x11-server.macros install -D xorg-x11-server.macros %{buildroot}%{_sysconfdir}/rpm/macros.xorg-server %ifnarch s390 s390x %if 0%{?suse_version} >= 1315 ++++++ u_Panning-Set-panning-state-in-xf86RandR12ScreenSetSize.patch ++++++ From: Egbert Eich <eich(a)suse.de> Date: Fri Jan 15 16:52:18 2016 +0100 Subject: [PATCH]Panning: Set panning state in xf86RandR12ScreenSetSize() Patch-mainline: to be upstreamed References: boo#771521 Signed-off-by: Egbert Eich <eich(a)suse.com> Right after verifying the panning area the per-crtc panning state should be set. This fixes panning when set in the configuration. Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=771521 Signed-off-by: Egbert Eich <eich(a)suse.de> --- hw/xfree86/modes/xf86RandR12.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c index eae7016..9f444dd 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c @@ -681,6 +681,7 @@ xf86RandR12ScreenSetSize(ScreenPtr pScreen, WindowPtr pRoot = pScreen->root; PixmapPtr pScrnPix; Bool ret = FALSE; + Bool panning = FALSE; int c; if (randrp->virtualX == -1 || randrp->virtualY == -1) { @@ -709,6 +710,7 @@ xf86RandR12ScreenSetSize(ScreenPtr pScreen, if (crtc->panningTrackingArea.y2 > crtc->panningTrackingArea.y1) crtc->panningTrackingArea.y2 += height - pScreen->height; xf86RandR13VerifyPanningArea(crtc, width, height); + panning = panning ? TRUE : PANNING_ENABLED (crtc); xf86RandR13Pan(crtc, randrp->pointerX, randrp->pointerY); } } @@ -718,6 +720,7 @@ xf86RandR12ScreenSetSize(ScreenPtr pScreen, pScreen->height = pScrnPix->drawable.height = height; randrp->mmWidth = pScreen->mmWidth = mmWidth; randrp->mmHeight = pScreen->mmHeight = mmHeight; + randrp->panning = panning; xf86SetViewport(pScreen, pScreen->width - 1, pScreen->height - 1); xf86SetViewport(pScreen, 0, 0);

1 0

commit kernel-firmware for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package kernel-firmware for openSUSE:Factory checked in at 2016-01-23 01:15:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-firmware (Old) and /work/SRC/openSUSE:Factory/.kernel-firmware.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-firmware" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-firmware/kernel-firmware.changes 2016-01-13 22:44:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-firmware.new/kernel-firmware.changes 2016-01-23 01:15:41.000000000 +0100 @@ -1,0 +2,24 @@ +Fri Jan 15 15:00:34 UTC 2016 - mmarek(a)suse.cz + +- Update to version 20160112git (commit 40e9ae8) + * Update firmware patch for Intel Bluetooth 7265 (D1) + * rtlwifi: v35 firmware for rtl8723bu + * qed: Add firmware 8.7.3.0. + * Clarified licensing terms for the current ath9k_htc firmware + * brcm: add firmware for BCM4350 rev 5 + * fix permissions on brcm/brcmfmac4371-pcie.bin + * add a symlink from qat_mmp.bin to its new file name + * add fw for new qat devices + * WHENCE: Add version information for hfi1 + * Update Skylake audio firmware + * moxa: Refer to LICENCE.moxa for mxuport driver + * moxa: Add firmware for Moxa 11x0 USB Serial devices + * iwlwifi: replace 7265D-10.ucode by 7265-10.ucode + * Update Intel OPA hfi1 firmware + * update Marvell USB8797-B0 firmware image + * update Marvell 8897-B0 firmware images to 7.p53 + * update Marvell 8897-B0 firmware images to 7.p18 + * add Marvell SD/USB8801 B0 firmware images +- Fix the Supplements dependency of ucode-amd. + +------------------------------------------------------------------- Old: ---- linux-firmware-20151207git.tar.xz New: ---- linux-firmware-20160112git.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-firmware.spec ++++++ --- /var/tmp/diff_new_pack.Hi5Jjd/_old 2016-01-23 01:15:44.000000000 +0100 +++ /var/tmp/diff_new_pack.Hi5Jjd/_new 2016-01-23 01:15:44.000000000 +0100 @@ -20,7 +20,7 @@ %define __ksyms_supplements bash %{_sourcedir}/firmware.sh --cache %{_builddir}/%{?buildsubdir}/find_supplements.cache --find-supplements %define __ksyms_path ^/lib/firmware Name: kernel-firmware -Version: 20151207git +Version: 20160112git Release: 0 Summary: Linux kernel firmware files License: SUSE-Firmware and GPL-2.0 and GPL-2.0+ and MIT @@ -81,7 +81,7 @@ Group: System/Kernel Requires(post): coreutils Requires(postun): coreutils -Supplements: modalias(x86cpu:vendor%{3}A0002%{3}Afamily%{3}A*%{3}Amodel%{3}A*%{3}Afeature%{3}A*) +Supplements: modalias(x86cpu:vendor%%3A0002%%3Afamily%%3A*%%3Amodel%%3A*%%3Afeature%%3A*) %description -n ucode-amd This package contains the microcode files used by AMD CPUs. ++++++ linux-firmware-20151207git.tar.xz -> linux-firmware-20160112git.tar.xz ++++++ /work/SRC/openSUSE:Factory/kernel-firmware/linux-firmware-20151207git.tar.xz /work/SRC/openSUSE:Factory/.kernel-firmware.new/linux-firmware-20160112git.tar.xz differ: char 13, line 1

1 0

commit gedit for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package gedit for openSUSE:Factory checked in at 2016-01-23 01:15:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gedit (Old) and /work/SRC/openSUSE:Factory/.gedit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gedit" Changes: -------- --- /work/SRC/openSUSE:Factory/gedit/gedit.changes 2015-11-22 10:59:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gedit.new/gedit.changes 2016-01-23 01:15:38.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Jan 15 11:47:11 UTC 2016 - dimstar(a)opensuse.org + +- Update to version 3.18.3: + + Several crash fixes. + + A few other more minor bug fixes. + + Add kudos to appdata. + + Updated translations. + +------------------------------------------------------------------- Old: ---- gedit-3.18.2.tar.xz New: ---- gedit-3.18.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gedit.spec ++++++ --- /var/tmp/diff_new_pack.nuRpxJ/_old 2016-01-23 01:15:39.000000000 +0100 +++ /var/tmp/diff_new_pack.nuRpxJ/_new 2016-01-23 01:15:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gedit # -# 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 @@ -19,7 +19,7 @@ %define _with_gi_python 1 Name: gedit -Version: 3.18.2 +Version: 3.18.3 Release: 0 Summary: Small and lightweight UTF-8 text editor License: GPL-2.0+ @@ -187,6 +187,7 @@ %files -n python3-gedit %defattr(-,root,root) %{python3_sitearch}/gi/overrides/Gedit* +%{python3_sitearch}/gi/overrides/__pycache__/Gedit* %endif %files devel ++++++ gedit-3.18.2.tar.xz -> gedit-3.18.3.tar.xz ++++++ ++++ 17522 lines of diff (skipped)

1 0

commit jasper for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package jasper for openSUSE:Factory checked in at 2016-01-23 01:15:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jasper (Old) and /work/SRC/openSUSE:Factory/.jasper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jasper" Changes: -------- --- /work/SRC/openSUSE:Factory/jasper/jasper.changes 2015-07-19 11:45:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jasper.new/jasper.changes 2016-01-23 01:15:36.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Jan 14 13:55:04 UTC 2016 - fstrba(a)suse.com + +- Add jasper-CVE-2016-1867.patch + * CVE-2016-1867: Out-of-bounds Read in the JasPer's + jpc_pi_nextcprl() function (bsc#961886) + +------------------------------------------------------------------- @@ -18 +25 @@ -- fixed CVE-2014-8137, CVE-2014-8137 (bnc#909474, bnc#909475) +- fixed CVE-2014-8137, CVE-2014-8138 (bnc#909474, bnc#909475) @@ -26,0 +34,5 @@ + +------------------------------------------------------------------- +Thu Jun 12 11:06:02 UTC 2014 - nadvornik(a)suse.com + +- added obsoletes and provides of libjasper-32bit (bnc#881716) New: ---- jasper-CVE-2016-1867.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jasper.spec ++++++ --- /var/tmp/diff_new_pack.QOCIuR/_old 2016-01-23 01:15:37.000000000 +0100 +++ /var/tmp/diff_new_pack.QOCIuR/_new 2016-01-23 01:15:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package jasper # -# 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 @@ -42,6 +42,7 @@ Patch10: jasper-CVE-2014-8158.patch # PATCH-FIX-UPSTREAM jasper-jpc_dec.patch deb#469786 badshah400(a)gmail.com -- Fix failure when manipulating images with 4 component color using reversible color translation (patch taken from Fedora) Patch11: jasper-jpc_dec.patch +Patch12: jasper-CVE-2016-1867.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -93,6 +94,7 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %build autoreconf -i -f ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.QOCIuR/_old 2016-01-23 01:15:37.000000000 +0100 +++ /var/tmp/diff_new_pack.QOCIuR/_new 2016-01-23 01:15:37.000000000 +0100 @@ -1 +1,3 @@ libjasper1 + obsoletes "libjasper-<targettype>" + provides "libjasper-<targettype>" ++++++ jasper-CVE-2016-1867.patch ++++++ --- jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c 2007-01-19 22:43:07.000000000 +0100 +++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c 2016-01-14 14:22:24.569056412 +0100 @@ -429,7 +429,7 @@ } for (pi->compno = pchg->compnostart, pi->picomp = - &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend); ++pi->compno, + &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend) && pi->compno < pi->numcomps; ++pi->compno, ++pi->picomp) { pirlvl = pi->picomp->pirlvls; pi->xstep = pi->picomp->hsamp * (1 << (pirlvl->prcwidthexpn +

1 0

commit python-mutagen for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package python-mutagen for openSUSE:Factory checked in at 2016-01-23 01:15:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-mutagen (Old) and /work/SRC/openSUSE:Factory/.python-mutagen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-mutagen" Changes: -------- --- /work/SRC/openSUSE:Factory/python-mutagen/python-mutagen.changes 2015-04-06 00:26:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-mutagen.new/python-mutagen.changes 2016-01-23 01:15:35.000000000 +0100 @@ -1,0 +2,49 @@ +Thu Jan 14 13:56:56 UTC 2016 - toddrme2178(a)gmail.com + +- Update to 1.31 + * New padding control API for flac/id3/mp4/asf/ogg/aiff and everything + based on it, except oggflac :bug:`229` + * Mutagen will now reduce padding on save if there is lots of it. + * delete() will remove padding in addition to tags. + * ASF: + * Padding support :bug:`201` + * Don't report negative lengths for some broken files + * New :class:`asf.ASFInfo`.codec_type/codec_name/codec_description + * Implement ASF.delete() + * OGG: Padding support for Opus/Vorbis/Theora/Speex + * M4A: Implementation removed. Every operation will raise. Use mp4 instead. + * Tools: Support Unicode output under Windows :bug:`232` +- Update to 1.30 + * FLAC: + * Fix :meth:`flac.FLAC.save` in case the source contained a too large + (invalid but recovered) image block :bug:`226` + * MP3: + * Improved length and bitrate accuracy: + * Read lame "Info" tags for improved bitrate/length accuracy + * Use bytes info of VBRI headers for improved bitrate accuracy + * Subtract encoder delay/padding from length for improved length accuracy + (especially for short tracks) + * Fix rare false identification of Xing headers :bug:`182` + * New :class:`mp3.MPEGInfo`.encoder_info attribute containing the encoder + name and version :bug:`66` + * New :class:`mp3.MPEGInfo`.bitrate_mode attribute exposing if the file is + VBR, ABR or CBR :bug:`24` :bug:`66` + * New :class:`mp3.MPEGInfo`.channels attribute providing the channel count + * New :class:`mp3.MPEGInfo`.track_gain/track_peak/album_gain values exposing + the replaygain info provided by the lame header :bug:`36` + * ID3: + * New :class:`id3.PictureType` enum for the picture type used in APIC frames :bug:`222` + * MP4: + * Fix MP4FreeForm.__eq__ and MP4Cover.__eq__ when comparing with bytes + :bug:`218` + * Don't raise on :meth:`FileType.save` if there are no tags. :bug:`227` + * Minor fixes: :bug:`228` +- Update to 1.29 + * mid3v2: Fix an error under Python 3 with files without tags :bug:`219` + * mid3v2: Various Windows+Python2+Unicode fixes :bug:`214` + * Don't emit warnings during loading (ID3Warning) :bug:`223` + * py.test support +- Clean up update-alternatives +- Implement unit tests + +------------------------------------------------------------------- Old: ---- mutagen-1.28.tar.gz New: ---- mutagen-1.31.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-mutagen.spec ++++++ --- /var/tmp/diff_new_pack.ymupSZ/_old 2016-01-23 01:15:36.000000000 +0100 +++ /var/tmp/diff_new_pack.ymupSZ/_new 2016-01-23 01:15:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-mutagen # -# 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 @@ -17,7 +17,7 @@ Name: python-mutagen -Version: 1.28 +Version: 1.31 Release: 0 Summary: Python module to Handle Audio Metadata License: GPL-2.0 @@ -25,6 +25,7 @@ Url: https://pypi.python.org/pypi/mutagen Source: https://pypi.python.org/packages/source/m/mutagen/mutagen-%{version}.tar.gz BuildRequires: python-devel +BuildRequires: python-pytest BuildRequires: python-setuptools Requires(post): update-alternatives Requires(postun): update-alternatives @@ -49,8 +50,11 @@ # remove shebangs from library files find mutagen/ -name "*.py" -exec sed -i -e '/^#!\s\?\/usr\/bin\/$env\s$\?python$/d' {} ';' +export LANG=en_US.UTF-8 for i in mid3cp mid3iconv mid3v2 moggsplit mutagen-inspect mutagen-pony; do + j=`echo $i|tr '-' '_'` sed -i "s/\"${i}\"/\"${i}-%{py_ver}\"/g" setup.py + sed -i "s/u\"${i}\"/u\"${i}-%{py_ver}\"/g" tests/test_tools_${j}.py mv tools/${i} tools/${i}-%{py_ver} mv man/${i}.1 man/${i}-%{py_ver}.1 done @@ -60,84 +64,83 @@ %install python setup.py install --root=%{buildroot} --prefix="%{_prefix}" -ln -sf %{_bindir}/mid3cp-%{py_ver} %{buildroot}%{_bindir}/mid3cp -ln -sf %{_bindir}/mid3iconv-%{py_ver} %{buildroot}%{_bindir}/mid3iconv -ln -sf %{_bindir}/mid3v2-%{py_ver} %{buildroot}%{_bindir}/mid3v2 -ln -sf %{_bindir}/moggsplit-%{py_ver} %{buildroot}%{_bindir}/moggsplit -ln -sf %{_bindir}/mutagen-inspect-%{py_ver} %{buildroot}%{_bindir}/mutagen-inspect -ln -sf %{_bindir}/mutagen-pony-%{py_ver} %{buildroot}%{_bindir}/mutagen-pony - -ln -sf %{_mandir}/man1/mid3cp-%{py_ver}.1.gz %{buildroot}%{_mandir}/man1/mid3cp.1.gz -ln -sf %{_mandir}/man1/mid3iconv-%{py_ver}.1.gz %{buildroot}%{_mandir}/man1/mid3iconv.1.gz -ln -sf %{_mandir}/man1/mid3v2-%{py_ver}.1.gz %{buildroot}%{_mandir}/man1/mid3v2.1.gz -ln -sf %{_mandir}/man1/moggsplit-%{py_ver}.1.gz %{buildroot}%{_mandir}/man1/moggsplit.1.gz -ln -sf %{_mandir}/man1/mutagen-inspect-%{py_ver}.1.gz %{buildroot}%{_mandir}/man1/mutagen-inspect.1.gz -ln -sf %{_mandir}/man1/mutagen-pony-%{py_ver}.1.gz %{buildroot}%{_mandir}/man1/mutagen-pony.1.gz - -%pre -# Since binaries became ghosted to be used with update-alternatives, we have to get rid -# of the old binary resulting from the non-update-alternativies-ified package: -[ -h %{_bindir}/mid3cp ] || rm -f %{_bindir}/mid3cp -[ -h %{_bindir}/mid3iconv ] || rm -f %{_bindir}/mid3iconv -[ -h %{_bindir}/mid3v2 ] || rm -f %{_bindir}/mid3v2 -[ -h %{_bindir}/moggsplit ] || rm -f %{_bindir}/moggsplit -[ -h %{_bindir}/mutagen-inspect ] || rm -f %{_bindir}/mutagen-inspect -[ -h %{_bindir}/mutagen-pony ] || rm -f %{_bindir}/mutagen-pony -[ -h %{_mandir}/man1/mid3cp.1.gz ] || rm -f %{_mandir}/man1/mid3cp.1.gz -[ -h %{_mandir}/man1/mid3iconv.1.gz ] || rm -f %{_mandir}/man1/mid3iconv.1.gz -[ -h %{_mandir}/man1/mid3v2.1.gz ] || rm -f %{_mandir}/man1/mid3v2.1.gz -[ -h %{_mandir}/man1/moggsplit.1.gz ] || rm -f %{_mandir}/man1/moggsplit.1.gz -[ -h %{_mandir}/man1/mutagen-inspect.1.gz ] || rm -f %{_mandir}/man1/mutagen-inspect.1.gz -[ -h %{_mandir}/man1/mutagen-pony.1.gz ] || rm -f %{_mandir}/man1/mutagen-pony.1.gz + +# Prepare for update-alternatives usage +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +for p in mid3cp mid3iconv mid3v2 moggsplit mutagen-inspect mutagen-pony; do + ln -s -f %{_sysconfdir}/alternatives/$p %{buildroot}%{_bindir}/$p + ln -s -f %{_sysconfdir}/alternatives/$p.1.gz %{buildroot}%{_mandir}/man1/${p}.1.gz + # create a dummy target for /etc/alternatives/$p and /etc/alternatives/$p.1.gz + touch %{buildroot}%{_sysconfdir}/alternatives/$p + touch %{buildroot}%{_sysconfdir}/alternatives/$p.1.gz +done %post -update-alternatives \ ---install %{_bindir}/mid3cp mid3cp %{_bindir}/mid3cp-%{py_ver} 30 \ ---slave %{_bindir}/mid3iconv mid3iconv %{_bindir}/mid3iconv-%{py_ver} \ ---slave %{_bindir}/mid3v2 mid3v2 %{_bindir}/mid3v2-%{py_ver} \ ---slave %{_bindir}/moggsplit moggsplit %{_bindir}/moggsplit-%{py_ver} \ ---slave %{_bindir}/mutagen-inspect mutagen-inspect %{_bindir}/mutagen-inspect-%{py_ver} \ ---slave %{_bindir}/mutagen-pony mutagen-pony %{_bindir}/mutagen-pony-%{py_ver} \ ---slave %{_mandir}/man1/mid3cp.1.gz mid3cp.1.gz %{_mandir}/man1/mid3cp-%{py_ver}.1.gz \ ---slave %{_mandir}/man1/mid3iconv.1.gz mid3iconv.1.gz %{_mandir}/man1/mid3iconv-%{py_ver}.1.gz \ ---slave %{_mandir}/man1/mid3v2.1.gz mid3v2.1.gz %{_mandir}/man1/mid3v2-%{py_ver}.1.gz \ ---slave %{_mandir}/man1/moggsplit.1.gz moggsplit.1.gz %{_mandir}/man1/moggsplit-%{py_ver}.1.gz \ ---slave %{_mandir}/man1/mutagen-inspect.1.gz mutagen-inspect.1.gz %{_mandir}/man1/mutagen-inspect-%{py_ver}.1.gz \ ---slave %{_mandir}/man1/mutagen-pony.1.gz mutagen-pony.1.gz %{_mandir}/man1/mutagen-pony-%{py_ver}.1.gz +"%_sbindir/update-alternatives" \ + --install %{_bindir}/mid3cp mid3cp %{_bindir}/mid3cp-%{py_ver} 30 \ + --slave %{_bindir}/mid3iconv mid3iconv %{_bindir}/mid3iconv-%{py_ver} \ + --slave %{_bindir}/mid3v2 mid3v2 %{_bindir}/mid3v2-%{py_ver} \ + --slave %{_bindir}/moggsplit moggsplit %{_bindir}/moggsplit-%{py_ver} \ + --slave %{_bindir}/mutagen-inspect mutagen-inspect %{_bindir}/mutagen-inspect-%{py_ver}.1.gz \ + --slave %{_bindir}/mutagen-pony mutagen-pony %{_bindir}/mutagen-pony-%{py_ver}.1.gz \ + --slave %{_mandir}/man1/mid3cp.1.gz mid3cp.1.gz %{_mandir}/man1/mid3cp-%{py_ver}.1.gz \ + --slave %{_mandir}/man1/mid3iconv.1.gz mid3iconv.1.gz %{_mandir}/man1/mid3iconv-%{py_ver}.1.gz \ + --slave %{_mandir}/man1/mid3v2.1.gz mid3v2.1.gz %{_mandir}/man1/mid3v2-%{py_ver}.1.gz \ + --slave %{_mandir}/man1/moggsplit.1.gz moggsplit.1.gz %{_mandir}/man1/moggsplit-%{py_ver}.1.gz \ + --slave %{_mandir}/man1/mutagen-inspect.1.gz mutagen-inspect.1.gz %{_mandir}/man1/mutagen-inspect-%{py_ver}.1.gz \ + --slave %{_mandir}/man1/mutagen-pony.1.gz mutagen-pony.1.gz %{_mandir}/man1/mutagen-pony-%{py_ver}.1.gz -%preun +%postun if [ $1 -eq 0 ] ; then - update-alternatives --remove mid3cp %{_bindir}/mid3cp-%{py_ver} + "%_sbindir/update-alternatives" --remove mid3cp %{_bindir}/mid3cp-%{py_ver} fi +%check +export LANG=en_US.UTF-8 +export PATH="$PATH:%{buildroot}%{_bindir}" +export PYTHONPATH="$PYTHONPATH:%{buildroot}%{python_sitelib}" +python setup.py test + %files %defattr(-, root, root, 0755) %doc COPYING NEWS README.rst -%ghost %{_bindir}/mid3cp +%{_bindir}/mid3cp +%{_bindir}/mid3iconv +%{_bindir}/mid3v2 +%{_bindir}/moggsplit +%{_bindir}/mutagen-inspect +%{_bindir}/mutagen-pony %{_bindir}/mid3cp-%{py_ver} -%ghost %{_bindir}/mid3iconv %{_bindir}/mid3iconv-%{py_ver} -%ghost %{_bindir}/mid3v2 %{_bindir}/mid3v2-%{py_ver} -%ghost %{_bindir}/moggsplit %{_bindir}/moggsplit-%{py_ver} -%ghost %{_bindir}/mutagen-inspect %{_bindir}/mutagen-inspect-%{py_ver} -%ghost %{_bindir}/mutagen-pony %{_bindir}/mutagen-pony-%{py_ver} -%{python_sitelib}/mutagen -%{python_sitelib}/mutagen-%{version}-py%{py_ver}.egg-info -%ghost %{_mandir}/man1/mid3cp.1.gz +%ghost %{_sysconfdir}/alternatives/mid3cp +%ghost %{_sysconfdir}/alternatives/mid3iconv +%ghost %{_sysconfdir}/alternatives/mid3v2 +%ghost %{_sysconfdir}/alternatives/moggsplit +%ghost %{_sysconfdir}/alternatives/mutagen-inspect +%ghost %{_sysconfdir}/alternatives/mutagen-pony +%{_mandir}/man1/mid3cp.1.gz +%{_mandir}/man1/mid3iconv.1.gz +%{_mandir}/man1/mid3v2.1.gz +%{_mandir}/man1/moggsplit.1.gz +%{_mandir}/man1/mutagen-inspect.1.gz +%{_mandir}/man1/mutagen-pony.1.gz %{_mandir}/man1/mid3cp-%{py_ver}.1.gz -%ghost %{_mandir}/man1/mid3iconv.1.gz %{_mandir}/man1/mid3iconv-%{py_ver}.1.gz -%ghost %{_mandir}/man1/mid3v2.1.gz %{_mandir}/man1/mid3v2-%{py_ver}.1.gz -%ghost %{_mandir}/man1/moggsplit.1.gz %{_mandir}/man1/moggsplit-%{py_ver}.1.gz -%ghost %{_mandir}/man1/mutagen-inspect.1.gz %{_mandir}/man1/mutagen-inspect-%{py_ver}.1.gz -%ghost %{_mandir}/man1/mutagen-pony.1.gz %{_mandir}/man1/mutagen-pony-%{py_ver}.1.gz +%ghost %{_sysconfdir}/alternatives/mid3cp.1.gz +%ghost %{_sysconfdir}/alternatives/mid3iconv.1.gz +%ghost %{_sysconfdir}/alternatives/mid3v2.1.gz +%ghost %{_sysconfdir}/alternatives/moggsplit.1.gz +%ghost %{_sysconfdir}/alternatives/mutagen-inspect.1.gz +%ghost %{_sysconfdir}/alternatives/mutagen-pony.1.gz +%{python_sitelib}/mutagen +%{python_sitelib}/mutagen-%{version}-py*.egg-info %changelog ++++++ mutagen-1.28.tar.gz -> mutagen-1.31.tar.gz ++++++ ++++ 12830 lines of diff (skipped)

1 0

commit python-setuptools_scm for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package python-setuptools_scm for openSUSE:Factory checked in at 2016-01-23 01:15:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-setuptools_scm (Old) and /work/SRC/openSUSE:Factory/.python-setuptools_scm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-setuptools_scm" Changes: -------- --- /work/SRC/openSUSE:Factory/python-setuptools_scm/python-setuptools_scm.changes 2015-11-12 19:37:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-setuptools_scm.new/python-setuptools_scm.changes 2016-01-23 01:15:34.000000000 +0100 @@ -1,0 +2,23 @@ +Tue Jan 12 17:07:35 UTC 2016 - michael(a)stroeder.com + +- Update to 1.10.1: + +v1.10.1 +* fix issue #73 - in hg pre commit merge, consider parent1 instead of failing + +v1.10.0 +* add support for overriding the version number via the + environment variable SETUPTOOLS_SCM_PRETEND_VERSION +* fix isssue #63 by adding the --match parameter to the git describe call + and prepare the possibility of passing more options to scm backends +* fix issue #70 and #71 by introducing the parse keyword + to specify custom scm parsing, its an expert feature, + use with caution + this change also introduces the setuptools_scm.parse_scm_fallback + entrypoint which can be used to register custom archive fallbacks + +v1.9.0 +* Add :code:`relative_to` parameter to :code:`get_version` function; + fixes #44 per #45. + +------------------------------------------------------------------- Old: ---- setuptools_scm-1.8.0.tar.bz2 New: ---- setuptools_scm-1.10.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-setuptools_scm.spec ++++++ --- /var/tmp/diff_new_pack.kvVxai/_old 2016-01-23 01:15:35.000000000 +0100 +++ /var/tmp/diff_new_pack.kvVxai/_new 2016-01-23 01:15:35.000000000 +0100 @@ -17,7 +17,7 @@ Name: python-setuptools_scm -Version: 1.8.0 +Version: 1.10.1 Release: 0 Summary: Manage your versions by scm tags License: MIT ++++++ setuptools_scm-1.8.0.tar.bz2 -> setuptools_scm-1.10.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/.hgtags new/setuptools_scm-1.10.1/.hgtags --- old/setuptools_scm-1.8.0/.hgtags 1970-01-01 01:00:00.000000000 +0100 +++ new/setuptools_scm-1.10.1/.hgtags 2015-11-28 14:49:00.000000000 +0100 @@ -0,0 +1 @@ +1092123ef78598eade56aa9c57e484f3670c8da8 v1.9.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/CHANGELOG.rst new/setuptools_scm-1.10.1/CHANGELOG.rst --- old/setuptools_scm-1.8.0/CHANGELOG.rst 2015-09-17 22:48:24.000000000 +0200 +++ new/setuptools_scm-1.10.1/CHANGELOG.rst 2015-12-10 21:58:57.000000000 +0100 @@ -1,4 +1,30 @@ +v1.10.1 +======= +* fix issue #73 - in hg pre commit merge, consider parent1 instead of failing + +v1.10.0 +======= + +* add support for overriding the version number via the + environment variable SETUPTOOLS_SCM_PRETEND_VERSION + +* fix isssue #63 by adding the --match parameter to the git describe call + and prepare the possibility of passing more options to scm backends + +* fix issue #70 and #71 by introducing the parse keyword + to specify custom scm parsing, its an expert feature, + use with caution + + this change also introduces the setuptools_scm.parse_scm_fallback + entrypoint which can be used to register custom archive fallbacks + + +v1.9.0 +====== + +* Add :code:`relative_to` parameter to :code:`get_version` function; + fixes #44 per #45. v1.8.0 ====== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/PKG-INFO new/setuptools_scm-1.10.1/PKG-INFO --- old/setuptools_scm-1.8.0/PKG-INFO 2015-09-17 23:00:09.000000000 +0200 +++ new/setuptools_scm-1.10.1/PKG-INFO 2015-12-10 22:04:05.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: setuptools_scm -Version: 1.8.0 +Version: 1.10.1 Summary: the blessed package to manage your versions by scm tags Home-page: https://github.com/pypa/setuptools_scm/ Author: Ronny Pfannschmidt @@ -13,7 +13,7 @@ in scm metadata instead of declaring them as the version argument or in a scm managed file. - It also handles file finders for the supperted scm's. + It also handles file finders for the supported scm's. .. image:: https://travis-ci.org/pypa/setuptools_scm.svg?branch=master :target: https://travis-ci.org/pypa/setuptools_scm @@ -51,6 +51,17 @@ version = get_version() + Notable Plugins + ---------------- + + `setuptools_scm_git_archive <https://pypi.python.org/pypi/setuptools_scm_git_archive>`_ + provides partial support for obtaining versions from git archvies + that belong to tagged versions. The only reason for not including + it in setuptools-scm itself is git/github not supporting + sufficient metadata for untagged/followup commits, + which is preventing a consistent UX. + + Default versioning scheme -------------------------- @@ -134,6 +145,18 @@ a newstyle format string thats given the current version as the :code:`version` keyword argument for formatting + :relative_to: + a file from which root may be resolved. typically called by a + script or module that is not + in the root of the repository to direct setuptools_scm to the + root of the repository by supplying ``__file__``. + + :parse: + a function that will be used instead of the discovered scm for parsing the version, + use with caution, this is a expert function and you should be closely familiar + with the setuptools_scm internals to use it + + To use setuptools_scm in other Python code you can use the ``get_version`` function: @@ -146,6 +169,15 @@ keyword arguments. + Environment Variables + --------------------- + + :SETUPTOOLS_SCM_PRETEND_VERSION: + when defined and not empty, + its used as the primary source for the version number + in which case it will be a unparsed string + + Extending setuptools_scm ------------------------ @@ -205,7 +237,7 @@ To support usage in :code:`setup.py` passing a callable into use_scm_version is supported. - Within that callable, setuptools_scm is availiable for import. + Within that callable, setuptools_scm is available for import. The callable must return the configuration. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/README.rst new/setuptools_scm-1.10.1/README.rst --- old/setuptools_scm-1.8.0/README.rst 2015-09-17 22:49:11.000000000 +0200 +++ new/setuptools_scm-1.10.1/README.rst 2015-12-07 21:45:49.000000000 +0100 @@ -5,7 +5,7 @@ in scm metadata instead of declaring them as the version argument or in a scm managed file. -It also handles file finders for the supperted scm's. +It also handles file finders for the supported scm's. .. image:: https://travis-ci.org/pypa/setuptools_scm.svg?branch=master :target: https://travis-ci.org/pypa/setuptools_scm @@ -43,6 +43,17 @@ version = get_version() +Notable Plugins +---------------- + +`setuptools_scm_git_archive <https://pypi.python.org/pypi/setuptools_scm_git_archive>`_ +provides partial support for obtaining versions from git archvies +that belong to tagged versions. The only reason for not including +it in setuptools-scm itself is git/github not supporting +sufficient metadata for untagged/followup commits, +which is preventing a consistent UX. + + Default versioning scheme -------------------------- @@ -126,6 +137,18 @@ a newstyle format string thats given the current version as the :code:`version` keyword argument for formatting +:relative_to: + a file from which root may be resolved. typically called by a + script or module that is not + in the root of the repository to direct setuptools_scm to the + root of the repository by supplying ``__file__``. + +:parse: + a function that will be used instead of the discovered scm for parsing the version, + use with caution, this is a expert function and you should be closely familiar + with the setuptools_scm internals to use it + + To use setuptools_scm in other Python code you can use the ``get_version`` function: @@ -138,6 +161,15 @@ keyword arguments. +Environment Variables +--------------------- + +:SETUPTOOLS_SCM_PRETEND_VERSION: + when defined and not empty, + its used as the primary source for the version number + in which case it will be a unparsed string + + Extending setuptools_scm ------------------------ @@ -197,7 +229,7 @@ To support usage in :code:`setup.py` passing a callable into use_scm_version is supported. -Within that callable, setuptools_scm is availiable for import. +Within that callable, setuptools_scm is available for import. The callable must return the configuration. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/setup.cfg new/setuptools_scm-1.10.1/setup.cfg --- old/setuptools_scm-1.8.0/setup.cfg 2015-09-17 23:00:09.000000000 +0200 +++ new/setuptools_scm-1.10.1/setup.cfg 2015-12-10 22:04:05.000000000 +0100 @@ -4,8 +4,11 @@ [devpi:upload] formats = sdist,bdist_wheel +[aliases] +release = sdist bdist_wheel upload + [egg_info] -tag_date = 0 tag_build = +tag_date = 0 tag_svn_revision = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/setup.py new/setuptools_scm-1.10.1/setup.py --- old/setuptools_scm-1.8.0/setup.py 2015-09-17 23:00:09.000000000 +0200 +++ new/setuptools_scm-1.10.1/setup.py 2015-12-10 22:04:05.000000000 +0100 @@ -63,7 +63,7 @@ url='https://github.com/pypa/setuptools_scm/', zip_safe=True, # pass here since entrypints are not yet registred - version="1.8.0", + version="1.10.1", author='Ronny Pfannschmidt', author_email='opensource(a)ronnypfannschmidt.de', description=('the blessed package to manage your versions by scm tags'), @@ -82,6 +82,12 @@ [setuptools_scm.parse_scm] .hg = setuptools_scm.hg:parse .git = setuptools_scm.git:parse + + # those are left here for backward compatibility in the 1.x series + .hg_archival.txt = setuptools_scm.hg:parse_archival + PKG-INFO = setuptools_scm.hacks:parse_pkginfo + + [setuptools_scm.parse_scm_fallback] .hg_archival.txt = setuptools_scm.hg:parse_archival PKG-INFO = setuptools_scm.hacks:parse_pkginfo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/setuptools_scm/__init__.py new/setuptools_scm-1.10.1/setuptools_scm/__init__.py --- old/setuptools_scm-1.8.0/setuptools_scm/__init__.py 2015-09-17 22:43:47.000000000 +0200 +++ new/setuptools_scm-1.10.1/setuptools_scm/__init__.py 2015-12-07 21:24:21.000000000 +0100 @@ -9,6 +9,9 @@ from .version import format_version from .discover import find_matching_entrypoint +PRETEND_KEY = 'SETUPTOOLS_SCM_PRETEND_VERSION' + + TEMPLATES = { '.py': """\ # coding: utf-8 @@ -24,16 +27,13 @@ def version_from_scm(root): - ep = find_matching_entrypoint(root, 'setuptools_scm.parse_scm') + return _version_from_entrypoint(root, 'setuptools_scm.parse_scm') + + +def _version_from_entrypoint(root, entrypoint): + ep = find_matching_entrypoint(root, entrypoint) if ep: return ep.load()(root) - raise LookupError( - "setuptools-scm was unable to detect version for %r.\n\n" - "Make sure you're not using GitHub's tarballs (or similar ones), as " - "those don't contain the necessary metadata. Use PyPI's tarballs " - "instead.\n\nFor example, if you're using pip, instead of " - "https://github.com/user/proj/archive/master.zip " - "use git+https://github.com/user/proj.git#egg=proj" % root) def dump_version(root, version, write_to, template=None): @@ -56,15 +56,50 @@ fp.write(dump) +def _do_parse(root, parse): + pretended = os.environ.get(PRETEND_KEY) + if pretended: + return pretended + + if parse: + version = parse(root) or _version_from_entrypoint( + root, 'setuptools_scm.parse_scm_fallback') + else: + # include fallbacks after dropping them from the main entrypoint + version = version_from_scm(root) + + if version: + return version + + raise LookupError( + "setuptools-scm was unable to detect version for %r.\n\n" + "Make sure you're not using GitHub's tarballs (or similar ones), as " + "those don't contain the necessary metadata. Use PyPI's tarballs " + "instead.\n\nFor example, if you're using pip, instead of " + "https://github.com/user/proj/archive/master.zip " + "use git+https://github.com/user/proj.git#egg=proj" % root) + + def get_version(root='.', version_scheme='guess-next-dev', local_scheme='node-and-date', write_to=None, - write_to_template=None): + write_to_template=None, + relative_to=None, + parse=None, + ): + """ + If supplied, relative_to should be a file from which root may + be resolved. Typically called by a script or module that is not + in the root of the repository to direct setuptools_scm to the + root of the repository by supplying ``__file__``. + """ + if relative_to: + root = os.path.join(os.path.dirname(relative_to), root) root = os.path.abspath(root) trace('root', repr(root)) - version = version_from_scm(root) + version = _do_parse(root, parse) if version: if isinstance(version, string_types): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/setuptools_scm/__main__.py new/setuptools_scm-1.10.1/setuptools_scm/__main__.py --- old/setuptools_scm-1.8.0/setuptools_scm/__main__.py 2015-06-14 08:39:53.000000000 +0200 +++ new/setuptools_scm-1.10.1/setuptools_scm/__main__.py 2015-11-28 14:49:00.000000000 +0100 @@ -1,7 +1,8 @@ from __future__ import print_function import sys -from setuptools_scm import get_version, find_files, \ - _warn_if_setuptools_outdated +from setuptools_scm import get_version +from setuptools_scm.integration import find_files +from setuptools_scm.version import _warn_if_setuptools_outdated if __name__ == '__main__': _warn_if_setuptools_outdated() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/setuptools_scm/git.py new/setuptools_scm-1.10.1/setuptools_scm/git.py --- old/setuptools_scm-1.8.0/setuptools_scm/git.py 2015-09-17 22:46:32.000000000 +0200 +++ new/setuptools_scm-1.10.1/setuptools_scm/git.py 2015-12-07 18:44:51.000000000 +0100 @@ -4,10 +4,13 @@ FILES_COMMAND = 'git ls-files' +DEFAULT_DESCRIBE = 'git describe --dirty --tags --long --match *.*' -def parse(root): +def parse(root, describe_command=DEFAULT_DESCRIBE): real_root, _, ret = do_ex('git rev-parse --show-toplevel', root) + if ret: + return trace('real root', real_root) if abspath(realpath(real_root)) != abspath(realpath(root)): return @@ -15,7 +18,7 @@ if ret: return meta('0.0') rev_node = rev_node[:7] - out, err, ret = do_ex('git describe --dirty --tags --long', root) + out, err, ret = do_ex(describe_command, root) if '-' not in out and '.' not in out: revs = do('git rev-list HEAD', root) count = revs.count('\n') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/setuptools_scm/hg.py new/setuptools_scm-1.10.1/setuptools_scm/hg.py --- old/setuptools_scm-1.8.0/setuptools_scm/hg.py 2015-09-17 22:46:32.000000000 +0200 +++ new/setuptools_scm-1.10.1/setuptools_scm/hg.py 2015-12-10 21:57:24.000000000 +0100 @@ -31,10 +31,12 @@ trace('initial node', root) return meta('0.0', dirty=dirty) - cmd = 'hg parents --template "{latesttag} {latesttagdistance}"' + # the newline is needed for merge stae, see issue 72 + cmd = 'hg parents --template "{latesttag} {latesttagdistance}\n"' out = do(cmd, root) try: - tag, dist = out.split() + # in merge state we assume parent 1 is fine + tag, dist = out.splitlines()[0].split() if tag == 'null': tag = '0.0' dist = int(dist) + 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/setuptools_scm/version.py new/setuptools_scm-1.10.1/setuptools_scm/version.py --- old/setuptools_scm-1.8.0/setuptools_scm/version.py 2015-09-17 22:46:32.000000000 +0200 +++ new/setuptools_scm-1.10.1/setuptools_scm/version.py 2015-11-28 20:33:43.000000000 +0100 @@ -22,8 +22,8 @@ def callable_or_entrypoint(group, callable_or_name): trace('ep', (group, callable_or_name)) if isinstance(callable_or_name, str): - ep = next(iter_entry_points(group, callable_or_name)) - return ep.load() + for ep in iter_entry_points(group, callable_or_name): + return ep.load() else: return callable_or_name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/setuptools_scm.egg-info/PKG-INFO new/setuptools_scm-1.10.1/setuptools_scm.egg-info/PKG-INFO --- old/setuptools_scm-1.8.0/setuptools_scm.egg-info/PKG-INFO 2015-09-17 23:00:09.000000000 +0200 +++ new/setuptools_scm-1.10.1/setuptools_scm.egg-info/PKG-INFO 2015-12-10 22:04:05.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: setuptools-scm -Version: 1.8.0 +Version: 1.10.1 Summary: the blessed package to manage your versions by scm tags Home-page: https://github.com/pypa/setuptools_scm/ Author: Ronny Pfannschmidt @@ -13,7 +13,7 @@ in scm metadata instead of declaring them as the version argument or in a scm managed file. - It also handles file finders for the supperted scm's. + It also handles file finders for the supported scm's. .. image:: https://travis-ci.org/pypa/setuptools_scm.svg?branch=master :target: https://travis-ci.org/pypa/setuptools_scm @@ -51,6 +51,17 @@ version = get_version() + Notable Plugins + ---------------- + + `setuptools_scm_git_archive <https://pypi.python.org/pypi/setuptools_scm_git_archive>`_ + provides partial support for obtaining versions from git archvies + that belong to tagged versions. The only reason for not including + it in setuptools-scm itself is git/github not supporting + sufficient metadata for untagged/followup commits, + which is preventing a consistent UX. + + Default versioning scheme -------------------------- @@ -134,6 +145,18 @@ a newstyle format string thats given the current version as the :code:`version` keyword argument for formatting + :relative_to: + a file from which root may be resolved. typically called by a + script or module that is not + in the root of the repository to direct setuptools_scm to the + root of the repository by supplying ``__file__``. + + :parse: + a function that will be used instead of the discovered scm for parsing the version, + use with caution, this is a expert function and you should be closely familiar + with the setuptools_scm internals to use it + + To use setuptools_scm in other Python code you can use the ``get_version`` function: @@ -146,6 +169,15 @@ keyword arguments. + Environment Variables + --------------------- + + :SETUPTOOLS_SCM_PRETEND_VERSION: + when defined and not empty, + its used as the primary source for the version number + in which case it will be a unparsed string + + Extending setuptools_scm ------------------------ @@ -205,7 +237,7 @@ To support usage in :code:`setup.py` passing a callable into use_scm_version is supported. - Within that callable, setuptools_scm is availiable for import. + Within that callable, setuptools_scm is available for import. The callable must return the configuration. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/setuptools_scm.egg-info/SOURCES.txt new/setuptools_scm-1.10.1/setuptools_scm.egg-info/SOURCES.txt --- old/setuptools_scm-1.8.0/setuptools_scm.egg-info/SOURCES.txt 2015-09-17 23:00:09.000000000 +0200 +++ new/setuptools_scm-1.10.1/setuptools_scm.egg-info/SOURCES.txt 2015-12-10 22:04:05.000000000 +0100 @@ -1,4 +1,5 @@ .gitignore +.hgtags .travis.yml CHANGELOG.rst LICENSE @@ -25,4 +26,7 @@ testing/conftest.py testing/test_basic_api.py testing/test_functions.py +testing/test_git.py +testing/test_main.py +testing/test_mercurial.py testing/test_regressions.py \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/setuptools_scm.egg-info/entry_points.txt new/setuptools_scm-1.10.1/setuptools_scm.egg-info/entry_points.txt --- old/setuptools_scm-1.8.0/setuptools_scm.egg-info/entry_points.txt 2015-09-17 23:00:09.000000000 +0200 +++ new/setuptools_scm-1.10.1/setuptools_scm.egg-info/entry_points.txt 2015-12-10 22:04:05.000000000 +0100 @@ -8,6 +8,12 @@ [setuptools_scm.parse_scm] .hg = setuptools_scm.hg:parse .git = setuptools_scm.git:parse + + # those are left here for backward compatibility in the 1.x series + .hg_archival.txt = setuptools_scm.hg:parse_archival + PKG-INFO = setuptools_scm.hacks:parse_pkginfo + + [setuptools_scm.parse_scm_fallback] .hg_archival.txt = setuptools_scm.hg:parse_archival PKG-INFO = setuptools_scm.hacks:parse_pkginfo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/testing/conftest.py new/setuptools_scm-1.10.1/testing/conftest.py --- old/setuptools_scm-1.8.0/testing/conftest.py 2015-06-20 16:02:46.000000000 +0200 +++ new/setuptools_scm-1.10.1/testing/conftest.py 2015-11-29 17:37:41.000000000 +0100 @@ -1,4 +1,7 @@ import os +import itertools +import pytest + os.environ['SETUPTOOLS_SCM_DEBUG'] = '1' VERSION_PKGS = ['setuptools', 'setuptools_scm'] @@ -10,3 +13,54 @@ version = pkg_resources.get_distribution(pkg).version res.append('%s version %s' % (pkg, version)) return res + + +class Wd(object): + commit_command = None + add_command = None + + def __init__(self, cwd): + self.cwd = cwd + self.__counter = itertools.count() + + def __call__(self, cmd, **kw): + if kw: + cmd = cmd.format(**kw) + from setuptools_scm.utils import do + return do(cmd, self.cwd) + + def write(self, name, value, **kw): + filename = self.cwd.join(name) + if kw: + value = value.format(**kw) + filename.write(value) + return filename + + def _reason(self, given_reason): + if given_reason is None: + return 'number-{c}'.format(c=next(self.__counter)) + else: + return given_reason + + def commit(self, reason=None): + reason = self._reason(reason) + self(self.commit_command, reason=reason) + + def commit_testfile(self, reason=None): + reason = self._reason(reason) + self.write('test.txt', 'test {reason}', reason=reason) + self(self.add_command) + self.commit(reason=reason) + + @property + def version(self): + __tracebackhide__ = True + from setuptools_scm import get_version + version = get_version(root=str(self.cwd)) + print(version) + return version + + +(a)pytest.fixture +def wd(tmpdir): + return Wd(tmpdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/testing/test_basic_api.py new/setuptools_scm-1.10.1/testing/test_basic_api.py --- old/setuptools_scm-1.8.0/testing/test_basic_api.py 2015-09-17 22:46:32.000000000 +0200 +++ new/setuptools_scm-1.10.1/testing/test_basic_api.py 2015-12-07 19:00:11.000000000 +0100 @@ -3,22 +3,9 @@ import pytest import setuptools_scm -from setuptools_scm import format_version -from setuptools_scm import integration from setuptools_scm import dump_version - from setuptools_scm.utils import data_from_mime, do -from setuptools_scm.hg import archival_to_version - - -def get_version(root, method='get_version', __tracebackhide__=False, **kw): - call = getattr(setuptools_scm, method) - data = call(root=root.strpath, **kw) - if isinstance(data, dict): - return format_version(data) - else: - return data @pytest.mark.parametrize('cmd', ['ls', 'dir']) @@ -28,35 +15,9 @@ do(cmd, str(tmpdir)) -class Wd(object): - def __init__(self, cwd): - self.cwd = cwd - - def __call__(self, cmd): - return do(cmd, self.cwd) - - def write(self, name, value): - filename = self.cwd.join(name) - filename.write(value) - return filename - - @property - def version(self): - __tracebackhide__ = True - version = get_version(self.cwd, __tracebackhide__=True) - print(version) - return version - - -(a)pytest.fixture -def wd(tmpdir): - return Wd(tmpdir) - - -def test_data_from_mime(wd): - tmpfile = wd.write( - 'test.archival', - 'name: test\nrevision: 1') +def test_data_from_mime(tmpdir): + tmpfile = tmpdir.join('test.archival') + tmpfile.write('name: test\nrevision: 1') res = data_from_mime(str(tmpfile)) assert res == { @@ -65,135 +26,40 @@ } -archival_mapping = { - '1.0': {'tag': '1.0'}, - '1.1.dev3+n000000000000': { - 'latesttag': '1.0', - 'latesttagdistance': '3', - 'node': '0'*20, - }, - '0.0': { - 'node': '0'*20, - }, - '1.2.2': {'tag': 'release-1.2.2'}, - '1.2.2.dev0': {'tag': 'release-1.2.2.dev'}, - -} - - -(a)pytest.mark.parametrize('expected,data', sorted(archival_mapping.items())) -def test_archival_to_version(expected, data): - version = archival_to_version(data) - assert format_version( - version, - version_scheme='guess-next-dev', - local_scheme='node-and-date') == expected - - -def test_version_from_git(wd): - wd('git init') - wd('git config user.email test(a)example.com') - wd('git config user.name "a test"') - assert wd.version == '0.0' - wd.write('test.txt', 'test') - wd('git add test.txt') - wd('git commit -m commit') - - assert wd.version.startswith('0.1.dev1+') - assert not wd.version.endswith('1-') - - wd('git tag v0.1') - assert wd.version == '0.1' - - wd.write('test.txt', 'test2') - assert wd.version.startswith('0.2.dev0+') - wd('git add test.txt') - wd('git commit -m commit') - assert wd.version.startswith('0.2.dev1+') - wd('git tag version-0.2') - assert wd.version.startswith('0.2') - - -# XXX: better tests for tag prefixes -def test_version_from_hg_id(wd): - wd('hg init') - assert wd.version == '0.0' - wd.write('test.txt', 'test') - wd('hg add test.txt') - wd('hg commit -m commit -u test -d "0 0"') - - assert wd.version.startswith('0.1.dev2+') - - # tagging commit is considered the tag - wd('hg tag v0.1 -u test -d "0 0"') +def test_version_from_pkginfo(wd): + wd.write('PKG-INFO', 'Version: 0.1') assert wd.version == '0.1' - wd.write('test.txt', 'test2') - - wd('hg commit -m commit2 -u test -d "0 0"') - assert wd.version.startswith('0.2.dev2') - - wd('hg up v0.1') - assert wd.version == '0.1' - # commit originating from the taged revision - # that is not a actual tag - wd.write('test.txt', 'test2') - wd('hg commit -m commit3 -u test -d "0 0"') - assert wd.version.startswith('0.2.dev1+') - - -def test_version_from_archival(tmpdir): - tmpdir.join('.hg_archival.txt').write( - 'node: 000000000000\n' - 'tag: 0.1\n' - ) - assert get_version(tmpdir) == '0.1' - - tmpdir.join('.hg_archival.txt').write( - 'node: 000000000000\n' - 'latesttag: 0.1\n' - 'latesttagdistance: 3\n' - ) - - assert get_version(tmpdir) == '0.2.dev3+n000000000000' - - -def test_version_from_pkginfo(tmpdir): - tmpdir.join('PKG-INFO').write('Version: 0.1') - assert get_version(tmpdir) == '0.1' +def assert_root(monkeypatch, expected_root): + """ + Patch version_from_scm to simply assert that root is expected root + """ + def assertion(root, unused_parse): + assert root == expected_root + monkeypatch.setattr(setuptools_scm, '_do_parse', assertion) def test_root_parameter_creation(monkeypatch): - def assert_cwd(root, cache_file=None): - assert root == os.getcwd() - monkeypatch.setattr(setuptools_scm, 'version_from_scm', assert_cwd) + assert_root(monkeypatch, os.getcwd()) setuptools_scm.get_version() def test_root_parameter_pass_by(monkeypatch): - def assert_root_tmp(root): - assert root == os.path.abspath('/tmp') - monkeypatch.setattr(setuptools_scm, 'version_from_scm', assert_root_tmp) + assert_root(monkeypatch, '/tmp') setuptools_scm.get_version(root='/tmp') -def test_find_files_stop_at_root_hg(wd): - wd('hg init') - wd.write('test.txt', 'test') - wd('hg add .') - wd('hg commit -m test -u test') - wd.cwd.ensure('project/setup.cfg') - assert integration .find_files(str(wd.cwd/'project')) == [] - - -def test_find_files_stop_at_root_git(wd): - wd('git init') - wd.write('test.txt', 'test') - wd('git add .') - wd('git commit -m test -u test') - wd.cwd.ensure('project/setup.cfg') - assert integration.find_files(str(wd.cwd/'project')) == [] +def test_pretended(monkeypatch): + pretense = '2345' + monkeypatch.setenv(setuptools_scm.PRETEND_KEY, pretense) + assert setuptools_scm.get_version() == pretense + + +def test_root_relative_to(monkeypatch): + assert_root(monkeypatch, '/tmp/alt') + __file__ = '/tmp/module/file.py' + setuptools_scm.get_version(root='../alt', relative_to=__file__) def test_dump_version(tmpdir): @@ -206,3 +72,9 @@ assert repr('1.0') in content import ast ast.parse(content) + + +def test_parse_plain(): + def parse(root): + return 'tricked you' + assert setuptools_scm.get_version(parse=parse) == 'tricked you' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/testing/test_git.py new/setuptools_scm-1.10.1/testing/test_git.py --- old/setuptools_scm-1.8.0/testing/test_git.py 1970-01-01 01:00:00.000000000 +0100 +++ new/setuptools_scm-1.10.1/testing/test_git.py 2015-11-29 17:38:10.000000000 +0100 @@ -0,0 +1,44 @@ +from setuptools_scm import integration +import pytest + + +(a)pytest.fixture +def wd(wd): + wd('git init') + wd('git config user.email test(a)example.com') + wd('git config user.name "a test"') + wd.add_command = 'git add .' + wd.commit_command = 'git commit -m test-{reason}' + return wd + + +def test_version_from_git(wd): + assert wd.version == '0.0' + + wd.commit_testfile() + assert wd.version.startswith('0.1.dev1+') + assert not wd.version.endswith('1-') + + wd('git tag v0.1') + assert wd.version == '0.1' + + wd.write('test.txt', 'test2') + assert wd.version.startswith('0.2.dev0+') + + wd.commit_testfile() + assert wd.version.startswith('0.2.dev1+') + + wd('git tag version-0.2') + assert wd.version.startswith('0.2') + + +def test_find_files_stop_at_root_git(wd): + wd.commit_testfile() + wd.cwd.ensure('project/setup.cfg') + assert integration.find_files(str(wd.cwd/'project')) == [] + + +def test_alphanumeric_tags_match(wd): + wd.commit_testfile() + wd('git tag newstyle-development-started') + assert wd.version.startswith('0.1.dev1+') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/testing/test_main.py new/setuptools_scm-1.10.1/testing/test_main.py --- old/setuptools_scm-1.8.0/testing/test_main.py 1970-01-01 01:00:00.000000000 +0100 +++ new/setuptools_scm-1.10.1/testing/test_main.py 2015-11-28 14:49:00.000000000 +0100 @@ -0,0 +1,9 @@ +import os.path + + +def test_main(): + mainfile = os.path.join( + os.path.dirname(__file__), "..", "setuptools_scm", "__main__.py") + with open(mainfile) as f: + code = compile(f.read(), "__main__.py", 'exec') + exec(code) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.8.0/testing/test_mercurial.py new/setuptools_scm-1.10.1/testing/test_mercurial.py --- old/setuptools_scm-1.8.0/testing/test_mercurial.py 1970-01-01 01:00:00.000000000 +0100 +++ new/setuptools_scm-1.10.1/testing/test_mercurial.py 2015-12-10 21:58:05.000000000 +0100 @@ -0,0 +1,97 @@ +from setuptools_scm import format_version +from setuptools_scm.hg import archival_to_version +from setuptools_scm import integration + +import pytest + + +(a)pytest.fixture +def wd(wd): + wd('hg init') + wd.add_command = 'hg add .' + wd.commit_command = 'hg commit -m test-{reason} -u test -d "0 0"' + return wd + +archival_mapping = { + '1.0': {'tag': '1.0'}, + '1.1.dev3+n000000000000': { + 'latesttag': '1.0', + 'latesttagdistance': '3', + 'node': '0'*20, + }, + '0.0': { + 'node': '0'*20, + }, + '1.2.2': {'tag': 'release-1.2.2'}, + '1.2.2.dev0': {'tag': 'release-1.2.2.dev'}, + +} + + +(a)pytest.mark.parametrize('expected,data', sorted(archival_mapping.items())) +def test_archival_to_version(expected, data): + version = archival_to_version(data) + assert format_version( + version, + version_scheme='guess-next-dev', + local_scheme='node-and-date') == expected + + +def test_find_files_stop_at_root_hg(wd): + wd.commit_testfile() + wd.cwd.ensure('project/setup.cfg') + assert integration.find_files(str(wd.cwd/'project')) == [] + + +# XXX: better tests for tag prefixes +def test_version_from_hg_id(wd): + assert wd.version == '0.0' + + wd.commit_testfile() + assert wd.version.startswith('0.1.dev2+') + + # tagging commit is considered the tag + wd('hg tag v0.1 -u test -d "0 0"') + assert wd.version == '0.1' + + wd.commit_testfile() + assert wd.version.startswith('0.2.dev2') + + wd('hg up v0.1') + assert wd.version == '0.1' + + # commit originating from the taged revision + # that is not a actual tag + wd.commit_testfile() + assert wd.version.startswith('0.2.dev1+') + + +def test_version_from_archival(wd): + # entrypoints are unordered, + # cleaning the wd ensure this test wont break randomly + wd.cwd.join('.hg').remove() + wd.write( + '.hg_archival.txt', + 'node: 000000000000\n' + 'tag: 0.1\n' + ) + assert wd.version == '0.1' + + wd.write( + '.hg_archival.txt', + 'node: 000000000000\n' + 'latesttag: 0.1\n' + 'latesttagdistance: 3\n' + ) + + assert wd.version == '0.2.dev3+n000000000000' + + +(a)pytest.mark.issue('#72') +def test_version_in_merge(wd): + wd.commit_testfile() + wd.commit_testfile() + wd('hg up 0') + wd.commit_testfile() + wd('hg merge') + assert wd.version is not None

1 0

commit perl-XML-XPath for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package perl-XML-XPath for openSUSE:Factory checked in at 2016-01-23 01:14:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-XML-XPath (Old) and /work/SRC/openSUSE:Factory/.perl-XML-XPath.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-XML-XPath" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-XML-XPath/perl-XML-XPath.changes 2016-01-17 09:23:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-XML-XPath.new/perl-XML-XPath.changes 2016-01-23 01:15:33.000000000 +0100 @@ -1,0 +2,21 @@ +Wed Jan 20 10:57:03 UTC 2016 - coolo(a)suse.com + +- updated to 1.24 + see /usr/share/doc/packages/perl-XML-XPath/Changes + + 1.24 2016-01-19 MANWAR + - Fixed issue RT# 111278 (XML::XPath::PerlSAX doesn't compile). + +------------------------------------------------------------------- +Tue Jan 19 10:40:24 UTC 2016 - coolo(a)suse.com + +- updated to 1.23 + see /usr/share/doc/packages/perl-XML-XPath/Changes + + 1.23 2016-01-18 MANWAR + - Fixed issues RT# 6363 (using < in a query returns results as if <= had been used). + + 1.22 2016-01-13 MANWAR + - Fixed issues RT# 30818 and RT# 80277. + +------------------------------------------------------------------- Old: ---- XML-XPath-1.21.tar.gz New: ---- XML-XPath-1.24.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-XML-XPath.spec ++++++ --- /var/tmp/diff_new_pack.ewsS2A/_old 2016-01-23 01:15:34.000000000 +0100 +++ /var/tmp/diff_new_pack.ewsS2A/_new 2016-01-23 01:15:34.000000000 +0100 @@ -17,10 +17,10 @@ Name: perl-XML-XPath -Version: 1.21 +Version: 1.24 Release: 0 %define cpan_name XML-XPath -Summary: Set of Modules for Parsing and Evaluating Xpath Statements +Summary: Parse and evaluate XPath statements License: Artistic-2.0 Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/XML-XPath/ ++++++ XML-XPath-1.21.tar.gz -> XML-XPath-1.24.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/Changes new/XML-XPath-1.24/Changes --- old/XML-XPath-1.21/Changes 2016-01-12 11:37:46.000000000 +0100 +++ new/XML-XPath-1.24/Changes 2016-01-19 12:29:56.000000000 +0100 @@ -1,5 +1,14 @@ Revision history for XML::XPath +1.24 2016-01-19 MANWAR + - Fixed issue RT# 111278 (XML::XPath::PerlSAX doesn't compile). + +1.23 2016-01-18 MANWAR + - Fixed issue RT# 6363 (using < in a query returns results as if <= had been used). + +1.22 2016-01-13 MANWAR + - Fixed issues RT# 30818 and RT# 80277. + 1.21 2016-01-12 MANWAR - Fixed issues RT# 14957 and RT# 30819. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/MANIFEST new/XML-XPath-1.24/MANIFEST --- old/XML-XPath-1.21/MANIFEST 2016-01-12 11:38:11.000000000 +0100 +++ new/XML-XPath-1.24/MANIFEST 2016-01-19 12:30:34.000000000 +0100 @@ -27,6 +27,7 @@ lib/XML/XPath/Root.pm lib/XML/XPath/PerlSAX.pm lib/XML/XPath/Builder.pm +t/00load.t t/01basic.t t/02descendant.t t/03star.t @@ -69,6 +70,9 @@ t/39contains.t t/40substring_before.t t/41substring_after.t +t/42create_node.t +t/43op_div.t +t/44test_compare.t t/rdf.t t/remove.t t/insert.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/META.json new/XML-XPath-1.24/META.json --- old/XML-XPath-1.21/META.json 2016-01-12 11:38:11.000000000 +0100 +++ new/XML-XPath-1.24/META.json 2016-01-19 12:30:34.000000000 +0100 @@ -45,6 +45,6 @@ "web" : "https://github.com/manwar/XML-XPath" } }, - "version" : "1.21", + "version" : "1.24", "x_serialization_backend" : "JSON::PP version 2.27203" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/META.yml new/XML-XPath-1.24/META.yml --- old/XML-XPath-1.21/META.yml 2016-01-12 11:38:11.000000000 +0100 +++ new/XML-XPath-1.24/META.yml 2016-01-19 12:30:34.000000000 +0100 @@ -22,5 +22,5 @@ perl: '5.006' resources: repository: https://github.com/manwar/XML-XPath.git -version: '1.21' +version: '1.24' x_serialization_backend: 'CPAN::Meta::YAML version 0.012' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Boolean.pm new/XML-XPath-1.24/lib/XML/XPath/Boolean.pm --- old/XML-XPath-1.21/lib/XML/XPath/Boolean.pm 2016-01-12 10:47:37.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Boolean.pm 2016-01-19 12:19:30.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Boolean; -$VERSION = '1.21'; +$VERSION = '1.24'; use XML::XPath::Number; use XML::XPath::Literal; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Builder.pm new/XML-XPath-1.24/lib/XML/XPath/Builder.pm --- old/XML-XPath-1.21/lib/XML/XPath/Builder.pm 2016-01-12 10:47:45.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Builder.pm 2016-01-19 12:19:40.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Builder; -$VERSION = '1.21'; +$VERSION = '1.24'; use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Expr.pm new/XML-XPath-1.24/lib/XML/XPath/Expr.pm --- old/XML-XPath-1.21/lib/XML/XPath/Expr.pm 2016-01-12 10:47:54.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Expr.pm 2016-01-19 12:19:48.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Expr; -$VERSION = '1.21'; +$VERSION = '1.24'; use strict; use warnings; @@ -331,7 +331,7 @@ sub op_le { my ($node, $lhs, $rhs) = @_; - op_gt($node, $rhs, $lhs); + op_ge($node, $rhs, $lhs); } sub op_ge { @@ -360,31 +360,22 @@ !$rh_results->isa('XML::XPath::NodeSet'))) { # (that says: one is a nodeset, and one is not a nodeset) - my ($nodeset, $other); - my ($true, $false); if ($lh_results->isa('XML::XPath::NodeSet')) { - $nodeset = $lh_results; - $other = $rh_results; - # we do this because unlike ==, these ops are direction dependant - ($false, $true) = (XML::XPath::Boolean->False, XML::XPath::Boolean->True); + foreach my $node ($lh_results->get_nodelist) { + if ($node->to_number->value >= $rh_results->to_number->value) { + return XML::XPath::Boolean->True; + } + } } else { - $nodeset = $rh_results; - $other = $lh_results; - # ditto above comment - ($true, $false) = (XML::XPath::Boolean->False, XML::XPath::Boolean->True); - } - - # True if and only if there is a node in the - # nodeset such that the result of performing - # the comparison on <type>(string_value($node)) - # is true. - foreach my $node ($nodeset->get_nodelist) { - if ($node->to_number->value >= $other->to_number->value) { - return $true; + foreach my $node ($rh_results->get_nodelist) { + if ( $lh_results->to_number->value >= $node->to_number->value) { + return XML::XPath::Boolean->True; + } } } - return $false; + + return XML::XPath::Boolean->False; } else { # Neither is a nodeset if ($lh_results->isa('XML::XPath::Boolean') || @@ -430,31 +421,22 @@ !$rh_results->isa('XML::XPath::NodeSet'))) { # (that says: one is a nodeset, and one is not a nodeset) - my ($nodeset, $other); - my ($true, $false); if ($lh_results->isa('XML::XPath::NodeSet')) { - $nodeset = $lh_results; - $other = $rh_results; - # we do this because unlike ==, these ops are direction dependant - ($false, $true) = (XML::XPath::Boolean->False, XML::XPath::Boolean->True); + foreach my $node ($lh_results->get_nodelist) { + if ($node->to_number->value > $rh_results->to_number->value) { + return XML::XPath::Boolean->True; + } + } } else { - $nodeset = $rh_results; - $other = $lh_results; - # ditto above comment - ($true, $false) = (XML::XPath::Boolean->False, XML::XPath::Boolean->True); - } - - # True if and only if there is a node in the - # nodeset such that the result of performing - # the comparison on <type>(string_value($node)) - # is true. - foreach my $node ($nodeset->get_nodelist) { - if ($node->to_number->value > $other->to_number->value) { - return $true; + foreach my $node ($rh_results->get_nodelist) { + if ( $lh_results->to_number->value > $node->to_number->value) { + return XML::XPath::Boolean->True; + } } } - return $false; + + return XML::XPath::Boolean->False; } else { # Neither is a nodeset if ($lh_results->isa('XML::XPath::Boolean') || @@ -509,6 +491,18 @@ my $lh_results = $lhs->evaluate($node); my $rh_results = $rhs->evaluate($node); + # handle zero devided cases. + if ($rh_results->to_number->value == 0) { + my $lv = $lh_results->to_number->value; + if ($lv == 0) { + return XML::XPath::Literal->new('NaN'); + } elsif ($lv > 0) { + return XML::XPath::Literal->new('Infinity'); + } elsif ($lv < 0) { + return XML::XPath::Literal->new('-Infinity'); + } + } + my $result = eval { $lh_results->to_number->value / diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Function.pm new/XML-XPath-1.24/lib/XML/XPath/Function.pm --- old/XML-XPath-1.21/lib/XML/XPath/Function.pm 2016-01-12 10:48:01.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Function.pm 2016-01-19 12:19:57.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Function; -$VERSION = '1.21'; +$VERSION = '1.24'; use XML::XPath::Number; use XML::XPath::Literal; @@ -265,7 +265,7 @@ if (@params == 3) { $len = $params[2]->value; - if (($len eq 'NaN') || (($offset eq 'Infinity') && ($len eq 'Infinity'))) { + if (($len eq 'NaN') || (($offset =~ /Infinity/) && ($len eq 'Infinity'))) { return XML::XPath::Literal->new(''); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Literal.pm new/XML-XPath-1.24/lib/XML/XPath/Literal.pm --- old/XML-XPath-1.21/lib/XML/XPath/Literal.pm 2016-01-12 10:48:12.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Literal.pm 2016-01-19 12:20:07.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Literal; -$VERSION = '1.21'; +$VERSION = '1.24'; use XML::XPath::Boolean; use XML::XPath::Number; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/LocationPath.pm new/XML-XPath-1.24/lib/XML/XPath/LocationPath.pm --- old/XML-XPath-1.21/lib/XML/XPath/LocationPath.pm 2016-01-12 10:48:20.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/LocationPath.pm 2016-01-19 12:20:16.000000000 +0100 @@ -1,24 +1,24 @@ package XML::XPath::LocationPath; -$VERSION = '1.21'; +$VERSION = '1.24'; use XML::XPath::Root; use strict; use warnings; sub new { - my $class = shift; - my $self = []; - bless $self, $class; + my $class = shift; + my $self = []; + bless $self, $class; } sub as_string { - my $self = shift; - my $string; - for (my $i = 0; $i < @$self; $i++) { - $string .= $self->[$i]->as_string if defined $self->[$i]->as_string; - $string .= "/" if $self->[$i+1]; - } - return $string; + my $self = shift; + my $string; + for (my $i = 0; $i < @$self; $i++) { + $string .= $self->[$i]->as_string if defined $self->[$i]->as_string; + $string .= "/" if $self->[$i+1]; + } + return $string; } sub as_xml { @@ -34,29 +34,29 @@ } sub set_root { - my $self = shift; - unshift @$self, XML::XPath::Root->new(); + my $self = shift; + unshift @$self, XML::XPath::Root->new(); } sub evaluate { - my $self = shift; - # context _MUST_ be a single node - my $context = shift; - die "No context" unless $context; - - # I _think_ this is how it should work :) - - my $nodeset = XML::XPath::NodeSet->new(); - $nodeset->push($context); - - foreach my $step (@$self) { - # For each step - # evaluate the step with the nodeset - my $pos = 1; - $nodeset = $step->evaluate($nodeset); - } + my $self = shift; + # context _MUST_ be a single node + my $context = shift; + die "No context" unless $context; + + # I _think_ this is how it should work :) + + my $nodeset = XML::XPath::NodeSet->new(); + $nodeset->push($context); + + foreach my $step (@$self) { + # For each step + # evaluate the step with the nodeset + my $pos = 1; + $nodeset = $step->evaluate($nodeset); + } - return $nodeset; + return $nodeset->remove_duplicates; } 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Node/Attribute.pm new/XML-XPath-1.24/lib/XML/XPath/Node/Attribute.pm --- old/XML-XPath-1.21/lib/XML/XPath/Node/Attribute.pm 2016-01-12 11:29:54.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Node/Attribute.pm 2016-01-19 12:22:03.000000000 +0100 @@ -4,7 +4,7 @@ use vars qw/@ISA $VERSION/; @ISA = ('XML::XPath::Node'); -$VERSION = '1.21'; +$VERSION = '1.24'; package XML::XPath::Node::AttributeImpl; @@ -12,7 +12,7 @@ @ISA = ('XML::XPath::NodeImpl', 'XML::XPath::Node::Attribute'); use XML::XPath::Node ':node_keys'; -$VERSION = '1.21'; +$VERSION = '1.24'; sub new { my $class = shift; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Node/Comment.pm new/XML-XPath-1.24/lib/XML/XPath/Node/Comment.pm --- old/XML-XPath-1.21/lib/XML/XPath/Node/Comment.pm 2016-01-12 11:30:02.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Node/Comment.pm 2016-01-19 12:23:28.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Node::Comment; -$VERSION = '1.21'; +$VERSION = '1.24'; use strict; use warnings; use vars qw/@ISA/; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Node/Element.pm new/XML-XPath-1.24/lib/XML/XPath/Node/Element.pm --- old/XML-XPath-1.21/lib/XML/XPath/Node/Element.pm 2016-01-12 11:30:10.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Node/Element.pm 2016-01-19 12:23:35.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Node::Element; -$VERSION = '1.21'; +$VERSION = '1.24'; use strict; use warnings; use vars qw/@ISA/; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Node/Namespace.pm new/XML-XPath-1.24/lib/XML/XPath/Node/Namespace.pm --- old/XML-XPath-1.21/lib/XML/XPath/Node/Namespace.pm 2016-01-12 11:30:19.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Node/Namespace.pm 2016-01-19 12:23:42.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Node::Namespace; -$VERSION = '1.21'; +$VERSION = '1.24'; use strict; use warnings; use vars qw/@ISA/; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Node/PI.pm new/XML-XPath-1.24/lib/XML/XPath/Node/PI.pm --- old/XML-XPath-1.21/lib/XML/XPath/Node/PI.pm 2016-01-12 11:30:27.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Node/PI.pm 2016-01-19 12:23:47.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Node::PI; -$VERSION = '1.21'; +$VERSION = '1.24'; use strict; use warnings; use vars qw/@ISA/; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Node/Text.pm new/XML-XPath-1.24/lib/XML/XPath/Node/Text.pm --- old/XML-XPath-1.21/lib/XML/XPath/Node/Text.pm 2016-01-12 11:30:37.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Node/Text.pm 2016-01-19 12:23:58.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Node::Text; -$VERSION = '1.21'; +$VERSION = '1.24'; use strict; use warnings; use vars qw/@ISA/; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Node.pm new/XML-XPath-1.24/lib/XML/XPath/Node.pm --- old/XML-XPath-1.21/lib/XML/XPath/Node.pm 2016-01-12 10:48:30.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Node.pm 2016-01-19 12:20:26.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Node; -$VERSION = '1.21'; +$VERSION = '1.24'; use strict; use warnings; use vars qw(@ISA @EXPORT $AUTOLOAD %EXPORT_TAGS @EXPORT_OK); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/NodeSet.pm new/XML-XPath-1.24/lib/XML/XPath/NodeSet.pm --- old/XML-XPath-1.21/lib/XML/XPath/NodeSet.pm 2016-01-12 10:48:37.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/NodeSet.pm 2016-01-19 12:20:33.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::NodeSet; -$VERSION = '1.21'; +$VERSION = '1.24'; use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Number.pm new/XML-XPath-1.24/lib/XML/XPath/Number.pm --- old/XML-XPath-1.21/lib/XML/XPath/Number.pm 2016-01-12 10:48:45.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Number.pm 2016-01-19 12:20:40.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Number; -$VERSION = '1.21'; +$VERSION = '1.24'; use XML::XPath::Boolean; use XML::XPath::Literal; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Parser.pm new/XML-XPath-1.24/lib/XML/XPath/Parser.pm --- old/XML-XPath-1.21/lib/XML/XPath/Parser.pm 2016-01-12 10:48:53.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Parser.pm 2016-01-19 12:20:49.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Parser; -$VERSION = '1.21'; +$VERSION = '1.24'; use strict; use warnings; use vars qw/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/PerlSAX.pm new/XML-XPath-1.24/lib/XML/XPath/PerlSAX.pm --- old/XML-XPath-1.21/lib/XML/XPath/PerlSAX.pm 2016-01-12 10:49:01.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/PerlSAX.pm 2016-01-19 12:27:45.000000000 +0100 @@ -1,7 +1,8 @@ package XML::XPath::PerlSAX; -$VERSION = '1.21'; +$VERSION = '1.24'; +use XML::XPath::Node qw(:node_keys); use XML::XPath::XMLParser; use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Root.pm new/XML-XPath-1.24/lib/XML/XPath/Root.pm --- old/XML-XPath-1.21/lib/XML/XPath/Root.pm 2016-01-12 10:49:10.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Root.pm 2016-01-19 12:21:22.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Root; -$VERSION = '1.21'; +$VERSION = '1.24'; use strict; use warnings; use XML::XPath::XMLParser; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Step.pm new/XML-XPath-1.24/lib/XML/XPath/Step.pm --- old/XML-XPath-1.21/lib/XML/XPath/Step.pm 2016-01-12 10:50:06.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Step.pm 2016-01-19 12:21:31.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Step; -$VERSION = '1.21'; +$VERSION = '1.24'; use XML::XPath::Parser; use XML::XPath::Node; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/Variable.pm new/XML-XPath-1.24/lib/XML/XPath/Variable.pm --- old/XML-XPath-1.21/lib/XML/XPath/Variable.pm 2016-01-12 10:50:14.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/Variable.pm 2016-01-19 12:21:40.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Variable; -$VERSION = '1.21'; +$VERSION = '1.24'; use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath/XMLParser.pm new/XML-XPath-1.24/lib/XML/XPath/XMLParser.pm --- old/XML-XPath-1.21/lib/XML/XPath/XMLParser.pm 2016-01-12 10:50:24.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath/XMLParser.pm 2016-01-19 12:21:50.000000000 +0100 @@ -1,11 +1,10 @@ package XML::XPath::XMLParser; -$VERSION = '1.21'; +$VERSION = '1.24'; use strict; use warnings; use XML::Parser; -#use XML::XPath; use XML::XPath::Node; use XML::XPath::Node::Element; use XML::XPath::Node::Text; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/lib/XML/XPath.pm new/XML-XPath-1.24/lib/XML/XPath.pm --- old/XML-XPath-1.21/lib/XML/XPath.pm 2016-01-12 10:47:29.000000000 +0100 +++ new/XML-XPath-1.24/lib/XML/XPath.pm 2016-01-19 12:19:14.000000000 +0100 @@ -2,18 +2,18 @@ =head1 NAME -XML::XPath - a set of modules for parsing and evaluating XPath statements +XML::XPath - Parse and evaluate XPath statements. =head1 VERSION -Version 1.21 +Version 1.24 =cut use strict; use warnings; use vars qw($VERSION $AUTOLOAD $revision); -$VERSION = '1.21'; +$VERSION = '1.24'; $XML::XPath::Namespaces = 1; $XML::XPath::Debug = 0; @@ -392,11 +392,19 @@ my $newnode = undef; my($axis,$name) = ($path =~ /^(.*?)::(.*)$/); if ($axis =~ /^child$/i) { - $newnode = XML::XPath::Node::Element->new($name); + if ($name =~ /(\S+):(\S+)/) { + $newnode = XML::XPath::Node::Element->new($name, $1); + } else { + $newnode = XML::XPath::Node::Element->new($name); + } return undef if (!defined $newnode); $prev_node->appendChild($newnode); } elsif ($axis =~ /^attribute$/i) { - $newnode = XML::XPath::Node::Attribute->new($name, ""); + if ($name =~ /(\S+):(\S+)/) { + $newnode = XML::XPath::Node::Attribute->new($name, "", $1); + } else { + $newnode = XML::XPath::Node::Attribute->new($name, ""); + } return undef if (!defined $newnode); $prev_node->appendAttribute($newnode); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/t/00load.t new/XML-XPath-1.24/t/00load.t --- old/XML-XPath-1.21/t/00load.t 1970-01-01 01:00:00.000000000 +0100 +++ new/XML-XPath-1.24/t/00load.t 2016-01-19 11:45:31.000000000 +0100 @@ -0,0 +1,34 @@ +#!perl + +use 5.006; +use strict; +use warnings FATAL => 'all'; +use Test::More tests => 23; + +BEGIN { + use_ok('XML::XPath') || print "Bail out!\n"; + use_ok('XML::XPath::Boolean') || print "Bail out!\n"; + use_ok('XML::XPath::Builder') || print "Bail out!\n"; + use_ok('XML::XPath::Expr') || print "Bail out!\n"; + use_ok('XML::XPath::Function') || print "Bail out!\n"; + use_ok('XML::XPath::Literal') || print "Bail out!\n"; + use_ok('XML::XPath::LocationPath') || print "Bail out!\n"; + use_ok('XML::XPath::Node') || print "Bail out!\n"; + use_ok('XML::XPath::Node::Attribute') || print "Bail out!\n"; + use_ok('XML::XPath::Node::Comment') || print "Bail out!\n"; + use_ok('XML::XPath::Node::Element') || print "Bail out!\n"; + use_ok('XML::XPath::Node::Namespace') || print "Bail out!\n"; + use_ok('XML::XPath::Node::PI') || print "Bail out!\n"; + use_ok('XML::XPath::Node::Text') || print "Bail out!\n"; + use_ok('XML::XPath::Node') || print "Bail out!\n"; + use_ok('XML::XPath::NodeSet') || print "Bail out!\n"; + use_ok('XML::XPath::Number') || print "Bail out!\n"; + use_ok('XML::XPath::Parser') || print "Bail out!\n"; + use_ok('XML::XPath::PerlSAX') || print "Bail out!\n"; + use_ok('XML::XPath::Root') || print "Bail out!\n"; + use_ok('XML::XPath::Step') || print "Bail out!\n"; + use_ok('XML::XPath::Variable') || print "Bail out!\n"; + use_ok('XML::XPath::XMLParser') || print "Bail out!\n"; +} + +diag( "Testing XML::XPath $XML::XPath::VERSION, Perl $], $^X" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/t/42create_node.t new/XML-XPath-1.24/t/42create_node.t --- old/XML-XPath-1.21/t/42create_node.t 1970-01-01 01:00:00.000000000 +0100 +++ new/XML-XPath-1.24/t/42create_node.t 2016-01-12 20:31:39.000000000 +0100 @@ -0,0 +1,29 @@ +use strict; +use warnings; +use Test::More tests => 2; +use XML::XPath; + +my $xp1 = new XML::XPath(xml => '<?xml version="1.0" encoding="UTF-8" ?> +<n1:root xmlns:n1="http://n1.zzz.ru" xmlns:n2="http://n2.zzz.ru" xmlns:n3="http://n3.zzz.ru"> +<n2:a></n2:a></n1:root>'); + +$xp1->createNode('/n1:root/n3:b/@aaa'); +$xp1->setNodeText('/n1:root/n3:b/@aaa','aaa'); +$xp1->createNode('/n1:root/n3:b/@ccc'); +$xp1->setNodeText('/n1:root/n3:b/@ccc','ccc'); +$xp1->createNode('/n1:root/n3:b'); +$xp1->setNodeText('/n1:root/n3:b','xxx'); + +is($xp1->getNodeAsXML(), qq{<n1:root xmlns:n1="http://n1.zzz.ru" xmlns:n2="http://n2.zzz.ru" xmlns:n3="http://n3.zzz.ru"> +<n2:a /><n3:b aaa="aaa" ccc="ccc">xxx</n3:b></n1:root>}); + +my $xp2 = new XML::XPath(xml => '<?xml version="1.0" encoding="UTF-8" ?> +<root><a></a></root>'); + +$xp2->createNode('/root/b/@aaa'); +$xp2->setNodeText('/root/b/@aaa','aaa'); +$xp2->createNode('/root/b/@ccc'); +$xp2->setNodeText('/root/b/@ccc','ccc'); +$xp2->setNodeText('/root/b','xxx'); + +is($xp2->getNodeAsXML(), q{<root><a />xxx</root>}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/t/43op_div.t new/XML-XPath-1.24/t/43op_div.t --- old/XML-XPath-1.21/t/43op_div.t 1970-01-01 01:00:00.000000000 +0100 +++ new/XML-XPath-1.24/t/43op_div.t 2016-01-12 21:00:11.000000000 +0100 @@ -0,0 +1,15 @@ +use strict; +use warnings; +use Test::More tests => 5; +use XML::XPath; + +my $xp = XML::XPath->new(ioref => *DATA); +ok($xp); + +ok($xp->findvalue('4 div 2') == 2); +is $xp->findvalue('4 div 0'), 'Infinity'; +is $xp->findvalue('-4 div 0'), '-Infinity'; +is $xp->findvalue('0 div 0'), 'NaN'; + +__DATA__ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.21/t/44test_compare.t new/XML-XPath-1.24/t/44test_compare.t --- old/XML-XPath-1.21/t/44test_compare.t 1970-01-01 01:00:00.000000000 +0100 +++ new/XML-XPath-1.24/t/44test_compare.t 2016-01-18 11:50:34.000000000 +0100 @@ -0,0 +1,27 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use XML::XPath; +use Test::More; + +my $xml='<root att="root_att"><daughter att="3"/><daughter att="4"/><daughter att="5"/></root>'; +my %results= ( '/root/daughter[@att<"4"]' => 'daughter[3]', + '/root/daughter[@att<4]' => 'daughter[3]', + '//daughter[@att<4]' => 'daughter[3]', + '/root/daughter[@att>4]' => 'daughter[5]', + '/root/daughter[@att>5]' => '', + '/root/daughter[@att<3]' => '', + ); + +plan tests => scalar keys %results; + +my $xpath = XML::XPath->new( xml => $xml); +foreach my $path ( keys %results) { + my @xpath_result = $xpath->findnodes( $path); + is( dump_nodes( @xpath_result) => $results{$path}, "path: $path"); +} + +sub dump_nodes { + return join '-', map { $_->getName . "[" . $_->getAttribute( 'att') . "]" } @_ +}

1 0

commit autoyast2 for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2016-01-23 01:14:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-16 11:56:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2016-01-23 01:15:31.000000000 +0100 @@ -1,0 +2,20 @@ +Wed Jan 20 16:31:03 CET 2016 - schubi(a)suse.de + +- LVM: taking care about "auto" option --> switching to "max". + (bnc#962034) +- 3.1.113 + +------------------------------------------------------------------- +Tue Jan 19 15:19:04 CET 2016 - schubi(a)suse.de + +- Fixed rules.xml : OR operator is interpreted as AND. + (bnc#961941) +- 3.1.112 + +------------------------------------------------------------------- +Tue Jan 19 11:40:38 UTC 2016 - igonzalezsosa(a)suse.com + +- Fix wrong warning message about the 'init' section + not being processed (bsc#962526) + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.111.tar.bz2 New: ---- autoyast2-3.1.113.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.jAf9ti/_old 2016-01-23 01:15:32.000000000 +0100 +++ /var/tmp/diff_new_pack.jAf9ti/_new 2016-01-23 01:15:32.000000000 +0100 @@ -17,7 +17,8 @@ Name: autoyast2 -Version: 3.1.111 + +Version: 3.1.113 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-3.1.111.tar.bz2 -> autoyast2-3.1.113.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.111/package/autoyast2.changes new/autoyast2-3.1.113/package/autoyast2.changes --- old/autoyast2-3.1.111/package/autoyast2.changes 2016-01-15 12:54:10.000000000 +0100 +++ new/autoyast2-3.1.113/package/autoyast2.changes 2016-01-21 10:44:11.000000000 +0100 @@ -1,4 +1,24 @@ ------------------------------------------------------------------- +Wed Jan 20 16:31:03 CET 2016 - schubi(a)suse.de + +- LVM: taking care about "auto" option --> switching to "max". + (bnc#962034) +- 3.1.113 + +------------------------------------------------------------------- +Tue Jan 19 15:19:04 CET 2016 - schubi(a)suse.de + +- Fixed rules.xml : OR operator is interpreted as AND. + (bnc#961941) +- 3.1.112 + +------------------------------------------------------------------- +Tue Jan 19 11:40:38 UTC 2016 - igonzalezsosa(a)suse.com + +- Fix wrong warning message about the 'init' section + not being processed (bsc#962526) + +------------------------------------------------------------------- Fri Jan 15 10:30:58 CET 2016 - schubi(a)suse.de - Installation with "autoyast=default". Fixed nil exception error. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.111/package/autoyast2.spec new/autoyast2-3.1.113/package/autoyast2.spec --- old/autoyast2-3.1.111/package/autoyast2.spec 2016-01-15 12:54:10.000000000 +0100 +++ new/autoyast2-3.1.113/package/autoyast2.spec 2016-01-21 10:44:11.000000000 +0100 @@ -17,7 +17,8 @@ Name: autoyast2 -Version: 3.1.111 + +Version: 3.1.113 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.111/src/modules/AutoInstallRules.rb new/autoyast2-3.1.113/src/modules/AutoInstallRules.rb --- old/autoyast2-3.1.111/src/modules/AutoInstallRules.rb 2016-01-15 12:54:10.000000000 +0100 +++ new/autoyast2-3.1.113/src/modules/AutoInstallRules.rb 2016-01-21 10:44:11.000000000 +0100 @@ -466,13 +466,14 @@ rls.reject! {|r| r=="result"} rls.push("result") end + op = Ops.get_string(ruleset, "operator", "and") + rls.reject! {|r| r=="op"} Builtins.y2milestone("Orderes Rules: %1", rls) Builtins.foreach(rls) do |rule| ruledef = ruleset.fetch( rule, {} ) Builtins.y2milestone("Rule: %1", rule) Builtins.y2milestone("Ruledef: %1", ruledef) match = Ops.get_string(ruledef, "match", "undefined") - op = Ops.get_string(ruledef, "operator", "and") matchtype = Ops.get_string(ruledef, "match_type", "exact") easy_rules = [ "hostname", @@ -822,7 +823,6 @@ @tomerge ) end - nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.111/src/modules/AutoinstLVM.rb new/autoyast2-3.1.113/src/modules/AutoinstLVM.rb --- old/autoyast2-3.1.111/src/modules/AutoinstLVM.rb 2016-01-15 12:54:10.000000000 +0100 +++ new/autoyast2-3.1.113/src/modules/AutoinstLVM.rb 2016-01-21 10:44:11.000000000 +0100 @@ -403,8 +403,11 @@ lv, integer_k ) - elsif Ops.get_string(lv, "size", "") == "max" && + elsif (Ops.get_string(lv, "size", "") == "max" || Ops.get_string(lv, "size", "") == "auto") && Ops.less_or_equal(Ops.get_integer(lv, "stripes", 0), 1) + # "auto" size does not make sense here. But we are switching to the "max" behaviour in order + # not to produce an error and to evaluate other useable settings. (bnc#962034) + Report.Warning( "Option \"auto\" is not supported with LVM. Taking \"max\" option instead.") if lv["size"] == "auto" max_counter = Ops.add(max_counter, 1) end deep_copy(lv) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.111/src/modules/Profile.rb new/autoyast2-3.1.113/src/modules/Profile.rb --- old/autoyast2-3.1.111/src/modules/Profile.rb 2016-01-15 12:54:10.000000000 +0100 +++ new/autoyast2-3.1.113/src/modules/Profile.rb 2016-01-21 10:44:11.000000000 +0100 @@ -21,7 +21,10 @@ # Flags for setting the solver while the upgrade process with AutoYaST "upgrade", # Flags for controlling the update backups (see Installation module) - "backup" + "backup", + # init section used by Kickstart and to pass additional arguments + # to Linuxrc (bsc#962526) + "init" ] # Dropped YaST modules that used to provide AutoYaST functionality diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.111/test/AutoInstallRules_test.rb new/autoyast2-3.1.113/test/AutoInstallRules_test.rb --- old/autoyast2-3.1.111/test/AutoInstallRules_test.rb 2016-01-15 12:54:10.000000000 +0100 +++ new/autoyast2-3.1.113/test/AutoInstallRules_test.rb 2016-01-21 10:44:11.000000000 +0100 @@ -114,6 +114,67 @@ end end + describe "#Rules XML" do + it "Reading rules with -or- operator" do + expect(Yast::XML).to receive(:XMLToYCPFile).and_return( + { "rules"=>[{ + "hostaddress"=>{"match"=>"10.69.57.43", + "match_type"=>"exact"}, + "mac"=>{"match"=>"000c2903d288", + "match_type"=>"exact"}, + "operator"=>"or", + "result"=>{"profile"=>"machine12.xml"}}] + } + ) + expect(Yast::SCR).to receive(:Execute).with(Yast::Path.new(".target.bash_output"), + "if ( [ \"$hostaddress\" = \"10.69.57.43\" ] ) || ( [ \"$mac\" = \"000c2903d288\" ] ); then exit 0; else exit 1; fi", + {"hostaddress"=>"192.168.1.1", "mac"=>""} + ) + .and_return({"stdout"=>"", "exit"=>0, "stderr"=>""}) + + subject.Read + end + + it "Reading rules with -and- operator" do + expect(Yast::XML).to receive(:XMLToYCPFile).and_return( + { "rules"=>[{ + "hostaddress"=>{"match"=>"10.69.57.43", + "match_type"=>"exact"}, + "mac"=>{"match"=>"000c2903d288", + "match_type"=>"exact"}, + "operator"=>"and", + "result"=>{"profile"=>"machine12.xml"}}] + } + ) + expect(Yast::SCR).to receive(:Execute).with(Yast::Path.new(".target.bash_output"), + "if ( [ \"$hostaddress\" = \"10.69.57.43\" ] ) && ( [ \"$mac\" = \"000c2903d288\" ] ); then exit 0; else exit 1; fi", + {"hostaddress"=>"192.168.1.1", "mac"=>""} + ) + .and_return({"stdout"=>"", "exit"=>0, "stderr"=>""}) + + subject.Read + end + + it "Reading rules with default operator" do + expect(Yast::XML).to receive(:XMLToYCPFile).and_return( + { "rules"=>[{ + "hostaddress"=>{"match"=>"10.69.57.43", + "match_type"=>"exact"}, + "mac"=>{"match"=>"000c2903d288", + "match_type"=>"exact"}, + "result"=>{"profile"=>"machine12.xml"}}] + } + ) + expect(Yast::SCR).to receive(:Execute).with(Yast::Path.new(".target.bash_output"), + "if ( [ \"$hostaddress\" = \"10.69.57.43\" ] ) && ( [ \"$mac\" = \"000c2903d288\" ] ); then exit 0; else exit 1; fi", + {"hostaddress"=>"192.168.1.1", "mac"=>""} + ) + .and_return({"stdout"=>"", "exit"=>0, "stderr"=>""}) + + subject.Read + end + end + describe "#Host ID" do let(:wicked_output_path) { File.join(root_path, 'test', 'fixtures', 'output', 'wicked_output') } it "returns host IP in hex format (initial Stage)" do

1 0

commit libreoffice for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2016-01-23 01:14:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-12-25 13:05:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2016-01-23 01:15:07.000000000 +0100 @@ -1,0 +2,43 @@ +Sun Jan 17 08:04:26 UTC 2016 - tchvatal(a)suse.com + +- Update to 5.1.0.2: + * More small fixes here and there for the RC2 release +- Remove upstreamed patches: + * libreoffice-graphite.patch + * libreoffice-uno-py26.patch + * libreoffice-kde4-filelist.patch + * libreoffice-old-gtkapi.patch + +------------------------------------------------------------------- +Wed Jan 13 01:55:23 UTC 2016 - tchvatal(a)suse.com + +- Reenable collada, debian and fedora both build with it so do the + same + +------------------------------------------------------------------- +Wed Jan 13 01:52:54 UTC 2016 - tchvatal(a)suse.com + +- Set ulimit to unlimited prior build to allow better debugging of + build crashes + +------------------------------------------------------------------- +Sun Jan 3 15:00:06 UTC 2016 - tchvatal(a)suse.com + +- Add patch attempting to fix build on old gtk2 versions: + * libreoffice-old-gtkapi.patch + +------------------------------------------------------------------- +Mon Dec 28 16:25:19 UTC 2015 - tchvatal(a)suse.com + +- Add patch to fix filelist generating after kde3 removal: + * libreoffice-kde4-filelist.patch + +------------------------------------------------------------------- +Tue Dec 22 14:43:52 UTC 2015 - tchvatal(a)suse.com + +- Add patch to fix graphite2 bundled build on SLE11: + * libreoffice-graphite.patch +- Add patch to fix build of pyuno with python2.6: + * libreoffice-uno-py26.patch + +------------------------------------------------------------------- @@ -7,0 +51,21 @@ +Mon Dec 21 10:36:40 UTC 2015 - tchvatal(a)suse.com + +- Version update to 5.1.0.1: + * Update few bundled libs for SLE11 +- Drop support for gvfs2 +- Drop kde/kdeab switches +- Drop lockdown enabler + +------------------------------------------------------------------- +Thu Dec 17 09:45:29 UTC 2015 - tchvatal(a)suse.com + +- Version update to 5.1.0.0.beta2: + * testing the changes for 5.1 series +- Remove upstreamed patches: + * bnc-679938.diff + * bnc-889755.diff + * bnc-945047.diff + * bnc-954345.diff + * use-long-for-test-comparsion.patch + +------------------------------------------------------------------- @@ -10 +74 @@ -- Version update to 5.0.4.2: +- Version update to 5.0.4.2 bnc#959716: Old: ---- 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 Firebird-2.5.2.26540-0.tar.bz2 bnc-679938.diff bnc-889755.diff bnc-945047.diff bnc-954345.diff d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz graphite2-1.2.4.tgz libetonyek-0.1.3.tar.bz2 libmwaw-0.3.5.tar.bz2 libodfgen-0.1.4.tar.bz2 libreoffice-5.0.4.2.tar.xz libreoffice-help-5.0.4.2.tar.xz libreoffice-translations-5.0.4.2.tar.xz libvisio-0.1.1.tar.bz2 libwps-0.4.0.tar.bz2 use-long-for-test-comparsion.patch New: ---- 3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 5c0c9ac0996fbb4a0e17780ff5441959-graphite2-minimal-1.3.4.tgz Firebird-2.5.4.26856-0.tar.bz2 aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2 boost_1_59_0.tar.bz2 c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz libetonyek-0.1.5.tar.bz2 libmwaw-0.3.7.tar.bz2 libodfgen-0.1.5.tar.bz2 liborcus-0.9.2.tar.gz libreoffice-5.1.0.2.tar.xz libreoffice-help-5.1.0.2.tar.xz libreoffice-translations-5.1.0.2.tar.xz libvisio-0.1.3.tar.bz2 libwps-0.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.53uPYH/_old 2016-01-23 01:15:24.000000000 +0100 +++ /var/tmp/diff_new_pack.53uPYH/_new 2016-01-23 01:15:24.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libreoffice # -# 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 @@ -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.0.4 +%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.1.0 # Old Make and bundle or not %if 0%{?suse_version} > 1230 %bcond_with oldmake @@ -64,7 +64,7 @@ %endif # This is used due to the need for beta releases Name: libreoffice -Version: 5.0.4.2 +Version: 5.1.0.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 @@ -83,6 +83,8 @@ # used extensions sources Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 +# This never had an release so just bundle it as per what other distros do +Source1999: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 # Internal bundled stuff we can't remove # XMLSec is patched over and over in here Source2000: %{external_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -99,38 +101,38 @@ Source2006: %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz Source2007: %{external_url}/librevenge-0.0.2.tar.bz2 Source2008: %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz -Source2009: %{external_url}/libetonyek-0.1.3.tar.bz2 +Source2009: %{external_url}/libetonyek-0.1.5.tar.bz2 Source2010: %{external_url}/libe-book-0.1.2.tar.bz2 Source2011: %{external_url}/libfreehand-0.1.1.tar.bz2 -Source2012: %{external_url}/libodfgen-0.1.4.tar.bz2 +Source2012: %{external_url}/libodfgen-0.1.5.tar.bz2 Source2013: %{external_url}/libcdr-0.1.1.tar.bz2 Source2014: %{external_url}/libmspub-0.1.2.tar.bz2 -Source2015: %{external_url}/libmwaw-0.3.5.tar.bz2 +Source2015: %{external_url}/libmwaw-0.3.7.tar.bz2 Source2016: %{external_url}/libpagemaker-0.0.2.tar.bz2 -Source2017: %{external_url}/libvisio-0.1.1.tar.bz2 +Source2017: %{external_url}/libvisio-0.1.3.tar.bz2 Source2018: %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz Source2019: %{external_url}/libwpd-0.10.0.tar.bz2 Source2020: %{external_url}/libwpg-0.3.0.tar.bz2 -Source2021: %{external_url}/libwps-0.4.0.tar.bz2 +Source2021: %{external_url}/libwps-0.4.2.tar.bz2 Source2022: %{external_url}/libabw-0.1.1.tar.bz2 Source2023: %{external_url}/lcms2-2.6.tar.gz Source2024: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip Source2025: %{external_url}/mdds_0.12.1.tar.bz2 Source2026: %{external_url}/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz Source2027: %{external_url}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz -Source2028: %{external_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 -Source2029: %{external_url}/594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip +Source2028: %{external_url}/boost_1_59_0.tar.bz2 +Source2029: %{external_url}/3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip Source2030: %{external_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip -Source2031: %{external_url}/e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz -Source2032: %{external_url}/graphite2-1.2.4.tgz -Source2033: %{external_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 +Source2031: %{external_url}/c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz +Source2032: %{external_url}/5c0c9ac0996fbb4a0e17780ff5441959-graphite2-minimal-1.3.4.tgz +Source2033: %{external_url}/liborcus-0.9.2.tar.gz Source2034: %{external_url}/harfbuzz-0.9.40.tar.bz2 Source2035: %{external_url}/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz Source2036: %{external_url}/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 Source2037: %{external_url}/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz Source2038: %{external_url}/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip Source2039: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip -Source2040: %{external_url}/Firebird-2.5.2.26540-0.tar.bz2 +Source2040: %{external_url}/Firebird-2.5.4.26856-0.tar.bz2 Source2041: %{external_url}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz Source2042: %{external_url}/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz Source2043: %{external_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz @@ -148,7 +150,7 @@ Source2055: %{external_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip Source2056: %{external_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip Source2057: %{external_url}/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz -Source2058: %{external_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 +Source2058: %{external_url}/aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2 Source2059: %{external_url}/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 Source2060: %{external_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz Source2061: %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz @@ -169,16 +171,6 @@ Patch5: mediawiki-no-broken-help.diff # PATCH-FIX-SUSE: do not declare java6 available for without system libs build Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch -# bnc#889755 - LO-L3: PPTX: chart axis number format incorrect -Patch10: bnc-889755.diff -# bnc#679938 - LO-L3: saving to doc file the chapter name in the header does not change with chapters -Patch11: bnc-679938.diff -# PATCH-FIX-UPSTREAM: taken from Master to fix flaky test -Patch12: use-long-for-test-comparsion.patch -# bnc#954345 - LO-L3: Insert-->Image-->Insert as Link hangs writer -Patch13: bnc-954345.diff -# bnc#945047 - LO-L3: LO is duplicating master pages -Patch14: bnc-945047.diff # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -201,7 +193,6 @@ BuildRequires: gcc-c++ # Only for backtracking to see failing tests, pain to rebuild otherwise BuildRequires: gdb -BuildRequires: gnome-vfs2-devel BuildRequires: gperf BuildRequires: gtk2-devel BuildRequires: hunspell-devel @@ -286,7 +277,7 @@ BuildRequires: libcdr-devel >= 0.1 BuildRequires: libcmis-devel >= 0.5.0 BuildRequires: libe-book-devel >= 0.1.1 -BuildRequires: libetonyek-devel >= 0.1.2 +BuildRequires: libetonyek-devel >= 0.1.4 BuildRequires: libexif BuildRequires: libexttextcat-devel >= 3.1.1 BuildRequires: libfbembed-devel @@ -303,7 +294,7 @@ BuildRequires: libmysqlclient-devel BuildRequires: libmysqlcppconn-devel >= 1.0.6 BuildRequires: libodfgen-devel >= 0.1.4 -BuildRequires: liborcus-devel >= 0.7.0 +BuildRequires: liborcus-devel >= 0.9.1 BuildRequires: libpagemaker-devel BuildRequires: libredland-devel BuildRequires: librepository @@ -313,12 +304,13 @@ BuildRequires: libvisio-devel >= 0.1 BuildRequires: libwpd-devel >= 0.10 BuildRequires: libwpg-devel -BuildRequires: libwps-devel >= 0.4.0 +BuildRequires: libwps-devel >= 0.4.2 BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: lpsolve-devel BuildRequires: mdds-devel >= 0.12.0 BuildRequires: npapi-sdk +BuildRequires: openCOLLADA-devel BuildRequires: pentaho-libxml BuildRequires: pentaho-reporting-flow-engine BuildRequires: postgresql-devel @@ -1006,11 +998,6 @@ %if !%{with systemlibs} %patch7 -p1 %endif -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} @@ -1117,7 +1104,6 @@ --with-system-hunspell \ --with-system-mythes \ --with-system-bluez \ - --with-system-mesa-headers \ --with-system-openldap \ --with-system-odbc \ --with-system-nss \ @@ -1134,9 +1120,6 @@ --disable-fetch-external \ --with-external-tar="$RPM_SOURCE_DIR" \ --disable-epm \ - --disable-gnome-vfs \ - --disable-kdeab \ - --disable-kde \ --disable-online-update \ --disable-systray \ %if %{with newmedia} @@ -1145,6 +1128,7 @@ --enable-gtk3 \ --with-doxygen \ --enable-gltf \ + --enable-collada --with-system-opencollada \ %else --enable-gstreamer-0-10 \ --disable-gstreamer-1-0 \ @@ -1173,7 +1157,6 @@ --enable-odk \ --enable-kde4 \ --enable-evolution2 \ - --enable-lockdown \ --enable-dbus \ --enable-hardlink-deliver \ --enable-ext-ct2n \ @@ -1187,13 +1170,14 @@ --enable-neon \ --disable-ccache \ --disable-coinmp \ - --disable-collada \ --enable-symbols # no coinormp packages for coinmp # hack to correctly bootstrap python stuff with system python, (deb#501028, i#90701) sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py pyuno/source/officehelper.py +# Allow deep backtracking if the build crashes +ulimit -c unlimited # just call make here as we added the jobs in configure # The check phase is run here too if it is split with nocheck # install of jars get broken sometimes @@ -1341,10 +1325,6 @@ done %endif -# Merge kde and kde4 filelists as we do not bother with compat anymore -# Not worth fixing unless really cleaning up the install completely -cat file-lists/kde_list.txt >> file-lists/kde4_list.txt - # Remove pointless readmes rm -rf %{buildroot}%{_libdir}/%{name}/readmes/ @@ -1555,21 +1535,26 @@ %files -f file-lists/base_list.txt base %defattr(-,root,root) +%{_datadir}/appdata/libreoffice-base.appdata.xml %files -f file-lists/calc_list.txt calc %defattr(-,root,root) +%{_datadir}/appdata/libreoffice-calc.appdata.xml %files -f file-lists/draw_list.txt draw %defattr(-,root,root) +%{_datadir}/appdata/libreoffice-draw.appdata.xml %files -f file-lists/math_list.txt math %defattr(-,root,root) %files -f file-lists/impress_list.txt impress %defattr(-,root,root) +%{_datadir}/appdata/libreoffice-impress.appdata.xml %files -f file-lists/writer_list.txt writer %defattr(-,root,root) +%{_datadir}/appdata/libreoffice-writer.appdata.xml %files -f file-lists/postgresql_list.txt base-drivers-postgresql %defattr(-,root,root) ++++++ Firebird-2.5.2.26540-0.tar.bz2 -> Firebird-2.5.4.26856-0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libreoffice/Firebird-2.5.2.26540-0.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new/Firebird-2.5.4.26856-0.tar.bz2 differ: char 11, line 1 ++++++ 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 -> aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2 ++++++ ++++ 40323 lines of diff (skipped) ++++++ d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 -> boost_1_59_0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libreoffice/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new/boost_1_59_0.tar.bz2 differ: char 11, line 1 ++++++ e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz -> c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz ++++++ /work/SRC/openSUSE:Factory/libreoffice/e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz /work/SRC/openSUSE:Factory/.libreoffice.new/c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz differ: char 5, line 1 ++++++ libetonyek-0.1.3.tar.bz2 -> libetonyek-0.1.5.tar.bz2 ++++++ ++++ 44646 lines of diff (skipped) ++++++ libmwaw-0.3.5.tar.bz2 -> libmwaw-0.3.7.tar.bz2 ++++++ ++++ 43273 lines of diff (skipped) ++++++ libodfgen-0.1.4.tar.bz2 -> libodfgen-0.1.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/ChangeLog new/libodfgen-0.1.5/ChangeLog --- old/libodfgen-0.1.4/ChangeLog 2015-05-17 11:04:54.000000000 +0200 +++ new/libodfgen-0.1.5/ChangeLog 2015-10-24 09:58:58.000000000 +0200 @@ -1,3 +1,48 @@ +2015-10-24 osnola <alonso(a)loria.fr> [5109e2d2d68ed9c7033206d6a6f0a6cb401c7731] + +tOdfDocumentHandler.hxx: do not add attribute to enums, mingw32-g++ do not like that, configure.ac: check correctly if we need to add --std=c++11 + update NEWS file + + +2015-10-03 osnola <alonso(a)loria.fr> [653de2329a6cc5f0c4751245ce5e90144b18f337] + +tSheetStyle.cxx: add some operators (plage, union, intersection and %) + accept also "librevenge:sheet-name" to define the sheet's name... + + +2015-08-30 David Tardon <dtardon(a)redhat.com> [42f6ef8f4428e3d352166a45d179b0bd57db7a22] + +tautomatically pass -std=c++11 if needed + + +2015-08-30 David Tardon <dtardon(a)redhat.com> [473698347afd9c4f53151ea2c82229640f3d5912] + +tremove unused argument + + +2015-07-19 osnola <alonso(a)loria.fr> [ce4a03ca92873343c526f514f0e3a6353530cf69] + +tOdfGenerator: implements librevenge:replacement-objects... + + +2015-06-23 David Tardon <dtardon(a)redhat.com> [8ef8c171ebe3c5daebdce80ee422cf7bb96aa3bc] + +tfix typo + + +2015-06-23 osnola <alonso(a)loria.fr> [d55c58fad462a95db8474a240cef7236f5e98ac9] + +tGraphicStyle: also allow to set the opacity value:"draw:opacity" for surfaces which contain patterns, + add minimalist implementation of "measure": if drawPolyline is called with two points and draw:show-unit is set, then create a draw:measure tag instead of a draw:line... + + +2015-05-19 Fridrich Štrba <fridrich.strba(a)bluewin.ch> [9b8e077429dd5cb3a5b3eb92aa86ef6a7204e2f5] + +tFixing werror build and wondering why developers don't use it :( + + +2015-05-17 osnola <alonso(a)loria.fr> [6066227bc5d23b3d5ead3f1e7d4277e4c5484591] + +tconfigure.ac: bump version... + + 2015-05-17 osnola <alonso(a)loria.fr> [4300376e1617ffe93dde3bcb79e7031ee9707f83] tupdate version and NEWS + add an ODFGENAPI inside the "enum OdfStreamType"'s definition diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/NEWS new/libodfgen-0.1.5/NEWS --- old/libodfgen-0.1.4/NEWS 2015-05-17 10:51:38.000000000 +0200 +++ new/libodfgen-0.1.5/NEWS 2015-10-23 20:19:16.000000000 +0200 @@ -1,3 +1,14 @@ +libodfgen 0.1.5 +- graphics: + + add code for librevenge:replacement-objects + + allow to set the opacity value:"draw:opacity" for surfaces which + contain patterns, + + add minimalist implementation of "measure": if drawPolyline is + called with two points and draw:show-unit is set, then create a + draw:measure tag instead of a draw:line... +- sheet interface: + + add some operators (plage, union, intersection and %) + libodfgen 0.1.4 - drawing interface: do no forget to call startDocument/endDocument when diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/configure new/libodfgen-0.1.5/configure --- old/libodfgen-0.1.4/configure 2015-05-17 10:50:33.000000000 +0200 +++ new/libodfgen-0.1.5/configure 2015-10-24 09:34:58.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libodfgen 0.1.4. +# Generated by GNU Autoconf 2.69 for libodfgen 0.1.5. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='libodfgen' PACKAGE_TARNAME='libodfgen' -PACKAGE_VERSION='0.1.4' -PACKAGE_STRING='libodfgen 0.1.4' +PACKAGE_VERSION='0.1.5' +PACKAGE_STRING='libodfgen 0.1.5' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1357,7 +1357,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 libodfgen 0.1.4 to adapt to many kinds of systems. +\`configure' configures libodfgen 0.1.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1427,7 +1427,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libodfgen 0.1.4:";; + short | recursive ) echo "Configuration of libodfgen 0.1.5:";; esac cat <<\_ACEOF @@ -1560,7 +1560,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libodfgen configure 0.1.4 +libodfgen configure 0.1.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1959,7 +1959,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libodfgen $as_me 0.1.4, which was +It was created by libodfgen $as_me 0.1.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2825,7 +2825,7 @@ # Define the identity of the package. PACKAGE='libodfgen' - VERSION='0.1.4' + VERSION='0.1.5' cat >>confdefs.h <<_ACEOF @@ -16350,7 +16350,7 @@ LIBODFGEN_MINOR_VERSION=1 -LIBODFGEN_MICRO_VERSION=4 +LIBODFGEN_MICRO_VERSION=5 # AC_SUBST(LT_RELEASE, [libodfgen_version_major.libodfgen_version_minor]) LT_CURRENT=`expr 100 '*' 0 + 1` @@ -16358,7 +16358,7 @@ LT_AGE=0 # LT_AGE=libodfgen_version_minor -LT_REVISION=4 +LT_REVISION=5 @@ -16715,6 +16715,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++11 shared ptr" >&5 $as_echo_n "checking for c++11 shared ptr... " >&6; } + save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -std=c++11" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -16745,6 +16747,36 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CXXFLAGS="$save_CXXFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler needs -std=c++11" >&5 +$as_echo_n "checking whether the compiler needs -std=c++11... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include <memory> +int +main () +{ +std::shared_ptr<int> p; + + ; + return 0; +} + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + CXXFLAGS="$CXXFLAGS -std=c++11" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test "x$with_sharedptr" = "xtr1"; then : @@ -17457,7 +17489,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libodfgen $as_me 0.1.4, which was +This file was extended by libodfgen $as_me 0.1.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17523,7 +17555,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libodfgen config.status 0.1.4 +libodfgen config.status 0.1.5 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/libodfgen-0.1.4/configure.ac new/libodfgen-0.1.5/configure.ac --- old/libodfgen-0.1.4/configure.ac 2015-05-17 10:28:25.000000000 +0200 +++ new/libodfgen-0.1.5/configure.ac 2015-10-24 09:33:41.000000000 +0200 @@ -7,7 +7,7 @@ # ==================== m4_define([libodfgen_version_major],[0]) m4_define([libodfgen_version_minor],[1]) -m4_define([libodfgen_version_micro],[4]) +m4_define([libodfgen_version_micro],[5]) m4_define([libodfgen_version],[libodfgen_version_major.libodfgen_version_minor.libodfgen_version_micro]) # ============= @@ -216,6 +216,8 @@ AS_IF([test "x$with_sharedptr" = "xc++11"], [ AC_MSG_CHECKING([for c++11 shared ptr]) + save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -std=c++11" AC_COMPILE_IFELSE([ AC_LANG_PROGRAM( [[#include <memory>]], @@ -227,8 +229,19 @@ ], [ AC_MSG_RESULT([no]) AC_MSG_ERROR([Could not find C++11 implementation of shared_ptr]) + ]) + CXXFLAGS="$save_CXXFLAGS" + AC_MSG_CHECKING([whether the compiler needs -std=c++11]) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [[#include <memory>]], + [[std::shared_ptr<int> p;]] + ) + ], [ + AC_MSG_RESULT([no]) ], [ - [#include <memory>] + AC_MSG_RESULT([yes]) + CXXFLAGS="$CXXFLAGS -std=c++11" ]) ]) AS_IF([test "x$with_sharedptr" = "xtr1"], [ @@ -244,8 +257,6 @@ ], [ AC_MSG_RESULT([no]) AC_MSG_ERROR([Could not find TR1 implementation of shared_ptr]) - ], [ - [#include <tr1/memory>] ]) ]) AS_IF([test "x$with_sharedptr" = "xboost"], [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/inc/libodfgen/OdfDocumentHandler.hxx new/libodfgen-0.1.5/inc/libodfgen/OdfDocumentHandler.hxx --- old/libodfgen-0.1.4/inc/libodfgen/OdfDocumentHandler.hxx 2015-05-17 10:32:40.000000000 +0200 +++ new/libodfgen-0.1.5/inc/libodfgen/OdfDocumentHandler.hxx 2015-10-24 09:37:52.000000000 +0200 @@ -32,7 +32,7 @@ * * @sa OdgGenerator, OdpGenerator, OdtGenerator */ -enum ODFGENAPI OdfStreamType { ODF_FLAT_XML, ODF_CONTENT_XML, ODF_STYLES_XML, ODF_SETTINGS_XML, ODF_META_XML, ODF_MANIFEST_XML }; +enum OdfStreamType { ODF_FLAT_XML, ODF_CONTENT_XML, ODF_STYLES_XML, ODF_SETTINGS_XML, ODF_META_XML, ODF_MANIFEST_XML }; class OdfDocumentHandler; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/src/GraphicStyle.cxx new/libodfgen-0.1.5/src/GraphicStyle.cxx --- old/libodfgen-0.1.4/src/GraphicStyle.cxx 2015-05-07 14:14:57.000000000 +0200 +++ new/libodfgen-0.1.5/src/GraphicStyle.cxx 2015-07-16 15:15:13.000000000 +0200 @@ -60,6 +60,13 @@ pHandler->startElement("style:graphic-properties", graphicElement); pHandler->endElement("style:graphic-properties"); + if (mPropList["draw:show-unit"] && mPropList["draw:show-unit"]->getStr()=="true") + { + librevenge::RVNGPropertyList textElement; + textElement.insert("fo:font-size", 12, librevenge::RVNG_POINT); + pHandler->startElement("style:text-properties", textElement); + pHandler->endElement("style:text-properties"); + } pHandler->endElement("style:style"); } @@ -361,7 +368,7 @@ librevenge::RVNGString GraphicStyleManager::getStyleNameForStrokeDash(librevenge::RVNGPropertyList const &style) { librevenge::RVNGPropertyList pList; - if (style["svg:stoke-linecap"]) + if (style["svg:stroke-linecap"]) pList.insert("draw:style", style["svg:stroke-linecap"]->getStr()); else pList.insert("draw:style", "rect"); @@ -416,7 +423,7 @@ if (style["svg:stroke-linejoin"]) element.insert("draw:stroke-linejoin", style["svg:stroke-linejoin"]->getStr()); if (style["svg:stroke-linecap"]) - element.insert("svg:stoke-linecap", style["svg:stroke-linecap"]->getStr()); + element.insert("svg:stroke-linecap", style["svg:stroke-linecap"]->getStr()); librevenge::RVNGString name(""); if (style["draw:stroke"] && style["draw:stroke"]->getStr() == "dash") @@ -489,6 +496,8 @@ element.insert("draw:fill-image-ref-point-x", style["draw:fill-image-ref-point-x"]->getStr()); if (style["draw:fill-image-ref-point-y"]) element.insert("draw:fill-image-ref-point-y", style["draw:fill-image-ref-point-y"]->getStr()); + if (style["draw:opacity"]) + element.insert("draw:opacity", style["draw:opacity"]->getStr()); } else element.insert("draw:fill", "none"); @@ -562,6 +571,7 @@ static char const *(others[])= { "draw:ole-draw-aspect", + "draw:show-unit", "fo:background-color", "fo:border","fo:border-top","fo:border-left","fo:border-bottom","fo:border-right", "fo:clip", @@ -571,7 +581,7 @@ "style:mirror", "style:parent-style-name", "style:run-through", "style:wrap" }; - for (int b = 0; b < 18; b++) + for (int b = 0; b < 19; b++) { if (style[others[b]]) element.insert(others[b], style[others[b]]->getStr()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/src/OdcGenerator.cxx new/libodfgen-0.1.5/src/OdcGenerator.cxx --- old/libodfgen-0.1.4/src/OdcGenerator.cxx 2015-01-01 10:14:57.000000000 +0100 +++ new/libodfgen-0.1.5/src/OdcGenerator.cxx 2015-06-23 09:37:46.000000000 +0200 @@ -137,7 +137,7 @@ // ok create a new list librevenge::RVNGString sName(""); - sName.sprintf("Chart%i", mChartStyleHash.size()); + sName.sprintf("Chart%i", (int)mChartStyleHash.size()); pList.insert("style:name", sName); mChartStyleHash[sName] =pList; mHashChartNameMap[hashKey] = sName; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/src/OdfGenerator.cxx new/libodfgen-0.1.5/src/OdfGenerator.cxx --- old/libodfgen-0.1.4/src/OdfGenerator.cxx 2015-03-12 09:15:21.000000000 +0100 +++ new/libodfgen-0.1.5/src/OdfGenerator.cxx 2015-10-23 20:13:18.000000000 +0200 @@ -1147,6 +1147,12 @@ else mpCurrentStorage->push_back(new TagCloseElement("draw:image")); } + + librevenge::RVNGPropertyListVector const *replacements=propList.child("librevenge:replacement-objects"); + if (!replacements) + return; + for (unsigned long c=0; c < replacements->count(); ++c) + insertBinaryObject((*replacements)[c]); } //////////////////////////////////////////////////////////// @@ -1284,7 +1290,10 @@ return; } librevenge::RVNGString sValue=getCurrentGraphicStyleName(propList); - TagOpenElement *pDrawLineElement = new TagOpenElement("draw:line"); + bool isMeasure=(propList["draw:show-unit"] && propList["draw:show-unit"]->getStr()=="true"); + librevenge::RVNGString what= isMeasure ? "draw:measure" : "draw:line"; + + TagOpenElement *pDrawLineElement = new TagOpenElement(what); addFrameProperties(propList, *pDrawLineElement); pDrawLineElement->addAttribute("draw:style-name", sValue); pDrawLineElement->addAttribute("svg:x1", (*vertices)[0]["svg:x"]->getStr()); @@ -1292,7 +1301,7 @@ pDrawLineElement->addAttribute("svg:x2", (*vertices)[1]["svg:x"]->getStr()); pDrawLineElement->addAttribute("svg:y2", (*vertices)[1]["svg:y"]->getStr()); mpCurrentStorage->push_back(pDrawLineElement); - mpCurrentStorage->push_back(new TagCloseElement("draw:line")); + mpCurrentStorage->push_back(new TagCloseElement(what)); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/src/SectionStyle.cxx new/libodfgen-0.1.5/src/SectionStyle.cxx --- old/libodfgen-0.1.4/src/SectionStyle.cxx 2014-09-14 11:23:29.000000000 +0200 +++ new/libodfgen-0.1.5/src/SectionStyle.cxx 2015-06-23 09:37:46.000000000 +0200 @@ -119,9 +119,9 @@ zone=Style::Z_ContentAutomatic; librevenge::RVNGString name; if (zone==Style::Z_StyleAutomatic) - name.sprintf("Section_M%i", mStyleList.size()); + name.sprintf("Section_M%i", (int)mStyleList.size()); else - name.sprintf("Section%i", mStyleList.size()); + name.sprintf("Section%i", (int)mStyleList.size()); shared_ptr<SectionStyle> style(new SectionStyle(propList, name.cstr(), zone)); mStyleList.push_back(style); return name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/src/SheetStyle.cxx new/libodfgen-0.1.5/src/SheetStyle.cxx --- old/libodfgen-0.1.4/src/SheetStyle.cxx 2015-03-12 08:55:28.000000000 +0100 +++ new/libodfgen-0.1.5/src/SheetStyle.cxx 2015-10-03 17:37:49.000000000 +0200 @@ -138,7 +138,7 @@ } else if (type=="currency") { - what.sprintf("number:currency-style", type.c_str()); + what = "number:currency-style"; TagOpenElement styleOpen(what); styleOpen.addAttribute("style:name", getName()); styleOpen.write(pHandler); @@ -562,11 +562,11 @@ } std::string oper(list["librevenge:operator"]->getStr().cstr()); bool find=false; - for (int w=0; w<15; ++w) + for (int w=0; w<19; ++w) { - static char const *(s_operators[15])= + static char const *(s_operators[19])= { - "(", ")", "+", "-", "*", "/", "=", "<>", ";", "<", ">", "<=", ">=", "^", "&" + "(", ")", "+", "-", "*", "/", "=", "<>", ";", "<", ">", "<=", ">=", "^", "&", "!", "~", ":", "%" }; if (oper!=s_operators[w]) continue; s << oper; @@ -645,7 +645,8 @@ ODFGEN_DEBUG_MSG(("SheetManager::convertCellRange: find bad coordinate!!!\n")); return res; } - if (list["librevenge:sheet"]) s << list["librevenge:sheet"]->getStr().cstr(); + if (list["librevenge:sheet-name"]) s << list["librevenge:sheet-name"]->getStr().cstr(); + else if (list["librevenge:sheet"]) s << list["librevenge:sheet"]->getStr().cstr(); s << "."; if (list["librevenge:column-absolute"] && list["librevenge:column-absolute"]->getInt()) s << "$"; if (column>=26) s << char('A'+(column/26-1)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/src/TextRunStyle.cxx new/libodfgen-0.1.5/src/TextRunStyle.cxx --- old/libodfgen-0.1.4/src/TextRunStyle.cxx 2015-01-01 10:14:57.000000000 +0100 +++ new/libodfgen-0.1.5/src/TextRunStyle.cxx 2015-10-23 20:13:32.000000000 +0200 @@ -215,11 +215,11 @@ // ok create a new style if (currentZone==Style::Z_Style) - sName.sprintf("S_N%i", mStyleHash.size()); + sName.sprintf("S_N%i", (int)mStyleHash.size()); else if (currentZone==Style::Z_StyleAutomatic) - sName.sprintf("S_M%i", mStyleHash.size()); + sName.sprintf("S_M%i", (int)mStyleHash.size()); else - sName.sprintf("S%i", mStyleHash.size()); + sName.sprintf("S%i", (int)mStyleHash.size()); if (propList["style:display-name"]) { librevenge::RVNGString name(propList["style:display-name"]->getStr()); @@ -361,11 +361,11 @@ librevenge::RVNGString sName(""); if (zone==Style::Z_Style) - sName.sprintf("Span_N%i", mStyleHash.size()); + sName.sprintf("Span_N%i", (int)mStyleHash.size()); else if (zone==Style::Z_StyleAutomatic) - sName.sprintf("Span_M%i", mStyleHash.size()); + sName.sprintf("Span_M%i", (int)mStyleHash.size()); else - sName.sprintf("Span%i", mStyleHash.size()); + sName.sprintf("Span%i", (int)mStyleHash.size()); shared_ptr<SpanStyle> span(new SpanStyle(sName.cstr(), propList, zone)); mStyleHash[sName] = span; mHashNameMap[hashKey] = sName; ++++++ libreoffice-5.0.4.2.tar.xz -> libreoffice-5.1.0.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-5.0.4.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-5.1.0.2.tar.xz differ: char 26, line 1 ++++++ libreoffice-help-5.0.4.2.tar.xz -> libreoffice-help-5.1.0.2.tar.xz ++++++ ++++ 29572 lines of diff (skipped) ++++++ libreoffice-translations-5.0.4.2.tar.xz -> libreoffice-translations-5.1.0.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-5.0.4.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-5.1.0.2.tar.xz differ: char 26, line 1 ++++++ libvisio-0.1.1.tar.bz2 -> libvisio-0.1.3.tar.bz2 ++++++ ++++ 9114 lines of diff (skipped) ++++++ libwps-0.4.0.tar.bz2 -> libwps-0.4.2.tar.bz2 ++++++ ++++ 33778 lines of diff (skipped)

1 0

commit liborcus for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package liborcus for openSUSE:Factory checked in at 2016-01-23 01:14:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liborcus (Old) and /work/SRC/openSUSE:Factory/.liborcus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "liborcus" Changes: -------- --- /work/SRC/openSUSE:Factory/liborcus/liborcus.changes 2015-03-27 09:39:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.liborcus.new/liborcus.changes 2016-01-23 01:14:47.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 21 09:49:32 UTC 2015 - tchvatal(a)suse.com + +- Version update to 0.9.2: + * Various bugfixes and update for libreoffice 5.1 + +------------------------------------------------------------------- Old: ---- liborcus-0.7.1.tar.xz New: ---- liborcus-0.9.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liborcus.spec ++++++ --- /var/tmp/diff_new_pack.c3n8mw/_old 2016-01-23 01:14:48.000000000 +0100 +++ /var/tmp/diff_new_pack.c3n8mw/_new 2016-01-23 01:14:48.000000000 +0100 @@ -16,14 +16,14 @@ # -%define libname liborcus-0_8-0 +%define libname liborcus-0_10-0 Name: liborcus -Version: 0.7.1 +Version: 0.9.2 Release: 0 Summary: Spreadsheet file processing library License: MIT Group: Productivity/Publishing/Word -Url: http://gitorious.org/orcus +Url: https://gitlab.com/orcus/orcus/ Source: http://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz BuildRequires: boost-devel BuildRequires: coreutils ++++++ liborcus-0.7.1.tar.xz -> liborcus-0.9.2.tar.xz ++++++ ++++ 27756 lines of diff (skipped)

1 0

commit poppler for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at 2016-01-23 01:14:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poppler (Old) and /work/SRC/openSUSE:Factory/.poppler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "poppler" Changes: -------- --- /work/SRC/openSUSE:Factory/poppler/poppler-qt.changes 2015-12-20 10:51:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2016-01-23 01:14:42.000000000 +0100 @@ -1,0 +2,20 @@ +Fri Jan 15 11:39:40 UTC 2016 - zaitor(a)opensuse.org + +- Update to version 0.40.0: + + core: + - CairoOutputDev: Use shape mask with soft mask (fdo#91931). + - TextOutputDev: + . Handle right-to-left text in search + . Fix finding Arabic Presentation Forms ligatures. + - Fix crash in invalid file (fdo#93476). + - Regression test improvements. + + utils: + - pdftocairo: + . Fix writing to stdout out with image output. + . Document that -singlefile appends file type (fdo#86254). + . Ensure surface flushed before accessing image data. + . Check for invalid use of options (fdo#92195). + - pdfunite: Fix typo in manual. + + build system: Improve cmake build system. + +------------------------------------------------------------------- poppler-qt5.changes: same change poppler.changes: same change Old: ---- poppler-0.39.0.tar.xz New: ---- poppler-0.40.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt.spec ++++++ --- /var/tmp/diff_new_pack.kqFdIN/_old 2016-01-23 01:14:43.000000000 +0100 +++ /var/tmp/diff_new_pack.kqFdIN/_new 2016-01-23 01:14:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package poppler-qt # -# 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 @@ -21,7 +21,7 @@ Name: poppler-qt %define _name poppler -Version: 0.39.0 +Version: 0.40.0 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.4.6 poppler-qt5.spec: same change ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.kqFdIN/_old 2016-01-23 01:14:43.000000000 +0100 +++ /var/tmp/diff_new_pack.kqFdIN/_new 2016-01-23 01:14:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package poppler # -# 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 @@ -21,7 +21,7 @@ Name: poppler %define _name poppler -Version: 0.39.0 +Version: 0.40.0 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.4.6 ++++++ poppler-0.39.0.tar.xz -> poppler-0.40.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/CMakeLists.txt new/poppler-0.40.0/CMakeLists.txt --- old/poppler-0.39.0/CMakeLists.txt 2015-12-17 00:07:49.000000000 +0100 +++ new/poppler-0.40.0/CMakeLists.txt 2016-01-13 23:18:14.000000000 +0100 @@ -22,7 +22,7 @@ endif() set(POPPLER_MAJOR_VERSION "0") -set(POPPLER_MINOR_VERSION "39") +set(POPPLER_MINOR_VERSION "40") set(POPPLER_MICRO_VERSION "0") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") @@ -442,7 +442,6 @@ poppler/JPEG2000Stream.cc ) add_definitions(-DUSE_OPENJPEG2) -MESSAGE(${LIBOPENJPEG2_LIBRARIES}) set(poppler_LIBS ${poppler_LIBS} ${LIBOPENJPEG2_LIBRARIES}) else () set(poppler_SRCS ${poppler_SRCS} @@ -479,8 +478,7 @@ add_library(poppler SHARED ${poppler_SRCS}) endif(MSVC) set_target_properties(poppler PROPERTIES VERSION 58.0.0 SOVERSION 58) -target_link_libraries(poppler ${poppler_LIBS}) -target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "") +target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS}) install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) if(ENABLE_XPDF_HEADERS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/ChangeLog new/poppler-0.40.0/ChangeLog --- old/poppler-0.39.0/ChangeLog 2015-12-17 00:19:26.000000000 +0100 +++ new/poppler-0.40.0/ChangeLog 2016-01-13 23:33:57.000000000 +0100 @@ -1,3 +1,248 @@ +commit 449d45fab8e61393d858549460e61599e4dbd7eb +Author: Albert Astals Cid <aacid(a)kde.org> +Date: Wed Jan 13 23:19:12 2016 +0100 + + 0.40.0 + NEWS + + CMakeLists.txt | 2 +- + NEWS | 18 ++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 23 insertions(+), 5 deletions(-) + +commit e9740b57324cf5a09f6f4312165da13c7b3a576b +Author: Albert Astals Cid <aacid(a)kde.org> +Date: Wed Jan 13 23:14:35 2016 +0100 + + Update copyrights + + poppler/Function.cc | 2 +- + utils/pdftocairo.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 3bfc45bfcca1a52447cedbb95afad1ef362ac6f0 +Author: Adrian Johnson <ajohnson(a)redneon.com> +Date: Mon Jan 11 21:46:49 2016 +1030 + + pdftocairo: check for invalid use of -scale-to* and -paper[wh] options + + Bug 92195 + + utils/pdftocairo.cc | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 819bea740b1fadb24833e0ecbdf4e75ddca8eb14 +Author: Adrian Johnson <ajohnson(a)redneon.com> +Date: Mon Jan 11 19:44:14 2016 +1030 + + pdftocairo: ensure surface flushed before accessing image data + + utils/pdftocairo.cc | 1 + + 1 file changed, 1 insertion(+) + +commit f7542348b37cc881d854bbc36c3af0a4fe37d839 +Author: Adrian Johnson <ajohnson(a)redneon.com> +Date: Mon Jan 11 19:39:34 2016 +1030 + + pdftocairo: document that -singlefile appends file type + + Bug 86254 + + utils/pdftocairo.1 | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 9fa58b1ef6c97e2a30bb3197c11000fac3b059f4 +Author: Adrian Johnson <ajohnson(a)redneon.com> +Date: Mon Jan 11 19:26:02 2016 +1030 + + pdftocairo: fix writing to stdout out with image output + + utils/pdftocairo.cc | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 01d4bb222d63eda7dc5ec903c0735179edf77c0e +Author: Albert Astals Cid <aacid(a)kde.org> +Date: Sun Jan 3 13:01:31 2016 +0100 + + Happy New Year + + poppler/poppler-config.h.cmake | 2 +- + poppler/poppler-config.h.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit d8f418d2f2ec5966d77caf128a52c834fdd0efcf +Author: Khaled Hosny <khaledhosny(a)eglug.org> +Date: Mon Nov 23 13:52:10 2015 +0400 + + Fix finding Arabic Presentation Forms ligatures + + PDF text containing Arabic Presentation forms ligatures is still not + found after the previous commit. + + This because the ligatures are decomposed in logical order after + normalisation, while the whole string is in visual order. For example + the RTL text ABCD in visual order will be DCBA, and assuming B is a + ligature, it will be decomposed to B1B2 so the string after + normalization will be DCB1B2A while we are expecting it to be DCB2B1A. + + This patch reverses the order of the decomposition of RTL characters + to + work around this issue. + + poppler/TextOutputDev.cc | 4 +++- + poppler/UnicodeTypeTable.cc | 20 ++++++++++++++++---- + poppler/UnicodeTypeTable.h | 7 ++++++- + 3 files changed, 25 insertions(+), 6 deletions(-) + +commit 67645087477beb618304ea34cbdbafd40b199276 +Author: Khaled Hosny <khaledhosny(a)eglug.org> +Date: Wed Nov 18 14:47:28 2015 +0400 + + Handle right-to-left text in search + + Currently right-to-left text reversal is only done during text + dumping, + but not during search. This commit applies the same reversal logic + during PDF search as well. + + poppler/TextOutputDev.cc | 191 + ++++++++++++++++++++++++++--------------------- + 1 file changed, 107 insertions(+), 84 deletions(-) + +commit 00422d0c6baaba639fa0660e3a933cdb76b28f88 +Author: Jason Crain <jason(a)aquaticape.us> +Date: Sun Dec 20 09:54:43 2015 -0600 + + cairo: use shape mask with soft mask + + Clear target with the shape mask whether the soft mask is set or not. + Propagate the shape up to any higher level groups and destroy the + shape pattern when done. + + Fix a memory leak by removing a call to 'cairo_reference + (cairo_shape)'. + We already keep track of the lifetime of cairo_shape using + knockoutCount. + + bug 91931 + + poppler/CairoOutputDev.cc | 49 + ++++++++++++++++++++++------------------------- + 1 file changed, 23 insertions(+), 26 deletions(-) + +commit bc4cab272e4fe28b836cb2ef1ff672f0d79d243c +Author: Carlos Garcia Campos <carlosgc(a)gnome.org> +Date: Sat Jan 2 09:49:27 2016 +0100 + + regtest: Fix the number of worker threads spawned reported in log + of run-tests command + + regtest/TestRun.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ea75de614e666d8235c38048585315e0d7ff5522 +Author: Adam Reichold <adam.reichold(a)t-online.de> +Date: Sat Jan 2 09:48:03 2016 +0100 + + regtest: Limit the number of worker threads to the number of documents + to create references + + The same way we do for the run-tests command. + + regtest/TestReferences.py | 27 ++++++++++++++++++--------- + 1 file changed, 18 insertions(+), 9 deletions(-) + +commit 25bb59a81de8a1b6dd23fec871a97ccb11fe9d64 +Author: Carlos Garcia Campos <carlosgc(a)gnome.org> +Date: Fri Jan 1 12:45:42 2016 +0100 + + regtest: Allow to interrupt run-tests and create-refs commands when + multiple threads are used + + The Queue join implementation uses a non-timed wait that blocks + the main + thread, making it impossible to interrupt it with CTRL+C or sending + SIGINT signal. Using any timeout value for wait would fix the problem, + but Queue doesn't allow to pass a timeout to the join method. The + Queue implementation is actually quite simple, so we can just add our + own implementation with only the things we really need and use + a timeout + value when calling wait() in join(). + + regtest/InterruptibleQueue.py | 68 + +++++++++++++++++++++++++++++++++++++++++++ + regtest/TestReferences.py | 4 +-- + regtest/TestRun.py | 4 +-- + 3 files changed, 72 insertions(+), 4 deletions(-) + +commit ffb3ff633b124c476ab48bbcfce04d7f418df9bc +Author: Adam Reichold <adam.reichold(a)t-online.de> +Date: Fri Jan 1 11:32:14 2016 +0100 + + regtest: Do not use the log printer with the TestReferences lock held + + regtest/TestReferences.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e3b09727ad96a03ba1250f49486948899b4df793 +Author: Adam Reichold <adam.reichold(a)t-online.de> +Date: Fri Dec 25 14:10:03 2015 +0100 + + Make detection of version one of OpenJPEG prefer a pkg-config manifest + if it exists. + + CMakeLists.txt | 1 - + cmake/modules/FindLIBOPENJPEG.cmake | 37 + +++++++++++++++++++++++-------------- + 2 files changed, 23 insertions(+), 15 deletions(-) + +commit 7c880daecfcddac2f8181d5f3d506dd409812dbe +Author: Adam Reichold <adam.reichold(a)t-online.de> +Date: Fri Dec 25 14:10:03 2015 +0100 + + Make use of LINK_PRIVATE flag to fix warning on CMake policy 0022. + + CMakeLists.txt | 3 +-- + cpp/CMakeLists.txt | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +commit 4a413b9b95d5c6815c91adb815254cce97dd5b4b +Author: Adam Reichold <adam.reichold(a)t-online.de> +Date: Fri Dec 25 14:10:03 2015 +0100 + + Make target names for Qt4 and Qt5 builds unique so they can be built + at the same time using recent CMake and Ninja versions. + + qt4/tests/CMakeLists.txt | 44 +++++++++++++++++++++--------------------- + qt5/CMakeLists.txt | 2 ++ + qt5/demos/CMakeLists.txt | 2 -- + qt5/src/CMakeLists.txt | 2 -- + qt5/tests/CMakeLists.txt | 50 + +++++++++++++++++++++++------------------------- + 5 files changed, 48 insertions(+), 52 deletions(-) + +commit b3425dd3261679958cd56c0f71995c15d2124433 +Author: Albert Astals Cid <aacid(a)kde.org> +Date: Tue Dec 22 22:50:33 2015 +0100 + + Do not crash on invalid files + + Bug #93476 + + poppler/Function.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 5d57c34cbf9288eec6ddb149e905268405c19450 +Author: Pino Toscano <pino(a)kde.org> +Date: Sun Dec 20 08:42:25 2015 +0100 + + typo fix: "occurence" -> "occurrence" + + utils/pdfunite.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 3eee5274abb24d5b5be05262aafe794652cdac35 Author: Albert Astals Cid <aacid(a)kde.org> Date: Thu Dec 17 00:09:37 2015 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/NEWS new/poppler-0.40.0/NEWS --- old/poppler-0.39.0/NEWS 2015-12-17 00:05:13.000000000 +0100 +++ new/poppler-0.40.0/NEWS 2016-01-13 23:17:55.000000000 +0100 @@ -1,3 +1,21 @@ +Release 0.40.0 + core: + * CairoOutputDev: Use shape mask with soft mask. Bug #91931 + * TextOutputDev: Handle right-to-left text in search + * TextOutputDev: Fix finding Arabic Presentation Forms ligatures + * Fix crash in invalid file. Bug #93476 + * Regression test improvements + + utils: + * pdftocairo: fix writing to stdout out with image output + * pdftocairo: document that -singlefile appends file type. Bug #86254 + * pdftocairo: ensure surface flushed before accessing image data + * pdftocairo: check for invalid use of options. Bug #92195 + * pdfunite: Fix typo in manual + + build system: + * Improve cmake build system + Release 0.39.0 core: * Ignore the alternateSpace and tintTransform. Bug #92381 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/cmake/modules/FindLIBOPENJPEG.cmake new/poppler-0.40.0/cmake/modules/FindLIBOPENJPEG.cmake --- old/poppler-0.39.0/cmake/modules/FindLIBOPENJPEG.cmake 2015-01-04 20:21:42.000000000 +0100 +++ new/poppler-0.40.0/cmake/modules/FindLIBOPENJPEG.cmake 2016-01-13 23:13:59.000000000 +0100 @@ -23,31 +23,40 @@ set(LIBOPENJPEG_LIBRARIES) set(LIBOPENJPEG_INCLUDE_DIR) - find_path (LIBOPENJPEG_INCLUDE_DIR openjpeg.h PATH_SUFFIXES openjpeg) - find_library(LIBOPENJPEG_LIBRARIES openjpeg) - if(LIBOPENJPEG_INCLUDE_DIR AND LIBOPENJPEG_LIBRARIES) + find_package(PkgConfig REQUIRED) + pkg_check_modules(LIBOPENJPEG libopenjpeg) - set(CMAKE_REQUIRED_INCLUDES ${LIBOPENJPEG_INCLUDE_DIR}) - set(CMAKE_REQUIRED_LIBRARIES ${LIBOPENJPEG_LIBRARIES}) + if(LIBOPENJPEG_FOUND) + add_definitions(-DUSE_OPENJPEG1) + set(LIBOPENJPEG_INCLUDE_DIR ${LIBOPENJPEG_INCLUDE_DIRS}) + else(LIBOPENJPEG_FOUND) + + find_path (LIBOPENJPEG_INCLUDE_DIR openjpeg.h PATH_SUFFIXES openjpeg) + find_library(LIBOPENJPEG_LIBRARIES openjpeg) + if(LIBOPENJPEG_INCLUDE_DIR AND LIBOPENJPEG_LIBRARIES) -check_cxx_source_compiles(" + set(CMAKE_REQUIRED_INCLUDES ${LIBOPENJPEG_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${LIBOPENJPEG_LIBRARIES}) + + check_cxx_source_compiles(" #include <openjpeg.h> int main() { int foo = OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG; return 0; -} -" WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG) +}" + WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG) - set(CMAKE_REQUIRED_INCLUDES) - set(CMAKE_REQUIRED_LIBRARIES) + set(CMAKE_REQUIRED_INCLUDES) + set(CMAKE_REQUIRED_LIBRARIES) - set(LIBOPENJPEG_FOUND TRUE) - endif(LIBOPENJPEG_INCLUDE_DIR AND LIBOPENJPEG_LIBRARIES) + set(LIBOPENJPEG_FOUND TRUE) + endif(LIBOPENJPEG_INCLUDE_DIR AND LIBOPENJPEG_LIBRARIES) - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(LibOpenJPEG DEFAULT_MSG LIBOPENJPEG_LIBRARIES LIBOPENJPEG_INCLUDE_DIR) + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(LibOpenJPEG DEFAULT_MSG LIBOPENJPEG_LIBRARIES LIBOPENJPEG_INCLUDE_DIR) + endif (LIBOPENJPEG_FOUND) endif (LIBOPENJPEG_LIBRARIES AND LIBOPENJPEG_INCLUDE_DIR) set(LIBOPENJPEG_INCLUDE_DIRS ${LIBOPENJPEG_INCLUDE_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/configure new/poppler-0.40.0/configure --- old/poppler-0.39.0/configure 2015-12-17 00:10:13.000000000 +0100 +++ new/poppler-0.40.0/configure 2016-01-13 23:20:11.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for poppler 0.39.0. +# Generated by GNU Autoconf 2.69 for poppler 0.40.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=poppler>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='poppler' PACKAGE_TARNAME='poppler' -PACKAGE_VERSION='0.39.0' -PACKAGE_STRING='poppler 0.39.0' +PACKAGE_VERSION='0.40.0' +PACKAGE_STRING='poppler 0.40.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler' PACKAGE_URL='' @@ -1541,7 +1541,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 poppler 0.39.0 to adapt to many kinds of systems. +\`configure' configures poppler 0.40.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1616,7 +1616,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of poppler 0.39.0:";; + short | recursive ) echo "Configuration of poppler 0.40.0:";; esac cat <<\_ACEOF @@ -1836,7 +1836,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -poppler configure 0.39.0 +poppler configure 0.40.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2530,7 +2530,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by poppler $as_me 0.39.0, which was +It was created by poppler $as_me 0.40.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3394,7 +3394,7 @@ # Define the identity of the package. PACKAGE='poppler' - VERSION='0.39.0' + VERSION='0.40.0' cat >>confdefs.h <<_ACEOF @@ -17790,7 +17790,7 @@ cat >>confdefs.h <<_ACEOF -#define POPPLER_VERSION "0.39.0" +#define POPPLER_VERSION "0.40.0" _ACEOF @@ -25022,11 +25022,11 @@ POPPLER_MAJOR_VERSION=0 -POPPLER_MINOR_VERSION=39 +POPPLER_MINOR_VERSION=40 POPPLER_MICRO_VERSION=0 -POPPLER_VERSION=0.39.0 +POPPLER_VERSION=0.40.0 ac_config_files="$ac_config_files Makefile goo/Makefile fofi/Makefile splash/Makefile poppler/Makefile utils/Makefile glib/Makefile glib/poppler-features.h glib/reference/Makefile glib/reference/version.xml glib/demo/Makefile test/Makefile qt4/Makefile qt4/src/Makefile qt4/tests/Makefile qt4/demos/Makefile qt5/Makefile qt5/src/Makefile qt5/tests/Makefile qt5/demos/Makefile cpp/Makefile cpp/poppler-version.h cpp/tests/Makefile poppler.pc poppler-uninstalled.pc poppler-cairo.pc poppler-cairo-uninstalled.pc poppler-splash.pc poppler-splash-uninstalled.pc poppler-glib.pc poppler-glib-uninstalled.pc poppler-qt4.pc poppler-qt4-uninstalled.pc poppler-qt5.pc poppler-qt5-uninstalled.pc poppler-cpp.pc poppler-cpp-uninstalled.pc" @@ -25678,7 +25678,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by poppler $as_me 0.39.0, which was +This file was extended by poppler $as_me 0.40.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25744,7 +25744,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -poppler config.status 0.39.0 +poppler config.status 0.40.0 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/poppler-0.39.0/configure.ac new/poppler-0.40.0/configure.ac --- old/poppler-0.39.0/configure.ac 2015-12-17 00:07:03.000000000 +0100 +++ new/poppler-0.40.0/configure.ac 2016-01-13 23:18:09.000000000 +0100 @@ -1,5 +1,5 @@ m4_define([poppler_version_major],[0]) -m4_define([poppler_version_minor],[39]) +m4_define([poppler_version_minor],[40]) m4_define([poppler_version_micro],[0]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/cpp/CMakeLists.txt new/poppler-0.40.0/cpp/CMakeLists.txt --- old/poppler-0.39.0/cpp/CMakeLists.txt 2015-01-04 22:58:28.000000000 +0100 +++ new/poppler-0.40.0/cpp/CMakeLists.txt 2016-01-13 23:13:59.000000000 +0100 @@ -26,9 +26,8 @@ set_target_properties(poppler-cpp PROPERTIES VERSION 0.2.1 SOVERSION 0) target_link_libraries(poppler-cpp poppler ${ICONV_LIBRARIES}) if(MSVC) -target_link_libraries(poppler-cpp ${poppler_LIBS}) +target_link_libraries(poppler-cpp LINK_PRIVATE ${poppler_LIBS}) endif(MSVC) -target_link_libraries(poppler-cpp LINK_INTERFACE_LIBRARIES "") install(TARGETS poppler-cpp RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) install(FILES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/cpp/poppler-version.h new/poppler-0.40.0/cpp/poppler-version.h --- old/poppler-0.39.0/cpp/poppler-version.h 2015-12-17 00:10:19.000000000 +0100 +++ new/poppler-0.40.0/cpp/poppler-version.h 2016-01-13 23:20:17.000000000 +0100 @@ -21,9 +21,9 @@ #include "poppler-global.h" -#define POPPLER_VERSION "0.39.0" +#define POPPLER_VERSION "0.40.0" #define POPPLER_VERSION_MAJOR 0 -#define POPPLER_VERSION_MINOR 39 +#define POPPLER_VERSION_MINOR 40 #define POPPLER_VERSION_MICRO 0 namespace poppler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/glib/reference/html/index.html new/poppler-0.40.0/glib/reference/html/index.html --- old/poppler-0.39.0/glib/reference/html/index.html 2015-12-17 00:19:27.000000000 +0100 +++ new/poppler-0.40.0/glib/reference/html/index.html 2016-01-13 23:33:58.000000000 +0100 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle">Poppler Reference Manual</th></tr></table></div> <div> - for Poppler 0.39.0 + for Poppler 0.40.0 </div> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/glib/reference/html/poppler-Version-and-Features-Information.html new/poppler-0.40.0/glib/reference/html/poppler-Version-and-Features-Information.html --- old/poppler-0.39.0/glib/reference/html/poppler-Version-and-Features-Information.html 2015-12-17 00:19:27.000000000 +0100 +++ new/poppler-0.40.0/glib/reference/html/poppler-Version-and-Features-Information.html 2016-01-13 23:33:58.000000000 +0100 @@ -119,7 +119,7 @@ <hr> <div class="refsect2"> <a name="POPPLER-MINOR-VERSION:CAPS"></a><h3>POPPLER_MINOR_VERSION</h3> -<pre class="programlisting">#define POPPLER_MINOR_VERSION (39) +<pre class="programlisting">#define POPPLER_MINOR_VERSION (40) </pre> The major version number of the poppler header files (e.g. in poppler version 0.1.2 this is 1.) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/glib/reference/version.xml new/poppler-0.40.0/glib/reference/version.xml --- old/poppler-0.39.0/glib/reference/version.xml 2015-12-17 00:10:19.000000000 +0100 +++ new/poppler-0.40.0/glib/reference/version.xml 2016-01-13 23:20:17.000000000 +0100 @@ -1 +1 @@ -0.39.0 +0.40.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/poppler/CairoOutputDev.cc new/poppler-0.40.0/poppler/CairoOutputDev.cc --- old/poppler-0.39.0/poppler/CairoOutputDev.cc 2015-12-16 23:59:30.000000000 +0100 +++ new/poppler-0.40.0/poppler/CairoOutputDev.cc 2016-01-13 23:13:59.000000000 +0100 @@ -1597,8 +1597,6 @@ cairo_get_matrix (cairo, &matrix); //printMatrix(&matrix); cairo_set_matrix (cairo_shape, &matrix); - } else { - cairo_reference (cairo_shape); } } if (groupColorSpaceStack->next && groupColorSpaceStack->next->knockout) { @@ -1638,33 +1636,22 @@ cairo_save (cairo); cairo_set_matrix (cairo, &groupColorSpaceStack->group_matrix); + + if (shape) { + /* OPERATOR_SOURCE w/ a mask is defined as (src IN mask) ADD (dest OUT mask) + * however our source has already been clipped to mask so we only need to + * do ADD and OUT */ + + /* clear the shape mask */ + cairo_set_source (cairo, shape); + cairo_set_operator (cairo, CAIRO_OPERATOR_DEST_OUT); + cairo_paint (cairo); + cairo_set_operator (cairo, CAIRO_OPERATOR_ADD); + } cairo_set_source (cairo, group); if (!mask) { - //XXX: deal with mask && shape case - if (shape) { - cairo_save (cairo); - - /* OPERATOR_SOURCE w/ a mask is defined as (src IN mask) ADD (dest OUT mask) - * however our source has already been clipped to mask so we only need to - * do ADD and OUT */ - - /* clear the shape mask */ - cairo_set_source (cairo, shape); - cairo_set_operator (cairo, CAIRO_OPERATOR_DEST_OUT); - cairo_paint (cairo); - - cairo_set_operator (cairo, CAIRO_OPERATOR_ADD); - cairo_set_source (cairo, group); - cairo_paint (cairo); - - cairo_restore (cairo); - - cairo_pattern_destroy (shape); - shape = NULL; - } else { - cairo_paint_with_alpha (cairo, fill_opacity); - } + cairo_paint_with_alpha (cairo, fill_opacity); cairo_status_t status = cairo_status(cairo); if (status) printf("BAD status: %s\n", cairo_status_to_string(status)); @@ -1684,6 +1671,16 @@ mask = NULL; } + if (shape) { + if (cairo_shape) { + cairo_set_source (cairo_shape, shape); + cairo_paint (cairo_shape); + cairo_set_source_rgb (cairo_shape, 0, 0, 0); + } + cairo_pattern_destroy (shape); + shape = NULL; + } + popTransparencyGroup(); cairo_restore(cairo); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/poppler/Function.cc new/poppler-0.40.0/poppler/Function.cc --- old/poppler-0.39.0/poppler/Function.cc 2014-10-01 22:38:58.000000000 +0200 +++ new/poppler-0.40.0/poppler/Function.cc 2016-01-13 23:14:11.000000000 +0100 @@ -13,7 +13,7 @@ // All changes made under the Poppler project to this file are licensed // under GPL version 2 or later // -// Copyright (C) 2006, 2008-2010, 2013, 2014 Albert Astals Cid <aacid(a)kde.org> +// Copyright (C) 2006, 2008-2010, 2013-2015 Albert Astals Cid <aacid(a)kde.org> // Copyright (C) 2006 Jeff Muizelaar <jeff(a)infidigm.net> // Copyright (C) 2010 Christian Feuers�nger <cfeuersaenger(a)googlemail.com> // Copyright (C) 2011 Andrea Canciani <ranma42(a)gmail.com> @@ -577,6 +577,10 @@ goto err2; } n = obj1.arrayGetLength(); + if (unlikely(n > funcMaxOutputs)) { + error(errSyntaxError, -1, "Function's C0 array is wrong length"); + n = funcMaxOutputs; + } for (i = 0; i < n; ++i) { obj1.arrayGet(i, &obj2); if (!obj2.isNum()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/poppler/TextOutputDev.cc new/poppler-0.40.0/poppler/TextOutputDev.cc --- old/poppler-0.39.0/poppler/TextOutputDev.cc 2015-11-15 22:05:22.000000000 +0100 +++ new/poppler-0.40.0/poppler/TextOutputDev.cc 2016-01-13 23:13:59.000000000 +0100 @@ -35,6 +35,7 @@ // Copyright (C) 2013 José Aliste <jaliste(a)src.gnome.org> // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag(a)alfa.de> // Copyright (C) 2013 Ed Catmur <ed(a)catmur.co.uk> +// Copyright (C) 2016 Khaled Hosny <khaledhosny(a)eglug.org> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -178,6 +179,94 @@ #define combMaxMidDelta 0.3 #define combMaxBaseDelta 0.4 +static int reorderText(Unicode *text, int len, UnicodeMap *uMap, GBool primaryLR, GooString *s, Unicode* u) { + char lre[8], rle[8], popdf[8], buf[8]; + int lreLen = 0, rleLen = 0, popdfLen = 0, n; + int nCols, i, j, k; + + nCols = 0; + + if (s) { + lreLen = uMap->mapUnicode(0x202a, lre, sizeof(lre)); + rleLen = uMap->mapUnicode(0x202b, rle, sizeof(rle)); + popdfLen = uMap->mapUnicode(0x202c, popdf, sizeof(popdf)); + } + + if (primaryLR) { + i = 0; + while (i < len) { + // output a left-to-right section + for (j = i; j < len && !unicodeTypeR(text[j]); ++j) ; + for (k = i; k < j; ++k) { + if (s) { + n = uMap->mapUnicode(text[k], buf, sizeof(buf)); + s->append(buf, n); + } + if (u) u[nCols] = text[k]; + ++nCols; + } + i = j; + // output a right-to-left section + for (j = i; + j < len && !(unicodeTypeL(text[j]) || unicodeTypeNum(text[j])); + ++j) ; + if (j > i) { + if (s) s->append(rle, rleLen); + for (k = j - 1; k >= i; --k) { + if (s) { + n = uMap->mapUnicode(text[k], buf, sizeof(buf)); + s->append(buf, n); + } + if (u) u[nCols] = text[k]; + ++nCols; + } + if (s) s->append(popdf, popdfLen); + i = j; + } + } + } else { + // Note: This code treats numeric characters (European and + // Arabic/Indic) as left-to-right, which isn't strictly correct + // (incurs extra LRE/POPDF pairs), but does produce correct + // visual formatting. + if (s) s->append(rle, rleLen); + i = len - 1; + while (i >= 0) { + // output a right-to-left section + for (j = i; + j >= 0 && !(unicodeTypeL(text[j]) || unicodeTypeNum(text[j])); + --j) ; + for (k = i; k > j; --k) { + if (s) { + n = uMap->mapUnicode(text[k], buf, sizeof(buf)); + s->append(buf, n); + } + if (u) u[nCols] = text[k]; + ++nCols; + } + i = j; + // output a left-to-right section + for (j = i; j >= 0 && !unicodeTypeR(text[j]); --j) ; + if (j < i) { + if (s) s->append(lre, lreLen); + for (k = j + 1; k <= i; ++k) { + if (s) { + n = uMap->mapUnicode(text[k], buf, sizeof(buf)); + s->append(buf, n); + } + if (u) u[nCols] = text[k]; + ++nCols; + } + if (s) s->append(popdf, popdfLen); + i = j; + } + } + if (s) s->append(popdf, popdfLen); + } + + return nCols; +} + //------------------------------------------------------------------------ // TextUnderline //------------------------------------------------------------------------ @@ -3720,7 +3809,7 @@ double *xMax, double *yMax) { TextBlock *blk; TextLine *line; - Unicode *s2, *txt; + Unicode *s2, *txt, *reordered; Unicode *p; int txtSize, m, i, j, k; double xStart, yStart, xStop, yStop; @@ -3728,20 +3817,23 @@ double xMin1, yMin1, xMax1, yMax1; GBool found; - //~ needs to handle right-to-left text if (rawOrder) { return gFalse; } + // handle right-to-left text + reordered = (Unicode*)gmallocn(len, sizeof(Unicode)); + reorderText(s, len, NULL, primaryLR, NULL, reordered); + + // normalize the search string + s2 = unicodeNormalizeNFKC(reordered, len, &len, NULL); + // convert the search string to uppercase if (!caseSensitive) { - s2 = unicodeNormalizeNFKC(s, len, &len, NULL); for (i = 0; i < len; ++i) { s2[i] = unicodeToUpper(s2[i]); } - } else { - s2 = unicodeNormalizeNFKC(s, len, &len, NULL); } txt = NULL; @@ -3809,7 +3901,8 @@ if (!line->normalized) line->normalized = unicodeNormalizeNFKC(line->text, line->len, &line->normalized_len, - &line->normalized_idx); + &line->normalized_idx, + true); // convert the line to uppercase m = line->normalized_len; if (!caseSensitive) { @@ -3915,6 +4008,7 @@ } gfree(s2); + gfree(reordered); if (!caseSensitive) { gfree(txt); } @@ -5330,91 +5424,22 @@ int TextPage::dumpFragment(Unicode *text, int len, UnicodeMap *uMap, GooString *s) { - char lre[8], rle[8], popdf[8], buf[8]; - int lreLen, rleLen, popdfLen, n; - int nCols, i, j, k; - - nCols = 0; - if (uMap->isUnicode()) { + return reorderText(text, len, uMap, primaryLR, s, NULL); + } else { + int nCols = 0; - lreLen = uMap->mapUnicode(0x202a, lre, sizeof(lre)); - rleLen = uMap->mapUnicode(0x202b, rle, sizeof(rle)); - popdfLen = uMap->mapUnicode(0x202c, popdf, sizeof(popdf)); - - if (primaryLR) { - - i = 0; - while (i < len) { - // output a left-to-right section - for (j = i; j < len && !unicodeTypeR(text[j]); ++j) ; - for (k = i; k < j; ++k) { - n = uMap->mapUnicode(text[k], buf, sizeof(buf)); - s->append(buf, n); - ++nCols; - } - i = j; - // output a right-to-left section - for (j = i; - j < len && !(unicodeTypeL(text[j]) || unicodeTypeNum(text[j])); - ++j) ; - if (j > i) { - s->append(rle, rleLen); - for (k = j - 1; k >= i; --k) { - n = uMap->mapUnicode(text[k], buf, sizeof(buf)); - s->append(buf, n); - ++nCols; - } - s->append(popdf, popdfLen); - i = j; - } - } - - } else { - - // Note: This code treats numeric characters (European and - // Arabic/Indic) as left-to-right, which isn't strictly correct - // (incurs extra LRE/POPDF pairs), but does produce correct - // visual formatting. - s->append(rle, rleLen); - i = len - 1; - while (i >= 0) { - // output a right-to-left section - for (j = i; - j >= 0 && !(unicodeTypeL(text[j]) || unicodeTypeNum(text[j])); - --j) ; - for (k = i; k > j; --k) { - n = uMap->mapUnicode(text[k], buf, sizeof(buf)); - s->append(buf, n); - ++nCols; - } - i = j; - // output a left-to-right section - for (j = i; j >= 0 && !unicodeTypeR(text[j]); --j) ; - if (j < i) { - s->append(lre, lreLen); - for (k = j + 1; k <= i; ++k) { - n = uMap->mapUnicode(text[k], buf, sizeof(buf)); - s->append(buf, n); - ++nCols; - } - s->append(popdf, popdfLen); - i = j; - } - } - s->append(popdf, popdfLen); + char buf[8]; + int buflen = 0; + for (int i = 0; i < len; ++i) { + buflen = uMap->mapUnicode(text[i], buf, sizeof(buf)); + s->append(buf, buflen); + nCols += buflen; } - } else { - for (i = 0; i < len; ++i) { - n = uMap->mapUnicode(text[i], buf, sizeof(buf)); - s->append(buf, n); - nCols += n; - } + return nCols; } - - return nCols; } #if TEXTOUT_WORD_LIST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/poppler/UnicodeTypeTable.cc new/poppler-0.40.0/poppler/UnicodeTypeTable.cc --- old/poppler-0.39.0/poppler/UnicodeTypeTable.cc 2014-02-09 16:10:33.000000000 +0100 +++ new/poppler-0.40.0/poppler/UnicodeTypeTable.cc 2016-01-13 23:13:59.000000000 +0100 @@ -17,6 +17,7 @@ // Copyright (C) 2007 Jeff Muizelaar <jeff(a)infidigm.net> // Copyright (C) 2008 Albert Astals Cid <aacid(a)kde.org> // Copyright (C) 2012 Adrian Johnson <ajohnson(a)redneon.com> +// Copyright (C) 2016 Khaled Hosny <khaledhosny(a)eglug.org> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -1015,7 +1016,9 @@ // of characters written. @buf may be NULL, in which case the length of the // decomposition is returned but nothing is written. If @u is its own // decomposition, write @u into @buf and return 1. -static int decomp_compat(Unicode u, Unicode *buf) { +// If reverseRTL is true, then decompositions of RTL characters will be output +// in reverse order. +static int decomp_compat(Unicode u, Unicode *buf, GBool reverseRTL = false) { // decomposition tables stored as lists {character, decomp_length, offset} // so we do a binary search int start = 0, end = DECOMP_TABLE_LENGTH; @@ -1031,7 +1034,10 @@ int length = decomp_table[midpoint].length, i; if (buf) for (i = 0; i < length; ++i) - buf[i] = decomp_expansion[offset + i]; + if (unicodeTypeR(u) && reverseRTL) + buf[i] = decomp_expansion[offset + length - i - 1]; + else + buf[i] = decomp_expansion[offset + i]; return length; } } else if (midpoint == start) @@ -1125,8 +1131,14 @@ // for each character in the normalized string giving the index in @in of the // corresponding unnormalized character. @indices is not guaranteed monotone or // onto. -Unicode *unicodeNormalizeNFKC(Unicode *in, int len, +Unicode *unicodeNormalizeNFKC(Unicode *in, int len, int *out_len, int **indices) { + return unicodeNormalizeNFKC(in, len, out_len, indices, false); +} + +Unicode *unicodeNormalizeNFKC(Unicode *in, int len, + int *out_len, int **indices, + GBool reverseRTL) { Unicode *out; int i, o, *classes, *idx = NULL; @@ -1174,7 +1186,7 @@ u = in[j]; if (j != i && COMBINING_CLASS(u) == 0) break; - dlen = decomp_compat(u, out + p); + dlen = decomp_compat(u, out + p, reverseRTL); for (q = p; q < p + dlen; ++q) { classes[q] = COMBINING_CLASS(out[q]); if (indices) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/poppler/UnicodeTypeTable.h new/poppler-0.40.0/poppler/UnicodeTypeTable.h --- old/poppler-0.39.0/poppler/UnicodeTypeTable.h 2014-02-09 16:10:33.000000000 +0100 +++ new/poppler-0.40.0/poppler/UnicodeTypeTable.h 2016-01-13 23:13:59.000000000 +0100 @@ -15,6 +15,7 @@ // // Copyright (C) 2006 Ed Catmur <ed(a)catmur.co.uk> // Copyright (C) 2012 Adrian Johnson <ajohnson(a)redneon.com> +// Copyright (C) 2016 Khaled Hosny <khaledhosny(a)eglug.org> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -38,7 +39,11 @@ extern Unicode unicodeToUpper(Unicode c); -extern Unicode *unicodeNormalizeNFKC(Unicode *in, int len, +extern Unicode *unicodeNormalizeNFKC(Unicode *in, int len, int *out_len, int **offsets); +extern Unicode *unicodeNormalizeNFKC(Unicode *in, int len, + int *out_len, int **offsets, + GBool reverseRTL); + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/poppler/poppler-config.h.cmake new/poppler-0.40.0/poppler/poppler-config.h.cmake --- old/poppler-0.39.0/poppler/poppler-config.h.cmake 2015-10-05 16:04:39.000000000 +0200 +++ new/poppler-0.40.0/poppler/poppler-config.h.cmake 2016-01-13 23:13:59.000000000 +0100 @@ -134,7 +134,7 @@ //------------------------------------------------------------------------ // copyright notice -#define popplerCopyright "Copyright 2005-2015 The Poppler Developers - http://poppler.freedesktop.org" +#define popplerCopyright "Copyright 2005-2016 The Poppler Developers - http://poppler.freedesktop.org" #define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC" //------------------------------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/poppler/poppler-config.h.in new/poppler-0.40.0/poppler/poppler-config.h.in --- old/poppler-0.39.0/poppler/poppler-config.h.in 2015-01-04 23:11:09.000000000 +0100 +++ new/poppler-0.40.0/poppler/poppler-config.h.in 2016-01-13 23:13:59.000000000 +0100 @@ -134,7 +134,7 @@ //------------------------------------------------------------------------ // copyright notice -#define popplerCopyright "Copyright 2005-2015 The Poppler Developers - http://poppler.freedesktop.org" +#define popplerCopyright "Copyright 2005-2016 The Poppler Developers - http://poppler.freedesktop.org" #define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC" //------------------------------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/qt4/tests/CMakeLists.txt new/poppler-0.40.0/qt4/tests/CMakeLists.txt --- old/poppler-0.39.0/qt4/tests/CMakeLists.txt 2014-03-21 23:13:45.000000000 +0100 +++ new/poppler-0.40.0/qt4/tests/CMakeLists.txt 2016-01-13 23:13:59.000000000 +0100 @@ -38,30 +38,30 @@ qt4_add_simpletest(test-poppler-qt4 test-poppler-qt4.cpp) qt4_add_simpletest(test-password-qt4 test-password-qt4.cpp) -qt4_add_simpletest(test-render-to-file test-render-to-file.cpp) -qt4_add_simpletest(poppler-forms poppler-forms.cpp) -qt4_add_simpletest(poppler-fonts poppler-fonts.cpp) -qt4_add_simpletest(poppler_attachments poppler-attachments.cpp) +qt4_add_simpletest(test-render-to-file-qt4 test-render-to-file.cpp) +qt4_add_simpletest(poppler-qt4-forms poppler-forms.cpp) +qt4_add_simpletest(poppler-qt4-fonts poppler-fonts.cpp) +qt4_add_simpletest(poppler-qt4-attachments poppler-attachments.cpp) qt4_add_simpletest(stress-poppler-qt4 stress-poppler-qt4.cpp) -qt4_add_simpletest(stress-poppler-dir stress-poppler-dir.cpp) +qt4_add_simpletest(stress-poppler-dir-qt4 stress-poppler-dir.cpp) qt4_add_simpletest(stress-threads-qt4 stress-threads-qt4.cpp) -qt4_add_simpletest(poppler-texts poppler-texts.cpp) +qt4_add_simpletest(poppler-qt4-texts poppler-texts.cpp) -qt4_add_qtest(check_attachments check_attachments.cpp) -qt4_add_qtest(check_dateConversion check_dateConversion.cpp) -qt4_add_qtest(check_fonts check_fonts.cpp) -qt4_add_qtest(check_links check_links.cpp) -qt4_add_qtest(check_metadata check_metadata.cpp) -qt4_add_qtest(check_optcontent check_optcontent.cpp) -qt4_add_qtest(check_pagelayout check_pagelayout.cpp) -qt4_add_qtest(check_pagemode check_pagemode.cpp) -qt4_add_qtest(check_password check_password.cpp) -qt4_add_qtest(check_permissions check_permissions.cpp) -qt4_add_qtest(check_search check_search.cpp) -qt4_add_qtest(check_actualtext check_actualtext.cpp) -qt4_add_qtest(check_lexer check_lexer.cpp) -qt4_add_qtest(check_pagelabelinfo check_pagelabelinfo.cpp) -qt4_add_qtest(check_goostring check_goostring.cpp) +qt4_add_qtest(check_qt4_attachments check_attachments.cpp) +qt4_add_qtest(check_qt4_dateConversion check_dateConversion.cpp) +qt4_add_qtest(check_qt4_fonts check_fonts.cpp) +qt4_add_qtest(check_qt4_links check_links.cpp) +qt4_add_qtest(check_qt4_metadata check_metadata.cpp) +qt4_add_qtest(check_qt4_optcontent check_optcontent.cpp) +qt4_add_qtest(check_qt4_pagelayout check_pagelayout.cpp) +qt4_add_qtest(check_qt4_pagemode check_pagemode.cpp) +qt4_add_qtest(check_qt4_password check_password.cpp) +qt4_add_qtest(check_qt4_permissions check_permissions.cpp) +qt4_add_qtest(check_qt4_search check_search.cpp) +qt4_add_qtest(check_qt4_actualtext check_actualtext.cpp) +qt4_add_qtest(check_qt4_lexer check_lexer.cpp) +qt4_add_qtest(check_qt4_pagelabelinfo check_pagelabelinfo.cpp) +qt4_add_qtest(check_qt4_goostring check_goostring.cpp) if (NOT WIN32) - qt4_add_qtest(check_strings check_strings.cpp) + qt4_add_qtest(check_qt4_strings check_strings.cpp) endif (NOT WIN32) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/qt5/CMakeLists.txt new/poppler-0.40.0/qt5/CMakeLists.txt --- old/poppler-0.39.0/qt5/CMakeLists.txt 2015-07-10 22:10:25.000000000 +0200 +++ new/poppler-0.40.0/qt5/CMakeLists.txt 2016-01-13 23:13:59.000000000 +0100 @@ -1,3 +1,5 @@ +set(CMAKE_AUTOMOC ON) + add_subdirectory(src) add_subdirectory(tests) add_subdirectory(demos) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/qt5/demos/CMakeLists.txt new/poppler-0.40.0/qt5/demos/CMakeLists.txt --- old/poppler-0.39.0/qt5/demos/CMakeLists.txt 2014-02-09 16:10:33.000000000 +0100 +++ new/poppler-0.40.0/qt5/demos/CMakeLists.txt 2016-01-13 23:13:59.000000000 +0100 @@ -1,5 +1,3 @@ -set(CMAKE_AUTOMOC ON) - add_definitions(${QT5_DEFINITIONS}) add_definitions(${Qt5Core_DEFINITIONS}) add_definitions(${Qt5Gui_DEFINITIONS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/qt5/src/CMakeLists.txt new/poppler-0.40.0/qt5/src/CMakeLists.txt --- old/poppler-0.39.0/qt5/src/CMakeLists.txt 2015-10-28 23:11:50.000000000 +0100 +++ new/poppler-0.40.0/qt5/src/CMakeLists.txt 2016-01-13 23:13:59.000000000 +0100 @@ -1,8 +1,6 @@ add_definitions(${QT5_DEFINITIONS}) add_definitions(${Qt5Core_DEFINITIONS}) -set(CMAKE_AUTOMOC ON) - include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${Qt5Core_INCLUDE_DIRS} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/qt5/tests/CMakeLists.txt new/poppler-0.40.0/qt5/tests/CMakeLists.txt --- old/poppler-0.39.0/qt5/tests/CMakeLists.txt 2015-07-12 23:20:18.000000000 +0200 +++ new/poppler-0.40.0/qt5/tests/CMakeLists.txt 2016-01-13 23:13:59.000000000 +0100 @@ -1,5 +1,3 @@ -set(CMAKE_AUTOMOC ON) - add_definitions(${Qt5Core_DEFINITIONS}) add_definitions(-DTESTDATADIR=\"${TESTDATADIR}\") @@ -37,9 +35,9 @@ ${source} ) poppler_add_unittest(${exe} BUILD_QT5_TESTS ${${test_name}_SOURCES}) - target_link_libraries(${exe} poppler-qt5 ${Qt5Widgets_LIBRARIES} ${Qt5Test_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES}) + target_link_libraries(${exe} poppler-qt5 ${Qt5Widgets_LIBRARIES} ${Qt5Test_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES}) if(MSVC) - target_link_libraries(${exe} poppler ${poppler_LIBS}) + target_link_libraries(${exe} poppler ${poppler_LIBS}) endif(MSVC) endif (Qt5Test_FOUND) endmacro(QT5_ADD_QTEST) @@ -47,30 +45,30 @@ qt5_add_simpletest(test-poppler-qt5 test-poppler-qt5.cpp) qt5_add_simpletest(test-password-qt5 test-password-qt5.cpp) -qt5_add_simpletest(test-render-to-file test-render-to-file.cpp) -qt5_add_simpletest(poppler-forms poppler-forms.cpp) -qt5_add_simpletest(poppler-fonts poppler-fonts.cpp) -qt5_add_simpletest(poppler_attachments poppler-attachments.cpp) +qt5_add_simpletest(test-render-to-file-qt5 test-render-to-file.cpp) +qt5_add_simpletest(poppler-qt5-forms poppler-forms.cpp) +qt5_add_simpletest(poppler-qt5-fonts poppler-fonts.cpp) +qt5_add_simpletest(poppler-qt5-attachments poppler-attachments.cpp) qt5_add_simpletest(stress-poppler-qt5 stress-poppler-qt5.cpp) -qt5_add_simpletest(stress-poppler-dir stress-poppler-dir.cpp) +qt5_add_simpletest(stress-poppler-dir-qt5 stress-poppler-dir.cpp) qt5_add_simpletest(stress-threads-qt5 stress-threads-qt5.cpp) -qt5_add_simpletest(poppler-texts poppler-texts.cpp) +qt5_add_simpletest(poppler-qt5-texts poppler-texts.cpp) -qt5_add_qtest(check_attachments check_attachments.cpp) -qt5_add_qtest(check_dateConversion check_dateConversion.cpp) -qt5_add_qtest(check_fonts check_fonts.cpp) -qt5_add_qtest(check_links check_links.cpp) -qt5_add_qtest(check_metadata check_metadata.cpp) -qt5_add_qtest(check_optcontent check_optcontent.cpp) -qt5_add_qtest(check_pagelayout check_pagelayout.cpp) -qt5_add_qtest(check_pagemode check_pagemode.cpp) -qt5_add_qtest(check_password check_password.cpp) -qt5_add_qtest(check_permissions check_permissions.cpp) -qt5_add_qtest(check_search check_search.cpp) -qt5_add_qtest(check_actualtext check_actualtext.cpp) -qt5_add_qtest(check_lexer check_lexer.cpp) -qt5_add_qtest(check_pagelabelinfo check_pagelabelinfo.cpp) -qt5_add_qtest(check_goostring check_goostring.cpp) +qt5_add_qtest(check_qt5_attachments check_attachments.cpp) +qt5_add_qtest(check_qt5_dateConversion check_dateConversion.cpp) +qt5_add_qtest(check_qt5_fonts check_fonts.cpp) +qt5_add_qtest(check_qt5_links check_links.cpp) +qt5_add_qtest(check_qt5_metadata check_metadata.cpp) +qt5_add_qtest(check_qt5_optcontent check_optcontent.cpp) +qt5_add_qtest(check_qt5_pagelayout check_pagelayout.cpp) +qt5_add_qtest(check_qt5_pagemode check_pagemode.cpp) +qt5_add_qtest(check_qt5_password check_password.cpp) +qt5_add_qtest(check_qt5_permissions check_permissions.cpp) +qt5_add_qtest(check_qt5_search check_search.cpp) +qt5_add_qtest(check_qt5_actualtext check_actualtext.cpp) +qt5_add_qtest(check_qt5_lexer check_lexer.cpp) +qt5_add_qtest(check_qt5_pagelabelinfo check_pagelabelinfo.cpp) +qt5_add_qtest(check_qt5_goostring check_goostring.cpp) if (NOT WIN32) - qt5_add_qtest(check_strings check_strings.cpp) + qt5_add_qtest(check_qt5_strings check_strings.cpp) endif (NOT WIN32) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/utils/pdftocairo.1 new/poppler-0.40.0/utils/pdftocairo.1 --- old/poppler-0.39.0/utils/pdftocairo.1 2014-10-26 23:00:59.000000000 +0100 +++ new/poppler-0.40.0/utils/pdftocairo.1 2016-01-13 23:13:59.000000000 +0100 @@ -1,4 +1,4 @@ -.TH pdftoppm 1 +.TH pdftocairo 1 .SH NAME pdftocairo \- Portable Document Format (PDF) to PNG/JPEG/TIFF/PDF/PS/EPS/SVG using cairo .SH SYNOPSIS @@ -32,9 +32,10 @@ and writes to .IR output-file . The image formats (PNG, JPEG, and TIFF) generate one file per page with the page number and file type appended to -.IR output-file -(except when \-singlefile is used). -When the output format is a vector format (PDF, PS, EPS, and SVG) or when \-singlefile is used, +.IR output-file . +qWhen \-singlefile is used with the image formats, the file type is appended to +.IR output-file . +When the output format is a vector format (PDF, PS, EPS, and SVG), .IR output-file is the full filename. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/utils/pdftocairo.cc new/poppler-0.40.0/utils/pdftocairo.cc --- old/poppler-0.39.0/utils/pdftocairo.cc 2015-12-16 23:58:58.000000000 +0100 +++ new/poppler-0.40.0/utils/pdftocairo.cc 2016-01-13 23:14:26.000000000 +0100 @@ -19,7 +19,7 @@ // Copyright (C) 2009 Shen Liang <shenzhuxi(a)gmail.com> // Copyright (C) 2009 Stefan Thomas <thomas(a)eload24.com> // Copyright (C) 2009, 2010 Albert Astals Cid <aacid(a)kde.org> -// Copyright (C) 2010, 2011-2015 Adrian Johnson <ajohnson(a)redneon.com> +// Copyright (C) 2010, 2011-2016 Adrian Johnson <ajohnson(a)redneon.com> // Copyright (C) 2010, 2014 Hib Eris <hib(a)hiberis.nl> // Copyright (C) 2010 Jonathan Liu <net147(a)gmail.com> // Copyright (C) 2010 William Bader <williambader(a)hotmail.com> @@ -351,6 +351,7 @@ height = cairo_image_surface_get_height(surface); width = cairo_image_surface_get_width(surface); stride = cairo_image_surface_get_stride(surface); + cairo_surface_flush(surface); data = cairo_image_surface_get_data(surface); if (!writer->init(file, width, height, x_resolution, y_resolution)) { @@ -725,12 +726,14 @@ snprintf(buf, sizeof(buf), "-%0*d", numDigits, page); imageName->append(buf); } - if (png) - imageName->append(".png"); - else if (jpeg) - imageName->append(".jpg"); - else if (tiff) - imageName->append(".tif"); + if (outputFileName->cmp("fd://0") != 0) { + if (png) + imageName->append(".png"); + else if (jpeg) + imageName->append(".jpg"); + else if (tiff) + imageName->append(".tif"); + } return imageName; } @@ -832,8 +835,10 @@ int num_outputs; // parse args - if (!parseArgs(argDesc, &argc, argv)) + if (!parseArgs(argDesc, &argc, argv)) { + printUsage("pdftocairo", 0, argDesc); exit(99); + } if ( resolution != 0.0 && (x_resolution == 150.0 || @@ -883,6 +888,9 @@ checkInvalidPrintOption(icc.getCString()[0], "-icc"); checkInvalidPrintOption(singleFile, "-singlefile"); checkInvalidPrintOption(useCropBox, "-cropbox"); + checkInvalidPrintOption(scaleTo != 0, "-scale-to"); + checkInvalidPrintOption(x_scaleTo != 0, "-scale-to-x"); + checkInvalidPrintOption(y_scaleTo != 0, "-scale-to-y"); } else { checkInvalidImageOption(level2, "-level2"); checkInvalidImageOption(level3, "-level3"); @@ -937,6 +945,11 @@ exit(99); } + if ((paperWidth > 0 && paperHeight <= 0) || (paperWidth <= 0 && paperHeight > 0)) { + fprintf(stderr, "Error: both -paperw and -paperh must be specified.\n"); + exit(99); + } + if (paperSize[0]) { if (origPageSizes) { fprintf(stderr, "Error: -origpagesizes and -paper may not be used together.\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.39.0/utils/pdfunite.1 new/poppler-0.40.0/utils/pdfunite.1 --- old/poppler-0.39.0/utils/pdfunite.1 2014-08-12 17:21:24.000000000 +0200 +++ new/poppler-0.40.0/utils/pdfunite.1 2016-01-13 23:13:59.000000000 +0100 @@ -8,7 +8,7 @@ .I PDF-sourcefile1..PDF-sourcefilen PDF-destfile .SH DESCRIPTION .B pdfunite -merges several PDF (Portable Document Format) files in order of their occurence on command line to one PDF result file. +merges several PDF (Portable Document Format) files in order of their occurrence on command line to one PDF result file. .TP Neither of the PDF-sourcefile1 to PDF-sourcefilen should be encrypted. .SH OPTIONS

1 0

commit opus for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package opus for openSUSE:Factory checked in at 2016-01-23 01:14:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opus (Old) and /work/SRC/openSUSE:Factory/.opus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opus" Changes: -------- --- /work/SRC/openSUSE:Factory/opus/opus.changes 2015-12-09 19:32:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.opus.new/opus.changes 2016-01-23 01:14:35.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Jan 19 13:24:17 UTC 2016 - idonmez(a)suse.com + +- Update to version 1.1.2, fixes the following bugs: + + Resetting the encoder or decoder state with OPUS_RESET_STATE + would disable some run-time selected architecture-specific + optimizations. + + In hybrid mode discontinuous transmission (DTX) operation, + the comfort noise above 8 kHz was incorrectly estimated + and could oscillate in time. + +------------------------------------------------------------------- Old: ---- opus-1.1.1.tar.gz New: ---- opus-1.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opus.spec ++++++ --- /var/tmp/diff_new_pack.qMwMgp/_old 2016-01-23 01:14:36.000000000 +0100 +++ /var/tmp/diff_new_pack.qMwMgp/_new 2016-01-23 01:14:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package opus # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Pascal Bleser <pascal.bleser(a)opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: opus -Version: 1.1.1 +Version: 1.1.2 Release: 0 %define soname 0 Summary: Opus Audio Codec Library ++++++ opus-1.1.1.tar.gz -> opus-1.1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/Makefile.in new/opus-1.1.2/Makefile.in --- old/opus-1.1.1/Makefile.in 2015-11-25 21:46:28.000000000 +0100 +++ new/opus-1.1.2/Makefile.in 2016-01-12 19:17:49.000000000 +0100 @@ -953,6 +953,7 @@ OPUS_LT_AGE = @OPUS_LT_AGE@ OPUS_LT_CURRENT = @OPUS_LT_CURRENT@ OPUS_LT_REVISION = @OPUS_LT_REVISION@ +OPUS_X86_AVX_CFLAGS = @OPUS_X86_AVX_CFLAGS@ OPUS_X86_SSE2_CFLAGS = @OPUS_X86_SSE2_CFLAGS@ OPUS_X86_SSE4_1_CFLAGS = @OPUS_X86_SSE4_1_CFLAGS@ OPUS_X86_SSE_CFLAGS = @OPUS_X86_SSE_CFLAGS@ @@ -973,6 +974,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +X86_AVX_CFLAGS = @X86_AVX_CFLAGS@ X86_SSE2_CFLAGS = @X86_SSE2_CFLAGS@ X86_SSE4_1_CFLAGS = @X86_SSE4_1_CFLAGS@ X86_SSE_CFLAGS = @X86_SSE_CFLAGS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/Makefile.mips new/opus-1.1.2/Makefile.mips --- old/opus-1.1.1/Makefile.mips 2015-04-22 02:22:07.000000000 +0200 +++ new/opus-1.1.2/Makefile.mips 2016-01-11 21:48:46.000000000 +0100 @@ -108,11 +108,16 @@ OPUSCOMPARE_SRCS_C = src/opus_compare.c OPUSCOMPARE_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(OPUSCOMPARE_SRCS_C)) +TESTS := test_opus_api test_opus_decode test_opus_encode test_opus_padding + # Rules -all: lib opus_demo opus_compare test_opus_api test_opus_decode test_opus_encode test_opus_padding +all: lib opus_demo opus_compare $(TESTS) lib: $(TARGET) +check: all + for test in $(TESTS); do ./$$test; done + $(TARGET): $(OBJS) $(ARCHIVE.cmdline) @@ -153,4 +158,4 @@ $(OBJS) $(OPUSDEMO_OBJS) $(OPUSCOMPARE_OBJS) $(TESTOPUSAPI_OBJS) \ $(TESTOPUSDECODE_OBJS) $(TESTOPUSENCODE_OBJS) $(TESTOPUSPADDING_OBJS) -.PHONY: all lib clean +.PHONY: all lib clean force check diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/Makefile.unix new/opus-1.1.2/Makefile.unix --- old/opus-1.1.1/Makefile.unix 2015-04-22 02:22:07.000000000 +0200 +++ new/opus-1.1.2/Makefile.unix 2016-01-11 21:48:46.000000000 +0100 @@ -106,11 +106,16 @@ OPUSCOMPARE_SRCS_C = src/opus_compare.c OPUSCOMPARE_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(OPUSCOMPARE_SRCS_C)) +TESTS := test_opus_api test_opus_decode test_opus_encode test_opus_padding + # Rules -all: lib opus_demo opus_compare test_opus_api test_opus_decode test_opus_encode test_opus_padding +all: lib opus_demo opus_compare $(TESTS) lib: $(TARGET) +check: all + for test in $(TESTS); do ./$$test; done + $(TARGET): $(OBJS) $(ARCHIVE.cmdline) @@ -151,4 +156,4 @@ $(OBJS) $(OPUSDEMO_OBJS) $(OPUSCOMPARE_OBJS) $(TESTOPUSAPI_OBJS) \ $(TESTOPUSDECODE_OBJS) $(TESTOPUSENCODE_OBJS) $(TESTOPUSPADDING_OBJS) -.PHONY: all lib clean +.PHONY: all lib clean force check diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/celt/celt_decoder.c new/opus-1.1.2/celt/celt_decoder.c --- old/opus-1.1.1/celt/celt_decoder.c 2015-10-08 00:09:20.000000000 +0200 +++ new/opus-1.1.2/celt/celt_decoder.c 2015-12-30 20:16:21.000000000 +0100 @@ -457,10 +457,9 @@ VARDECL(celt_norm, X); #endif opus_uint32 seed; - opus_val16 *plcLogE; int end; int effEnd; - + opus_val16 decay; end = st->end; effEnd = IMAX(start, IMIN(end, mode->effEBands)); @@ -472,19 +471,13 @@ ALLOC(X, C*N, celt_norm); /**< Interleaved normalised MDCTs */ #endif - if (loss_count >= 5) - plcLogE = backgroundLogE; - else { - /* Energy decay */ - opus_val16 decay = loss_count==0 ? - QCONST16(1.5f, DB_SHIFT) : QCONST16(.5f, DB_SHIFT); - c=0; do - { - for (i=start;i<end;i++) - oldBandE[c*nbEBands+i] -= decay; - } while (++c<C); - plcLogE = oldBandE; - } + /* Energy decay */ + decay = loss_count==0 ? QCONST16(1.5f, DB_SHIFT) : QCONST16(.5f, DB_SHIFT); + c=0; do + { + for (i=start;i<end;i++) + oldBandE[c*nbEBands+i] = MAX16(backgroundLogE[c*nbEBands+i], oldBandE[c*nbEBands+i] - decay); + } while (++c<C); seed = st->rng; for (c=0;c<C;c++) { @@ -510,7 +503,7 @@ DECODE_BUFFER_SIZE-N+(overlap>>1)); } while (++c<C); - celt_synthesis(mode, X, out_syn, plcLogE, start, effEnd, C, C, 0, LM, st->downsample, 0, st->arch); + celt_synthesis(mode, X, out_syn, oldBandE, start, effEnd, C, C, 0, LM, st->downsample, 0, st->arch); } else { /* Pitch-based PLC */ const opus_val16 *window; @@ -1037,10 +1030,18 @@ /* In case start or end were to change */ if (!isTransient) { + opus_val16 max_background_increase; OPUS_COPY(oldLogE2, oldLogE, 2*nbEBands); OPUS_COPY(oldLogE, oldBandE, 2*nbEBands); + /* In normal circumstances, we only allow the noise floor to increase by + up to 2.4 dB/second, but when we're in DTX, we allow up to 6 dB + increase for each update.*/ + if (st->loss_count < 10) + max_background_increase = M*QCONST16(0.001f,DB_SHIFT); + else + max_background_increase = QCONST16(1.f,DB_SHIFT); for (i=0;i<2*nbEBands;i++) - backgroundLogE[i] = MIN16(backgroundLogE[i] + M*QCONST16(0.001f,DB_SHIFT), oldBandE[i]); + backgroundLogE[i] = MIN16(backgroundLogE[i] + max_background_increase, oldBandE[i]); } else { for (i=0;i<2*nbEBands;i++) oldLogE[i] = MIN16(oldLogE[i], oldBandE[i]); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/celt/celt_encoder.c new/opus-1.1.2/celt/celt_encoder.c --- old/opus-1.1.1/celt/celt_encoder.c 2015-11-25 03:03:10.000000000 +0100 +++ new/opus-1.1.2/celt/celt_encoder.c 2016-01-12 18:16:54.000000000 +0100 @@ -343,9 +343,9 @@ { int id; #ifdef FIXED_POINT - id = IMAX(0,IMIN(127,MULT16_32_Q15(tmp[i],norm))); /* Do not round to nearest */ + id = MAX32(0,MIN32(127,MULT16_32_Q15(tmp[i]+EPSILON,norm))); /* Do not round to nearest */ #else - id = IMAX(0,IMIN(127,(int)floor(64*norm*tmp[i]))); /* Do not round to nearest */ + id = (int)MAX32(0,MIN32(127,floor(64*norm*(tmp[i]+EPSILON)))); /* Do not round to nearest */ #endif unmask += inv_table[id]; } @@ -375,8 +375,8 @@ /* Looks for sudden increases of energy to decide whether we need to patch the transient decision */ -int patch_transient_decision(opus_val16 *newE, opus_val16 *oldE, int nbEBands, - int end, int C) +static int patch_transient_decision(opus_val16 *newE, opus_val16 *oldE, int nbEBands, + int start, int end, int C) { int i, c; opus_val32 mean_diff=0; @@ -385,28 +385,28 @@ avoid false detection caused by irrelevant bands */ if (C==1) { - spread_old[0] = oldE[0]; - for (i=1;i<end;i++) + spread_old[start] = oldE[start]; + for (i=start+1;i<end;i++) spread_old[i] = MAX16(spread_old[i-1]-QCONST16(1.0f, DB_SHIFT), oldE[i]); } else { - spread_old[0] = MAX16(oldE[0],oldE[nbEBands]); - for (i=1;i<end;i++) + spread_old[start] = MAX16(oldE[start],oldE[start+nbEBands]); + for (i=start+1;i<end;i++) spread_old[i] = MAX16(spread_old[i-1]-QCONST16(1.0f, DB_SHIFT), MAX16(oldE[i],oldE[i+nbEBands])); } - for (i=end-2;i>=0;i--) + for (i=end-2;i>=start;i--) spread_old[i] = MAX16(spread_old[i], spread_old[i+1]-QCONST16(1.0f, DB_SHIFT)); /* Compute mean increase */ c=0; do { - for (i=2;i<end-1;i++) + for (i=IMAX(2,start);i<end-1;i++) { opus_val16 x1, x2; - x1 = MAX16(0, newE[i]); + x1 = MAX16(0, newE[i + c*nbEBands]); x2 = MAX16(0, spread_old[i]); mean_diff = ADD32(mean_diff, EXTEND32(MAX16(0, SUB16(x1, x2)))); } } while (++c<C); - mean_diff = DIV32(mean_diff, C*(end-3)); + mean_diff = DIV32(mean_diff, C*(end-1-IMAX(2,start))); /*printf("%f %f %d\n", mean_diff, max_diff, count);*/ return mean_diff > QCONST16(1.f, DB_SHIFT); } @@ -1735,7 +1735,7 @@ time-domain analysis */ if (LM>0 && ec_tell(enc)+3<=total_bits && !isTransient && st->complexity>=5 && !st->lfe) { - if (patch_transient_decision(bandLogE, oldBandE, nbEBands, end, C)) + if (patch_transient_decision(bandLogE, oldBandE, nbEBands, start, end, C)) { isTransient = 1; shortBlocks = M; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/celt/cpu_support.h new/opus-1.1.2/celt/cpu_support.h --- old/opus-1.1.1/celt/cpu_support.h 2015-11-25 03:03:10.000000000 +0100 +++ new/opus-1.1.2/celt/cpu_support.h 2015-12-30 20:16:21.000000000 +0100 @@ -45,16 +45,18 @@ #elif (defined(OPUS_X86_MAY_HAVE_SSE) && !defined(OPUS_X86_PRESUME_SSE)) || \ (defined(OPUS_X86_MAY_HAVE_SSE2) && !defined(OPUS_X86_PRESUME_SSE2)) || \ - (defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_PRESUME_SSE4_1)) + (defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_PRESUME_SSE4_1)) || \ + (defined(OPUS_X86_MAY_HAVE_AVX) && !defined(OPUS_X86_PRESUME_AVX)) #include "x86/x86cpu.h" -/* We currently support 4 x86 variants: +/* We currently support 5 x86 variants: * arch[0] -> non-sse * arch[1] -> sse * arch[2] -> sse2 * arch[3] -> sse4.1 + * arch[4] -> avx */ -#define OPUS_ARCHMASK 3 +#define OPUS_ARCHMASK 7 int opus_select_arch(void); #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/celt/quant_bands.c new/opus-1.1.2/celt/quant_bands.c --- old/opus-1.1.1/celt/quant_bands.c 2015-08-03 17:17:17.000000000 +0200 +++ new/opus-1.1.2/celt/quant_bands.c 2015-12-30 20:16:21.000000000 +0100 @@ -292,7 +292,7 @@ #endif } if (lfe) - max_decay=3; + max_decay = QCONST16(3.f,DB_SHIFT); enc_start_state = *enc; ALLOC(oldEBands_intra, C*m->nbEBands, opus_val16); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/celt/rate.c new/opus-1.1.2/celt/rate.c --- old/opus-1.1.1/celt/rate.c 2015-11-25 03:03:10.000000000 +0100 +++ new/opus-1.1.2/celt/rate.c 2016-01-11 21:48:46.000000000 +0100 @@ -131,7 +131,7 @@ for (i=0;i<nbEntries;i++) { unsigned char *ptr = bits+entryI[i]; - opus_int16 tmp[MAX_PULSES+1]; + opus_int16 tmp[CELT_MAX_PULSES+1]; get_required_bits(tmp, entryN[i], get_pulses(entryK[i]), BITRES); for (j=1;j<=entryK[i];j++) ptr[j] = tmp[get_pulses(j)]-1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/celt/rate.h new/opus-1.1.2/celt/rate.h --- old/opus-1.1.1/celt/rate.h 2015-08-31 18:14:35.000000000 +0200 +++ new/opus-1.1.2/celt/rate.h 2016-01-11 21:48:46.000000000 +0100 @@ -32,7 +32,7 @@ #define MAX_PSEUDO 40 #define LOG_MAX_PSEUDO 6 -#define MAX_PULSES 128 +#define CELT_MAX_PULSES 128 #define MAX_FINE_BITS 8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/celt/tests/test_unit_dft.c new/opus-1.1.2/celt/tests/test_unit_dft.c --- old/opus-1.1.1/celt/tests/test_unit_dft.c 2015-11-13 00:45:23.000000000 +0100 +++ new/opus-1.1.2/celt/tests/test_unit_dft.c 2015-12-30 20:16:21.000000000 +0100 @@ -149,7 +149,7 @@ free(in); free(out); - free(cfg); + opus_fft_free(cfg, arch); } int main(int argc,char ** argv) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/celt/tests/test_unit_laplace.c new/opus-1.1.2/celt/tests/test_unit_laplace.c --- old/opus-1.1.1/celt/tests/test_unit_laplace.c 2014-02-14 20:54:59.000000000 +0100 +++ new/opus-1.1.2/celt/tests/test_unit_laplace.c 2015-12-30 20:16:21.000000000 +0100 @@ -88,5 +88,6 @@ } } + free(ptr); return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/celt/tests/test_unit_mdct.c new/opus-1.1.2/celt/tests/test_unit_mdct.c --- old/opus-1.1.1/celt/tests/test_unit_mdct.c 2015-11-13 00:45:23.000000000 +0100 +++ new/opus-1.1.2/celt/tests/test_unit_mdct.c 2015-12-30 20:16:21.000000000 +0100 @@ -179,7 +179,9 @@ free(in); + free(in_copy); free(out); + free(window); clt_mdct_clear(&cfg, arch); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/celt/x86/x86_celt_map.c new/opus-1.1.2/celt/x86/x86_celt_map.c --- old/opus-1.1.1/celt/x86/x86_celt_map.c 2015-11-25 03:03:10.000000000 +0100 +++ new/opus-1.1.2/celt/x86/x86_celt_map.c 2015-12-30 20:16:21.000000000 +0100 @@ -53,6 +53,7 @@ celt_fir_c, celt_fir_c, MAY_HAVE_SSE4_1(celt_fir), /* sse4.1 */ + MAY_HAVE_SSE4_1(celt_fir) /* avx */ }; void (*const XCORR_KERNEL_IMPL[OPUS_ARCHMASK + 1])( @@ -65,6 +66,7 @@ xcorr_kernel_c, xcorr_kernel_c, MAY_HAVE_SSE4_1(xcorr_kernel), /* sse4.1 */ + MAY_HAVE_SSE4_1(xcorr_kernel) /* avx */ }; #endif @@ -81,6 +83,7 @@ celt_inner_prod_c, MAY_HAVE_SSE2(celt_inner_prod), MAY_HAVE_SSE4_1(celt_inner_prod), /* sse4.1 */ + MAY_HAVE_SSE4_1(celt_inner_prod) /* avx */ }; #endif @@ -99,6 +102,7 @@ MAY_HAVE_SSE(xcorr_kernel), MAY_HAVE_SSE(xcorr_kernel), MAY_HAVE_SSE(xcorr_kernel), + MAY_HAVE_SSE(xcorr_kernel) }; opus_val32 (*const CELT_INNER_PROD_IMPL[OPUS_ARCHMASK + 1])( @@ -110,6 +114,7 @@ MAY_HAVE_SSE(celt_inner_prod), MAY_HAVE_SSE(celt_inner_prod), MAY_HAVE_SSE(celt_inner_prod), + MAY_HAVE_SSE(celt_inner_prod) }; void (*const DUAL_INNER_PROD_IMPL[OPUS_ARCHMASK + 1])( @@ -124,6 +129,7 @@ MAY_HAVE_SSE(dual_inner_prod), MAY_HAVE_SSE(dual_inner_prod), MAY_HAVE_SSE(dual_inner_prod), + MAY_HAVE_SSE(dual_inner_prod) }; void (*const COMB_FILTER_CONST_IMPL[OPUS_ARCHMASK + 1])( @@ -139,6 +145,7 @@ MAY_HAVE_SSE(comb_filter_const), MAY_HAVE_SSE(comb_filter_const), MAY_HAVE_SSE(comb_filter_const), + MAY_HAVE_SSE(comb_filter_const) }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/celt/x86/x86cpu.c new/opus-1.1.2/celt/x86/x86cpu.c --- old/opus-1.1.1/celt/x86/x86cpu.c 2015-11-25 03:03:10.000000000 +0100 +++ new/opus-1.1.2/celt/x86/x86cpu.c 2015-12-30 20:16:21.000000000 +0100 @@ -37,7 +37,8 @@ #if (defined(OPUS_X86_MAY_HAVE_SSE) && !defined(OPUS_X86_PRESUME_SSE)) || \ (defined(OPUS_X86_MAY_HAVE_SSE2) && !defined(OPUS_X86_PRESUME_SSE2)) || \ - (defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_PRESUME_SSE4_1)) + (defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_PRESUME_SSE4_1)) || \ + (defined(OPUS_X86_MAY_HAVE_AVX) && !defined(OPUS_X86_PRESUME_AVX)) #if defined(_MSC_VER) @@ -91,6 +92,8 @@ int HW_SSE; int HW_SSE2; int HW_SSE41; + /* SIMD: 256-bit */ + int HW_AVX; } CPU_Feature; static void opus_cpu_feature_check(CPU_Feature *cpu_feature) @@ -106,11 +109,13 @@ cpu_feature->HW_SSE = (info[3] & (1 << 25)) != 0; cpu_feature->HW_SSE2 = (info[3] & (1 << 26)) != 0; cpu_feature->HW_SSE41 = (info[2] & (1 << 19)) != 0; + cpu_feature->HW_AVX = (info[2] & (1 << 28)) != 0; } else { cpu_feature->HW_SSE = 0; cpu_feature->HW_SSE2 = 0; cpu_feature->HW_SSE41 = 0; + cpu_feature->HW_AVX = 0; } } @@ -138,6 +143,12 @@ { return arch; } + arch++; + + if (!cpu_feature.HW_AVX) + { + return arch; + } arch++; return arch; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/celt/x86/x86cpu.h new/opus-1.1.2/celt/x86/x86cpu.h --- old/opus-1.1.1/celt/x86/x86cpu.h 2015-11-25 03:03:10.000000000 +0100 +++ new/opus-1.1.2/celt/x86/x86cpu.h 2015-12-30 20:16:21.000000000 +0100 @@ -46,6 +46,12 @@ # define MAY_HAVE_SSE4_1(name) name ## _c # endif +# if defined(OPUS_X86_MAY_HAVE_AVX) +# define MAY_HAVE_AVX(name) name ## _avx +# else +# define MAY_HAVE_AVX(name) name ## _c +# endif + # if defined(OPUS_HAVE_RTCD) int opus_select_arch(void); # endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/config.h.in new/opus-1.1.2/config.h.in --- old/opus-1.1.1/config.h.in 2015-11-25 21:46:32.000000000 +0100 +++ new/opus-1.1.2/config.h.in 2016-01-12 19:17:55.000000000 +0100 @@ -121,6 +121,9 @@ /* Use run-time CPU capabilities detection */ #undef OPUS_HAVE_RTCD +/* Compiler supports X86 AVX Intrinsics */ +#undef OPUS_X86_MAY_HAVE_AVX + /* Compiler supports X86 SSE Intrinsics */ #undef OPUS_X86_MAY_HAVE_SSE @@ -130,6 +133,9 @@ /* Compiler supports X86 SSE4.1 Intrinsics */ #undef OPUS_X86_MAY_HAVE_SSE4_1 +/* Define if binary requires AVX intrinsics support */ +#undef OPUS_X86_PRESUME_AVX + /* Define if binary requires SSE intrinsics support */ #undef OPUS_X86_PRESUME_SSE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/configure new/opus-1.1.2/configure --- old/opus-1.1.1/configure 2015-11-25 21:46:28.000000000 +0100 +++ new/opus-1.1.2/configure 2016-01-12 19:17:49.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for opus 1.1.1. +# Generated by GNU Autoconf 2.69 for opus 1.1.2. # # Report bugs to <opus(a)xiph.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='opus' PACKAGE_TARNAME='opus' -PACKAGE_VERSION='1.1.1' -PACKAGE_STRING='opus 1.1.1' +PACKAGE_VERSION='1.1.2' +PACKAGE_STRING='opus 1.1.2' PACKAGE_BUGREPORT='opus(a)xiph.org' PACKAGE_URL='' @@ -649,6 +649,7 @@ OPUS_ARM_NEON_INTR_TRUE CPU_ARM_FALSE CPU_ARM_TRUE +OPUS_X86_AVX_CFLAGS OPUS_X86_SSE4_1_CFLAGS OPUS_X86_SSE2_CFLAGS OPUS_X86_SSE_CFLAGS @@ -657,9 +658,12 @@ HAVE_ARM_NE10 OPUS_ARM_NEON_INTR_CFLAGS ARM_NEON_INTR_CFLAGS +X86_AVX_CFLAGS X86_SSE4_1_CFLAGS X86_SSE2_CFLAGS X86_SSE_CFLAGS +HAVE_AVX_FALSE +HAVE_AVX_TRUE HAVE_SSE4_1_FALSE HAVE_SSE4_1_TRUE HAVE_SSE2_FALSE @@ -848,6 +852,7 @@ X86_SSE_CFLAGS X86_SSE2_CFLAGS X86_SSE4_1_CFLAGS +X86_AVX_CFLAGS ARM_NEON_INTR_CFLAGS' @@ -1389,7 +1394,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 opus 1.1.1 to adapt to many kinds of systems. +\`configure' configures opus 1.1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1459,7 +1464,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of opus 1.1.1:";; + short | recursive ) echo "Configuration of opus 1.1.2:";; esac cat <<\_ACEOF @@ -1532,6 +1537,8 @@ C compiler flags to compile SSE2 intrinsics [default=-msse2] X86_SSE4_1_CFLAGS C compiler flags to compile SSE4.1 intrinsics [default=-msse4.1] + X86_AVX_CFLAGS + C compiler flags to compile AVX intrinsics [default=-mavx] ARM_NEON_INTR_CFLAGS C compiler flags to compile ARM NEON intrinsics [default=-mfpu=neon / -mfpu=neon -mfloat-abi=softfp] @@ -1602,7 +1609,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -opus configure 1.1.1 +opus configure 1.1.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1971,7 +1978,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by opus $as_me 1.1.1, which was +It was created by opus $as_me 1.1.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2365,7 +2372,7 @@ # For libtool. OPUS_LT_CURRENT=5 -OPUS_LT_REVISION=1 +OPUS_LT_REVISION=2 OPUS_LT_AGE=5 @@ -2848,7 +2855,7 @@ # Define the identity of the package. PACKAGE='opus' - VERSION='1.1.1' + VERSION='1.1.2' # Some tools Automake needs. @@ -12944,6 +12951,15 @@ HAVE_SSE4_1_FALSE= fi + if false; then + HAVE_AVX_TRUE= + HAVE_AVX_FALSE='#' +else + HAVE_AVX_TRUE='#' + HAVE_AVX_FALSE= +fi + + @@ -12970,6 +12986,7 @@ + if ${X86_SSE_CFLAGS+:} false; then : else @@ -12985,6 +13002,11 @@ else X86_SSE4_1_CFLAGS="-msse4.1" fi +if ${X86_AVX_CFLAGS+:} false; then : + +else + X86_AVX_CFLAGS="-mavx" +fi if ${ARM_NEON_INTR_CFLAGS+:} false; then : else @@ -13468,6 +13490,83 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports AVX intrinsics" >&5 +$as_echo_n "checking if compiler supports AVX intrinsics... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <immintrin.h> + +int +main () +{ + + static __m256 mtest; + mtest = _mm256_setzero_ps(); + + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + OPUS_X86_MAY_HAVE_AVX=1 + OPUS_X86_PRESUME_AVX=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +else + + OPUS_X86_PRESUME_AVX=0 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports AVX intrinsics with $X86_AVX_CFLAGS" >&5 +$as_echo_n "checking if compiler supports AVX intrinsics with $X86_AVX_CFLAGS... " >&6; } + save_CFLAGS="$CFLAGS"; CFLAGS="$X86_AVX_CFLAGS $CFLAGS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <immintrin.h> + +int +main () +{ + + static __m256 mtest; + mtest = _mm256_setzero_ps(); + + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + OPUS_X86_MAY_HAVE_AVX=1 + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + OPUS_X86_MAY_HAVE_AVX=0 + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$save_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + if test x"$OPUS_X86_MAY_HAVE_AVX" = x"1" && test x"$OPUS_X86_PRESUME_AVX" != x"1"; then : + + OPUS_X86_AVX_CFLAGS="$X86_AVX_CFLAGS" + + + +fi if test x"$rtcd_support" = x"no"; then : rtcd_support="" fi @@ -13536,6 +13635,28 @@ $as_echo "$as_me: WARNING: Compiler does not support SSE4.1 intrinsics" >&2;} fi + if test x"$OPUS_X86_MAY_HAVE_AVX" = x"1"; then : + + +$as_echo "#define OPUS_X86_MAY_HAVE_AVX 1" >>confdefs.h + + intrinsics_support="$intrinsics_support AVX" + + if test x"$OPUS_X86_PRESUME_AVX" = x"1"; then : + +$as_echo "#define OPUS_X86_PRESUME_AVX 1" >>confdefs.h + +else + rtcd_support="$rtcd_support AVX" +fi + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compiler does not support AVX intrinsics" >&5 +$as_echo "$as_me: WARNING: Compiler does not support AVX intrinsics" >&2;} + +fi + if test x"$intrinsics_support" = x""; then : intrinsics_support=no else @@ -13686,6 +13807,14 @@ HAVE_SSE4_1_FALSE= fi + if test x"$OPUS_X86_MAY_HAVE_AVX" = x"1"; then + HAVE_AVX_TRUE= + HAVE_AVX_FALSE='#' +else + HAVE_AVX_TRUE='#' + HAVE_AVX_FALSE= +fi + if test x"$enable_rtcd" = x"yes"; then : @@ -14086,6 +14215,10 @@ as_fn_error $? "conditional \"HAVE_SSE4_1\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_AVX_TRUE}" && test -z "${HAVE_AVX_FALSE}"; then + as_fn_error $? "conditional \"HAVE_AVX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${CPU_ARM_TRUE}" && test -z "${CPU_ARM_FALSE}"; then as_fn_error $? "conditional \"CPU_ARM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -14110,6 +14243,10 @@ as_fn_error $? "conditional \"HAVE_SSE4_1\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_AVX_TRUE}" && test -z "${HAVE_AVX_FALSE}"; then + as_fn_error $? "conditional \"HAVE_AVX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then as_fn_error $? "conditional \"HAVE_DOXYGEN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -14515,7 +14652,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by opus $as_me 1.1.1, which was +This file was extended by opus $as_me 1.1.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14581,7 +14718,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -opus config.status 1.1.1 +opus config.status 1.1.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/configure.ac new/opus-1.1.2/configure.ac --- old/opus-1.1.1/configure.ac 2015-11-25 21:46:26.000000000 +0100 +++ new/opus-1.1.2/configure.ac 2016-01-12 19:17:47.000000000 +0100 @@ -23,7 +23,7 @@ # For libtool. dnl Please update these for releases. OPUS_LT_CURRENT=5 -OPUS_LT_REVISION=1 +OPUS_LT_REVISION=2 OPUS_LT_AGE=5 AC_SUBST(OPUS_LT_CURRENT) @@ -351,10 +351,12 @@ AM_CONDITIONAL([HAVE_SSE], [false]) AM_CONDITIONAL([HAVE_SSE2], [false]) AM_CONDITIONAL([HAVE_SSE4_1], [false]) +AM_CONDITIONAL([HAVE_AVX], [false]) m4_define([DEFAULT_X86_SSE_CFLAGS], [-msse]) m4_define([DEFAULT_X86_SSE2_CFLAGS], [-msse2]) m4_define([DEFAULT_X86_SSE4_1_CFLAGS], [-msse4.1]) +m4_define([DEFAULT_X86_AVX_CFLAGS], [-mavx]) m4_define([DEFAULT_ARM_NEON_INTR_CFLAGS], [-mfpu=neon]) # With GCC on ARM32 softfp architectures (e.g. Android, or older Ubuntu) you need to specify # -mfloat-abi=softfp for -mfpu=neon to work. However, on ARM32 hardfp architectures (e.g. newer Ubuntu), @@ -371,11 +373,13 @@ AC_ARG_VAR([X86_SSE_CFLAGS], [C compiler flags to compile SSE intrinsics @<:@default=]DEFAULT_X86_SSE_CFLAGS[@:>@]) AC_ARG_VAR([X86_SSE2_CFLAGS], [C compiler flags to compile SSE2 intrinsics @<:@default=]DEFAULT_X86_SSE2_CFLAGS[@:>@]) AC_ARG_VAR([X86_SSE4_1_CFLAGS], [C compiler flags to compile SSE4.1 intrinsics @<:@default=]DEFAULT_X86_SSE4_1_CFLAGS[@:>@]) +AC_ARG_VAR([X86_AVX_CFLAGS], [C compiler flags to compile AVX intrinsics @<:@default=]DEFAULT_X86_AVX_CFLAGS[@:>@]) AC_ARG_VAR([ARM_NEON_INTR_CFLAGS], [C compiler flags to compile ARM NEON intrinsics @<:@default=]DEFAULT_ARM_NEON_INTR_CFLAGS / DEFAULT_ARM_NEON_SOFTFP_INTR_CFLAGS[@:>@]) AS_VAR_SET_IF([X86_SSE_CFLAGS], [], [AS_VAR_SET([X86_SSE_CFLAGS], "DEFAULT_X86_SSE_CFLAGS")]) AS_VAR_SET_IF([X86_SSE2_CFLAGS], [], [AS_VAR_SET([X86_SSE2_CFLAGS], "DEFAULT_X86_SSE2_CFLAGS")]) AS_VAR_SET_IF([X86_SSE4_1_CFLAGS], [], [AS_VAR_SET([X86_SSE4_1_CFLAGS], "DEFAULT_X86_SSE4_1_CFLAGS")]) +AS_VAR_SET_IF([X86_AVX_CFLAGS], [], [AS_VAR_SET([X86_AVX_CFLAGS], "DEFAULT_X86_AVX_CFLAGS")]) AS_VAR_SET_IF([ARM_NEON_INTR_CFLAGS], [], [AS_VAR_SET([ARM_NEON_INTR_CFLAGS], ["$RESOLVED_DEFAULT_ARM_NEON_INTR_CFLAGS"])]) AC_DEFUN([OPUS_PATH_NE10], @@ -566,7 +570,24 @@ AC_SUBST([OPUS_X86_SSE4_1_CFLAGS]) ] ) - + OPUS_CHECK_INTRINSICS( + [AVX], + [$X86_AVX_CFLAGS], + [OPUS_X86_MAY_HAVE_AVX], + [OPUS_X86_PRESUME_AVX], + [[#include <immintrin.h> + ]], + [[ + static __m256 mtest; + mtest = _mm256_setzero_ps(); + ]] + ) + AS_IF([test x"$OPUS_X86_MAY_HAVE_AVX" = x"1" && test x"$OPUS_X86_PRESUME_AVX" != x"1"], + [ + OPUS_X86_AVX_CFLAGS="$X86_AVX_CFLAGS" + AC_SUBST([OPUS_X86_AVX_CFLAGS]) + ] + ) AS_IF([test x"$rtcd_support" = x"no"], [rtcd_support=""]) AS_IF([test x"$OPUS_X86_MAY_HAVE_SSE" = x"1"], [ @@ -606,6 +627,19 @@ [ AC_MSG_WARN([Compiler does not support SSE4.1 intrinsics]) ]) + AS_IF([test x"$OPUS_X86_MAY_HAVE_AVX" = x"1"], + [ + AC_DEFINE([OPUS_X86_MAY_HAVE_AVX], 1, [Compiler supports X86 AVX Intrinsics]) + intrinsics_support="$intrinsics_support AVX" + + AS_IF([test x"$OPUS_X86_PRESUME_AVX" = x"1"], + [AC_DEFINE([OPUS_X86_PRESUME_AVX], 1, [Define if binary requires AVX intrinsics support])], + [rtcd_support="$rtcd_support AVX"]) + ], + [ + AC_MSG_WARN([Compiler does not support AVX intrinsics]) + ]) + AS_IF([test x"$intrinsics_support" = x""], [intrinsics_support=no], [intrinsics_support="x86$intrinsics_support"] @@ -672,6 +706,8 @@ [test x"$OPUS_X86_MAY_HAVE_SSE2" = x"1"]) AM_CONDITIONAL([HAVE_SSE4_1], [test x"$OPUS_X86_MAY_HAVE_SSE4_1" = x"1"]) +AM_CONDITIONAL([HAVE_AVX], + [test x"$OPUS_X86_MAY_HAVE_AVX" = x"1"]) AS_IF([test x"$enable_rtcd" = x"yes"],[ AS_IF([test x"$rtcd_support" != x"no"],[ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/doc/Makefile.in new/opus-1.1.2/doc/Makefile.in --- old/opus-1.1.1/doc/Makefile.in 2015-11-25 21:46:28.000000000 +0100 +++ new/opus-1.1.2/doc/Makefile.in 2016-01-12 19:17:49.000000000 +0100 @@ -189,6 +189,7 @@ OPUS_LT_AGE = @OPUS_LT_AGE@ OPUS_LT_CURRENT = @OPUS_LT_CURRENT@ OPUS_LT_REVISION = @OPUS_LT_REVISION@ +OPUS_X86_AVX_CFLAGS = @OPUS_X86_AVX_CFLAGS@ OPUS_X86_SSE2_CFLAGS = @OPUS_X86_SSE2_CFLAGS@ OPUS_X86_SSE4_1_CFLAGS = @OPUS_X86_SSE4_1_CFLAGS@ OPUS_X86_SSE_CFLAGS = @OPUS_X86_SSE_CFLAGS@ @@ -209,6 +210,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +X86_AVX_CFLAGS = @X86_AVX_CFLAGS@ X86_SSE2_CFLAGS = @X86_SSE2_CFLAGS@ X86_SSE4_1_CFLAGS = @X86_SSE4_1_CFLAGS@ X86_SSE_CFLAGS = @X86_SSE_CFLAGS@ @@ -388,8 +390,8 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@HAVE_DOXYGEN_FALSE@uninstall-local: @HAVE_DOXYGEN_FALSE@clean-local: +@HAVE_DOXYGEN_FALSE@uninstall-local: @HAVE_DOXYGEN_FALSE@install-data-local: clean: clean-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/include/opus_defines.h new/opus-1.1.2/include/opus_defines.h --- old/opus-1.1.1/include/opus_defines.h 2015-10-23 19:17:41.000000000 +0200 +++ new/opus-1.1.2/include/opus_defines.h 2016-01-12 18:17:00.000000000 +0100 @@ -523,10 +523,19 @@ * @hideinitializer */ #define OPUS_GET_DTX(x) OPUS_GET_DTX_REQUEST, __opus_check_int_ptr(x) /** Configures the depth of signal being encoded. + * * This is a hint which helps the encoder identify silence and near-silence. + * It represents the number of significant bits of linear intensity below + * which the signal contains ignorable quantization or other noise. + * + * For example, OPUS_SET_LSB_DEPTH(14) would be an appropriate setting + * for G.711 u-law input. OPUS_SET_LSB_DEPTH(16) would be appropriate + * for 16-bit linear pcm input with opus_encode_float(). + * * When using opus_encode() instead of opus_encode_float(), or when libopus * is compiled for fixed-point, the encoder uses the minimum of the value * set here and the value 16. + * * @see OPUS_GET_LSB_DEPTH * @param[in] x <tt>opus_int32</tt>: Input precision in bits, between 8 and 24 * (default: 24). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/package_version new/opus-1.1.2/package_version --- old/opus-1.1.1/package_version 2015-11-25 21:46:32.000000000 +0100 +++ new/opus-1.1.2/package_version 2016-01-12 19:17:56.000000000 +0100 @@ -1 +1 @@ -PACKAGE_VERSION="1.1.1" +PACKAGE_VERSION="1.1.2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/silk/decode_pulses.c new/opus-1.1.2/silk/decode_pulses.c --- old/opus-1.1.1/silk/decode_pulses.c 2015-04-22 02:22:07.000000000 +0200 +++ new/opus-1.1.2/silk/decode_pulses.c 2016-01-11 21:48:46.000000000 +0100 @@ -69,9 +69,9 @@ sum_pulses[ i ] = ec_dec_icdf( psRangeDec, cdf_ptr, 8 ); /* LSB indication */ - while( sum_pulses[ i ] == MAX_PULSES + 1 ) { + while( sum_pulses[ i ] == SILK_MAX_PULSES + 1 ) { nLshifts[ i ]++; - /* When we've already got 10 LSBs, we shift the table to not allow (MAX_PULSES + 1) */ + /* When we've already got 10 LSBs, we shift the table to not allow (SILK_MAX_PULSES + 1) */ sum_pulses[ i ] = ec_dec_icdf( psRangeDec, silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1] + ( nLshifts[ i ] == 10 ), 8 ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/silk/define.h new/opus-1.1.2/silk/define.h --- old/opus-1.1.1/silk/define.h 2014-02-14 20:54:59.000000000 +0100 +++ new/opus-1.1.2/silk/define.h 2016-01-11 21:48:46.000000000 +0100 @@ -169,7 +169,7 @@ #define N_RATE_LEVELS 10 /* Maximum sum of pulses per shell coding frame */ -#define MAX_PULSES 16 +#define SILK_MAX_PULSES 16 #define MAX_MATRIX_SIZE MAX_LPC_ORDER /* Max of LPC Order and LTP order */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/silk/encode_pulses.c new/opus-1.1.2/silk/encode_pulses.c --- old/opus-1.1.1/silk/encode_pulses.c 2014-02-14 20:54:59.000000000 +0100 +++ new/opus-1.1.2/silk/encode_pulses.c 2016-01-11 21:48:46.000000000 +0100 @@ -142,7 +142,7 @@ sumBits_Q5 = silk_rate_levels_BITS_Q5[ signalType >> 1 ][ k ]; for( i = 0; i < iter; i++ ) { if( nRshifts[ i ] > 0 ) { - sumBits_Q5 += nBits_ptr[ MAX_PULSES + 1 ]; + sumBits_Q5 += nBits_ptr[ SILK_MAX_PULSES + 1 ]; } else { sumBits_Q5 += nBits_ptr[ sum_pulses[ i ] ]; } @@ -162,9 +162,9 @@ if( nRshifts[ i ] == 0 ) { ec_enc_icdf( psRangeEnc, sum_pulses[ i ], cdf_ptr, 8 ); } else { - ec_enc_icdf( psRangeEnc, MAX_PULSES + 1, cdf_ptr, 8 ); + ec_enc_icdf( psRangeEnc, SILK_MAX_PULSES + 1, cdf_ptr, 8 ); for( k = 0; k < nRshifts[ i ] - 1; k++ ) { - ec_enc_icdf( psRangeEnc, MAX_PULSES + 1, silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1 ], 8 ); + ec_enc_icdf( psRangeEnc, SILK_MAX_PULSES + 1, silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1 ], 8 ); } ec_enc_icdf( psRangeEnc, sum_pulses[ i ], silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1 ], 8 ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/silk/tables.h new/opus-1.1.2/silk/tables.h --- old/opus-1.1.1/silk/tables.h 2014-02-14 20:54:59.000000000 +0100 +++ new/opus-1.1.2/silk/tables.h 2016-01-11 21:48:46.000000000 +0100 @@ -47,8 +47,8 @@ extern const opus_uint8 silk_pitch_contour_10_ms_iCDF[ 12 ]; /* 12 */ extern const opus_uint8 silk_pitch_contour_10_ms_NB_iCDF[ 3 ]; /* 3 */ -extern const opus_uint8 silk_pulses_per_block_iCDF[ N_RATE_LEVELS ][ MAX_PULSES + 2 ]; /* 180 */ -extern const opus_uint8 silk_pulses_per_block_BITS_Q5[ N_RATE_LEVELS - 1 ][ MAX_PULSES + 2 ]; /* 162 */ +extern const opus_uint8 silk_pulses_per_block_iCDF[ N_RATE_LEVELS ][ SILK_MAX_PULSES + 2 ]; /* 180 */ +extern const opus_uint8 silk_pulses_per_block_BITS_Q5[ N_RATE_LEVELS - 1 ][ SILK_MAX_PULSES + 2 ]; /* 162 */ extern const opus_uint8 silk_rate_levels_iCDF[ 2 ][ N_RATE_LEVELS - 1 ]; /* 18 */ extern const opus_uint8 silk_rate_levels_BITS_Q5[ 2 ][ N_RATE_LEVELS - 1 ]; /* 18 */ @@ -59,7 +59,7 @@ extern const opus_uint8 silk_shell_code_table1[ 152 ]; /* 152 */ extern const opus_uint8 silk_shell_code_table2[ 152 ]; /* 152 */ extern const opus_uint8 silk_shell_code_table3[ 152 ]; /* 152 */ -extern const opus_uint8 silk_shell_code_table_offsets[ MAX_PULSES + 1 ]; /* 17 */ +extern const opus_uint8 silk_shell_code_table_offsets[ SILK_MAX_PULSES + 1 ]; /* 17 */ extern const opus_uint8 silk_lsb_iCDF[ 2 ]; /* 2 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/silk/x86/x86_silk_map.c new/opus-1.1.2/silk/x86/x86_silk_map.c --- old/opus-1.1.1/silk/x86/x86_silk_map.c 2015-11-25 03:03:10.000000000 +0100 +++ new/opus-1.1.2/silk/x86/x86_silk_map.c 2015-12-30 20:16:21.000000000 +0100 @@ -50,6 +50,7 @@ silk_inner_prod16_aligned_64_c, silk_inner_prod16_aligned_64_c, MAY_HAVE_SSE4_1( silk_inner_prod16_aligned_64 ), /* sse4.1 */ + MAY_HAVE_SSE4_1( silk_inner_prod16_aligned_64 ) /* avx */ }; #endif @@ -62,6 +63,7 @@ silk_VAD_GetSA_Q8_c, silk_VAD_GetSA_Q8_c, MAY_HAVE_SSE4_1( silk_VAD_GetSA_Q8 ), /* sse4.1 */ + MAY_HAVE_SSE4_1( silk_VAD_GetSA_Q8 ) /* avx */ }; void (*const SILK_NSQ_IMPL[ OPUS_ARCHMASK + 1 ] )( @@ -85,6 +87,7 @@ silk_NSQ_c, silk_NSQ_c, MAY_HAVE_SSE4_1( silk_NSQ ), /* sse4.1 */ + MAY_HAVE_SSE4_1( silk_NSQ ) /* avx */ }; void (*const SILK_VQ_WMAT_EC_IMPL[ OPUS_ARCHMASK + 1 ] )( @@ -104,6 +107,7 @@ silk_VQ_WMat_EC_c, silk_VQ_WMat_EC_c, MAY_HAVE_SSE4_1( silk_VQ_WMat_EC ), /* sse4.1 */ + MAY_HAVE_SSE4_1( silk_VQ_WMat_EC ) /* avx */ }; void (*const SILK_NSQ_DEL_DEC_IMPL[ OPUS_ARCHMASK + 1 ] )( @@ -127,6 +131,7 @@ silk_NSQ_del_dec_c, silk_NSQ_del_dec_c, MAY_HAVE_SSE4_1( silk_NSQ_del_dec ), /* sse4.1 */ + MAY_HAVE_SSE4_1( silk_NSQ_del_dec ) /* avx */ }; #if defined(FIXED_POINT) @@ -144,6 +149,7 @@ silk_warped_LPC_analysis_filter_FIX_c, silk_warped_LPC_analysis_filter_FIX_c, MAY_HAVE_SSE4_1( silk_warped_LPC_analysis_filter_FIX ), /* sse4.1 */ + MAY_HAVE_SSE4_1( silk_warped_LPC_analysis_filter_FIX ) /* avx */ }; void (*const SILK_BURG_MODIFIED_IMPL[ OPUS_ARCHMASK + 1 ] )( @@ -161,6 +167,7 @@ silk_burg_modified_c, silk_burg_modified_c, MAY_HAVE_SSE4_1( silk_burg_modified ), /* sse4.1 */ + MAY_HAVE_SSE4_1( silk_burg_modified ) /* avx */ }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/src/analysis.c new/opus-1.1.2/src/analysis.c --- old/opus-1.1.1/src/analysis.c 2015-10-08 00:09:20.000000000 +0200 +++ new/opus-1.1.2/src/analysis.c 2016-01-12 18:16:54.000000000 +0100 @@ -138,6 +138,21 @@ } } +void tonality_analysis_init(TonalityAnalysisState *tonal) +{ + /* Initialize reusable fields. */ + tonal->arch = opus_select_arch(); + /* Clear remaining fields. */ + tonality_analysis_reset(tonal); +} + +void tonality_analysis_reset(TonalityAnalysisState *tonal) +{ + /* Clear non-reusable fields. */ + char *start = (char*)&tonal->TONALITY_ANALYSIS_RESET_START; + OPUS_CLEAR(start, sizeof(TonalityAnalysisState) - (start - (char*)tonal)); +} + void tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int len) { int pos; @@ -187,7 +202,7 @@ info_out->music_prob = psum; } -static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt_mode, const void *x, int len, int offset, int c1, int c2, int C, int lsb_depth, downmix_func downmix, int arch) +static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt_mode, const void *x, int len, int offset, int c1, int c2, int C, int lsb_depth, downmix_func downmix) { int i, b; const kiss_fft_state *kfft; @@ -260,7 +275,7 @@ remaining = len - (ANALYSIS_BUF_SIZE-tonal->mem_fill); downmix(x, &tonal->inmem[240], remaining, offset+ANALYSIS_BUF_SIZE-tonal->mem_fill, c1, c2, C); tonal->mem_fill = 240 + remaining; - opus_fft(kfft, in, out, arch); + opus_fft(kfft, in, out, tonal->arch); #ifndef FIXED_POINT /* If there's any NaN on the input, the entire output will be NaN, so we only need to check one value. */ if (celt_isnan(out[0].r)) @@ -633,7 +648,7 @@ void run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, const void *analysis_pcm, int analysis_frame_size, int frame_size, int c1, int c2, int C, opus_int32 Fs, - int lsb_depth, downmix_func downmix, AnalysisInfo *analysis_info, int arch) + int lsb_depth, downmix_func downmix, AnalysisInfo *analysis_info) { int offset; int pcm_len; @@ -646,7 +661,7 @@ pcm_len = analysis_frame_size - analysis->analysis_offset; offset = analysis->analysis_offset; do { - tonality_analysis(analysis, celt_mode, analysis_pcm, IMIN(480, pcm_len), offset, c1, c2, C, lsb_depth, downmix, arch); + tonality_analysis(analysis, celt_mode, analysis_pcm, IMIN(480, pcm_len), offset, c1, c2, C, lsb_depth, downmix); offset += 480; pcm_len -= 480; } while (pcm_len>0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/src/analysis.h new/opus-1.1.2/src/analysis.h --- old/opus-1.1.1/src/analysis.h 2015-10-08 00:09:20.000000000 +0200 +++ new/opus-1.1.2/src/analysis.h 2016-01-11 21:48:46.000000000 +0100 @@ -39,6 +39,8 @@ #define DETECT_SIZE 200 typedef struct { + int arch; +#define TONALITY_ANALYSIS_RESET_START angle float angle[240]; float d_angle[240]; float d2_angle[240]; @@ -78,10 +80,24 @@ AnalysisInfo info[DETECT_SIZE]; } TonalityAnalysisState; +/** Initialize a TonalityAnalysisState struct. + * + * This performs some possibly slow initialization steps which should + * not be repeated every analysis step. No allocated memory is retained + * by the state struct, so no cleanup call is required. + */ +void tonality_analysis_init(TonalityAnalysisState *analysis); + +/** Reset a TonalityAnalysisState stuct. + * + * Call this when there's a discontinuity in the data. + */ +void tonality_analysis_reset(TonalityAnalysisState *analysis); + void tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int len); void run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, const void *analysis_pcm, int analysis_frame_size, int frame_size, int c1, int c2, int C, opus_int32 Fs, - int lsb_depth, downmix_func downmix, AnalysisInfo *analysis_info, int arch); + int lsb_depth, downmix_func downmix, AnalysisInfo *analysis_info); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/src/opus_decoder.c new/opus-1.1.2/src/opus_decoder.c --- old/opus-1.1.1/src/opus_decoder.c 2015-08-24 00:02:52.000000000 +0200 +++ new/opus-1.1.2/src/opus_decoder.c 2016-01-11 21:48:46.000000000 +0100 @@ -59,6 +59,7 @@ opus_int32 Fs; /** Sampling rate (at the API level) */ silk_DecControlStruct DecControl; int decode_gain; + int arch; /* Everything beyond this point gets cleared on a reset */ #define OPUS_DECODER_RESET_START stream_channels @@ -75,7 +76,6 @@ #endif opus_uint32 rangeFinal; - int arch; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/src/opus_demo.c new/opus-1.1.2/src/opus_demo.c --- old/opus-1.1.1/src/opus_demo.c 2015-08-20 15:43:36.000000000 +0200 +++ new/opus-1.1.2/src/opus_demo.c 2016-01-12 18:16:54.000000000 +0100 @@ -866,7 +866,7 @@ 1e-3*bits_max*sampling_rate/frame_size); if (!decode_only) fprintf (stderr, "active bitrate: %7.3f kb/s\n", - 1e-3*bits_act*sampling_rate/(frame_size*(double)count_act)); + 1e-3*bits_act*sampling_rate/(1e-15+frame_size*(double)count_act)); fprintf (stderr, "bitrate standard deviation: %7.3f kb/s\n", 1e-3*sqrt(bits2/count - bits*bits/(count*(double)count))*sampling_rate/frame_size); /* Close any files to which intermediate results were stored */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/src/opus_encoder.c new/opus-1.1.2/src/opus_encoder.c --- old/opus-1.1.1/src/opus_encoder.c 2015-11-25 03:03:10.000000000 +0100 +++ new/opus-1.1.2/src/opus_encoder.c 2016-01-12 18:16:54.000000000 +0100 @@ -81,6 +81,10 @@ int lsb_depth; int encoder_buffer; int lfe; + int arch; +#ifndef DISABLE_FLOAT_API + TonalityAnalysisState analysis; +#endif #define OPUS_ENCODER_RESET_START stream_channels int stream_channels; @@ -100,12 +104,9 @@ StereoWidthState width_mem; opus_val16 delay_buffer[MAX_ENCODER_BUFFER*2]; #ifndef DISABLE_FLOAT_API - TonalityAnalysisState analysis; int detected_bandwidth; - int analysis_offset; #endif opus_uint32 rangeFinal; - int arch; }; /* Transition tables for the voice and music. First column is the @@ -243,6 +244,10 @@ st->mode = MODE_HYBRID; st->bandwidth = OPUS_BANDWIDTH_FULLBAND; +#ifndef DISABLE_FLOAT_API + tonality_analysis_init(&st->analysis); +#endif + return OPUS_OK; } @@ -1006,7 +1011,7 @@ analysis_read_subframe_bak = st->analysis.read_subframe; run_analysis(&st->analysis, celt_mode, analysis_pcm, analysis_size, frame_size, c1, c2, analysis_channels, st->Fs, - lsb_depth, downmix, &analysis_info, st->arch); + lsb_depth, downmix, &analysis_info); } #else (void)analysis_pcm; @@ -2449,11 +2454,14 @@ { void *silk_enc; silk_EncControlStruct dummy; + char *start; silk_enc = (char*)st+st->silk_enc_offset; +#ifndef DISABLE_FLOAT_API + tonality_analysis_reset(&st->analysis); +#endif - OPUS_CLEAR((char*)&st->OPUS_ENCODER_RESET_START, - sizeof(OpusEncoder)- - ((char*)&st->OPUS_ENCODER_RESET_START - (char*)st)); + start = (char*)&st->OPUS_ENCODER_RESET_START; + OPUS_CLEAR(start, sizeof(OpusEncoder) - (start - (char*)st)); celt_encoder_ctl(celt_enc, OPUS_RESET_STATE); silk_InitEncoder( silk_enc, st->arch, &dummy ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opus-1.1.1/version.mk new/opus-1.1.2/version.mk --- old/opus-1.1.1/version.mk 2015-11-25 03:06:45.000000000 +0100 +++ new/opus-1.1.2/version.mk 2016-01-12 19:14:41.000000000 +0100 @@ -1,2 +1,2 @@ # static version string; update manually every release. -PACKAGE_VERSION = "1.1.1" +PACKAGE_VERSION = "1.1.2"

1 0

commit gnome-keyring for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package gnome-keyring for openSUSE:Factory checked in at 2016-01-23 01:14:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-keyring (Old) and /work/SRC/openSUSE:Factory/.gnome-keyring.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-keyring" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-keyring/gnome-keyring.changes 2015-11-06 00:09:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-keyring.new/gnome-keyring.changes 2016-01-23 01:14:30.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 19 12:01:06 UTC 2016 - dimstar(a)opensuse.org + +- boo#962480: Add mdm as valid display manager to unlock gkr. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-keyring.spec ++++++ --- /var/tmp/diff_new_pack.Ef27lI/_old 2016-01-23 01:14:31.000000000 +0100 +++ /var/tmp/diff_new_pack.Ef27lI/_new 2016-01-23 01:14:31.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-keyring # -# 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 @@ -152,7 +152,7 @@ ### %post pam -%{_sbindir}/pam-config -a --gnome_keyring --gnome_keyring-auto_start --gnome_keyring-only_if=gdm,gdm-password,lxdm,lightdm || true +%{_sbindir}/pam-config -a --gnome_keyring --gnome_keyring-auto_start --gnome_keyring-only_if=gdm,gdm-password,lxdm,lightdm,mdm || true # Remove leftover from the old way, before we used pam-config. We start # cleaning up in 11.2, so this can be removed in 12.2. # Note: this can safely be done after pam-config, since pam-config doesn't

1 0

commit libsecret for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package libsecret for openSUSE:Factory checked in at 2016-01-23 01:14:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-08-25 07:18:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsecret.new/libsecret.changes 2016-01-23 01:14:25.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Jan 19 08:56:19 UTC 2016 - zaitor(a)opensuse.org + +- Update to version 0.18.4: + + Multithreading fixes (bgo#756766). + + Fix memory leaks (bgo#756766). + + Updated translations. + +------------------------------------------------------------------- Old: ---- libsecret-0.18.3.tar.xz New: ---- libsecret-0.18.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsecret.spec ++++++ --- /var/tmp/diff_new_pack.rOxHPK/_old 2016-01-23 01:14:26.000000000 +0100 +++ /var/tmp/diff_new_pack.rOxHPK/_new 2016-01-23 01:14:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libsecret # -# 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 @@ -19,12 +19,12 @@ %define have_lang 1 Name: libsecret -Version: 0.18.3 +Version: 0.18.4 Release: 0 Summary: Library for accessing the Secret Service API License: LGPL-2.1+ Group: System/Libraries -Url: http://www.gnome.org/ +Url: https://wiki.gnome.org/Projects/Libsecret Source0: http://download.gnome.org/sources/libsecret/0.18/%{name}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: docbook-xsl-stylesheets ++++++ libsecret-0.18.3.tar.xz -> libsecret-0.18.4.tar.xz ++++++ ++++ 33201 lines of diff (skipped)

1 0

commit giflib for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package giflib for openSUSE:Factory checked in at 2016-01-23 01:14:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/giflib (Old) and /work/SRC/openSUSE:Factory/.giflib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "giflib" Changes: -------- --- /work/SRC/openSUSE:Factory/giflib/giflib.changes 2015-01-26 16:46:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.giflib.new/giflib.changes 2016-01-23 01:14:24.000000000 +0100 @@ -1,0 +2,34 @@ +Tue Jan 19 12:59:02 UTC 2016 - fstrba(a)suse.com + +- Update to version 5.1.2 (fixes CVE-2015-7555, bsc#960319) + * Code Fixes + + Code hardening using reallocarray() from OpenBSD. + + Sanity check in giffilter catches files with malformed + extension records. Fixes SourceForge bug #63: malformed gif + causes segfault in giffilter. + + Inexpensive sanity check in DGifSlurp() catches malformed files + with no image descriptor. Fixes SourceForge bug #64: malformed + gif causes crash in giftool. + + Fix SourceForge bug #66: GifDrawBoxedText8x8() modifying + constant input parameter. + + Bail out of GIF read on invalid pixel width. Addresses Savannah + bug #67: invalid shift in dgif_lib.c + + Fix SourceForge bug #69: #69 Malformed: Gif file with no + extension block after a GRAPHICS_EXT_FUNC_CODE extension causes + segfault (in giftext). + + Fix SourceForge bug #71: Buffer overwrite when giffixing a + malformed gif. + + Fix SourceForge bug #73: Null pointer deference in gifclrmap + (only reachable with malformed GIF). + + Fix SourceForge bug #74: Double free in gifsponge under 5.1,1, + for any valid gif image. + + Fix SourceForge bug #75: GAGetArgs overflows due to uncounted + use of va_arg. + + Sanity check in giffix catches some malformed files. Addresses + SourceForge bug #77: dgif_lib.c: extension processing error +- Modified patches: + * giflib-automake-1_13.patch + * giflib-visibility.patch + + rediff to changed context + +------------------------------------------------------------------- Old: ---- giflib-5.1.1.tar.bz2 New: ---- giflib-5.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ giflib.spec ++++++ --- /var/tmp/diff_new_pack.miJoBp/_old 2016-01-23 01:14:25.000000000 +0100 +++ /var/tmp/diff_new_pack.miJoBp/_new 2016-01-23 01:14:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package giflib # -# Copyright (c) 2015 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 @@ -18,7 +18,7 @@ %define lname libgif7 Name: giflib -Version: 5.1.1 +Version: 5.1.2 Release: 0 Summary: A Library for Working with GIF Images License: MIT ++++++ giflib-5.1.1.tar.bz2 -> giflib-5.1.2.tar.bz2 ++++++ ++++ 3275 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/NEWS new/giflib-5.1.2/NEWS --- old/giflib-5.1.1/NEWS 2015-01-06 22:52:52.000000000 +0100 +++ new/giflib-5.1.2/NEWS 2016-01-07 13:53:05.000000000 +0100 @@ -1,8 +1,43 @@ GIFLIB NEWS -Short summary of recent news: - Two fixes to prevent library misbehavior in rare failure conditions. - Minor fixes to gifsponge and getarg.c, affacting utilities only. +Version 5.1.2 +============= + +Code Fixes +---------- + +* Code hardening using reallocarray() from OpenBSD. + +* Sanity check in giffilter catches files with malformed extension records + Fixes SourceForge bug #63: malformed gif causes segfault in giffilter. + +* Inexpensive sanity check in DGifSlurp() catches malformed files with + no image descriptor. Fixes SourceForge bug #64: malformed gif causes + crash in giftool. + +* Fix SourceForge bug #66: GifDrawBoxedText8x8() modifying constant input + parameter. + +* Bail out of GIF read on invalid pixel width. Addresses Savannah bug + #67: invalid shift in dgif_lib.c + +* Fix SourceForge bug #69: #69 Malformed: Gif file with no extension + block after a GRAPHICS_EXT_FUNC_CODE extension causes segfault (in + giftext). + +* Fix SourceForge bug #71: Buffer overwrite when giffixing a malformed gif. + +* Fix SourceForge bug #73: Null pointer deference in gifclrmap (only + reachable with malformed GIF). + +* Fix SourceForge bug #74: Double free in gifsponge under 5.1,1, + for any valid gif image. + +* Fix SourceForge bug #75: GAGetArgs overflows due to uncounted use of va_arg. + +* Sanity check in giffix catches some malformed files. Addresses + SourceForge bug #77: dgif_lib.c: extension processing error + Version 5.1.1 ============= @@ -13,7 +48,7 @@ * Numerous minor fixes in getarg.c. Affects only the utilities, not the core library. -* Fix SourceForge bug #59 DGifOpen can segfault if DGifGetScreenDesc fails. +* Fix SourceForge bug #59: DGifOpen can segfault if DGifGetScreenDesc fails. * SourceForge patch #20: In gifalloc, fix usage of realloc() in case of failure. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/ar-lib new/giflib-5.1.2/ar-lib --- old/giflib-5.1.1/ar-lib 1970-01-01 01:00:00.000000000 +0100 +++ new/giflib-5.1.2/ar-lib 2015-07-12 23:04:43.000000000 +0200 @@ -0,0 +1,270 @@ +#! /bin/sh +# Wrapper for Microsoft lib.exe + +me=ar-lib +scriptversion=2012-03-01.08; # UTC + +# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Written by Peter Rosin <peda(a)lysator.liu.se>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-automake(a)gnu.org> or send patches to +# <automake-patches(a)gnu.org>. + + +# func_error message +func_error () +{ + echo "$me: $1" 1>&2 + exit 1 +} + +file_conv= + +# func_file_conv build_file +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv in + mingw) + file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'` + ;; + cygwin) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_at_file at_file operation archive +# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE +# for each of them. +# When interpreting the content of the @FILE, do NOT use func_file_conv, +# since the user would need to supply preconverted file names to +# binutils ar, at least for MinGW. +func_at_file () +{ + operation=$2 + archive=$3 + at_file_contents=`cat "$1"` + eval set x "$at_file_contents" + shift + + for member + do + $AR -NOLOGO $operation:"$member" "$archive" || exit $? + done +} + +case $1 in + '') + func_error "no command. Try '$0 --help' for more information." + ;; + -h | --h*) + cat <<EOF +Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...] + +Members may be specified in a file named with @FILE. +EOF + exit $? + ;; + -v | --v*) + echo "$me, version $scriptversion" + exit $? + ;; +esac + +if test $# -lt 3; then + func_error "you must specify a program, an action and an archive" +fi + +AR=$1 +shift +while : +do + if test $# -lt 2; then + func_error "you must specify a program, an action and an archive" + fi + case $1 in + -lib | -LIB \ + | -ltcg | -LTCG \ + | -machine* | -MACHINE* \ + | -subsystem* | -SUBSYSTEM* \ + | -verbose | -VERBOSE \ + | -wx* | -WX* ) + AR="$AR $1" + shift + ;; + *) + action=$1 + shift + break + ;; + esac +done +orig_archive=$1 +shift +func_file_conv "$orig_archive" +archive=$file + +# strip leading dash in $action +action=${action#-} + +delete= +extract= +list= +quick= +replace= +index= +create= + +while test -n "$action" +do + case $action in + d*) delete=yes ;; + x*) extract=yes ;; + t*) list=yes ;; + q*) quick=yes ;; + r*) replace=yes ;; + s*) index=yes ;; + S*) ;; # the index is always updated implicitly + c*) create=yes ;; + u*) ;; # TODO: don't ignore the update modifier + v*) ;; # TODO: don't ignore the verbose modifier + *) + func_error "unknown action specified" + ;; + esac + action=${action#?} +done + +case $delete$extract$list$quick$replace,$index in + yes,* | ,yes) + ;; + yesyes*) + func_error "more than one action specified" + ;; + *) + func_error "no action specified" + ;; +esac + +if test -n "$delete"; then + if test ! -f "$orig_archive"; then + func_error "archive not found" + fi + for member + do + case $1 in + @*) + func_at_file "${1#@}" -REMOVE "$archive" + ;; + *) + func_file_conv "$1" + $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $? + ;; + esac + done + +elif test -n "$extract"; then + if test ! -f "$orig_archive"; then + func_error "archive not found" + fi + if test $# -gt 0; then + for member + do + case $1 in + @*) + func_at_file "${1#@}" -EXTRACT "$archive" + ;; + *) + func_file_conv "$1" + $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $? + ;; + esac + done + else + $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member + do + $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? + done + fi + +elif test -n "$quick$replace"; then + if test ! -f "$orig_archive"; then + if test -z "$create"; then + echo "$me: creating $orig_archive" + fi + orig_archive= + else + orig_archive=$archive + fi + + for member + do + case $1 in + @*) + func_file_conv "${1#@}" + set x "$@" "@$file" + ;; + *) + func_file_conv "$1" + set x "$@" "$file" + ;; + esac + shift + shift + done + + if test -n "$orig_archive"; then + $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $? + else + $AR -NOLOGO -OUT:"$archive" "$@" || exit $? + fi + +elif test -n "$list"; then + if test ! -f "$orig_archive"; then + func_error "archive not found" + fi + $AR -NOLOGO -LIST "$archive" || exit $? +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/build.asc new/giflib-5.1.2/build.asc --- old/giflib-5.1.1/build.asc 2014-05-16 12:46:53.000000000 +0200 +++ new/giflib-5.1.2/build.asc 2016-01-07 04:30:00.000000000 +0100 @@ -61,19 +61,19 @@ 1. Check the SourceForge tracker for bugs and patches. -2. The version needs to be bumped in two places, configure.ac +2. Run a Coverity scan before shipping. + +3. The version needs to be bumped in two places, configure.ac and lib/gif_lib.h. -3. Version-stamp the top entry in the NEWS file. +4. Version-stamp the top entry in the NEWS file. -4. The shared-library version is also set in configure.ac and must - be bumped is object or source-API compastibility changes. +5. The shared-library version is also set in configure.ac and must + be bumped if object or source-API compatibility changes. -5. If you are changing major versions, sync the XBS-SourceForge-Folder +6. If you are changing major versions, sync the XBS-SourceForge-Folder attribute in the control file. -6. Run a Coverity scan before shipping. - 7. 'make distcheck' to verify the build and make a tarball. 8. Tag the release in the repo. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/compile new/giflib-5.1.2/compile --- old/giflib-5.1.1/compile 2014-01-02 20:14:59.000000000 +0100 +++ new/giflib-5.1.2/compile 2015-07-12 23:04:43.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/configure.ac new/giflib-5.1.2/configure.ac --- old/giflib-5.1.1/configure.ac 2015-01-06 22:53:44.000000000 +0100 +++ new/giflib-5.1.2/configure.ac 2016-01-07 13:51:33.000000000 +0100 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(giflib, [5.1.1], [esr(a)thyrsus.com], giflib) +AC_INIT(giflib, [5.1.2], [esr(a)thyrsus.com], giflib) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([lib/dgif_lib.c]) AM_INIT_AUTOMAKE([gnu dist-bzip2 -Wall]) @@ -11,6 +11,7 @@ AM_CONFIG_HEADER(config.h) dnl Checks for programs. +AM_PROG_AR AC_PROG_LIBTOOL AC_PROG_CC AC_PROG_CPP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/control new/giflib-5.1.2/control --- old/giflib-5.1.1/control 2014-12-09 16:15:06.000000000 +0100 +++ new/giflib-5.1.2/control 2015-04-04 18:51:55.000000000 +0200 @@ -16,4 +16,4 @@ XBS-VC-Tag-Template: %(version)s -#XBS-Freecode-Tags: GIF, graphics +#XBS-Project-Tags: GIF, graphics diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/history.asc new/giflib-5.1.2/history.asc --- old/giflib-5.1.1/history.asc 2014-05-16 12:46:53.000000000 +0200 +++ new/giflib-5.1.2/history.asc 2015-05-28 06:33:34.000000000 +0200 @@ -21,9 +21,9 @@ (also the tools icon2gif, gifovly, and gifcompose; the last was removed in 5.0). -ESR's Unix port was incorporated into the NCSA/Netscape browser in -1994, which is how GIF became (with JPEG) one of the two most popular -image formats on the early Web. +ESR's Unix port was incorporated into the NCSA Mosaic browser in 1994, +which is how GIF became (with JPEG) one of the two most popular image +formats on the early Web. Beginning around 1993, patent claims by Unisys over the LZW compression method used in GIF theatened adverse legal consequences diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/lib/Makefile.am new/giflib-5.1.2/lib/Makefile.am --- old/giflib-5.1.1/lib/Makefile.am 2014-05-16 12:46:53.000000000 +0200 +++ new/giflib-5.1.2/lib/Makefile.am 2015-05-28 07:04:08.000000000 +0200 @@ -12,6 +12,7 @@ gif_hash.c \ gif_hash.h \ gifalloc.c \ + openbsd-reallocarray.c \ gif_err.c \ gif_lib_private.h \ quantize.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/lib/dgif_lib.c new/giflib-5.1.2/lib/dgif_lib.c --- old/giflib-5.1.1/lib/dgif_lib.c 2015-01-04 10:59:46.000000000 +0100 +++ new/giflib-5.1.2/lib/dgif_lib.c 2016-01-07 11:44:44.000000000 +0100 @@ -392,8 +392,8 @@ if (GifFile->SavedImages) { SavedImage* new_saved_images = - (SavedImage *)realloc(GifFile->SavedImages, - sizeof(SavedImage) * (GifFile->ImageCount + 1)); + (SavedImage *)reallocarray(GifFile->SavedImages, + (GifFile->ImageCount + 1), sizeof(SavedImage)); if (new_saved_images == NULL) { GifFile->Error = D_GIF_ERR_NOT_ENOUGH_MEM; return GIF_ERROR; @@ -763,6 +763,12 @@ } BitsPerPixel = CodeSize; + /* this can only happen on a severely malformed GIF */ + if (BitsPerPixel > 8 || Private->RunningBits > 32) { + GifFile->Error = D_GIF_ERR_READ_FAILED; /* somewhat bogus error code */ + return GIF_ERROR; /* Failed to read Code size. */ + } + Private->Buf[0] = 0; /* Input Buffer empty. */ Private->BitsPerPixel = BitsPerPixel; Private->ClearCode = (1 << BitsPerPixel); @@ -1098,7 +1104,7 @@ if (ImageSize > (SIZE_MAX / sizeof(GifPixelType))) { return GIF_ERROR; } - sp->RasterBits = (unsigned char *)malloc(ImageSize * + sp->RasterBits = (unsigned char *)reallocarray(NULL, ImageSize, sizeof(GifPixelType)); if (sp->RasterBits == NULL) { @@ -1170,6 +1176,12 @@ } } while (RecordType != TERMINATE_RECORD_TYPE); + /* Sanity check for corrupted file */ + if (GifFile->ImageCount == 0) { + GifFile->Error = D_GIF_ERR_NO_IMAG_DSCR; + return(GIF_ERROR); + } + return (GIF_OK); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/lib/gif_font.c new/giflib-5.1.2/lib/gif_font.c --- old/giflib-5.1.1/lib/gif_font.c 2014-05-16 12:46:53.000000000 +0200 +++ new/giflib-5.1.2/lib/gif_font.c 2016-01-05 23:44:33.000000000 +0100 @@ -5,6 +5,7 @@ ****************************************************************************/ #include <string.h> +#include <stdlib.h> #include "gif_lib.h" @@ -209,8 +210,9 @@ const int border, const int bg, const int fg) { - int i, j = 0, LineCount = 0, TextWidth = 0; + int j = 0, LineCount = 0, TextWidth = 0; const char *cp; + char *dup; /* compute size of text to box */ for (cp = legend; *cp; cp++) @@ -225,28 +227,33 @@ if (j > TextWidth) /* last line might be longer than any previous */ TextWidth = j; - /* fill the box */ - GifDrawRectangle(Image, x + 1, y + 1, - border + TextWidth * GIF_FONT_WIDTH + border - 1, - border + LineCount * GIF_FONT_HEIGHT + border - 1, bg); - /* draw the text */ - i = 0; - cp = strtok((char *)legend, "\r\n"); - do { - int leadspace = 0; - - if (cp[0] == '\t') - leadspace = (TextWidth - strlen(++cp)) / 2; - - GifDrawText8x8(Image, x + border + (leadspace * GIF_FONT_WIDTH), - y + border + (GIF_FONT_HEIGHT * i++), cp, fg); - cp = strtok((char *)NULL, "\r\n"); - } while (cp); - - /* outline the box */ - GifDrawBox(Image, x, y, border + TextWidth * GIF_FONT_WIDTH + border, - border + LineCount * GIF_FONT_HEIGHT + border, fg); + dup = malloc(strlen(legend)+1); + /* FIXME: should return bad status, but that would require API change */ + if (dup != NULL) { + int i = 0; + /* fill the box */ + GifDrawRectangle(Image, x + 1, y + 1, + border + TextWidth * GIF_FONT_WIDTH + border - 1, + border + LineCount * GIF_FONT_HEIGHT + border - 1, bg); + (void)strcpy(dup, (char *)legend); + cp = strtok((char *)dup, "\r\n"); + do { + int leadspace = 0; + + if (cp[0] == '\t') + leadspace = (TextWidth - strlen(++cp)) / 2; + + GifDrawText8x8(Image, x + border + (leadspace * GIF_FONT_WIDTH), + y + border + (GIF_FONT_HEIGHT * i++), cp, fg); + cp = strtok((char *)NULL, "\r\n"); + } while (cp); + (void)free((void *)dup); + + /* outline the box */ + GifDrawBox(Image, x, y, border + TextWidth * GIF_FONT_WIDTH + border, + border + LineCount * GIF_FONT_HEIGHT + border, fg); + } } /* end */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/lib/gif_lib.h new/giflib-5.1.2/lib/gif_lib.h --- old/giflib-5.1.1/lib/gif_lib.h 2015-01-06 22:54:09.000000000 +0100 +++ new/giflib-5.1.2/lib/gif_lib.h 2016-01-07 13:51:53.000000000 +0100 @@ -13,7 +13,7 @@ #define GIFLIB_MAJOR 5 #define GIFLIB_MINOR 1 -#define GIFLIB_RELEASE 1 +#define GIFLIB_RELEASE 2 #define GIF_ERROR 0 #define GIF_OK 1 @@ -244,6 +244,9 @@ GifPixelType ColorTransIn2[]); extern int GifBitSize(int n); +extern void * +reallocarray(void *optr, size_t nmemb, size_t size); + /****************************************************************************** Support for the in-core structures allocation (slurp mode). ******************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/lib/gifalloc.c new/giflib-5.1.2/lib/gifalloc.c --- old/giflib-5.1.1/lib/gifalloc.c 2015-01-04 10:59:46.000000000 +0100 +++ new/giflib-5.1.2/lib/gifalloc.c 2015-07-13 06:05:46.000000000 +0200 @@ -188,8 +188,8 @@ /* perhaps we can shrink the map? */ if (RoundUpTo < ColorUnion->ColorCount) { - GifColorType *new_map = (GifColorType *)realloc(Map, - sizeof(GifColorType) * RoundUpTo); + GifColorType *new_map = (GifColorType *)reallocarray(Map, + RoundUpTo, sizeof(GifColorType)); if( new_map == NULL ) { GifFreeMapObject(ColorUnion); return ((ColorMapObject *) NULL); @@ -232,9 +232,9 @@ if (*ExtensionBlocks == NULL) *ExtensionBlocks=(ExtensionBlock *)malloc(sizeof(ExtensionBlock)); else { - ExtensionBlock* ep_new = (ExtensionBlock *)realloc(*ExtensionBlocks, - sizeof(ExtensionBlock) * - (*ExtensionBlockCount + 1)); + ExtensionBlock* ep_new = (ExtensionBlock *)reallocarray + (*ExtensionBlocks, (*ExtensionBlockCount + 1), + sizeof(ExtensionBlock)); if( ep_new == NULL ) return (GIF_ERROR); *ExtensionBlocks = ep_new; @@ -325,8 +325,8 @@ if (GifFile->SavedImages == NULL) GifFile->SavedImages = (SavedImage *)malloc(sizeof(SavedImage)); else - GifFile->SavedImages = (SavedImage *)realloc(GifFile->SavedImages, - sizeof(SavedImage) * (GifFile->ImageCount + 1)); + GifFile->SavedImages = (SavedImage *)reallocarray(GifFile->SavedImages, + (GifFile->ImageCount + 1), sizeof(SavedImage)); if (GifFile->SavedImages == NULL) return ((SavedImage *)NULL); @@ -355,9 +355,10 @@ } /* next, the raster */ - sp->RasterBits = (unsigned char *)malloc(sizeof(GifPixelType) * - CopyFrom->ImageDesc.Height * - CopyFrom->ImageDesc.Width); + sp->RasterBits = (unsigned char *)reallocarray(NULL, + (CopyFrom->ImageDesc.Height * + CopyFrom->ImageDesc.Width), + sizeof(GifPixelType)); if (sp->RasterBits == NULL) { FreeLastSavedImage(GifFile); return (SavedImage *)(NULL); @@ -368,9 +369,9 @@ /* finally, the extension blocks */ if (sp->ExtensionBlocks != NULL) { - sp->ExtensionBlocks = (ExtensionBlock *)malloc( - sizeof(ExtensionBlock) * - CopyFrom->ExtensionBlockCount); + sp->ExtensionBlocks = (ExtensionBlock *)reallocarray(NULL, + CopyFrom->ExtensionBlockCount, + sizeof(ExtensionBlock)); if (sp->ExtensionBlocks == NULL) { FreeLastSavedImage(GifFile); return (SavedImage *)(NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/lib/openbsd-reallocarray.c new/giflib-5.1.2/lib/openbsd-reallocarray.c --- old/giflib-5.1.1/lib/openbsd-reallocarray.c 1970-01-01 01:00:00.000000000 +0100 +++ new/giflib-5.1.2/lib/openbsd-reallocarray.c 2015-05-28 06:56:37.000000000 +0200 @@ -0,0 +1,38 @@ +/* $OpenBSD: reallocarray.c,v 1.1 2014/05/08 21:43:49 deraadt Exp $ */ +/* + * Copyright (c) 2008 Otto Moerbeek <otto(a)drijf.net> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <sys/types.h> +#include <errno.h> +#include <stdint.h> +#include <stdlib.h> + +/* + * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX + * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW + */ +#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4)) + +void * +reallocarray(void *optr, size_t nmemb, size_t size) +{ + if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && + nmemb > 0 && SIZE_MAX / nmemb < size) { + errno = ENOMEM; + return NULL; + } + return realloc(optr, size * nmemb); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/missing new/giflib-5.1.2/missing --- old/giflib-5.1.1/missing 2014-01-02 20:14:59.000000000 +0100 +++ new/giflib-5.1.2/missing 2015-07-12 23:04:43.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/test-driver new/giflib-5.1.2/test-driver --- old/giflib-5.1.1/test-driver 2014-01-02 20:14:59.000000000 +0100 +++ new/giflib-5.1.2/test-driver 2015-07-12 23:04:43.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2013-07-13.22; # UTC -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -106,11 +106,14 @@ # Test script is run here. "$@" >$log_file 2>&1 estatus=$? + if test $enable_hard_errors = no && test $estatus -eq 99; then - estatus=1 + tweaked_estatus=1 +else + tweaked_estatus=$estatus fi -case $estatus:$expect_failure in +case $tweaked_estatus:$expect_failure in 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; 0:*) col=$grn res=PASS recheck=no gcopy=no;; 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; @@ -119,6 +122,12 @@ *:*) col=$red res=FAIL recheck=yes gcopy=yes;; esac +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + # Report outcome to console. echo "${col}${res}${std}: $test_name" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/util/getarg.c new/giflib-5.1.2/util/getarg.c --- old/giflib-5.1.1/util/getarg.c 2014-10-30 02:22:53.000000000 +0100 +++ new/giflib-5.1.2/util/getarg.c 2016-01-07 13:44:03.000000000 +0100 @@ -172,8 +172,9 @@ va_list ap; strncpy(CtrlStrCopy, CtrlStr, sizeof(CtrlStrCopy)-1); + GASetParamCount(CtrlStr, strlen(CtrlStr), &ParamCount); va_start(ap, CtrlStr); - for (i = 1; i <= MAX_PARAM; i++) + for (i = 1; i <= ParamCount; i++) Parameters[i - 1] = va_arg(ap, void *); va_end(ap); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/util/gifclrmp.c new/giflib-5.1.2/util/gifclrmp.c --- old/giflib-5.1.1/util/gifclrmp.c 2014-05-16 12:46:53.000000000 +0200 +++ new/giflib-5.1.2/util/gifclrmp.c 2016-01-06 06:41:27.000000000 +0100 @@ -127,6 +127,8 @@ if (!ImageNFlag) { /* We are supposed to modify the screen color map, so do it: */ + if (!GifFileIn->SColorMap) + GIF_EXIT("No colormap to modify"); GifFileIn->SColorMap = ModifyColorMap(GifFileIn->SColorMap); if (!HasGIFOutput) { /* We can quit here, as we have the color map: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/util/giffilter.c new/giflib-5.1.2/util/giffilter.c --- old/giflib-5.1.1/util/giffilter.c 2014-05-16 12:46:53.000000000 +0200 +++ new/giflib-5.1.2/util/giffilter.c 2015-01-31 18:06:43.000000000 +0100 @@ -107,7 +107,7 @@ break; case EXTENSION_RECORD_TYPE: /* pass through extension records */ - if (DGifGetExtension(GifFileIn, &ExtCode, &Extension) == GIF_ERROR) + if (DGifGetExtension(GifFileIn, &ExtCode, &Extension) == GIF_ERROR || Extension == NULL) QuitGifError(GifFileIn, GifFileOut); if (EGifPutExtensionLeader(GifFileOut, ExtCode) == GIF_ERROR) QuitGifError(GifFileIn, GifFileOut); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/util/giffix.c new/giflib-5.1.2/util/giffix.c --- old/giflib-5.1.1/util/giffix.c 2014-05-16 12:46:53.000000000 +0200 +++ new/giflib-5.1.2/util/giffix.c 2016-01-07 12:08:12.000000000 +0100 @@ -112,6 +112,8 @@ Height = GifFileIn->Image.Height; GifQprintf("\n%s: Image %d at (%d, %d) [%dx%d]: ", PROGRAM_NAME, ++ImageNum, Col, Row, Width, Height); + if (Width > GifFileIn->SWidth) + GIF_EXIT("Image is wider than total"); /* Put the image descriptor to out file: */ if (EGifPutImageDesc(GifFileOut, Col, Row, Width, Height, @@ -158,10 +160,11 @@ QuitGifError(GifFileIn, GifFileOut); if (EGifPutExtensionLeader(GifFileOut, ExtCode) == GIF_ERROR) QuitGifError(GifFileIn, GifFileOut); - if (EGifPutExtensionBlock(GifFileOut, + if (Extension != NULL) + if (EGifPutExtensionBlock(GifFileOut, Extension[0], Extension + 1) == GIF_ERROR) - QuitGifError(GifFileIn, GifFileOut); + QuitGifError(GifFileIn, GifFileOut); while (Extension != NULL) { if (DGifGetExtensionNext(GifFileIn, &Extension)==GIF_ERROR) QuitGifError(GifFileIn, GifFileOut); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/util/gifinto.c new/giflib-5.1.2/util/gifinto.c --- old/giflib-5.1.1/util/gifinto.c 2014-05-16 12:46:53.000000000 +0200 +++ new/giflib-5.1.2/util/gifinto.c 2016-01-06 00:07:24.000000000 +0100 @@ -70,6 +70,7 @@ ******************************************************************************/ int main(int argc, char **argv) { + int FD; int NumFiles; bool Error, MinSizeFlag = false, HelpFlag = false; char **FileName = NULL, FoutTmpName[STRLEN], FullPath[STRLEN], *p; @@ -126,7 +127,6 @@ /* then add a name for the tempfile */ if ( (strlen(FoutTmpName) + strlen(DEFAULT_TMP_NAME)) > STRLEN-1 ) GIF_EXIT("Filename too long."); strcat(FoutTmpName, DEFAULT_TMP_NAME); - int FD; #ifdef _WIN32 char *tmpFN = _mktemp(FoutTmpName); if (tmpFN) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/util/gifsponge.c new/giflib-5.1.2/util/gifsponge.c --- old/giflib-5.1.1/util/gifsponge.c 2014-12-22 22:30:05.000000000 +0100 +++ new/giflib-5.1.2/util/gifsponge.c 2016-01-06 06:59:50.000000000 +0100 @@ -54,9 +54,13 @@ GifFileOut->SHeight = GifFileIn->SHeight; GifFileOut->SColorResolution = GifFileIn->SColorResolution; GifFileOut->SBackGroundColor = GifFileIn->SBackGroundColor; - GifFileOut->SColorMap = GifMakeMapObject( - GifFileIn->SColorMap->ColorCount, - GifFileIn->SColorMap->Colors); + if (GifFileIn->SColorMap) { + GifFileOut->SColorMap = GifMakeMapObject( + GifFileIn->SColorMap->ColorCount, + GifFileIn->SColorMap->Colors); + } else { + GifFileOut->SColorMap = NULL; + } for (i = 0; i < GifFileIn->ImageCount; i++) (void) GifMakeSavedImage(GifFileOut, &GifFileIn->SavedImages[i]); @@ -74,8 +78,6 @@ if (DGifCloseFile(GifFileIn, &ErrorCode) == GIF_ERROR) PrintGifError(ErrorCode); - if (EGifCloseFile(GifFileOut, &ErrorCode) == GIF_ERROR) - PrintGifError(ErrorCode); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-5.1.1/util/giftext.c new/giflib-5.1.2/util/giftext.c --- old/giflib-5.1.1/util/giftext.c 2014-05-16 12:46:53.000000000 +0200 +++ new/giflib-5.1.2/util/giftext.c 2016-01-07 13:34:42.000000000 +0100 @@ -259,6 +259,12 @@ if (ExtCode == GRAPHICS_EXT_FUNC_CODE) { GraphicsControlBlock gcb; + if (Extension == NULL) { + printf("Invalid extension block\n"); + GifFile->Error = D_GIF_ERR_IMAGE_DEFECT; + PrintGifError(GifFile->Error); + exit(EXIT_FAILURE); + } if (DGifExtensionToGCB(Extension[0], Extension+1, &gcb) == GIF_ERROR) { PrintGifError(GifFile->Error); exit(EXIT_FAILURE); ++++++ giflib-automake-1_13.patch ++++++ --- /var/tmp/diff_new_pack.miJoBp/_old 2016-01-23 01:14:25.000000000 +0100 +++ /var/tmp/diff_new_pack.miJoBp/_new 2016-01-23 01:14:25.000000000 +0100 @@ -1,10 +1,6 @@ -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -5,11 +5,11 @@ AM_INIT_AUTOMAKE([gnu dist-bzip2 -Wall]) - dnl Make builds less verbose. Shuts off Makefile portability checks. - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +--- giflib-5.1.2/configure.ac 2016-01-19 13:55:58.238147631 +0100 ++++ giflib-5.1.2/configure.ac 2016-01-19 13:56:31.165397666 +0100 +@@ -8,7 +8,7 @@ dnl Note: config.h is not used in the current build dnl We leave this in place only to suppress an error message at autogen time @@ -13,5 +9,3 @@ AC_CONFIG_MACRO_DIR([m4]) dnl Checks for programs. - AC_PROG_CC_STDC - AC_USE_SYSTEM_EXTENSIONS ++++++ giflib-visibility.patch ++++++ --- /var/tmp/diff_new_pack.miJoBp/_old 2016-01-23 01:14:25.000000000 +0100 +++ /var/tmp/diff_new_pack.miJoBp/_new 2016-01-23 01:14:25.000000000 +0100 @@ -1,20 +1,13 @@ ---- - configure.ac | 7 +++++-- - lib/gif_hash.h | 4 ++++ - lib/gif_lib_private.h | 3 +++ - 3 files changed, 12 insertions(+), 2 deletions(-) - -Index: giflib-5.0.4/configure.ac -=================================================================== ---- giflib-5.0.4.orig/configure.ac -+++ giflib-5.0.4/configure.ac -@@ -8,11 +8,14 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R +--- giflib-5.1.2/configure.ac 2016-01-07 13:51:33.000000000 +0100 ++++ giflib-5.1.2/configure.ac 2016-01-19 13:54:45.119812921 +0100 +@@ -9,12 +9,15 @@ dnl Note: config.h is not used in the current build dnl We leave this in place only to suppress an error message at autogen time AM_CONFIG_HEADER(config.h) +AC_CONFIG_MACRO_DIR([m4]) dnl Checks for programs. + AM_PROG_AR -AC_PROG_LIBTOOL -AC_PROG_CC +AC_PROG_CC_STDC @@ -25,11 +18,9 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET -Index: giflib-5.0.4/lib/gif_hash.h -=================================================================== ---- giflib-5.0.4.orig/lib/gif_hash.h -+++ giflib-5.0.4/lib/gif_hash.h -@@ -25,6 +25,8 @@ gif_hash.h - magfic constants and declar +--- giflib-5.1.2/lib/gif_hash.h 2014-05-16 12:46:53.000000000 +0200 ++++ giflib-5.1.2/lib/gif_hash.h 2016-01-19 13:54:45.119812921 +0100 +@@ -25,6 +25,8 @@ #define HT_PUT_KEY(l) (l << 12) #define HT_PUT_CODE(l) (l & 0x0FFF) @@ -38,7 +29,7 @@ typedef struct GifHashTableType { uint32_t HTable[HT_SIZE]; } GifHashTableType; -@@ -34,6 +36,8 @@ void _ClearHashTable(GifHashTableType *H +@@ -34,6 +36,8 @@ void _InsertHashTable(GifHashTableType *HashTable, uint32_t Key, int Code); int _ExistsHashTable(GifHashTableType *HashTable, uint32_t Key); @@ -47,11 +38,9 @@ #endif /* _GIF_HASH_H_ */ /* end */ -Index: giflib-5.0.4/lib/gif_lib_private.h -=================================================================== ---- giflib-5.0.4.orig/lib/gif_lib_private.h -+++ giflib-5.0.4/lib/gif_lib_private.h -@@ -29,6 +29,8 @@ gif_lib_private.h - internal giflib rout +--- giflib-5.1.2/lib/gif_lib_private.h 2014-05-16 12:46:53.000000000 +0200 ++++ giflib-5.1.2/lib/gif_lib_private.h 2016-01-19 13:54:45.119812921 +0100 +@@ -29,6 +29,8 @@ #define IS_READABLE(Private) (Private->FileState & FILE_STATE_READ) #define IS_WRITEABLE(Private) (Private->FileState & FILE_STATE_WRITE) @@ -60,7 +49,7 @@ typedef struct GifFilePrivateType { GifWord FileState, FileHandle, /* Where all this data goes to! */ BitsPerPixel, /* Bits per pixel (Codes uses at least this + 1). */ -@@ -54,6 +56,7 @@ typedef struct GifFilePrivateType { +@@ -54,6 +56,7 @@ bool gif89; } GifFilePrivateType;

1 0

commit MozillaThunderbird for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:Factory checked in at 2016-01-23 01:14:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaThunderbird (Old) and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaThunderbird" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaThunderbird/MozillaThunderbird.changes 2016-01-05 09:41:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/MozillaThunderbird.changes 2016-01-23 01:14:16.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 18 07:32:51 UTC 2016 - olaf(a)aepfle.de + +- Add build conditionals for valgrind and -Os +- Convert existing conditions for kde to bcond + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ --- /var/tmp/diff_new_pack.exIG3W/_old 2016-01-23 01:14:23.000000000 +0100 +++ /var/tmp/diff_new_pack.exIG3W/_new 2016-01-23 01:14:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package MozillaThunderbird # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # 2006-2015 Wolfgang Rosenauer <wr(a)rosenauer.org> # # All modifications and additions to the file contributed by third parties @@ -29,7 +29,9 @@ %endif %endif -%define with_kde 1 +%bcond_without mozilla_tb_kde4 +%bcond_with mozilla_tb_valgrind +%bcond_without mozilla_tb_optimize_for_size Name: MozillaThunderbird BuildRequires: Mesa-devel @@ -54,6 +56,9 @@ BuildRequires: yasm BuildRequires: zip BuildRequires: pkgconfig(libpulse) +%if %{with mozilla_tb_valgrind} +BuildRequires: pkgconfig(valgrind) +%endif %if %suse_version > 1210 BuildRequires: pkgconfig(gstreamer-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver) @@ -74,7 +79,7 @@ Provides: thunderbird = %{version} Provides: appdata() Provides: appdata(thunderbird.appdata.xml) -%if %{with_kde} +%if %{with mozilla_tb_kde4} # this is needed to match this package with the kde4 helper package without the main package # having a hard requirement on the kde4 package %define kde_helper_version 6 @@ -194,7 +199,7 @@ pushd mozilla %patch1 -p1 %patch2 -p1 -%if %{with_kde} +%if %{with mozilla_tb_kde4} %patch3 -p1 %endif %patch4 -p1 @@ -212,7 +217,7 @@ TIME="\"$(date -d "${modified}" "+%%R")\"" find . -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} + # -%if %{with_kde} +%if %{with mozilla_tb_kde4} kdehelperversion=$(cat mozilla/toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3) if test "$kdehelperversion" != %{kde_helper_version}; then echo fix kde helper version in the .spec file @@ -226,7 +231,10 @@ %if %{update_channel} == "esr" export MOZ_ESR=1 %endif -export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +%if %{with mozilla_tb_optimize_for_size} +export CFLAGS="$CFLAGS -Os" +%endif %ifarch ppc64 ppc64le export CFLAGS="$CFLAGS -mminimal-toc" %endif @@ -281,6 +289,10 @@ %ifarch %arm ac_add_options --disable-neon %endif +%if %{with mozilla_tb_valgrind} +ac_add_options --disable-jemalloc +ac_add_options --enable-valgrind +%endif EOF make -f client.mk build @@ -291,7 +303,7 @@ mkdir -p $RPM_BUILD_ROOT%{progdir} cp -rf $RPM_BUILD_DIR/obj/dist/thunderbird/* \ $RPM_BUILD_ROOT%{progdir} -%if %{with_kde} +%if %{with mozilla_tb_kde4} # install kde.js install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{progdir}/defaults/pref/kde.js # make sure that instantApply is true by default

1 0

commit libetonyek for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package libetonyek for openSUSE:Factory checked in at 2016-01-23 01:14:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libetonyek (Old) and /work/SRC/openSUSE:Factory/.libetonyek.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libetonyek" Changes: -------- --- /work/SRC/openSUSE:Factory/libetonyek/libetonyek.changes 2015-07-02 22:46:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libetonyek.new/libetonyek.changes 2016-01-23 01:14:11.000000000 +0100 @@ -1,0 +2,34 @@ +Wed Jan 13 17:28:48 UTC 2016 - fstrba(a)suse.com + +- Version bump to 0.1.6: + * All formats: + + Improved handling of text language, e.g., written language + props now include country and script. + * Keynote 6: + + Parse links. + + Parse text language. + + Parse lists (bullets). + + Resize tables properly. + + Fix handling of texts containing non-ASCII characters (i.e., + the majority of non-English languages). + * Miscellaneous: + + Fix build with boost 1.54/1.55. + + Make help output of conversion tools more help2man-friendly. + + Fix build with recent clang, which does not like 'register' + keyword. + + Various small fixes and improvements. + * Changes to 0.1.5 + + Parse slide background. + + Parse shape style: fill, line stroke, opacity, shadow. + + Parse table style: default cell borders, background etc. + + Various fixes and improvements. + * Changes to 0.1.4 + * Parse formulas. + * Parse cell type and number format. + * Require mdds 1.0 by default (but 0.12.1 is still supported). + * Add support for Keynote 6. Imported features include: shapes, + images, text + text formatting, presentation notes, tables + (only simple tables are supported.) +- Generate manpages for the conversion tools + +------------------------------------------------------------------- Old: ---- libetonyek-0.1.3.tar.xz New: ---- libetonyek-0.1.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libetonyek.spec ++++++ --- /var/tmp/diff_new_pack.gsFi0I/_old 2016-01-23 01:14:12.000000000 +0100 +++ /var/tmp/diff_new_pack.gsFi0I/_new 2016-01-23 01:14:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libetonyek # -# 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 @@ -18,7 +18,7 @@ %define libname libetonyek-0_1-1 Name: libetonyek -Version: 0.1.3 +Version: 0.1.6 Release: 0 Summary: Library for Apple Keynote presentations License: MPL-2.0 @@ -31,6 +31,8 @@ BuildRequires: gcc-c++ BuildRequires: glm-devel BuildRequires: gperf +BuildRequires: help2man +BuildRequires: liblangtag-devel BuildRequires: pkg-config BuildRequires: xz BuildRequires: pkgconfig(cppunit) @@ -38,7 +40,7 @@ BuildRequires: pkgconfig(librevenge-generators-0.0) BuildRequires: pkgconfig(librevenge-stream-0.0) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(mdds) >= 0.12.1 +BuildRequires: pkgconfig(mdds-1.0) BuildRequires: pkgconfig(zlib) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -98,6 +100,12 @@ find %{buildroot} -type f -name "*.la" -delete -print +mkdir -p %{buildroot}%{_mandir}/man1 +for i in %{buildroot}%{_bindir}/*; do + LD_LIBRARY_PATH=%{buildroot}%{_libdir} \ + help2man -N -o %{buildroot}%{_mandir}/man1/$(basename $i).1 $i +done + cp -p AUTHORS COPYING ChangeLog %{buildroot}%{_docdir}/%{name}-devel/ %fdupes -s %{buildroot} @@ -129,5 +137,6 @@ %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog %{_bindir}/* +%{_mandir}/man1/*.1* %changelog ++++++ libetonyek-0.1.3.tar.xz -> libetonyek-0.1.6.tar.xz ++++++ ++++ 53641 lines of diff (skipped)

1 0

commit gwenview5 for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package gwenview5 for openSUSE:Factory checked in at 2016-01-23 01:14:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gwenview5 (Old) and /work/SRC/openSUSE:Factory/.gwenview5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gwenview5" Changes: -------- --- /work/SRC/openSUSE:Factory/gwenview5/gwenview5.changes 2016-01-10 13:09:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gwenview5.new/gwenview5.changes 2016-01-23 01:14:02.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:10:59 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- gwenview-15.12.0.tar.xz New: ---- gwenview-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwenview5.spec ++++++ --- /var/tmp/diff_new_pack.FbjSC5/_old 2016-01-23 01:14:03.000000000 +0100 +++ /var/tmp/diff_new_pack.FbjSC5/_new 2016-01-23 01:14:03.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gwenview5 # -# 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 @@ -18,7 +18,7 @@ %define rname gwenview Name: gwenview5 -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: Simple Image Viewer for KDE License: GPL-2.0+ @@ -33,6 +33,8 @@ BuildRequires: kio-devel >= 5.4.0 BuildRequires: libexiv2-devel BuildRequires: libjpeg-devel +BuildRequires: libkdcraw-devel +BuildRequires: libkipi-devel BuildRequires: liblcms2-devel BuildRequires: libpng-devel BuildRequires: phonon4qt5-devel @@ -44,9 +46,11 @@ BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0 -BuildRequires: libkipi-devel -BuildRequires: libkdcraw-devel +%if 0%{?suse_version} > 1320 +Obsoletes: gwenview < %{version} +%else Conflicts: gwenview +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ gwenview-15.12.0.tar.xz -> gwenview-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-15.12.0/CMakeLists.txt new/gwenview-15.12.1/CMakeLists.txt --- old/gwenview-15.12.0/CMakeLists.txt 2015-12-08 16:52:20.000000000 +0100 +++ new/gwenview-15.12.1/CMakeLists.txt 2016-01-07 00:05:05.000000000 +0100 @@ -3,7 +3,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "15") set (KDE_APPLICATIONS_VERSION_MINOR "12") -set (KDE_APPLICATIONS_VERSION_MICRO "0") +set (KDE_APPLICATIONS_VERSION_MICRO "1") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-15.12.0/app/gwenview.appdata.xml new/gwenview-15.12.1/app/gwenview.appdata.xml --- old/gwenview-15.12.0/app/gwenview.appdata.xml 2015-12-08 16:52:20.000000000 +0100 +++ new/gwenview-15.12.1/app/gwenview.appdata.xml 2016-01-07 00:05:05.000000000 +0100 @@ -236,7 +236,7 @@ <li xml:lang="id">Dapat diekstensi menggunakan plugin KIPI.</li> <li xml:lang="it">Può essere esteso tramite estensioni Kipi.</li> <li xml:lang="ko">KIPI 플러그인을 통한 확장성 제공.</li> - <li xml:lang="lt">Gali būti praplėsta naudojant KIPI priedus.</li> + <li xml:lang="lt">Gali būti praplėsta naudojant KIPI papildinius.</li> <li xml:lang="nb">Kan utvides med KIPI programtillegg.</li> <li xml:lang="nds">Laat sik mit KIPI-Modulen verwiedern</li> <li xml:lang="nl">Kan uitgebreid worden met KIPI-plug-ins.</li>

1 0

commit kgpg for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package kgpg for openSUSE:Factory checked in at 2016-01-23 01:13:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kgpg (Old) and /work/SRC/openSUSE:Factory/.kgpg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kgpg" Changes: -------- --- /work/SRC/openSUSE:Factory/kgpg/kgpg.changes 2015-12-29 12:58:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kgpg.new/kgpg.changes 2016-01-23 01:13:58.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Jan 20 20:49:50 UTC 2016 - wbauer(a)tmo.at + +- Fix ServiceMenus symlinks for KF5/Plasma5, they were pointing to + nowhere (boo#959490) + +------------------------------------------------------------------- +Sat Jan 9 18:19:52 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- kgpg-15.12.0.tar.xz New: ---- kgpg-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kgpg.spec ++++++ --- /var/tmp/diff_new_pack.CRAZbL/_old 2016-01-23 01:13:59.000000000 +0100 +++ /var/tmp/diff_new_pack.CRAZbL/_new 2016-01-23 01:13:59.000000000 +0100 @@ -17,7 +17,7 @@ Name: kgpg -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: Encryption Tool License: GPL-2.0+ @@ -53,7 +53,9 @@ %if 0%{?suse_version} > 1310 mkdir -p %{buildroot}%{_kf5_servicesdir}/ServiceMenus pushd %{buildroot}%{_kde4_servicesdir}/ServiceMenus/ > /dev/null -ln -s *.desktop %{buildroot}/%{_kf5_servicesdir}/ServiceMenus/ +for i in *.desktop; do +ln -s %{_kde4_servicesdir}/ServiceMenus/$i %{buildroot}/%{_kf5_servicesdir}/ServiceMenus/ +done popd > /dev/null %endif %kde_post_install ++++++ kgpg-15.12.0.tar.xz -> kgpg-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.0/CMakeLists.txt new/kgpg-15.12.1/CMakeLists.txt --- old/kgpg-15.12.0/CMakeLists.txt 2015-12-08 06:49:44.000000000 +0100 +++ new/kgpg-15.12.1/CMakeLists.txt 2015-12-22 16:56:36.000000000 +0100 @@ -210,7 +210,7 @@ install( FILES editor/kgpgeditor.rc keysmanager.rc tips DESTINATION ${DATA_INSTALL_DIR}/kgpg) install( PROGRAMS kgpg.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install( FILES kgpg.appdata.xml DESTINATION share/appdata/ ) +install( FILES kgpg.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/ ) install( FILES kgpg.kcfg DESTINATION ${KCFG_INSTALL_DIR}) install( FILES kgpg.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) install( FILES encryptfile.desktop encryptfolder.desktop viewdecrypted.desktop DESTINATION

1 0

commit kdebase4-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package kdebase4-openSUSE for openSUSE:Factory checked in at 2016-01-23 01:13:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kdebase4-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-openSUSE/kdebase4-openSUSE.changes 2016-01-07 00:24:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-openSUSE.new/kdebase4-openSUSE.changes 2016-01-23 01:13:54.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 15:12:28 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to 13.3 + * Remove all branding related files and packages. + * Drop patch plasma-change-defaults.diff + * Drop the BuildRequires on kdebase4-workspace. This is no + longer required. + +------------------------------------------------------------------- Old: ---- kdebase4-openSUSE-13.2.tar.bz2 plasma-change-defaults.diff New: ---- kdebase4-openSUSE-13.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.UDb33X/_old 2016-01-23 01:13:55.000000000 +0100 +++ /var/tmp/diff_new_pack.UDb33X/_new 2016-01-23 01:13:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdebase4-openSUSE -Version: 13.2 +Version: 13.3 Release: 0 Summary: openSUSE KDE Extension License: GPL-2.0+ @@ -25,23 +25,21 @@ # git clone git://github.com/openSUSE/kdebase-opensuse.git Url: http://www.opensuse.org/ Source0: kdebase4-openSUSE-%{version}.tar.bz2 -Source2: plasma-change-defaults.diff BuildRequires: fdupes BuildRequires: hwinfo-devel -BuildRequires: kdebase4-runtime-branding-upstream -BuildRequires: kdebase4-workspace-branding-upstream -BuildRequires: kdebase4-workspace-devel >= 4.11.8 BuildRequires: libkde4-devel BuildRequires: oxygen-icon-theme BuildRequires: rpm-devel BuildRequires: wallpaper-branding-openSUSE - PreReq: %fillup_prereq -Requires: kdebase4-workspace -Requires: plasmoid-folderview Recommends: %{name}-lang Provides: kdebase4-SuSE = %{version} Obsoletes: kdebase4-SuSE < %{version} +Obsoletes: kdebase4-runtime-branding-openSUSE < %{version} +Provides: kdebase4-runtime-branding-openSUSE = %{version} +Obsoletes: kdebase4-workspace-branding-openSUSE < %{version} +Provides: kdebase4-workspace-branding-openSUSE = %{version} +Provides: kdebase4-runtime-branding = %{_kde_branding_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %requires_ge libqt4-x11 %kde4_runtime_requires @@ -49,36 +47,6 @@ %description This package contains the standard openSUSE desktop and extensions. -%package -n kdebase4-workspace-branding-openSUSE -Summary: openSUSE KDE Extension -Group: System/GUI/KDE -PreReq: %fillup_prereq -Requires: kdebase4-workspace -# Explicitly require kdebase4-runtime-branding-oS, until kde#320855 is properly resolved -Requires: kdebase4-runtime-branding-openSUSE = %{version} -Requires: ksplashx-branding-openSUSE = %{version} -Requires: susegreeter-branding-openSUSE = %{version} -Requires: wallpaper-branding-openSUSE >= %{version} -Supplements: packageand(kdebase4-workspace:branding-openSUSE) -Provides: kdebase4-workspace-branding = %{_kde_branding_version} -Conflicts: otherproviders(kdebase4-workspace-branding) -%kde4_runtime_requires - -%description -n kdebase4-workspace-branding-openSUSE -This package contains the standard openSUSE desktop and extensions. - -%package -n kdebase4-runtime-branding-openSUSE -Summary: The KDE Runtime Components -Group: System/GUI/KDE -PreReq: %fillup_prereq -Supplements: packageand(kdebase4-runtime:branding-openSUSE) -Provides: kdebase4-runtime-branding = %{_kde_branding_version} -Conflicts: otherproviders(kdebase4-runtime-branding) -%kde4_runtime_requires - -%description -n kdebase4-runtime-branding-openSUSE -This package contains all run-time dependencies of KDE applications. - %lang_package %prep %setup -q -n %{name} @@ -100,23 +68,12 @@ %find_lang $l suse.lang done mv config-files/COPYING . - for dir in %_kde4_appsdir/plasma-desktop/init %_kde4_appsdir/plasma-netbook/init %_kde4_appsdir/plasma/layout-templates; do - mkdir -p %{buildroot}$dir - cp -a $dir/* %{buildroot}$dir/ - done cp -a config-files/* %{buildroot} - gzip %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSEdefault/widgets/branding.svg - mv %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSEdefault/widgets/branding.svg.gz %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSEdefault/widgets/branding.svgz chmod og-w -R %{buildroot} chmod a+x %{buildroot}/usr/share/kde4/apps/kconf_update/*.sh %suse_update_desktop_file -u SUSEgreeter System Documentation %fdupes -s %{buildroot}%{_kde4_configdir}/SuSE/default/ %kde_post_install - pushd %{buildroot}/%{_kde4_appsdir} - cp %{_kde4_appsdir}/plasma-desktop/init/00-defaultLayout.js %{buildroot}/%{_kde4_appsdir}/plasma-desktop/init/ - cp %{_kde4_appsdir}/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js %{buildroot}/%{_kde4_appsdir}/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/ - patch -p0 < %{SOURCE2} - popd #Make the "rpm:"-search default to to the correct version of openSUSE (see bnc#695417) sed -i s/12.1/%{version}/ %{buildroot}%{_kde4_servicesdir}/searchproviders/rpm.desktop @@ -124,18 +81,15 @@ #remove sysinfo from the standard desktop rm %{buildroot}%{_kde4_configdir}/SuSE/default/myComputer.desktop -%post -n kdebase4-workspace-branding-openSUSE -%{fillup_only -n windowmanager -s kde4} - %files lang -f suse.lang %defattr(-,root,root) %files %defattr(-,root,root) +%doc COPYING %{_kde4_applicationsdir}/konqfilemgr_rpm.desktop %{_kde4_appsdir}/krpmview %{_kde4_bindir}/kde_add_yast_source.sh -%{_kde4_bindir}/kde4-migrate %{_kde4_bindir}/preloadkde %dir %{_kde4_configdir} %dir %{_kde4_configdir}/SuSE @@ -147,27 +101,10 @@ %{_kde4_modulesdir}/libkrpmview.so %{_kde4_servicesdir}/krpmview.desktop %{_kde4_servicesdir}/searchproviders - -%files -n kdebase4-runtime-branding-openSUSE -%defattr(-,root,root) -%doc COPYING -%dir %{_kde4_appsdir}/desktoptheme -%{_kde4_appsdir}/desktoptheme/openSUSEdefault -%{_kde4_appsdir}/desktoptheme/openSUSE -%{_kde4_appsdir}/desktoptheme/openSUSElight/ -%{_kde4_appsdir}/color-schemes %config %{_sysconfdir}/kde4 - -%files -n kdebase4-workspace-branding-openSUSE -%defattr(-,root,root) -%doc COPYING -%{_datadir}/autostart/ -%{_datadir}/opensuse-kiwi %{_kde4_applicationsdir}/SUSEgreeter.desktop %{_kde4_appsdir}/kconf_update/ %{_kde4_appsdir}/konsole/ -%{_kde4_appsdir}/kwin/ -%{_kde4_appsdir}/plasma-desktop %{_kde4_appsdir}/SUSEgreeter %{_kde4_bindir}/SUSEgreeter %dir %{_kde4_configdir} @@ -194,8 +131,8 @@ %{_kde4_iconsdir}/oxygen/ %{_kde4_sharedir}/env/ %{_localstatedir}/adm/fillup-templates/sysconfig.windowmanager-kde4 -%_kde4_appsdir/plasma-desktop -%_kde4_appsdir/plasma-netbook -%_kde4_appsdir/plasma +%{_datadir}/autostart/SUSEgreeter.desktop +%{_kde4_appsdir}/color-schemes/ +%{_datadir}/opensuse-kiwi/ %changelog ++++++ kdebase4-openSUSE-13.2.tar.bz2 -> kdebase4-openSUSE-13.3.tar.bz2 ++++++ ++++ 89573 lines of diff (skipped)

1 0

commit kget for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package kget for openSUSE:Factory checked in at 2016-01-23 01:13:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kget (Old) and /work/SRC/openSUSE:Factory/.kget.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kget" Changes: -------- --- /work/SRC/openSUSE:Factory/kget/kget.changes 2016-01-07 00:21:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kget.new/kget.changes 2016-01-23 01:13:50.000000000 +0100 @@ -1,0 +2,12 @@ +Sat Jan 9 18:19:33 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + +- Drop the BuildRequires on kdebase4-workspace. In a Plasma5 + environment it would be impossible to shutdown the system through + KDE4. + +------------------------------------------------------------------- Old: ---- kget-15.12.0.tar.xz New: ---- kget-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kget.spec ++++++ --- /var/tmp/diff_new_pack.RIf4TV/_old 2016-01-23 01:13:51.000000000 +0100 +++ /var/tmp/diff_new_pack.RIf4TV/_new 2016-01-23 01:13:51.000000000 +0100 @@ -17,7 +17,7 @@ Name: kget -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: Download Manager License: GPL-2.0+ @@ -25,7 +25,6 @@ Source0: %{name}-%{version}.tar.xz BuildRequires: boost-devel BuildRequires: gpgme-devel -BuildRequires: kdebase4-workspace-devel BuildRequires: libkdepimlibs4-devel BuildRequires: libkonq-devel BuildRequires: libktorrent-devel ++++++ kget-15.12.0.tar.xz -> kget-15.12.1.tar.xz ++++++

1 0

commit kdebase4-workspace for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2016-01-23 01:13:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-workspace" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2015-12-17 15:54:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2016-01-23 01:13:45.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Jan 20 12:00:14 UTC 2016 - tittiatcoke(a)gmail.com + +- Drop the upstream branding package for workspace. This is no + longer required. Move the files from the upstream branding + package to the workspace package. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.EDK0Q4/_old 2016-01-23 01:13:47.000000000 +0100 +++ /var/tmp/diff_new_pack.EDK0Q4/_new 2016-01-23 01:13:47.000000000 +0100 @@ -149,7 +149,6 @@ # PATCH-FIX-OPENSUSE systemsettings-desktop-kde4.diff -- Changes name of System Settings to Configure KDE 4 Applications Patch73: systemsettings-desktop-kde4.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: %{name}-branding = %{_kde_branding_version} Requires: %{name}-ksysguardd = %{version} Requires: %{name}-liboxygenstyle = %{version} # Requires /etc/xdg/menus/applications.menu (bnc#754104) @@ -206,19 +205,6 @@ This package contains the basic packages for a K Desktop Environment workspace. -%package branding-upstream -Summary: The KDE Workspace Components -Group: System/GUI/KDE -Provides: %{name}-branding = %{_kde_branding_version} -Requires: kdebase4-artwork >= %{_kde_platform_version} -Requires: kdebase4-wallpaper-default >= %{_kde_platform_version} -Supplements: packageand(%{name}:branding-upstream) -Conflicts: otherproviders(%{name}-branding) - -%description branding-upstream -This package contains the basic packages for a K Desktop Environment -workspace. - %package -n kdm-branding-upstream Summary: KDE login and display manager - upstream branding Group: System/GUI/KDE @@ -249,7 +235,6 @@ Provides: kde4-kwin Provides: windowmanager %kde4_runtime_requires -Requires: %{name}-branding = %{_kde_branding_version} Requires: %{name}-liboxygenstyle >= %{version} Provides: kdebase3:/opt/kde3/bin/kwin @@ -535,15 +520,6 @@ %postun libs -p /sbin/ldconfig -%files branding-upstream -%defattr(-,root,root) -%doc COPYING -%{_kde4_appsdir}/kwin/cubecap.png -%{_kde4_appsdir}/kwin/titlebar_decor.png -%{_kde4_appsdir}/plasma-desktop/init -%{_kde4_appsdir}/plasma-netbook/init -%{_kde4_appsdir}/plasma/layout-templates - %files -n kde4-kgreeter-plugins %defattr(-,root,root) %{_kde4_modulesdir}/kgreet_*.so @@ -585,8 +561,8 @@ %defattr(-,root,root) %doc COPYING COPYING.DOC README kwin/clients/aurorae/theme-description %dir %{_kde4_servicesdir}/kwin -%exclude %{_kde4_appsdir}/kwin/cubecap.png -%exclude %{_kde4_appsdir}/kwin/titlebar_decor.png +%{_kde4_appsdir}/kwin/cubecap.png +%{_kde4_appsdir}/kwin/titlebar_decor.png %exclude %{_kde4_datadir}/dbus-1/interfaces/org.kde.KWin.xml %exclude %{_kde4_libdir}/libkdecorations.so* %exclude %{_kde4_bindir}/oxygen-shadow-demo @@ -802,8 +778,12 @@ %{_kde4_modulesdir}/ %{_kde4_sharedir}/services/ %{_kde4_sharedir}/servicetypes/ +%{_kde4_appsdir}/plasma-desktop/init +%{_kde4_appsdir}/plasma-netbook/init +%{_kde4_appsdir}/plasma/layout-templates #blacklist +%exclude %{_kde4_appsdir}/kwin/default_rules/plasma_desktop_containment.kwinrules %exclude %{_kde4_applicationsdir}/krandrtray.desktop %exclude %{_kde4_applicationsdir}/ksysguard.desktop %exclude %{_kde4_appsdir}/cmake @@ -812,13 +792,9 @@ %exclude %{_kde4_appsdir}/kstyle %exclude %{_kde4_appsdir}/kcmstyle %exclude %{_kde4_appsdir}/kdm -%exclude %{_kde4_appsdir}/ksysguard %exclude %{_kde4_appsdir}/kwin/cubecap.png -%exclude %{_kde4_appsdir}/kwin/default_rules/plasma_desktop_containment.kwinrules %exclude %{_kde4_appsdir}/kwin/titlebar_decor.png -%exclude %{_kde4_appsdir}/plasma-desktop/init -%exclude %{_kde4_appsdir}/plasma-netbook/init -%exclude %{_kde4_appsdir}/plasma/layout-templates +%exclude %{_kde4_appsdir}/ksysguard %exclude %{_kde4_appsdir}/plasma_scriptengine_python %exclude %{_kde4_appsdir}/color-schemes/ %exclude %{_kde4_appsdir}/kaccess/

1 0

commit kdebase4 for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at 2016-01-23 01:13:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4 (Old) and /work/SRC/openSUSE:Factory/.kdebase4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4/kdebase4.changes 2016-01-07 00:20:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes 2016-01-23 01:13:41.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Jan 20 14:08:10 UTC 2016 - tittiatcoke(a)gmail.com + +- Drop the dolphin4 package and include the necessary dolphin files + into the konqueror package. Drop the unnecessary files + +------------------------------------------------------------------- +Sat Jan 9 18:15:38 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- kde-baseapps-15.12.0.tar.xz New: ---- kde-baseapps-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.sBZ1h3/_old 2016-01-23 01:13:42.000000000 +0100 +++ /var/tmp/diff_new_pack.sBZ1h3/_new 2016-01-23 01:13:42.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdebase4 -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: The Base KDE Apps License: GPL-2.0+ @@ -57,7 +57,6 @@ %install pushd build %kde4_makeinstall - %create_subdir_filelist -d dolphin %create_subdir_filelist -d kdepasswd %create_subdir_filelist -d kdialog %create_subdir_filelist -d keditbookmarks @@ -75,16 +74,13 @@ %fdupes -s %{buildroot} %kde_post_install -%package -n dolphin4 -Summary: KDE File Manager -Group: Productivity/File utilities -Requires: %{name}-libkonq = %{version} -Recommends: konsole4-part -Recommends: kate4-part -%kde4_runtime_requires + # Remove unwanted files from Dolphin + rm -rf %{buildroot}%{_bindir}/dolphin4 + rm -rf %{buildroot}%{_libdir}/libkdeinit4_dolphin4.so + rm -rf %{buildroot}%{_kde4_appsdir}/dolphin + rm -rf %{buildroot}%{_kde4_configdir}/servicemenu.knsrc + rm -rf %{buildroot}%{_kde4_servicetypesdir}/fileviewversioncontrolplugin.desktop -%description -n dolphin4 -This package contains the default file manager of KDE 4. %package -n kdepasswd Summary: KDE Password Changer @@ -123,8 +119,6 @@ Group: Productivity/Networking/Web/Browsers Requires: %{name}-libkonq = %{version} Requires: konqueror-plugins = %{version} -# needed for embedded filemanagement part -Recommends: dolphin4 Recommends: kwebkitpart Recommends: kdebase4-nsplugin %kde4_runtime_requires @@ -139,6 +133,8 @@ Requires: %{name}-libkonq = %{version} Provides: konqueror-plugins-lang = %{version} Obsoletes: konqueror-plugins-lang < %{version} +Obsoletes: dolphin4 < %{version} +Provides: dolphin4 = %{version} %kde4_runtime_requires %description -n konqueror-plugins @@ -201,10 +197,6 @@ %postun -p /sbin/ldconfig -%post -n dolphin4 -p /sbin/ldconfig - -%postun -n dolphin4 -p /sbin/ldconfig - %post -n kdepasswd -p /sbin/ldconfig %postun -n kdepasswd -p /sbin/ldconfig @@ -237,11 +229,6 @@ %postun -n libkonq5 -p /sbin/ldconfig -%files -n dolphin4 -f filelists/dolphin -%defattr(-,root,root) -%doc COPYING COPYING.DOC README -%dir %{_kde4_appsdir}/dolphinpart - %files -n kdepasswd -f filelists/kdepasswd %defattr(-,root,root) %doc COPYING COPYING.DOC README @@ -283,6 +270,16 @@ %dir %{_kde4_appsdir}/kwebkitpart/ %dir %{_kde4_appsdir}/kwebkitpart/kpartplugins/ %dir %{_kde4_servicesdir}/useragentstrings + +# Originally packaged as dolphin4 +%{_kde4_appsdir}/dolphinpart/ +%{_kde4_modulesdir}/dolphinpart.so +%{_kde4_modulesdir}/kcm_dolphin*.so +%{_kde4_modulesdir}/kio_filenamesearch.so +%{_libdir}/libdolphinprivate4.so* +%{_kde4_servicesdir}/dolphinpart.desktop +%{_kde4_servicesdir}/kcmdolphin*.desktop +%{_kde4_servicesdir}/filenamesearch.protocol # installed from apps/lib/konq/ and hence in kdebase4-libkonq %exclude %{_kde4_appsdir}/konqueror/pics/arrow_bottomleft.png %exclude %{_kde4_appsdir}/konqueror/pics/arrow_bottomright.png @@ -290,7 +287,7 @@ %exclude %{_kde4_appsdir}/konqueror/pics/arrow_topright.png %exclude %{_kde4_includedir}/konqsidebarplugin.h %exclude %{_kde4_libdir}/libkonqsidebarplugin.so -%dir %{_kde4_appsdir}/dolphinpart +%exclude %{_kde4_appsdir}/dolphinpart/kpartplugins/ %files -n konqueror-plugins -f filelists/konq-plugins %defattr(-,root,root) @@ -305,7 +302,7 @@ %dir %{_kde4_appsdir}/konqueror/icons/oxygen/*/actions %dir %{_kde4_appsdir}/konqueror/kpartplugins %dir %{_kde4_appsdir}/konqueror/opensearch -%dir %{_kde4_appsdir}/dolphinpart +%dir %{_kde4_appsdir}/dolphinpart/kpartplugins %files libkonq -f filelists/lib %defattr(-,root,root) ++++++ kde-baseapps-15.12.0.tar.xz -> kde-baseapps-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-15.12.0/kfind/kfind.appdata.xml new/kde-baseapps-15.12.1/kfind/kfind.appdata.xml --- old/kde-baseapps-15.12.0/kfind/kfind.appdata.xml 2015-12-08 08:04:21.000000000 +0100 +++ new/kde-baseapps-15.12.1/kfind/kfind.appdata.xml 2015-12-23 05:43:04.000000000 +0100 @@ -104,6 +104,7 @@ KFind kan brukes som et selvstendig søkeverktøy, startet fra KRunner eller fra menyen. Det er også innebygget i Konqueror som «Finn fil» i «Verktøy»-menyen. Den kan finne filer etter navn, type eller innhold. KFind lett sik för sik as Söökwarktüüch bruken un vun KRunner oder över't Menü opropen. Dat arbeidt ok binnen Konqueror, binnen dat Warktüüch-Menü is dat de Punkt „Datei söken“. Du kannst dor mit na Dateinaams, -typ un -inholt söken. KFind kan gebuikt worden als een alleenstaand hulpmiddel voor zoeken, gestart door KRunner of vanuit uw menu. Het is ook geïntegreerd in Konqueror als "Bestand zoeken" in het menu "Hulpmiddelen". Het stelt u in staat bestanden te zoeken op naam, type of inhoud. + KFind kan brukast som eit sjølvstendig søkjeverktøy, starta frå KRunner eller frå menyen. Programmet er òg innebygd i Konqueror som «Finn fil» i «Verktøy»-menyen. Du kan bruka det til å finna filer etter namn, type eller innhald. KFind można używać jako samodzielnego narzędzia wyszukiwania, gdy zostanie wywołane z KRunner lub z twojego menu. Jest ono także zintegrowane z Konqueror jako "Znajdź plik" w menu "Narzędzia". Umożliwia znajdywanie plików po nazwie, rodzaju czy treści. O KFind pode ser usado como uma ferramenta de pesquisa independente, invocado pelo KRunner ou a partir do seu menu. Também está integrado no Konqueror e no Dolphin como "Procurar no Ficheiro" do menu "Ferramentas". Permite-lhe procurar ficheiros pelo seu nome, tipo ou conteúdo. O KFind pode ser usado como uma ferramenta de pesquisa independente, que pode ser executado a partir do KRunner ou do menu. Ele também é integrado ao Konqueror como "Localizar arquivo" no menu "Ferramentas". Permite-lhe localizar arquivos pelo nome, tipo ou conteúdo. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-15.12.0/konqueror/konqueror.appdata.xml new/kde-baseapps-15.12.1/konqueror/konqueror.appdata.xml --- old/kde-baseapps-15.12.0/konqueror/konqueror.appdata.xml 2015-12-08 08:04:21.000000000 +0100 +++ new/kde-baseapps-15.12.1/konqueror/konqueror.appdata.xml 2015-12-23 05:43:04.000000000 +0100 @@ -100,6 +100,7 @@ Konqueror er KDEs nettleser og multiverktøy for all slags filbehandling og forhåndsvisning. Konqueror is KDE sien Nettkieker un dat swiezer Offiziersmetz för all Problemen bi de Dateipleeg un för Vöransichten. Konqueror is de webbrowser van KDE en Zwitsers mes voor elk soort van bestandsbeheer en bekijken van bestanden. + Konqueror er KDEs nettlesar og multiverktøy for all slags handsaming og førehandvising av filer. Konqueror jest przeglądarką sieciową KDE i szwajcarskim scyzorykiem we wszystkich działaniach związanych z zarządzaniem i podglądem plików. O Konqueror é o navegador Web do KDE e o canivete-suíço para qualquer tipo de gestão e visualização de ficheiros. Konqueror é o navegador Web do KDE e um canivete-suíço para gerenciamento e visualização de arquivos. @@ -174,6 +175,7 @@ <li xml:lang="nb">Nettlesing med KHTML eller KDEWebkit som opptegningsmotorer</li> <li xml:lang="nds">Nettkieken mit KHTML oder KDEWebKit as Dorstellkarns</li> <li xml:lang="nl">Webbrowsing met KHTML of KDEWebKit als engines voor weergave</li> + <li xml:lang="nn">Nettlesing med KHTML eller KDEWebkit som oppteikningsmotorar</li> <li xml:lang="pl">Przeglądanie sieci przy użyciu KHTML lub KDEWebKit jako silniki wyświetlania</li> <li xml:lang="pt">Navegação com o KHTML ou o KDEWebKit como motores de visualização</li> <li xml:lang="pt-BR">Navegação Web usando KHTML ou KDEWebKit como mecanismo de renderização</li> @@ -209,6 +211,7 @@ <li xml:lang="nb">Filbehandling som buker de fleste av Dolphins muligheter (bl.a. versjonsstyring, tjenestemenyer og den grunnleggende brukerflaten)</li> <li xml:lang="nds">Dateipleeg mit de mehrsten vun Dolphin sien Funkschonen (ok Verschoonkuntrull, Deenstmenüs un de Brukerböversiet)</li> <li xml:lang="nl">Bestandsbeheer met gebruik van de meeste functies van Dolphin (inclusief beheer van versies, service-menu's en de basis UI)</li> + <li xml:lang="nn">Filhandsaming som brukar dei fleste funksjonane i Dolphins (mellom anna versjonsstyring, tenestemenyar og den grunnleggjande brukarflata)</li> <li xml:lang="pl">Zarządzanie plikami przy wykorzystaniu większości z możliwości Dolphina (włączając w to zarządzanie wersjami, menu usług i podstawowy układ sterowania)</li> <li xml:lang="pt">Gestão de ficheiros, usando a maioria das funcionalidades do Dolphin (incluindo o controlo de versões, os menus de serviços e a interface básica)</li> <li xml:lang="pt-BR">Gerenciamento de arquivos usando muitas das funcionalidades do Dolphin (incluindo controle de versão, menus de serviço e interface básica)</li> @@ -244,6 +247,7 @@ <li xml:lang="nb">Filbehandling på ftp- og sftp-tjenere</li> <li xml:lang="nds">Dateipleeg op FTP- un SFTP-Sersvers</li> <li xml:lang="nl">Bestandsbeheer op ftp- en sftp-servers</li> + <li xml:lang="nn">Filhandsaming på FTP og SFTP-tenarar</li> <li xml:lang="pl">Zarządzanie plikami na serwerach ftp i sftp</li> <li xml:lang="pt">Gestão de ficheiros em servidores de FTP e SFTP</li> <li xml:lang="pt-BR">Gerenciamento de arquivos em servidores ftp e sftp</li> @@ -279,6 +283,7 @@ <li xml:lang="nb">Fullt utstyrt FTP-klient (du kan dele vinduer slik at mapper på tjeneren og lokale mapper kan vises i samme vindu, sammen med forhåndsvisninger)</li> <li xml:lang="nds">FTP-Client mit all nödig Funkschonen (deelt Ansicht för lokaal un feern Ornern un Vöransichten binnen dat sülve Finster)</li> <li xml:lang="nl">FTP-client met alle functies (u kunt weergaven splitsen om lokale mappen en die op afstand te tonen en voorbeelden in hetzelfde venster)</li> + <li xml:lang="nn">Funksjonsrik FTP-klient (du kan dela vindauge slik at mapper på tenaren og lokale mapper kan visast i same vindauge, saman med førehandsvisingar)</li> <li xml:lang="pl">W pełni funkcjonalny klient FTP (można dzielić widoki tak, aby wyświetlały lokalne i zdalne katalogi wraz z podglądami w tym samym oknie)</li> <li xml:lang="pt">Cliente de FTP completo (poderá dividir as janelas para mostrar os ficheiros locais, remotos e as antevisões na mesma janela)</li> <li xml:lang="pt-BR">Cliente FTP completo e repleto de recursos (você pode dividir a área de exibição para mostrar as pastas locais e remotas na mesma janela)</li> @@ -313,6 +318,7 @@ <li xml:lang="ko">파일을 미리 볼 수 있는 내장형 프로그램(예: 문서용 Okular, Calligra, 그림용 Gwenview, 텍스트용 KTextEditor)</li> <li xml:lang="nb">Innebygde programmer som kan forhåndsvise filer (f.eks. Okular og Calligra for dokumenter, Gwenview for bilder, KTextEditor for tekstfiler)</li> <li xml:lang="nl">Ingebedde toepassingen om bestanden te bekijken (bijv. Okular en Calligra voor documenten, Gwenview voor afbeeldingen, KTextEditor voor tekstbestanden)</li> + <li xml:lang="nn">Innebygde program som kan førehandsvisa filer (for eksempel Okular og Calligra for dokument, Gwenview for bilete og KTextEditor for tekstfiler)</li> <li xml:lang="pl">Osadzone aplikacje do podglądania plików (np. Okular i Calligra dla dokumentów, Gwenview dla zdjęć, KTextEditor dla plików tekstowych)</li> <li xml:lang="pt">Aplicações incorporadas para antever e editar os ficheiros (p.ex., o Okular e o Calligra para os documentos, o Gwenview para as imagens, o KTextEditor para os ficheiros de texto)</li> <li xml:lang="pt-BR">Visualização de arquivos com aplicativos incorporados (p.ex., Okular e Calligra para documentos, Gwenview para imagens, KTextEditor para arquivos de texto)</li> @@ -348,6 +354,7 @@ <li xml:lang="nb">Diverse tilleggsmoduler: Tjenestemenyer, KParts (innebygde programmer), KIO (tilgang til filer ved bruk av spesielle protokoller som http elle ftp) og KPart-moduler (slik som AdBlocker osv.)</li> <li xml:lang="nds">Verscheden Moduul-Oorden: Deenstmenüs, KParts (inbett Programmen), KIO-In-/Utgaavmodulen (Togriep op Dateien över besünner Protokollen as HTTP oder FTP) un KPart-Modulen (as AdBlocker ...)</li> <li xml:lang="nl">Verschillende soorten plug-ins: Service-menu's, KParts (ingebedde toepassing), KIO (toegang tot bestanden met speciale protocollen zoals http of ftp) en KPart-plug-ins (zoals AdBlocker...)</li> + <li xml:lang="nn">Ymse tilleggsmodular: tenestemenyar, KParts (innebygde program), KIO (tilgang til filer ved bruk av spesielle protokollar som HTTP eller FTP) og KPart-tillegg (som for eksempel AdBlocker)</li> <li xml:lang="pl">Różne rodzaje wtyczek: Menu usług, KParts (osadzone aplikacje), KIO (dostęp do plików przy użyciu protokołów takich jak http czy ftp) oraz wtyczki KPart (takie jak AdBlocker...)</li> <li xml:lang="pt">Diferentes tipos de 'plugins': menus de serviços, KParts (aplicações incorporadas), KIO (acesso a ficheiros usando protocolos especiais como o HTTP ou o FTP) e os 'plugins' de KParts (como o bloqueio de anúncios, ...)</li> <li xml:lang="pt-BR">Vários tipos de plugins: Menus de serviço, KParts (aplicativos incorporados), KIO (acesso a arquivos usando protocolos especiais, como o http ou ftp) e plugins KParts (como o AdBlocker...)</li>

1 0

commit kdebase4-runtime for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at 2016-01-23 01:13:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdebase4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-runtime/kdebase4-runtime.changes 2016-01-07 00:21:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-runtime.new/kdebase4-runtime.changes 2016-01-23 01:13:36.000000000 +0100 @@ -1,0 +2,19 @@ +Wed Jan 20 10:45:58 UTC 2016 - tittiatcoke(a)gmail.com + +- Drop the branding-upstream sub package. This has always been + empty and was just there as counterpart of the openSUSE branding + package. Now with the latter gone, the upstream one can also be + dropped. +- Drop the requirement for a branding package. This is no longer + needed and no branding package actually exists. + +------------------------------------------------------------------- +Sat Jan 9 18:15:58 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- kde-runtime-15.12.0.tar.xz New: ---- kde-runtime-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.XdK5dS/_old 2016-01-23 01:13:38.000000000 +0100 +++ /var/tmp/diff_new_pack.XdK5dS/_new 2016-01-23 01:13:38.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdebase4-runtime -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: The KDE Runtime Components License: GPL-2.0+ @@ -83,22 +83,11 @@ Requires(postun): shared-mime-info Requires(post): update-alternatives Requires(postun): update-alternatives -Requires: %{name}-branding = %{_kde_branding_version} %kde4_runtime_requires %description This package contains all run-time dependencies of KDE applications. -%package branding-upstream -Summary: The KDE Runtime Components -Group: System/GUI/KDE -Provides: %{name}-branding = %{_kde_branding_version} -Supplements: packageand(kdebase4-runtime:branding-upstream) -Conflicts: otherproviders(%{name}-branding) - -%description branding-upstream -This package contains all run-time dependencies of KDE applications. - %package -n plasma-theme-oxygen Summary: The Oxygen Plasma Theme Group: System/GUI/KDE @@ -180,10 +169,6 @@ %verify_permissions -e %{_kde4_bindir}/kdesud %verify_permissions -e %{_kde4_libexecdir}/kdesud -%files branding-upstream -%defattr(-,root,root) -%doc COPYING - %files -n plasma-theme-oxygen %defattr(-,root,root) %doc COPYING ++++++ kde-runtime-15.12.0.tar.xz -> kde-runtime-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdebase4-runtime/kde-runtime-15.12.0.tar.xz /work/SRC/openSUSE:Factory/.kdebase4-runtime.new/kde-runtime-15.12.1.tar.xz differ: char 27, line 1

1 0

commit digikam for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2016-01-23 01:13:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "digikam" Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2015-11-04 15:32:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2016-01-23 01:13:31.000000000 +0100 @@ -1,0 +2,14 @@ +Sun Jan 10 15:17:03 UTC 2016 - tittiatcoke(a)gmail.com + +- Add the file digikam-libs.tar.bz2 based on the Digikam 4.13.0 + source file. These are the libs that have moved to KF5 upstream, + but digikam is still KDE4 based. + This should enable to build digikam until the KF5 based version + is released + +------------------------------------------------------------------- +Fri Jan 1 22:10:37 UTC 2016 - nico.kruber(a)gmail.com + +- re-enable support for MediaWiki export in kipi-plugins + +------------------------------------------------------------------- New: ---- digikam-libs.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.i3TeyH/_old 2016-01-23 01:13:33.000000000 +0100 +++ /var/tmp/diff_new_pack.i3TeyH/_new 2016-01-23 01:13:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package digikam # -# 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 @@ -25,6 +25,7 @@ Group: Productivity/Graphics/Viewers Url: http://www.digikam.org/ Source0: http://download.kde.org/stable/%{name}/%{name}-%{rversion}.tar.bz2 +Source1: digikam-libs.tar.bz2 # PATCH-FIX-OPENSUSE digikam-buildtime.patch -- Remove build time references so build-compare can do its work Patch0: digikam-buildtime.patch # PATCH-FIX-OPENSUSE remove-gplv2-only.patch idoenmez(a)suse.de bnc#711963 -- Remove GPLv2 only files from the build system @@ -38,13 +39,27 @@ BuildRequires: fdupes BuildRequires: flex BuildRequires: gdk-pixbuf-devel +%if 0%{?suse_version} <= 1310 || 0%{?suse_version} == 1320 +BuildRequires: libkdcraw-devel +BuildRequires: libkexiv2-devel +BuildRequires: libkface-devel BuildRequires: libkgeomap-devel +BuildRequires: libksane-devel +BuildRequires: libmediawiki-devel +BuildRequires: pkgconfig(libkipi) >= 2.0.0 +# libkgeomap package provides older lib with same so name. +Requires: libkgeomap2 +%else +BuildRequires: libexiv2-devel +BuildRequires: libmarblewidget-devel +BuildRequires: libraw-devel +BuildRequires: sane-backends-devel +%endif BuildRequires: libxml2-devel BuildRequires: libxslt-devel %if 0%{?suse_version} > 1310 BuildRequires: baloo-devel %endif -BuildRequires: libkface-devel %if 0%{?suse_version} > 1310 BuildRequires: gstreamer-plugins-qt-devel %else @@ -58,16 +73,12 @@ BuildRequires: libgphoto2-devel BuildRequires: libgpod-devel BuildRequires: libjasper-devel -BuildRequires: libkdcraw-devel BuildRequires: libkde4-devel BuildRequires: libkdepimlibs4-devel -BuildRequires: libkexiv2-devel -BuildRequires: pkgconfig(libkipi) >= 2.0.0 %if 0%{?suse_version} > 1230 BuildRequires: libkqoauth-devel %endif BuildRequires: libMagick++-devel -BuildRequires: libksane-devel BuildRequires: libkvkontakte-devel %if 0%{?suse_version} < 1320 && !0%{?is_opensuse} # from 13.2 upwards, and also Leap 42.1 (1315 && is_opensuse) we prefer lcms2 @@ -93,13 +104,14 @@ Requires: kipi-plugins >= %{version} Requires: libqt4-sql-mysql Requires: libqt4-sql-sqlite -# libkgeomap package provides older lib with same so name. -Requires: libkgeomap2 Recommends: %{name}-doc Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %requires_ge libkipi8 %kde4_runtime_requires +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +Requires: digikam-libs +%endif %description digiKam is a simple digital photo management application for KDE, which @@ -156,17 +168,35 @@ Recommends: kipi-plugins-lang = %{version} Supplements: packageand(kipi-plugins:marble) %kde4_runtime_requires +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +Requires: digikam-libs +%endif %description -n kipi-plugins A set of plug-ins for the KDE KIPI interface, used by some KDE imaging applications. +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +%package libs +Summary: Libraries required to run digikam +License: GPL-2.0+ +Group: Productivity/Graphics/Viewers +Requires: %{name} = %{version} +#Require the lib for the shared icons +Requires: libKF5Kipi30_0_0 +Requires: marble-data + +%description libs +These are the libraries libkipi, libkdcraw, libkgeomap, libkexiv2, libksane and libkface which are +required for digikam to run. Upstream these libraries have moved to KF5, but digikam is still KDE4 based +%endif + %lang_package %lang_package -n kipi-plugins %prep -%setup -q -n %{name}-%{rversion} +%setup -q -n %{name}-%{rversion} -a 1 %patch0 %patch3 %patch6 -p1 @@ -188,6 +218,11 @@ %else EXTRA_FLAGS="-DENABLE_LCMS2=ON" %endif +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +EXTRA_FLAGS+=" -DDIGIKAMSC_COMPILE_LIBKIPI=ON -DDIGIKAMSC_COMPILE_LIBKEXIV2=ON -DDIGIKAMSC_COMPILE_LIBKDCRAW=ON" +EXTRA_FLAGS+=" -DDIGIKAMSC_COMPILE_LIBKSANE=ON -DDIGIKAMSC_COMPILE_LIBKFACE=ON" +EXTRA_FLAGS+=" -DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON" +%endif %cmake_kde4 -d build -- -DENABLE_MYSQLSUPPORT=TRUE -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE $EXTRA_FLAGS # there are files in there that are so heavy to the compiler, that one is enough @@ -347,4 +382,35 @@ %{_kde4_modulesdir}/kipiplugin_gpssync.so %{_kde4_servicesdir}/kipiplugin_gpssync.desktop +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%files libs +%defattr(-,root,root) +%_libdir/cmake/Kface-3.5.0/ +%_libdir/cmake/libkexiv2-2.4.0/ +%_libdir/libkdcraw.so* +%_libdir/libkexiv2.so* +%_libdir/libkface.so* +%_libdir/libkgeomap.so* +%_libdir/libkipi.so* +%_libdir/libksane.so* +%_libdir/libmediawiki.so* +%_kde4_iconsdir/hicolor/*/apps/kdcraw.png +# maybe not the best way to do this, but it works and is easier to remove later +%exclude %_kde4_iconsdir/hicolor/*/apps/kipi.png +%_kde4_appsdir/kipi/ +%_kde4_appsdir/libkdcraw/ +%_kde4_appsdir/libkexiv2/ +%_kde4_appsdir/libkface/ +%_kde4_appsdir/libkgeomap/ +%_kde4_servicetypesdir/kipiplugin.desktop +%exclude %_kde4_appsdir/kipi/kipiplugin_* +%exclude %_kde4_appsdir/kipi/tips + +%endif + %changelog

1 0

commit libkgapi for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package libkgapi for openSUSE:Factory checked in at 2016-01-23 01:13:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkgapi (Old) and /work/SRC/openSUSE:Factory/.libkgapi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkgapi" Changes: -------- --- /work/SRC/openSUSE:Factory/libkgapi/libkgapi.changes 2014-08-25 10:58:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkgapi.new/libkgapi.changes 2016-01-23 01:13:26.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Jan 17 18:30:21 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to 5.1.0 + * KDE Frameworks 5 based version. (boo#953617) + +------------------------------------------------------------------- Old: ---- libkgapi-2.2.0.tar.bz2 New: ---- libkgapi-5.1.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkgapi.spec ++++++ --- /var/tmp/diff_new_pack.Uyx2xm/_old 2016-01-23 01:13:26.000000000 +0100 +++ /var/tmp/diff_new_pack.Uyx2xm/_new 2016-01-23 01:13:26.000000000 +0100 @@ -17,72 +17,228 @@ Name: libkgapi -Version: 2.2.0 +Version: 5.1.0 Release: 0 Summary: Extension for accessing your Google data License: GPL-2.0+ Group: System/GUI/KDE -Url: http://www.progdan.cz/ -Source0: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.ta… -BuildRequires: libkde4-devel -BuildRequires: libkdepimlibs4-devel -BuildRequires: libqjson-devel -BuildRequires: libxslt-devel +Url: http://www.kde.org +Source0: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.ta… +BuildRequires: extra-cmake-modules >= 1.0.0 +BuildRequires: kcontacts5-devel +BuildRequires: kcalcore-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kdelibs4support-devel +BuildRequires: kf5-filesystem +BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 +BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.2.0 +BuildRequires: cmake(Qt5LinguistTools) BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_akonadi_requires -%kde4_runtime_requires -%kde4_pimlibs_requires %description -An extension for accessing some Google services, such as Google Calendar, Google Contacts and Google tasks +An extension for accessing some Google services, such as Google Calendar, Google Contacts and Google tasks. -%package -n libkgapi2-2 -Summary: Akonadi resource to access your Google data -Group: Development/Libraries/KDE +%package -n libKF5GAPIBlogger5 +Summary: Extension for accessing your Google data +Group: System/GUI/KDE +Recommends: %{name}-lang = %{version} + +%description -n libKF5GAPIBlogger5 +An extension for accessing some Google services, such as Google Calendar, Google Contacts and Google tasks. + +%package -n libKF5GAPICalendar5 +Summary: Extension for accessing your Google data +Group: System/GUI/KDE +Recommends: %{name}-lang = %{version} + +%description -n libKF5GAPICalendar5 +An extension for accessing some Google services, such as Google Calendar, Google Contacts and Google tasks. + +%package -n libKF5GAPIContacts5 +Summary: Extension for accessing your Google data +Group: System/GUI/KDE +Recommends: %{name}-lang = %{version} + +%description -n libKF5GAPIContacts5 +An extension for accessing some Google services, such as Google Calendar, Google Contacts and Google tasks. + +%package -n libKF5GAPICore5 +Summary: Extension for accessing your Google data +Group: System/GUI/KDE +Recommends: %{name}-lang = %{version} + +%description -n libKF5GAPICore5 +An extension for accessing some Google services, such as Google Calendar, Google Contacts and Google tasks. -%description -n libkgapi2-2 -An extension for accessing some Google services, such as Google Calendar, Google Contacts and Google tasks +%package -n libKF5GAPIDrive5 +Summary: Extension for accessing your Google data +Group: System/GUI/KDE +Recommends: %{name}-lang = %{version} + +%description -n libKF5GAPIDrive5 +An extension for accessing some Google services, such as Google Calendar, Google Contacts and Google tasks. + +%package -n libKF5GAPILatitude5 +Summary: Extension for accessing your Google data +Group: System/GUI/KDE +Recommends: %{name}-lang = %{version} + +%description -n libKF5GAPILatitude5 +An extension for accessing some Google services, such as Google Calendar, Google Contacts and Google tasks. + +%package -n libKF5GAPIMaps5 +Summary: Extension for accessing your Google data +Group: System/GUI/KDE +Recommends: %{name}-lang = %{version} + +%description -n libKF5GAPIMaps5 +An extension for accessing some Google services, such as Google Calendar, Google Contacts and Google tasks. + +%package -n libKF5GAPITasks5 +Summary: Extension for accessing your Google data +Group: System/GUI/KDE +Recommends: %{name}-lang = %{version} + +%description -n libKF5GAPITasks5 +An extension for accessing some Google services, such as Google Calendar, Google Contacts and Google tasks. %package devel -Summary: Akonadi resource to access your Google data +Summary: KDE PIM Libraries: Build Environment Group: Development/Libraries/KDE -Requires: libkde4-devel -Requires: libkgapi2-2 = %{version} -Requires: libqjson-devel -Requires: libxslt-devel -Provides: libkgapi2-devel = %{version} -Obsoletes: libkgapi2-devel < %{version} +Requires: kcontacts5-devel +Requires: kcalcore-devel +Requires: kcoreaddons-devel +Requires: libKF5GAPIBlogger5 = %{version} +Requires: libKF5GAPICalendar5 = %{version} +Requires: libKF5GAPIContacts5 = %{version} +Requires: libKF5GAPICore5 = %{version} +Requires: libKF5GAPIDrive5 = %{version} +Requires: libKF5GAPILatitude5 = %{version} +Requires: libKF5GAPIMaps5 = %{version} +Requires: libKF5GAPITasks5 = %{version} +Obsoletes: libkgapi5-devel < %{version} +Provides: libkgapi5-devel = %{version} %description devel -An extension for accessing some Google services, such as Google Calendar, Google Contacts and Google tasks +This package contains all necessary include files and libraries needed +to develop KDE PIM applications. + +%package lang +Summary: Languages for package %{name} +Group: System/Localization +BuildArch: noarch + +%description lang +Provides translations to the package %{name} + -%lang_package %prep -%setup -q -n %{name}-%{version} +%setup -q -n libkgapi-%{version} %build - %cmake_kde4 -d build + %cmake_kf5 -d build -- -DBUILD_TESTING=ON %make_jobs %install - %kde4_makeinstall -C build - %kde_post_install + %kf5_makeinstall -C build + %find_lang libkgapi_qt --with-qt --all-name + +%post -n libKF5GAPIBlogger5 -p /sbin/ldconfig + +%postun -n libKF5GAPIBlogger5 -p /sbin/ldconfig + +%post -n libKF5GAPICalendar5 -p /sbin/ldconfig + +%postun -n libKF5GAPICalendar5 -p /sbin/ldconfig + +%post -n libKF5GAPIContacts5 -p /sbin/ldconfig + +%postun -n libKF5GAPIContacts5 -p /sbin/ldconfig + +%post -n libKF5GAPICore5 -p /sbin/ldconfig + +%postun -n libKF5GAPICore5 -p /sbin/ldconfig + +%post -n libKF5GAPIDrive5 -p /sbin/ldconfig + +%postun -n libKF5GAPIDrive5 -p /sbin/ldconfig + +%post -n libKF5GAPILatitude5 -p /sbin/ldconfig + +%postun -n libKF5GAPILatitude5 -p /sbin/ldconfig + +%post -n libKF5GAPIMaps5 -p /sbin/ldconfig + +%postun -n libKF5GAPIMaps5 -p /sbin/ldconfig -%post -n libkgapi2-2 -p /sbin/ldconfig +%post -n libKF5GAPITasks5 -p /sbin/ldconfig -%postun -n libkgapi2-2 -p /sbin/ldconfig +%postun -n libKF5GAPITasks5 -p /sbin/ldconfig -%files -n libkgapi2-2 +%files -n libKF5GAPIBlogger5 %defattr(-,root,root) -%doc LICENSE README -%{_kde4_libdir}/libkgapi2.so.* +%doc LICENSE +%{_kf5_libdir}/libKF5GAPIBlogger.so.* + +%files -n libKF5GAPICalendar5 +%defattr(-,root,root) +%doc LICENSE +%{_kf5_libdir}/libKF5GAPICalendar.so.* + +%files -n libKF5GAPIContacts5 +%defattr(-,root,root) +%doc LICENSE +%{_kf5_libdir}/libKF5GAPIContacts.so.* + +%files -n libKF5GAPICore5 +%defattr(-,root,root) +%doc LICENSE +%{_kf5_libdir}/libKF5GAPICore.so.* +%{_kf5_configdir}/libkgapi.categories + +%files -n libKF5GAPIDrive5 +%defattr(-,root,root) +%doc LICENSE +%{_kf5_libdir}/libKF5GAPIDrive.so.* + +%files -n libKF5GAPILatitude5 +%defattr(-,root,root) +%doc LICENSE +%{_kf5_libdir}/libKF5GAPILatitude.so.* + +%files -n libKF5GAPIMaps5 +%defattr(-,root,root) +%doc LICENSE +%{_kf5_libdir}/libKF5GAPIMaps.so.* + +%files -n libKF5GAPITasks5 +%defattr(-,root,root) +%doc LICENSE +%{_kf5_libdir}/libKF5GAPITasks.so.* %files devel %defattr(-,root,root) -%doc LICENSE README -%{_kde4_libdir}/libkgapi2.so -%{_kde4_includedir}/libkgapi2/ -%{_kde4_includedir}/LibKGAPI2/ -%{_libdir}/cmake/LibKGAPI2/ +%doc LICENSE +%{_kf5_libdir}/libKF5GAPIBlogger.so +%{_kf5_libdir}/libKF5GAPICalendar.so +%{_kf5_libdir}/libKF5GAPIContacts.so +%{_kf5_libdir}/libKF5GAPICore.so +%{_kf5_libdir}/libKF5GAPIDrive.so +%{_kf5_libdir}/libKF5GAPILatitude.so +%{_kf5_libdir}/libKF5GAPIMaps.so +%{_kf5_libdir}/libKF5GAPITasks.so +%{_kf5_includedir}/ +%{_kf5_libdir}/cmake/KF5GAPI/ +%{_kf5_mkspecsdir}/qt_KGAPIBlogger.pri +%{_kf5_mkspecsdir}/qt_KGAPICalendar.pri +%{_kf5_mkspecsdir}/qt_KGAPIContacts.pri +%{_kf5_mkspecsdir}/qt_KGAPICore.pri +%{_kf5_mkspecsdir}/qt_KGAPIDrive.pri +%{_kf5_mkspecsdir}/qt_KGAPILatitude.pri +%{_kf5_mkspecsdir}/qt_KGAPIMaps.pri +%{_kf5_mkspecsdir}/qt_KGAPITasks.pri + +%files lang -f libkgapi_qt.lang +%defattr(-,root,root,-) %changelog

1 0

commit libkgeomap for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package libkgeomap for openSUSE:Factory checked in at 2016-01-23 01:13:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkgeomap (Old) and /work/SRC/openSUSE:Factory/.libkgeomap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkgeomap" Changes: -------- --- /work/SRC/openSUSE:Factory/libkgeomap/libkgeomap.changes 2015-11-15 12:42:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkgeomap.new/libkgeomap.changes 2016-01-23 01:13:21.000000000 +0100 @@ -1,0 +2,18 @@ +Sat Jan 9 18:33:48 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- +Sun Dec 13 13:31:40 UTC 2015 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + +------------------------------------------------------------------- Old: ---- libkgeomap-15.08.3.tar.xz New: ---- libkgeomap-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkgeomap.spec ++++++ --- /var/tmp/diff_new_pack.lMX6Hv/_old 2016-01-23 01:13:21.000000000 +0100 +++ /var/tmp/diff_new_pack.lMX6Hv/_new 2016-01-23 01:13:21.000000000 +0100 @@ -17,21 +17,32 @@ Name: libkgeomap -BuildRequires: boost-devel -BuildRequires: libkde4-devel -BuildRequires: libkexiv2-devel -BuildRequires: libmarblewidget-devel Summary: Wrapper around different world-map components License: LGPL-2.1 and GPL-2.0+ Group: Development/Libraries/KDE Url: http://www.kde.org -Version: 15.08.3 +Version: 15.12.1 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires -Requires: libkgeomap2 -Obsoletes: libkgeomap-lang +BuildRequires: extra-cmake-modules +BuildRequires: ktextwidgets-devel +BuildRequires: kconfig-devel +BuildRequires: ki18n-devel +BuildRequires: khtml-devel +BuildRequires: kdelibs4support-devel +BuildRequires: marble-devel +BuildRequires: libkexiv2-devel +BuildRequires: kxmlgui-devel +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Obsoletes: libkgeomap-kf5 < %{version} +Provides: libkgeomap-kf5 = %{version} +Requires: libKF5KGeoMap10_0_0 = %version %description Libkgeomap is a wrapper around different world-map components, to browse and arrange photos over a map. @@ -45,43 +56,39 @@ %setup -q -n %{name}-%{version} %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - cd build - %makeinstall - %kde_post_install + %kf5_makeinstall -C build + %clean rm -rf $RPM_BUILD_ROOT -%package -n libkgeomap2 -Summary: Wrapper around different world-map components +%package -n libKF5KGeoMap10_0_0 Group: Development/Libraries/KDE -Recommends: marble -Requires: libkgeomap +Summary: Wrapper around different world-map components +Recommends: marble5 -%description -n libkgeomap2 -Libkgeomap is a wrapper around different world-map components, to browse and arrange photos over a map +%description -n libKF5KGeoMap10_0_0 +Libkgeomap is a wrapper around different world-map components, to browse and arrange photos over a map. Currently supported map engine are: - Marble, - OpenstreetMap (via Marble), - GoogleMap, This library is used by kipi-plugins, digiKam and other kipi host programs -%files -n libkgeomap2 -%defattr(-,root,root) -%_kde4_libdir/libkgeomap.so.* - -%post -n libkgeomap2 -p /sbin/ldconfig +%post -n libKF5KGeoMap10_0_0 -p /sbin/ldconfig -%postun -n libkgeomap2 -p /sbin/ldconfig +%postun -n libKF5KGeoMap10_0_0 -p /sbin/ldconfig %package devel -Summary: Wrapper around different world-map components Group: Development/Libraries/KDE -Requires: libkgeomap2 = %version +Summary: Wrapper around different world-map components +Requires: libKF5KGeoMap10_0_0 = %version +Obsoletes: libkgeomap-kf5-devel < %{version} +Provides: libkgeomap-kf5-devel = %{version} %description devel Libkgeomap is a wrapper around different world-map components, to browse and arrange photos over a map. @@ -93,14 +100,20 @@ %files devel %defattr(-,root,root) -%doc README -%_kde4_libdir/libkgeomap.so -%_includedir/libkgeomap/ -%_kde4_libdir/pkgconfig/libkgeomap.pc -%_kde4_appsdir/cmake/modules/FindKGeoMap.cmake +%doc COPYING README +%_libdir/cmake/KF5KGeoMap/ +%_kf5_includedir/libkgeomap_version.h +%_kf5_includedir/KGeoMap/ +%_libdir/libKF5KGeoMap.so + +%files -n libKF5KGeoMap10_0_0 +%defattr(-,root,root) +%doc COPYING.LIB README +%_libdir/libKF5KGeoMap.so.* %files %defattr(-,root,root) -%_kde4_appsdir/libkgeomap/ +%doc COPYING README +%_datadir/libkgeomap/ %changelog ++++++ libkgeomap-15.08.3.tar.xz -> libkgeomap-15.12.1.tar.xz ++++++ ++++ 34038 lines of diff (skipped)

1 0

commit kdepim for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package kdepim for openSUSE:Factory checked in at 2016-01-23 01:13:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim (Old) and /work/SRC/openSUSE:Factory/.kdepim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim/kdepim.changes 2016-01-10 13:07:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepim.new/kdepim.changes 2016-01-23 01:13:18.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:17:20 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- kdepim-15.12.0.tar.xz New: ---- kdepim-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim.spec ++++++ --- /var/tmp/diff_new_pack.sPUZGd/_old 2016-01-23 01:13:19.000000000 +0100 +++ /var/tmp/diff_new_pack.sPUZGd/_new 2016-01-23 01:13:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdepim # -# 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 @@ -55,7 +55,7 @@ %{nil} Name: kdepim -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: Base package of kdepim License: GPL-2.0+ and LGPL-2.1+ @@ -117,6 +117,7 @@ BuildRequires: phonon4qt5-devel BuildRequires: syndication-devel BuildRequires: update-desktop-files +BuildRequires: libkgapi-devel BuildRequires: xz BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 @@ -130,7 +131,7 @@ BuildRequires: pkgconfig(Qt5XmlPatterns) >= 5.2.0 Requires: akonadi_resources = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Conflicts: kdepim4 +Obsoletes: kdepim4 < %{version} # Account wizard files Conflicts: kdepim4-runtime <= 4.14.10 @@ -196,7 +197,7 @@ Group: System/GUI/KDE Requires: akonadi-server Requires: kdepim-runtime -Conflicts: akonadi +Obsoletes: akonadi < %{version} # Executables: Archive mail agent, followup reminder, mailfilter, notes, sendlateragent, akonadiconsole Conflicts: kdepim4 @@ -226,7 +227,7 @@ License: LGPL-2.1+ Group: Productivity/Networking/News/Utilities Requires: libkdepim = %{version} -Conflicts: akregator +Obsoletes: akregator < %{version} %description -n akregator5 A KDE Feed Aggregator @@ -258,7 +259,7 @@ Group: Productivity/Editors/Other Requires: ktexteditor Requires: libkdepim = %{version} -Conflicts: blogilo +Obsoletes: blogilo < %{version} %description -n blogilo5 A blog editor for KDE @@ -282,7 +283,7 @@ Group: Productivity/Networking/Email/Utilities Requires: kdepim-runtime Requires: libkdepim = %{version} -Conflicts: kaddressbook +Obsoletes: kaddressbook < %{version} # DBus service file Conflicts: libkdepim4 @@ -313,7 +314,7 @@ Requires: kdepim-runtime Requires: libkdepim = %{version} Recommends: kleopatra5 -Conflicts: kmail +Obsoletes: kmail < %{version} # Sieveeditor executable Conflicts: kdepim4 # mailtransport DBus interface @@ -365,7 +366,7 @@ License: LGPL-2.1+ Group: Productivity/Networking/News/Clients Requires: libkdepim = %{version} -Conflicts: kleopatra +Obsoletes: kleopatra < %{version} # kleopatra executables Conflicts: kdepim4 @@ -403,7 +404,7 @@ Group: Productivity/Networking/Email/Clients Requires: kdepim-runtime Requires: libkdepim = %{version} -Conflicts: ktnef +Obsoletes: ktnef < %{version} %description -n ktnef5 KTNEF is a viewer for email attachments in the TNEF format. @@ -424,8 +425,8 @@ License: LGPL-2.1+ Group: Productivity/Other Requires: libkdepim = %{version} -Conflicts: knotes -Conflicts: kjots +Obsoletes: kjots < %{version} +Obsoletes: knotes < %{version} %description -n knotes5 KNotes is a note taking application for KDE. @@ -458,7 +459,7 @@ Suggests: kaddressbook5 Suggests: knotes5 Suggests: korganizer5 -Conflicts: kontact +Obsoletes: kontact < %{version} %description -n kontact5 Kontact combines the individual applications KMail, KAddressBook and @@ -487,7 +488,7 @@ Group: Productivity/Office/Organizers Requires: kdepim-runtime Requires: libkdepim = %{version} -Conflicts: korganizer +Obsoletes: korganizer < %{version} # korgac binary, DBus interface Conflicts: kdepim4 @@ -529,7 +530,7 @@ License: LGPL-2.1+ Group: Productivity/Other Requires: libkdepim = %{version} -Conflicts: kalarm +Obsoletes: kalarm < %{version} %description -n kalarm5 Personal alarm message, command and email scheduler for KDE @@ -560,8 +561,8 @@ License: LGPL-2.1+ Group: System/GUI/KDE Requires: kdepim = %{version} -Conflicts: ktimetracker -Conflicts: libkdepim4 +Obsoletes: ktimetracker < %{version} +Obsoletes: libkdepim4 < %{version} %description -n libkdepim This package contains the basic packages for KDE PIM applications. ++++++ kdepim-15.12.0.tar.xz -> kdepim-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdepim/kdepim-15.12.0.tar.xz /work/SRC/openSUSE:Factory/.kdepim.new/kdepim-15.12.1.tar.xz differ: char 26, line 1

1 0

commit skanlite for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package skanlite for openSUSE:Factory checked in at 2016-01-23 01:10:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skanlite (Old) and /work/SRC/openSUSE:Factory/.skanlite.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skanlite" Changes: -------- --- /work/SRC/openSUSE:Factory/skanlite/skanlite.changes 2014-01-03 14:53:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.skanlite.new/skanlite.changes 2016-01-23 01:12:24.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Jan 18 10:13:15 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to the latest git snapshot from upstream. This contains + the rework done to make it work with KDE Frameworks. Unfortunately + this means that the lang package is gone for the moment, but at + least the program is still there as that the required libraries + are only available in a KF5 based version + +------------------------------------------------------------------- Old: ---- skanlite-1.1.tar.xz New: ---- skanlite-1.1git.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skanlite.spec ++++++ --- /var/tmp/diff_new_pack.wUofyJ/_old 2016-01-23 01:12:25.000000000 +0100 +++ /var/tmp/diff_new_pack.wUofyJ/_new 2016-01-23 01:12:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package skanlite # -# 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 @@ -17,20 +17,27 @@ Name: skanlite -Version: 1.1 +Version: 1.1git Release: 0 Summary: Image Scanner Application License: LGPL-2.1+ Group: Hardware/Scanner Url: http://kde-apps.org/content/show.php?content=109803 -Source0: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.ta… -BuildRequires: libkde4-devel +#Source0: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.ta… +Source0: %{name}-%{version}.tar.xz +BuildRequires: extra-cmake-modules +BuildRequires: kcoreaddons-devel +BuildRequires: kdoctools-devel +BuildRequires: ki18n-devel +BuildRequires: kio-devel +BuildRequires: ktextwidgets-devel +BuildRequires: kxmlgui-devel BuildRequires: libksane-devel -BuildRequires: oxygen-icon-theme +BuildRequires: libpng-devel +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Test) Recommends: %{name}-doc = %{version} -Recommends: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Skanlite is an image scanner application for KDE 4. @@ -43,40 +50,24 @@ %description doc This package provides the documentation for skanlite. -%lang_package - %prep -%setup -q +%setup -q -n %{name} %build -%cmake_kde4 -d build +%cmake_kf5 -d build %make_jobs %install -%kde4_makeinstall -C build - -for i in {16,22,32,48,64}; do - mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/"$i"x"$i"/apps - cp -a %{_kde4_iconsdir}/oxygen/"$i"x"$i"/devices/scanner.png %{buildroot}%{_kde4_iconsdir}/hicolor/"$i"x"$i"/apps/ -done - -%find_lang %{name} - -%kde_post_install +%kf5_makeinstall -C build %files %defattr(-,root,root,-) %doc src/COPYING src/TODO -%{_kde4_applicationsdir}/skanlite.desktop -%{_kde4_bindir}/skanlite -%{_kde4_iconsdir}/hicolor/*/apps/scanner.* +%{_kf5_applicationsdir}/org.kde.skanlite.desktop +%{_bindir}/skanlite %files doc %defattr(-,root,root,-) -%doc %lang(en) %{_kde4_htmldir}/en/skanlite/ - -%files lang -f %{name}.lang -%defattr(-,root,root,-) -%exclude %{_kde4_htmldir}/en/skanlite/ +%doc %lang(en) %{_kf5_htmldir}/en/skanlite/ %changelog

1 0

commit kdelibs4 for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2016-01-23 01:10:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old) and /work/SRC/openSUSE:Factory/.kdelibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdelibs4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4-apidocs.changes 2016-01-09 23:10:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4-apidocs.changes 2016-01-23 01:12:21.000000000 +0100 @@ -1,0 +2,15 @@ +Sat Jan 9 18:50:38 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to 4.14.16 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + +- Drop upstream patch bko355275.patch + +------------------------------------------------------------------- +Fri Jan 8 19:40:07 UTC 2016 - tittiatcoke(a)gmail.com + +- Drop support for Nepomuk which is no longer used + +------------------------------------------------------------------- @@ -8,0 +24,9 @@ +- Included upstream patch bko355275.patch to resolve the issue + with Kopete crashing when closing windows. (bko#355275) + +------------------------------------------------------------------- +Wed Dec 9 12:27:46 UTC 2015 - tchvatal(a)suse.com + +- Use yast2 sw_single package instead of invoking zypper in + interactive mode. bnc#858018 + @@ -10 +34 @@ -Tue Nov 10 20:56:49 UTC 2015 - tittiatcoke(a)gmail.com +Tue Nov 10 20:56:07 UTC 2015 - tittiatcoke(a)gmail.com @@ -16,0 +41,3 @@ +- Drop upstreamed patches: + * sync-with-upstream-FindGettext.patch + * Give-unique-names-to-the-targets-created-by-KDE4Macros.cmake.patch --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2016-01-09 23:10:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2016-01-23 01:12:21.000000000 +0100 @@ -1,0 +2,15 @@ +Sat Jan 9 18:50:38 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to 4.14.16 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + +- Drop upstream patch bko355275.patch + +------------------------------------------------------------------- +Fri Jan 8 19:40:07 UTC 2016 - tittiatcoke(a)gmail.com + +- Drop support for Nepomuk which is no longer used + +------------------------------------------------------------------- Old: ---- bko355275.patch kdelibs-4.14.15.tar.xz New: ---- kdelibs-4.14.16.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4-apidocs.spec ++++++ --- /var/tmp/diff_new_pack.GiZoGd/_old 2016-01-23 01:12:23.000000000 +0100 +++ /var/tmp/diff_new_pack.GiZoGd/_new 2016-01-23 01:12:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdelibs4-apidocs # -# 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 @@ -17,7 +17,7 @@ Name: kdelibs4-apidocs -Version: 4.14.15 +Version: 4.14.16 Release: 0 Summary: KDE 4 API documentation License: LGPL-2.1+ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.GiZoGd/_old 2016-01-23 01:12:23.000000000 +0100 +++ /var/tmp/diff_new_pack.GiZoGd/_new 2016-01-23 01:12:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdelibs4 # -# 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 @@ -20,7 +20,7 @@ %bcond_with gendoxygen Name: kdelibs4 -Version: 4.14.15 +Version: 4.14.16 Release: 0 BuildRequires: OpenEXR-devel BuildRequires: automoc4 @@ -48,14 +48,11 @@ BuildRequires: libpolkit-qt-1-devel BuildRequires: libqca2-devel >= 2.0.0 BuildRequires: libqt4-devel >= 4.8.0 -BuildRequires: libsoprano-devel BuildRequires: libudev-devel BuildRequires: libxslt-devel BuildRequires: pcre-devel BuildRequires: phonon-devel -BuildRequires: shared-desktop-ontologies-devel BuildRequires: shared-mime-info -BuildRequires: strigi BuildRequires: strigi-devel BuildRequires: update-desktop-files BuildRequires: utempter-devel @@ -90,8 +87,6 @@ # PATCH-FIX-OPENSUSE 0001-Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch -- Nepomuk is only used in a private header, browserrun_p.h, # thus it is not needed as KParts public dependancy, makes it possible to drop libsoprano-devel from libkde4-devel Requires Patch15: 0001-Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch -# PATCH-FIX-UPSTREAM bko355275.patch -- Revert a commit that caused Kopete to crash when closing windows -Patch16: bko355275.patch PreReq: permissions Requires: libattica0_4 >= %( echo `rpm -q --queryformat '%{VERSION}' libattica-devel`) Recommends: media-player-info @@ -151,7 +146,6 @@ %patch11 -p1 %patch12 -p1 %patch15 -p1 -%patch16 -p1 %build EXTRA_FLAGS="-DLIB_INSTALL_DIR=%{_kde4_libdir} \ @@ -164,6 +158,7 @@ -DHTML_INSTALL_DIR=%{_kde4_htmldir} \ -DWITH_SOLID_UDISKS2=TRUE \ -DKIO_NO_SOPRANO=ON \ + -DKIO_NO_STRIGI=TRUE \ -DKDE_DEFAULT_HOME=.kde4 -DSYSCONF_INSTALL_DIR=%{_sysconfdir}" %cmake_kde4 -d build -- -DKDE_DISTRIBUTION_TEXT="%distribution" $EXTRA_FLAGS %make_jobs @@ -382,7 +377,6 @@ %{_kde4_libdir}/libkunitconversion.so.* %{_kde4_libdir}/libkunittest.so.* %{_kde4_libdir}/libkutils.so.* -%{_kde4_libdir}/libnepomuk*.so.* %{_kde4_libdir}/libplasma.so.* %{_kde4_libdir}/libsolid.so.* %{_kde4_libdir}/libthreadweaver.so.* ++++++ kdelibs-4.14.15.tar.xz -> kdelibs-4.14.16.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdelibs4/kdelibs-4.14.15.tar.xz /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs-4.14.16.tar.xz differ: char 26, line 1

1 0

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

23 Jan '16

Hello community, here is the log from the commit of package kde-l10n for openSUSE:Factory checked in at 2016-01-23 01:10:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-10 13:07:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n.changes 2016-01-23 01:10:59.000000000 +0100 @@ -1,0 +2,8 @@ +Sat Jan 9 18:44:28 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + +------------------------------------------------------------------- Old: ---- kde-l10n-ar-15.12.0.tar.xz kde-l10n-bg-15.12.0.tar.xz kde-l10n-bs-15.12.0.tar.xz kde-l10n-ca-15.12.0.tar.xz kde-l10n-ca(a)valencia-15.12.0.tar.xz kde-l10n-cs-15.12.0.tar.xz kde-l10n-da-15.12.0.tar.xz kde-l10n-de-15.12.0.tar.xz kde-l10n-el-15.12.0.tar.xz kde-l10n-en_GB-15.12.0.tar.xz kde-l10n-eo-15.12.0.tar.xz kde-l10n-es-15.12.0.tar.xz kde-l10n-et-15.12.0.tar.xz kde-l10n-eu-15.12.0.tar.xz kde-l10n-fa-15.12.0.tar.xz kde-l10n-fi-15.12.0.tar.xz kde-l10n-fr-15.12.0.tar.xz kde-l10n-ga-15.12.0.tar.xz kde-l10n-gl-15.12.0.tar.xz kde-l10n-he-15.12.0.tar.xz kde-l10n-hi-15.12.0.tar.xz kde-l10n-hr-15.12.0.tar.xz kde-l10n-hu-15.12.0.tar.xz kde-l10n-ia-15.12.0.tar.xz kde-l10n-id-15.12.0.tar.xz kde-l10n-is-15.12.0.tar.xz kde-l10n-it-15.12.0.tar.xz kde-l10n-ja-15.12.0.tar.xz kde-l10n-kk-15.12.0.tar.xz kde-l10n-km-15.12.0.tar.xz kde-l10n-ko-15.12.0.tar.xz kde-l10n-lt-15.12.0.tar.xz kde-l10n-lv-15.12.0.tar.xz kde-l10n-mr-15.12.0.tar.xz kde-l10n-nb-15.12.0.tar.xz kde-l10n-nds-15.12.0.tar.xz kde-l10n-nl-15.12.0.tar.xz kde-l10n-nn-15.12.0.tar.xz kde-l10n-pa-15.12.0.tar.xz kde-l10n-pl-15.12.0.tar.xz kde-l10n-pt-15.12.0.tar.xz kde-l10n-pt_BR-15.12.0.tar.xz kde-l10n-ro-15.12.0.tar.xz kde-l10n-ru-15.12.0.tar.xz kde-l10n-sk-15.12.0.tar.xz kde-l10n-sl-15.12.0.tar.xz kde-l10n-sr-15.12.0.tar.xz kde-l10n-sv-15.12.0.tar.xz kde-l10n-tr-15.12.0.tar.xz kde-l10n-ug-15.12.0.tar.xz kde-l10n-uk-15.12.0.tar.xz kde-l10n-wa-15.12.0.tar.xz kde-l10n-zh_CN-15.12.0.tar.xz kde-l10n-zh_TW-15.12.0.tar.xz New: ---- kde-l10n-ar-15.12.1.tar.xz kde-l10n-bg-15.12.1.tar.xz kde-l10n-bs-15.12.1.tar.xz kde-l10n-ca-15.12.1.tar.xz kde-l10n-ca(a)valencia-15.12.1.tar.xz kde-l10n-cs-15.12.1.tar.xz kde-l10n-da-15.12.1.tar.xz kde-l10n-de-15.12.1.tar.xz kde-l10n-el-15.12.1.tar.xz kde-l10n-en_GB-15.12.1.tar.xz kde-l10n-eo-15.12.1.tar.xz kde-l10n-es-15.12.1.tar.xz kde-l10n-et-15.12.1.tar.xz kde-l10n-eu-15.12.1.tar.xz kde-l10n-fa-15.12.1.tar.xz kde-l10n-fi-15.12.1.tar.xz kde-l10n-fr-15.12.1.tar.xz kde-l10n-ga-15.12.1.tar.xz kde-l10n-gl-15.12.1.tar.xz kde-l10n-he-15.12.1.tar.xz kde-l10n-hi-15.12.1.tar.xz kde-l10n-hr-15.12.1.tar.xz kde-l10n-hu-15.12.1.tar.xz kde-l10n-ia-15.12.1.tar.xz kde-l10n-id-15.12.1.tar.xz kde-l10n-is-15.12.1.tar.xz kde-l10n-it-15.12.1.tar.xz kde-l10n-ja-15.12.1.tar.xz kde-l10n-kk-15.12.1.tar.xz kde-l10n-km-15.12.1.tar.xz kde-l10n-ko-15.12.1.tar.xz kde-l10n-lt-15.12.1.tar.xz kde-l10n-lv-15.12.1.tar.xz kde-l10n-mr-15.12.1.tar.xz kde-l10n-nb-15.12.1.tar.xz kde-l10n-nds-15.12.1.tar.xz kde-l10n-nl-15.12.1.tar.xz kde-l10n-nn-15.12.1.tar.xz kde-l10n-pa-15.12.1.tar.xz kde-l10n-pl-15.12.1.tar.xz kde-l10n-pt-15.12.1.tar.xz kde-l10n-pt_BR-15.12.1.tar.xz kde-l10n-ro-15.12.1.tar.xz kde-l10n-ru-15.12.1.tar.xz kde-l10n-sk-15.12.1.tar.xz kde-l10n-sl-15.12.1.tar.xz kde-l10n-sr-15.12.1.tar.xz kde-l10n-sv-15.12.1.tar.xz kde-l10n-tr-15.12.1.tar.xz kde-l10n-ug-15.12.1.tar.xz kde-l10n-uk-15.12.1.tar.xz kde-l10n-wa-15.12.1.tar.xz kde-l10n-zh_CN-15.12.1.tar.xz kde-l10n-zh_TW-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde-l10n.spec ++++++ --- /var/tmp/diff_new_pack.ldly4Z/_old 2016-01-23 01:11:19.000000000 +0100 +++ /var/tmp/diff_new_pack.ldly4Z/_new 2016-01-23 01:11:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kde-l10n # -# 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 @@ -18,7 +18,7 @@ Name: kde-l10n -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: KDE translations base package License: GPL-2.0+ @@ -1500,6 +1500,10 @@ echo "%lang($l) %{_datadir}/klettres/$i" echo "%dir %{_datadir}/klettres" fi + if test -f %{buildroot}%{_datadir}/autocorrect/$i.xml; then + echo "%lang($l) %{_datadir}/autocorrect/$i.xml" + echo "%dir %{_datadir}/autocorrect" + fi if test -f %{buildroot}%{_datadir}/ktuberling/sounds/$i.soundtheme; then echo "%lang($l) %{_datadir}/ktuberling/sounds/$i.soundtheme" fi ++++++ kde-l10n-ar-15.12.0.tar.xz -> kde-l10n-ar-15.12.1.tar.xz ++++++ ++++ 6588 lines of diff (skipped) ++++++ kde-l10n-bg-15.12.0.tar.xz -> kde-l10n-bg-15.12.1.tar.xz ++++++ ++++ 2441 lines of diff (skipped) ++++++ kde-l10n-bs-15.12.0.tar.xz -> kde-l10n-bs-15.12.1.tar.xz ++++++ ++++ 7680 lines of diff (skipped) ++++++ kde-l10n-ca-15.12.0.tar.xz -> kde-l10n-ca-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-ca-15.12.0.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-ca-15.12.1.tar.xz differ: char 27, line 1 ++++++ kde-l10n-ca(a)valencia-15.12.0.tar.xz -> kde-l10n-ca(a)valencia-15.12.1.tar.xz ++++++ ++++ 8976 lines of diff (skipped) ++++++ kde-l10n-cs-15.12.0.tar.xz -> kde-l10n-cs-15.12.1.tar.xz ++++++ ++++ 7467 lines of diff (skipped) ++++++ kde-l10n-da-15.12.0.tar.xz -> kde-l10n-da-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-da-15.12.0.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-da-15.12.1.tar.xz differ: char 27, line 1 ++++++ kde-l10n-de-15.12.0.tar.xz -> kde-l10n-de-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-de-15.12.0.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-de-15.12.1.tar.xz differ: char 27, line 1 ++++++ kde-l10n-el-15.12.0.tar.xz -> kde-l10n-el-15.12.1.tar.xz ++++++ ++++ 6956 lines of diff (skipped) ++++++ kde-l10n-en_GB-15.12.0.tar.xz -> kde-l10n-en_GB-15.12.1.tar.xz ++++++ ++++ 7673 lines of diff (skipped) ++++++ kde-l10n-eo-15.12.0.tar.xz -> kde-l10n-eo-15.12.1.tar.xz ++++++ ++++ 2371 lines of diff (skipped) ++++++ kde-l10n-es-15.12.0.tar.xz -> kde-l10n-es-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-es-15.12.0.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-es-15.12.1.tar.xz differ: char 27, line 1 ++++++ kde-l10n-et-15.12.0.tar.xz -> kde-l10n-et-15.12.1.tar.xz ++++++ ++++ 7480 lines of diff (skipped) ++++++ kde-l10n-eu-15.12.0.tar.xz -> kde-l10n-eu-15.12.1.tar.xz ++++++ ++++ 2247 lines of diff (skipped) ++++++ kde-l10n-fa-15.12.0.tar.xz -> kde-l10n-fa-15.12.1.tar.xz ++++++ ++++ 2238 lines of diff (skipped) ++++++ kde-l10n-fi-15.12.0.tar.xz -> kde-l10n-fi-15.12.1.tar.xz ++++++ ++++ 10556 lines of diff (skipped) ++++++ kde-l10n-fr-15.12.0.tar.xz -> kde-l10n-fr-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-fr-15.12.0.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-fr-15.12.1.tar.xz differ: char 27, line 1 ++++++ kde-l10n-ga-15.12.0.tar.xz -> kde-l10n-ga-15.12.1.tar.xz ++++++ ++++ 6532 lines of diff (skipped) ++++++ kde-l10n-gl-15.12.0.tar.xz -> kde-l10n-gl-15.12.1.tar.xz ++++++ ++++ 9129 lines of diff (skipped) ++++++ kde-l10n-he-15.12.0.tar.xz -> kde-l10n-he-15.12.1.tar.xz ++++++ ++++ 6151 lines of diff (skipped) ++++++ kde-l10n-hi-15.12.0.tar.xz -> kde-l10n-hi-15.12.1.tar.xz ++++++ ++++ 2177 lines of diff (skipped) ++++++ kde-l10n-hr-15.12.0.tar.xz -> kde-l10n-hr-15.12.1.tar.xz ++++++ ++++ 6198 lines of diff (skipped) ++++++ kde-l10n-hu-15.12.0.tar.xz -> kde-l10n-hu-15.12.1.tar.xz ++++++ ++++ 7093 lines of diff (skipped) ++++++ kde-l10n-ia-15.12.0.tar.xz -> kde-l10n-ia-15.12.1.tar.xz ++++++ ++++ 1706 lines of diff (skipped) ++++++ kde-l10n-id-15.12.0.tar.xz -> kde-l10n-id-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-l10n-id-15.12.0/5/id/messages/applications/kate.po new/kde-l10n-id-15.12.1/5/id/messages/applications/kate.po --- old/kde-l10n-id-15.12.0/5/id/messages/applications/kate.po 2015-10-22 12:44:31.000000000 +0200 +++ new/kde-l10n-id-15.12.1/5/id/messages/applications/kate.po 2015-12-14 13:51:11.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kate\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-10-22 08:21+0000\n" +"POT-Creation-Date: 2015-12-14 11:33+0000\n" "PO-Revision-Date: 2014-11-22 10:47+0700\n" "Last-Translator: Andhika Padmawan <andhika.padmawan(a)gmail.com>\n" "Language-Team: Indonesian <translation-team-id(a)lists.sourceforge.net>\n" @@ -1104,15 +1104,15 @@ msgid "All people who have contributed and I have forgotten to mention" msgstr "Semua orang yang telah membantu dan saya lupa untuk menyebutkan" -#: main.cpp:153 +#: main.cpp:152 msgid "Start Kate with a given session." msgstr "Mulai Kate dengan sesi yang diberikan." -#: main.cpp:157 +#: main.cpp:156 msgid "Start Kate with a new anonymous session, implies '-n'." msgstr "Mulai Kate dengan sesi anonim baru, menyiratkan '-n'." -#: main.cpp:161 +#: main.cpp:160 msgid "" "Force start of a new kate instance (is ignored if start is used and another " "kate instance already has the given session opened), forced if no parameters " @@ -1122,7 +1122,7 @@ "lain telah memiliki sesi yang diberikan terbuka, memaksa jika sama sekali " "tidak ada parameter dan URL yang diberikan." -#: main.cpp:165 +#: main.cpp:164 msgid "" "If using an already running kate instance, block until it exits, if URLs " "given to open." @@ -1130,7 +1130,7 @@ "Jika Kate lainnya telah berjalan, memblokir sampai itu dikeluarkan, jika " "memberikan URL untuk membuka." -#: main.cpp:169 +#: main.cpp:168 msgid "" "Only try to reuse kate instance with this pid (is ignored if start is used " "and another kate instance already has the given session opened)." @@ -1138,27 +1138,27 @@ "Hanya coba menggunakan ulang kate dengan pid ini (diabaikan jika start telah " "digunakan dan kate lainnya telah mempunyai sesi yang diberikan terbuka)." -#: main.cpp:173 +#: main.cpp:172 msgid "Set encoding for the file to open." msgstr "Atur penyandian untuk berkas yang dibuka." -#: main.cpp:177 +#: main.cpp:176 msgid "Navigate to this line." msgstr "Arahkan ke baris ini." -#: main.cpp:181 +#: main.cpp:180 msgid "Navigate to this column." msgstr "Arahkan ke kolom ini." -#: main.cpp:185 +#: main.cpp:184 msgid "Read the contents of stdin." msgstr "Membaca isi stdin." -#: main.cpp:189 +#: main.cpp:188 msgid "The files/URLs opened by the application will be deleted after use" msgstr "Berkas/URL yang dibuka oleh aplikasi akan dihapus setelah penggunaan" -#: main.cpp:193 +#: main.cpp:192 msgid "Documents to open." msgstr "Dokumen yang akan dibuka." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-l10n-id-15.12.0/5/id/messages/kdeedu/kanagram.appdata.po new/kde-l10n-id-15.12.1/5/id/messages/kdeedu/kanagram.appdata.po --- old/kde-l10n-id-15.12.0/5/id/messages/kdeedu/kanagram.appdata.po 2014-11-24 09:40:11.000000000 +0100 +++ new/kde-l10n-id-15.12.1/5/id/messages/kdeedu/kanagram.appdata.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ -# -# Translators: -# Budiman Jojo <budimanjojo(a)gmail.com>, 2014 -msgid "" -msgstr "" -"Project-Id-Version: KDE Frameworks 5 Applications\n" -"POT-Creation-Date: 2014-08-15 08:28+0000\n" -"PO-Revision-Date: 2014-11-22 10:24+0700\n" -"Last-Translator: Budiman Jojo <budimanjojo(a)gmail.com>\n" -"Language-Team: Indonesian <translation-team-id(a)lists.sourceforge.net>\n" -"Language: id\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" - -#. (itstool) path: component/name -#: kanagram.appdata.xml:6 -msgid "Kanagram" -msgstr "Kanagram" - -#. (itstool) path: component/summary -#: kanagram.appdata.xml:7 -msgid "Letter Order Game" -msgstr "Permainan Urutan Huruf" - -#. (itstool) path: description/p -#: kanagram.appdata.xml:9 -msgid "" -"Kanagram is a game based on anagrams of words: the puzzle is solved when the " -"letters of the scrambled word are put back in the correct order. There is no " -"limit on either time taken, or the amount of attempts to solve the word. It " -"features several included word lists, a hints-and-cheats help system, a word " -"list editor, and allows for updating and distributing wordlists via " -"KNewStuff. The interface is scalable and appropriate for children." -msgstr "" -"Kanagram adalah permainan berbasis anagram dari kata: teka-teki diselesaikan " -"ketika huruf dari kata teracak diurutkan kembali dalam urutan yang benar. " -"Tidak ada batasan dari waktu maupun usaha yang digunakan untuk menyelesaikan " -"kata. Menampilkan beberapa daftar kata-kata, sebuah sistem bantuan petunjuk-" -"dan-tipuan, sebuah penyunting kata, dan memperbolehkan memperbarui dan " -"mendistribusikan daftar kata melalui KNewStuff. Ukuran antarmuka dapat " -"disetel dan cocok untuk anak-anak." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-l10n-id-15.12.0/5/id/messages/kdeedu/org.kde.kanagram.appdata.po new/kde-l10n-id-15.12.1/5/id/messages/kdeedu/org.kde.kanagram.appdata.po --- old/kde-l10n-id-15.12.0/5/id/messages/kdeedu/org.kde.kanagram.appdata.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-l10n-id-15.12.1/5/id/messages/kdeedu/org.kde.kanagram.appdata.po 2015-12-29 14:38:14.000000000 +0100 @@ -0,0 +1,43 @@ +# +# Translators: +# Budiman Jojo <budimanjojo(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: KDE Frameworks 5 Applications\n" +"POT-Creation-Date: 2015-12-27 10:11+0000\n" +"PO-Revision-Date: 2014-11-22 10:24+0700\n" +"Last-Translator: Budiman Jojo <budimanjojo(a)gmail.com>\n" +"Language-Team: Indonesian <translation-team-id(a)lists.sourceforge.net>\n" +"Language: id\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" + +#. (itstool) path: component/name +#: org.kde.kanagram.appdata.xml:6 +msgid "Kanagram" +msgstr "Kanagram" + +#. (itstool) path: component/summary +#: org.kde.kanagram.appdata.xml:7 +msgid "Letter Order Game" +msgstr "Permainan Urutan Huruf" + +#. (itstool) path: description/p +#: org.kde.kanagram.appdata.xml:9 +msgid "" +"Kanagram is a game based on anagrams of words: the puzzle is solved when the " +"letters of the scrambled word are put back in the correct order. There is no " +"limit on either time taken, or the amount of attempts to solve the word. It " +"features several included word lists, a hints-and-cheats help system, a word " +"list editor, and allows for updating and distributing wordlists via " +"KNewStuff. The interface is scalable and appropriate for children." +msgstr "" +"Kanagram adalah permainan berbasis anagram dari kata: teka-teki diselesaikan " +"ketika huruf dari kata teracak diurutkan kembali dalam urutan yang benar. " +"Tidak ada batasan dari waktu maupun usaha yang digunakan untuk menyelesaikan " +"kata. Menampilkan beberapa daftar kata-kata, sebuah sistem bantuan petunjuk-" +"dan-tipuan, sebuah penyunting kata, dan memperbolehkan memperbarui dan " +"mendistribusikan daftar kata melalui KNewStuff. Ukuran antarmuka dapat " +"disetel dan cocok untuk anak-anak." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-l10n-id-15.12.0/5/id/messages/kdegames/kpat.po new/kde-l10n-id-15.12.1/5/id/messages/kdegames/kpat.po --- old/kde-l10n-id-15.12.0/5/id/messages/kdegames/kpat.po 2015-10-04 12:22:48.000000000 +0200 +++ new/kde-l10n-id-15.12.1/5/id/messages/kdegames/kpat.po 2016-01-06 13:44:51.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-10-04 08:31+0000\n" +"POT-Creation-Date: 2016-01-06 11:34+0000\n" "PO-Revision-Date: 2014-12-19 18:46+0700\n" "Last-Translator: wantoyo <wantoyo(a)yahoo.com>\n" "Language-Team: Indonesian <translation-team-id(a)lists.sourceforge.net>\n" @@ -147,15 +147,15 @@ msgid "Get New Card Decks..." msgstr "Dapatkan Dek Kartu Baru..." -#: main.cpp:113 +#: main.cpp:115 msgid "KPatience" msgstr "KPatience" -#: main.cpp:115 +#: main.cpp:117 msgid "KDE Patience Game" msgstr "Permainan Patience KDE" -#: main.cpp:117 +#: main.cpp:119 msgid "" "© 1995 Paul Olav Tvete\n" "© 2000 Stephan Kulow" @@ -163,137 +163,137 @@ "© 1995 Paul Olav Tvete\n" "© 2000 Stephan Kulow" -#: main.cpp:122 +#: main.cpp:124 msgid "Paul Olav Tvete" msgstr "Paul Olav Tvete" -#: main.cpp:123 +#: main.cpp:125 msgid "Author of original Qt version" msgstr "Penulis asli versi Qt" -#: main.cpp:125 +#: main.cpp:127 msgid "Mario Weilguni" msgstr "Mario Weilguni" -#: main.cpp:126 +#: main.cpp:128 msgid "Initial KDE port" msgstr "Initial port KDE" -#: main.cpp:128 +#: main.cpp:130 msgid "Matthias Ettrich" msgstr "Matthias Ettrich" -#: main.cpp:131 +#: main.cpp:133 msgid "Rodolfo Borges" msgstr "Rodolfo Borges" -#: main.cpp:132 +#: main.cpp:134 msgid "New game types" msgstr "Tipe permainan baru" -#: main.cpp:134 +#: main.cpp:136 msgid "Peter H. Ruegg" msgstr "Peter H. Ruegg" -#: main.cpp:137 +#: main.cpp:139 msgid "Michael Koch" msgstr "Michael Koch" -#: main.cpp:138 main.cpp:159 +#: main.cpp:140 main.cpp:161 msgid "Bug fixes" msgstr "Memperbaiki kutu" -#: main.cpp:140 +#: main.cpp:142 msgid "Marcus Meissner" msgstr "Marcus Meissner" -#: main.cpp:141 +#: main.cpp:143 msgid "Shuffle algorithm for game numbers" msgstr "Algoritme mengocok kartu untuk angka-angka permainan" -#: main.cpp:143 +#: main.cpp:145 msgid "Tom Holroyd" msgstr "Tom Holroyd" -#: main.cpp:144 +#: main.cpp:146 msgid "Initial patience solver" msgstr "Initial solver patience" -#: main.cpp:146 +#: main.cpp:148 msgid "Stephan Kulow" msgstr "Stephan Kulow" -#: main.cpp:147 +#: main.cpp:149 msgid "Rewrite and current maintainer" msgstr "Menulis ulang dan pengelola sekarang" -#: main.cpp:149 +#: main.cpp:151 msgid "Erik Sigra" msgstr "Erik Sigra" -#: main.cpp:150 +#: main.cpp:152 msgid "Klondike improvements" msgstr "Perbaikan Klondike" -#: main.cpp:152 +#: main.cpp:154 msgid "Josh Metzler" msgstr "Josh Metzler" -#: main.cpp:153 +#: main.cpp:155 msgid "Spider implementation" msgstr "Perbaikan Spider" -#: main.cpp:155 +#: main.cpp:157 msgid "Maren Pakura" msgstr "Maren Pakura" -#: main.cpp:156 +#: main.cpp:158 msgid "Documentation" msgstr "Dokumentasi" -#: main.cpp:158 +#: main.cpp:160 msgid "Inge Wallin" msgstr "Inge Wallin" -#: main.cpp:161 +#: main.cpp:163 msgid "Simon Hürlimann" msgstr "Simon Hürlimann" -#: main.cpp:162 +#: main.cpp:164 msgid "Menu and toolbar work" msgstr "Menu dan kerja batang alat" -#: main.cpp:164 +#: main.cpp:166 msgid "Parker Coates" msgstr "Parker Coates" -#: main.cpp:165 +#: main.cpp:167 msgid "Cleanup and polish" msgstr "Membersihkan dan mengilapkan" -#: main.cpp:181 +#: main.cpp:183 msgctxt "List separator" msgid ", " msgstr ", " -#: main.cpp:188 +#: main.cpp:190 msgid "Try to find a solution to the given savegame" msgstr "" "Mencoba untuk menemukan sebuah solusi kepada savegame yang telah ditentukan" -#: main.cpp:189 +#: main.cpp:191 msgid "Dealer to solve (debug)" msgstr "Memecahkan pembagi kartu (awakutu)" -#: main.cpp:190 +#: main.cpp:192 msgid "Game range start (default 0:INT_MAX)" msgstr "Jangkauan mulai permainan (standar 0:INT_MAX)" -#: main.cpp:191 +#: main.cpp:193 msgid "Game range end (default start:start if start given)" msgstr "Jangkauan akhir permainan (standar mulai:mulai jika cenderung memulai)" -#: main.cpp:192 +#: main.cpp:194 #, kde-format msgid "" "Skip the selection screen and load a particular game type. Valid values are: " @@ -302,15 +302,15 @@ "Lewati layar pemilihan dan muat tipe permainan tertentu. Nilai yang valid " "adalah: %1" -#: main.cpp:193 +#: main.cpp:195 msgid "Directory with test cases" msgstr "Direktori dengan hal-hal uji" -#: main.cpp:194 +#: main.cpp:196 msgid "Generate random test cases" msgstr "Menghasilkan hal-hal uji acak" -#: main.cpp:195 +#: main.cpp:197 msgid "File to load" msgstr "Berkas yang dimuat" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-l10n-id-15.12.0/5/id/messages/kdegraphics/kruler.po new/kde-l10n-id-15.12.1/5/id/messages/kdegraphics/kruler.po --- old/kde-l10n-id-15.12.0/5/id/messages/kdegraphics/kruler.po 2015-10-13 14:15:52.000000000 +0200 +++ new/kde-l10n-id-15.12.1/5/id/messages/kdegraphics/kruler.po 2016-01-07 13:40:10.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-10-13 10:17+0000\n" +"POT-Creation-Date: 2016-01-07 11:27+0000\n" "PO-Revision-Date: 2015-02-01 10:36+0700\n" "Last-Translator: wantoyo <wantoyo(a)yahoo.com>\n" "Language-Team: Indonesian <translation-team-id(a)lists.sourceforge.net>\n" @@ -18,14 +18,6 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.5\n" -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "Wantoyo" - -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "wantoyo(a)yahoo.com" - #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_NativeMoving) #: cfg_advanced.ui:23 msgid "" @@ -343,3 +335,13 @@ #: main.cpp:41 msgid "Initial port to KDE 2" msgstr "Pangkalan awal untuk KDE 2" + +#: main.cpp:42 +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Wantoyo" + +#: main.cpp:42 +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "wantoyo(a)yahoo.com" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-l10n-id-15.12.0/5/id/messages/kdeutils/ark.po new/kde-l10n-id-15.12.1/5/id/messages/kdeutils/ark.po --- old/kde-l10n-id-15.12.0/5/id/messages/kdeutils/ark.po 2015-12-04 12:43:16.000000000 +0100 +++ new/kde-l10n-id-15.12.1/5/id/messages/kdeutils/ark.po 2016-01-05 16:49:13.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ark\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-12-04 10:15+0000\n" +"POT-Creation-Date: 2016-01-05 14:50+0000\n" "PO-Revision-Date: 2010-06-02 08:09+0700\n" "Last-Translator: Dirgita <dirgitadevina(a)yahoo.co.id>\n" "Language-Team: Indonesian <kde-i18n-doc(a)kde.org>\n" @@ -167,17 +167,17 @@ msgid "bkisofs code" msgstr "Kode bkisofs" -#: app/main.cpp:130 +#: app/main.cpp:129 msgid "URLs to open." msgstr "" -#: app/main.cpp:133 +#: app/main.cpp:132 msgid "" "Show a dialog for specifying the options for the operation (extract/add)" msgstr "" "Menampilkan dialog dalam menentukan opsi untuk operasi (ekstrak/penambahan)" -#: app/main.cpp:136 +#: app/main.cpp:135 msgid "" "Destination folder to extract to. Defaults to current path if not specified." msgstr "" @@ -185,13 +185,13 @@ "saat ini yang dituju." #. i18n: ectx: label, entry (openDestinationFolderAfterExtraction), group (Extraction) -#: app/main.cpp:140 kerfuffle/ark.kcfg:9 +#: app/main.cpp:139 kerfuffle/ark.kcfg:9 #, fuzzy #| msgid "Open destination folder after extraction" msgid "Open destination folder after extraction." msgstr "Buka folder tujuan usai mengekstrak" -#: app/main.cpp:143 +#: app/main.cpp:142 msgid "" "Query the user for an archive filename and add specified files to it. Quit " "when finished." @@ -199,7 +199,7 @@ "Membuat arsip dengan nama yang sesuai dengan nama berkas yang diberikan. " "Keluar begitu selesai." -#: app/main.cpp:146 +#: app/main.cpp:145 msgid "" "Add the specified files to 'filename'. Create archive if it does not exist. " "Quit when finished." @@ -207,7 +207,7 @@ "Menambahkan berkas pada 'filename'. Membuat arsip apabila belum ada. Keluar " "begitu selesai." -#: app/main.cpp:150 +#: app/main.cpp:149 msgid "" "Change the current dir to the first entry and add all other entries relative " "to this one." @@ -215,7 +215,7 @@ "Mengubah direktori sekarang menuju entri pertama dan menambahkan semua entri " "relatif terhadap direktori tersebut." -#: app/main.cpp:153 +#: app/main.cpp:152 msgid "" "Automatically choose a filename, with the selected suffix (for example rar, " "tar.gz, zip or any other supported types)" @@ -223,7 +223,7 @@ "Otomatis memilih nama berkas, dengan akhiran yang dipilih (contohnya rar, " "tar.gz, zip, atau jenis-jenis yang didukung lainnya)" -#: app/main.cpp:157 +#: app/main.cpp:156 msgid "" "Use the batch interface instead of the usual dialog. This option is implied " "if more than one url is specified." @@ -231,13 +231,13 @@ "Menggunakan antarmuka \"batch\" ketimbang dialog yang biasanya. Opsi ini " "dipakai apabila lebih dari satu url yang dinyatakan." -#: app/main.cpp:160 +#: app/main.cpp:159 msgid "" "The destination argument will be set to the path of the first file supplied." msgstr "" "Argumen destinasi akan diset menuju jalur berkas pertama yang disediakan." -#: app/main.cpp:163 +#: app/main.cpp:162 msgid "" "Archive contents will be read, and if detected to not be a single folder " "archive, a subfolder with the name of the archive will be created." @@ -822,7 +822,7 @@ "you want to try to view it as plain text?" msgstr "" -#: part/arkviewer.cpp:175 +#: part/arkviewer.cpp:174 msgid "The internal viewer cannot preview this file." msgstr "Penampil internal tidak dapat membuka pratinjau untuk berkas ini." @@ -914,51 +914,51 @@ msgid "ArkPart" msgstr "ArkPart" -#: part/part.cpp:273 +#: part/part.cpp:275 msgctxt "@action:inmenu" msgid "Show information panel" msgstr "Tampilkan panel informasi" -#: part/part.cpp:282 +#: part/part.cpp:284 #, fuzzy #| msgid "Open File" msgctxt "open a file with external program" msgid "&Open File" msgstr "Buka Berkas" -#: part/part.cpp:284 +#: part/part.cpp:286 #, fuzzy #| msgid "Click to preview the selected file" msgid "Click to open the selected file with the associated application" msgstr "Klik untuk melihat pratinjau berkas yang dipilih" -#: part/part.cpp:289 +#: part/part.cpp:291 #, fuzzy #| msgid "Open File" msgctxt "open a file with external program" msgid "Open File &With..." msgstr "Buka Berkas" -#: part/part.cpp:291 +#: part/part.cpp:293 #, fuzzy #| msgid "Click to preview the selected file" msgid "Click to open the selected file with an external program" msgstr "Klik untuk melihat pratinjau berkas yang dipilih" -#: part/part.cpp:296 +#: part/part.cpp:298 msgctxt "to preview a file inside an archive" msgid "Pre&view" msgstr "Pra&tinjau" -#: part/part.cpp:298 +#: part/part.cpp:300 msgid "Click to preview the selected file" msgstr "Klik untuk melihat pratinjau berkas yang dipilih" -#: part/part.cpp:304 +#: part/part.cpp:306 msgid "E&xtract" msgstr "E&kstrak" -#: part/part.cpp:306 +#: part/part.cpp:308 msgid "" "Click to open an extraction dialog, where you can choose to extract either " "all files or just the selected ones" @@ -966,47 +966,47 @@ "Klik untuk membuka dialog ekstraksi, sehingga Anda bisa memilih untuk " "mengekstrak semua atau beberapa berkas saja." -#: part/part.cpp:313 +#: part/part.cpp:315 msgid "Add &File..." msgstr "Tambah &Berkas..." -#: part/part.cpp:314 +#: part/part.cpp:316 msgid "Click to add files to the archive" msgstr "Klik untuk menambah berkas ke arsip" -#: part/part.cpp:320 +#: part/part.cpp:322 msgid "Add Fo&lder..." msgstr "Tambah Fo&lder..." -#: part/part.cpp:321 +#: part/part.cpp:323 msgid "Click to add a folder to the archive" msgstr "Klik untuk menambah folder ke arsip" -#: part/part.cpp:327 +#: part/part.cpp:329 msgid "De&lete" msgstr "&Hapus" -#: part/part.cpp:329 +#: part/part.cpp:331 msgid "Click to delete the selected files" msgstr "Klik untuk menghapus berkas yang dipilih" -#: part/part.cpp:382 +#: part/part.cpp:384 #, fuzzy #| msgid "Quick Extract To..." msgid "Extract To..." msgstr "Ekstrak Cepat ke..." -#: part/part.cpp:389 +#: part/part.cpp:391 msgid "Quick Extract To..." msgstr "Ekstrak Cepat ke..." -#: part/part.cpp:458 +#: part/part.cpp:460 #, kde-format msgctxt "@info" msgid "<filename>%1</filename> is a directory." msgstr "" -#: part/part.cpp:465 +#: part/part.cpp:467 #, fuzzy, kde-format #| msgid "The file '%1' already exists. Would you like to open it instead?" msgctxt "@info" @@ -1015,28 +1015,28 @@ "it instead?" msgstr "Berkas '%1' sudah ada. Dibuka?" -#: part/part.cpp:465 +#: part/part.cpp:467 msgctxt "@title:window" msgid "File Exists" msgstr "Berkas Sudah Ada" -#: part/part.cpp:465 +#: part/part.cpp:467 msgid "Open File" msgstr "Buka Berkas" -#: part/part.cpp:473 +#: part/part.cpp:475 #, fuzzy, kde-format #| msgid "Error opening archive: the file '%1' was not found." msgctxt "@info" msgid "The archive <filename>%1</filename> was not found." msgstr "Galat membuka berkas: '%1' tidak ditemukan." -#: part/part.cpp:473 part/part.cpp:492 part/part.cpp:499 part/part.cpp:564 +#: part/part.cpp:475 part/part.cpp:494 part/part.cpp:501 part/part.cpp:571 msgctxt "@title:window" msgid "Error Opening Archive" msgstr "Galat Membuka Arsip" -#: part/part.cpp:478 +#: part/part.cpp:480 #, fuzzy, kde-format #| msgid "The file '%1' already exists. Would you like to open it instead?" msgctxt "@info" @@ -1045,7 +1045,7 @@ "possible to read from it." msgstr "Berkas '%1' sudah ada. Dibuka?" -#: part/part.cpp:489 +#: part/part.cpp:491 #, fuzzy, kde-format #| msgid "" #| "Ark was not able to open the archive '%1'. No library capable of handling " @@ -1058,7 +1058,7 @@ "Ark tidak dapat membuka arsip '%1'. Tidak terdapat pustaka yang mampu " "menangani berkas yang ditemukan." -#: part/part.cpp:496 +#: part/part.cpp:498 #, fuzzy, kde-format #| msgid "" #| "Ark was not able to open the archive '%1'. No library capable of handling " @@ -1072,20 +1072,20 @@ "Ark tidak dapat membuka arsip '%1'. Tidak terdapat pustaka yang mampu " "menangani berkas yang ditemukan." -#: part/part.cpp:545 +#: part/part.cpp:552 #, fuzzy #| msgid "Extraction Dialog" msgid "Extraction settings" msgstr "Dialog Ekstraksi" -#: part/part.cpp:546 +#: part/part.cpp:553 #, fuzzy #| msgctxt "to preview a file inside an archive" #| msgid "Pre&view" msgid "Preview settings" msgstr "Pra&tinjau" -#: part/part.cpp:561 +#: part/part.cpp:568 #, fuzzy, kde-format #| msgid "Reading the archive '%1' failed with the error '%2'" msgctxt "@info" @@ -1094,11 +1094,11 @@ "<nl/><nl/><message>%2</message>" msgstr "Gagal membaca arsip '%1' dengan galat '%2'" -#: part/part.cpp:640 +#: part/part.cpp:647 msgid "Ark cannot open symlinks." msgstr "" -#: part/part.cpp:752 +#: part/part.cpp:759 #, fuzzy, kde-format #| msgid "" #| "The folder '%1' already exists. Are you sure you want to extract here?" @@ -1107,38 +1107,38 @@ "archive?" msgstr "Folder '%1' sudah ada. Yakin untuk mengekstrak ke sana?" -#: part/part.cpp:754 +#: part/part.cpp:761 msgid "File modified" msgstr "" -#: part/part.cpp:1013 +#: part/part.cpp:1020 msgctxt "@title:window" msgid "Add Files" msgstr "Tambah Berkas" -#: part/part.cpp:1020 +#: part/part.cpp:1027 msgctxt "@title:window" msgid "Add Folder" msgstr "Tambah Folder" -#: part/part.cpp:1045 +#: part/part.cpp:1052 msgid "Deleting these files is not undoable. Are you sure you want to do this?" msgstr "Berkas ini tidak dapat dikembalikan setelah dihapus. Yakin?" # Ini nama dialog. -#: part/part.cpp:1046 +#: part/part.cpp:1053 msgctxt "@title:window" msgid "Delete files" msgstr "Menghapus berkas" -#: part/part.cpp:1078 +#: part/part.cpp:1085 #, fuzzy #| msgid "Source archive" msgctxt "@title:window" msgid "Save Archive As" msgstr "Arsip sumber" -#: part/part.cpp:1085 +#: part/part.cpp:1092 #, fuzzy, kde-format #| msgid "" #| "A file named %1 already exists. Are you sure you want to overwrite " @@ -1150,7 +1150,7 @@ msgstr "Berkas dengan nama %1 sudah ada. Timpa?" # Sengaja diperpendek. -#: part/part.cpp:1099 +#: part/part.cpp:1106 #, fuzzy, kde-format #| msgid "" #| "The file %1 cannot be copied to the specified location. The " @@ -1161,7 +1161,7 @@ "location. The archive does not exist anymore." msgstr "Berkas %1 tidak dapat disalin. Arsipnya sudah tidak ada lagi." -#: part/part.cpp:1113 +#: part/part.cpp:1120 #, fuzzy, kde-format #| msgid "" #| "The archive could not be saved as %1. Try to save it in another " ++++++ kde-l10n-is-15.12.0.tar.xz -> kde-l10n-is-15.12.1.tar.xz ++++++ ++++ 2033 lines of diff (skipped) ++++++ kde-l10n-it-15.12.0.tar.xz -> kde-l10n-it-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-it-15.12.0.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-it-15.12.1.tar.xz differ: char 27, line 1 ++++++ kde-l10n-ja-15.12.0.tar.xz -> kde-l10n-ja-15.12.1.tar.xz ++++++ ++++ 7594 lines of diff (skipped) ++++++ kde-l10n-kk-15.12.0.tar.xz -> kde-l10n-kk-15.12.1.tar.xz ++++++ ++++ 2493 lines of diff (skipped) ++++++ kde-l10n-km-15.12.0.tar.xz -> kde-l10n-km-15.12.1.tar.xz ++++++ ++++ 2358 lines of diff (skipped) ++++++ kde-l10n-ko-15.12.0.tar.xz -> kde-l10n-ko-15.12.1.tar.xz ++++++ ++++ 3432 lines of diff (skipped) ++++++ kde-l10n-lt-15.12.0.tar.xz -> kde-l10n-lt-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-lt-15.12.0.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-lt-15.12.1.tar.xz differ: char 26, line 1 ++++++ kde-l10n-lv-15.12.0.tar.xz -> kde-l10n-lv-15.12.1.tar.xz ++++++ ++++ 2128 lines of diff (skipped) ++++++ kde-l10n-mr-15.12.0.tar.xz -> kde-l10n-mr-15.12.1.tar.xz ++++++ ++++ 6492 lines of diff (skipped) ++++++ kde-l10n-nb-15.12.0.tar.xz -> kde-l10n-nb-15.12.1.tar.xz ++++++ ++++ 7084 lines of diff (skipped) ++++++ kde-l10n-nds-15.12.0.tar.xz -> kde-l10n-nds-15.12.1.tar.xz ++++++ ++++ 7436 lines of diff (skipped) ++++++ kde-l10n-nl-15.12.0.tar.xz -> kde-l10n-nl-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-nl-15.12.0.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-nl-15.12.1.tar.xz differ: char 27, line 1 ++++++ kde-l10n-nn-15.12.0.tar.xz -> kde-l10n-nn-15.12.1.tar.xz ++++++ ++++ 9974 lines of diff (skipped) ++++++ kde-l10n-pa-15.12.0.tar.xz -> kde-l10n-pa-15.12.1.tar.xz ++++++ ++++ 1984 lines of diff (skipped) ++++++ kde-l10n-pl-15.12.0.tar.xz -> kde-l10n-pl-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-pl-15.12.0.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-pl-15.12.1.tar.xz differ: char 27, line 1 ++++++ kde-l10n-pt-15.12.0.tar.xz -> kde-l10n-pt-15.12.1.tar.xz ++++++ ++++ 7794 lines of diff (skipped) ++++++ kde-l10n-pt_BR-15.12.0.tar.xz -> kde-l10n-pt_BR-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-pt_BR-15.12.0.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-pt_BR-15.12.1.tar.xz differ: char 27, line 1 ++++++ kde-l10n-ro-15.12.0.tar.xz -> kde-l10n-ro-15.12.1.tar.xz ++++++ ++++ 6734 lines of diff (skipped) ++++++ kde-l10n-ru-15.12.0.tar.xz -> kde-l10n-ru-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-ru-15.12.0.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-ru-15.12.1.tar.xz differ: char 27, line 1 ++++++ kde-l10n-sk-15.12.0.tar.xz -> kde-l10n-sk-15.12.1.tar.xz ++++++ ++++ 8722 lines of diff (skipped) ++++++ kde-l10n-sl-15.12.0.tar.xz -> kde-l10n-sl-15.12.1.tar.xz ++++++ ++++ 7776 lines of diff (skipped) ++++++ kde-l10n-sr-15.12.0.tar.xz -> kde-l10n-sr-15.12.1.tar.xz ++++++ ++++ 39320 lines of diff (skipped) ++++++ kde-l10n-sv-15.12.0.tar.xz -> kde-l10n-sv-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-sv-15.12.0.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-sv-15.12.1.tar.xz differ: char 26, line 1 ++++++ kde-l10n-tr-15.12.0.tar.xz -> kde-l10n-tr-15.12.1.tar.xz ++++++ ++++ 7341 lines of diff (skipped) ++++++ kde-l10n-ug-15.12.0.tar.xz -> kde-l10n-ug-15.12.1.tar.xz ++++++ ++++ 6403 lines of diff (skipped) ++++++ kde-l10n-uk-15.12.0.tar.xz -> kde-l10n-uk-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kde-l10n/kde-l10n-uk-15.12.0.tar.xz /work/SRC/openSUSE:Factory/.kde-l10n.new/kde-l10n-uk-15.12.1.tar.xz differ: char 26, line 1 ++++++ kde-l10n-wa-15.12.0.tar.xz -> kde-l10n-wa-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-l10n-wa-15.12.0/5/wa/messages/applications/kate.po new/kde-l10n-wa-15.12.1/5/wa/messages/applications/kate.po --- old/kde-l10n-wa-15.12.0/5/wa/messages/applications/kate.po 2015-10-22 12:44:31.000000000 +0200 +++ new/kde-l10n-wa-15.12.1/5/wa/messages/applications/kate.po 2015-12-14 13:51:11.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kate\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-10-22 08:21+0000\n" +"POT-Creation-Date: 2015-12-14 11:33+0000\n" "PO-Revision-Date: 2011-07-17 15:37+0200\n" "Last-Translator: Jean Cayron <jean.cayron(a)base.be>\n" "Language-Team: Walloon <linux(a)walon.org>\n" @@ -1152,66 +1152,66 @@ msgid "All people who have contributed and I have forgotten to mention" msgstr "Totes les djins k' ont aidî et k' dj' a rovyî d' dire li no" -#: main.cpp:153 +#: main.cpp:152 #, fuzzy #| msgid "Start Kate with a given session" msgid "Start Kate with a given session." msgstr "Enonder Kate avou ene session dinêye" -#: main.cpp:157 +#: main.cpp:156 #, fuzzy #| msgid "Start Kate with a given session" msgid "Start Kate with a new anonymous session, implies '-n'." msgstr "Enonder Kate avou ene session dinêye" -#: main.cpp:161 +#: main.cpp:160 msgid "" "Force start of a new kate instance (is ignored if start is used and another " "kate instance already has the given session opened), forced if no parameters " "and no URLs are given at all." msgstr "" -#: main.cpp:165 +#: main.cpp:164 msgid "" "If using an already running kate instance, block until it exits, if URLs " "given to open." msgstr "" -#: main.cpp:169 +#: main.cpp:168 msgid "" "Only try to reuse kate instance with this pid (is ignored if start is used " "and another kate instance already has the given session opened)." msgstr "" -#: main.cpp:173 +#: main.cpp:172 #, fuzzy #| msgid "Set encoding for the file to open" msgid "Set encoding for the file to open." msgstr "Defini l' ecôdaedje pol fitchî a drovi" -#: main.cpp:177 +#: main.cpp:176 #, fuzzy #| msgid "Navigate to this line" msgid "Navigate to this line." msgstr "Potchî a cisse roye" -#: main.cpp:181 +#: main.cpp:180 #, fuzzy #| msgid "Navigate to this column" msgid "Navigate to this column." msgstr "Potchî a cisse colone" -#: main.cpp:185 +#: main.cpp:184 #, fuzzy #| msgid "Read the contents of stdin" msgid "Read the contents of stdin." msgstr "Lére çou k' i gn a dins stdin" -#: main.cpp:189 +#: main.cpp:188 msgid "The files/URLs opened by the application will be deleted after use" msgstr "" -#: main.cpp:193 +#: main.cpp:192 #, fuzzy #| msgid "Document to open" msgid "Documents to open." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-l10n-wa-15.12.0/5/wa/messages/kdegames/kpat.po new/kde-l10n-wa-15.12.1/5/wa/messages/kdegames/kpat.po --- old/kde-l10n-wa-15.12.0/5/wa/messages/kdegames/kpat.po 2015-10-04 12:22:48.000000000 +0200 +++ new/kde-l10n-wa-15.12.1/5/wa/messages/kdegames/kpat.po 2016-01-06 13:44:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kpat\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-10-04 08:31+0000\n" +"POT-Creation-Date: 2016-01-06 11:34+0000\n" "PO-Revision-Date: 2011-01-09 09:53+0100\n" "Last-Translator: Jean Cayron <jean.cayron(a)gmail.com>\n" "Language-Team: Walloon <linux(a)walon.org>\n" @@ -148,15 +148,15 @@ msgid "Get New Card Decks..." msgstr "Cweri des noveas dos d' cwåtes..." -#: main.cpp:113 +#: main.cpp:115 msgid "KPatience" msgstr "KPacyince" -#: main.cpp:115 +#: main.cpp:117 msgid "KDE Patience Game" msgstr "Djeu d' pacyince po KDE" -#: main.cpp:117 +#: main.cpp:119 msgid "" "© 1995 Paul Olav Tvete\n" "© 2000 Stephan Kulow" @@ -164,138 +164,138 @@ "© 1995, Paul Olav Tvete\n" "© 2000 Stephan Kulow" -#: main.cpp:122 +#: main.cpp:124 msgid "Paul Olav Tvete" msgstr "Paul Olav Tvete" -#: main.cpp:123 +#: main.cpp:125 msgid "Author of original Qt version" msgstr "Oteur del prumire modêye Qt" -#: main.cpp:125 +#: main.cpp:127 msgid "Mario Weilguni" msgstr "Mario Weilguni" -#: main.cpp:126 +#: main.cpp:128 msgid "Initial KDE port" msgstr "Prumî poirtaedje viè KDE" -#: main.cpp:128 +#: main.cpp:130 msgid "Matthias Ettrich" msgstr "Matthias Ettrich" -#: main.cpp:131 +#: main.cpp:133 msgid "Rodolfo Borges" msgstr "Rodolfo Borges" -#: main.cpp:132 +#: main.cpp:134 msgid "New game types" msgstr "Novelès sôres di djeus" -#: main.cpp:134 +#: main.cpp:136 msgid "Peter H. Ruegg" msgstr "Peter H. Ruegg" -#: main.cpp:137 +#: main.cpp:139 msgid "Michael Koch" msgstr "Michael Koch" -#: main.cpp:138 main.cpp:159 +#: main.cpp:140 main.cpp:161 msgid "Bug fixes" msgstr "Coridjaedjes di bugs" -#: main.cpp:140 +#: main.cpp:142 msgid "Marcus Meissner" msgstr "Marcus Meissner" -#: main.cpp:141 +#: main.cpp:143 msgid "Shuffle algorithm for game numbers" msgstr "Algorisse di maxhaedje po les limeros des pårt" -#: main.cpp:143 +#: main.cpp:145 msgid "Tom Holroyd" msgstr "Tom Holroyd" -#: main.cpp:144 +#: main.cpp:146 msgid "Initial patience solver" msgstr "Prumî rezoudeu d' pacyince" -#: main.cpp:146 +#: main.cpp:148 msgid "Stephan Kulow" msgstr "Stephan Kulow" -#: main.cpp:147 +#: main.cpp:149 msgid "Rewrite and current maintainer" msgstr "Riscrijhaedje et mintneu do moumint" -#: main.cpp:149 +#: main.cpp:151 msgid "Erik Sigra" msgstr "Erik Sigra" -#: main.cpp:150 +#: main.cpp:152 msgid "Klondike improvements" msgstr "Amidraedjes a Klondike" -#: main.cpp:152 +#: main.cpp:154 msgid "Josh Metzler" msgstr "Josh Metzler" -#: main.cpp:153 +#: main.cpp:155 msgid "Spider implementation" msgstr "Implemintåcion di l' araegne" -#: main.cpp:155 +#: main.cpp:157 msgid "Maren Pakura" msgstr "Maren Pakura" -#: main.cpp:156 +#: main.cpp:158 msgid "Documentation" msgstr "Documintåcion" -#: main.cpp:158 +#: main.cpp:160 msgid "Inge Wallin" msgstr "Inge Wallin" -#: main.cpp:161 +#: main.cpp:163 msgid "Simon Hürlimann" msgstr "Simon Hürlimann" -#: main.cpp:162 +#: main.cpp:164 msgid "Menu and toolbar work" msgstr "Ovraedje sol dressêye et l' bår ås usteyes" -#: main.cpp:164 +#: main.cpp:166 msgid "Parker Coates" msgstr "Parker Coates" -#: main.cpp:165 +#: main.cpp:167 msgid "Cleanup and polish" msgstr "Rinetiaedje eyet afroyaedje" -#: main.cpp:181 +#: main.cpp:183 msgctxt "List separator" msgid ", " msgstr ", " -#: main.cpp:188 +#: main.cpp:190 msgid "Try to find a solution to the given savegame" msgstr "Sayîz d' trover ene solucion pol djeu d' schapaedje diné" -#: main.cpp:189 +#: main.cpp:191 msgid "Dealer to solve (debug)" msgstr "Dineu d' cwårdjeus a rezoude (disbogaedje)" -#: main.cpp:190 +#: main.cpp:192 msgid "Game range start (default 0:INT_MAX)" msgstr "Fortchete d' enondaedje do djeu (prémetou 0:INT_MAX)" -#: main.cpp:191 +#: main.cpp:193 msgid "Game range end (default start:start if start given)" msgstr "" "Fortchete di finixhaedje do djeu (prémetou start:start si l' enondaedje est " "dné)" -#: main.cpp:192 +#: main.cpp:194 #, kde-format msgid "" "Skip the selection screen and load a particular game type. Valid values are: " @@ -304,15 +304,15 @@ "Passer l' waitroûle di tchoes eyet tcherdjî ene sôre di djeu dnêye. Les " "valåbès valixhances sont: %1" -#: main.cpp:193 +#: main.cpp:195 msgid "Directory with test cases" msgstr "" -#: main.cpp:194 +#: main.cpp:196 msgid "Generate random test cases" msgstr "" -#: main.cpp:195 +#: main.cpp:197 msgid "File to load" msgstr "Fitchî a tcherdjî" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-l10n-wa-15.12.0/5/wa/messages/kdepim/kmail.po new/kde-l10n-wa-15.12.1/5/wa/messages/kdepim/kmail.po --- old/kde-l10n-wa-15.12.0/5/wa/messages/kdepim/kmail.po 2015-11-19 15:31:59.000000000 +0100 +++ new/kde-l10n-wa-15.12.1/5/wa/messages/kdepim/kmail.po 2016-01-05 16:49:13.000000000 +0100 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: kmail\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-11-19 13:31+0000\n" +"POT-Creation-Date: 2016-01-05 14:49+0000\n" "PO-Revision-Date: 2013-07-06 02:07+0200\n" "Last-Translator: Jean Cayron <jean.cayron(a)gmail.com>\n" "Language-Team: Walloon <linux-wa(a)walon.org>\n" @@ -2460,6 +2460,71 @@ msgid "Folder Shortcut %1" msgstr "Racourti viè l' ridant %1" +#. i18n: file: about/introduction_kmail.html +#: html.cpp:2 +#, fuzzy, kde-format +#| msgid "Welcome to KMail" +msgctxt "%1 is version" +msgid "Welcome to KMail %1" +msgstr "Bénvnou dins KMail" + +#. i18n: file: about/introduction_kmail.html +#: html.cpp:4 +msgid "" +"KMail is the email client by KDE. It is designed to be fully compatible with " +"Internet mailing standards including IMAP, POP3 and SMTP." +msgstr "" + +#. i18n: file: about/introduction_kmail.html +#: html.cpp:6 +msgid "KMail has many powerful features that are described in the <a href=" +msgstr "" + +#. i18n: file: about/introduction_kmail.html +#: html.cpp:8 +msgid "Important changes since last version:" +msgstr "" + +#. i18n: file: about/introduction_kmail.html +#: html.cpp:10 +#, fuzzy +#| msgid "" +#| "Some of the new features in this release of KMail include (compared to " +#| "KMail %1, which is part of KDE Software Compilation %2):\n" +msgid "Some of the new features in this release of KMail include:" +msgstr "" +"I gn a ezès novelès fonccionålités di cisse rexhowe ci di KMail (s' on " +"ravize KMail %1, ki fjheut pårteye del Ramexhnêye di programes KDE %2) :</" +"p>\n" + +#. i18n: file: about/introduction_kmail.html +#: html.cpp:12 +#, fuzzy +#| msgid "" +#| "Please take a moment to fill in the KMail configuration panel at " +#| "Settings->Configure KMail.\n" +#| "You need to create at least a default identity and an incoming as well as " +#| "outgoing mail account.\n" +msgid "" +"Please take a moment to fill in the KMail configuration panel at Settings-" +">Configure KMail. You need to create at least a default identity and " +"incoming as well as outgoing mail account." +msgstr "" +"Purdoz ene munute po rimpli l' sicriftôr d' apontiaedje di KMAil dins " +"Apontiaedjes->Apontyî KMail.\n" +"Vos dvoz ahiver pol moens ene idintité prémetowe eyet on conte emile " +"rintrant et rexhant.\n" + +#. i18n: file: about/introduction_kmail.html +#: html.cpp:14 +msgid "We hope that you will enjoy KMail." +msgstr "" + +#. i18n: file: about/introduction_kmail.html +#: html.cpp:16 +msgid "Thank you, The KMail Team" +msgstr "" + #: identity/identityaddvcarddialog.cpp:36 #: identity/identityeditvcarddialog.cpp:53 msgid "Create own vCard" @@ -6420,13 +6485,13 @@ msgid "Prefer &HTML to Plain Text" msgstr "&HTML pus rade ki peur tecse" -#: widgets/displaymessageformatactionmenu.cpp:42 +#: widgets/displaymessageformatactionmenu.cpp:41 #, fuzzy #| msgid "Prefer &HTML to Plain Text" msgid "Prefer &Plain Text to HTML" msgstr "&HTML pus rade ki peur tecse" -#: widgets/displaymessageformatactionmenu.cpp:49 +#: widgets/displaymessageformatactionmenu.cpp:47 #, fuzzy #| msgid "Reset Font Settings" msgid "Use Global Setting" @@ -6480,25 +6545,6 @@ #~ "    L' ekipe di KMail" #~ msgid "" -#~ "Some of the new features in this release of KMail include (compared to " -#~ "KMail %1, which is part of KDE Software Compilation %2):\n" -#~ msgstr "" -#~ "I gn a ezès novelès fonccionålités di cisse rexhowe ci di KMail (s' on " -#~ "ravize KMail %1, ki fjheut pårteye del Ramexhnêye di programes KDE %2) :</" -#~ "p>\n" - -#~ msgid "" -#~ "Please take a moment to fill in the KMail configuration panel at " -#~ "Settings->Configure KMail.\n" -#~ "You need to create at least a default identity and an incoming as well as " -#~ "outgoing mail account.\n" -#~ msgstr "" -#~ "Purdoz ene munute po rimpli l' sicriftôr d' apontiaedje di KMAil dins " -#~ "Apontiaedjes->Apontyî KMail.\n" -#~ "Vos dvoz ahiver pol moens ene idintité prémetowe eyet on conte emile " -#~ "rintrant et rexhant.\n" - -#~ msgid "" #~ "Important changes</" #~ "span> (compared to KMail %1):\n" #~ msgstr "" @@ -13232,9 +13278,6 @@ #~ msgid "attached" #~ msgstr "ataetchî" -#~ msgid "Welcome to KMail" -#~ msgstr "Bénvnou dins KMail" - #~ msgid "Welcome" #~ msgstr "Wilikome" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-l10n-wa-15.12.0/5/wa/messages/kdepim/kontact.po new/kde-l10n-wa-15.12.1/5/wa/messages/kdepim/kontact.po --- old/kde-l10n-wa-15.12.0/5/wa/messages/kdepim/kontact.po 2015-10-16 12:04:49.000000000 +0200 +++ new/kde-l10n-wa-15.12.1/5/wa/messages/kdepim/kontact.po 2016-01-05 16:49:13.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kontact\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-10-16 08:16+0000\n" +"POT-Creation-Date: 2016-01-05 14:49+0000\n" "PO-Revision-Date: 2013-03-19 17:01+0100\n" "Last-Translator: Jean Cayron <jean.cayron(a)gmail.com>\n" "Language-Team: Walloon <linux-wa(a)walon.org>\n" @@ -204,6 +204,37 @@ msgid "%1 License" msgstr "%1 Licince" +#. i18n: file: src/about/loading_kontact.html +#: src/html.cpp:2 +#, fuzzy +#| msgid "Loading Kontact..." +msgid "Loading Kontact ..." +msgstr "Dji tchedje Kontact..." + +#. i18n: file: src/about/introduction_kontact.html +#: src/html.cpp:4 +#, kde-format +msgid "Welcome to Kontact %1" +msgstr "" + +#. i18n: file: src/about/introduction_kontact.html +#: src/html.cpp:6 +#, fuzzy +#| msgid "" +#| "Kontact handles your e-mail, address book, calendar, to-do list and more." +msgid "" +"Kontact handles your e-mail, address book, calendar, to-do list and more." +msgstr "" +"Kontact apougne vos emiles, vosse calpin d' adresse, calindrî, djivêye des " +"afés et co pus." + +#. i18n: file: src/about/introduction_kontact.html +#: src/html.cpp:8 +#, fuzzy +#| msgid "&Kontact Introduction" +msgid "Skip this introduction" +msgstr "Adrovaedje di &Kontact" + #: src/iconsidepane.cpp:254 msgctxt "@action:inmenu" msgid "Show Icons Only" @@ -623,12 +654,6 @@ #~ "<h2 style='text-align:center; margin-top: 0px; margin-bottom: 0px'>%1</h2>" #, fuzzy -#~| msgid "Loading Kontact..." -#~ msgctxt "@item:intext" -#~ msgid "Loading Kontact..." -#~ msgstr "Dji tchedje Kontact..." - -#, fuzzy #~| msgid "KDE Kontact" #~ msgctxt "@item:intext" #~ msgid "KDE Kontact" @@ -678,16 +703,6 @@ #~ "\"margin-bottom: 0px\"> <a href=\"%24\">Passer cist adrovaedje</a>" #, fuzzy -#~| msgid "" -#~| "Kontact handles your e-mail, address book, calendar, to-do list and more." -#~ msgctxt "@item:intext" -#~ msgid "" -#~ "Kontact handles your e-mail, address book, calendar, to-do list and more." -#~ msgstr "" -#~ "Kontact apougne vos emiles, vosse calpin d' adresse, calindrî, djivêye " -#~ "des afés et co pus." - -#, fuzzy #~| msgid "&Tip of the Day" #~ msgctxt "@action:inmenu" #~ msgid "&Tip of the Day" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-l10n-wa-15.12.0/5/wa/messages/kdepim/libmessageviewer.po new/kde-l10n-wa-15.12.1/5/wa/messages/kdepim/libmessageviewer.po --- old/kde-l10n-wa-15.12.0/5/wa/messages/kdepim/libmessageviewer.po 2015-11-25 19:04:04.000000000 +0100 +++ new/kde-l10n-wa-15.12.1/5/wa/messages/kdepim/libmessageviewer.po 2016-01-05 16:49:13.000000000 +0100 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: kmail\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-11-25 16:59+0000\n" +"POT-Creation-Date: 2016-01-05 14:49+0000\n" "PO-Revision-Date: 2011-08-15 08:58+0200\n" "Last-Translator: Jean Cayron <jean.cayron(a)base.be>\n" "Language-Team: Walloon <linux-wa(a)walon.org>\n" @@ -1593,7 +1593,7 @@ msgid "Unable to edit attachment" msgstr "Dji n' a sepou aspougnî l' ataetchmint" -#: viewer/messagepart.cpp:349 viewer/objecttreeparser.cpp:2176 +#: viewer/messagepart.cpp:349 viewer/objecttreeparser.cpp:2183 msgid "Wrong Crypto Plug-In." msgstr "Mwais tchôke-divins di criptografeye." @@ -1610,8 +1610,8 @@ msgid "The crypto engine returned no cleartext data." msgstr "L' éndjin d' criptografeye n' a nén rtourner des dnêyes cleartext." -#: viewer/messagepart.cpp:532 viewer/objecttreeparser.cpp:1997 -#: viewer/objecttreeparser.cpp:2039 +#: viewer/messagepart.cpp:532 viewer/objecttreeparser.cpp:2004 +#: viewer/objecttreeparser.cpp:2046 msgid "Status: " msgstr "Sitatut: " @@ -1706,32 +1706,32 @@ msgid "Could not decrypt the data." msgstr "Li tchôke-divins di discriptaedje %1 èn sait discripter nou messaedje." -#: viewer/objecttreeparser.cpp:719 +#: viewer/objecttreeparser.cpp:724 #, fuzzy, kde-format msgid "Crypto plug-in \"%1\" could not decrypt the data." msgstr "Li tchôke-divins di discriptaedje %1 èn sait discripter nou messaedje." -#: viewer/objecttreeparser.cpp:721 +#: viewer/objecttreeparser.cpp:726 #, kde-format msgid "Error: %1" msgstr "Aroke: %1" -#: viewer/objecttreeparser.cpp:732 viewer/objecttreeparser.cpp:2247 +#: viewer/objecttreeparser.cpp:739 viewer/objecttreeparser.cpp:2252 #, fuzzy, kde-format msgid "Crypto plug-in \"%1\" is not initialized." msgstr "Li tchôke-divins di discriptaedje %1 èn sait discripter nou messaedje." -#: viewer/objecttreeparser.cpp:736 +#: viewer/objecttreeparser.cpp:743 #, fuzzy, kde-format msgid "Crypto plug-in \"%1\" cannot decrypt messages." msgstr "Li tchôke-divins di discriptaedje %1 èn sait discripter nou messaedje." -#: viewer/objecttreeparser.cpp:740 viewer/objecttreeparser.cpp:2256 +#: viewer/objecttreeparser.cpp:747 viewer/objecttreeparser.cpp:2261 #, fuzzy msgid "No appropriate crypto plug-in was found." msgstr "Nol apontiaedje di tchôke-divins di criptografeye di trové." -#: viewer/objecttreeparser.cpp:834 +#: viewer/objecttreeparser.cpp:841 msgid "" "Note: This HTML message may contain external references to images " "etc. For security/privacy reasons external references are not loaded. If you " @@ -1739,7 +1739,7 @@ "for this message <a href=\"kmail:loadExternal\">by clicking here</a>." msgstr "" -#: viewer/objecttreeparser.cpp:848 +#: viewer/objecttreeparser.cpp:855 msgid "" "Note: This is an HTML message. For security reasons, only the raw " "HTML code is shown. If you trust the sender of this message then you can " @@ -1747,301 +1747,301 @@ "\">by clicking here</a>." msgstr "" -#: viewer/objecttreeparser.cpp:1438 +#: viewer/objecttreeparser.cpp:1445 msgctxt "display name for an unnamed attachment" msgid "Unnamed" msgstr "Co nou no" -#: viewer/objecttreeparser.cpp:1494 +#: viewer/objecttreeparser.cpp:1501 msgid "Error: Signature not verified" msgstr "Aroke: Sinateure nén verifieye" -#: viewer/objecttreeparser.cpp:1497 +#: viewer/objecttreeparser.cpp:1504 msgid "Good signature" msgstr "Boune sinateure" -#: viewer/objecttreeparser.cpp:1500 +#: viewer/objecttreeparser.cpp:1507 msgid "Bad signature" msgstr "Mwaijhe sinateure" -#: viewer/objecttreeparser.cpp:1503 +#: viewer/objecttreeparser.cpp:1510 msgid "No public key to verify the signature" msgstr "Pont d' clé publike po verifyî l' sinateure" -#: viewer/objecttreeparser.cpp:1506 +#: viewer/objecttreeparser.cpp:1513 msgid "No signature found" msgstr "Nole sinateure di trovêye" -#: viewer/objecttreeparser.cpp:1509 +#: viewer/objecttreeparser.cpp:1516 msgid "Error verifying the signature" msgstr "Åk n' a nén stî tot verifiant l' sinateure" -#: viewer/objecttreeparser.cpp:1512 +#: viewer/objecttreeparser.cpp:1519 msgid "Different results for signatures" msgstr "Diferin rzultat po les sinateures" -#: viewer/objecttreeparser.cpp:1531 +#: viewer/objecttreeparser.cpp:1538 msgid "No status information available." msgstr "" -#: viewer/objecttreeparser.cpp:1538 viewer/objecttreeparser.cpp:1624 +#: viewer/objecttreeparser.cpp:1545 viewer/objecttreeparser.cpp:1631 msgid "Good signature." msgstr "Boune sinateure." -#: viewer/objecttreeparser.cpp:1559 +#: viewer/objecttreeparser.cpp:1566 msgid "One key has expired." msgstr "" -#: viewer/objecttreeparser.cpp:1563 +#: viewer/objecttreeparser.cpp:1570 msgid "The signature has expired." msgstr "" -#: viewer/objecttreeparser.cpp:1568 +#: viewer/objecttreeparser.cpp:1575 msgid "Unable to verify: key missing." msgstr "" -#: viewer/objecttreeparser.cpp:1575 +#: viewer/objecttreeparser.cpp:1582 msgid "CRL not available." msgstr "" -#: viewer/objecttreeparser.cpp:1579 +#: viewer/objecttreeparser.cpp:1586 msgid "Available CRL is too old." msgstr "" -#: viewer/objecttreeparser.cpp:1583 +#: viewer/objecttreeparser.cpp:1590 msgid "A policy was not met." msgstr "" -#: viewer/objecttreeparser.cpp:1587 +#: viewer/objecttreeparser.cpp:1594 msgid "A system error occurred." msgstr "" -#: viewer/objecttreeparser.cpp:1598 +#: viewer/objecttreeparser.cpp:1605 msgid "One key has been revoked." msgstr "" -#: viewer/objecttreeparser.cpp:1626 +#: viewer/objecttreeparser.cpp:1633 msgid "Bad signature." msgstr "Mwaijhe sinateure." -#: viewer/objecttreeparser.cpp:1654 +#: viewer/objecttreeparser.cpp:1661 #, fuzzy #| msgid "&Enable signature" msgid "Invalid signature." msgstr "M&ete en alaedje sinateure" -#: viewer/objecttreeparser.cpp:1657 +#: viewer/objecttreeparser.cpp:1664 msgid "Not enough information to check signature validity." msgstr "" -#: viewer/objecttreeparser.cpp:1671 +#: viewer/objecttreeparser.cpp:1678 #, fuzzy #| msgid "Signatures" msgid "Signature is valid." msgstr "Sinateures" -#: viewer/objecttreeparser.cpp:1673 +#: viewer/objecttreeparser.cpp:1680 #, kde-format msgid "Signed by <a href=\"mailto:%1\">%2</a>." msgstr "" -#: viewer/objecttreeparser.cpp:1678 +#: viewer/objecttreeparser.cpp:1685 msgid "Unknown signature state" msgstr "" -#: viewer/objecttreeparser.cpp:1684 +#: viewer/objecttreeparser.cpp:1691 #, fuzzy #| msgctxt "EMAIL OF TRANSLATORS" #| msgid "Your emails" msgid "Show Details" msgstr "lorint.hendschel(a)skynet.be" -#: viewer/objecttreeparser.cpp:1707 +#: viewer/objecttreeparser.cpp:1714 #, fuzzy msgid "No Audit Log available" msgstr "I gn a pupont d' lingaedjes" -#: viewer/objecttreeparser.cpp:1709 +#: viewer/objecttreeparser.cpp:1716 #, fuzzy, kde-format msgid "Error Retrieving Audit Log: %1" msgstr "Disfacer les emiles oistés sol sierveu" -#: viewer/objecttreeparser.cpp:1720 +#: viewer/objecttreeparser.cpp:1727 msgctxt "The Audit Log is a detailed error log from the gnupg backend" msgid "Show Audit Log" msgstr "" -#: viewer/objecttreeparser.cpp:1731 +#: viewer/objecttreeparser.cpp:1738 msgid "Hide Details" msgstr "" -#: viewer/objecttreeparser.cpp:1756 viewer/objecttreeparser.cpp:1758 +#: viewer/objecttreeparser.cpp:1763 viewer/objecttreeparser.cpp:1765 msgid "Encapsulated message" msgstr "Messaedje ecapsulé" -#: viewer/objecttreeparser.cpp:1767 +#: viewer/objecttreeparser.cpp:1774 #, fuzzy #| msgid "Please wait while the message is transferred" #| msgid_plural "Please wait while the %1 messages are transferred" msgid "Please wait while the message is being decrypted..." msgstr "Tårdjîz s' i vs plait tins kel messaedje est berweté" -#: viewer/objecttreeparser.cpp:1769 +#: viewer/objecttreeparser.cpp:1776 msgid "Encrypted message" msgstr "Messaedje ecripté" -#: viewer/objecttreeparser.cpp:1771 +#: viewer/objecttreeparser.cpp:1778 msgid "Encrypted message (decryption not possible)" msgstr "" -#: viewer/objecttreeparser.cpp:1773 +#: viewer/objecttreeparser.cpp:1780 #, fuzzy, kde-format msgid "Reason: %1" msgstr "råjhon:" -#: viewer/objecttreeparser.cpp:1783 +#: viewer/objecttreeparser.cpp:1790 #, fuzzy #| msgid "Please wait while the message is transferred" #| msgid_plural "Please wait while the %1 messages are transferred" msgid "Please wait while the signature is being verified..." msgstr "Tårdjîz s' i vs plait tins kel messaedje est berweté" -#: viewer/objecttreeparser.cpp:1880 viewer/objecttreeparser.cpp:1882 +#: viewer/objecttreeparser.cpp:1887 viewer/objecttreeparser.cpp:1889 #, fuzzy #| msgid "Certificates" msgid "certificate" msgstr "Acertineures" -#: viewer/objecttreeparser.cpp:1889 viewer/objecttreeparser.cpp:1915 +#: viewer/objecttreeparser.cpp:1896 viewer/objecttreeparser.cpp:1922 #, fuzzy #| msgid "Warning:" msgctxt "Start of warning message." msgid "Warning:" msgstr "Advertixhmint:" -#: viewer/objecttreeparser.cpp:1891 +#: viewer/objecttreeparser.cpp:1898 #, kde-format msgid "Sender's mail address is not stored in the %1 used for signing." msgstr "" -#: viewer/objecttreeparser.cpp:1894 +#: viewer/objecttreeparser.cpp:1901 msgid "sender: " msgstr "evoyeu: " -#: viewer/objecttreeparser.cpp:1897 +#: viewer/objecttreeparser.cpp:1904 msgid "stored: " msgstr "wårdé: " -#: viewer/objecttreeparser.cpp:1917 +#: viewer/objecttreeparser.cpp:1924 #, kde-format msgid "" "No mail address is stored in the %1 used for signing, so we cannot compare " "it to the sender's address %2." msgstr "" -#: viewer/objecttreeparser.cpp:1941 +#: viewer/objecttreeparser.cpp:1948 #, kde-format msgid "Not enough information to check signature. %1" msgstr "" -#: viewer/objecttreeparser.cpp:1958 viewer/objecttreeparser.cpp:2032 +#: viewer/objecttreeparser.cpp:1965 viewer/objecttreeparser.cpp:2039 msgid "Message was signed with unknown key." msgstr "Li messaedje a stî siné avou ene clé nén cnoxhowe." -#: viewer/objecttreeparser.cpp:1960 viewer/objecttreeparser.cpp:2070 -#: viewer/objecttreeparser.cpp:2112 +#: viewer/objecttreeparser.cpp:1967 viewer/objecttreeparser.cpp:2077 +#: viewer/objecttreeparser.cpp:2119 #, kde-format msgid "Message was signed by %1." msgstr "Li messaedje a stî siné di %1." -#: viewer/objecttreeparser.cpp:1967 viewer/objecttreeparser.cpp:1975 -#: viewer/objecttreeparser.cpp:1985 +#: viewer/objecttreeparser.cpp:1974 viewer/objecttreeparser.cpp:1982 +#: viewer/objecttreeparser.cpp:1992 #, kde-format msgid "Message was signed with key %1." msgstr "Li messaedje a stî siné avou l' clé %1." -#: viewer/objecttreeparser.cpp:1970 +#: viewer/objecttreeparser.cpp:1977 #, fuzzy, kde-format msgid "Message was signed on %1 with key %2." msgstr "Li messaedje a stî siné di %2, avou l' clé %1." -#: viewer/objecttreeparser.cpp:1978 +#: viewer/objecttreeparser.cpp:1985 #, fuzzy, kde-format msgid "Message was signed by %3 on %1 with key %2" msgstr "Li messaedje a stî siné di %2, avou l' clé %1." -#: viewer/objecttreeparser.cpp:1988 +#: viewer/objecttreeparser.cpp:1995 #, kde-format msgid "Message was signed by %2 with key %1." msgstr "Li messaedje a stî siné di %2, avou l' clé %1." -#: viewer/objecttreeparser.cpp:2025 +#: viewer/objecttreeparser.cpp:2032 #, fuzzy, kde-format msgid "Message was signed on %1 with unknown key %2." msgstr "Li messaedje a stî siné avou l' clé nén cnoxhowe %1." -#: viewer/objecttreeparser.cpp:2029 +#: viewer/objecttreeparser.cpp:2036 #, kde-format msgid "Message was signed with unknown key %1." msgstr "Li messaedje a stî siné avou l' clé nén cnoxhowe %1." -#: viewer/objecttreeparser.cpp:2035 +#: viewer/objecttreeparser.cpp:2042 msgid "The validity of the signature cannot be verified." msgstr "" -#: viewer/objecttreeparser.cpp:2066 viewer/objecttreeparser.cpp:2108 +#: viewer/objecttreeparser.cpp:2073 viewer/objecttreeparser.cpp:2115 #, kde-format msgid "Message was signed by %2 (Key ID: %1)." msgstr "Li messaedje a stî siné di %2 (ID del clé: %1)." -#: viewer/objecttreeparser.cpp:2076 +#: viewer/objecttreeparser.cpp:2083 msgid "The signature is valid, but the key's validity is unknown." msgstr "Li sinateure est valide, mins dji n' sai l' livea d' fiyate del clé." -#: viewer/objecttreeparser.cpp:2080 +#: viewer/objecttreeparser.cpp:2087 msgid "The signature is valid and the key is marginally trusted." msgstr "Li sinateure est valide et on-z a fiyate dins l' clé." -#: viewer/objecttreeparser.cpp:2084 +#: viewer/objecttreeparser.cpp:2091 msgid "The signature is valid and the key is fully trusted." msgstr "Li sinateure est valide et on-z a foirt fiyate dins l' clé." -#: viewer/objecttreeparser.cpp:2088 +#: viewer/objecttreeparser.cpp:2095 msgid "The signature is valid and the key is ultimately trusted." msgstr "Li sinateure est valide et on-z a pår fiyate dins l' clé." -#: viewer/objecttreeparser.cpp:2092 +#: viewer/objecttreeparser.cpp:2099 msgid "The signature is valid, but the key is untrusted." msgstr "Li sinateure est valide, mins on n' a nén fiyate dins l' clé." -#: viewer/objecttreeparser.cpp:2115 +#: viewer/objecttreeparser.cpp:2122 msgid "Warning: The signature is bad." msgstr "Asteme: Li sinateure est mwaijhe." -#: viewer/objecttreeparser.cpp:2140 +#: viewer/objecttreeparser.cpp:2147 msgid "End of signed message" msgstr "Fén do messaedje siné" -#: viewer/objecttreeparser.cpp:2146 +#: viewer/objecttreeparser.cpp:2153 msgid "End of encrypted message" msgstr "Fén do messaedje ecripté" -#: viewer/objecttreeparser.cpp:2152 +#: viewer/objecttreeparser.cpp:2159 msgid "End of encapsulated message" msgstr "Fén do messaedje ecapsulé" -#: viewer/objecttreeparser.cpp:2251 +#: viewer/objecttreeparser.cpp:2256 #, fuzzy, kde-format msgid "Crypto plug-in \"%1\" cannot verify signatures." msgstr "Li tchôke-divins di discriptaedje %1 èn sait discripter nou messaedje." -#: viewer/objecttreeparser.cpp:2259 +#: viewer/objecttreeparser.cpp:2264 #, kde-format msgctxt "%1 is either 'OpenPGP' or 'S/MIME'" msgid "No %1 plug-in was found." msgstr "" -#: viewer/objecttreeparser.cpp:2264 +#: viewer/objecttreeparser.cpp:2269 #, kde-format msgid "" "The message is signed, but the validity of the signature cannot be verified." @@ -2829,21 +2829,21 @@ msgid "Open folder where attachment was saved" msgstr "" -#: widgets/vcardviewer.cpp:43 +#: widgets/vcardviewer.cpp:44 msgid "vCard Viewer" msgstr "" -#: widgets/vcardviewer.cpp:57 +#: widgets/vcardviewer.cpp:58 #, fuzzy msgid "&Import" msgstr "&Aberweter..." -#: widgets/vcardviewer.cpp:58 +#: widgets/vcardviewer.cpp:59 #, fuzzy msgid "&Next Card" msgstr "Messaedje &shuvant" -#: widgets/vcardviewer.cpp:59 +#: widgets/vcardviewer.cpp:60 #, fuzzy msgid "&Previous Card" msgstr "Messaedje di d&vant" ++++++ kde-l10n-zh_CN-15.12.0.tar.xz -> kde-l10n-zh_CN-15.12.1.tar.xz ++++++ ++++ 8603 lines of diff (skipped) ++++++ kde-l10n-zh_TW-15.12.0.tar.xz -> kde-l10n-zh_TW-15.12.1.tar.xz ++++++ ++++ 15081 lines of diff (skipped) ++++++ kde-l10n.spec.in ++++++ --- /var/tmp/diff_new_pack.ldly4Z/_old 2016-01-23 01:12:20.000000000 +0100 +++ /var/tmp/diff_new_pack.ldly4Z/_new 2016-01-23 01:12:20.000000000 +0100 @@ -18,7 +18,7 @@ # icecream 0 Name: kde-l10n -Version: 15.12.0 +Version: 15.12.1 Release: 0 License: GPL-2.0+ Summary: English translations for KDE @@ -247,6 +247,10 @@ echo "%lang($l) %{_datadir}/klettres/$i" echo "%dir %{_datadir}/klettres" fi + if test -f %{buildroot}%{_datadir}/autocorrect/$i.xml; then + echo "%lang($l) %{_datadir}/autocorrect/$i.xml" + echo "%dir %{_datadir}/autocorrect" + fi if test -f %{buildroot}%{_datadir}/ktuberling/sounds/$i.soundtheme; then echo "%lang($l) %{_datadir}/ktuberling/sounds/$i.soundtheme" fi

1 0

commit spectacle for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package spectacle for openSUSE:Factory checked in at 2016-01-23 01:10:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spectacle (Old) and /work/SRC/openSUSE:Factory/.spectacle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "spectacle" Changes: -------- --- /work/SRC/openSUSE:Factory/spectacle/spectacle.changes 2016-01-11 19:11:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.spectacle.new/spectacle.changes 2016-01-23 01:10:35.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:37:37 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- spectacle-15.12.0.tar.xz New: ---- spectacle-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spectacle.spec ++++++ --- /var/tmp/diff_new_pack.xEIDyx/_old 2016-01-23 01:10:36.000000000 +0100 +++ /var/tmp/diff_new_pack.xEIDyx/_new 2016-01-23 01:10:36.000000000 +0100 @@ -17,7 +17,7 @@ Name: spectacle -Version: 15.12.0 +Version: 15.12.1 Release: 0 BuildRequires: update-desktop-files BuildRequires: kf5-filesystem ++++++ spectacle-15.12.0.tar.xz -> spectacle-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-15.12.0/CMakeLists.txt new/spectacle-15.12.1/CMakeLists.txt --- old/spectacle-15.12.0/CMakeLists.txt 2015-12-09 13:00:20.000000000 +0100 +++ new/spectacle-15.12.1/CMakeLists.txt 2016-01-07 00:19:43.000000000 +0100 @@ -5,7 +5,7 @@ # KDE Application Version, managed by release script set(KDE_APPLICATIONS_VERSION_MAJOR "15") set(KDE_APPLICATIONS_VERSION_MINOR "12") -set(KDE_APPLICATIONS_VERSION_MICRO "0") +set(KDE_APPLICATIONS_VERSION_MICRO "1") set(KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(SPECTACLE_VERSION ${KDE_APPLICATIONS_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-15.12.0/desktop/org.kde.spectacle.desktop new/spectacle-15.12.1/desktop/org.kde.spectacle.desktop --- old/spectacle-15.12.0/desktop/org.kde.spectacle.desktop 2015-12-09 13:00:20.000000000 +0100 +++ new/spectacle-15.12.1/desktop/org.kde.spectacle.desktop 2016-01-07 00:19:43.000000000 +0100 @@ -11,17 +11,20 @@ GenericName[gl]=Utilidade para facer capturas de pantalla GenericName[it]=Accessorio per catturare schermate GenericName[ko]=화면 캡처 유틸리티 +GenericName[lt]=KDE ekranvaizdžių paveikslavimas GenericName[nl]=Hulpmiddel voor het vangen van een schermafdruk GenericName[pl]=Narzędzie do przechwytywania ekranu GenericName[pt]=Utilitário de Captura de Imagens GenericName[pt_BR]=Utilitário de captura de tela GenericName[ro]=Utilitar de capturare a ecranului +GenericName[ru]=Создание снимков экрана GenericName[sk]=Nástroj na snímanie obrazovky GenericName[sl]=Pripomoček za zajem zaslona GenericName[sv]=Verktyg för att ta skärmbilder GenericName[uk]=Програма для створення знімків екрана GenericName[x-test]=xxScreenshot Capture Utilityxx GenericName[zh_CN]=屏幕截图工具 +GenericName[zh_TW]=畫面擷取工具 Name=Spectacle Name[ca]=Spectacle Name[ca@valencia]=Spectacle @@ -33,15 +36,18 @@ Name[gl]=Spectacle Name[it]=Spectacle Name[ko]=Spectacle +Name[lt]=Spectacle Name[nl]=Spectacle -Name[pl]=Spektakl +Name[pl]=Spectacle Name[pt]=Spectacle Name[pt_BR]=Spectacle +Name[ru]=Spectacle Name[sk]=Spectacle Name[sl]=Spectacle Name[sv]=Spectacle Name[uk]=Spectacle Name[x-test]=xxSpectaclexx +Name[zh_TW]=Spectacle Categories=Qt;KDE;Utility; MimeType= Exec=spectacle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-15.12.0/desktop/spectacle.notifyrc new/spectacle-15.12.1/desktop/spectacle.notifyrc --- old/spectacle-15.12.0/desktop/spectacle.notifyrc 2015-12-09 13:00:20.000000000 +0100 +++ new/spectacle-15.12.1/desktop/spectacle.notifyrc 2016-01-07 00:19:43.000000000 +0100 @@ -11,15 +11,18 @@ Name[gl]=Spectacle Name[it]=Spectacle Name[ko]=Spectacle +Name[lt]=Spectacle Name[nl]=Spectacle -Name[pl]=Spektakl +Name[pl]=Spectacle Name[pt]=Spectacle Name[pt_BR]=Spectacle +Name[ru]=Spectacle Name[sk]=Spectacle Name[sl]=Spectacle Name[sv]=Spectacle Name[uk]=Spectacle Name[x-test]=xxSpectaclexx +Name[zh_TW]=Spectacle Comment=Screenshot Capture Utility Comment[ca]=Utilitat per pendre captures de pantalla Comment[ca@valencia]=Utilitat per pendre captures de pantalla @@ -31,15 +34,18 @@ Comment[gl]=Utilidade para facer capturas de pantalla. Comment[it]=Accessorio per catturare schermate Comment[ko]=화면 캡처 유틸리티 +Comment[lt]=KDE ekranvaizdžių paveikslavimas Comment[nl]=Hulpmiddel voor het maken van een schermafdruk Comment[pl]=Narzędzie do przechwytywania ekranu Comment[pt]=Utilitário de Captura de Imagens Comment[pt_BR]=Utilitário de captura de tela +Comment[ru]=Программа для создания снимков экрана Comment[sk]=Nástroj na zachytávanie obrazovky Comment[sl]=Pripomoček za zajem zaslona Comment[sv]=Verktyg för att ta skärmbilder Comment[uk]=Програма для створення знімків екрана Comment[x-test]=xxScreenshot Capture Utilityxx +Comment[zh_TW]=畫面擷取工具 [Event/newScreenshotSaved] Name=New Screenshot Saved @@ -52,15 +58,18 @@ Name[gl]=Gardouse a nova captura Name[it]=Nuova schermata salvata Name[ko]=새 스크린샷 저장됨 +Name[lt]=Ekranvaizdis įrašytas Name[nl]=Nieuwe schermafdruk opgeslagen Name[pl]=Zapisano nowy zrzut ekranu Name[pt]=Nova Imagem Gravada Name[pt_BR]=Nova captura de tela salva +Name[ru]=Сохранён новый снимок экрана Name[sk]=Nová obrazovka uložená Name[sl]=Shranjena nova zaslonska slika Name[sv]=Ny skärmbild sparad Name[uk]=Збереженого нових знімок Name[x-test]=xxNew Screenshot Savedxx +Name[zh_TW]=螢幕快照已儲存 Comment=A new screenshot was captured and saved Comment[ca]=S'ha efectuat una captura de pantalla nova i s'ha desat Comment[ca@valencia]=S'ha efectuat una captura de pantalla nova i s'ha guardat @@ -71,13 +80,16 @@ Comment[gl]=Fíxose unha nova captura de pantalla e gardouse. Comment[it]=Una nuova schermata è stata catturata e salvata Comment[ko]=새 스크린샷을 캡처하여 저장함 +Comment[lt]=Ekranas nupaveiksluotas ir įrašytas Comment[nl]=Een nieuwe schermafdruk is opgenomen en opgeslagen Comment[pl]=Przechwycono i zapisano zawartość ekranu Comment[pt]=Foi capturada e gravada uma nova imagem Comment[pt_BR]=Uma nova imagem foi obtida e salva +Comment[ru]=Новый снимок экрана создан и сохранён. Comment[sk]=Nová obrazovka bola zachytená a uložená Comment[sl]=Zajeta in shranjena je bila nova zaslonska slika Comment[sv]=En ny skärmbild togs och sparades Comment[uk]=Було створено і збережено новий знімок Comment[x-test]=xxA new screenshot was captured and savedxx +Comment[zh_TW]=新的螢幕快照已擷取並儲存 Action=Popup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-15.12.0/src/Gui/KSImageWidget.cpp new/spectacle-15.12.1/src/Gui/KSImageWidget.cpp --- old/spectacle-15.12.0/src/Gui/KSImageWidget.cpp 2015-12-09 13:00:20.000000000 +0100 +++ new/spectacle-15.12.1/src/Gui/KSImageWidget.cpp 2016-01-07 00:19:43.000000000 +0100 @@ -38,7 +38,7 @@ { mPixmap = pixmap; setToolTip(i18n("Image Size: %1x%2 pixels", mPixmap.width(), mPixmap.height())); - setPixmap(mPixmap.scaled(size(), Qt::KeepAspectRatio, Qt::SmoothTransformation)); + setPixmap(mPixmap.scaled(size() * pixmap.devicePixelRatio(), Qt::KeepAspectRatio, Qt::SmoothTransformation)); } // drag handlers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-15.12.0/src/Gui/ScreenClipper.cpp new/spectacle-15.12.1/src/Gui/ScreenClipper.cpp --- old/spectacle-15.12.0/src/Gui/ScreenClipper.cpp 2015-12-09 13:00:20.000000000 +0100 +++ new/spectacle-15.12.1/src/Gui/ScreenClipper.cpp 2016-01-07 00:19:43.000000000 +0100 @@ -40,6 +40,7 @@ void ScreenClipper::init() { + mPixmap.setDevicePixelRatio(devicePixelRatio()); setGeometry(0, 0, mPixmap.width(), mPixmap.height()); setCursor(Qt::CrossCursor); showFullScreen(); @@ -94,18 +95,23 @@ // if we don't have a selection yet, just draw a semitransparent // black rectangle over the whole screen, and render the help text + const QRect normalizedWindowGeometry = QRect(geometry().x() / devicePixelRatio(), + geometry().y() / devicePixelRatio(), + geometry().width() / devicePixelRatio(), + geometry().height() / devicePixelRatio()); + if (mSelection.isNull() || mSelection.isEmpty()) { - painter.setClipRegion(QRegion(geometry())); + painter.setClipRegion(QRegion(normalizedWindowGeometry)); painter.setPen(Qt::NoPen); painter.setBrush(overlayColor); - painter.drawRect(geometry()); + painter.drawRect(normalizedWindowGeometry); painter.setPen(textColor); painter.setBrush(textBackgroundColor); QString helpText = i18n("Click anywhere on the screen (including on this text) to start drawing a selection rectangle, or press Esc to quit"); - QRect helpTextBoundingBox = painter.boundingRect(geometry(), Qt::TextWordWrap, helpText); - helpTextBoundingBox.moveCenter(geometry().center()); + QRect helpTextBoundingBox = painter.boundingRect(normalizedWindowGeometry, Qt::TextWordWrap, helpText); + helpTextBoundingBox.moveCenter(normalizedWindowGeometry.center()); QRect helpTextRect = helpTextBoundingBox.adjusted(-20, -20, 20, 20); painter.setPen(textColor); @@ -119,11 +125,11 @@ // if we're here, this means we have a valid selection. let's draw // the overlay first - QRegion region = QRegion(geometry()).subtracted(mSelection); + QRegion region = QRegion(normalizedWindowGeometry).subtracted(mSelection); painter.setClipRegion(region); painter.setPen(Qt::NoPen); painter.setBrush(overlayColor); - painter.drawRect(geometry()); + painter.drawRect(normalizedWindowGeometry); // and the selection rectangle border @@ -131,7 +137,7 @@ painter.setBrush(handleColor); painter.setClipRegion(region); painter.drawRect(mSelection); - painter.setClipRect(geometry()); + painter.setClipRect(normalizedWindowGeometry); // draw the handles @@ -146,9 +152,9 @@ painter.setBrush(textBackgroundColor); QString helpText = i18n("To take the screenshot, double-click or press Enter. Right-click to reset the selection, or press Esc to quit."); - QRect helpTextBoundingBox = painter.boundingRect(geometry(), Qt::TextWordWrap, helpText); - helpTextBoundingBox.moveCenter(geometry().center()); - helpTextBoundingBox.moveTop(geometry().top()); + QRect helpTextBoundingBox = painter.boundingRect(normalizedWindowGeometry, Qt::TextWordWrap, helpText); + helpTextBoundingBox.moveCenter(normalizedWindowGeometry.center()); + helpTextBoundingBox.moveTop(normalizedWindowGeometry.top()); QRect helpTextRect = helpTextBoundingBox.adjusted(-5, 0, 5, 10); helpTextBoundingBox.moveCenter(helpTextRect.center()); @@ -406,7 +412,13 @@ { if (!mSelection.isNull() && mSelection.isValid()) { grabbing = true; - emit regionGrabbed(mPixmap.copy(mSelection), mSelection); + + const QRect normalizedSelection = QRect(mSelection.x() * devicePixelRatio(), + mSelection.y() * devicePixelRatio(), + mSelection.width() * devicePixelRatio(), + mSelection.height() * devicePixelRatio()); + + emit regionGrabbed(mPixmap.copy(normalizedSelection), normalizedSelection); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-15.12.0/src/Main.cpp new/spectacle-15.12.1/src/Main.cpp --- old/spectacle-15.12.0/src/Main.cpp 2015-12-09 13:00:20.000000000 +0100 +++ new/spectacle-15.12.1/src/Main.cpp 2016-01-07 00:19:43.000000000 +0100 @@ -56,6 +56,7 @@ KAboutLicense::GPL_V2, i18n("(C) 2015 Boudhayan Gupta")); aboutData.addAuthor("Boudhayan Gupta", QString(), "bgupta(a)kde.org"); + aboutData.setTranslator(i18nc("NAME OF TRANSLATORS", "Your names"), i18nc("EMAIL OF TRANSLATORS", "Your emails")); KAboutData::setApplicationData(aboutData); // set up the command line options parser @@ -76,7 +77,6 @@ {{"b", "background"}, i18n("Take a screenshot and exit without showing the GUI")}, {{"s", "dbus"}, i18n("Start in DBus-Activation mode")}, {{"n", "nonotify"}, i18n("In background mode, do not pop up a notification when the screenshot is taken")}, - {{"c", "clipboard"}, i18n("In background mode, send image to clipboard without saving to file")}, {{"o", "output"}, i18n("In background mode, save image to specified file"), "fileName"}, {{"d", "delay"}, i18n("In background mode, delay before taking the shot (in milliseconds)"), "delayMsec"}, {{"w", "onclick"}, i18n("Wait for a click before taking screenshot. Invalidates delay")} @@ -103,7 +103,6 @@ // are we running in background or dbus mode? SpectacleCore::StartMode startMode = SpectacleCore::GuiMode; - bool sendToClipboard = false; bool notify = true; qint64 delayMsec = 0; QString fileName = QString(); @@ -135,10 +134,6 @@ if (parser.isSet("onclick")) { delayMsec = -1; } - - if (parser.isSet("clipboard")) { - sendToClipboard = true; - } case SpectacleCore::DBusMode: app.setQuitOnLastWindowClosed(false); case SpectacleCore::GuiMode: @@ -147,7 +142,7 @@ // release the kraken - SpectacleCore core(startMode, grabMode, fileName, delayMsec, sendToClipboard, notify); + SpectacleCore core(startMode, grabMode, fileName, delayMsec, notify); QObject::connect(&core, &SpectacleCore::allDone, qApp, &QApplication::quit); // create the dbus connections diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-15.12.0/src/SpectacleCore.cpp new/spectacle-15.12.1/src/SpectacleCore.cpp --- old/spectacle-15.12.0/src/SpectacleCore.cpp 2015-12-09 13:00:20.000000000 +0100 +++ new/spectacle-15.12.1/src/SpectacleCore.cpp 2016-01-07 00:19:43.000000000 +0100 @@ -20,12 +20,11 @@ #include "SpectacleCore.h" SpectacleCore::SpectacleCore(StartMode startMode, ImageGrabber::GrabMode grabMode, QString &saveFileName, - qint64 delayMsec, bool sendToClipboard, bool notifyOnGrab, QObject *parent) : + qint64 delayMsec, bool notifyOnGrab, QObject *parent) : QObject(parent), mExportManager(ExportManager::instance()), mStartMode(startMode), mNotify(notifyOnGrab), - mBackgroundSendToClipboard(sendToClipboard), mImageGrabber(nullptr), mMainWindow(nullptr), isGuiInited(false) @@ -158,10 +157,6 @@ switch (mStartMode) { case BackgroundMode: - if (mBackgroundSendToClipboard) { - qApp->clipboard()->setPixmap(pixmap); - qDebug() << i18n("Copied image to clipboard"); - } case DBusMode: { if (mNotify) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-15.12.0/src/SpectacleCore.h new/spectacle-15.12.1/src/SpectacleCore.h --- old/spectacle-15.12.0/src/SpectacleCore.h 2015-12-09 13:00:20.000000000 +0100 +++ new/spectacle-15.12.1/src/SpectacleCore.h 2016-01-07 00:19:43.000000000 +0100 @@ -83,7 +83,7 @@ }; explicit SpectacleCore(StartMode startMode, ImageGrabber::GrabMode grabMode, QString &saveFileName, - qint64 delayMsec, bool sendToClipboard, bool notifyOnGrab, QObject *parent = 0); + qint64 delayMsec, bool notifyOnGrab, QObject *parent = 0); ~SpectacleCore(); QString filename() const; @@ -117,7 +117,6 @@ ExportManager *mExportManager; StartMode mStartMode; bool mNotify; - bool mBackgroundSendToClipboard; QString mFileNameString; QUrl mFileNameUrl; ImageGrabber *mImageGrabber;

1 0

commit syndication for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package syndication for openSUSE:Factory checked in at 2016-01-23 01:10:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syndication (Old) and /work/SRC/openSUSE:Factory/.syndication.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "syndication" Changes: -------- --- /work/SRC/openSUSE:Factory/syndication/syndication.changes 2016-01-10 13:07:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.syndication.new/syndication.changes 2016-01-23 01:10:31.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:37:15 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- syndication-15.12.0.tar.xz New: ---- syndication-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syndication.spec ++++++ --- /var/tmp/diff_new_pack.TlhLmI/_old 2016-01-23 01:10:31.000000000 +0100 +++ /var/tmp/diff_new_pack.TlhLmI/_new 2016-01-23 01:10:31.000000000 +0100 @@ -17,7 +17,7 @@ Name: syndication -Version: 15.12.0 +Version: 15.12.1 Release: 0 %define kf5_version 5.1.0 Summary: KDE PIM Libraries: Syndication ++++++ syndication-15.12.0.tar.xz -> syndication-15.12.1.tar.xz ++++++

1 0

commit sweeper for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package sweeper for openSUSE:Factory checked in at 2016-01-23 01:10:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sweeper (Old) and /work/SRC/openSUSE:Factory/.sweeper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sweeper" Changes: -------- --- /work/SRC/openSUSE:Factory/sweeper/sweeper.changes 2016-01-07 00:23:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sweeper.new/sweeper.changes 2016-01-23 01:10:27.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:37:08 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- sweeper-15.12.0.tar.xz New: ---- sweeper-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sweeper.spec ++++++ --- /var/tmp/diff_new_pack.ciZhlI/_old 2016-01-23 01:10:28.000000000 +0100 +++ /var/tmp/diff_new_pack.ciZhlI/_new 2016-01-23 01:10:28.000000000 +0100 @@ -17,7 +17,7 @@ Name: sweeper -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: KDE Privacy Utility License: LGPL-2.1+ ++++++ sweeper-15.12.0.tar.xz -> sweeper-15.12.1.tar.xz ++++++

1 0

commit signon-kwallet-extension for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package signon-kwallet-extension for openSUSE:Factory checked in at 2016-01-23 01:10:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/signon-kwallet-extension (Old) and /work/SRC/openSUSE:Factory/.signon-kwallet-extension.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "signon-kwallet-extension" Changes: -------- --- /work/SRC/openSUSE:Factory/signon-kwallet-extension/signon-kwallet-extension.changes 2016-01-10 13:07:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.signon-kwallet-extension.new/signon-kwallet-extension.changes 2016-01-23 01:10:23.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:36:45 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- signon-kwallet-extension-15.12.0.tar.xz New: ---- signon-kwallet-extension-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ signon-kwallet-extension.spec ++++++ --- /var/tmp/diff_new_pack.Dk9DNA/_old 2016-01-23 01:10:24.000000000 +0100 +++ /var/tmp/diff_new_pack.Dk9DNA/_new 2016-01-23 01:10:24.000000000 +0100 @@ -17,7 +17,7 @@ Name: signon-kwallet-extension -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: KWallet integration for signon framework License: GPL-2.0+ ++++++ signon-kwallet-extension-15.12.0.tar.xz -> signon-kwallet-extension-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/signon-kwallet-extension-15.12.0/CMakeLists.txt new/signon-kwallet-extension-15.12.1/CMakeLists.txt --- old/signon-kwallet-extension-15.12.0/CMakeLists.txt 2015-12-08 17:09:43.000000000 +0100 +++ new/signon-kwallet-extension-15.12.1/CMakeLists.txt 2016-01-07 00:25:46.000000000 +0100 @@ -2,7 +2,7 @@ set(KDE_APPLICATIONS_VERSION_MAJOR "15") set(KDE_APPLICATIONS_VERSION_MINOR "12") -set(KDE_APPLICATIONS_VERSION_MICRO "0") +set(KDE_APPLICATIONS_VERSION_MICRO "1") set(kwalletsignon_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") cmake_minimum_required(VERSION 2.8.12)

1 0

commit okular for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2016-01-23 01:10:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/okular (Old) and /work/SRC/openSUSE:Factory/.okular.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "okular" Changes: -------- --- /work/SRC/openSUSE:Factory/okular/okular.changes 2016-01-07 00:23:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2016-01-23 01:10:19.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:35:52 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- okular-15.12.0.tar.xz New: ---- okular-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.iVmwGk/_old 2016-01-23 01:10:20.000000000 +0100 +++ /var/tmp/diff_new_pack.iVmwGk/_new 2016-01-23 01:10:20.000000000 +0100 @@ -17,7 +17,7 @@ Name: okular -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: Document Viewer License: GPL-2.0+ ++++++ okular-15.12.0.tar.xz -> okular-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/generators/chm/okularApplication_chm.desktop new/okular-15.12.1/generators/chm/okularApplication_chm.desktop --- old/okular-15.12.0/generators/chm/okularApplication_chm.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/generators/chm/okularApplication_chm.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -128,12 +128,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/generators/comicbook/okularApplication_comicbook.desktop new/okular-15.12.1/generators/comicbook/okularApplication_comicbook.desktop --- old/okular-15.12.0/generators/comicbook/okularApplication_comicbook.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/generators/comicbook/okularApplication_comicbook.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -128,12 +128,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/generators/djvu/okularApplication_djvu.desktop new/okular-15.12.1/generators/djvu/okularApplication_djvu.desktop --- old/okular-15.12.0/generators/djvu/okularApplication_djvu.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/generators/djvu/okularApplication_djvu.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -128,12 +128,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/generators/dvi/okularApplication_dvi.desktop new/okular-15.12.1/generators/dvi/okularApplication_dvi.desktop --- old/okular-15.12.0/generators/dvi/okularApplication_dvi.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/generators/dvi/okularApplication_dvi.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -128,12 +128,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/generators/epub/okularApplication_epub.desktop new/okular-15.12.1/generators/epub/okularApplication_epub.desktop --- old/okular-15.12.0/generators/epub/okularApplication_epub.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/generators/epub/okularApplication_epub.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -128,12 +128,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/generators/fax/okularApplication_fax.desktop new/okular-15.12.1/generators/fax/okularApplication_fax.desktop --- old/okular-15.12.0/generators/fax/okularApplication_fax.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/generators/fax/okularApplication_fax.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -128,12 +128,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/generators/fictionbook/okularApplication_fb.desktop new/okular-15.12.1/generators/fictionbook/okularApplication_fb.desktop --- old/okular-15.12.0/generators/fictionbook/okularApplication_fb.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/generators/fictionbook/okularApplication_fb.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -128,12 +128,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/generators/kimgio/okularApplication_kimgio.desktop new/okular-15.12.1/generators/kimgio/okularApplication_kimgio.desktop --- old/okular-15.12.0/generators/kimgio/okularApplication_kimgio.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/generators/kimgio/okularApplication_kimgio.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -128,12 +128,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/generators/mobipocket/okularApplication_mobi.desktop new/okular-15.12.1/generators/mobipocket/okularApplication_mobi.desktop --- old/okular-15.12.0/generators/mobipocket/okularApplication_mobi.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/generators/mobipocket/okularApplication_mobi.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -128,12 +128,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/generators/ooo/okularApplication_ooo.desktop new/okular-15.12.1/generators/ooo/okularApplication_ooo.desktop --- old/okular-15.12.0/generators/ooo/okularApplication_ooo.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/generators/ooo/okularApplication_ooo.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -128,12 +128,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/generators/plucker/okularApplication_plucker.desktop new/okular-15.12.1/generators/plucker/okularApplication_plucker.desktop --- old/okular-15.12.0/generators/plucker/okularApplication_plucker.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/generators/plucker/okularApplication_plucker.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -128,12 +128,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/generators/poppler/okularApplication_pdf.desktop new/okular-15.12.1/generators/poppler/okularApplication_pdf.desktop --- old/okular-15.12.0/generators/poppler/okularApplication_pdf.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/generators/poppler/okularApplication_pdf.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -128,12 +128,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/generators/spectre/okularApplication_ghostview.desktop new/okular-15.12.1/generators/spectre/okularApplication_ghostview.desktop --- old/okular-15.12.0/generators/spectre/okularApplication_ghostview.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/generators/spectre/okularApplication_ghostview.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -128,12 +128,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/generators/tiff/okularApplication_tiff.desktop new/okular-15.12.1/generators/tiff/okularApplication_tiff.desktop --- old/okular-15.12.0/generators/tiff/okularApplication_tiff.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/generators/tiff/okularApplication_tiff.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -128,12 +128,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/generators/txt/okularApplication_txt.desktop new/okular-15.12.1/generators/txt/okularApplication_txt.desktop --- old/okular-15.12.0/generators/txt/okularApplication_txt.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/generators/txt/okularApplication_txt.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -128,12 +128,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/generators/xps/okularApplication_xps.desktop new/okular-15.12.1/generators/xps/okularApplication_xps.desktop --- old/okular-15.12.0/generators/xps/okularApplication_xps.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/generators/xps/okularApplication_xps.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -128,12 +128,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.12.0/shell/okular.desktop new/okular-15.12.1/shell/okular.desktop --- old/okular-15.12.0/shell/okular.desktop 2015-12-07 23:31:12.000000000 +0100 +++ new/okular-15.12.1/shell/okular.desktop 2016-01-07 07:46:40.000000000 +0100 @@ -127,12 +127,14 @@ Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων Comment[en_GB]=Universal document viewer Comment[es]=Visor de documentos universal Comment[fi]=Yleinen asiakirjakatselin Comment[fr]=Afficheur de document universel +Comment[gl]=Visor de documentos universal Comment[is]=Fjölhæfur skjalaskoðari Comment[it]=Visore di documenti universale Comment[ko]=만능 문서 뷰어

1 0

commit mobipocket for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package mobipocket for openSUSE:Factory checked in at 2016-01-23 01:10:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mobipocket (Old) and /work/SRC/openSUSE:Factory/.mobipocket.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mobipocket" Changes: -------- --- /work/SRC/openSUSE:Factory/mobipocket/mobipocket.changes 2016-01-07 00:23:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mobipocket.new/mobipocket.changes 2016-01-23 01:10:15.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:35:30 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- kdegraphics-mobipocket-15.12.0.tar.xz New: ---- kdegraphics-mobipocket-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mobipocket.spec ++++++ --- /var/tmp/diff_new_pack.bU7nmA/_old 2016-01-23 01:10:16.000000000 +0100 +++ /var/tmp/diff_new_pack.bU7nmA/_new 2016-01-23 01:10:16.000000000 +0100 @@ -17,7 +17,7 @@ Name: mobipocket -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: E-book plugin and library License: GPL-2.0+ ++++++ kdegraphics-mobipocket-15.12.0.tar.xz -> kdegraphics-mobipocket-15.12.1.tar.xz ++++++

1 0

commit marble for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package marble for openSUSE:Factory checked in at 2016-01-23 01:10:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/marble (Old) and /work/SRC/openSUSE:Factory/.marble.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "marble" Changes: -------- --- /work/SRC/openSUSE:Factory/marble/marble.changes 2015-11-15 12:43:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.marble.new/marble.changes 2016-01-23 01:10:09.000000000 +0100 @@ -1,0 +2,19 @@ +Sat Jan 9 18:34:52 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- +Sun Dec 13 13:32:37 UTC 2015 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + +- Drop upstreamed patches: + * fix-libastro-version-tagging.diff +------------------------------------------------------------------- Old: ---- fix-libastro-version-tagging.diff libmarblewidget.changes libmarblewidget.spec marble-15.08.3.tar.xz New: ---- marble-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ marble.spec ++++++ --- /var/tmp/diff_new_pack.LtITXt/_old 2016-01-23 01:10:11.000000000 +0100 +++ /var/tmp/diff_new_pack.LtITXt/_new 2016-01-23 01:10:11.000000000 +0100 @@ -15,18 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define _so -22 +%define _so -23 Name: marble -Version: 15.08.3 +Version: 15.12.1 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ Group: Amusements/Teaching/Other Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE fix-libastro-version-tagging.diff alarrosa(a)suse.com -- Declare QT_NO_VERSION_TAGGING -Patch0: fix-libastro-version-tagging.diff # PATCH-FIX-OPENSUSE make_astro_coinstall.diff tittiatcoke(a)gmail.com -- Make astro coinstallable with its Qt4 version Patch1: make_astro_coinstall.diff BuildRequires: fdupes @@ -53,6 +51,7 @@ BuildRequires: extra-cmake-modules BuildRequires: kwallet-devel BuildRequires: knewstuff-devel +BuildRequires: kcrash-devel BuildRequires: kparts-devel BuildRequires: kcoreaddons-devel BuildRequires: kdoctools-devel @@ -135,7 +134,6 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 %build @@ -158,6 +156,7 @@ -DECM_MKSPECS_INSTALL_DIR=%{_kf5_mkspecsdir} \ -DBUILD_TESTING=OFF \ -DBUILD_MARBLE_TESTS=NO \ + -DMOBILE=FALSE \ -DWITH_KF5=TRUE \ .. %make_jobs @@ -165,10 +164,8 @@ %install %kf5_makeinstall -C build %fdupes -s %{buildroot} - rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-touch.desktop rm -rf %{buildroot}/designer - rm -rf %{buildroot}%{_kf5_bindir}/marble-mobile rm -rf %{buildroot}%{_kf5_bindir}/marble-touch %fdupes -s %{buildroot} @@ -195,6 +192,7 @@ %{_kf5_configkcfgdir}/ %{_kf5_iconsdir}/hicolor/*/apps/marble.* %{_kf5_kxmlguidir}/marble/ +%_libdir/libmarbledeclarative.so %{_kf5_libdir}/marble/ %{_kf5_libdir}/plugins/designer/ %{_kf5_plugindir}/libmarble*so ++++++ make_astro_coinstall.diff ++++++ --- /var/tmp/diff_new_pack.LtITXt/_old 2016-01-23 01:10:11.000000000 +0100 +++ /var/tmp/diff_new_pack.LtITXt/_new 2016-01-23 01:10:11.000000000 +0100 @@ -1,25 +1,38 @@ -diff -urB marble-15.08.2/CMakeLists.txt new/CMakeLists.txt ---- marble-15.08.2/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 -@@ -121,6 +121,7 @@ - cmake_minimum_required(VERSION 2.8.12) - set(QT4BUILD FALSE) - set(MARBLEWIDGET marblewidget-qt5) -+ set(ASTRO astro-qt5) - - include_directories( ${Qt5Svg_INCLUDE_DIRS} ) - include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} ) -@@ -135,6 +136,7 @@ - set(WITH_KF5 FALSE) - set(QT4BUILD TRUE) - set(MARBLEWIDGET marblewidget) -+ set(ASTRO astro) - find_package(Qt4 REQUIRED) - set( QT_USE_QTXML ON ) - set( QT_USE_QTNETWORK ON ) -diff -urB marble-15.08.2/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMakeLists.txt ---- marble-15.08.2/src/apps/marble-kde/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/src/apps/marble-kde/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 +diff -urB marble/CMakeLists.txt new/CMakeLists.txt +--- marble/CMakeLists.txt 2015-10-23 19:36:58.656015667 +0200 ++++ new/CMakeLists.txt 2015-10-23 19:39:18.128704325 +0200 +@@ -94,6 +94,7 @@ + + cmake_minimum_required(VERSION 2.8.12) + set(MARBLEWIDGET marblewidget-qt5) ++set(ASTRO astro-qt5) + + include_directories( ${Qt5Svg_INCLUDE_DIRS} ) + include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} ) +diff -urB marble/src/apps/behaim/CMakeLists.txt new/src/apps/behaim/CMakeLists.txt +--- marble/src/apps/behaim/CMakeLists.txt 2015-10-23 19:36:58.892016832 +0200 ++++ new/src/apps/behaim/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 +@@ -29,7 +29,7 @@ + ${Qt5Positioning_LIBRARIES} + ${Qt5AndroidExtras_LIBRARIES} + ${Qt5Multimedia_LIBRARIES} +- astro ++ ${ASTRO} + ${MARBLEWIDGET} + marbledeclarative) + +@@ -47,7 +47,7 @@ + set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK}) + set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK}) + set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarbleBehaim.so") +- set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so") ++ set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so") + set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package") + set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.behaim") + set(QT_ANDROID_APP_NAME "Marble Globe: Behaim's Erdapfel") +diff -urB marble/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMakeLists.txt +--- marble/src/apps/marble-kde/CMakeLists.txt 2015-10-23 19:36:58.896016851 +0200 ++++ new/src/apps/marble-kde/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 @@ -54,7 +54,7 @@ marble marbleui @@ -29,52 +42,43 @@ KF5::NewStuff KF5::Wallet KF5::Parts -diff -urB marble-15.08.2/src/apps/marble_maps/CMakeLists.txt new/src/apps/marble_maps/CMakeLists.txt ---- marble-15.08.2/src/apps/marble_maps/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/src/apps/marble_maps/CMakeLists.txt 2015-10-11 18:06:50.981995015 +0200 -@@ -14,7 +14,7 @@ - ${Qt5WebKitWidgets_LIBRARIES} - ${Qt5WebKit_LIBRARIES} +diff -urB marble/src/apps/marble-maps/CMakeLists.txt new/src/apps/marble-maps/CMakeLists.txt +--- marble/src/apps/marble-maps/CMakeLists.txt 2015-10-23 19:36:58.896016851 +0200 ++++ new/src/apps/marble-maps/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 +@@ -29,7 +29,7 @@ + ${Qt5Positioning_LIBRARIES} + ${Qt5AndroidExtras_LIBRARIES} + ${Qt5Multimedia_LIBRARIES} +- astro ++ ${ASTRO} ${MARBLEWIDGET} -- astro) -+ ${ASTRO}) - - file(COPY "../../../data" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/assets") - file(COPY "../../../data/android/drawable-ldpi" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/res") -@@ -32,7 +32,7 @@ - PACKAGE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/package" - PACKAGE_NAME org.kde.marble.maps - ${KEYSTORE_OPTIONS} -- DEPENDS "${PROJECT_BINARY_DIR}/lib/libmarblewidget-qt5.so" "${PROJECT_BINARY_DIR}/lib/libastro.so" -+ DEPENDS "${PROJECT_BINARY_DIR}/lib/libmarblewidget-qt5.so" "${PROJECT_BINARY_DIR}/lib/libastro-qt5.so" - ) + marbledeclarative) - # Move target from default build to install phase so we can create everything in one go -diff -urB marble-15.08.2/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeLists.txt ---- marble-15.08.2/src/apps/marble-qt/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/src/apps/marble-qt/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 -@@ -40,7 +40,7 @@ - ${QT_QTDBUS_LIBRARY} - marbleui - ${MARBLEWIDGET} -- astro) -+ ${ASTRO}) - else() - target_link_libraries ( - marble-qt -@@ -53,7 +53,7 @@ - ${Qt5WebKit_LIBRARIES} - marbleui - ${MARBLEWIDGET} -- astro) -+ ${ASTRO}) - endif() +@@ -47,7 +47,7 @@ + set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK}) + set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK}) + set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarble.so") +- set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so") ++ set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so") + set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package") + set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.maps") + set(QT_ANDROID_APP_NAME "Marble Maps") +diff -urB marble/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeLists.txt +--- marble/src/apps/marble-qt/CMakeLists.txt 2015-10-23 19:36:58.896016851 +0200 ++++ new/src/apps/marble-qt/CMakeLists.txt 2015-10-23 19:40:22.905024163 +0200 +@@ -34,7 +34,7 @@ + ${Qt5WebKit_LIBRARIES} + marbleui + ${MARBLEWIDGET} +-astro) ++${ASTRO}) if(WIN32) -diff -urB marble-15.08.2/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt ---- marble-15.08.2/src/lib/astro/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/src/lib/astro/CMakeLists.txt 2015-10-11 18:08:05.239677950 +0200 -@@ -20,23 +20,23 @@ + target_link_libraries( +diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt +--- marble/src/lib/astro/CMakeLists.txt 2015-10-23 19:36:58.908016911 +0200 ++++ new/src/lib/astro/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 +@@ -21,27 +21,27 @@ solarsystem.cpp ) @@ -100,10 +104,15 @@ -SET_TARGET_PROPERTIES(astro PROPERTIES +SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES - VERSION ${GENERIC_LIB_VERSION} - SOVERSION ${GENERIC_LIB_SOVERSION} - DEFINE_SYMBOL MAKE_ASTRO_LIB # needed for astrolib_export.h -@@ -44,11 +44,11 @@ + DEFINE_SYMBOL MAKE_ASTRO_LIB # needed for astrolib_export.h + ) + if(NOT CMAKE_SYSTEM_NAME STREQUAL Android) +- SET_TARGET_PROPERTIES(astro PROPERTIES ++ SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES + VERSION ${GENERIC_LIB_VERSION} + SOVERSION ${GENERIC_LIB_SOVERSION} + ) +@@ -49,11 +49,11 @@ # choose the correct target install library path if(WIN32) @@ -118,55 +127,42 @@ endif() ########### install files ############### -diff -urB marble-15.08.2/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt ---- marble-15.08.2/src/lib/marble/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/src/lib/marble/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 -@@ -372,7 +372,7 @@ +diff -urB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt +--- marble/src/lib/marble/CMakeLists.txt 2015-10-23 19:36:58.912016931 +0200 ++++ new/src/lib/marble/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 +@@ -364,7 +364,7 @@ ADD_LIBRARY(${MARBLEWIDGET} SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS}) # link with libastro -TARGET_LINK_LIBRARIES (${MARBLEWIDGET} astro) +TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ASTRO}) - # link with release version of Qt libs - if( QT4BUILD ) -diff -urB marble-15.08.2/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt ---- marble-15.08.2/src/plugins/render/eclipses/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/src/plugins/render/eclipses/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 -@@ -26,4 +26,4 @@ + # link against zlib + TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ZLIB_LIBRARIES}) +diff -urB marble/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt +--- marble/src/plugins/render/eclipses/CMakeLists.txt 2015-10-23 19:36:58.964017187 +0200 ++++ new/src/plugins/render/eclipses/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 +@@ -22,4 +22,4 @@ marble_add_plugin( EclipsesPlugin ${eclipses_SRCS} ) -target_link_libraries( EclipsesPlugin astro ) +target_link_libraries( EclipsesPlugin ${ASTRO} ) -diff -urB marble-15.08.2/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt ---- marble-15.08.2/src/plugins/render/satellites/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/src/plugins/render/satellites/CMakeLists.txt 2015-10-11 18:08:39.680458497 +0200 -@@ -37,4 +37,4 @@ +diff -urB marble/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt +--- marble/src/plugins/render/satellites/CMakeLists.txt 2015-10-23 19:36:58.972017228 +0200 ++++ new/src/plugins/render/satellites/CMakeLists.txt 2015-10-23 19:37:28.736164190 +0200 +@@ -30,4 +30,4 @@ ${satellites_SRCS} ${sgp4_SRCS} ) --target_link_libraries( SatellitesPlugin astro ) -+target_link_libraries( SatellitesPlugin ${ASTRO} ) -diff -urB marble-15.08.2/src/plugins/render/stars/CMakeLists.txt new/src/plugins/render/stars/CMakeLists.txt ---- marble-15.08.2/src/plugins/render/stars/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/src/plugins/render/stars/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 -@@ -16,4 +16,4 @@ +-target_link_libraries( SatellitesPlugin astro sgp4 ) ++target_link_libraries( SatellitesPlugin ${ASTRO} sgp4 ) +diff -urB marble/src/plugins/render/stars/CMakeLists.txt new/src/plugins/render/stars/CMakeLists.txt +--- marble/src/plugins/render/stars/CMakeLists.txt 2015-10-23 19:36:58.976017247 +0200 ++++ new/src/plugins/render/stars/CMakeLists.txt 2015-10-23 19:37:28.736164190 +0200 +@@ -13,4 +13,4 @@ qt_wrap_ui(stars_SRCS ${stars_UI}) marble_add_plugin( StarsPlugin ${stars_SRCS} ) -target_link_libraries( StarsPlugin astro ) +target_link_libraries( StarsPlugin ${ASTRO} ) -diff -urB marble-15.08.2/tools/osm-sisyphus/CMakeLists.txt new/tools/osm-sisyphus/CMakeLists.txt ---- marble-15.08.2/tools/osm-sisyphus/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/tools/osm-sisyphus/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 -@@ -24,7 +24,7 @@ - add_executable( ${TARGET} ${${TARGET}_SRC} ) - - if(QT4BUILD) -- target_link_libraries( ${TARGET} ${QT_QTCORE_LIBRARY} ${QT_QTMAIN_LIBRARY} ${QT_QTSQL_LIBRARY} marblewidget ) -+ target_link_libraries( ${TARGET} ${QT_QTCORE_LIBRARY} ${QT_QTMAIN_LIBRARY} ${QT_QTSQL_LIBRARY} ${MARBLEWIDGET} ) - else() -- target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} ${Qt5Sql_LIBRARIES} marblewidget-qt5 ) -+ target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} ${Qt5Sql_LIBRARIES} ${MARBLEWIDGET} ) - endif() ++++++ marble-15.08.3.tar.xz -> marble-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/marble/marble-15.08.3.tar.xz /work/SRC/openSUSE:Factory/.marble.new/marble-15.12.1.tar.xz differ: char 26, line 1

1 0

commit libksane for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package libksane for openSUSE:Factory checked in at 2016-01-23 01:10:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksane (Old) and /work/SRC/openSUSE:Factory/.libksane.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libksane" Changes: -------- --- /work/SRC/openSUSE:Factory/libksane/libksane.changes 2015-11-15 12:43:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libksane.new/libksane.changes 2016-01-23 01:10:05.000000000 +0100 @@ -1,0 +2,18 @@ +Sat Jan 9 18:34:17 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- +Sun Dec 13 13:32:08 UTC 2015 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + +------------------------------------------------------------------- Old: ---- libksane-15.08.3.tar.xz New: ---- libksane-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksane.spec ++++++ --- /var/tmp/diff_new_pack.w6CoRO/_old 2016-01-23 01:10:06.000000000 +0100 +++ /var/tmp/diff_new_pack.w6CoRO/_new 2016-01-23 01:10:06.000000000 +0100 @@ -15,27 +15,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%define _so 0 +%define _so 5 +%define lname libKF5Sane Name: libksane -BuildRequires: libkde4-devel -BuildRequires: oxygen-icon-theme-large -BuildRequires: xz -%if 0%{?suse_version} > 1130 +BuildRequires: extra-cmake-modules +BuildRequires: kconfig-devel +BuildRequires: kf5-filesystem +BuildRequires: ki18n-devel +BuildRequires: ktextwidgets-devel +BuildRequires: kwallet-devel +BuildRequires: kwidgetsaddons-devel BuildRequires: sane-backends-devel -%else -BuildRequires: sane-backends -%endif +BuildRequires: xz +BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 Summary: KDE Image Plugin Interface License: GPL-2.0+ Group: Development/Libraries/KDE Url: http://www.kde.org -Version: 15.08.3 +Version: 15.12.1 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description This package contains a library to add scan support to KDE @@ -45,60 +48,50 @@ %setup -q -n %{name}-%version %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - cd build - %kde4_makeinstall - %kde_post_install + %kf5_makeinstall -C build -%package -n %{name}%{_so} +%package -n %{lname}%{_so} Summary: KDE scan library Group: Productivity/Graphics/Other -Provides: %{name}%{_so}-devel = 3.95.1 -Obsoletes: %{name}%{_so}-devel < 3.95.1 -%description -n %{name}%{_so} +%description -n %{lname}%{_so} This package contains a library to add scan support to KDE applications. -%post -n %{name}%{_so} -p /sbin/ldconfig +%post -n %{lname}%{_so} -p /sbin/ldconfig -%postun -n %{name}%{_so} -p /sbin/ldconfig +%postun -n %{lname}%{_so} -p /sbin/ldconfig -%files -n %{name}%{_so} +%files -n %{lname}%{_so} %defattr(-,root,root) -%doc COPYING README TODO -%_kde4_libdir/%{name}.so.* +%doc COPYING* +%{_kf5_libdir}/%{lname}.so.* %package devel Summary: KDE scan library - Development Files Group: Development/Libraries/KDE -Requires: %{name}%{_so} = %version -Requires: libkde4-devel -%if 0%{?suse_version} > 1130 +Requires: %{lname}%{_so} = %version Requires: sane-backends-devel -%else -Requires: sane-backends -%endif +Requires: pkgconfig(Qt5Widgets) >= 5.2.0 +Requires: kwallet-devel +Requires: kwidgetsaddons-devel +Obsoletes: libksane-kf5-devel < %{version} +Provides: libksane-kf5-devel = %{version} %description devel This package contains a library to add scan support to KDE applications. - -Authors: --------- - The KDE Team <kde(a)kde.org> - %files devel %defattr(-,root,root) -%_kde4_includedir/%{name}/ -%_kde4_libdir/pkgconfig/%{name}.pc -%_kde4_libdir/%{name}.so -%_kde4_datadir/icons/hicolor/*/actions/*.png -%_kde4_libdir/cmake/KSane/ +%{_kf5_prefix}/include/KF5/KSane/ +%{_kf5_prefix}/include/KF5/ksane_version.h +%{_kf5_libdir}/%{lname}.so +%{_kf5_libdir}/cmake/KF5Sane/ %changelog ++++++ libksane-15.08.3.tar.xz -> libksane-15.12.1.tar.xz ++++++ ++++ 23627 lines of diff (skipped)

1 0

commit libkomparediff2 for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package libkomparediff2 for openSUSE:Factory checked in at 2016-01-23 01:09:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkomparediff2 (Old) and /work/SRC/openSUSE:Factory/.libkomparediff2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkomparediff2" Changes: -------- --- /work/SRC/openSUSE:Factory/libkomparediff2/libkomparediff2.changes 2016-01-07 00:23:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkomparediff2.new/libkomparediff2.changes 2016-01-23 01:10:00.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:34:11 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- libkomparediff2-15.12.0.tar.xz New: ---- libkomparediff2-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkomparediff2.spec ++++++ --- /var/tmp/diff_new_pack.nhFzLo/_old 2016-01-23 01:10:01.000000000 +0100 +++ /var/tmp/diff_new_pack.nhFzLo/_new 2016-01-23 01:10:01.000000000 +0100 @@ -35,7 +35,7 @@ Summary: A library to compare files and strings License: (GPL-2.0+ and LGPL-2.0+) and BSD-2-Clause Group: Development/Libraries/KDE -Version: 15.12.0 +Version: 15.12.1 Release: 0 Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz ++++++ libkomparediff2-15.12.0.tar.xz -> libkomparediff2-15.12.1.tar.xz ++++++

1 0

commit libkipi for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package libkipi for openSUSE:Factory checked in at 2016-01-23 01:09:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkipi (Old) and /work/SRC/openSUSE:Factory/.libkipi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkipi" Changes: -------- --- /work/SRC/openSUSE:Factory/libkipi/libkipi.changes 2015-11-15 12:42:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkipi.new/libkipi.changes 2016-01-23 01:09:56.000000000 +0100 @@ -1,0 +2,18 @@ +Sat Jan 9 18:33:55 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- +Sun Dec 13 13:31:47 UTC 2015 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + +------------------------------------------------------------------- Old: ---- libkipi-15.08.3.tar.xz New: ---- libkipi-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkipi.spec ++++++ --- /var/tmp/diff_new_pack.GC2y4Q/_old 2016-01-23 01:09:57.000000000 +0100 +++ /var/tmp/diff_new_pack.GC2y4Q/_new 2016-01-23 01:09:57.000000000 +0100 @@ -16,21 +16,26 @@ # -%define _so 11 +%define _so 30_0_0 +%define libname libKF5Kipi Name: libkipi -BuildRequires: libkde4-devel -BuildRequires: oxygen-icon-theme-large -BuildRequires: xz +BuildRequires: extra-cmake-modules >= 1.1.0 +BuildRequires: kconfig-devel >= 5.1.0 +BuildRequires: ki18n-devel >= 5.1.0 +BuildRequires: kservice-devel >= 5.1.0 +BuildRequires: kxmlgui-devel >= 5.1.0 +BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 Summary: KDE Image Plugin Interface License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT Group: Development/Libraries/KDE Url: http://www.kde.org -Version: 15.08.3 +Version: 15.12.1 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description This package provides a generic KDE Image Plug-in Interface used by @@ -41,42 +46,45 @@ %setup -q -n %{name}-%version %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - cd build - %kde4_makeinstall - %kde_post_install + %kf5_makeinstall -C build -%package -n %{name}%{_so} +%package -n %{libname}%{_so} Summary: KDE Image Plug-In Interface Group: Development/Libraries/KDE -%requires_ge libqt4-x11 -%description -n %{name}%{_so} +%description -n %{libname}%{_so} This package provides a generic KDE image plug-in interface used by some KDE image applications. Plug-ins for this interface are in the kipi-plugins package. -%files -n %{name}%{_so} +%files -n %{libname}%{_so} %defattr(-,root,root) -%_kde4_appsdir/kipi/ -%_kde4_libdir/%{name}.so.* -%_kde4_datadir/icons/hicolor/*/apps/kipi.png -%_kde4_servicetypes/kipiplugin.desktop +%_kf5_libdir/%{libname}.so.* +%_kf5_iconsdir/hicolor/*/apps/kipi.png +%_kf5_servicetypesdir/kipiplugin.desktop +%_kf5_datadir/kipi/ -%post -n libkipi%{_so} -p /sbin/ldconfig +%post -n %{libname}%{_so} -p /sbin/ldconfig -%postun -n libkipi%{_so} -p /sbin/ldconfig +%postun -n %{libname}%{_so} -p /sbin/ldconfig %package devel Summary: KDE Image Plugin Interface Group: Development/Libraries/KDE -Provides: %{name}6-devel = %version -Obsoletes: %{name}6-devel <= 4.1.87 -Requires: %{name}%{_so} = %version -Requires: libkde4-devel +Requires: %{libname}%{_so} = %version +Requires: kconfig-devel >= 5.1.0 +Requires: ki18n-devel >= 5.1.0 +Requires: kservice-devel >= 5.1.0 +Requires: kxmlgui-devel >= 5.1.0 +Requires: pkgconfig(Qt5Core) >= 5.2.0 +Requires: pkgconfig(Qt5Gui) >= 5.2.0 +Requires: pkgconfig(Qt5Widgets) >= 5.2.0 +Obsoletes: libkipi-kf5-devel < %{version} +Provides: libkipi-kf5-devel = %{version} %description devel This package provides a generic KDE Image Plug-in Interface used by @@ -86,8 +94,9 @@ %files devel %defattr(-,root,root) %doc COPYING README -%_kde4_libdir/%{name}.so -%_kde4_includedir/%{name}/ -%_kde4_libdir/pkgconfig/%{name}.pc +%_kf5_libdir/%{libname}.so +%_kf5_includedir/KIPI/ +%_kf5_includedir/libkipi_version.h +%_kf5_libdir/cmake/KF5Kipi/ %changelog ++++++ libkipi-15.08.3.tar.xz -> libkipi-15.12.1.tar.xz ++++++ ++++ 19427 lines of diff (skipped)

1 0

commit libkface for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package libkface for openSUSE:Factory checked in at 2016-01-23 01:09:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkface (Old) and /work/SRC/openSUSE:Factory/.libkface.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkface" Changes: -------- --- /work/SRC/openSUSE:Factory/libkface/libkface.changes 2016-01-07 00:23:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkface.new/libkface.changes 2016-01-23 01:09:52.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:33:31 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- libkface-15.12.0.tar.xz New: ---- libkface-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkface.spec ++++++ --- /var/tmp/diff_new_pack.jE96SI/_old 2016-01-23 01:09:53.000000000 +0100 +++ /var/tmp/diff_new_pack.jE96SI/_new 2016-01-23 01:09:53.000000000 +0100 @@ -23,7 +23,7 @@ License: LGPL-2.1+ Group: Development/Libraries/KDE Url: http://www.kde.org -Version: 15.12.0 +Version: 15.12.1 Release: 0 Source0: %{name}-%{version}.tar.xz Patch0: fix-opencv.diff ++++++ libkface-15.12.0.tar.xz -> libkface-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libkface/libkface-15.12.0.tar.xz /work/SRC/openSUSE:Factory/.libkface.new/libkface-15.12.1.tar.xz differ: char 26, line 1

1 0

commit libkexiv2 for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package libkexiv2 for openSUSE:Factory checked in at 2016-01-23 01:09:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkexiv2 (Old) and /work/SRC/openSUSE:Factory/.libkexiv2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkexiv2" Changes: -------- --- /work/SRC/openSUSE:Factory/libkexiv2/libkexiv2.changes 2015-12-03 13:28:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkexiv2.new/libkexiv2.changes 2016-01-23 01:09:47.000000000 +0100 @@ -1,0 +2,23 @@ +Sat Jan 9 18:33:13 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- +Thu Dec 17 10:53:31 UTC 2015 - alarrosa(a)suse.com + +- Update patch: fix-reduce-required-exiv2-to-0.23.diff for 15.12.0 + +------------------------------------------------------------------- +Sun Dec 13 13:31:14 UTC 2015 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + +------------------------------------------------------------------- Old: ---- libkexiv2-15.08.3.tar.xz New: ---- libkexiv2-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkexiv2.spec ++++++ --- /var/tmp/diff_new_pack.6LI8pg/_old 2016-01-23 01:09:48.000000000 +0100 +++ /var/tmp/diff_new_pack.6LI8pg/_new 2016-01-23 01:09:48.000000000 +0100 @@ -16,10 +16,11 @@ # -%define _so 11 +%define _so 15_0_0 +%define lname libKF5KExiv2 Name: libkexiv2 -Version: 15.08.3 +Version: 15.12.1 Release: 0 Summary: Library to manipulate picture meta data License: GPL-2.0+ @@ -33,11 +34,16 @@ %else BuildRequires: libexiv2-devel >= 0.23 %endif -BuildRequires: libkde4-devel -BuildRequires: xz -Requires: %{name}-%{_so} = %{version} +BuildRequires: extra-cmake-modules +BuildRequires: kcompletion-devel +BuildRequires: kcoreaddons-devel +BuildRequires: ktextwidgets-devel +BuildRequires: kf5-filesystem +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures @@ -50,37 +56,36 @@ %endif %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - cd build - %kde4_makeinstall + %kf5_makeinstall -C build -%package -n %{name}-%{_so} +%package -n %{lname}-%{_so} Summary: Library to manipulate picture meta data Group: Development/Libraries/KDE -%description -n %{name}-%{_so} +%description -n %{lname}-%{_so} Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures metadata. -%post -n %{name}-%{_so} -p /sbin/ldconfig +%post -n %{lname}-%{_so} -p /sbin/ldconfig -%postun -n %{name}-%{_so} -p /sbin/ldconfig +%postun -n %{lname}-%{_so} -p /sbin/ldconfig -%files -n %{name}-%{_so} +%files -n %{lname}-%{_so} %defattr(-,root,root) -%{_kde4_appsdir}/%{name}/ -%{_kde4_libdir}/%{name}.so.%{_so}* +%{_kf5_libdir}/libKF5KExiv2.so.* %package devel Summary: Library to manipulate picture meta data Group: Development/Libraries/KDE -Requires: %{name}-%{_so} = %{version} +Requires: %{lname}-%{_so} = %{version} +Requires: extra-cmake-modules +Requires: kdelibs4support-devel +Requires: khtml-devel Requires: libexiv2-devel -Requires: libkde4-devel -%requires_ge libqt4-x11 %description devel Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures @@ -89,9 +94,8 @@ %files devel %defattr(-,root,root) %doc COPYING README -%{_kde4_libdir}/%{name}.so -%{_kde4_libdir}/pkgconfig/%{name}.pc -%{_kde4_includedir}/%{name}/ -%{_kde4_libdir}/cmake/libkexiv2*/ +%{_kf5_libdir}/libKF5KExiv2.so +%{_kf5_includedir}/ +%{_kf5_libdir}/cmake/KF5KExiv2/ %changelog ++++++ fix-reduce-required-exiv2-to-0.23.diff ++++++ --- /var/tmp/diff_new_pack.6LI8pg/_old 2016-01-23 01:09:48.000000000 +0100 +++ /var/tmp/diff_new_pack.6LI8pg/_new 2016-01-23 01:09:48.000000000 +0100 @@ -1,13 +1,13 @@ -Index: libkexiv2-15.08.3/CMakeLists.txt +Index: libkexiv2-15.12.0/CMakeLists.txt =================================================================== ---- libkexiv2-15.08.3.orig/CMakeLists.txt -+++ libkexiv2-15.08.3/CMakeLists.txt -@@ -23,7 +23,7 @@ include_directories(${QDBUS_INCLUDE_DIRS - set(LIBKEXIV2_AREA_CODE_GENERAL 51003) - add_definitions(-DKDE_DEFAULT_DEBUG_AREA=${LIBKEXIV2_AREA_CODE_GENERAL}) +--- libkexiv2-15.12.0.orig/CMakeLists.txt ++++ libkexiv2-15.12.0/CMakeLists.txt +@@ -12,7 +12,7 @@ message(STATUS "Starting CMake configura + set(CMAKE_MIN_VERSION "2.8.12") + set(ECM_MIN_VERSION "1.1.0") + set(REQUIRED_QT_VERSION "5.2.0") +-set(EXIV2_MIN_VERSION "0.24") ++set(EXIV2_MIN_VERSION "0.23") + + cmake_minimum_required(VERSION ${CMAKE_MIN_VERSION}) --set(EXIV2_MIN_VERSION "0.24") -+set(EXIV2_MIN_VERSION "0.23") - find_package(Exiv2) - MACRO_LOG_FEATURE(EXIV2_FOUND "Exiv2" "Required to build libkexiv2." "http://www.exiv2.org" - TRUE ${EXIV2_MIN_VERSION} "") ++++++ libkexiv2-15.08.3.tar.xz -> libkexiv2-15.12.1.tar.xz ++++++ ++++ 39219 lines of diff (skipped)

1 0

commit libkdegames for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package libkdegames for openSUSE:Factory checked in at 2016-01-23 01:09:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-07 00:23:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkdegames.new/libkdegames.changes 2016-01-23 01:09:43.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:32:50 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- libkdegames-15.12.0.tar.xz New: ---- libkdegames-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkdegames.spec ++++++ --- /var/tmp/diff_new_pack.bR7FIj/_old 2016-01-23 01:09:44.000000000 +0100 +++ /var/tmp/diff_new_pack.bR7FIj/_new 2016-01-23 01:09:44.000000000 +0100 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 15.12.0 +Version: 15.12.1 Release: 0 Source0: libkdegames-%{version}.tar.xz Patch1: libkdegames-bnc793185.patch ++++++ libkdegames-15.12.0.tar.xz -> libkdegames-15.12.1.tar.xz ++++++

1 0

commit libkdcraw for openSUSE:Factory
by root＠hilbert.suse.de 23 Jan '16

23 Jan '16

Hello community, here is the log from the commit of package libkdcraw for openSUSE:Factory checked in at 2016-01-23 01:09:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkdcraw (Old) and /work/SRC/openSUSE:Factory/.libkdcraw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkdcraw" Changes: -------- --- /work/SRC/openSUSE:Factory/libkdcraw/libkdcraw.changes 2015-11-15 12:42:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkdcraw.new/libkdcraw.changes 2016-01-23 01:09:38.000000000 +0100 @@ -1,0 +2,24 @@ +Sat Jan 9 18:32:36 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- +Wed Dec 23 18:10:51 UTC 2015 - alarrosa(a)suse.com + +- Add fix-libraw-dependency.diff and decrease the requirement of libraw + for SLE12 from 0.16 to 0.15.4 + +------------------------------------------------------------------- +Sun Dec 13 13:30:40 UTC 2015 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + +------------------------------------------------------------------- Old: ---- libkdcraw-15.08.3.tar.xz New: ---- fix-libraw-dependency.diff libkdcraw-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkdcraw.spec ++++++ --- /var/tmp/diff_new_pack.3Yibte/_old 2016-01-23 01:09:39.000000000 +0100 +++ /var/tmp/diff_new_pack.3Yibte/_new 2016-01-23 01:09:39.000000000 +0100 @@ -16,27 +16,36 @@ # -%define _so 23 +%define _so 5 +%define lname libKF5KDcraw Name: libkdcraw -Version: 15.08.3 +Version: 15.12.1 Release: 0 Summary: Shared library interface around dcraw License: LGPL-2.0+ and GPL-2.0+ and GPL-3.0+ Group: Development/Libraries/KDE Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz -BuildRequires: libjasper-devel -BuildRequires: libjpeg-devel -BuildRequires: libkde4-devel -BuildRequires: liblcms2-devel -BuildRequires: libraw-devel -BuildRequires: openmpi-devel -BuildRequires: oxygen-icon-theme-large +Patch0: fix-libraw-dependency.diff +BuildRequires: extra-cmake-modules +BuildRequires: kconfig-devel +BuildRequires: ktextwidgets-devel +BuildRequires: kiconthemes-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kcompletion-devel +BuildRequires: kio-devel +BuildRequires: kf5-filesystem +BuildRequires: threadweaver-devel +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: xz -BuildRequires: pkgconfig(libxml-2.0) +%if 0%{?suse_version}==1315 && !0%{?is_opensuse} +BuildRequires: pkgconfig(libraw) >= 0.15.4 +%else +BuildRequires: pkgconfig(libraw) >= 0.16.0 +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Libkdcraw is a C++ interface around dcraw binary program used to decode @@ -48,28 +57,25 @@ %prep %setup -q -n %{name}-%{version} -%if 0%{?suse_version} > 1320 -echo "add_definitions(\${KDE4_ENABLE_EXCEPTIONS})" >> libkdcraw/CMakeLists.txt +%if 0%{?suse_version}==1315 && !0%{?is_opensuse} +%patch0 -p1 %endif %build - %cmake_kde4 -d build -- -DENABLE_LCMS2=true -DENABLE_RAWSPEED=true + %cmake_kf5 -d build -- -DENABLE_LCMS2=true -DENABLE_RAWSPEED=true %make_jobs %install - cd build - %kde4_makeinstall - %kde_post_install + %kf5_makeinstall -C build %clean rm -rf %{buildroot} -%package -n %{name}%{_so} +%package -n %{lname}%{_so} Summary: Shared library interface around dcraw Group: Development/Libraries/KDE -%requires_ge libqt4-x11 -%description -n %{name}%{_so} +%description -n %{lname}%{_so} Libkdcraw is a C++ interface around dcraw binary program used to decode RAW picture files. The library documentation is available on header files. @@ -77,21 +83,22 @@ This library is used by kipi-plugins, digiKam and others kipi host programs. -%files -n %{name}%{_so} +%files -n %{lname}%{_so} %defattr(-,root,root) -%_kde4_appsdir/%{name}/ -%_kde4_libdir/%{name}.so.* -%_kde4_datadir/icons/hicolor/*/apps/kdcraw.png +%{_kf5_libdir}/%{lname}.so.* -%post -n %{name}%{_so} -p /sbin/ldconfig +%post -n %{lname}%{_so} -p /sbin/ldconfig -%postun -n %{name}%{_so} -p /sbin/ldconfig +%postun -n %{lname}%{_so} -p /sbin/ldconfig %package devel Summary: Shared library interface around dcraw Group: Development/Libraries/KDE -Requires: %{name}%{_so} = %{version} -Requires: libkde4-devel +Requires: %{lname}%{_so} = %{version} +Requires: kdelibs4support-devel +Requires: threadweaver-devel +Obsoletes: libkdcraw-kf5-devel < %{version} +Provides: libkdcraw-kf5-devel = %{version} %description devel Libkdcraw is a C++ interface around dcraw binary program used to decode @@ -104,8 +111,8 @@ %files devel %defattr(-,root,root) %doc COPYING README -%_kde4_includedir/%{name}/ -%_kde4_libdir/%{name}.so -%_kde4_libdir/pkgconfig/%{name}.pc +%{_kf5_includedir}/ +%{_kf5_libdir}/cmake/KF5KDcraw/ +%{_kf5_libdir}/%{lname}.so %changelog ++++++ fix-libraw-dependency.diff ++++++ Index: libkdcraw-15.12.0/CMakeLists.txt =================================================================== --- libkdcraw-15.12.0.orig/CMakeLists.txt +++ libkdcraw-15.12.0/CMakeLists.txt @@ -12,7 +12,7 @@ message(STATUS "Starting CMake configura set(CMAKE_MIN_VERSION "2.8.12") set(ECM_MIN_VERSION "1.1.0") set(REQUIRED_QT_VERSION "5.2.0") -set(LIBRAW_MIN_VERSION "0.16") +set(LIBRAW_MIN_VERSION "0.15.4") cmake_minimum_required(VERSION ${CMAKE_MIN_VERSION}) ++++++ libkdcraw-15.08.3.tar.xz -> libkdcraw-15.12.1.tar.xz ++++++ ++++ 15606 lines of diff (skipped)

1 0