March 2020 - openSUSE Commits - openSUSE Mailing Lists

commit virtualbox for openSUSE:Factory
by root 31 Mar '20

31 Mar '20

Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at 2020-03-31 17:32:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtualbox (Old) and /work/SRC/openSUSE:Factory/.virtualbox.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virtualbox" Tue Mar 31 17:32:13 2020 rev:195 rq:789605 version:6.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2020-03-24 22:29:57.197017277 +0100 +++ /work/SRC/openSUSE:Factory/.virtualbox.new.3160/virtualbox.changes 2020-03-31 17:32:31.744270457 +0200 @@ -1,0 +2,14 @@ +Sun Mar 29 19:20:48 UTC 2020 - Larry Finger <Larry.Finger(a)gmail.com> + +- Fix build errors for gcc-10 (boo#1167897). File "fixes_for_gcc10.patch" is + added. +- Convert /usr/bin/VirtualBox to use "~/.config/VirtualBox" instead "~/.vbox". + This change was requested in boo#1167660. + +------------------------------------------------------------------- +Fri Mar 27 09:32:21 UTC 2020 - Antonio Larrosa <alarrosa(a)suse.com> + +- Add patch to fix missing include with Qt 5.15: + * fix-missing-includes-with-qt-5.15.patch + +------------------------------------------------------------------- New: ---- fix-missing-includes-with-qt-5.15.patch fixes_for_gcc10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.PVbndO/_old 2020-03-31 17:32:36.096273006 +0200 +++ /var/tmp/diff_new_pack.PVbndO/_new 2020-03-31 17:32:36.100273008 +0200 @@ -154,6 +154,10 @@ Patch135: fixes_for_5.6.patch # Fis VBoxClient Crashes Patch136: VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch +# Fix build for Qt 5.15 +Patch137: fix-missing-includes-with-qt-5.15.patch +# Fix builds with GCC10 +Patch138: fixes_for_gcc10.patch Patch999: virtualbox-fix-ui-background-color.patch # BuildRequires: LibVNCServer-devel @@ -460,6 +464,8 @@ %patch135 -p1 %endif %patch136 -p1 +%patch137 -p1 +%patch138 -p1 # make VB UI background colors look sane again %patch999 -p1 ++++++ VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch ++++++ --- /var/tmp/diff_new_pack.PVbndO/_old 2020-03-31 17:32:36.140273032 +0200 +++ /var/tmp/diff_new_pack.PVbndO/_new 2020-03-31 17:32:36.140273032 +0200 @@ -63,3 +63,4 @@ #ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE int rc2 = vboxClipboardFUSEStop(); + ++++++ fix-missing-includes-with-qt-5.15.patch ++++++ Index: VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp =================================================================== --- VirtualBox-6.1.4.orig/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp +++ VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp @@ -17,6 +17,7 @@ /* Qt includes: */ #include <QPainter> +#include <QPainterPath> /* GUI include */ #include "UIImageTools.h" Index: VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp =================================================================== --- VirtualBox-6.1.4.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp +++ VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp @@ -19,6 +19,7 @@ #include <QApplication> #include <QLabel> #include <QPainter> +#include <QPainterPath> #include <QPaintEvent> #include <QStyle> #include <QVBoxLayout> Index: VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h =================================================================== --- VirtualBox-6.1.4.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h +++ VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h @@ -24,6 +24,7 @@ /* Qt includes: */ #include <QIcon> #include <QWidget> +#include <QPainterPath> /* GUI includes: */ #include "UILibraryDefs.h" @@ -34,7 +35,6 @@ class QIcon; class QLabel; class QMouseEvent; class QObject; -class QPainterPath; class QPaintEvent; class QResizeEvent; class QString; Index: VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp =================================================================== --- VirtualBox-6.1.4.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp +++ VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp @@ -21,6 +21,7 @@ #include <QMenu> #include <QMoveEvent> #include <QPainter> +#include <QPainterPath> #include <QStateMachine> #include <QStyle> #include <QTimer> Index: VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp =================================================================== --- VirtualBox-6.1.4.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp +++ VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp @@ -19,6 +19,7 @@ #include <QApplication> #include <QHBoxLayout> #include <QPainter> +#include <QPainterPath> #include <QStyle> #include <QToolButton> ++++++ fixes_for_gcc10.patch ++++++ Index: VirtualBox-6.1.4/Config.kmk =================================================================== --- VirtualBox-6.1.4.orig/Config.kmk +++ VirtualBox-6.1.4/Config.kmk @@ -2684,8 +2684,16 @@ else # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)). # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`. # gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`! - VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion) | \ - $(SED_EXT) 's|$[0-9]$\.\{0,1\}$[0-9]\{0,1\}$\.\{0,1\}$[0-9]\{0,1\}$.*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' ) + # + # Check to make sure that the compiler has either -dumpfullversion or -dumpversion. gcc-10 has neither + RC = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion 2>/dev/null) ; echo $$?) + ifneq ($(RC),0) + # dump version commands not available - hardcode 10.0.1 for the moment + VBOX_GCC_VERSION = 100001 + else + VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion 2>/dev/null) | \ + $(SED_EXT) 's|$[0-9]$\.\{0,1\}$[0-9]\{0,1\}$\.\{0,1\}$[0-9]\{0,1\}$.*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' ) + endif endif # YASM macros ifndef DONT_USE_YASM Index: VirtualBox-6.1.4/include/iprt/formats/mach-o.h =================================================================== --- VirtualBox-6.1.4.orig/include/iprt/formats/mach-o.h +++ VirtualBox-6.1.4/include/iprt/formats/mach-o.h @@ -38,7 +38,7 @@ /* cputype */ #define CPU_ARCH_MASK INT32_C(0xff000000) #define CPU_ARCH_ABI64 INT32_C(0x01000000) -#define CPU_TYPE_ANY INT32_C(-1) +#define CPU_TYPE_ANY INT32_C(999) #define CPU_TYPE_VAX INT32_C(1) #define CPU_TYPE_MC680x0 INT32_C(6) #define CPU_TYPE_X86 INT32_C(7) @@ -53,7 +53,7 @@ #define CPU_TYPE_POWERPC64 (CPU_TYPE_POWERPC | CPU_ARCH_ABI64) /* cpusubtype */ -#define CPU_SUBTYPE_MULTIPLE INT32_C(-1) +#define CPU_SUBTYPE_MULTIPLE -1 #define CPU_SUBTYPE_LITTLE_ENDIAN INT32_C(0) #define CPU_SUBTYPE_BIG_ENDIAN INT32_C(1) ++++++ vbox-fpie.diff ++++++ --- /var/tmp/diff_new_pack.PVbndO/_old 2020-03-31 17:32:36.240273090 +0200 +++ /var/tmp/diff_new_pack.PVbndO/_new 2020-03-31 17:32:36.240273090 +0200 @@ -1,8 +1,16 @@ -Index: VirtualBox-5.1.4/Config.kmk +Index: VirtualBox-6.1.4/Config.kmk =================================================================== ---- VirtualBox-5.1.4.orig/Config.kmk -+++ VirtualBox-5.1.4/Config.kmk -@@ -4852,6 +4852,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi +--- VirtualBox-6.1.4.orig/Config.kmk ++++ VirtualBox-6.1.4/Config.kmk +@@ -2687,7 +2687,6 @@ else + VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion) | \ + $(SED_EXT) 's|$[0-9]$\.\{0,1\}$[0-9]\{0,1\}$\.\{0,1\}$[0-9]\{0,1\}$.*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' ) + endif +- + # YASM macros + ifndef DONT_USE_YASM + include $(KBUILD_PATH)/tools/YASM.kmk +@@ -5533,6 +5532,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi ifeq ($(KBUILD_TARGET),linux) # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp # TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap @@ -12,7 +20,7 @@ endif ifeq ($(KBUILD_TARGET),win) # No CRT! TEMPLATE_VBOXR3HARDENEDEXE_SDKS = VBOX_NTDLL $(TEMPLATE_VBOXR3EXE_SDKS) -@@ -4871,8 +4874,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! +@@ -5554,8 +5556,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE) else ifn1of ($(KBUILD_TARGET), os2 solaris) # We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH) ++++++ vbox-usb-warning.diff ++++++ --- /var/tmp/diff_new_pack.PVbndO/_old 2020-03-31 17:32:36.268273107 +0200 +++ /var/tmp/diff_new_pack.PVbndO/_new 2020-03-31 17:32:36.272273109 +0200 @@ -55,21 +55,21 @@ +#include <QtWidgets/QPushButton>+ +int main(int argc, char *argv[]) +{ -+ QApplication app(argc, argv); -+ QMessageBox msgBox; ++ QApplication app(argc, argv); ++ QMessageBox msgBox; + QPushButton *myYesButton = msgBox.addButton("Enable", QMessageBox::YesRole); + QPushButton *myNoButton = msgBox.addButton("Disable", QMessageBox::NoRole); + msgBox.setWindowTitle(QObject::tr("USB Rules and Permissions !")); -+ msgBox.setText(QObject::tr("USB passthrough requires read/write access to USB devices. " ++ msgBox.setText(QObject::tr("USB passthrough requires read/write access to USB devices. " + "As a result, it opens a security hole.\n\n" + "Nonetheless, this feature is extremely useful and it may be worth the security risk. " + "Thus the code defaults to enabling it.\n\nIf you agree that the risk is acceptable, then click 'Enable'.\n" -+ "You will not be asked this question again when VB is updated. If you later change your mind, run 'rm ~/.vbox/*'\n\n" ++ "You should not be asked this question again when VB is updated. If you later change your mind, run 'rm ~/.config/virtualbox/*'\n\n" + "If you wish to disable USB passthrough to plug the security hole, then click 'Disable'. " + "You will be asked for the system password, and /etc/udev/rules.d/60-vboxdrv.rules will be changed.\n\n" -+ "These changes cannot be preserved through VB updates, thus this screen will be displayed again at that time.")); ++ "These changes may not be preserved through VB updates, thus this screen may be displayed again at that time.")); + msgBox.exec(); -+ app.quit(); ++ app.quit(); + if (msgBox.clickedButton() == myYesButton) + return 0; + return 1; ++++++ virtualbox-wrapper.sh ++++++ --- /var/tmp/diff_new_pack.PVbndO/_old 2020-03-31 17:32:36.476273229 +0200 +++ /var/tmp/diff_new_pack.PVbndO/_new 2020-03-31 17:32:36.480273231 +0200 @@ -6,8 +6,8 @@ # # Handle the issue regarding USB passthru # The following conditions apply: -# 1. If ~/.vbox/enable exists, the user accepts the security risk. -# 2. If ~/.vbox/disable exists, the user does not accept the risk. That file will contain the inode of /usr/lib/udev/rules.d/60-vboxdrv.rules. +# 1. If ~/.config/VirtualBox/enable exists, the user accepts the security risk. +# 2. If ~/.config/VirtualBox/disable exists, the user does not accept the risk. That file will contain the inode of /usr/lib/udev/rules.d/60-vboxdrv.rules. # When that changes, the VBoxUSB_DevRules will again be displayed as that means that VB has been reloaded. # devrules() @@ -15,38 +15,40 @@ /usr/lib/virtualbox/VBoxUSB_DevRules if [ $? -eq 0 ] ; then # User accepts the risk - touch ~/.vbox/enable - rm -f ~/.vbox/disable + touch ~/.config/VirtualBox/enable + rm -f ~/.config/VirtualBox/disable else # User declines the risk - save the inode - echo "" > ~/.vbox/disable - rm -f ~/.vbox/enable + echo "" > ~/.config/VirtualBox/disable + rm -f ~/.config/VirtualBox/enable fi } # Start of main routine # -# Ensure that ~/.vbox exists -mkdir -p ~/.vbox/ +# Ensure that ~/.config/VirtualBox exists +mkdir -p ~/.config/VirtualBox +# Originally, this information was in ~/.vbox. Remove any files found there +rm -rf ~/.vbox # Get the inode for /usr/lib/udev/rules.d/60-vboxdrv.rules INODE=$(stat /usr/lib/udev/rules.d/60-vboxdrv.rules | grep Inode | cut -d' ' -f3) -if [ ! -f ~/.vbox/enable ] && [ ! -f ~/.vbox/disable ] ; then +if [ ! -f ~/.config/VirtualBox/enable ] && [ ! -f ~/.config/VirtualBox/disable ] ; then # Neither file exists - find what the user wants devrules fi # Get the original Inode if it exists -if [ -f ~/.vbox/disable ] ; then - read LINE < ~/.vbox/disable +if [ -f ~/.config/VirtualBox/disable ] ; then + read LINE < ~/.config/VirtualBox/disable else LINE=" " fi # If user originally declined, make certain that /usr/lib/udev/rules.d/60-vboxdrv.rules has not been changed -if [ -f ~/.vbox/disable ] && [ "$LINE" != "$INODE" ] && [ "$LINE" != "" ] ; then +if [ -f ~/.config/VirtualBox/disable ] && [ "$LINE" != "$INODE" ] && [ "$LINE" != "" ] ; then # disable is selected and the Inode has changed - ask again devrules fi -if [ -f ~/.vbox/disable ] ; then - echo $INODE > ~/.vbox/disable +if [ -f ~/.config/VirtualBox/disable ] ; then + echo $INODE > ~/.config/VirtualBox/disable if [ "$LINE" != "$INODE" ] ; then if [ -f /usr/bin/kdesu ] ; then kdesu /sbin/vbox-fix-usb-rules.sh

