Skip to content
This repository has been archived by the owner on Jan 20, 2021. It is now read-only.

Commit

Permalink
qt-everywhere: initiate package v5.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@SupervisedThinking
SupervisedThinking committed May 2, 2018
1 parent de9f3a7 commit be570c3
Show file tree
Hide file tree
Showing 2 changed files with 243 additions and 0 deletions.
132 changes: 132 additions & 0 deletions packages/addons/addon-depends/qt-everywhere/package.mk
View file
@@ -0,0 +1,132 @@
################################################################################
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2018-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# LibreELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with LibreELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################

PKG_NAME="qt-everywhere"
PKG_VERSION="5.10.1"
PKG_SHA256="05ffba7b811b854ed558abf2be2ddbd3bb6ddd0b60ea4b5da75d277ac15e740a"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://qt-project.org"
PKG_URL="http://download.qt.io/archive/qt/5.10/$PKG_VERSION/single/$PKG_NAME-src-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain pcre2 zlib"
PKG_SOURCE_DIR="$PKG_NAME-src-$PKG_VERSION"
PKG_LONGDESC="A cross-platform application and UI framework"
PKG_AUTORECONF="no"

PKG_CONFIGURE_OPTS_TARGET="-prefix /usr
-sysroot $SYSROOT_PREFIX
-hostprefix $TOOLCHAIN
-device linux-libreelec-g++
-opensource -confirm-license
-release
-static
-make libs
-force-pkg-config
-no-accessibility
-no-sql-sqlite
-no-sql-mysql
-no-qml-debug
-system-zlib
-no-mtdev
-no-gif
-no-libjpeg
-no-harfbuzz
-no-openssl
-no-libproxy
-system-pcre
-no-glib
-silent
-no-cups
-no-iconv
-no-evdev
-no-tslib
-no-icu
-no-strip
-no-fontconfig
-no-dbus
-no-opengl
-no-libudev
-no-libinput
-no-eglfs
-skip qt3d
-skip qtactiveqt
-skip qtandroidextras
-skip qtcanvas3d
-skip qtcharts
-skip qtconnectivity
-skip qtdatavis3d
-skip qtdeclarative
-skip qtdoc
-skip qtgamepad
-skip qtgraphicaleffects
-skip qtimageformats
-skip qtlocation
-skip qtmacextras
-skip qtmultimedia
-skip qtnetworkauth
-skip qtpurchasing
-skip qtquickcontrols
-skip qtquickcontrols2
-skip qtremoteobjects
-skip qtscript
-skip qtscxml
-skip qtsensors
-skip qtserialbus
-skip qtspeech
-skip qtsvg
-skip qttranslations
-skip qtvirtualkeyboard
-skip qtwayland
-skip qtwebchannel
-skip qtwebengine
-skip qtwebsockets
-skip qtwebview
-skip qtwinextras
-skip qtx11extras
-skip qtxmlpatterns"

configure_target() {
QMAKE_CONF_DIR="qtbase/mkspecs/devices/linux-libreelec-g++"
QMAKE_CONF="${QMAKE_CONF_DIR}/qmake.conf"

cd ..
mkdir -p $QMAKE_CONF_DIR
echo "MAKEFILE_GENERATOR = UNIX" > $QMAKE_CONF
echo "CONFIG += incremental" >> $QMAKE_CONF
echo "QMAKE_INCREMENTAL_STYLE = sublib" >> $QMAKE_CONF
echo "include(../../common/linux.conf)" >> $QMAKE_CONF
echo "include(../../common/gcc-base-unix.conf)" >> $QMAKE_CONF
echo "include(../../common/g++-unix.conf)" >> $QMAKE_CONF
echo "load(device_config)" >> $QMAKE_CONF
echo "QMAKE_CC = $CC" >> $QMAKE_CONF
echo "QMAKE_CXX = $CXX" >> $QMAKE_CONF
echo "QMAKE_LINK = $CXX" >> $QMAKE_CONF
echo "QMAKE_LINK_SHLIB = $CXX" >> $QMAKE_CONF
echo "QMAKE_AR = $AR cqs" >> $QMAKE_CONF
echo "QMAKE_OBJCOPY = $OBJCOPY" >> $QMAKE_CONF
echo "QMAKE_NM = $NM -P" >> $QMAKE_CONF
echo "QMAKE_STRIP = $STRIP" >> $QMAKE_CONF
echo "QMAKE_CFLAGS = $CFLAGS" >> $QMAKE_CONF
echo "QMAKE_CXXFLAGS = $CXXFLAGS" >> $QMAKE_CONF
echo "QMAKE_LFLAGS = $LDFLAGS" >> $QMAKE_CONF
echo "load(qt_config)" >> $QMAKE_CONF
echo '#include "../../linux-g++/qplatformdefs.h"' >> $QMAKE_CONF_DIR/qplatformdefs.h

unset CC CXX LD RANLIB AR AS CPPFLAGS CFLAGS LDFLAGS CXXFLAGS
./configure $PKG_CONFIGURE_OPTS_TARGET
}
111 changes: 111 additions & 0 deletions packages/addons/addon-depends/qt-everywhere/patches/qt-everywhere-001-stdlib-error.patch
View file
@@ -0,0 +1,111 @@
From 9f3efa796acb97ea4887468f1e8136e2e0711118 Mon Sep 17 00:00:00 2001
From: Peter Levine <plevine457@gmail.com>
Date: Fri, 13 May 2016 20:04:00 -0400
Subject: [PATCH] Remove -isystem from qmake due to QTBUG-53375

