Cherry-picking upstream release 0.11.1.

* Removed some build dependencies:
  - cmake
  - libqt5xdg-dev
  - libqt5xdgiconloader-dev
  - pkg-config
  - qtbase5-private-dev
  - qttools5-dev
  - qttools5-dev-tools
* Bumped some build-dependencies:
  - liblxqt0-dev (>= 0.11.1)
  - liblxqt-globalkeys0-dev (>= 0.11.1)
  - liblxqt-globalkeys-ui0-dev (>= 0.11.1)
* Bump years in d/copyright

.gitignore

@@ -1,3 +0,0 @@
-build
-nbproject
-translations/lxqt-runner

CHANGELOG

@@ -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

CMakeLists.txt

@@ -8,6 +8,8 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
+set(REQUIRED_MENUCACHE_VERSION "0.3.3")
+
 include(CMakeDependentOption)
 include(GNUInstallDirs)
 
@@ -39,9 +41,7 @@ endif ()
 
 if (USE_MENU_CACHE)
     # optionally use libmenu-cache from lxde to generate the application menu
-    pkg_check_modules(MENU_CACHE REQUIRED QUIET
+    find_package(MenuCache "${REQUIRED_MENUCACHE_VERSION}" REQUIRED)
-        libmenu-cache>=0.3.3
-    )
 endif()
 
 if (RUNNER_MATH)
@@ -80,7 +80,7 @@ set(lxqt-runner_LIBRARIES
     lxqt
     lxqt-globalkeys
     lxqt-globalkeys-ui
-    ${MENU_CACHE_LIBRARIES}
+    ${MENUCACHE_LIBRARIES}
     ${QTX_LIBRARIES}
     ${MUPARSER_LDFLAGS}
 )
@@ -127,7 +127,7 @@ if (RUNNER_MATH)
 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 @@ target_compile_definitions(${PROJECT_NAME}
     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 @@ install(TARGETS
     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)

debian/changelog

@@ -1,3 +1,22 @@
+lxqt-runner (0.11.1-1) unstable; urgency=medium
+
+  * Cherry-picking upstream release 0.11.1.
+  * Removed some build dependencies:
+    - cmake
+    - libqt5xdg-dev
+    - libqt5xdgiconloader-dev
+    - pkg-config
+    - qtbase5-private-dev
+    - qttools5-dev
+    - qttools5-dev-tools
+  * Bumped some build-dependencies:
+    - liblxqt0-dev (>= 0.11.1)
+    - liblxqt-globalkeys0-dev (>= 0.11.1)
+    - liblxqt-globalkeys-ui0-dev (>= 0.11.1) 
+  * Bump years in d/copyright
+
+ -- Alf Gaida <agaida@siduction.org>  Mon, 02 Jan 2017 19:27:11 +0100
+
 lxqt-runner (0.11.0-2) unstable; urgency=medium
 
   * Cherry-picking upstream release 0.11.0.

debian/control

@@ -5,22 +5,16 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
 Section: x11
 Priority: optional
 Build-Depends: debhelper (>= 10),
-               cmake (>= 3.0.2),
                libkf5windowsystem-dev,
-               liblxqt0-dev (>= 0.11.0),
+               liblxqt0-dev (>= 0.11.1),
-               liblxqt-globalkeys0-dev (>= 0.11.0),
+               liblxqt-globalkeys0-dev (>= 0.11.1),
-               liblxqt-globalkeys-ui0-dev (>= 0.11.0),
+               liblxqt-globalkeys-ui0-dev (>= 0.11.1),
                libmenu-cache-dev,
                libmuparser-dev,
                libqt5svg5-dev,
                libqt5x11extras5-dev,
-               libqt5xdg-dev (>= 2.0.0),
-               libqt5xdgiconloader-dev (>= 2.0.0),
                libx11-dev,
-               pkg-config,
+               qtbase5-private-dev
-               qtbase5-private-dev,
-               qttools5-dev,
-               qttools5-dev-tools
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-runner.git/?h=debian/sid
 Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-runner.git -b debian/sid

debian/copyright

@@ -3,12 +3,12 @@ Upstream-Name: lxqt-runner
 Source: https://github.com/lxde/lxqt-runner
 
 Files: *
-Copyright: 2012-2016 LXQt team
+Copyright: 2012-2017 LXQt team
            2010-2012 Razor team
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2014-2016 Alf Gaida <agaida@siduction.org>
+Copyright: 2014-2017 Alf Gaida <agaida@siduction.org>
 License: LGPL-2.1+
 
 License: LGPL-2.1+

debian/rules

@@ -9,7 +9,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 	dh ${@} --buildsystem cmake
 
 override_dh_auto_configure:
-	dh_auto_configure --\
+	dh_auto_configure -- \
-		-DPULL_TRANSLATIONS=OFF\
+		-DPULL_TRANSLATIONS=OFF \
-		-DUPDATE_TRANSLATIONS=OFF\
+		-DUPDATE_TRANSLATIONS=OFF \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo

providers.cpp

@@ -791,12 +791,33 @@ bool VirtualBoxProvider::isOutDated() const
 #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 @@ MathProvider::MathProvider()
     append(new MathItem());
 }
 
+#endif
+
 ExternalProviderItem::ExternalProviderItem()
 {
 }
@@ -974,4 +997,3 @@ void ExternalProvider::readFromProcess()
     }
 }
 
-#endif

providers.h

@@ -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,15 +246,13 @@ private:
 
 
 #ifdef MATH_ENABLED
-namespace mu
-{
-    class Parser;
-}
 /************************************************
  * Mathematics
  ************************************************/
 class MathItem: public CommandProviderItem
 {
+public:
+    class Parser;
 public:
     MathItem();
     ~MathItem();
@@ -263,7 +261,7 @@ public:
     bool compare(const QRegExp &regExp) const;
     virtual unsigned int rank(const QString &pattern) const;
 private:
-    QScopedPointer<mu::Parser> mParser;
+    QScopedPointer<Parser> mParser;
     mutable QString mCachedInput;
 };