1 0

commit kdiagram for openSUSE:Factory
by root 31 Mar '20

31 Mar '20

Hello community, here is the log from the commit of package kdiagram for openSUSE:Factory checked in at 2020-03-31 17:32:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdiagram (Old) and /work/SRC/openSUSE:Factory/.kdiagram.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdiagram" Tue Mar 31 17:32:11 2020 rev:3 rq:789521 version:2.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kdiagram/kdiagram.changes 2018-04-25 09:55:41.663294894 +0200 +++ /work/SRC/openSUSE:Factory/.kdiagram.new.3160/kdiagram.changes 2020-03-31 17:32:21.168264264 +0200 @@ -1,0 +2,13 @@ +Sun Mar 29 10:51:37 UTC 2020 - wbauer(a)tmo.at + +- Update to 2.6.2 + * Reimplement Chart::paint() to fix printing issues + The previous implementation did not take the headers and + footers into account when resizing the diagram (kde#405075) + * Fix painting bar diagrams with horizontal bars + * Do not reference private headers in KChart convenience header +- Add full Source URL +- Use %lang_package macro +- Run spec-cleaner + +------------------------------------------------------------------- Old: ---- kdiagram-2.6.1.tar.xz New: ---- kdiagram-2.6.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiagram.spec ++++++ --- /var/tmp/diff_new_pack.5pn5Ee/_old 2020-03-31 17:32:21.724264589 +0200 +++ /var/tmp/diff_new_pack.5pn5Ee/_new 2020-03-31 17:32:21.724264589 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdiagram # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,30 +12,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %bcond_without lang Name: kdiagram -Version: 2.6.1 +Version: 2.6.2 Release: 0 Summary: Powerful libraries (KChart, KGantt) for creating business diagrams -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/KDE -Url: http://www.kde.org/ -Source: %{name}-%{version}.tar.xz +URL: https://www.kde.org/ +Source: https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: libqt5-linguist-devel >= 5.6.0 -BuildRequires: pkgconfig(Qt5Core) >= 5.6.0 -BuildRequires: pkgconfig(Qt5Gui) >= 5.6.0 -BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.6.0 -BuildRequires: pkgconfig(Qt5Svg) >= 5.6.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.6.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.6.0 -BuildRequires: pkgconfig(zlib) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: cmake(Qt5PrintSupport) >= 5.6.0 +BuildRequires: cmake(Qt5Svg) >= 5.6.0 +BuildRequires: cmake(Qt5Test) >= 5.6.0 +BuildRequires: cmake(Qt5Widgets) >= 5.6.0 %description %{summary} @@ -44,6 +40,7 @@ Summary: KChart library for kdiagram Group: System/Libraries Recommends: libkchart-lang = %{version} +Provides: libkchart = %{version} %description -n libKChart2 This package contains the KChart libraries from the kdiagram package. @@ -52,41 +49,24 @@ Summary: Gantt chart implementation for kdiagram Group: System/Libraries Recommends: libkgantt-lang = %{version} +Provides: libkgantt = %{version} %description -n libKGantt2 This package contains the KGantt libraries from the kdiagram package. -%package -n libkgantt-lang -Summary: Translation for the KGantt library -Group: System/Localization -Requires: libKGantt2 = %{version} -Provides: libkgantt-lang-all = %{version} -Supplements: packageand(bundle-lang-other:libKGantt2) -BuildArch: noarch - -%description -n libkgantt-lang -Translatons for the KGantt library - -%package -n libkchart-lang -Summary: Translation for the KChart library -Group: System/Localization -Requires: libKChart2 = %{version} -Provides: libkchart-lang-all = %{version} -Supplements: packageand(bundle-lang-other:libKChart2) -BuildArch: noarch - -%description -n libkchart-lang -Translatons for the KChart library +%lang_package -n libkgantt +%lang_package -n libkchart %package devel Summary: Development package for the KDiagram libraries Group: System/Libraries/KDE Requires: libKChart2 = %{version} Requires: libKGantt2 = %{version} -Requires: pkgconfig(Qt5Core) >= 5.2.0 -Requires: pkgconfig(Qt5Svg) >= 5.2.0 -Requires: pkgconfig(Qt5Widgets) >= 5.2.0 +Requires: cmake(Qt5Core) >= 5.6.0 +Requires: cmake(Qt5PrintSupport) >= 5.6.0 +Requires: cmake(Qt5Svg) >= 5.6.0 +Requires: cmake(Qt5Widgets) >= 5.6.0 %description devel Development package for the KDiagram libraries @@ -100,8 +80,10 @@ %install %kf5_makeinstall -C build - %find_lang kgantt_qt --with-qt --without-mo --all-name - %find_lang kchart_qt --with-qt --without-mo --all-name +%if %{with lang} + %find_lang kgantt --with-qt --without-mo + %find_lang kchart --with-qt --without-mo +%endif %post -n libKChart2 -p /sbin/ldconfig %postun -n libKChart2 -p /sbin/ldconfig @@ -109,23 +91,18 @@ %postun -n libKGantt2 -p /sbin/ldconfig %files -n libKChart2 -%defattr(-,root,root) %{_libdir}/libKChart.so.* %files -n libKGantt2 -%defattr(-,root,root) %{_libdir}/libKGantt.so.* -%files -n libkchart-lang -f kchart_qt.lang -%defattr(-,root,root) -%exclude %{_datadir}/locale/*/LC_MESSAGES/kgantt_qt.qm - -%files -n libkgantt-lang -f kgantt_qt.lang -%defattr(-,root,root) -%exclude %{_datadir}/locale/*/LC_MESSAGES/kchart_qt.qm +%if %{with lang} +%files -n libkchart-lang -f kchart.lang + +%files -n libkgantt-lang -f kgantt.lang +%endif %files devel -%defattr(-,root,root) %{_includedir}/KChart/ %{_includedir}/kchart_version.h %{_includedir}/KGantt/ ++++++ kdiagram-2.6.1.tar.xz -> kdiagram-2.6.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ca/kchart_qt.po new/kdiagram-2.6.2/po/ca/kchart_qt.po --- old/kdiagram-2.6.1/po/ca/kchart_qt.po 2018-04-18 09:36:42.000000000 +0200 +++ new/kdiagram-2.6.2/po/ca/kchart_qt.po 2020-03-28 13:56:47.000000000 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kchart_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" "PO-Revision-Date: 2015-02-23 13:57+0100\n" "Last-Translator: Antoni Bella Pérez <antonibella5(a)yahoo.com>\n" "Language-Team: Catalan <kde-i18n-ca(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ca/kgantt_qt.po new/kdiagram-2.6.2/po/ca/kgantt_qt.po --- old/kdiagram-2.6.1/po/ca/kgantt_qt.po 2018-04-18 09:36:42.000000000 +0200 +++ new/kdiagram-2.6.2/po/ca/kgantt_qt.po 2020-03-28 13:56:47.000000000 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kgantt_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" "PO-Revision-Date: 2015-02-23 13:58+0100\n" "Last-Translator: Antoni Bella Pérez <antonibella5(a)yahoo.com>\n" "Language-Team: Catalan <kde-i18n-ca(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ca(a)valencia/kchart_qt.po new/kdiagram-2.6.2/po/ca(a)valencia/kchart_qt.po --- old/kdiagram-2.6.1/po/ca(a)valencia/kchart_qt.po 2018-04-18 09:36:42.000000000 +0200 +++ new/kdiagram-2.6.2/po/ca(a)valencia/kchart_qt.po 2020-03-28 13:56:47.000000000 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kchart_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" "PO-Revision-Date: 2015-02-23 13:57+0100\n" "Last-Translator: Antoni Bella Pérez <antonibella5(a)yahoo.com>\n" "Language-Team: Catalan <kde-i18n-ca(a)kde.org>\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Qt-Contexts: true\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: &\n" "X-Generator: Lokalize 1.5\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ca(a)valencia/kgantt_qt.po new/kdiagram-2.6.2/po/ca(a)valencia/kgantt_qt.po --- old/kdiagram-2.6.1/po/ca(a)valencia/kgantt_qt.po 2018-04-18 09:36:42.000000000 +0200 +++ new/kdiagram-2.6.2/po/ca(a)valencia/kgantt_qt.po 2020-03-28 13:56:47.000000000 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kgantt_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" "PO-Revision-Date: 2015-02-23 13:58+0100\n" "Last-Translator: Antoni Bella Pérez <antonibella5(a)yahoo.com>\n" "Language-Team: Catalan <kde-i18n-ca(a)kde.org>\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Qt-Contexts: true\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: &\n" "X-Generator: Lokalize 1.5\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/gl/kchart_qt.po new/kdiagram-2.6.2/po/gl/kchart_qt.po --- old/kdiagram-2.6.1/po/gl/kchart_qt.po 2018-04-18 09:36:50.000000000 +0200 +++ new/kdiagram-2.6.2/po/gl/kchart_qt.po 2020-03-28 13:57:09.000000000 +0100 @@ -9,9 +9,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Qt-Contexts: true\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Qt-Contexts: true\n" #: Cartesian/KChartLeveyJenningsAxis.cpp:63 msgctxt "KChart::LeveyJenningsAxis|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/gl/kgantt_qt.po new/kdiagram-2.6.2/po/gl/kgantt_qt.po --- old/kdiagram-2.6.1/po/gl/kgantt_qt.po 2018-04-18 09:36:50.000000000 +0200 +++ new/kdiagram-2.6.2/po/gl/kgantt_qt.po 2020-03-28 13:57:09.000000000 +0100 @@ -9,9 +9,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Qt-Contexts: true\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Qt-Contexts: true\n" #: kganttgraphicsview.cpp:97 msgctxt "KGantt::HeaderWidget|@title:menu" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ja/kchart_qt.po new/kdiagram-2.6.2/po/ja/kchart_qt.po --- old/kdiagram-2.6.1/po/ja/kchart_qt.po 2018-04-18 09:36:54.000000000 +0200 +++ new/kdiagram-2.6.2/po/ja/kchart_qt.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,165 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: kchart_qt\n" -"Language-Team: Japanese <kde-jp(a)kde.org>\n" -"Language: ja\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: qtrich\n" -"X-Qt-Contexts: true\n" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:63 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "-3sd" -msgstr "" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:63 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "-2sd" -msgstr "" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:63 -#: Cartesian/KChartLeveyJenningsAxis.cpp:175 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "mean" -msgstr "" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:64 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "+2sd" -msgstr "" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:64 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "+3sd" -msgstr "" - -#: KChartDatasetSelector.ui:30 -msgctxt "DatasetSelector|" -msgid "Data Selector" -msgstr "" - -#: KChartDatasetSelector.ui:42 -msgctxt "DatasetSelector|" -msgid "Only display a subset of the model in the chart:" -msgstr "" - -#: KChartDatasetSelector.ui:60 KChartDatasetSelector.ui:126 -msgctxt "DatasetSelector|" -msgid "in reverse order." -msgstr "" - -#: KChartDatasetSelector.ui:67 KChartDatasetSelector.ui:103 -msgctxt "DatasetSelector|" -msgid "..." -msgstr "" - -#: KChartDatasetSelector.ui:80 -msgctxt "DatasetSelector|" -msgid "columns starting at column" -msgstr "" - -#: KChartDatasetSelector.ui:93 KChartDatasetSelector.ui:133 -msgctxt "DatasetSelector|" -msgid "Display" -msgstr "" - -#: KChartDatasetSelector.ui:116 -msgctxt "DatasetSelector|" -msgid "rows starting at row" -msgstr "" - -#: KChartLegend.cpp:53 -msgctxt "QObject|" -msgid "Legend" -msgstr "" - -#: KChartPosition.cpp:40 -msgctxt "Position|" -msgid "Unknown Position" -msgstr "" - -#: KChartPosition.cpp:41 -msgctxt "Position|" -msgid "Center" -msgstr "" - -#: KChartPosition.cpp:42 -msgctxt "Position|" -msgid "NorthWest" -msgstr "" - -#: KChartPosition.cpp:43 -msgctxt "Position|" -msgid "North" -msgstr "" - -#: KChartPosition.cpp:44 -msgctxt "Position|" -msgid "NorthEast" -msgstr "" - -#: KChartPosition.cpp:45 -msgctxt "Position|" -msgid "East" -msgstr "" - -#: KChartPosition.cpp:46 -msgctxt "Position|" -msgid "SouthEast" -msgstr "" - -#: KChartPosition.cpp:47 -msgctxt "Position|" -msgid "South" -msgstr "" - -#: KChartPosition.cpp:48 -msgctxt "Position|" -msgid "SouthWest" -msgstr "" - -#: KChartPosition.cpp:49 -msgctxt "Position|" -msgid "West" -msgstr "" - -#: KChartPosition.cpp:50 -msgctxt "Position|" -msgid "Floating" -msgstr "" - -#: Ternary/KChartTernaryAxis.cpp:48 -msgctxt "QObject|" -msgid "50%" -msgstr "" - -#: Ternary/KChartTernaryAxis.cpp:146 -msgctxt "KChart::TernaryAxis|" -msgid "A" -msgstr "" - -#: Ternary/KChartTernaryAxis.cpp:149 -msgctxt "KChart::TernaryAxis|" -msgid "C" -msgstr "" - -#: Ternary/KChartTernaryAxis.cpp:152 -msgctxt "KChart::TernaryAxis|" -msgid "B" -msgstr "" - -#: Ternary/KChartTernaryLineDiagram.cpp:133 -#, qt-format -msgctxt "KChart::TernaryLineDiagram|(x, y, z) values of the data point" -msgid "(%1, %2, %3)" -msgstr "" - -#: Ternary/KChartTernaryPointDiagram.cpp:116 -#, qt-format -msgctxt "KChart::TernaryPointDiagram|(x, y, z) values of the data point" -msgid "(%1, %2, %3)" -msgstr "" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ja/kgantt_qt.po new/kdiagram-2.6.2/po/ja/kgantt_qt.po --- old/kdiagram-2.6.1/po/ja/kgantt_qt.po 2018-04-18 09:36:54.000000000 +0200 +++ new/kdiagram-2.6.2/po/ja/kgantt_qt.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: kgantt_qt\n" -"Language-Team: Japanese <kde-jp(a)kde.org>\n" -"Language: ja\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: qtrich\n" -"X-Qt-Contexts: true\n" - -#: kganttgraphicsview.cpp:97 -msgctxt "KGantt::HeaderWidget|@title:menu" -msgid "Scale" -msgstr "" - -#: kganttgraphicsview.cpp:101 -msgctxt "KGantt::HeaderWidget|@item:inmenu Automatic scale" -msgid "Auto" -msgstr "" - -#: kganttgraphicsview.cpp:104 -msgctxt "KGantt::HeaderWidget|@item:inmenu" -msgid "Month" -msgstr "" - -#: kganttgraphicsview.cpp:107 -msgctxt "KGantt::HeaderWidget|@item:inmenu" -msgid "Week" -msgstr "" - -#: kganttgraphicsview.cpp:110 -msgctxt "KGantt::HeaderWidget|@item:inmenu" -msgid "Day" -msgstr "" - -#: kganttgraphicsview.cpp:113 -msgctxt "KGantt::HeaderWidget|@item:inmenu" -msgid "Hour" -msgstr "" - -#: kganttgraphicsview.cpp:136 -msgctxt "KGantt::HeaderWidget|@action:inmenu" -msgid "Zoom In" -msgstr "" - -#: kganttgraphicsview.cpp:138 -msgctxt "KGantt::HeaderWidget|@action:inmenu" -msgid "Zoom Out" -msgstr "" - -#: kganttitemdelegate.cpp:183 -#, qt-format -msgctxt "KGantt::ItemDelegate|start time -> end time: item name" -msgid "%1 -> %2: %3" -msgstr "" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ko/kchart_qt.po new/kdiagram-2.6.2/po/ko/kchart_qt.po --- old/kdiagram-2.6.1/po/ko/kchart_qt.po 2018-04-18 09:36:56.000000000 +0200 +++ new/kdiagram-2.6.2/po/ko/kchart_qt.po 2020-03-28 13:57:26.000000000 +0100 @@ -4,7 +4,7 @@ "Project-Id-Version: \n" "PO-Revision-Date: 2015-07-30 15:27+0200\n" "Last-Translator: Shinjo Park <kde(a)peremen.name>\n" -"Language-Team: Korean <kde(a)peremen.name>\n" +"Language-Team: Korean <kde-kr(a)kde.org>\n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ko/kgantt_qt.po new/kdiagram-2.6.2/po/ko/kgantt_qt.po --- old/kdiagram-2.6.1/po/ko/kgantt_qt.po 2018-04-18 09:36:56.000000000 +0200 +++ new/kdiagram-2.6.2/po/ko/kgantt_qt.po 2020-03-28 13:57:26.000000000 +0100 @@ -4,7 +4,7 @@ "Project-Id-Version: \n" "PO-Revision-Date: 2015-07-27 15:55+0200\n" "Last-Translator: Shinjo Park <kde(a)peremen.name>\n" -"Language-Team: Korean <kde(a)peremen.name>\n" +"Language-Team: Korean <kde-kr(a)kde.org>\n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/lt/kchart_qt.po new/kdiagram-2.6.2/po/lt/kchart_qt.po --- old/kdiagram-2.6.1/po/lt/kchart_qt.po 2018-04-18 09:36:57.000000000 +0200 +++ new/kdiagram-2.6.2/po/lt/kchart_qt.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,165 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: trunk-kf 5\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: lt\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Qt-Contexts: true\n" -"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" -"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:63 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "-3sd" -msgstr "" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:63 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "-2sd" -msgstr "" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:63 -#: Cartesian/KChartLeveyJenningsAxis.cpp:175 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "mean" -msgstr "" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:64 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "+2sd" -msgstr "" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:64 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "+3sd" -msgstr "" - -#: KChartDatasetSelector.ui:30 -msgctxt "DatasetSelector|" -msgid "Data Selector" -msgstr "" - -#: KChartDatasetSelector.ui:42 -msgctxt "DatasetSelector|" -msgid "Only display a subset of the model in the chart:" -msgstr "" - -#: KChartDatasetSelector.ui:60 KChartDatasetSelector.ui:126 -msgctxt "DatasetSelector|" -msgid "in reverse order." -msgstr "" - -#: KChartDatasetSelector.ui:67 KChartDatasetSelector.ui:103 -msgctxt "DatasetSelector|" -msgid "..." -msgstr "" - -#: KChartDatasetSelector.ui:80 -msgctxt "DatasetSelector|" -msgid "columns starting at column" -msgstr "" - -#: KChartDatasetSelector.ui:93 KChartDatasetSelector.ui:133 -msgctxt "DatasetSelector|" -msgid "Display" -msgstr "" - -#: KChartDatasetSelector.ui:116 -msgctxt "DatasetSelector|" -msgid "rows starting at row" -msgstr "" - -#: KChartLegend.cpp:53 -msgctxt "QObject|" -msgid "Legend" -msgstr "" - -#: KChartPosition.cpp:40 -msgctxt "Position|" -msgid "Unknown Position" -msgstr "" - -#: KChartPosition.cpp:41 -msgctxt "Position|" -msgid "Center" -msgstr "" - -#: KChartPosition.cpp:42 -msgctxt "Position|" -msgid "NorthWest" -msgstr "" - -#: KChartPosition.cpp:43 -msgctxt "Position|" -msgid "North" -msgstr "" - -#: KChartPosition.cpp:44 -msgctxt "Position|" -msgid "NorthEast" -msgstr "" - -#: KChartPosition.cpp:45 -msgctxt "Position|" -msgid "East" -msgstr "" - -#: KChartPosition.cpp:46 -msgctxt "Position|" -msgid "SouthEast" -msgstr "" - -#: KChartPosition.cpp:47 -msgctxt "Position|" -msgid "South" -msgstr "" - -#: KChartPosition.cpp:48 -msgctxt "Position|" -msgid "SouthWest" -msgstr "" - -#: KChartPosition.cpp:49 -msgctxt "Position|" -msgid "West" -msgstr "" - -#: KChartPosition.cpp:50 -msgctxt "Position|" -msgid "Floating" -msgstr "" - -#: Ternary/KChartTernaryAxis.cpp:48 -msgctxt "QObject|" -msgid "50%" -msgstr "" - -#: Ternary/KChartTernaryAxis.cpp:146 -msgctxt "KChart::TernaryAxis|" -msgid "A" -msgstr "" - -#: Ternary/KChartTernaryAxis.cpp:149 -msgctxt "KChart::TernaryAxis|" -msgid "C" -msgstr "" - -#: Ternary/KChartTernaryAxis.cpp:152 -msgctxt "KChart::TernaryAxis|" -msgid "B" -msgstr "" - -#: Ternary/KChartTernaryLineDiagram.cpp:133 -#, qt-format -msgctxt "KChart::TernaryLineDiagram|(x, y, z) values of the data point" -msgid "(%1, %2, %3)" -msgstr "" - -#: Ternary/KChartTernaryPointDiagram.cpp:116 -#, qt-format -msgctxt "KChart::TernaryPointDiagram|(x, y, z) values of the data point" -msgid "(%1, %2, %3)" -msgstr "" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/lt/kgantt_qt.po new/kdiagram-2.6.2/po/lt/kgantt_qt.po --- old/kdiagram-2.6.1/po/lt/kgantt_qt.po 2018-04-18 09:36:57.000000000 +0200 +++ new/kdiagram-2.6.2/po/lt/kgantt_qt.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: trunk-kf 5\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: lt\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Qt-Contexts: true\n" -"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" -"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" - -#: kganttgraphicsview.cpp:97 -msgctxt "KGantt::HeaderWidget|@title:menu" -msgid "Scale" -msgstr "" - -#: kganttgraphicsview.cpp:101 -msgctxt "KGantt::HeaderWidget|@item:inmenu Automatic scale" -msgid "Auto" -msgstr "" - -#: kganttgraphicsview.cpp:104 -msgctxt "KGantt::HeaderWidget|@item:inmenu" -msgid "Month" -msgstr "" - -#: kganttgraphicsview.cpp:107 -msgctxt "KGantt::HeaderWidget|@item:inmenu" -msgid "Week" -msgstr "" - -#: kganttgraphicsview.cpp:110 -msgctxt "KGantt::HeaderWidget|@item:inmenu" -msgid "Day" -msgstr "" - -#: kganttgraphicsview.cpp:113 -msgctxt "KGantt::HeaderWidget|@item:inmenu" -msgid "Hour" -msgstr "" - -#: kganttgraphicsview.cpp:136 -msgctxt "KGantt::HeaderWidget|@action:inmenu" -msgid "Zoom In" -msgstr "" - -#: kganttgraphicsview.cpp:138 -msgctxt "KGantt::HeaderWidget|@action:inmenu" -msgid "Zoom Out" -msgstr "" - -#: kganttitemdelegate.cpp:183 -#, qt-format -msgctxt "KGantt::ItemDelegate|start time -> end time: item name" -msgid "%1 -> %2: %3" -msgstr "" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ru/kchart_qt.po new/kdiagram-2.6.2/po/ru/kchart_qt.po --- old/kdiagram-2.6.1/po/ru/kchart_qt.po 2018-04-18 09:37:04.000000000 +0200 +++ new/kdiagram-2.6.2/po/ru/kchart_qt.po 2020-03-28 13:57:59.000000000 +0100 @@ -1,9 +1,9 @@ # Alexander Lakhin <exclusion(a)gmail.com>, 2013. -# Alexander Potashev <aspotashev(a)gmail.com>, 2015. +# Alexander Potashev <aspotashev(a)gmail.com>, 2015, 2018. msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2015-10-03 18:38+0300\n" +"PO-Revision-Date: 2018-12-17 14:35+0300\n" "Last-Translator: Alexander Potashev <aspotashev(a)gmail.com>\n" "Language-Team: Russian <kde-russian(a)lists.kde.ru>\n" "Language: ru\n" @@ -84,86 +84,86 @@ #: KChartPosition.cpp:40 msgctxt "Position|" msgid "Unknown Position" -msgstr "" +msgstr "Неизвестное расположение" #: KChartPosition.cpp:41 msgctxt "Position|" msgid "Center" -msgstr "" +msgstr "По центру" #: KChartPosition.cpp:42 msgctxt "Position|" msgid "NorthWest" -msgstr "" +msgstr "Слева сверху" #: KChartPosition.cpp:43 msgctxt "Position|" msgid "North" -msgstr "" +msgstr "Сверху" #: KChartPosition.cpp:44 msgctxt "Position|" msgid "NorthEast" -msgstr "" +msgstr "Справа сверху" #: KChartPosition.cpp:45 msgctxt "Position|" msgid "East" -msgstr "" +msgstr "Справа" #: KChartPosition.cpp:46 msgctxt "Position|" msgid "SouthEast" -msgstr "" +msgstr "Справа снизу" #: KChartPosition.cpp:47 msgctxt "Position|" msgid "South" -msgstr "" +msgstr "Снизу" #: KChartPosition.cpp:48 msgctxt "Position|" msgid "SouthWest" -msgstr "" +msgstr "Слева снизу" #: KChartPosition.cpp:49 msgctxt "Position|" msgid "West" -msgstr "" +msgstr "Слева" #: KChartPosition.cpp:50 msgctxt "Position|" msgid "Floating" -msgstr "" +msgstr "Плавающее" #: Ternary/KChartTernaryAxis.cpp:48 msgctxt "QObject|" msgid "50%" -msgstr "" +msgstr "50%" #: Ternary/KChartTernaryAxis.cpp:146 msgctxt "KChart::TernaryAxis|" msgid "A" -msgstr "" +msgstr "A" #: Ternary/KChartTernaryAxis.cpp:149 msgctxt "KChart::TernaryAxis|" msgid "C" -msgstr "" +msgstr "C" #: Ternary/KChartTernaryAxis.cpp:152 msgctxt "KChart::TernaryAxis|" msgid "B" -msgstr "" +msgstr "B" #: Ternary/KChartTernaryLineDiagram.cpp:133 #, qt-format msgctxt "KChart::TernaryLineDiagram|(x, y, z) values of the data point" msgid "(%1, %2, %3)" -msgstr "" +msgstr "(%1; %2; %3)" #: Ternary/KChartTernaryPointDiagram.cpp:116 #, qt-format msgctxt "KChart::TernaryPointDiagram|(x, y, z) values of the data point" msgid "(%1, %2, %3)" -msgstr "" \ No newline at end of file +msgstr "(%1; %2; %3)" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/zh_CN/kchart_qt.po new/kdiagram-2.6.2/po/zh_CN/kchart_qt.po --- old/kdiagram-2.6.1/po/zh_CN/kchart_qt.po 2018-04-18 09:37:15.000000000 +0200 +++ new/kdiagram-2.6.2/po/zh_CN/kchart_qt.po 2020-03-28 13:58:24.000000000 +0100 @@ -2,8 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-04-17 04:58-0400\n" -"Last-Translator: guoyunhebrave <guoyunhebrave(a)gmail.com>\n" +"PO-Revision-Date: 2020-03-25 19:57\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -11,7 +10,6 @@ "Content-Transfer-Encoding: 8bit\n" "X-Qt-Contexts: true\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" "X-Crowdin-Language: zh-CN\n" "X-Crowdin-File: /kf5-stable/messages/extragear-graphics/kchart_qt.pot\n" @@ -90,7 +88,7 @@ #: KChartPosition.cpp:41 msgctxt "Position|" msgid "Center" -msgstr "中间" +msgstr "居中" #: KChartPosition.cpp:42 msgctxt "Position|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/zh_CN/kgantt_qt.po new/kdiagram-2.6.2/po/zh_CN/kgantt_qt.po --- old/kdiagram-2.6.1/po/zh_CN/kgantt_qt.po 2018-04-18 09:37:15.000000000 +0200 +++ new/kdiagram-2.6.2/po/zh_CN/kgantt_qt.po 2020-03-28 13:58:24.000000000 +0100 @@ -2,8 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-04-17 04:58-0400\n" -"Last-Translator: guoyunhebrave <guoyunhebrave(a)gmail.com>\n" +"PO-Revision-Date: 2020-03-25 19:57\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -11,7 +10,6 @@ "Content-Transfer-Encoding: 8bit\n" "X-Qt-Contexts: true\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" "X-Crowdin-Language: zh-CN\n" "X-Crowdin-File: /kf5-stable/messages/extragear-graphics/kgantt_qt.pot\n" @@ -19,7 +17,7 @@ #: kganttgraphicsview.cpp:97 msgctxt "KGantt::HeaderWidget|@title:menu" msgid "Scale" -msgstr "比例" +msgstr "缩放" #: kganttgraphicsview.cpp:101 msgctxt "KGantt::HeaderWidget|@item:inmenu Automatic scale" @@ -39,7 +37,7 @@ #: kganttgraphicsview.cpp:110 msgctxt "KGantt::HeaderWidget|@item:inmenu" msgid "Day" -msgstr "白天" +msgstr "天" #: kganttgraphicsview.cpp:113 msgctxt "KGantt::HeaderWidget|@item:inmenu" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/CMakeLists.txt new/kdiagram-2.6.2/src/KChart/CMakeLists.txt --- old/kdiagram-2.6.1/src/KChart/CMakeLists.txt 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/CMakeLists.txt 2020-03-28 13:56:20.000000000 +0100 @@ -1,4 +1,4 @@ -set( KCHARTLIB_VERSION "2.6.1" ) +set( KCHARTLIB_VERSION "2.6.2" ) ecm_setup_version(${KCHARTLIB_VERSION} VARIABLE_PREFIX KCHART diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp new/kdiagram-2.6.2/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp --- old/kdiagram-2.6.1/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -158,13 +158,13 @@ } } - for ( int column = 0; column < colCount; column++ ) { + for ( int column = colCount-1; column >= 0; --column ) { // paint one group const CartesianDiagramDataCompressor::CachePosition position( row, column ); const CartesianDiagramDataCompressor::DataPoint point = compressor().data( position ); const QModelIndex sourceIndex = attributesModel()->mapToSource( point.index ); - QPointF dataPoint( 0, rowCount - ( point.key + 0.5 ) ); + QPointF dataPoint( 0, ( point.key + 0.5 ) ); const QPointF topLeft = ctx->coordinatePlane()->translate( dataPoint ); dataPoint.rx() += point.value; const QPointF bottomRight = ctx->coordinatePlane()->translate( dataPoint ) + @@ -173,6 +173,7 @@ const QRectF rect = QRectF( topLeft, bottomRight ).translated( 1.0, offset ); m_private->addLabel( &lpc, sourceIndex, 0, PositionPoints( rect ), Position::North, Position::South, point.value ); + paintBars( ctx, sourceIndex, rect, maxDepth ); offset += barWidth + spaceBetweenBars; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp new/kdiagram-2.6.2/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp --- old/kdiagram-2.6.1/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -192,11 +192,11 @@ QPointF point, previousPoint; if ( sumValuesVector.at( curRow ) != 0 && value > 0 ) { - QPointF dataPoint( ( stackedValues / sumValuesVector.at( curRow ) * maxValue ), rowCount - key ); + QPointF dataPoint( ( stackedValues / sumValuesVector.at( curRow ) * maxValue ), key + 1 ); point = ctx->coordinatePlane()->translate( dataPoint ); point.ry() += offset / 2 + threeDOffset; - previousPoint = ctx->coordinatePlane()->translate( QPointF( ( ( stackedValues - value) / sumValuesVector.at( curRow ) * maxValue ), rowCount - key ) ); + previousPoint = ctx->coordinatePlane()->translate( QPointF( ( ( stackedValues - value) / sumValuesVector.at( curRow ) * maxValue ), key + 1 ) ); } const qreal barHeight = point.x() - previousPoint.x(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp new/kdiagram-2.6.2/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp --- old/kdiagram-2.6.1/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -184,9 +184,9 @@ stackedValues += point.value; key = point.key; } - QPointF point = ctx->coordinatePlane()->translate( QPointF( stackedValues, rowCount - key ) ); + QPointF point = ctx->coordinatePlane()->translate( QPointF( stackedValues, key + 1 ) ); point.ry() += offset / 2 + threeDOffset; - const QPointF previousPoint = ctx->coordinatePlane()->translate( QPointF( stackedValues - value, rowCount - key ) ); + const QPointF previousPoint = ctx->coordinatePlane()->translate( QPointF( stackedValues - value, key + 1 ) ); const qreal barHeight = point.x() - previousPoint.x(); point.rx() -= barHeight; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/Cartesian/KChartCartesianAxis.cpp new/kdiagram-2.6.2/src/KChart/Cartesian/KChartCartesianAxis.cpp --- old/kdiagram-2.6.1/src/KChart/Cartesian/KChartCartesianAxis.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/Cartesian/KChartCartesianAxis.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -1157,3 +1157,17 @@ setCachedSizeDirty(); layoutPlanes(); } + +#if !defined(QT_NO_DEBUG_STREAM) +QDebug operator<<(QDebug dbg, KChart::CartesianAxis::Position pos) +{ + switch (pos) { + case KChart::CartesianAxis::Bottom: dbg << "KChart::CartesianAxis::Bottom"; break; + case KChart::CartesianAxis::Top: dbg << "KChart::CartesianAxis::Top"; break; + case KChart::CartesianAxis::Left: dbg << "KChart::CartesianAxis::Left"; break; + case KChart::CartesianAxis::Right: dbg << "KChart::CartesianAxis::Right"; break; + default: dbg << "KChart::CartesianAxis::Invalid"; break; + } + return dbg; +} +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/Cartesian/KChartCartesianAxis.h new/kdiagram-2.6.2/src/KChart/Cartesian/KChartCartesianAxis.h --- old/kdiagram-2.6.1/src/KChart/Cartesian/KChartCartesianAxis.h 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/Cartesian/KChartCartesianAxis.h 2020-03-28 13:56:20.000000000 +0100 @@ -43,6 +43,8 @@ Q_DISABLE_COPY( CartesianAxis ) KCHART_DECLARE_PRIVATE_DERIVED_PARENT( CartesianAxis, AbstractDiagram* ) + Q_ENUMS(Position) + public: enum Position { Bottom, @@ -183,4 +185,8 @@ typedef QList<CartesianAxis*> CartesianAxisList; } +#if !defined(QT_NO_DEBUG_STREAM) +KCHART_EXPORT QDebug operator<<(QDebug dbg, KChart::CartesianAxis::Position pos); +#endif + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/Cartesian/KChartCartesianGrid.cpp new/kdiagram-2.6.2/src/KChart/Cartesian/KChartCartesianGrid.cpp --- old/kdiagram-2.6.1/src/KChart/Cartesian/KChartCartesianGrid.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/Cartesian/KChartCartesianGrid.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -27,6 +27,7 @@ #include "KChartMath_p.h" #include <QPainter> +#include <QPainterPath> using namespace KChart; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/KChartAbstractAreaBase.cpp new/kdiagram-2.6.2/src/KChart/KChartAbstractAreaBase.cpp --- old/kdiagram-2.6.1/src/KChart/KChartAbstractAreaBase.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/KChartAbstractAreaBase.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -28,7 +28,7 @@ #include "KChartMath_p.h" #include <QPainter> - +#include <QPainterPath> using namespace KChart; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/KChartAbstractDiagram.cpp new/kdiagram-2.6.2/src/KChart/KChartAbstractDiagram.cpp --- old/kdiagram-2.6.1/src/KChart/KChartAbstractDiagram.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/KChartAbstractDiagram.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -21,6 +21,7 @@ #include "KChartAbstractDiagram_p.h" #include <QPainter> +#include <QPainterPath> #include <QDebug> #include <QApplication> #include <QAbstractProxyModel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/KChartAbstractDiagram_p.h new/kdiagram-2.6.2/src/KChart/KChartAbstractDiagram_p.h --- old/kdiagram-2.6.1/src/KChart/KChartAbstractDiagram_p.h 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/KChartAbstractDiagram_p.h 2020-03-28 13:56:20.000000000 +0100 @@ -49,6 +49,7 @@ #include <QFont> #include <QFontMetrics> #include <QPaintDevice> +#include <QPainterPath> #include <QModelIndex> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/KChartChart.cpp new/kdiagram-2.6.2/src/KChart/KChartChart.cpp --- old/kdiagram-2.6.1/src/KChart/KChartChart.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/KChartChart.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -1344,65 +1344,34 @@ return d->globalLeadingBottom; } -void Chart::paint( QPainter* painter, const QRect& target ) +void Chart::paint( QPainter* painter, const QRect& rect ) { - if ( target.isEmpty() || !painter ) { + if ( rect.isEmpty() || !painter ) { return; } QPaintDevice* prevDevice = GlobalMeasureScaling::paintDevice(); GlobalMeasureScaling::setPaintDevice( painter->device() ); + int prevScaleFactor = PrintingParameters::scaleFactor(); - // Output on a widget - if ( dynamic_cast< QWidget* >( painter->device() ) != 0 ) { - GlobalMeasureScaling::setFactors( qreal( target.width() ) / qreal( geometry().size().width() ), - qreal( target.height() ) / qreal( geometry().size().height() ) ); - } else { - // Output onto a QPixmap - PrintingParameters::setScaleFactor( qreal( painter->device()->logicalDpiX() ) / qreal( logicalDpiX() ) ); + // Output onto a QPixmap + PrintingParameters::setScaleFactor( qreal( painter->device()->logicalDpiX() ) / qreal( logicalDpiX() ) ); - const qreal resX = qreal( logicalDpiX() ) / qreal( painter->device()->logicalDpiX() ); - const qreal resY = qreal( logicalDpiY() ) / qreal( painter->device()->logicalDpiY() ); - - GlobalMeasureScaling::setFactors( qreal( target.width() ) / qreal( geometry().size().width() ) * resX, - qreal( target.height() ) / qreal( geometry().size().height() ) * resY ); - } - - const QPoint translation = target.topLeft(); - painter->translate( translation ); - - // the following layout logic has the disadvantage that repeatedly calling this method can - // cause a relayout every time, but since this method's main use seems to be printing, the - // gratuitous relayouts shouldn't be much of a performance problem. - const bool differentSize = target.size() != size(); - QRect oldGeometry; - if ( differentSize ) { - oldGeometry = geometry(); - d->isPlanesLayoutDirty = true; - d->isFloatingLegendsLayoutDirty = true; - invalidateLayoutTree( d->dataAndLegendLayout ); - d->dataAndLegendLayout->setGeometry( QRect( QPoint(), target.size() ) ); - } - - d->overrideSize = target.size(); + const QRect oldGeometry( geometry() ); + if ( oldGeometry != rect ) + setGeometry( rect ); + painter->translate( rect.left(), rect.top() ); d->paintAll( painter ); - d->overrideSize = QSize(); - - if ( differentSize ) { - invalidateLayoutTree( d->dataAndLegendLayout ); - d->dataAndLegendLayout->setGeometry( oldGeometry ); - d->isPlanesLayoutDirty = true; - d->isFloatingLegendsLayoutDirty = true; - } // for debugging // painter->setPen( QPen( Qt::blue, 8 ) ); - // painter->drawRect( target ); + // painter->drawRect( rect ); - painter->translate( -translation.x(), -translation.y() ); + painter->translate( -rect.left(), -rect.top() ); + if ( oldGeometry != rect ) + setGeometry( oldGeometry ); - GlobalMeasureScaling::instance()->resetFactors(); - PrintingParameters::resetScaleFactor(); + PrintingParameters::setScaleFactor( prevScaleFactor ); GlobalMeasureScaling::setPaintDevice( prevDevice ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/KChartChart.h new/kdiagram-2.6.2/src/KChart/KChartChart.h --- old/kdiagram-2.6.1/src/KChart/KChartChart.h 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/KChartChart.h 2020-03-28 13:56:20.000000000 +0100 @@ -434,11 +434,11 @@ * size of the target rectangle. * * \param painter The painter to be drawn into. - * \param target The rectangle to be filled by the Chart's drawing. + * \param rect The rectangle to be filled by the Chart's drawing. * * \sa setGlobalLeading */ - void paint( QPainter* painter, const QRect& target ); + void paint( QPainter* painter, const QRect& rect ); void reLayoutFloatingLegends(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/KChartPrintingParameters.cpp new/kdiagram-2.6.2/src/KChart/KChartPrintingParameters.cpp --- old/kdiagram-2.6.1/src/KChart/KChartPrintingParameters.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/KChartPrintingParameters.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -22,7 +22,7 @@ using namespace KChart; PrintingParameters::PrintingParameters() - : scaleFactor( 1.0 ) + : m_scaleFactor( 1.0 ) { } @@ -32,25 +32,30 @@ return &instance; } +qreal PrintingParameters::scaleFactor() +{ + return instance()->m_scaleFactor; +} + void PrintingParameters::setScaleFactor( const qreal scaleFactor ) { - instance()->scaleFactor = scaleFactor; + instance()->m_scaleFactor = scaleFactor; } void PrintingParameters::resetScaleFactor() { - instance()->scaleFactor = 1.0; + instance()->m_scaleFactor = 1.0; } QPen PrintingParameters::scalePen( const QPen& pen ) { - if ( instance()->scaleFactor == 1.0 ) + if ( instance()->m_scaleFactor == 1.0 ) return pen; QPen resultPen = pen; - resultPen.setWidthF( resultPen.widthF() * instance()->scaleFactor ); + resultPen.setWidthF( resultPen.widthF() * instance()->m_scaleFactor ); if ( resultPen.widthF() == 0.0 ) - resultPen.setWidthF( instance()->scaleFactor ); + resultPen.setWidthF( instance()->m_scaleFactor ); return resultPen; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/KChartPrintingParameters.h new/kdiagram-2.6.2/src/KChart/KChartPrintingParameters.h --- old/kdiagram-2.6.1/src/KChart/KChartPrintingParameters.h 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/KChartPrintingParameters.h 2020-03-28 13:56:20.000000000 +0100 @@ -42,6 +42,7 @@ */ class PrintingParameters { public: + static qreal scaleFactor(); static void setScaleFactor( const qreal scaleFactor ); static void resetScaleFactor(); static QPen scalePen( const QPen& pen ); @@ -50,7 +51,7 @@ PrintingParameters(); static PrintingParameters* instance(); - qreal scaleFactor; + qreal m_scaleFactor; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/include/KChart new/kdiagram-2.6.2/src/KChart/include/KChart --- old/kdiagram-2.6.1/src/KChart/include/KChart 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/include/KChart 2020-03-28 13:56:20.000000000 +0100 @@ -1,18 +1,14 @@ #include "KChartDatasetProxyModel.h" -#include "KChartNullPaintDevice.h" #include "KChartChart.h" #include "KChartHeaderFooter.h" #include "KChartGlobal.h" #include "KChartDataValueAttributes.h" #include "KChartPalette.h" -#include "KChartSignalCompressor.h" #include "KChartDiagramObserver.h" #include "KChartMeasure.h" #include "KChartGridAttributes.h" -#include "KChartPrintingParameters.h" #include "KChartLineAttributes.h" #include "KChartValueTrackerAttributes.h" -#include "KChartAbstractGrid.h" #include "KChartRulerAttributes.h" #include "KChartTextArea.h" #include "KChartAttributesModel.h" @@ -27,12 +23,10 @@ #include "KChartTextAttributes.h" #include "KChartFrameAttributes.h" #include "KChartAbstractThreeDAttributes.h" -#include "KChartTextLabelCache.h" #include "KChartBackgroundAttributes.h" #include "KChartAbstractAreaWidget.h" #include "KChartThreeDLineAttributes.h" #include "KChartPosition.h" -#include "KChartZoomParameters.h" #include "KChartAbstractAreaBase.h" #include "KChartPaintContext.h" #include "KChartAbstractProxyModel.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KGantt/CMakeLists.txt new/kdiagram-2.6.2/src/KGantt/CMakeLists.txt --- old/kdiagram-2.6.1/src/KGantt/CMakeLists.txt 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KGantt/CMakeLists.txt 2020-03-28 13:56:20.000000000 +0100 @@ -1,4 +1,4 @@ -set( KGANTTLIB_VERSION "2.6.1" ) +set( KGANTTLIB_VERSION "2.6.2" ) ecm_setup_version(${KGANTTLIB_VERSION} VARIABLE_PREFIX KGANTT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KGantt/kganttdatetimegrid.cpp new/kdiagram-2.6.2/src/KGantt/kganttdatetimegrid.cpp --- old/kdiagram-2.6.1/src/KGantt/kganttdatetimegrid.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KGantt/kganttdatetimegrid.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -25,6 +25,7 @@ #include <QApplication> #include <QDateTime> #include <QPainter> +#include <QPainterPath> #include <QStyle> #include <QStyleOptionHeader> #include <QWidget>

