Hello community, here is the log from the commit of package lxqt-runner for openSUSE:Factory checked in at 2017-03-13 15:32:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxqt-runner (Old) and /work/SRC/openSUSE:Factory/.lxqt-runner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxqt-runner" Mon Mar 13 15:32:19 2017 rev:7 rq:460153 version:0.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/lxqt-runner/lxqt-runner.changes 2016-10-06 12:44:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxqt-runner.new/lxqt-runner.changes 2017-03-13 15:33:30.298094277 +0100 @@ -1,0 +2,10 @@ +Fri Feb 24 01:34:41 UTC 2017 - [email protected] + +- Update to 0.11.1: + * MathItem: Honor system locale (#52) + * Use the new MenuCache configuration CMake module + * Fixes FTBFS when libmenu-cache was installed to non-standard location + * Remove cpack (#49) + * - Fix endif placement when test for MATH library. + +------------------------------------------------------------------- Old: ---- lxqt-runner-0.11.0.tar.xz lxqt-runner-0.11.0.tar.xz.asc New: ---- lxqt-runner-0.11.1.tar.xz lxqt-runner-0.11.1.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxqt-runner.spec ++++++ --- /var/tmp/diff_new_pack.9HbAtg/_old 2017-03-13 15:33:30.838017973 +0100 +++ /var/tmp/diff_new_pack.9HbAtg/_new 2017-03-13 15:33:30.838017973 +0100 @@ -17,7 +17,7 @@ Name: lxqt-runner -Version: 0.11.0 +Version: 0.11.1 Release: 0 Summary: LXQt application launcher License: LGPL-2.1+ @@ -28,6 +28,7 @@ Source2: %{name}.keyring BuildRequires: cmake >= 3.0.2 BuildRequires: gcc-c++ +BuildRequires: lxqt-build-tools-devel BuildRequires: cmake(KF5WindowSystem) BuildRequires: pkgconfig(muparser) BuildRequires: pkgconfig(Qt5UiTools) ++++++ lxqt-runner-0.11.0.tar.xz -> lxqt-runner-0.11.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-runner-0.11.0/.gitignore new/lxqt-runner-0.11.1/.gitignore --- old/lxqt-runner-0.11.0/.gitignore 2016-09-24 00:46:38.000000000 +0200 +++ new/lxqt-runner-0.11.1/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -build -nbproject -translations/lxqt-runner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-runner-0.11.0/CHANGELOG new/lxqt-runner-0.11.1/CHANGELOG --- old/lxqt-runner-0.11.0/CHANGELOG 2016-09-24 00:46:38.000000000 +0200 +++ new/lxqt-runner-0.11.1/CHANGELOG 2017-01-01 23:30:39.000000000 +0100 @@ -1,7 +1,17 @@ -lxqt-runner-0.11.0 / 2016-09-24 +lxqt-runner-0.11.1 / 2017-01-01 =============================== + * MathItem: Honor system locale (#52) + * Use the new MenuCache configuration CMake module + * Fixes FTBFS when libmenu-cache was installed to non-standard location + * Remove cpack (#49) + * - Fix endif placement when test for MATH library. + +0.11.0 / 2016-09-24 +=================== + + * Release 0.11.0: Add changelog * Add README.md * Math: Enhance evaluation logic * Math: Use libmuparser for math evaluation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-runner-0.11.0/CMakeLists.txt new/lxqt-runner-0.11.1/CMakeLists.txt --- old/lxqt-runner-0.11.0/CMakeLists.txt 2016-09-24 00:46:38.000000000 +0200 +++ new/lxqt-runner-0.11.1/CMakeLists.txt 2017-01-01 23:30:39.000000000 +0100 @@ -8,6 +8,8 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) +set(REQUIRED_MENUCACHE_VERSION "0.3.3") + include(CMakeDependentOption) include(GNUInstallDirs) @@ -39,9 +41,7 @@ if (USE_MENU_CACHE) # optionally use libmenu-cache from lxde to generate the application menu - pkg_check_modules(MENU_CACHE REQUIRED QUIET - libmenu-cache>=0.3.3 - ) + find_package(MenuCache "${REQUIRED_MENUCACHE_VERSION}" REQUIRED) endif() if (RUNNER_MATH) @@ -80,7 +80,7 @@ lxqt lxqt-globalkeys lxqt-globalkeys-ui - ${MENU_CACHE_LIBRARIES} + ${MENUCACHE_LIBRARIES} ${QTX_LIBRARIES} ${MUPARSER_LDFLAGS} ) @@ -127,7 +127,7 @@ endif () target_include_directories(${PROJECT_NAME} - PRIVATE "$<$<BOOL:${MENU_CACHE_FOUND}>:${MENU_CACHE_INCLUDE_DIRS}>" + PRIVATE "$<$<BOOL:${MENUCACHE_FOUND}>:${MENUCACHE_INCLUDE_DIRS}>" PRIVATE "$<$<BOOL:${MUPARSER_FOUND}>:${MUPARSER_INCLUDE_DIRS}>" ) @@ -135,7 +135,7 @@ PRIVATE "$<$<BOOL:${RUNNER_MATH}>:MATH_ENABLED>" PRIVATE "$<$<BOOL:${RUNNER_VBOX}>:VBOX_ENABLED>" PRIVATE "$<$<BOOL:${RUNNER_VBOX_HEADLESS}>:VBOX_HEADLESS_ENABLED>" - PRIVATE "$<$<BOOL:${MENU_CACHE_FOUND}>:HAVE_MENU_CACHE=1>" + PRIVATE "$<$<BOOL:${MENUCACHE_FOUND}>:HAVE_MENU_CACHE=1>" ) target_link_libraries(${PROJECT_NAME} @@ -148,13 +148,3 @@ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT Runtime ) - -# building tarball with CPack ------------------------------------------------- -include(InstallRequiredSystemLibraries) -set(CPACK_PACKAGE_VERSION_MAJOR ${LXQT_MAJOR_VERSION}) -set(CPACK_PACKAGE_VERSION_MINOR ${LXQT_MINOR_VERSION}) -set(CPACK_PACKAGE_VERSION_PATCH ${LXQT_PATCH_VERSION}) -set(CPACK_GENERATOR TBZ2) -set(CPACK_SOURCE_GENERATOR TBZ2) -set(CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp) -include(CPack) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-runner-0.11.0/providers.cpp new/lxqt-runner-0.11.1/providers.cpp --- old/lxqt-runner-0.11.0/providers.cpp 2016-09-24 00:46:38.000000000 +0200 +++ new/lxqt-runner-0.11.1/providers.cpp 2017-01-01 23:30:39.000000000 +0100 @@ -791,12 +791,33 @@ #ifdef MATH_ENABLED #include <muParser.h> +class MathItem::Parser : public mu::Parser +{ +public: + static void initLocale() + { + try + { + // use the system's locale instead of the "C" + s_locale = std::locale{""}; + } catch (const std::runtime_error & e) + { + qWarning().noquote() << "Unable to set locale for Math, " << e.what(); + } + } +}; +static void muParserInitLocale() +{ + MathItem::Parser::initLocale(); +} +Q_COREAPP_STARTUP_FUNCTION(muParserInitLocale); + /************************************************ ************************************************/ MathItem::MathItem(): CommandProviderItem(), - mParser{new mu::Parser} + mParser{new Parser} { mToolTip =QObject::tr("Mathematics"); mIcon = XdgIcon::fromTheme("accessories-calculator"); @@ -885,6 +906,8 @@ append(new MathItem()); } +#endif + ExternalProviderItem::ExternalProviderItem() { } @@ -974,4 +997,3 @@ } } -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-runner-0.11.0/providers.h new/lxqt-runner-0.11.1/providers.h --- old/lxqt-runner-0.11.0/providers.h 2016-09-24 00:46:38.000000000 +0200 +++ new/lxqt-runner-0.11.1/providers.h 2017-01-01 23:30:39.000000000 +0100 @@ -37,7 +37,7 @@ #include <QIcon> #ifdef HAVE_MENU_CACHE -#include <menu-cache/menu-cache.h> +#include <menu-cache.h> #endif #define MAX_RANK 0xFFFF @@ -246,16 +246,14 @@ #ifdef MATH_ENABLED -namespace mu -{ - class Parser; -} /************************************************ * Mathematics ************************************************/ class MathItem: public CommandProviderItem { public: + class Parser; +public: MathItem(); ~MathItem(); @@ -263,7 +261,7 @@ bool compare(const QRegExp ®Exp) const; virtual unsigned int rank(const QString &pattern) const; private: - QScopedPointer<mu::Parser> mParser; + QScopedPointer<Parser> mParser; mutable QString mCachedInput; };
