Return-Path: Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by mail.openembedded.org (Postfix) with ESMTP id E3F2E607A5 for ; Tue, 26 Apr 2016 16:56:57 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id n3so6765550wmn.1 for ; Tue, 26 Apr 2016 09:56:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3PIkncbgKWtCEl0bXw2/td1DpYHaqdyaGu385WIMzLA=; b=UU3zsTofXCgM9ZqCudH3/Pii3W0Gm/A0CtgLrgGOwJpnXFwIXxSFZqHFS6tehiJWwp vMVVtoHS3hsQmEwUGV9JahPF0p49bP2ClsXiK+gpgzcJSJGnBNK35UpTxnCxNza5J+5/ vRCqqi0R7wdYBQI+RMqAY+RJ5q86jKikEUJEOsDTrjxqMA7qxQC4xU82p5Hw8PbW/0WU XylML/iH3xnkT20ppNo+aOkOTuxKgjI3KS4NPWFx+rhmR7KLQKJUNDUtf9+UGoEMBjqy pE4ZjOYm6qlDfxuoH3COCAldgnd002byxV1BJGi1O6pmW2Mkh7Tymm5Tgp3NIt9e81gJ XsIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3PIkncbgKWtCEl0bXw2/td1DpYHaqdyaGu385WIMzLA=; b=bLhgfb6TVa3xAZQCYxs4UgaYrJAfIeoe7eDCzGsXDmf/Ln3dTaacajqc7xIzEzNIHJ lcL5ErcwxZjqnZKmekKlCqRyM2rwolnskflmfJPFYCBCAT/DPv23PTpr2kO+cyaODLyz LDLW7IDXdqw3FrAXdT8zB+v1Ch3nBBfi+V7VeG9FANwm+MIlCMRpfY3TqY//OY5LukEp 7k0tyz1etWHKXd4YhSvekNP1lFsfvQwstwDoE/USl26cSl1HLqFbYeRN7YTsR3ZmGbRe Iw0wf29/r0oOUZ8CynrLLhJiFwLmMNoObmiDeVgwTlVl/eGnuoUvm/4iq10B2OKxCwCK cwdA== X-Gm-Message-State: AOPr4FVDk4y4A4ZoF3IOLOcMMAUgNqOkELJHVWjOrwxVM3g8L82Rtg2FQbrcC4AT4ebECA== X-Received: by 10.194.133.135 with SMTP id pc7mr4375301wjb.49.1461689816701; Tue, 26 Apr 2016 09:56:56 -0700 (PDT) Received: from localhost (ip-86-49-34-37.net.upcbroadband.cz. [86.49.34.37]) by smtp.gmail.com with ESMTPSA id t206sm4058268wmt.21.2016.04.26.09.56.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Apr 2016 09:56:55 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Date: Tue, 26 Apr 2016 18:57:08 +0200 Message-Id: <1461689830-8750-2-git-send-email-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461689830-8750-1-git-send-email-Martin.Jansa@gmail.com> References: <1461689830-8750-1-git-send-email-Martin.Jansa@gmail.com> Subject: [PATCH][meta-qt5 2/4] qtbase: Remove unsupported options xvideo, xinerama, xinput, gtkstyle X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2016 16:56:59 -0000 * xvideo and xinerama were removed in: commit e824abd987d77efaa085fe1f9fb514d270798d55 Author: Alexander Volkov Date: Tue Oct 13 18:43:25 2015 +0300 configure: Remove unused options -xvideo and -xinerama -xvideo was not used even by Qt 4 for a long time. -xinerama was used by the xlib plugin which was dropped by e6a7a6a381c0b61a93a642b425ecbcd714fd1c29. * xinput was removed in: commit fa8dbbff8895e7e1fdf1e6b0a9f3d821cd2caf2f Author: Alexander Volkov Date: Thu Oct 8 18:19:39 2015 +0300 configure: Remove -xinput option It's obsolete since e6a7a6a381c0b61a93a642b425ecbcd714fd1c29 (Remove xlib plugin) and a2337f79ffd229aa1e91f6bfec6294570eb3fe44 (Remove Windows and X11 from src/widgets/platforms). The actual option is -xinput2. * gtkstyle was removed (partially replaced with gtk) in: commit 899a815414e95da8d9429a4a4f4d7094e49cfc55 Author: Dmitry Shachnev Date: Thu Jul 30 21:32:43 2015 +0300 Remove gtk2 style from qtbase, it will be moved to qtstyleplugins This will allow us to drop gtk2 support from qtbase in future, while still providing the gtk2 style for those who want to use it. Also with moving to qtstyleplugins, the code can be simplified because we can directly link to libraries we need, instead of using QLibrary. [ChangeLog][QtWidgets] Remove QGtkStyle, it is now provided in qtstyleplugins repository. Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 9b61746..201a605 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -36,7 +36,7 @@ RDEPENDS_${PN}-tools += "perl" PACKAGECONFIG_GL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" PACKAGECONFIG_FB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" -PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor glib gtkstyle xkb', '', d)}" +PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xsync xshape xrender xrandr xfixes xinput2 xcursor glib xkb', '', d)}" PACKAGECONFIG_FONTS ?= "" PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" @@ -96,15 +96,12 @@ PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2" PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite" PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3" PACKAGECONFIG[xcursor] = "-xcursor,-no-xcursor,libxcursor" -PACKAGECONFIG[xinerama] = "-xinerama,-no-xinerama,libxinerama" -PACKAGECONFIG[xinput] = "-xinput,-no-xinput" PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,libxi" PACKAGECONFIG[xfixes] = "-xfixes,-no-xfixes,libxfixes" PACKAGECONFIG[xrandr] = "-xrandr,-no-xrandr,libxrandr" PACKAGECONFIG[xrender] = "-xrender,-no-xrender,libxrender" PACKAGECONFIG[xshape] = "-xshape,-no-xshape" PACKAGECONFIG[xsync] = "-xsync,-no-xsync" -PACKAGECONFIG[xvideo] = "-xvideo,-no-xvideo" PACKAGECONFIG[openvg] = "-openvg,-no-openvg" PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon" @@ -113,7 +110,7 @@ PACKAGECONFIG[evdev] = "-evdev,-no-evdev" PACKAGECONFIG[mtdev] = "-mtdev,-no-mtdev,mtdev" # depends on glib PACKAGECONFIG[fontconfig] = "-fontconfig,-no-fontconfig,fontconfig" -PACKAGECONFIG[gtkstyle] = "-gtkstyle,-no-gtkstyle,gtk+" +PACKAGECONFIG[gtk] = "-gtk,-no-gtk,gtk+" PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb" PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm" -- 2.8.1