Hello community, here is the log from the commit of package novprog for openSUSE:Factory checked in at 2020-04-25 20:31:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/novprog (Old) and /work/SRC/openSUSE:Factory/.novprog.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "novprog" Sat Apr 25 20:31:17 2020 rev:7 rq:796896 version:3.1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/novprog/novprog.changes 2018-11-29 23:00:42.343483835 +0100 +++ /work/SRC/openSUSE:Factory/.novprog.new.2738/novprog.changes 2020-04-25 20:35:53.418958160 +0200 @@ -1,0 +2,13 @@ +Fri Apr 24 08:12:50 UTC 2020 - Martin Pluskal <[email protected]> + +- Update to version 3.1.7: + * FIXED: Did not load locales with underscores + * Improved Windows deployment + * Replaced deprecated code +- Changes in version 3.1.6: + * FIXED: Window icon didn't work in Wayland + * Improved loading locales + * Improved Windows deployment + * Replaced deprecated code + +------------------------------------------------------------------- Old: ---- novprog-3.1.5-src.tar.bz2 New: ---- novprog-3.1.7-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ novprog.spec ++++++ --- /var/tmp/diff_new_pack.VzyVM7/_old 2020-04-25 20:35:54.434960254 +0200 +++ /var/tmp/diff_new_pack.VzyVM7/_new 2020-04-25 20:35:54.438960263 +0200 @@ -1,7 +1,7 @@ # # spec file for package novprog # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2016 Graeme Gott <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -18,12 +18,12 @@ Name: novprog -Version: 3.1.5 +Version: 3.1.7 Release: 0 Summary: Wordcount graphing program License: GPL-3.0-or-later Group: Productivity/Office/Other -URL: http://gottcode.org/novprog/ +URL: https://gottcode.org/novprog/ Source: http://gottcode.org/novprog/%{name}-%{version}-src.tar.bz2 BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -34,11 +34,6 @@ BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) Requires: hicolor-icon-theme -Requires(post): hicolor-icon-theme -Requires(post): update-desktop-files -Requires(postun): hicolor-icon-theme -Requires(postun): update-desktop-files -Recommends: %{name}-lang %description NovProg allows you to create a graph of your progress in writing a @@ -61,16 +56,6 @@ %suse_update_desktop_file -u -r %{name} Office Publishing %find_lang %{name} --with-qt -%if 0%{?suse_version} < 1330 -%post -%desktop_database_post -%icon_theme_cache_post - -%postun -%desktop_database_postun -%icon_theme_cache_postun -%endif - %files %license COPYING %doc ChangeLog CREDITS README ++++++ novprog-3.1.5-src.tar.bz2 -> novprog-3.1.7-src.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novprog-3.1.5/ChangeLog new/novprog-3.1.7/ChangeLog --- old/novprog-3.1.5/ChangeLog 2018-07-20 18:00:50.000000000 +0200 +++ new/novprog-3.1.7/ChangeLog 2020-04-21 02:41:59.000000000 +0200 @@ -1,3 +1,16 @@ +3.1.7 +----- +* FIXED: Did not load locales with underscores. +* Improved Windows deployment. +* Replaced deprecated code. + +3.1.6 +----- +* FIXED: Window icon didn't work in Wayland. +* Improved loading locales. +* Improved Windows deployment. +* Replaced deprecated code. + 3.1.5 ----- * FIXED: Automatic high DPI support. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novprog-3.1.5/icons/icon.rc new/novprog-3.1.7/icons/icon.rc --- old/novprog-3.1.5/icons/icon.rc 2018-07-20 18:00:50.000000000 +0200 +++ new/novprog-3.1.7/icons/icon.rc 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "novprog.ico" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novprog-3.1.5/icons/novprog.appdata.xml new/novprog-3.1.7/icons/novprog.appdata.xml --- old/novprog-3.1.5/icons/novprog.appdata.xml 2018-07-20 18:00:50.000000000 +0200 +++ new/novprog-3.1.7/icons/novprog.appdata.xml 2020-04-21 02:41:59.000000000 +0200 @@ -63,7 +63,28 @@ <kudo>ModernToolkit</kudo> </kudos> + <content_rating type="oars-1.1" /> + <releases> + <release version="3.1.7" date="2020-04-20"> + <description> + <ul> + <li>FIXED: Did not load locales with underscores</li> + <li>Improved Windows deployment</li> + <li>Replaced deprecated code</li> + </ul> + </description> + </release> + <release version="3.1.6" date="2019-08-07"> + <description> + <ul> + <li>FIXED: Window icon didn't work in Wayland</li> + <li>Improved loading locales</li> + <li>Improved Windows deployment</li> + <li>Replaced deprecated code</li> + </ul> + </description> + </release> <release version="3.1.5" date="2018-07-20"> <description> <ul> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novprog-3.1.5/mac_deploy.sh new/novprog-3.1.7/mac_deploy.sh --- old/novprog-3.1.5/mac_deploy.sh 2018-07-20 18:00:50.000000000 +0200 +++ new/novprog-3.1.7/mac_deploy.sh 2020-04-21 02:41:59.000000000 +0200 @@ -2,7 +2,7 @@ APP='NovProg' BUNDLE="$APP.app" -VERSION='3.1.5' +VERSION='3.1.7' # Remove any previous disk folder or DMG echo -n 'Preparing... ' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novprog-3.1.5/novprog.pro new/novprog-3.1.7/novprog.pro --- old/novprog-3.1.5/novprog.pro 2018-07-20 18:00:50.000000000 +0200 +++ new/novprog-3.1.7/novprog.pro 2020-04-21 02:41:59.000000000 +0200 @@ -1,8 +1,8 @@ lessThan(QT_MAJOR_VERSION, 5) { - error("NovProg requires Qt 5.2 or greater") + error("NovProg requires Qt 5.9 or greater") } -equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) { - error("NovProg requires Qt 5.2 or greater") +equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 9) { + error("NovProg requires Qt 5.9 or greater") } TEMPLATE = app @@ -12,19 +12,17 @@ CONFIG(debug, debug|release) { CONFIG += warn_on DEFINES += QT_DEPRECATED_WARNINGS - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051100 + DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051400 DEFINES += QT_NO_NARROWING_CONVERSIONS_IN_CONNECT } # Allow in-tree builds -!win32 { - MOC_DIR = build - OBJECTS_DIR = build - RCC_DIR = build -} +MOC_DIR = build +OBJECTS_DIR = build +RCC_DIR = build # Set program version -VERSION = 3.1.5 +VERSION = 3.1.7 DEFINES += VERSIONSTR=\\\"$${VERSION}\\\" # Set program name @@ -63,7 +61,9 @@ macx { ICON = icons/novprog.icns } else:win32 { - RC_FILE = icons/icon.rc + RC_ICONS = icons/novprog.ico + QMAKE_TARGET_DESCRIPTION = "Wordcount graphing program" + QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2019 Graeme Gott" } else:unix { isEmpty(PREFIX) { PREFIX = /usr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novprog-3.1.5/src/locale_dialog.cpp new/novprog-3.1.7/src/locale_dialog.cpp --- old/novprog-3.1.5/src/locale_dialog.cpp 2018-07-20 18:00:50.000000000 +0200 +++ new/novprog-3.1.7/src/locale_dialog.cpp 2020-04-21 02:41:59.000000000 +0200 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2010, 2011, 2012, 2014, 2015, 2016, 2018 Graeme Gott <[email protected]> + * Copyright (C) 2010, 2011, 2012, 2014, 2015, 2016, 2018, 2019, 2020 Graeme Gott <[email protected]> * * 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 @@ -43,8 +43,8 @@ //----------------------------------------------------------------------------- -LocaleDialog::LocaleDialog(QWidget* parent) - : QDialog(parent, Qt::WindowTitleHint | Qt::MSWindowsFixedSizeDialogHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint) +LocaleDialog::LocaleDialog(QWidget* parent) : + QDialog(parent, Qt::WindowTitleHint | Qt::MSWindowsFixedSizeDialogHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint) { QString title = parent ? parent->window()->windowTitle() : QString(); setWindowTitle(!title.isEmpty() ? title : QCoreApplication::applicationName()); @@ -84,62 +84,50 @@ // Find translator path QStringList paths; - paths.append(appdir + "/translations/"); - paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower() + "/translations/"); - paths.append(appdir + "/../Resources/translations"); + paths.append(appdir); + paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower()); + paths.append(appdir + "/../Resources"); for (const QString& path : paths) { - if (QFile::exists(path)) { - m_path = path; + if (QFile::exists(path + "/translations/")) { + m_path = path + "/translations/"; break; } } // Find current locale m_current = QSettings().value("Locale/Language").toString(); - QString current = !m_current.isEmpty() ? m_current : QLocale::system().name(); - QStringList translations = findTranslations(); - if (!translations.contains(m_appname + current)) { - current = current.left(2); - if (!translations.contains(m_appname + current)) { - current.clear(); - } - } - if (!current.isEmpty()) { - QLocale::setDefault(current); - } else { - current = "en"; + if (!m_current.isEmpty()) { + QLocale::setDefault(m_current); } + const QString locale = QLocale().name(); // Load translators - static QTranslator qt_translator; - qt_translator.load("qt_" + current, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); - QCoreApplication::installTranslator(&qt_translator); - - static QTranslator qtbase_translator; - if (translations.contains("qtbase_" + current) || translations.contains("qtbase_" + current.left(2))) { - qtbase_translator.load("qtbase_" + current, m_path); - } else { - qtbase_translator.load("qtbase_" + current, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); - } - QCoreApplication::installTranslator(&qtbase_translator); - static QTranslator translator; - translator.load(m_appname + current, m_path); - QCoreApplication::installTranslator(&translator); + if (translator.load(m_appname + locale, m_path)) { + QCoreApplication::installTranslator(&translator); - // Work around bug in Qt 5 where text direction is not loaded - QGuiApplication::setLayoutDirection(QLocale(current).textDirection()); + const QString path = QLibraryInfo::location(QLibraryInfo::TranslationsPath); + + static QTranslator qtbase_translator; + if (qtbase_translator.load("qtbase_" + locale, m_path) || qtbase_translator.load("qtbase_" + locale, path)) { + QCoreApplication::installTranslator(&qtbase_translator); + } + + static QTranslator qt_translator; + if (qt_translator.load("qt_" + locale, m_path) || qt_translator.load("qt_" + locale, path)) { + QCoreApplication::installTranslator(&qt_translator); + } + } } //----------------------------------------------------------------------------- QString LocaleDialog::languageName(const QString& language) { - QString lang_code = language.left(5); - QLocale locale(lang_code); QString name; - if (lang_code.length() > 2) { - if (locale.name() == lang_code) { + const QLocale locale(language); + if (language.contains('_')) { + if (locale.name() == language) { name = locale.nativeLanguageName() + " (" + locale.nativeCountryName() + ")"; } else { name = locale.nativeLanguageName() + " (" + language + ")"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novprog-3.1.5/src/main.cpp new/novprog-3.1.7/src/main.cpp --- old/novprog-3.1.5/src/main.cpp 2018-07-20 18:00:50.000000000 +0200 +++ new/novprog-3.1.7/src/main.cpp 2020-04-21 02:41:59.000000000 +0200 @@ -1,6 +1,6 @@ /************************************************************************ * - * Copyright (C) 2006, 2007, 2008, 2010, 2012, 2014, 2015, 2018 Graeme Gott <[email protected]> + * Copyright (C) 2006, 2007, 2008, 2010, 2012, 2014, 2015, 2018, 2019 Graeme Gott <[email protected]> * * 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 @@ -28,7 +28,7 @@ int main(int argc, char** argv) { -#if !defined(Q_OS_MAC) && (QT_VERSION >= QT_VERSION_CHECK(5,6,0)) +#if !defined(Q_OS_MAC) if (!qEnvironmentVariableIsSet("QT_DEVICE_PIXEL_RATIO") && !qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR") && !qEnvironmentVariableIsSet("QT_SCALE_FACTOR") @@ -44,6 +44,7 @@ app.setOrganizationName("GottCode"); #if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) app.setWindowIcon(QIcon::fromTheme("novprog", QIcon(":/novprog.png"))); + app.setDesktopFileName("novprog"); #endif app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novprog-3.1.5/src/window.cpp new/novprog-3.1.7/src/window.cpp --- old/novprog-3.1.5/src/window.cpp 2018-07-20 18:00:50.000000000 +0200 +++ new/novprog-3.1.7/src/window.cpp 2020-04-21 02:41:59.000000000 +0200 @@ -1,6 +1,6 @@ /************************************************************************ * - * Copyright (C) 2006, 2007, 2008, 2010, 2014 Graeme Gott <[email protected]> + * Copyright (C) 2006, 2007, 2008, 2010, 2014, 2019 Graeme Gott <[email protected]> * * 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 @@ -58,7 +58,11 @@ m_data = new Database(this); m_novels = new QComboBox(this); m_novels->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); +#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0)) + connect(m_novels, &QComboBox::textActivated, this, &Window::load); +#else connect(m_novels, static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::activated), this, &Window::load); +#endif QTabWidget* graphs = new QTabWidget(this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novprog-3.1.5/windows/installer.nsi new/novprog-3.1.7/windows/installer.nsi --- old/novprog-3.1.5/windows/installer.nsi 2018-07-20 18:00:50.000000000 +0200 +++ new/novprog-3.1.7/windows/installer.nsi 2020-04-21 02:41:59.000000000 +0200 @@ -4,7 +4,7 @@ !define APPNAME "NovProg" !define VERSIONMAJOR 3 !define VERSIONMINOR 1 -!define VERSIONPATCH 5 +!define VERSIONPATCH 7 !define APPVERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}" !define ABOUTURL "https://gottcode.org/novprog/"; @@ -26,7 +26,7 @@ OutFile "${APPNAME}_${APPVERSION}.exe" ;Default installation folder -InstallDir "$PROGRAMFILES\${APPNAME}" +InstallDir "$PROGRAMFILES64\${APPNAME}" InstallDirRegKey HKLM "Software\${APPNAME}" "" ;Request application privileges for Windows Vista diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/novprog-3.1.5/windows_deploy.bat new/novprog-3.1.7/windows_deploy.bat --- old/novprog-3.1.5/windows_deploy.bat 2018-07-20 18:00:50.000000000 +0200 +++ new/novprog-3.1.7/windows_deploy.bat 2020-04-21 02:41:59.000000000 +0200 @@ -3,12 +3,11 @@ @ECHO OFF SET APP=NovProg -SET VERSION=3.1.5 +SET VERSION=3.1.7 ECHO Copying executable MKDIR %APP% COPY release\%APP%.exe %APP% >nul -strip %APP%\%APP%.exe ECHO Copying translations SET TRANSLATIONS=%APP%\translations @@ -16,7 +15,7 @@ COPY translations\*.qm %TRANSLATIONS% >nul ECHO Copying Qt -%QTDIR%\bin\windeployqt.exe --verbose 0 --release --no-angle --no-opengl-sw --no-svg %APP%\%APP%.exe +%QTDIR%\bin\windeployqt.exe --verbose 0 --no-angle --no-opengl-sw --no-svg %APP%\%APP%.exe RMDIR /S /Q %APP%\imageformats ECHO Creating ReadMe