1 0

commit xscreensaver for openSUSE:Factory
by root 31 Mar '20

31 Mar '20

Hello community, here is the log from the commit of package xscreensaver for openSUSE:Factory checked in at 2020-03-31 17:32:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xscreensaver (Old) and /work/SRC/openSUSE:Factory/.xscreensaver.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xscreensaver" Tue Mar 31 17:32:07 2020 rev:61 rq:789445 version:5.44 Changes: -------- --- /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver.changes 2020-03-06 21:25:54.965503094 +0100 +++ /work/SRC/openSUSE:Factory/.xscreensaver.new.3160/xscreensaver.changes 2020-03-31 17:32:19.604263349 +0200 @@ -1,0 +2,13 @@ +Sat Mar 28 18:32:12 UTC 2020 - Andreas Stieger <andreas.stieger(a)gmx.de> + +- update to 5.44: + * New hacks, gibson, etruscanvenus and scooter + * BSOD supports Tivo and Nintendo + * New color options in romanboy, projectiveplane, hypertorus and + klein + * Performance tweaks for eruption, fireworkx, halftone, halo, + moire2, rd-bomb + * X11: Always use $HOME/.xscreensaver, not getpwuid's directory + * Various bug fixes + +------------------------------------------------------------------- Old: ---- xscreensaver-5.43.tar.gz New: ---- xscreensaver-5.44.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xscreensaver.spec ++++++ --- /var/tmp/diff_new_pack.s69HAD/_old 2020-03-31 17:32:20.740264013 +0200 +++ /var/tmp/diff_new_pack.s69HAD/_new 2020-03-31 17:32:20.740264013 +0200 @@ -17,7 +17,7 @@ Name: xscreensaver -Version: 5.43 +Version: 5.44 Release: 0 Summary: A screen saver and locker for the X Window System License: BSD-3-Clause AND GPL-2.0-or-later @@ -54,6 +54,7 @@ BuildRequires: libxslt-tools BuildRequires: pam-devel BuildRequires: perl-XML-Parser +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(gdk-pixbuf-2.0) @@ -81,9 +82,9 @@ Requires: %{name}-data Requires: /sbin/unix2_chkpwd Requires: desktop-data +Recommends: %{name}-lang = %{version} # Suggests: %{name}-data-extra -Recommends: %{name}-lang = %{version} # Provides: xscreensaver-gnome = %{version} Provides: xscrns = %{version} @@ -144,6 +145,7 @@ This packages contains additional graphics demos. %lang_package + %prep %setup -q %patch5 @@ -197,7 +199,7 @@ --with-image-directory=%{_datadir}/wallpapers \ --enable-locking \ --with-login-manager -make %{?_smp_mflags} all +%make_build all %install rm -f hacks/config/vidwhacker.xml @@ -243,7 +245,6 @@ done %files -%defattr(-,root,root) %doc README %{_bindir}/xscreensaver %{_bindir}/xscreensaver-command @@ -267,13 +268,11 @@ %files lang -f %{name}.lang %files data -f %{name}-data.lst -%defattr(-,root,root) %dir %{_libdir}/xscreensaver/ %dir %{_sysconfdir}/xscreensaver/ %dir %{_datadir}/applications/screensavers/ %files data-extra -f %{name}-data-extra.lst -%defattr(-,root,root) %dir %{_libdir}/xscreensaver/ %dir %{_sysconfdir}/xscreensaver/ %dir %{_datadir}/applications/screensavers/ ++++++ xscreensaver-5.43.tar.gz -> xscreensaver-5.44.tar.gz ++++++ /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver-5.43.tar.gz /work/SRC/openSUSE:Factory/.xscreensaver.new.3160/xscreensaver-5.44.tar.gz differ: char 5, line 1 ++++++ xscreensaver-data-extra.list ++++++ --- /var/tmp/diff_new_pack.s69HAD/_old 2020-03-31 17:32:20.804264051 +0200 +++ /var/tmp/diff_new_pack.s69HAD/_new 2020-03-31 17:32:20.804264051 +0200 @@ -63,6 +63,7 @@ epicycle eruption esper +etruscanvenus euler2d extrusion fadeplot @@ -81,6 +82,7 @@ geodesic geodesicgears gflux +gibson glblur glcells gleidescope @@ -174,6 +176,7 @@ rubik rubikblocks sballs +scooter shadebobs sierpinski sierpinski3d

