Adding upstream version 1.96~38-g975f8ce.

cmake/LXQtTranslateDesktop.cmake

@@ -71,13 +71,13 @@ function(lxqt_translate_desktop _RESULT)
         set(_pattern "'\\[.*]\\s*='")
         if (_translations)
             add_custom_command(OUTPUT ${_outFile}
-                COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
-                COMMAND grep -h ${_pattern} ${_translations} >> ${_outFile}
+                COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
+                COMMAND grep -h -a ${_pattern} ${_translations} >> ${_outFile}
                 COMMENT "Generating ${_fileName}${_fileExt}"
             )
         else()
             add_custom_command(OUTPUT ${_outFile}
-                COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
+                COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
                 COMMENT "Generating ${_fileName}${_fileExt}"
             )
         endif()

debian/patches/build-date-time.patch

@@ -0,0 +1,21 @@
+diff --git a/src/core/ui/about.cpp b/src/core/ui/about.cpp
+index 33f2b15..6c47467 100644
+--- a/src/core/ui/about.cpp
++++ b/src/core/ui/about.cpp
+@@ -31,16 +31,8 @@ AboutDialog::AboutDialog(QWidget *parent):
+     _ui->setupUi(this);
+     _ui->labAppName->setText(_ui->labAppName->text() + QString(" <b>") + qApp->applicationVersion() + QString("</b>"));
+ 
+-    QString versionInfo;
+-    versionInfo = tr("built on ");
+-    versionInfo.append(__DATE__);
+-    versionInfo.append(" ");
+-    versionInfo.append(__TIME__);
+-
+     _ui->labQtVer->setText(tr("using Qt ") + qVersion());
+ 
+-    _ui->labVersion->setText(versionInfo);
+-
+     QTabBar *tabs = new QTabBar;
+ 
+     _ui->frame->layout()->addWidget(tabs);

debian/patches/disable-uploads.patch

@@ -0,0 +1,29 @@
+diff --git a/src/core/modulemanager.cpp b/src/core/modulemanager.cpp
+index 8778e93..b35202c 100644
+--- a/src/core/modulemanager.cpp
++++ b/src/core/modulemanager.cpp
+@@ -18,9 +18,9 @@
+ 
+ #include "modulemanager.h"
+ 
+-#ifdef SG_EXT_UPLOADS
+-#include "src/modules/uploader/moduleuploader.h"
+-#endif
++// #ifdef SG_EXT_UPLOADS
++// #include "src/modules/uploader/moduleuploader.h"
++// #endif
+ 
+ #ifdef SG_EXT_EDIT
+ #include "src/modules/extedit/moduleextedit.h"
+@@ -35,10 +35,10 @@ ModuleManager::ModuleManager()
+ 
+ void ModuleManager::initModules()
+ {
+-#ifdef SG_EXT_UPLOADS
+-    ModuleUploader *uploader = new ModuleUploader();
+-    _modules->insert(MOD_UPLOADER , uploader);
+-#endif
++//#ifdef SG_EXT_UPLOADS
++//    ModuleUploader *uploader = new ModuleUploader();
++//    _modules->insert(MOD_UPLOADER , uploader);
++//#endif

debian/patches/reproducible-builds.patch

@@ -1,23 +0,0 @@
-Description: Make the builds reproducible again
-Author: Alf Gaida <agaida@siduction.org>
-Bug-Debian: https://bugs.debian.org/815899
-
---- screengrab-1.95+20160128.orig/cmake/LXQtTranslateDesktop.cmake
-+++ screengrab-1.95+20160128/cmake/LXQtTranslateDesktop.cmake
-@@ -71,13 +71,13 @@ function(lxqt_translate_desktop _RESULT)
-         set(_pattern "'\\[.*]\\s*='")
-         if (_translations)
-             add_custom_command(OUTPUT ${_outFile}
--                COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
--                COMMAND grep -h ${_pattern} ${_translations} >> ${_outFile}
-+                COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
-+                COMMAND grep -h -a ${_pattern} ${_translations} >> ${_outFile}
-                 COMMENT "Generating ${_fileName}${_fileExt}"
-             )
-         else()
-             add_custom_command(OUTPUT ${_outFile}
--                COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
-+                COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
-                 COMMENT "Generating ${_fileName}${_fileExt}"
-             )
-         endif()

debian/patches/series

@@ -1 +1,3 @@
-reproducible-builds.patch
+disable-uploads.patch
+build-date-time.patch
+

src/core/ui/about.cpp

@@ -31,8 +31,16 @@ AboutDialog::AboutDialog(QWidget *parent):
     _ui->setupUi(this);
     _ui->labAppName->setText(_ui->labAppName->text() + QString(" <b>") + qApp->applicationVersion() + QString("</b>"));
 
+    QString versionInfo;
+    versionInfo = tr("built on ");
+    versionInfo.append(__DATE__);
+    versionInfo.append(" ");
+    versionInfo.append(__TIME__);
+
     _ui->labQtVer->setText(tr("using Qt ") + qVersion());
 
+    _ui->labVersion->setText(versionInfo);
+
     QTabBar *tabs = new QTabBar;
 
     _ui->frame->layout()->addWidget(tabs);