Control: tag -1 + patch On Sat, 09 Sep 2017 23:09:52 +0200, Lisandro Damián Nicanor Pérez Meyer wrote:
> Source: simplescreenrecorder > Version: 0.3.8-2 > Severity: wishlist > User: debian-qt-...@lists.debian.org > Usertags: qt4-removal > > > Hi! As you might know we the Qt/KDE team are preparing to remove Qt4 > as [announced] in: > [announced] > <https://lists.debian.org/debian-devel-announce/2017/08/msg00006.html> simplescreenrecorder bascially has Qt5 support upstream. With a bit of trial&error I managed to build the package, and the binary also seems to work afterwards :) Find attached my changes - as one diff - as 3 git patches against HEAD of the packaging repo Cheers, gregor -- .''`. https://info.comodo.priv.at -- Debian Developer https://www.debian.org : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06 `. `' Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe `- NP: R.E.M.: All The Way To Reno
From 334dd7c277ea446fb28b18bf45e73a592d0a3a10 Mon Sep 17 00:00:00 2001 From: gregor herrmann <gre...@debian.org> Date: Sat, 25 Nov 2017 05:01:19 +0100 Subject: [PATCH 1/3] debian/control: adjust build dependencies for Qt5. --- debian/control | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index fd2dad7..12598a7 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,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, -- 2.15.0
From b4b285c09df054f8614cb671a7add118a2654b18 Mon Sep 17 00:00:00 2001 From: gregor herrmann <gre...@debian.org> Date: Sat, 25 Nov 2017 05:01:49 +0100 Subject: [PATCH 2/3] debian/rules: update build flags for Qt5. --- debian/rules | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 2914469..60316fc 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,12 @@ include /usr/share/dpkg/default.mk ARCH = $(shell dpkg --print-architecture) +export QT_SELECT=5 +# cf. https://github.com/MaartenBaert/ssr/issues/498 +export QT5_CFLAGS += -fpic +INC = $(shell pkg-config --cflags-only-I Qt5Core Qt5Gui Qt5Widgets Qt5X11Extras) +export QT5_CFLAGS += $(INC) + %: dh $@ --parallel --with autotools-dev @@ -17,12 +23,14 @@ ARCH = $(shell dpkg --print-architecture) override_dh_auto_configure: ifeq ($(ARCH),$(filter $(ARCH),amd64 i386 hurd-i386 kfreebsd-amd64 kfreebsd-i386 x32)) dh_auto_configure -- \ - --disable-assert + --disable-assert \ + --with-qt5 else dh_auto_configure -- \ --disable-x86-asm \ --disable-assert \ - --disable-glinjectlib + --disable-glinjectlib \ + --with-qt5 endif override_dh_auto_install: -- 2.15.0
From cecdc793ba8202533a28c197b682544ea9386c4a Mon Sep 17 00:00:00 2001 From: gregor herrmann <gre...@debian.org> Date: Sat, 25 Nov 2017 05:02:17 +0100 Subject: [PATCH 3/3] Add patch qt5_includes.patch: adjust includes for Qt5 build. --- debian/patches/qt5_includes.patch | 39 +++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 debian/patches/qt5_includes.patch create mode 100644 debian/patches/series diff --git a/debian/patches/qt5_includes.patch b/debian/patches/qt5_includes.patch new file mode 100644 index 0000000..c8c988a --- /dev/null +++ b/debian/patches/qt5_includes.patch @@ -0,0 +1,39 @@ +Description: fix includes for qt5 +Origin: vendor +Author: gregor herrmann <gre...@debian.org> +Last-Update: 2017-11-25 + +--- a/src/Global.h ++++ b/src/Global.h +@@ -22,8 +22,8 @@ + + #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,20 @@ + #include <QStackedLayout> + #include <QVBoxLayout> + ++#include <QDebug> ++#include <QTranslator> ++#include <QLibraryInfo> ++#include <QPainter> ++#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 new file mode 100644 index 0000000..c807aae --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +qt5_includes.patch -- 2.15.0
diff --git a/debian/control b/debian/control index fd2dad7..12598a7 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,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/qt5_includes.patch b/debian/patches/qt5_includes.patch new file mode 100644 index 0000000..c8c988a --- /dev/null +++ b/debian/patches/qt5_includes.patch @@ -0,0 +1,39 @@ +Description: fix includes for qt5 +Origin: vendor +Author: gregor herrmann <gre...@debian.org> +Last-Update: 2017-11-25 + +--- a/src/Global.h ++++ b/src/Global.h +@@ -22,8 +22,8 @@ + + #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,20 @@ + #include <QStackedLayout> + #include <QVBoxLayout> + ++#include <QDebug> ++#include <QTranslator> ++#include <QLibraryInfo> ++#include <QPainter> ++#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 new file mode 100644 index 0000000..c807aae --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +qt5_includes.patch diff --git a/debian/rules b/debian/rules index 2914469..60316fc 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,12 @@ include /usr/share/dpkg/default.mk ARCH = $(shell dpkg --print-architecture) +export QT_SELECT=5 +# cf. https://github.com/MaartenBaert/ssr/issues/498 +export QT5_CFLAGS += -fpic +INC = $(shell pkg-config --cflags-only-I Qt5Core Qt5Gui Qt5Widgets Qt5X11Extras) +export QT5_CFLAGS += $(INC) + %: dh $@ --parallel --with autotools-dev @@ -17,12 +23,14 @@ ARCH = $(shell dpkg --print-architecture) override_dh_auto_configure: ifeq ($(ARCH),$(filter $(ARCH),amd64 i386 hurd-i386 kfreebsd-amd64 kfreebsd-i386 x32)) dh_auto_configure -- \ - --disable-assert + --disable-assert \ + --with-qt5 else dh_auto_configure -- \ --disable-x86-asm \ --disable-assert \ - --disable-glinjectlib + --disable-glinjectlib \ + --with-qt5 endif override_dh_auto_install:
signature.asc
Description: Digital Signature
_______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