1 0

commit 000package-groups for openSUSE:Factory
by root 31 Mar '20

31 Mar '20

Hello community, here is the log from the commit of package 000package-groups for openSUSE:Factory checked in at 2020-03-31 17:32:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000package-groups (Old) and /work/SRC/openSUSE:Factory/.000package-groups.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000package-groups" Tue Mar 31 17:32:06 2020 rev:109 rq:789127 version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ groups.yml ++++++ --- /var/tmp/diff_new_pack.Qj4r81/_old 2020-03-31 17:32:18.484262692 +0200 +++ /var/tmp/diff_new_pack.Qj4r81/_new 2020-03-31 17:32:18.484262692 +0200 @@ -366,21 +366,21 @@ - kernel-debug: [locked] - openSUSE-MicroOS-release - kernel-default - - patterns-microos-base: [aarch64,x86_64] - - patterns-microos-defaults: [aarch64,x86_64] - - patterns-microos-hardware: [aarch64,x86_64] - - patterns-microos-apparmor: [aarch64,x86_64] - - patterns-microos-selinux: [aarch64,x86_64] - - patterns-microos-sssd_ldap: [aarch64,x86_64] - - patterns-microos-ima_evm: [aarch64,x86_64] - - patterns-microos-cloud: [aarch64,x86_64] + - patterns-microos-base: [aarch64,s390x,x86_64] + - patterns-microos-defaults: [aarch64,s390x,x86_64] + - patterns-microos-hardware: [aarch64,s390x,x86_64] + - patterns-microos-apparmor: [aarch64,s390x,x86_64] + - patterns-microos-selinux: [aarch64,s390x,x86_64] + - patterns-microos-sssd_ldap: [aarch64,s390x,x86_64] + - patterns-microos-ima_evm: [aarch64,s390x,x86_64] + - patterns-microos-cloud: [aarch64,s390x,x86_64] - patterns-microos-desktop-kde: [aarch64,x86_64] - patterns-microos-desktop-gnome: [aarch64,x86_64] - - patterns-microos-onlyDVD: [aarch64,x86_64] - - patterns-microos-alt_onlyDVD: [aarch64,x86_64] - - patterns-containers-container_runtime: [aarch64,x86_64] - - podman-cni-config: [aarch64,x86_64] - - kernel-default-base: [aarch64,x86_64] + - patterns-microos-onlyDVD: [aarch64,s390x,x86_64] + - patterns-microos-alt_onlyDVD: [aarch64,s390x,x86_64] + - patterns-containers-container_runtime: [aarch64,s390x,x86_64] + - podman-cni-config: [aarch64,s390x,x86_64] + - kernel-default-base: [aarch64,s390x,x86_64] - grub2-x86_64-efi: [x86_64] - grub2-i386-pc: [x86_64] - grub2-arm64-efi: [aarch64] @@ -388,13 +388,13 @@ opensuse_kubic: - patterns-microos-desktop-kde: [locked] - patterns-microos-desktop-gnome: [locked] - - patterns-containers-kubeadm: [aarch64,x86_64] - - patterns-containers-container_runtime_kubernetes: [aarch64,x86_64] - - patterns-containers-container_runtime: [aarch64,x86_64] - - patterns-containers-kubic_worker: [aarch64,x86_64] - - patterns-containers-kubic_admin: [aarch64,x86_64] - - patterns-containers-kubernetes_utilities: [aarch64,x86_64] - - patterns-containers-kubic_loadbalancer: [aarch64,x86_64] + - patterns-containers-kubeadm: [aarch64,s390x,x86_64] + - patterns-containers-container_runtime_kubernetes: [aarch64,s390x,x86_64] + - patterns-containers-container_runtime: [aarch64,s390x,x86_64] + - patterns-containers-kubic_worker: [aarch64,s390x,x86_64] + - patterns-containers-kubic_admin: [aarch64,s390x,x86_64] + - patterns-containers-kubernetes_utilities: [aarch64,s390x,x86_64] + - patterns-containers-kubic_loadbalancer: [aarch64,s390x,x86_64] - grub2-x86_64-efi: [x86_64] - grub2-i386-pc: [x86_64] - grub2-arm64-efi: [aarch64]

