From bcb9c63d071b2adfe9a80493882a39b2fffe72fd Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Sun, 8 Oct 2017 17:06:37 +0300 Subject: Remove outdated Dyson patches --- debian/patches/dyson-pcre-int64_t.patch | 12 ------------ debian/patches/dyson-xcb-needs-lxkbcommon-x11.patch | 12 ------------ debian/patches/series | 2 -- 3 files changed, 26 deletions(-) delete mode 100644 debian/patches/dyson-pcre-int64_t.patch delete mode 100644 debian/patches/dyson-xcb-needs-lxkbcommon-x11.patch diff --git a/debian/patches/dyson-pcre-int64_t.patch b/debian/patches/dyson-pcre-int64_t.patch deleted file mode 100644 index e509e27..0000000 --- a/debian/patches/dyson-pcre-int64_t.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: qtbase/src/3rdparty/pcre/pcre_compile.c -=================================================================== ---- qtbase.orig/src/3rdparty/pcre/pcre_compile.c 2013-08-25 22:03:42.000000000 +0400 -+++ qtbase/src/3rdparty/pcre/pcre_compile.c 2013-09-16 14:19:30.162245857 +0400 -@@ -52,6 +52,7 @@ - - #include "pcre_internal.h" - -+#include - - /* When PCRE_DEBUG is defined, we need the pcre(16|32)_printint() function, which - is also used by pcretest. PCRE_DEBUG is not defined when building a production diff --git a/debian/patches/dyson-xcb-needs-lxkbcommon-x11.patch b/debian/patches/dyson-xcb-needs-lxkbcommon-x11.patch deleted file mode 100644 index a9c17d8..0000000 --- a/debian/patches/dyson-xcb-needs-lxkbcommon-x11.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: qtbase/src/plugins/platforms/xcb/xcb-plugin.pro -=================================================================== ---- qtbase.orig/src/plugins/platforms/xcb/xcb-plugin.pro -+++ qtbase/src/plugins/platforms/xcb/xcb-plugin.pro -@@ -122,6 +122,7 @@ contains(QT_CONFIG, xcb-qt) { - LIBS += -lxcb -L$$OUT_PWD/xcb-static -lxcb-static - } else { - LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms -+ LIBS += -lxkbcommon-x11 - !contains(DEFINES, QT_NO_XKB):LIBS += -lxcb-xkb - } - diff --git a/debian/patches/series b/debian/patches/series index 3c1fce5..270d885 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,6 +13,4 @@ armv4.diff nonlinux_utime.diff # Dyson patches. -dyson-pcre-int64_t.patch dyson-mkspecs.patch -dyson-xcb-needs-lxkbcommon-x11.patch -- cgit v1.2.3