sergiotarxz/termux-packages
sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qt5-base: keep host-build tools, use a separate spec for cross-compilation

Browse Source 
Makes cross-compilation of Qt-enabled programs possible.
This commit is contained in:
Leonid Pliushch 2018-09-21 18:15:40 +03:00 committed by Yaksh Bariya
parent 414d7bb27f
commit 2c97a9b3f5
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
15 changed files with 192 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
x11-packages/qt5-base/build.sh
View File

@ -3,14 +3,16 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
## ##
## TODO: ## TODO:
## ##
## 1. Enable OpenGL. ## 1. Enable OpenGL (causes "incomplete type 'QOpenGLContext'").
## 2. Enable feature 'dnslookup'. ## 2. Enable feature 'dnslookup' (causes 'static_assert' failure).
## 3. Enable additional libraries as subpackages. ## 3. Enable additional libraries as subpackages.
## 4. Use fontconfig (causes failure in configure step).
## ##
TERMUX_PKG_HOMEPAGE=http://qt-project.org/ TERMUX_PKG_HOMEPAGE=http://qt-project.org/
TERMUX_PKG_DESCRIPTION="A cross-platform application and UI framework" TERMUX_PKG_DESCRIPTION="A cross-platform application and UI framework"
TERMUX_PKG_VERSION=5.11.2 TERMUX_PKG_VERSION=5.11.2
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL="http://download.qt.io/official_releases/qt/${TERMUX_PKG_VERSION%.*}/${TERMUX_PKG_VERSION}/single/qt-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" TERMUX_PKG_SRCURL="http://download.qt.io/official_releases/qt/${TERMUX_PKG_VERSION%.*}/${TERMUX_PKG_VERSION}/single/qt-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz"
TERMUX_PKG_SHA256=c6104b840b6caee596fa9a35bc5f57f67ed5a99d6a36497b6fe66f990a53ca81 TERMUX_PKG_SHA256=c6104b840b6caee596fa9a35bc5f57f67ed5a99d6a36497b6fe66f990a53ca81
TERMUX_PKG_DEPENDS="harfbuzz, libandroid-support, libandroid-shmem, libc++, libice, libicu, libjpeg-turbo, libpng, libsm, libuuid, libx11, libxcb, libxi, libxkbcommon, openssl, pcre2, xcb-util-image, xcb-util-keysyms, xcb-util-renderutil, xcb-util-wm" TERMUX_PKG_DEPENDS="harfbuzz, libandroid-support, libandroid-shmem, libc++, libice, libicu, libjpeg-turbo, libpng, libsm, libuuid, libx11, libxcb, libxi, libxkbcommon, openssl, pcre2, xcb-util-image, xcb-util-keysyms, xcb-util-renderutil, xcb-util-wm"
@ -31,6 +33,7 @@ lib/libqt*.prl
TERMUX_PKG_RM_AFTER_INSTALL=" TERMUX_PKG_RM_AFTER_INSTALL="
bin/fixqt4headers.pl bin/fixqt4headers.pl
bin/syncqt.pl bin/syncqt.pl
lib/qt/mkspecs/termux-cross
" "
termux_step_pre_configure () { termux_step_pre_configure () {
@ -40,7 +43,7 @@ termux_step_pre_configure () {
CXXFLAGS="${CXXFLAGS/-mfpu=neon/} -mfpu=vfp" CXXFLAGS="${CXXFLAGS/-mfpu=neon/} -mfpu=vfp"
fi fi
## qmake.conf for cross-compiling ## Create qmake.conf suitable for cross-compiling.
sed \ sed \
-e "s|@TERMUX_CC@|${TERMUX_HOST_PLATFORM}-clang|" \ -e "s|@TERMUX_CC@|${TERMUX_HOST_PLATFORM}-clang|" \
-e "s|@TERMUX_CXX@|${TERMUX_HOST_PLATFORM}-clang++|" \ -e "s|@TERMUX_CXX@|${TERMUX_HOST_PLATFORM}-clang++|" \
@ -52,22 +55,7 @@ termux_step_pre_configure () {
-e "s|@TERMUX_CFLAGS@|${CPPFLAGS} ${CFLAGS}|" \ -e "s|@TERMUX_CFLAGS@|${CPPFLAGS} ${CFLAGS}|" \
-e "s|@TERMUX_CXXFLAGS@|${CPPFLAGS} ${CXXFLAGS}|" \ -e "s|@TERMUX_CXXFLAGS@|${CPPFLAGS} ${CXXFLAGS}|" \
-e "s|@TERMUX_LDFLAGS@|${LDFLAGS}|" \ -e "s|@TERMUX_LDFLAGS@|${LDFLAGS}|" \
"${TERMUX_PKG_BUILDER_DIR}/qmake.conf" > "${TERMUX_PKG_SRCDIR}/qtbase/mkspecs/termux/qmake.conf" "${TERMUX_PKG_BUILDER_DIR}/qmake.conf" > "${TERMUX_PKG_SRCDIR}/qtbase/mkspecs/termux-cross/qmake.conf"
## qmake.conf for target.
## Should be put to correct place in post_install step.
sed \
-e "s|@TERMUX_CC@|clang|" \
-e "s|@TERMUX_CXX@|clang++|" \
-e "s|@TERMUX_AR@|ar|" \
-e "s|@TERMUX_NM@|nm|" \
-e "s|@TERMUX_OBJCOPY@|objcopy|" \
-e "s|@TERMUX_PKGCONFIG@|pkg-config|" \
-e "s|@TERMUX_STRIP@|strip|" \
-e "s|@TERMUX_CFLAGS@|${CPPFLAGS} ${CFLAGS}|" \
-e "s|@TERMUX_CXXFLAGS@|${CPPFLAGS} ${CXXFLAGS}|" \
-e "s|@TERMUX_LDFLAGS@|${LDFLAGS}|" \
"${TERMUX_PKG_BUILDER_DIR}/qmake.conf" > "/tmp/target-qmake.conf"
} }
termux_step_configure () { termux_step_configure () {
@ -78,7 +66,7 @@ termux_step_configure () {
-opensource \ -opensource \
-confirm-license \ -confirm-license \
-release \ -release \
-xplatform termux \ -xplatform termux-cross \
-optimized-qmake \ -optimized-qmake \
-no-rpath \ -no-rpath \
-no-use-gold-linker \ -no-use-gold-linker \
@ -174,11 +162,18 @@ termux_step_make() {
termux_step_make_install() { termux_step_make_install() {
make install make install
cd "${TERMUX_PKG_SRCDIR}/qtbase" && {
## Save host-compiled Qt dev tools for later
## use (e.g. cross-compiling Qt application).
cp -a bin bin.host
cd -
}
cd "${TERMUX_PKG_SRCDIR}/qtbase/src/tools/bootstrap" && { cd "${TERMUX_PKG_SRCDIR}/qtbase/src/tools/bootstrap" && {
make clean make clean
"${TERMUX_PKG_SRCDIR}/qtbase/bin/qmake" \ "${TERMUX_PKG_SRCDIR}/qtbase/bin/qmake" \
-spec "${TERMUX_PKG_SRCDIR}/qtbase/mkspecs/termux" -spec "${TERMUX_PKG_SRCDIR}/qtbase/mkspecs/termux-cross"
make -j "${TERMUX_MAKE_PROCESSES}" make -j "${TERMUX_MAKE_PROCESSES}"
} }
@ -188,7 +183,7 @@ termux_step_make_install() {
make clean make clean
"${TERMUX_PKG_SRCDIR}/qtbase/bin/qmake" \ "${TERMUX_PKG_SRCDIR}/qtbase/bin/qmake" \
-spec "${TERMUX_PKG_SRCDIR}/qtbase/mkspecs/termux" -spec "${TERMUX_PKG_SRCDIR}/qtbase/mkspecs/termux-cross"
## Ensure that no '-lpthread' specified in makefile. ## Ensure that no '-lpthread' specified in makefile.
sed \ sed \
@ -209,12 +204,6 @@ termux_step_make_install() {
done done
unset i unset i
## Install 'qmake.conf' that usable on target (Termux).
install \
-Dm600 \
"/tmp/target-qmake.conf" \
"${TERMUX_PREFIX}/lib/qt/mkspecs/termux/qmake.conf"
## Install target-prebuilt 'qmake' tool. ## Install target-prebuilt 'qmake' tool.
cd "${TERMUX_PKG_SRCDIR}" && { cd "${TERMUX_PKG_SRCDIR}" && {
tar xf "${TERMUX_PKG_BUILDER_DIR}/termux-prebuilt-qmake.txz" tar xf "${TERMUX_PKG_BUILDER_DIR}/termux-prebuilt-qmake.txz"
@ -226,10 +215,26 @@ termux_step_make_install() {
# Drop QMAKE_PRL_BUILD_DIR because reference the build dir. # Drop QMAKE_PRL_BUILD_DIR because reference the build dir.
find "${TERMUX_PREFIX}/lib" -type f -name '*.prl' \ find "${TERMUX_PREFIX}/lib" -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' "{}" \; -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' "{}" \;
cd "${TERMUX_PKG_SRCDIR}/qtbase" && {
## Restore host-compiled Qt dev tools.
rm -rf bin
mv bin.host bin
cd -
}
} }
termux_step_create_debscripts() { termux_step_create_debscripts() {
## FIXME: Qt should be built with fontconfig somehow instead ## FIXME: Qt should be built with fontconfig somehow instead
## of using direct path to fonts. ## of using direct path to fonts.
## Currently, using post-installation script to create symlink
## from /system/bin/fonts to $PREFIX/lib/fonts if possible.
cp -f "${TERMUX_PKG_BUILDER_DIR}/postinst" ./ cp -f "${TERMUX_PKG_BUILDER_DIR}/postinst" ./
} }
## The following is required for building packages that require
## Qt dev tools (qmake).
if [ "${#}" -eq 1 ] && [ "${1}" == "qt_cross_config" ]; then
echo "QMAKE=${TERMUX_TOPDIR}/qt5-base/src/qtbase/bin/qmake"
echo "QMAKESPEC=${TERMUX_PREFIX}/lib/qt/mkspecs/termux-cross"
fi

8
x11-packages/qt5-base/qt-everywhere-src-5.11.1_qtbase_mkspecs_termux_qplatformdefs.h.patch
View File

@ -1,8 +0,0 @@
diff -uNr qt-everywhere-src-5.11.1/qtbase/mkspecs/termux/qplatformdefs.h qt-everywhere-src-5.11.1.mod/qtbase/mkspecs/termux/qplatformdefs.h
--- qt-everywhere-src-5.11.1/qtbase/mkspecs/termux/qplatformdefs.h 1970-01-01 03:00:00.000000000 +0300
+++ qt-everywhere-src-5.11.1.mod/qtbase/mkspecs/termux/qplatformdefs.h 2018-09-20 03:22:39.659797353 +0300
@@ -0,0 +1,4 @@
+#include "../android-clang/qplatformdefs.h"
+#define fseeko64 fseeko
+#define ftello64 ftello
+#define fopen64 fopen

11
x11-packages/qt5-base/qt-everywhere-src-5.11.1_qtsensors_src_plugins_sensors_linux_linux.pro.patch
View File

@ -1,11 +0,0 @@
diff -uNr qt-everywhere-src-5.11.1/qtsensors/src/plugins/sensors/linux/linux.pro qt-everywhere-src-5.11.1.mod/qtsensors/src/plugins/sensors/linux/linux.pro
--- qt-everywhere-src-5.11.1/qtsensors/src/plugins/sensors/linux/linux.pro 2018-06-12 12:10:20.000000000 +0300
+++ qt-everywhere-src-5.11.1.mod/qtsensors/src/plugins/sensors/linux/linux.pro 2018-09-20 03:22:39.666464086 +0300
@@ -3,7 +3,6 @@
OTHER_FILES = plugin.json
-!android:LIBS += -lrt
HEADERS += linuxsysaccelerometer.h
SOURCES += linuxsysaccelerometer.cpp \
main.cpp

12
x11-packages/qt5-base/qt-everywhere-src-5.11.1_qtserialport_src_serialport_qserialport_unix.cpp.patch
View File

@ -1,12 +0,0 @@
diff -uNr qt-everywhere-src-5.11.1/qtserialport/src/serialport/qserialport_unix.cpp qt-everywhere-src-5.11.1.mod/qtserialport/src/serialport/qserialport_unix.cpp
--- qt-everywhere-src-5.11.1/qtserialport/src/serialport/qserialport_unix.cpp 2018-06-09 14:09:14.000000000 +0300
+++ qt-everywhere-src-5.11.1.mod/qtserialport/src/serialport/qserialport_unix.cpp 2018-09-20 03:22:39.666464086 +0300
@@ -73,7 +73,7 @@
# define __ANDROID_API__ 21
# endif
-# if !defined(Q_OS_ANDROID) || (!defined(Q_PROCESSOR_X86) && __ANDROID_API__ < 21)
+# if 0
struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */

8
x11-packages/qt5-base/qt-everywhere-src-5.11.2_qtbase_mkspecs_termux-cross_qplatformdefs.h.patch Normal file
View File

@ -0,0 +1,8 @@
diff -uNr qt-everywhere-src-5.11.2/qtbase/mkspecs/termux-cross/qplatformdefs.h qt-everywhere-src-5.11.2.mod/qtbase/mkspecs/termux-cross/qplatformdefs.h
--- qt-everywhere-src-5.11.2/qtbase/mkspecs/termux-cross/qplatformdefs.h 1970-01-01 03:00:00.000000000 +0300
+++ qt-everywhere-src-5.11.2.mod/qtbase/mkspecs/termux-cross/qplatformdefs.h 2018-09-21 16:25:01.055329471 +0300
@@ -0,0 +1,4 @@
+#include "../android-clang/qplatformdefs.h"
+#define fseeko64 fseeko
+#define ftello64 ftello
+#define fopen64 fopen

35
x11-packages/qt5-base/qt-everywhere-src-5.11.2_qtbase_mkspecs_termux_qmake.conf.patch Normal file
View File

@ -0,0 +1,35 @@
diff -uNr qt-everywhere-src-5.11.2/qtbase/mkspecs/termux/qmake.conf qt-everywhere-src-5.11.2.mod/qtbase/mkspecs/termux/qmake.conf
--- qt-everywhere-src-5.11.2/qtbase/mkspecs/termux/qmake.conf 1970-01-01 03:00:00.000000000 +0300
+++ qt-everywhere-src-5.11.2.mod/qtbase/mkspecs/termux/qmake.conf 2018-09-21 16:26:18.042253449 +0300
@@ -0,0 +1,31 @@
+QT_QPA_DEFAULT_PLATFORM = xcb
+
+MAKEFILE_GENERATOR = UNIX
+CONFIG += incremental
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(../common/linux.conf)
+include(../common/gcc-base-unix.conf)
+include(../common/clang.conf)
+
+QMAKE_CC = clang
+QMAKE_CXX = clang++
+QMAKE_LINK = $${QMAKE_CXX}
+QMAKE_LINK_SHLIB = $${QMAKE_CXX}
+QMAKE_AR = ar cqs
+QMAKE_NM = nm -P
+QMAKE_OBJCOPY = objcopy
+QMAKE_PKG_CONFIG = pkg-config
+QMAKE_STRIP = strip
+
+QMAKE_CFLAGS += -I/data/data/com.termux/files/usr/include -isystem /data/data/com.termux/files/usr/include/libandroid-support -Oz
+QMAKE_CXXFLAGS += -I/data/data/com.termux/files/usr/include -isystem /data/data/com.termux/files/usr/include/libandroid-support -Oz
+QMAKE_LFLAGS += -L/data/data/com.termux/files/usr/lib -landroid-support
+QMAKE_LFLAGS_SHLIB += -shared
+QMAKE_LFLAGS_PLUGIN += -shared
+
+## Should be -lpthread, but Termux does not provide
+## libpthread.so library.
+QMAKE_LIBS_THREAD =
+
+load(qt_config)

8
x11-packages/qt5-base/qt-everywhere-src-5.11.2_qtbase_mkspecs_termux_qplatformdefs.h.patch Normal file
View File

@ -0,0 +1,8 @@
diff -uNr qt-everywhere-src-5.11.2/qtbase/mkspecs/termux/qplatformdefs.h qt-everywhere-src-5.11.2.mod/qtbase/mkspecs/termux/qplatformdefs.h
--- qt-everywhere-src-5.11.2/qtbase/mkspecs/termux/qplatformdefs.h 1970-01-01 03:00:00.000000000 +0300
+++ qt-everywhere-src-5.11.2.mod/qtbase/mkspecs/termux/qplatformdefs.h 2018-09-21 16:25:01.055329471 +0300
@@ -0,0 +1,4 @@
+#include "../android-clang/qplatformdefs.h"
+#define fseeko64 fseeko
+#define ftello64 ftello
+#define fopen64 fopen

6
x11-packages/qt5-base/qt-everywhere-src-5.11.1_qtbase_src_corelib_global_qsystemdetection.h.patch → x11-packages/qt5-base/qt-everywhere-src-5.11.2_qtbase_src_corelib_global_qsystemdetection.h.patch
View File

@ -1,6 +1,6 @@
diff -uNr qt-everywhere-src-5.11.1/qtbase/src/corelib/global/qsystemdetection.h qt-everywhere-src-5.11.1.mod/qtbase/src/corelib/global/qsystemdetection.h diff -uNr qt-everywhere-src-5.11.2/qtbase/src/corelib/global/qsystemdetection.h qt-everywhere-src-5.11.2.mod/qtbase/src/corelib/global/qsystemdetection.h
--- qt-everywhere-src-5.11.1/qtbase/src/corelib/global/qsystemdetection.h 2018-06-15 10:29:31.000000000 +0300 --- qt-everywhere-src-5.11.2/qtbase/src/corelib/global/qsystemdetection.h 2018-09-13 07:25:10.000000000 +0300
+++ qt-everywhere-src-5.11.1.mod/qtbase/src/corelib/global/qsystemdetection.h 2018-09-20 03:22:39.659797353 +0300 +++ qt-everywhere-src-5.11.2.mod/qtbase/src/corelib/global/qsystemdetection.h 2018-09-21 16:25:01.055329471 +0300
@@ -108,9 +108,6 @@ @@ -108,9 +108,6 @@
# else # else
# error "Qt has not been ported to this Apple platform - see http://www.qt.io/developers" # error "Qt has not been ported to this Apple platform - see http://www.qt.io/developers"

8
x11-packages/qt5-base/qt-everywhere-src-5.11.1_qtbase_src_corelib_io_qfilesystemengine_unix.cpp.patch → x11-packages/qt5-base/qt-everywhere-src-5.11.2_qtbase_src_corelib_io_qfilesystemengine_unix.cpp.patch
View File

@ -1,7 +1,7 @@
diff -uNr qt-everywhere-src-5.11.1/qtbase/src/corelib/io/qfilesystemengine_unix.cpp qt-everywhere-src-5.11.1.mod/qtbase/src/corelib/io/qfilesystemengine_unix.cpp diff -uNr qt-everywhere-src-5.11.2/qtbase/src/corelib/io/qfilesystemengine_unix.cpp qt-everywhere-src-5.11.2.mod/qtbase/src/corelib/io/qfilesystemengine_unix.cpp
--- qt-everywhere-src-5.11.1/qtbase/src/corelib/io/qfilesystemengine_unix.cpp 2018-06-15 10:29:31.000000000 +0300 --- qt-everywhere-src-5.11.2/qtbase/src/corelib/io/qfilesystemengine_unix.cpp 2018-09-13 07:25:10.000000000 +0300
+++ qt-everywhere-src-5.11.1.mod/qtbase/src/corelib/io/qfilesystemengine_unix.cpp 2018-09-20 03:22:39.663130719 +0300 +++ qt-everywhere-src-5.11.2.mod/qtbase/src/corelib/io/qfilesystemengine_unix.cpp 2018-09-21 16:25:01.058662816 +0300
@@ -98,7 +98,7 @@ @@ -97,7 +97,7 @@
# define FICLONE _IOW(0x94, 9, int) # define FICLONE _IOW(0x94, 9, int)
#endif #endif

6
x11-packages/qt5-base/qt-everywhere-src-5.11.1_qtbase_src_corelib_thread_qthread_unix.cpp.patch → x11-packages/qt5-base/qt-everywhere-src-5.11.2_qtbase_src_corelib_thread_qthread_unix.cpp.patch
View File

@ -1,6 +1,6 @@
diff -uNr qt-everywhere-src-5.11.1/qtbase/src/corelib/thread/qthread_unix.cpp qt-everywhere-src-5.11.1.mod/qtbase/src/corelib/thread/qthread_unix.cpp diff -uNr qt-everywhere-src-5.11.2/qtbase/src/corelib/thread/qthread_unix.cpp qt-everywhere-src-5.11.2.mod/qtbase/src/corelib/thread/qthread_unix.cpp
--- qt-everywhere-src-5.11.1/qtbase/src/corelib/thread/qthread_unix.cpp 2018-06-15 10:29:31.000000000 +0300 --- qt-everywhere-src-5.11.2/qtbase/src/corelib/thread/qthread_unix.cpp 2018-09-13 07:25:10.000000000 +0300
+++ qt-everywhere-src-5.11.1.mod/qtbase/src/corelib/thread/qthread_unix.cpp 2018-09-20 03:22:39.663130719 +0300 +++ qt-everywhere-src-5.11.2.mod/qtbase/src/corelib/thread/qthread_unix.cpp 2018-09-21 16:25:01.058662816 +0300
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
# define SCHED_IDLE 5 # define SCHED_IDLE 5
#endif #endif

69
x11-packages/qt5-base/qt-everywhere-src-5.11.2_qtbase_src_network_kernel_qdnslookup_unix.cpp.patch Normal file
View File

@ -0,0 +1,69 @@
diff -uNr qt-everywhere-src-5.11.2/qtbase/src/network/kernel/qdnslookup_unix.cpp qt-everywhere-src-5.11.2.mod/qtbase/src/network/kernel/qdnslookup_unix.cpp
--- qt-everywhere-src-5.11.2/qtbase/src/network/kernel/qdnslookup_unix.cpp 2018-09-13 07:25:10.000000000 +0300
+++ qt-everywhere-src-5.11.2.mod/qtbase/src/network/kernel/qdnslookup_unix.cpp 2018-09-21 16:25:01.061996160 +0300
@@ -65,9 +65,63 @@
#if QT_CONFIG(library)
-#if defined(Q_OS_OPENBSD)
-typedef struct __res_state* res_state;
+#include <sys/types.h>
+#include <linux/in.h>
+
+/* res_state: the global state used by the resolver stub. */
+#define MAXNS 3 /* max # name servers we'll track */
+#define MAXDFLSRCH 3 /* # default domain levels to try */
+#define MAXDNSRCH 6 /* max # domains in search path */
+#define MAXRESOLVSORT 10 /* number of net to sort on */
+
+struct __res_state {
+ int retrans; /* retransmition time interval */
+ int retry; /* number of times to retransmit */
+ unsigned long options; /* option flags - see below. */
+ int nscount; /* number of name servers */
+ struct sockaddr_in
+ nsaddr_list[MAXNS]; /* address of name server */
+ unsigned short id; /* current message id */
+ /* 2 byte hole here. */
+ char *dnsrch[MAXDNSRCH+1]; /* components of domain to search */
+ char defdname[256]; /* default domain (deprecated) */
+ unsigned long pfcode; /* RES_PRF_ flags - see below. */
+ unsigned ndots:4; /* threshold for initial abs. query */
+ unsigned nsort:4; /* number of elements in sort_list[] */
+ unsigned ipv6_unavail:1; /* connecting to IPv6 server failed */
+ unsigned unused:23;
+ struct {
+ struct in_addr addr;
+ uint32_t mask;
+ } sort_list[MAXRESOLVSORT];
+ /* 4 byte hole here on 64-bit architectures. */
+ void * __glibc_unused_qhook;
+ void * __glibc_unused_rhook;
+ int res_h_errno; /* last one set for this context */
+ int _vcsock; /* PRIVATE: for res_send VC i/o */
+ unsigned int _flags; /* PRIVATE: see below */
+ /* 4 byte hole here on 64-bit architectures. */
+ union {
+ char pad[52]; /* On an i386 this means 512b total. */
+ struct {
+ uint16_t nscount;
+ uint16_t nsmap[MAXNS];
+ int nssocks[MAXNS];
+ uint16_t nscount6;
+ uint16_t nsinit;
+ struct sockaddr_in6 *nsaddrs[MAXNS];
+#ifdef _LIBC
+ unsigned long long int __glibc_extension_index
+ __attribute__((packed));
+#else
+ unsigned int __glibc_reserved[2];
#endif
+ } _ext;
+ } _u;
+};
+
+typedef struct __res_state* res_state;
+
typedef int (*dn_expand_proto)(const unsigned char *, const unsigned char *, const unsigned char *, char *, int);
static dn_expand_proto local_dn_expand = 0;
typedef void (*res_nclose_proto)(res_state);

6
x11-packages/qt5-base/qt-everywhere-src-5.11.1_qtbase_src_network_kernel_qhostinfo_unix.cpp.patch → x11-packages/qt5-base/qt-everywhere-src-5.11.2_qtbase_src_network_kernel_qhostinfo_unix.cpp.patch
View File

@ -1,6 +1,6 @@
diff -uNr qt-everywhere-src-5.11.1/qtbase/src/network/kernel/qhostinfo_unix.cpp qt-everywhere-src-5.11.1.mod/qtbase/src/network/kernel/qhostinfo_unix.cpp diff -uNr qt-everywhere-src-5.11.2/qtbase/src/network/kernel/qhostinfo_unix.cpp qt-everywhere-src-5.11.2.mod/qtbase/src/network/kernel/qhostinfo_unix.cpp
--- qt-everywhere-src-5.11.1/qtbase/src/network/kernel/qhostinfo_unix.cpp 2018-06-15 10:29:31.000000000 +0300 --- qt-everywhere-src-5.11.2/qtbase/src/network/kernel/qhostinfo_unix.cpp 2018-09-13 07:25:10.000000000 +0300
+++ qt-everywhere-src-5.11.1.mod/qtbase/src/network/kernel/qhostinfo_unix.cpp 2018-09-20 03:22:39.663130719 +0300 +++ qt-everywhere-src-5.11.2.mod/qtbase/src/network/kernel/qhostinfo_unix.cpp 2018-09-21 16:25:01.061996160 +0300
@@ -84,6 +84,61 @@ @@ -84,6 +84,61 @@
NeedResNInit NeedResNInit
}; };

6
x11-packages/qt5-base/qt-everywhere-src-5.11.1_qtlocation_src_plugins_geoservices_geoservices.pro.patch → x11-packages/qt5-base/qt-everywhere-src-5.11.2_qtlocation_src_plugins_geoservices_geoservices.pro.patch
View File

@ -1,6 +1,6 @@
diff -uNr qt-everywhere-src-5.11.1/qtlocation/src/plugins/geoservices/geoservices.pro qt-everywhere-src-5.11.1.mod/qtlocation/src/plugins/geoservices/geoservices.pro diff -uNr qt-everywhere-src-5.11.2/qtlocation/src/plugins/geoservices/geoservices.pro qt-everywhere-src-5.11.2.mod/qtlocation/src/plugins/geoservices/geoservices.pro
--- qt-everywhere-src-5.11.1/qtlocation/src/plugins/geoservices/geoservices.pro 2018-06-12 21:44:12.000000000 +0300 --- qt-everywhere-src-5.11.2/qtlocation/src/plugins/geoservices/geoservices.pro 2018-08-31 15:50:06.000000000 +0300
+++ qt-everywhere-src-5.11.1.mod/qtlocation/src/plugins/geoservices/geoservices.pro 2018-09-20 03:22:39.666464086 +0300 +++ qt-everywhere-src-5.11.2.mod/qtlocation/src/plugins/geoservices/geoservices.pro 2018-09-21 16:25:01.061996160 +0300
@@ -8,11 +8,3 @@ @@ -8,11 +8,3 @@
qtConfig(geoservices_itemsoverlay): SUBDIRS += itemsoverlay qtConfig(geoservices_itemsoverlay): SUBDIRS += itemsoverlay
qtConfig(geoservices_osm): SUBDIRS += osm qtConfig(geoservices_osm): SUBDIRS += osm

11
x11-packages/qt5-base/qt-everywhere-src-5.11.2_qtsensors_src_plugins_sensors_linux_linux.pro.patch Normal file
View File

@ -0,0 +1,11 @@
diff -uNr qt-everywhere-src-5.11.2/qtsensors/src/plugins/sensors/linux/linux.pro qt-everywhere-src-5.11.2.mod/qtsensors/src/plugins/sensors/linux/linux.pro
--- qt-everywhere-src-5.11.2/qtsensors/src/plugins/sensors/linux/linux.pro 2018-08-28 16:10:03.000000000 +0300
+++ qt-everywhere-src-5.11.2.mod/qtsensors/src/plugins/sensors/linux/linux.pro 2018-09-21 16:25:01.061996160 +0300
@@ -3,7 +3,6 @@
OTHER_FILES = plugin.json
-!android:LIBS += -lrt
HEADERS += linuxsysaccelerometer.h
SOURCES += linuxsysaccelerometer.cpp \
main.cpp

12
x11-packages/qt5-base/qt-everywhere-src-5.11.2_qtserialport_src_serialport_qserialport_unix.cpp.patch Normal file
View File

@ -0,0 +1,12 @@
diff -uNr qt-everywhere-src-5.11.2/qtserialport/src/serialport/qserialport_unix.cpp qt-everywhere-src-5.11.2.mod/qtserialport/src/serialport/qserialport_unix.cpp
--- qt-everywhere-src-5.11.2/qtserialport/src/serialport/qserialport_unix.cpp 2018-08-29 13:18:41.000000000 +0300
+++ qt-everywhere-src-5.11.2.mod/qtserialport/src/serialport/qserialport_unix.cpp 2018-09-21 16:25:01.061996160 +0300
@@ -73,7 +73,7 @@
# define __ANDROID_API__ 21
# endif
-# if !defined(Q_OS_ANDROID) || (!defined(Q_PROCESSOR_X86) && __ANDROID_API__ < 21)
+# if 0
struct termios2 {
tcflag_t c_iflag; /* input mode flags */
tcflag_t c_oflag; /* output mode flags */