1 0

commit hfst-ospell for openSUSE:Factory
by root 31 Mar '20

31 Mar '20

Hello community, here is the log from the commit of package hfst-ospell for openSUSE:Factory checked in at 2020-03-31 17:32:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hfst-ospell (Old) and /work/SRC/openSUSE:Factory/.hfst-ospell.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hfst-ospell" Tue Mar 31 17:32:03 2020 rev:6 rq:789082 version:0.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/hfst-ospell/hfst-ospell.changes 2020-02-20 14:55:12.714268231 +0100 +++ /work/SRC/openSUSE:Factory/.hfst-ospell.new.3160/hfst-ospell.changes 2020-03-31 17:32:14.536260380 +0200 @@ -1,0 +2,6 @@ +Fri Mar 27 14:25:33 UTC 2020 - Martin Liška <mliska(a)suse.cz> + +- Fix boo#1158318 by + gcc10-Fix-a-typo-in-wide-string-conversion-function-49.patch. + +------------------------------------------------------------------- New: ---- gcc10-Fix-a-typo-in-wide-string-conversion-function-49.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hfst-ospell.spec ++++++ --- /var/tmp/diff_new_pack.ymrxXG/_old 2020-03-31 17:32:15.600261003 +0200 +++ /var/tmp/diff_new_pack.ymrxXG/_new 2020-03-31 17:32:15.600261003 +0200 @@ -27,6 +27,7 @@ URL: https://hfst.github.io/ Source0: https://github.com/hfst/%{name}/releases/download/v%{version}/%{_name}-%{ve… Source99: baselibs.conf +Patch0: gcc10-Fix-a-typo-in-wide-string-conversion-function-49.patch BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkgconfig @@ -56,6 +57,7 @@ %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 %build # disable libxml++ as upstream requires version 2.6 ++++++ gcc10-Fix-a-typo-in-wide-string-conversion-function-49.patch ++++++ >From a9d5afb14aa71893f142dfd3ae735e8930aa0f8a Mon Sep 17 00:00:00 2001 From: Martin Liska <mliska(a)suse.cz> Date: Mon, 16 Mar 2020 11:32:10 +0100 Subject: [PATCH] Fix a typo in wide string conversion function (#49). Revert a hunk from: 04e4843e4c66beb61b756f3ceb2ac94628142185. --- main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cc b/main.cc index abecf46..e4fd676 100644 --- a/main.cc +++ b/main.cc @@ -61,7 +61,7 @@ static bool suggest_reals = false; #ifdef WINDOWS static std::string wide_string_to_string(const std::wstring & wstr) { - int size_needed = WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)§wstr.size(), NULL, 0, NULL, NULL); + int size_needed = WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), NULL, 0, NULL, NULL); std::string str( size_needed, 0 ); WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), &str[0], size_needed, NULL, NULL); return str; -- 2.26.0

