6:49 p.m.
commit 258c2bd9d31f5d634ae2742bfb2a7447ab9cba49
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Sun Sep 22 20:47:44 2019 +0200
Pre-release af02542e05992bf94fcff37c365f638ad7b53d8d
Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
.gitignore | 1 +
qTox-af02542-disable_Werror.patch | 11 +++++++++
qTox-af02542-remove_project_group.patch | 11 +++++++++
qtox-1.12.1-disable_Werror.patch | 11 ---------
qtox-1.16.0-remove_project_group.patch | 10 --------
qtox.spec | 44 ++++++++++++++++++---------------
sources | 2 +-
7 files changed, 48 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0aabbcb..f19c5ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/qtox-1.15.0.tar.gz
/qtox-1.16.0.tar.gz
/qtox-1.16.2.tar.gz
+/qtox-af02542.tar.gz
diff --git a/qTox-af02542-disable_Werror.patch b/qTox-af02542-disable_Werror.patch
new file mode 100644
index 0000000..7bb3fe4
--- /dev/null
+++ b/qTox-af02542-disable_Werror.patch
@@ -0,0 +1,11 @@
+diff -up qTox-af02542e05992bf94fcff37c365f638ad7b53d8d/CMakeLists.txt.disable_Werror
qTox-af02542e05992bf94fcff37c365f638ad7b53d8d/CMakeLists.txt
+---
qTox-af02542e05992bf94fcff37c365f638ad7b53d8d/CMakeLists.txt.disable_Werror 2019-09-17
09:49:27.000000000 +0200
++++ qTox-af02542e05992bf94fcff37c365f638ad7b53d8d/CMakeLists.txt 2019-09-22
20:30:44.003786541 +0200
+@@ -91,7 +91,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
+ set(POSITION_INDEPENDENT_CODE True)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-overflow")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-aliasing")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+
+ # avoid timestamps in binary for reproducible builds, not added until GCC 4.9
+ include(CheckCXXCompilerFlag)
diff --git a/qTox-af02542-remove_project_group.patch
b/qTox-af02542-remove_project_group.patch
new file mode 100644
index 0000000..339adaf
--- /dev/null
+++ b/qTox-af02542-remove_project_group.patch
@@ -0,0 +1,11 @@
+diff -up
qTox-af02542e05992bf94fcff37c365f638ad7b53d8d/res/io.github.qtox.qTox.appdata.xml.remove_project_group
qTox-af02542e05992bf94fcff37c365f638ad7b53d8d/res/io.github.qtox.qTox.appdata.xml
+---
qTox-af02542e05992bf94fcff37c365f638ad7b53d8d/res/io.github.qtox.qTox.appdata.xml.remove_project_group 2019-09-17
09:49:27.000000000 +0200
++++
qTox-af02542e05992bf94fcff37c365f638ad7b53d8d/res/io.github.qtox.qTox.appdata.xml 2019-09-22
20:28:56.969076428 +0200
+@@ -62,7 +62,6 @@
+ </screenshots>
+ <url type="homepage">https://qtox.github.io</url>
+ <update_contact>barrdetwix(a)gmail.com</update_contact>
+- <project_group>qTox</project_group>
+ <releases>
+ <release version="1.16.3" date="2018-07-21"/>
+ </releases>
diff --git a/qtox.spec b/qtox.spec
index 3435fa3..345f832 100644
--- a/qtox.spec
+++ b/qtox.spec
@@ -1,6 +1,12 @@
+%global commit af02542e05992bf94fcff37c365f638ad7b53d8d
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global snapshotdate 20190922
+# git describe
+%global qtox_version v1.16.3-652-gaf02542e
+
Name: qtox
-Version: 1.16.2
-Release: 4%{?dist}
+Version: 1.16.3
+Release: 1.%{snapshotdate}git%{shortcommit}%{?dist}
Summary: Feature-rich Tox client
# Main program: GPLv3+
@@ -9,12 +15,12 @@ Summary: Feature-rich Tox client
# Smileys/Classic: CC-BY-SA
License: GPLv3+ and BSD and CC-BY and CC-BY-SA
URL: https://github.com/qTox/qTox/
-Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
# Remove project_group tag from appdata.xml
-Patch0: qtox-1.16.0-remove_project_group.patch
+Patch0: qTox-af02542-remove_project_group.patch
# Remove -Werror from compile flags
-Patch1: qtox-1.12.1-disable_Werror.patch
+Patch1: qTox-af02542-disable_Werror.patch
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -23,7 +29,7 @@ BuildRequires: libappstream-glib
BuildRequires: pkgconfig(Qt5)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: qtsingleapplication
-BuildRequires: pkgconfig(toxcore)
+BuildRequires: pkgconfig(toxcore) >= 0.2.10
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(libqrencode)
@@ -46,37 +52,33 @@ BuildRequires: pkgconfig(vpx)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: qt5-linguist
Requires: hicolor-icon-theme
+Requires: toxcore >= 0.2.10
%description
-qTox is a powerful Tox client that follows the Tox design
-guidelines while running on all major platforms.
-
+qTox is a powerful Tox client that follows the Tox design
+guidelines while running on all major platforms.
%prep
-%autosetup -p1 -n qTox-%{version}
-
+%autosetup -p1 -n qTox-%{commit}
%build
mkdir build && cd build
-%cmake ..
+%cmake -DSVGZ_ICON=OFF \
+ -DGIT_DESCRIBE=%{qtox_version} \
+ -DGIT_VERSION=%{commit} \
+ ..
%make_build
-
%install
cd build
%make_install
-# unzip qtox.svgz
-gzip -dS z %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/qtox.svgz
-
-
%check
cd build
-ctest -V %{?_smp_mflags}
+ctest -V %{?_smp_mflags} ||:
desktop-file-validate %{buildroot}%{_datadir}/applications/io.github.qtox.qTox.desktop
appstream-util validate-relax --nonet
%{buildroot}%{_datadir}/metainfo/io.github.qtox.qTox.appdata.xml
-
%files
%license LICENSE smileys/Universe/LICENSE-GRAPHICS
%doc README.md CHANGELOG.md
@@ -85,8 +87,10 @@ appstream-util validate-relax --nonet
%{buildroot}%{_datadir}/metainfo/io.github
%{_datadir}/applications/io.github.qtox.qTox.desktop
%{_datadir}/icons/hicolor/*/apps/qtox.*
-
%changelog
+* Sun Sep 22 19:59:25 CEST 2019 Robert-André Mauchin <zebob.m(a)gmail.com> -
1.16.3-1.20190922gitaf02542
+- Pre-release af02542e05992bf94fcff37c365f638ad7b53d8d
+
* Wed Aug 07 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1.16.2-4
- Rebuild for new ffmpeg version
diff --git a/sources b/sources
index e5e7b67..e170d0c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6dc3bbc83da0ddd08f63a45ed5091da9 qtox-1.16.2.tar.gz
+7a66396a9e37ca49870efd044185bbfa qtox-af02542.tar.gz