[SCM] simplescreenrecorder/master: Use Qt5
jcowgill at users.alioth.debian.org
jcowgill at users.alioth.debian.org
Sun Nov 26 12:24:16 UTC 2017
The following commit has been merged in the master branch:
commit f21361a6546b686106467ffac0493ebe69559674
Author: James Cowgill <jcowgill at debian.org>
Date: Sun Nov 26 11:42:21 2017 +0000
Use Qt5
Thanks: Gregor Herrmann
Closes: #875192
diff --git a/debian/control b/debian/control
index 93ae25d..a424fa5 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,9 @@ Build-Depends:
libjack-dev | libjack-jackd2-dev,
liboss4-salsa-dev [!linux-any],
libpulse-dev,
- libqt4-dev,
+ libqt5x11extras5-dev,
+ qtbase5-dev,
+ qttools5-dev-tools,
libswscale-dev,
libx11-dev,
libxext-dev,
diff --git a/debian/patches/02-qt5_includes.patch b/debian/patches/02-qt5_includes.patch
new file mode 100644
index 0000000..42900c9
--- /dev/null
+++ b/debian/patches/02-qt5_includes.patch
@@ -0,0 +1,39 @@
+Description: fix includes for qt5
+Origin: vendor
+Author: gregor herrmann <gregoa at debian.org>
+Bug-Debian: https://bugs.debian.org/875192
+Last-Update: 2017-11-25
+
+--- a/src/Global.h
++++ b/src/Global.h
+@@ -22,8 +22,8 @@ along with SimpleScreenRecorder. If not
+
+ #include "config.h"
+
+-#include <QtGui>
+-
++// for QT_VERSION*
++#include "qglobal.h"
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+
+ #include <QProcess>
+@@ -59,6 +59,19 @@ along with SimpleScreenRecorder. If not
+ #include <QStackedLayout>
+ #include <QVBoxLayout>
+
++#include <QDebug>
++#include <QTranslator>
++#include <QLibraryInfo>
++#include <QPainter>
++#include <QSettings>
++#include <QSocketNotifier>
++#include <QCloseEvent>
++#include <QMouseEvent>
++
++#else
++
++#include <QtGui>
++
+ #endif
+
+ #include <cassert>
diff --git a/debian/patches/series b/debian/patches/series
index 47d77c1..7168671 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01-private-glinject.patch
+02-qt5_includes.patch
diff --git a/debian/rules b/debian/rules
index b8c8946..cf4c2f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,10 @@
include /usr/share/dpkg/architecture.mk
+export QT_SELECT=5
+# cf. https://github.com/MaartenBaert/ssr/issues/498
+export DEB_CXXFLAGS_MAINT_APPEND := -fPIC
+
%:
dh $@
@@ -15,12 +19,14 @@ override_dh_auto_configure:
ifneq ($(filter $(DEB_HOST_ARCH_CPU), amd64 i386),)
dh_auto_configure -- \
--disable-assert \
- --libdir=/usr/lib/simplescreenrecorder
+ --libdir=/usr/lib/simplescreenrecorder \
+ --with-qt5
else
dh_auto_configure -- \
--disable-x86-asm \
--disable-assert \
- --disable-glinjectlib
+ --disable-glinjectlib \
+ --with-qt5
endif
override_dh_auto_install:
--
simplescreenrecorder packaging
More information about the pkg-multimedia-commits
mailing list