1 0

commit yomi-formula for openSUSE:Factory
by root 31 Mar '20

31 Mar '20

Hello community, here is the log from the commit of package yomi-formula for openSUSE:Factory checked in at 2020-03-31 17:32:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yomi-formula (Old) and /work/SRC/openSUSE:Factory/.yomi-formula.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yomi-formula" Tue Mar 31 17:32:01 2020 rev:12 rq:789060 version:0.0.1+git.1585319502.392f59c Changes: -------- --- /work/SRC/openSUSE:Factory/yomi-formula/yomi-formula.changes 2020-03-19 19:50:21.716186280 +0100 +++ /work/SRC/openSUSE:Factory/.yomi-formula.new.3160/yomi-formula.changes 2020-03-31 17:32:12.608259251 +0200 @@ -1,0 +2,7 @@ +Fri Mar 27 14:32:24 UTC 2020 - Alberto Planas Dominguez <aplanas(a)suse.com> + +- Update to version 0.0.1+git.1585319502.392f59c: + * users: better quote for certificate + * users: workaround bsc#1167909 for passwords + +------------------------------------------------------------------- Old: ---- yomi-0.0.1+git.1583771480.5787782.obscpio New: ---- yomi-0.0.1+git.1585319502.392f59c.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yomi-formula.spec ++++++ --- /var/tmp/diff_new_pack.srbGiu/_old 2020-03-31 17:32:13.248259626 +0200 +++ /var/tmp/diff_new_pack.srbGiu/_new 2020-03-31 17:32:13.248259626 +0200 @@ -20,7 +20,7 @@ %define fdir %{_datadir}/salt-formulas Name: yomi-formula -Version: 0.0.1+git.1583771480.5787782 +Version: 0.0.1+git.1585319502.392f59c Release: 0 Summary: Yomi - Yet one more installer License: Apache-2.0 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.srbGiu/_old 2020-03-31 17:32:13.276259642 +0200 +++ /var/tmp/diff_new_pack.srbGiu/_new 2020-03-31 17:32:13.280259644 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/yomi.git</param> - <param name="changesrevision">5787782e9898eadec2dc7130d569106b8fd627a4</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">392f59cfaabe5a25aea39a38ed58a003dff68724</param></service></servicedata> \ No newline at end of file ++++++ yomi-0.0.1+git.1583771480.5787782.obscpio -> yomi-0.0.1+git.1585319502.392f59c.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1583771480.5787782/salt/yomi/users.sls new/yomi-0.0.1+git.1585319502.392f59c/salt/yomi/users.sls --- old/yomi-0.0.1+git.1583771480.5787782/salt/yomi/users.sls 2020-03-09 17:31:20.000000000 +0100 +++ new/yomi-0.0.1+git.1585319502.392f59c/salt/yomi/users.sls 2020-03-27 15:31:42.000000000 +0100 @@ -14,13 +14,16 @@ {% if user.get('password') %} {{ macros.log('module', 'set_password_user_' ~ user.username) }} +# We should use here the root parameter, but we move to chroot.call +# because bsc#1167909 set_password_user_{{ user.username }}: module.run: - - shadow.set_password: + - chroot.call: + - root: /mnt + - function: shadow.set_password - name: {{ user.username }} - - password: '{{ user.password }}' + - password: "'{{ user.password }}'" - use_usermod: yes - - root: /mnt - unless: grep -q '{{ user.username }}:{{ user.password }}' /mnt/etc/shadow {% endif %} @@ -32,7 +35,7 @@ - root: /mnt - function: ssh.set_auth_key - user: {{ user.username }} - - key: '{{ certificate }}' + - key: "'{{ certificate }}'" - unless: grep -q '{{ certificate }}' /mnt/{{ 'home/' if user.username != 'root' else '' }}{{ user.username }}/.ssh/authorized_keys {% endfor %} {% endfor %} ++++++ yomi.obsinfo ++++++ --- /var/tmp/diff_new_pack.srbGiu/_old 2020-03-31 17:32:13.384259705 +0200 +++ /var/tmp/diff_new_pack.srbGiu/_new 2020-03-31 17:32:13.384259705 +0200 @@ -1,5 +1,5 @@ name: yomi -version: 0.0.1+git.1583771480.5787782 -mtime: 1583771480 -commit: 5787782e9898eadec2dc7130d569106b8fd627a4 +version: 0.0.1+git.1585319502.392f59c +mtime: 1585319502 +commit: 392f59cfaabe5a25aea39a38ed58a003dff68724

