commit libyui-qt for openSUSE:Factory
Hello community, here is the log from the commit of package libyui-qt for openSUSE:Factory checked in at 2018-04-26 13:30:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt (Old) and /work/SRC/openSUSE:Factory/.libyui-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-qt" Thu Apr 26 13:30:19 2018 rev:47 rq:599964 version:2.49.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt/libyui-qt.changes 2018-02-14 09:19:00.326914277 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-qt.new/libyui-qt.changes 2018-04-26 13:30:20.804974511 +0200 @@ -1,0 +2,7 @@ +Wed Apr 18 14:03:01 UTC 2018 - igonzalezsosa@suse.com + +- Use QLibraryInfo to determine the path to Qt translations + (bsc#1082569). +- 2.49.2 + +------------------------------------------------------------------- Old: ---- libyui-qt-2.49.1.tar.bz2 New: ---- libyui-qt-2.49.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-doc.spec ++++++ --- /var/tmp/diff_new_pack.hbLJmV/_old 2018-04-26 13:30:21.300956344 +0200 +++ /var/tmp/diff_new_pack.hbLJmV/_new 2018-04-26 13:30:21.300956344 +0200 @@ -20,7 +20,7 @@ %define so_version 8 Name: %{parent}-doc -Version: 2.49.1 +Version: 2.49.2 Release: 0 Source: %{parent}-%{version}.tar.bz2 ++++++ libyui-qt.spec ++++++ --- /var/tmp/diff_new_pack.hbLJmV/_old 2018-04-26 13:30:21.320955611 +0200 +++ /var/tmp/diff_new_pack.hbLJmV/_new 2018-04-26 13:30:21.324955465 +0200 @@ -17,7 +17,7 @@ Name: libyui-qt -Version: 2.49.1 +Version: 2.49.2 Release: 0 Source: %{name}-%{version}.tar.bz2 ++++++ libyui-qt-2.49.1.tar.bz2 -> libyui-qt-2.49.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.1/VERSION.cmake new/libyui-qt-2.49.2/VERSION.cmake --- old/libyui-qt-2.49.1/VERSION.cmake 2018-02-07 17:11:06.000000000 +0100 +++ new/libyui-qt-2.49.2/VERSION.cmake 2018-04-23 11:41:05.000000000 +0200 @@ -1,6 +1,6 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "49") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is needed for the libyui-qt core ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.1/package/libyui-qt-doc.spec new/libyui-qt-2.49.2/package/libyui-qt-doc.spec --- old/libyui-qt-2.49.1/package/libyui-qt-doc.spec 2018-02-07 17:11:06.000000000 +0100 +++ new/libyui-qt-2.49.2/package/libyui-qt-doc.spec 2018-04-23 11:41:05.000000000 +0200 @@ -20,7 +20,7 @@ %define so_version 8 Name: %{parent}-doc -Version: 2.49.1 +Version: 2.49.2 Release: 0 Source: %{parent}-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.1/package/libyui-qt.changes new/libyui-qt-2.49.2/package/libyui-qt.changes --- old/libyui-qt-2.49.1/package/libyui-qt.changes 2018-02-07 17:11:06.000000000 +0100 +++ new/libyui-qt-2.49.2/package/libyui-qt.changes 2018-04-23 11:41:05.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 18 14:03:01 UTC 2018 - igonzalezsosa@suse.com + +- Use QLibraryInfo to determine the path to Qt translations + (bsc#1082569). +- 2.49.2 + +------------------------------------------------------------------- Mon Jan 8 17:09:26 UTC 2018 - shundhammer@suse.com - Prevent segfault if an open dialog is left over (bsc#1074596): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.1/package/libyui-qt.spec new/libyui-qt-2.49.2/package/libyui-qt.spec --- old/libyui-qt-2.49.1/package/libyui-qt.spec 2018-02-07 17:11:06.000000000 +0100 +++ new/libyui-qt-2.49.2/package/libyui-qt.spec 2018-04-23 11:41:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-qt -Version: 2.49.1 +Version: 2.49.2 Release: 0 Source: %{name}-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.1/src/CMakeLists.txt new/libyui-qt-2.49.2/src/CMakeLists.txt --- old/libyui-qt-2.49.1/src/CMakeLists.txt 2018-02-07 17:11:06.000000000 +0100 +++ new/libyui-qt-2.49.2/src/CMakeLists.txt 2018-04-23 11:41:05.000000000 +0200 @@ -7,7 +7,6 @@ set(Y2QT_ICONDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme/current) add_definitions( -DICONDIR="${Y2QT_ICONDIR}" - -DQT_LOCALEDIR="${QT_TRANSLATIONS_DIR}" ) qt5_wrap_ui(${TARGETLIB}_SOURCES "${${TARGETLIB}_WRAP_UI}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.1/src/YQApplication.cc new/libyui-qt-2.49.2/src/YQApplication.cc --- old/libyui-qt-2.49.1/src/YQApplication.cc 2018-02-07 17:11:06.000000000 +0100 +++ new/libyui-qt-2.49.2/src/YQApplication.cc 2018-04-23 11:41:05.000000000 +0200 @@ -34,6 +34,7 @@ #include <QSettings> #include <QFontDatabase> #include <QMenu> +#include <QLibraryInfo> #include <fontconfig/fontconfig.h> @@ -120,7 +121,7 @@ void YQApplication::loadPredefinedQtTranslations() { - QString path = QT_LOCALEDIR; + QString path = QLibraryInfo::location(QLibraryInfo::TranslationsPath); QString language; if (glob_language == "") @@ -143,24 +144,15 @@ if ( ! _qtTranslations ) _qtTranslations = new QTranslator(); - _qtTranslations->load( transFile, path ); - - if ( _qtTranslations->isEmpty() ) - { - // try fallback - transFile = QString( "qt_%1.qm").arg( language.toLower().left(2) ); - _qtTranslations->load( transFile, path ); - } - - if ( _qtTranslations->isEmpty() ) + if ( !_qtTranslations->load( transFile, path ) ) { - yuiWarning() << "Can't load translations for predefined Qt dialogs from " - << path << "/" << transFile << std::endl; + yuiWarning() << "Can't load translations for predefined Qt dialogs for " + << language << std::endl; } else { - yuiMilestone() << "Loaded translations for predefined Qt dialogs from " - << path << "/" << transFile << std::endl; + yuiMilestone() << "Loaded translations for predefined Qt dialogs for " + << language << std::endl; qApp->installTranslator( _qtTranslations );
participants (1)
-
root＠hilbert.suse.de