diff --git a/harbour-fernschreiber.pro b/harbour-fernschreiber.pro index 1986a63..46bf66b 100644 --- a/harbour-fernschreiber.pro +++ b/harbour-fernschreiber.pro @@ -145,11 +145,18 @@ TRANSLATIONS += translations/harbour-fernschreiber-de.ts \ translations/harbour-fernschreiber-en.ts \ translations/harbour-fernschreiber-zh_CN.ts -contains(QT_ARCH, arm) { +equals(QT_ARCH, arm) { + message(Building ARM) TARGET_ARCHITECTURE = armv7hl -} else { +} +equals(QT_ARCH, i386) { + message(Building i486) TARGET_ARCHITECTURE = i486 } +equals(QT_ARCH, arm64){ + message(Building aarch64) + TARGET_ARCHITECTURE = aarch64 +} INCLUDEPATH += $$PWD/tdlib/include DEPENDPATH += $$PWD/tdlib/include diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index aed649c..be72dd1 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -59,7 +59,7 @@ Page { } Label { - text: "Fernschreiber 0.8.1" + text: "Fernschreiber 0.8.2" horizontalAlignment: Text.AlignHCenter font.pixelSize: Theme.fontSizeExtraLarge anchors { diff --git a/rpm/harbour-fernschreiber.spec b/rpm/harbour-fernschreiber.spec index 7d74154..605c40f 100644 --- a/rpm/harbour-fernschreiber.spec +++ b/rpm/harbour-fernschreiber.spec @@ -6,11 +6,13 @@ Name: harbour-fernschreiber # >> macros +%define __provides_exclude_from ^%{_datadir}/.*$ +%define __requires_exclude ^libtdjson.*$ # << macros Summary: Fernschreiber is a Telegram client for Sailfish OS -Version: 0.8.1 -Release: 2 +Version: 0.8.2 +Release: 1 Group: Qt/Qt License: LICENSE URL: http://werkwolf.eu/ @@ -26,7 +28,6 @@ BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Multimedia) BuildRequires: pkgconfig(Qt5Positioning) BuildRequires: pkgconfig(nemonotifications-qt5) -BuildRequires: pkgconfig(ngf-qt5) BuildRequires: desktop-file-utils %description diff --git a/rpm/harbour-fernschreiber.yaml b/rpm/harbour-fernschreiber.yaml index 818bf3d..e438587 100644 --- a/rpm/harbour-fernschreiber.yaml +++ b/rpm/harbour-fernschreiber.yaml @@ -28,7 +28,6 @@ PkgConfigBR: - Qt5Multimedia - Qt5Positioning - nemonotifications-qt5 - - ngf-qt5 # Build dependencies without a pkgconfig setup can be listed here # PkgBR: diff --git a/src/tdlibwrapper.cpp b/src/tdlibwrapper.cpp index 34403cb..612513a 100644 --- a/src/tdlibwrapper.cpp +++ b/src/tdlibwrapper.cpp @@ -1853,7 +1853,7 @@ void TDLibWrapper::setInitialParameters() QSettings hardwareSettings("/etc/hw-release", QSettings::NativeFormat); initialParameters.insert("device_model", hardwareSettings.value("NAME", "Unknown Mobile Device").toString()); initialParameters.insert("system_version", QSysInfo::prettyProductName()); - initialParameters.insert("application_version", "0.8.1"); + initialParameters.insert("application_version", "0.8.2"); initialParameters.insert("enable_storage_optimizer", appSettings->storageOptimizer()); // initialParameters.insert("use_test_dc", true); requestObject.insert("parameters", initialParameters);