1 0

commit vlc for openSUSE:Factory
by root 31 Mar '20

31 Mar '20

Hello community, here is the log from the commit of package vlc for openSUSE:Factory checked in at 2020-03-31 17:31:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vlc (Old) and /work/SRC/openSUSE:Factory/.vlc.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vlc" Tue Mar 31 17:31:59 2020 rev:103 rq:789031 version:3.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/vlc/vlc.changes 2020-01-27 00:21:34.625462175 +0100 +++ /work/SRC/openSUSE:Factory/.vlc.new.3160/vlc.changes 2020-03-31 17:32:08.576256890 +0200 @@ -1,0 +2,6 @@ +Fri Mar 27 09:23:26 UTC 2020 - Antonio Larrosa <alarrosa(a)suse.com> + +- Add patch to fix missing include with Qt 5.15: + * fix-missing-includes-with-qt-5.15.patch + +------------------------------------------------------------------- New: ---- fix-missing-includes-with-qt-5.15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vlc.spec ++++++ --- /var/tmp/diff_new_pack.qXbTe7/_old 2020-03-31 17:32:12.096258951 +0200 +++ /var/tmp/diff_new_pack.qXbTe7/_new 2020-03-31 17:32:12.100258953 +0200 @@ -57,6 +57,8 @@ Patch102: 0002-Add-Avahi-implementation-for-chromecast-renderer-dis.patch # PATCH-FIX-UPSTREAM -- Use OpenCV C++ API Patch103: 0001-Port-OpenCV-facedetect-example-to-C-API.patch +# PATCH-FIX-UPSTREAM -- Fix building with Qt 5.15 by adding a missing include +Patch104: fix-missing-includes-with-qt-5.15.patch BuildRequires: Mesa-devel BuildRequires: aalib-devel BuildRequires: alsa-devel >= 1.0.24 @@ -404,6 +406,7 @@ %patch101 -p1 %patch102 -p1 %patch103 -p1 +%patch104 -p1 ### And LUA 5.3.1 has some more API changes if pkg-config --atleast-version 5.3.1 lua; then ++++++ fix-missing-includes-with-qt-5.15.patch ++++++ Index: vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp =================================================================== --- vlc-3.0.8.orig/modules/gui/qt/util/timetooltip.hpp +++ vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp @@ -25,6 +25,7 @@ #include "qt.hpp" #include <QWidget> +#include <QPainterPath> class TimeTooltip : public QWidget { Index: vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp =================================================================== --- vlc-3.0.8.orig/modules/gui/qt/components/playlist/views.cpp +++ vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp @@ -27,6 +27,7 @@ #include "input_manager.hpp" /* THEMIM */ #include <QPainter> +#include <QPainterPath> #include <QRect> #include <QStyleOptionViewItem> #include <QFontMetrics> Index: vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp =================================================================== --- vlc-3.0.8.orig/modules/gui/qt/dialogs/plugins.cpp +++ vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp @@ -53,6 +53,7 @@ #include <QListView> #include <QListWidget> #include <QPainter> +#include <QPainterPath> #include <QStyleOptionViewItem> #include <QKeyEvent> #include <QPushButton>

