Hello community, here is the log from the commit of package linphoneqt for openSUSE:Factory checked in at 2018-08-18 00:05:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linphoneqt (Old) and /work/SRC/openSUSE:Factory/.linphoneqt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linphoneqt" Sat Aug 18 00:05:15 2018 rev:7 rq:629597 version:4.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/linphoneqt/linphoneqt.changes 2018-08-15 10:39:32.568417300 +0200 +++ /work/SRC/openSUSE:Factory/.linphoneqt.new/linphoneqt.changes 2018-08-18 00:05:18.243290991 +0200 @@ -1,0 +2,5 @@ +Wed Aug 15 14:36:31 UTC 2018 - sor.ale...@meowr.ru + +- Add linphoneqt-fix-no-git.patch: Fix building out-of-git. + +------------------------------------------------------------------- New: ---- linphoneqt-fix-no-git.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linphoneqt.spec ++++++ --- /var/tmp/diff_new_pack.ksqiBN/_old 2018-08-18 00:05:18.791292631 +0200 +++ /var/tmp/diff_new_pack.ksqiBN/_new 2018-08-18 00:05:18.791292631 +0200 @@ -34,6 +34,8 @@ Patch2: linphoneqt-fix-qt-5.11.patch # PATCH-FIX-OPENSUSE linphoneqt-qt-5.9-fix-buttons.patch boo#1095273 -- Fix button invisibility with Qt 5.9. Patch3: linphoneqt-qt-5.9-fix-buttons.patch +# PATCH-FIX-OPENSUSE linphoneqt-fix-no-git.patch -- Fix building out-of-git. +Patch4: linphoneqt-fix-no-git.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -84,6 +86,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 cp %{SOURCE1} linphone.appdata.xml %build ++++++ linphoneqt-fix-no-git.patch ++++++ --- a/config.h.cmake +++ b/config.h.cmake @@ -20,5 +20,7 @@ * *******************************************************************************/ +#define LINPHONE_QT_VERSION "${PROJECT_VERSION}" + #cmakedefine MSPLUGINS_DIR "${MSPLUGINS_DIR}" #cmakedefine ENABLE_UPDATE_CHECK 1 \ No newline at end of file --- a/src/app/AppController.cpp +++ b/src/app/AppController.cpp @@ -25,10 +25,15 @@ #include <QMessageBox> #include <QQuickStyle> +#include "config.h" #include "gitversion.h" #include "AppController.hpp" +#ifndef LINPHONE_QT_GIT_VERSION +#define LINPHONE_QT_GIT_VERSION LINPHONE_QT_VERSION +#endif + // Must be unique. Used by `SingleApplication` and `Paths`. #define APPLICATION_NAME "linphone" #define APPLICATION_VERSION LINPHONE_QT_GIT_VERSION