Commit 3ae58ec2 authored by yangfl's avatar yangfl

debian: update to 1.16.3-2

parent 15bf0bca
Source: https://download.opensuse.org/repositories/home:/antonbatenev:/tox/Debian_9.0/qtox_201708291918~v1.6.0.tar.bz2
qtox (1.16.3-2) unstable; urgency=medium
* Backport ec9d9850 to fix CheckAtomic.cmake
* Backport 6d0885f3 to fix FTBFS on hurd
* Fix FTBR by setting QT_RCC_SOURCE_DATE_OVERRIDE
* Fix autopkgtest
* Bump Standards-Version to 4.3.0
* Bump debhelper compat to 12
-- Yangfl <mmyangfl@gmail.com> Tue, 29 Jan 2019 16:01:45 +0800
qtox (1.16.3-1) unstable; urgency=medium
* New upstream release
......
......@@ -3,7 +3,7 @@ Section: net
Priority: optional
Maintainer: Yangfl <mmyangfl@gmail.com>
Build-Depends:
debhelper (>= 11~),
debhelper (>= 12~),
cmake (>= 2.8.11),
check,
pkg-config,
......@@ -21,7 +21,7 @@ Build-Depends:
libgtk2.0-dev,
libgdk-pixbuf2.0-dev,
libsndio-dev [!linux-any],
Standards-Version: 4.2.1
Standards-Version: 4.3.0
Homepage: https://qtox.github.io
Vcs-Git: https://salsa.debian.org/yangfl-guest/qTox.git
Vcs-Browser: https://salsa.debian.org/yangfl-guest/qTox
......
This diff is collapsed.
From ec9d9850bfa2c1c1e6345e729f28f8522ae1d3ab Mon Sep 17 00:00:00 2001
From: yangfl <yangfl@users.noreply.github.com>
Date: Wed, 21 Nov 2018 20:13:13 +0800
Subject: [PATCH] chore(cmake): add missing CheckLibraryExists in
CheckAtomic.cmake
---
cmake/CheckAtomic.cmake | 1 +
1 file changed, 1 insertion(+)
diff --git a/cmake/CheckAtomic.cmake b/cmake/CheckAtomic.cmake
index b8296a1c..5f362dc4 100644
--- a/cmake/CheckAtomic.cmake
+++ b/cmake/CheckAtomic.cmake
@@ -1,6 +1,7 @@
# atomic builtins are required for threading support.
INCLUDE(CheckCXXSourceCompiles)
+INCLUDE(CheckLibraryExists)
# Sometimes linking against libatomic is required for atomic ops, if
# the platform doesn't support lock-free atomics.
--
2.19.2
From 6d0885f396a657a7fb3f890a881a33c16559872d Mon Sep 17 00:00:00 2001
From: yangfl <yangfl@users.noreply.github.com>
Date: Mon, 3 Dec 2018 15:59:31 +0800
Subject: [PATCH] chore(cmake): let CMake choose which platform dependent code
to compile
Macros can be hard to manipulate and vary among different compilers and
platforms. For example, GNU Hurd has `__MACH__` defined but not
`__APPLE__`.
Let CMake choose them during configuration.
---
CMakeLists.txt | 30 ++++++++++++++++++++----------
src/platform/autorun_osx.cpp | 3 ---
src/platform/autorun_win.cpp | 3 ---
src/platform/autorun_xdg.cpp | 3 ---
src/platform/capslock_osx.cpp | 3 ---
src/platform/capslock_win.cpp | 3 ---
src/platform/capslock_x11.cpp | 4 ----
src/platform/timer_osx.cpp | 3 ---
src/platform/timer_win.cpp | 3 ---
src/platform/timer_x11.cpp | 3 ---
src/platform/x11_display.cpp | 3 ---
src/platform/x11_display.h | 4 ----
12 files changed, 20 insertions(+), 45 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a229ad63..2ea1f485 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -524,17 +524,27 @@ if (PLATFORM_EXTENSIONS)
src/platform/autorun.h
src/platform/capslock.h
src/platform/timer.h
- src/platform/autorun_osx.cpp
- src/platform/autorun_win.cpp
- src/platform/autorun_xdg.cpp
- src/platform/capslock_osx.cpp
- src/platform/capslock_win.cpp
- src/platform/capslock_x11.cpp
- src/platform/timer_osx.cpp
- src/platform/timer_win.cpp
- src/platform/timer_x11.cpp
- src/platform/x11_display.cpp
)
+ if (WIN32)
+ set(${PROJECT_NAME}_SOURCES ${${PROJECT_NAME}_SOURCES}
+ src/platform/autorun_win.cpp
+ src/platform/capslock_win.cpp
+ src/platform/timer_win.cpp
+ )
+ elseif (${X11_EXT})
+ set(${PROJECT_NAME}_SOURCES ${${PROJECT_NAME}_SOURCES}
+ src/platform/autorun_xdg.cpp
+ src/platform/capslock_x11.cpp
+ src/platform/timer_x11.cpp
+ src/platform/x11_display.cpp
+ )
+ elseif (${APPLE_EXT})
+ set(${PROJECT_NAME}_SOURCES ${${PROJECT_NAME}_SOURCES}
+ src/platform/autorun_osx.cpp
+ src/platform/capslock_osx.cpp
+ src/platform/timer_osx.cpp
+ )
+ endif()
endif()
add_definitions(-DQT_MESSAGELOGCONTEXT=1)
diff --git a/src/platform/autorun_osx.cpp b/src/platform/autorun_osx.cpp
index 95a9a958..b0095a3b 100644
--- a/src/platform/autorun_osx.cpp
+++ b/src/platform/autorun_osx.cpp
@@ -17,7 +17,6 @@
along with qTox. If not, see <http://www.gnu.org/licenses/>.
*/
-#if defined(__APPLE__) && defined(__MACH__)
#include "src/platform/autorun.h"
#include <QCoreApplication>
#include <QDir>
@@ -48,5 +47,3 @@ bool Platform::getAutorun()
{
return state;
}
-
-#endif // defined(__APPLE__) && defined(__MACH__)
diff --git a/src/platform/autorun_win.cpp b/src/platform/autorun_win.cpp
index 8fe25a7c..8d239106 100644
--- a/src/platform/autorun_win.cpp
+++ b/src/platform/autorun_win.cpp
@@ -18,7 +18,6 @@
*/
#include <QApplication>
-#ifdef Q_OS_WIN32
#include "src/persistence/settings.h"
#include "src/platform/autorun.h"
#include <string>
@@ -101,5 +100,3 @@ bool Platform::getAutorun()
RegCloseKey(key);
return result;
}
-
-#endif // Q_OS_WIN32
diff --git a/src/platform/autorun_xdg.cpp b/src/platform/autorun_xdg.cpp
index 1706026a..2456ceba 100644
--- a/src/platform/autorun_xdg.cpp
+++ b/src/platform/autorun_xdg.cpp
@@ -18,7 +18,6 @@
*/
#include <QApplication>
-#if defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__)
#include "src/persistence/settings.h"
#include "src/platform/autorun.h"
#include <QDir>
@@ -69,5 +68,3 @@ bool Platform::getAutorun()
{
return QFile(getAutostartFilePath(getAutostartDirPath())).exists();
}
-
-#endif // defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__)
diff --git a/src/platform/capslock_osx.cpp b/src/platform/capslock_osx.cpp
index 85b242c0..1bab3926 100644
--- a/src/platform/capslock_osx.cpp
+++ b/src/platform/capslock_osx.cpp
@@ -18,7 +18,6 @@
*/
#include <QtCore/qsystemdetection.h>
-#if defined(__APPLE__) && defined(__MACH__)
#include "src/platform/capslock.h"
// TODO: Implement for osx
@@ -26,5 +25,3 @@ bool Platform::capsLockEnabled()
{
return false;
}
-
-#endif // defined(__APPLE__) && defined(__MACH__)
diff --git a/src/platform/capslock_win.cpp b/src/platform/capslock_win.cpp
index 4ee66c2a..8e1a647d 100644
--- a/src/platform/capslock_win.cpp
+++ b/src/platform/capslock_win.cpp
@@ -18,7 +18,6 @@
*/
#include <QtCore/qsystemdetection.h>
-#ifdef Q_OS_WIN32
#include "src/platform/capslock.h"
#include <windows.h>
@@ -26,5 +25,3 @@ bool Platform::capsLockEnabled()
{
return GetKeyState(VK_CAPITAL) == 1;
}
-
-#endif // Q_OS_WIN32
diff --git a/src/platform/capslock_x11.cpp b/src/platform/capslock_x11.cpp
index 877f7d5b..80ca8d36 100644
--- a/src/platform/capslock_x11.cpp
+++ b/src/platform/capslock_x11.cpp
@@ -18,7 +18,6 @@
*/
#include <QtCore/qsystemdetection.h>
-#if defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__)
#include "src/platform/capslock.h"
#include "src/platform/x11_display.h"
#include <X11/XKBlib.h>
@@ -39,6 +38,3 @@ bool Platform::capsLockEnabled()
X11Display::unlock();
return caps_state;
}
-
-
-#endif // defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__)
diff --git a/src/platform/timer_osx.cpp b/src/platform/timer_osx.cpp
index c27f509a..8057397e 100644
--- a/src/platform/timer_osx.cpp
+++ b/src/platform/timer_osx.cpp
@@ -24,7 +24,6 @@
*/
#include <QtCore/qsystemdetection.h>
-#if defined(__APPLE__) && defined(__MACH__)
#include "src/platform/timer.h"
#include <CoreFoundation/CoreFoundation.h>
#include <IOKit/IOKitLib.h>
@@ -50,5 +49,3 @@ uint32_t Platform::getIdleTime()
return idleTime_ns / 1000000;
}
-
-#endif // defined(__APPLE__) && defined(__MACH__)
diff --git a/src/platform/timer_win.cpp b/src/platform/timer_win.cpp
index 3bd0f934..92067caa 100644
--- a/src/platform/timer_win.cpp
+++ b/src/platform/timer_win.cpp
@@ -18,7 +18,6 @@
*/
#include <QtCore/qsystemdetection.h>
-#ifdef Q_OS_WIN32
#include "src/platform/timer.h"
#include <windows.h>
@@ -30,5 +29,3 @@ uint32_t Platform::getIdleTime()
return GetTickCount() - info.dwTime;
return 0;
}
-
-#endif // Q_OS_WIN32
diff --git a/src/platform/timer_x11.cpp b/src/platform/timer_x11.cpp
index 3ae08677..7d5d7306 100644
--- a/src/platform/timer_x11.cpp
+++ b/src/platform/timer_x11.cpp
@@ -16,7 +16,6 @@
*/
#include <QtCore/qsystemdetection.h>
-#if defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__)
#include "src/platform/timer.h"
#include "src/platform/x11_display.h"
#include <QDebug>
@@ -47,5 +46,3 @@ uint32_t Platform::getIdleTime()
X11Display::unlock();
return idleTime;
}
-
-#endif // Q_OS_UNIX
diff --git a/src/platform/x11_display.cpp b/src/platform/x11_display.cpp
index 413a3472..4f39f919 100644
--- a/src/platform/x11_display.cpp
+++ b/src/platform/x11_display.cpp
@@ -18,7 +18,6 @@
*/
#include <QtCore/qsystemdetection.h>
-#if defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__)
#include "src/platform/x11_display.h"
#include <QMutex>
#include <X11/Xlib.h>
@@ -60,5 +59,3 @@ void X11Display::unlock()
X11DisplayPrivate::getSingleInstance().mutex.unlock();
}
}
-
-#endif // Q_OS_UNIX && !defined(__APPLE__) && !defined(__MACH__)
diff --git a/src/platform/x11_display.h b/src/platform/x11_display.h
index 6b0aff00..bdef6d95 100644
--- a/src/platform/x11_display.h
+++ b/src/platform/x11_display.h
@@ -22,8 +22,6 @@
#ifndef PLATFORM_X11_DISPLAY_H
#define PLATFORM_X11_DISPLAY_H
-#if defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__)
-
typedef struct _XDisplay Display;
namespace Platform {
@@ -35,8 +33,6 @@ void unlock();
}
-#endif // Q_OS_UNIX && !defined(__APPLE__) && !defined(__MACH__)
-
#endif // PLATFORM_X11_DISPLAY_H
#endif // QTOX_PLATFORM_EXT
--
2.19.2
0001-chore-cmake-check-for-libatomic-support.patch
0002-chore-cmake-add-missing-CheckLibraryExists-in-CheckA.patch
0003-chore-cmake-let-CMake-choose-which-platform-dependen.patch
no-builtin-font.patch
no-Werror.patch
......@@ -7,6 +7,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_CXXFLAGS_MAINT_APPEND = -Wall -pedantic
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=894476
export QT_RCC_SOURCE_DATE_OVERRIDE = 1
include /usr/share/dpkg/pkg-info.mk
......
Tests: unittest.sh
Depends: @builddeps@
......@@ -4,6 +4,9 @@ set -e
mkdir build
cd build
cmake ..
for i in test_toxpk test_toxid test_textformatter test_toxmedata test_posixsignalnotifier; do
make $i
done
make test
cd ..
rm -rf build
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment