diff --git a/cmake/LXQtTranslateDesktop.cmake b/cmake/LXQtTranslateDesktop.cmake index 522ed68..7569f03 100644 --- a/cmake/LXQtTranslateDesktop.cmake +++ b/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() diff --git a/debian/patches/build-date-time.patch b/debian/patches/build-date-time.patch new file mode 100644 index 0000000..6eaa89b --- /dev/null +++ b/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(" ") + qApp->applicationVersion() + QString("")); + +- 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); diff --git a/debian/patches/disable-uploads.patch b/debian/patches/disable-uploads.patch new file mode 100644 index 0000000..b0820e1 --- /dev/null +++ b/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 diff --git a/debian/patches/reproducible-builds.patch b/debian/patches/reproducible-builds.patch deleted file mode 100644 index 22a07c1..0000000 --- a/debian/patches/reproducible-builds.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: Make the builds reproducible again -Author: Alf Gaida -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() diff --git a/debian/patches/series b/debian/patches/series index 153739d..7819566 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ -reproducible-builds.patch +disable-uploads.patch +build-date-time.patch + diff --git a/screengrab_de.qm b/screengrab_de.qm deleted file mode 100644 index 165f4ac..0000000 Binary files a/screengrab_de.qm and /dev/null differ diff --git a/screengrab_es_ES.qm b/screengrab_es_ES.qm deleted file mode 100644 index ebf0e2a..0000000 Binary files a/screengrab_es_ES.qm and /dev/null differ diff --git a/screengrab_it.qm b/screengrab_it.qm deleted file mode 100644 index fa1ff54..0000000 Binary files a/screengrab_it.qm and /dev/null differ diff --git a/screengrab_pt_BR.qm b/screengrab_pt_BR.qm deleted file mode 100644 index 7302c8a..0000000 Binary files a/screengrab_pt_BR.qm and /dev/null differ diff --git a/screengrab_ru.qm b/screengrab_ru.qm deleted file mode 100644 index 596099b..0000000 Binary files a/screengrab_ru.qm and /dev/null differ diff --git a/screengrab_uk_UA.qm b/screengrab_uk_UA.qm deleted file mode 100644 index 73b5d0d..0000000 Binary files a/screengrab_uk_UA.qm and /dev/null differ diff --git a/src/core/ui/about.cpp b/src/core/ui/about.cpp index 6c47467..33f2b15 100644 --- a/src/core/ui/about.cpp +++ b/src/core/ui/about.cpp @@ -31,8 +31,16 @@ AboutDialog::AboutDialog(QWidget *parent): _ui->setupUi(this); _ui->labAppName->setText(_ui->labAppName->text() + QString(" ") + qApp->applicationVersion() + QString("")); + 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);