Return-Path: Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mail.openembedded.org (Postfix) with ESMTP id BCDA27D28A for ; Thu, 18 Apr 2019 15:59:27 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id a184so3310936wma.2 for ; Thu, 18 Apr 2019 08:59:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SadOhMSi037drBNcVbHBw230PmYTB64je4DHA37FHSk=; b=hWkEiAMRhy8oKyZRbyhRZKljvt7c0xdhM2oFrG9w+8csw54g6NRnmTpR+0m19oBFUU IQNJGTQoRR2VHlFTaEzfrEynGUoZYNIwzTkt2wO+BLfpAmMW92ultdQptO4xM5xOtg5Q Dh7LO2j+MTMePaOh5X+LdhVA+5StD2VO1EP8Wu5w9dcx+AM3+7BYENCfFbajtvvZAkwE lJILKkZK7SzkJTu34u88YNoOjjbxGgsJpJvRFFuGbZMdiaiCkLzKXDqfxuzl+wGYvzKr PXT8Qmdoics4xWMvazeiSHvaePUb/XGH+InkqQOonPaiCvwiDP2qSwheW7/1Mt9rlK+N Wvtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SadOhMSi037drBNcVbHBw230PmYTB64je4DHA37FHSk=; b=Jmbw1JMO1T0AeN6k0AoWI9fFqgEGtR0cfzZ0DrvgsDOVEaVcrIStgsg63w24ypOT2N /7Y29IQ2tAQxza44jL3RlQvPpaIdZ9KOHH269eVeH8XGbA18YiT7rdN251UTCuiCrFYj NnMDY8/Z8jiMjURTG+62Bsl/My2IF6p2mmCRw6ZAcFjLJYJaYZ9UFdZAC42bnQRTbefn qgao7X9ewYM7A2c7YwsMegtISrng7UXSG8SzjToZktfFUVgHw6KXMDyYNg/Dz5m/fOir pVOdBT5PtwYtCOqrU/VCRVG4cPtveeYPy+M6LjbC6LlbBwhSB+doQ120gBkZlZWwDylg uZzA== X-Gm-Message-State: APjAAAWmNyY6X+Y3BZrFUaEPutSISKykP2d638iKkT4GcIV53ZNNR1Gf T3jEMutXPblDqS2KY2PuwbYN+8G34vM= X-Google-Smtp-Source: APXvYqysN7f7tqfR3KAnR7bDsKw+TCspeP+pXOeXr+a6ANxxXpYFqBHSfDFcBqL9v6hHCaQSzY/1pQ== X-Received: by 2002:a1c:eb07:: with SMTP id j7mr3583988wmh.138.1555603168172; Thu, 18 Apr 2019 08:59:28 -0700 (PDT) Received: from alexander-box.luxoft.com ([62.96.135.139]) by smtp.gmail.com with ESMTPSA id r196sm1761006wmf.22.2019.04.18.08.59.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 08:59:27 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 18 Apr 2019 17:59:18 +0200 Message-Id: <20190418155918.40653-5-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190418155918.40653-1-alex.kanavin@gmail.com> References: <20190418155918.40653-1-alex.kanavin@gmail.com> Subject: [PATCH 5/5] python3-pygobject: update to 3.32.0 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Apr 2019 15:59:28 -0000 Switch to meson build system. Add a patch to disable tests. Add "introspection" to unknown configure option whitelist, as this recipe needs g-i unconditionally. Signed-off-by: Alexander Kanavin --- .../0001-Do-not-build-tests.patch | 26 +++++++++++++++++++ ..._3.28.3.bb => python3-pygobject_3.32.0.bb} | 10 ++++--- 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch rename meta/recipes-devtools/python/{python3-pygobject_3.28.3.bb => python3-pygobject_3.32.0.bb} (68%) diff --git a/meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch b/meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch new file mode 100644 index 00000000000..626a82cb095 --- /dev/null +++ b/meta/recipes-devtools/python/python3-pygobject/0001-Do-not-build-tests.patch @@ -0,0 +1,26 @@ +From c125a806de951359ab7e302b0584f7c92fa451ad Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 12 Apr 2019 16:25:58 +0200 +Subject: [PATCH] Do not build tests + +They require installing tests from g-i, which we do not do. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index a63d771..b3925d0 100644 +--- a/meson.build ++++ b/meson.build +@@ -174,4 +174,4 @@ configure_file(input : 'PKG-INFO.in', + + subdir('gi') + subdir('pygtkcompat') +-subdir('tests') ++#subdir('tests') +-- +2.17.1 + diff --git a/meta/recipes-devtools/python/python3-pygobject_3.28.3.bb b/meta/recipes-devtools/python/python3-pygobject_3.32.0.bb similarity index 68% rename from meta/recipes-devtools/python/python3-pygobject_3.28.3.bb rename to meta/recipes-devtools/python/python3-pygobject_3.32.0.bb index 313af227b62..c2676b35022 100644 --- a/meta/recipes-devtools/python/python3-pygobject_3.28.3.bb +++ b/meta/recipes-devtools/python/python3-pygobject_3.32.0.bb @@ -3,6 +3,7 @@ SECTION = "devel/python" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" +GNOMEBASEBUILDCLASS = "meson" inherit gnomebase distutils3-base gobject-introspection upstream-version-is-even DEPENDS += "python3 glib-2.0" @@ -10,10 +11,13 @@ DEPENDS += "python3 glib-2.0" SRCNAME="pygobject" SRC_URI = " \ http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ + file://0001-Do-not-build-tests.patch \ " -SRC_URI[md5sum] = "3bac63c86bb963aa401f97859464aa90" -SRC_URI[sha256sum] = "3dd3e21015d06e00482ea665fc1733b77e754a6ab656a5db5d7f7bfaf31ad0b0" +UNKNOWN_CONFIGURE_WHITELIST = "introspection" + +SRC_URI[md5sum] = "6e39bca1d19a27cde4435061dd59578a" +SRC_URI[sha256sum] = "83f4d7e59fde6bc6b0d39c5e5208574802f759bc525a4cb8e7265dfcba45ef29" S = "${WORKDIR}/${SRCNAME}-${PV}" @@ -21,7 +25,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', [ 'directfb', 'wa # python3-pycairo is checked on configuration -> DEPENDS # we don't link against python3-pycairo -> RDEPENDS -PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo python3-pycairo, python3-pycairo" +PACKAGECONFIG[cairo] = "-Dpycairo=true,-Dpycairo=false, cairo python3-pycairo, python3-pycairo" RDEPENDS_${PN} += "python3-setuptools" -- 2.17.1