1 0

commit texlive for openSUSE:Factory
by root 31 Mar '20

31 Mar '20

Hello community, here is the log from the commit of package texlive for openSUSE:Factory checked in at 2020-03-31 17:31:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive (Old) and /work/SRC/openSUSE:Factory/.texlive.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive" Tue Mar 31 17:31:54 2020 rev:65 rq:789002 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive/texlive.changes 2020-03-19 19:44:01.615977674 +0100 +++ /work/SRC/openSUSE:Factory/.texlive.new.3160/texlive.changes 2020-03-31 17:32:05.932255341 +0200 @@ -1,0 +2,5 @@ +Fri Mar 27 01:39:45 UTC 2020 - Michael Gorse <mgorse(a)suse.com> + +- Add source-poppler0.86.0.patch: fix build with poppler 0.86.0. + +------------------------------------------------------------------- New: ---- source-poppler0.86.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive.spec ++++++ --- /var/tmp/diff_new_pack.fH0JMr/_old 2020-03-31 17:32:08.020256564 +0200 +++ /var/tmp/diff_new_pack.fH0JMr/_new 2020-03-31 17:32:08.024256566 +0200 @@ -283,6 +283,8 @@ Patch62: source-common.patch # PATCH-FIX-UPSTREAM source-poppler0.84.0.patch Patch63: source-poppler0.84.0.patch +# PATCH-FIX-UPSTREAM source-poppler0.86.0.patch +Patch64: source-poppler0.86.0.patch Prefix: %{_bindir} Provides: pdfjam = %{version} Obsoletes: pdfjam < %{version} @@ -3689,6 +3691,9 @@ %if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.84.0}}%{!?pkg_vcmp:0} %patch63 -p1 -b .poppler84 %endif +%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.86.0}}%{!?pkg_vcmp:0} +%patch64 -p1 -b .poppler86 +%endif pver=$(pkg-config --modversion poppler) %if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.79.0}}%{!?pkg_vcmp:0} cp ./texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc ./texk/web2c/pdftexdir/pdftoepdf-poppler${pver}.cc ++++++ source-poppler0.86.0.patch ++++++ diff -urp texlive-20190407-source.orig/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc texlive-20190407-source/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc --- texlive-20190407-source.orig/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc 2020-03-26 20:36:35.584513454 -0500 +++ texlive-20190407-source/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc 2020-03-26 20:37:50.808915680 -0500 @@ -757,7 +757,7 @@ read_pdf_info(char *image_name, char *pa if (page_name) { // get page by name GString name(page_name); - LinkDest *link = pdf_doc->doc->findDest(&name); + std::unique_ptr<LinkDest> link = pdf_doc->doc->findDest(&name); if (link == 0 || !link->isOk()) pdftex_fail("PDF inclusion: invalid destination <%s>", page_name); const Ref ref = link->getPageRef(); @@ -765,7 +765,6 @@ read_pdf_info(char *image_name, char *pa if (page_num == 0) pdftex_fail("PDF inclusion: destination is not a page <%s>", page_name); - delete link; } else { // get page by number if (page_num <= 0 || page_num > epdf_num_pages)

1 0

commit samba for openSUSE:Factory
by root 31 Mar '20

31 Mar '20

Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at 2020-03-31 17:31:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/samba (Old) and /work/SRC/openSUSE:Factory/.samba.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "samba" Tue Mar 31 17:31:53 2020 rev:257 rq:789000 version:4.12.0+git.135.dd3c974c75f Changes: -------- --- /work/SRC/openSUSE:Factory/samba/samba.changes 2020-03-25 23:44:35.924019162 +0100 +++ /work/SRC/openSUSE:Factory/.samba.new.3160/samba.changes 2020-03-31 17:32:03.440253882 +0200 @@ -1,0 +2,6 @@ +Wed Mar 25 12:52:55 UTC 2020 - Noel Power <nopower(a)suse.com> + +- s3: libsmbclient.h: add missing time.h include to fix + ffmpeg build and make it compatible with -std=c99. + +------------------------------------------------------------------- Old: ---- samba-4.12.0+git.132.199dc21ab22.tar.bz2 New: ---- samba-4.12.0+git.135.dd3c974c75f.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.HbEHZl/_old 2020-03-31 17:32:04.920254749 +0200 +++ /var/tmp/diff_new_pack.HbEHZl/_new 2020-03-31 17:32:04.924254751 +0200 @@ -164,7 +164,7 @@ %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -Version: 4.12.0+git.132.199dc21ab22 +Version: 4.12.0+git.135.dd3c974c75f Release: 0 Url: https://www.samba.org/ Obsoletes: samba-32bit < %{version} ++++++ samba-4.12.0+git.132.199dc21ab22.tar.bz2 -> samba-4.12.0+git.135.dd3c974c75f.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/samba/samba-4.12.0+git.132.199dc21ab22.tar.bz2 /work/SRC/openSUSE:Factory/.samba.new.3160/samba-4.12.0+git.135.dd3c974c75f.tar.bz2 differ: char 11, line 1

1 0

commit libmusicbrainz5 for openSUSE:Factory
by root 31 Mar '20

31 Mar '20

Hello community, here is the log from the commit of package libmusicbrainz5 for openSUSE:Factory checked in at 2020-03-31 17:31:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmusicbrainz5 (Old) and /work/SRC/openSUSE:Factory/.libmusicbrainz5.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmusicbrainz5" Tue Mar 31 17:31:51 2020 rev:9 rq:788985 version:5.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libmusicbrainz5/libmusicbrainz5.changes 2018-09-26 14:53:28.931101557 +0200 +++ /work/SRC/openSUSE:Factory/.libmusicbrainz5.new.3160/libmusicbrainz5.changes 2020-03-31 17:31:57.084250160 +0200 @@ -1,0 +2,6 @@ +Fri Mar 27 10:57:12 UTC 2020 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Add musicbrainz-cmake-noglob.patch: do not use wildcards for + dependencies. Fixes build when using ninja. + +------------------------------------------------------------------- New: ---- musicbrainz-cmake-noglob.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmusicbrainz5.spec ++++++ --- /var/tmp/diff_new_pack.xnNffG/_old 2020-03-31 17:31:57.876250623 +0200 +++ /var/tmp/diff_new_pack.xnNffG/_new 2020-03-31 17:31:57.876250623 +0200 @@ -1,7 +1,7 @@ # # spec file for package libmusicbrainz5 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,8 @@ URL: http://musicbrainz.org/doc/libmusicbrainz Source0: https://github.com/metabrainz/libmusicbrainz/releases/download/release-%{ve… Source1: baselibs.conf +# PATCH-FIX-UPSTREAM musicbrainz-cmake-noglob.patch dimstar(a)opensuse.org -- do not use wildcards for dependencies +Patch0: musicbrainz-cmake-noglob.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: neon-devel @@ -58,7 +60,7 @@ download metadata about the music they are playing. %prep -%setup -q -n %{_name}-%{version} +%autosetup -n %{_name}-%{version} -p1 %build CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" ++++++ musicbrainz-cmake-noglob.patch ++++++ >From 36262d60fe92fe7a2c9bfb40e736bfcd29a6c3bd Mon Sep 17 00:00:00 2001 From: Abderrahim Kitouni <a.kitouni(a)gmail.com> Date: Fri, 13 Apr 2018 09:56:57 +0100 Subject: [PATCH] src/CMakelists.txt: do not use wildcards for dependencies This is discouraged by cmake's documentation and doesn't work with the ninja generator. --- src/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: libmusicbrainz-5.1.0/src/CMakeLists.txt =================================================================== --- libmusicbrainz-5.1.0.orig/src/CMakeLists.txt +++ libmusicbrainz-5.1.0/src/CMakeLists.txt @@ -36,7 +36,8 @@ ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR} mb5_c.cc mb5_c.h COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h - DEPENDS make-c-interface cinterface.xml *.inc + DEPENDS make-c-interface cinterface.xml c-int-medium-defines.inc c-int-query-source.inc c-int-source-funcs.inc + c-int-medium-source.inc c-int-release-defines.inc c-int-query-defines.inc c-int-release-source.inc ) ADD_CUSTOM_TARGET(src_gen DEPENDS mb5_c.h)

1 0