Change-Id: If0595fc2f209a48585e7e9b9a61f11c0d4e0664f
---
mkspecs/common/clang.conf | 1 -
mkspecs/common/gcc-base.conf | 1 -
mkspecs/linux-icc/qmake.conf | 1 -
qmake/generators/unix/unixmake2.cpp | 14 +++-----------
qmake/generators/win32/mingw_make.cpp | 8 +-------
5 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
index ee9c1b8..fbe370e 100644
--- a/qtbase/mkspecs/common/clang.conf
+++ b/qtbase/mkspecs/common/clang.conf
@@ -16,7 +16,6 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX
CONFIG += clang_pch_style
QMAKE_PCH_OUTPUT_EXT = .pch

-QMAKE_CFLAGS_ISYSTEM = -isystem
QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
QMAKE_CFLAGS_LTCG = -flto
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index 6e043f5..df8d314 100644
--- a/qtbase/mkspecs/common/gcc-base.conf
+++ b/qtbase/mkspecs/common/gcc-base.conf
@@ -46,7 +46,6 @@
QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC
QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC
-QMAKE_CFLAGS_ISYSTEM = -isystem
QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index 495fd15..935833b 100644
--- a/qtbase/mkspecs/linux-icc/qmake.conf
+++ b/qtbase/mkspecs/linux-icc/qmake.conf
@@ -21,7 +21,6 @@ QMAKE_CFLAGS_DEBUG = -O0 -g
QMAKE_CFLAGS_SHLIB = -fPIC
QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
QMAKE_CFLAGS_YACC =
-QMAKE_CFLAGS_ISYSTEM = -isystem
QMAKE_CFLAGS_THREAD = -D_REENTRANT
QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections
QMAKE_CFLAGS_LTCG = -ipo -fno-fat-lto-objects
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 9312f19..009a674 100644
--- a/qtbase/qmake/generators/unix/unixmake2.cpp
+++ b/qtbase/qmake/generators/unix/unixmake2.cpp
@@ -176,16 +176,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
t << "INCPATH =";
{
- QString isystem = var("QMAKE_CFLAGS_ISYSTEM");
const ProStringList &incs = project->values("INCLUDEPATH");
for(int i = 0; i < incs.size(); ++i) {
const ProString &inc = incs.at(i);
- if (inc.isEmpty())
- continue;
-
- if (!isystem.isEmpty() && isSystemInclude(inc.toQString()))
- t << ' ' << isystem << ' ';
- else
+ if (!inc.isEmpty())
t << " -I";
t << escapeFilePath(inc);
}
@@ -1328,10 +1322,8 @@ void UnixMakefileGenerator::init2()
}

if (include_deps && project->isActiveConfig("gcc_MD_depends")) {
- // use -MMD if we know about -isystem too
- ProString MD_flag(project->values("QMAKE_CFLAGS_ISYSTEM").isEmpty() ? "-MD" : "-MMD");
- project->values("QMAKE_CFLAGS") += MD_flag;
- project->values("QMAKE_CXXFLAGS") += MD_flag;
+ project->values("QMAKE_CFLAGS") += "-MD";
+ project->values("QMAKE_CXXFLAGS") += "-MD";
}
}

diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 382b10c..c9eebd8 100644
--- a/qtbase/qmake/generators/win32/mingw_make.cpp
+++ b/qtbase/qmake/generators/win32/mingw_make.cpp
@@ -249,17 +249,11 @@ void MingwMakefileGenerator::writeIncPart(QTextStream &t)
{
t << "INCPATH = ";

- QString isystem = var("QMAKE_CFLAGS_ISYSTEM");
const ProStringList &incs = project->values("INCLUDEPATH");
for (ProStringList::ConstIterator incit = incs.begin(); incit != incs.end(); ++incit) {
QString inc = (*incit).toQString();
inc.replace(QRegExp("\\\\$"), "");
-
- if (!isystem.isEmpty() && isSystemInclude(inc))
- t << isystem << ' ';
- else
- t << "-I";
- t << escapeFilePath(inc) << ' ';
+ t << "-I" << escapeFilePath(inc) << ' ';
}
t << endl;
}
--
2.7.4

0 comments on commit be570c3

Please sign in to comment.