Return-Path: Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mail.openembedded.org (Postfix) with ESMTP id 1FD547F9A6 for ; Thu, 24 Oct 2019 11:11:36 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id r1so15801941wrs.9 for ; Thu, 24 Oct 2019 04:11:38 -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=6gx8u0uMl4d1t0bk6ujXvmBqyoUvbvMC8zgAG4aC/eU=; b=KqfJbr/ljxQwmC3kFkn7e2AfgnBwa0kvvhj8oGfwxTtrGee9bip8AHu69gAy6n9HS5 8g1rVA1aER7ZnilHP8pqzhpRYFyB/Ofr56e41u913Vxe2Snn3hKZXE50qL0OiEGiRgsY NhvCOrzBGzF1lACOo6sj3/EadUYp3O6n9eCzxxLy8TVPjH1sLcVcME64Owg/ncWMVYFX plFAeDl1Y/P93lwXBVucC3FGByK5J6+Tb8jQQFIE480ZYhw8xuXZSVQhL17ZWLb50tyi BVQI3L659uFi0lTwik4HxwnUhrYh9momuoseRl1qowc/zRs34cGoossUUB/sP9D6Tjax seJQ== 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=6gx8u0uMl4d1t0bk6ujXvmBqyoUvbvMC8zgAG4aC/eU=; b=t1nGV6ytqxMQ0MJ2Zw4jVpK79drmRzj5oOKEwGppvnFSpthMx/h3NzdT0qZ851S8b5 znewf0l/x9O/kAqY/+UVmL218eFICY5uawiGupYlr/EpKhpcs860A1hS9XSAGkUgIf9Z 5NwdgX85p7ljD0EhqrOGCAfiW5iZb7CNGeHLNiQC0FALjnCPQsSj8+mQfNsaNJZof3p/ PBaxyJ0Rhf61IrYnwGz7hujoLvI1ZT8sWp48fM3XSQJS7jpvMedyFamG6qgXBObAJKMd JnKTlo4xf6Te56eplth9+mNMMrJXX8x6pOu/dig/OsOwJhYUwCXaSOR6kFr6HzgbDmiO M7hA== X-Gm-Message-State: APjAAAUtw4vaMkcAGoJRqmEDyznRxjPAOCbL6f9LRUIOPCUz4Z9MzOuT 5khFREsuNYvLg7yIG1RLqqoovO6HCN8= X-Google-Smtp-Source: APXvYqz1wLISkNV1ztyz5y4VC8yu8LFYgTJ9cLJIrlzpaj+VTPkfSW7ep5mLlUZZFvZZdhtejNTd2Q== X-Received: by 2002:adf:f10e:: with SMTP id r14mr3396980wro.115.1571915497459; Thu, 24 Oct 2019 04:11:37 -0700 (PDT) Received: from alexander-box.luxoft.com ([62.96.135.139]) by smtp.gmail.com with ESMTPSA id v81sm1073024wmg.4.2019.10.24.04.11.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 04:11:36 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 24 Oct 2019 13:11:26 +0200 Message-Id: <20191024111126.41198-5-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191024111126.41198-1-alex.kanavin@gmail.com> References: <20191024111126.41198-1-alex.kanavin@gmail.com> Subject: [PATCH 5/5] libmodulemd-v1: update to 1.8.16 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, 24 Oct 2019 11:11:37 -0000 Upstream added support for optional docs, so 0001-Do-not-generate-gtkdoc-or-python-bindings.patch is replaced with an option to disable gtk-doc (as the modulemd feature is not used in oe-core anyway). Signed-off-by: Alexander Kanavin --- ...t-generate-gtkdoc-or-python-bindings.patch | 60 ------------------- .../libmodulemd/libmodulemd-v1_git.bb | 7 +-- 2 files changed, 3 insertions(+), 64 deletions(-) delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch b/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch deleted file mode 100644 index d950ad5867e..00000000000 --- a/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 71c51206e037c0bb5759e01b307b7ce1d5934703 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 6 Sep 2019 17:07:00 +0200 -Subject: [PATCH] Do not generate gtkdoc or python bindings - -All of these really need a configuration option. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - meson.build | 12 ------------ - modulemd/meson.build | 8 -------- - 2 files changed, 20 deletions(-) - -diff --git a/meson.build b/meson.build -index 155c9e7..fe35d5e 100644 ---- a/meson.build -+++ b/meson.build -@@ -51,25 +51,13 @@ gnome = import('gnome') - pkg = import('pkgconfig') - gobject = dependency('gobject-2.0') - yaml = dependency('yaml-0.1') --gtkdoc = dependency('gtk-doc') - - glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix') --glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') - - sh = find_program('sh') - sed = find_program('sed') - test = find_program('test') - --ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) --if ret.returncode() != 0 -- error('Missing documentation for GLib.') --endif -- --ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')]) --if ret.returncode() != 0 -- error('Missing documentation for GObject.') --endif -- - python_name = get_option('python_name') - - if python_name != '' -diff --git a/modulemd/meson.build b/modulemd/meson.build -index 9a164b5..349c982 100644 ---- a/modulemd/meson.build -+++ b/modulemd/meson.build -@@ -523,11 +523,3 @@ configure_file( - configuration : xcdata - ) - --gnome.gtkdoc( -- 'modulemd-1.0', -- install_dir: 'modulemd-1.0', -- src_dir : './modulemd', -- main_xml : 'modulemd-docs.xml', -- install : true, --) -- diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb index 9790470f4fe..5409051d79f 100644 --- a/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb +++ b/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb @@ -4,18 +4,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb" SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=1.x-maint \ file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \ - file://0001-Do-not-generate-gtkdoc-or-python-bindings.patch \ " -PV = "1.8.15" -SRCREV = "2d461725f781c6fdcf32893d8dcfa40bcef8dda5" +PV = "1.8.16" +SRCREV = "d0dcf7b373b3cf85cd39eb3bc23d31e06195a75a" UPSTREAM_CHECK_GITTAGREGEX = "libmodulemd-(?P1.*\d)" S = "${WORKDIR}/git" inherit meson gobject-introspection -EXTRA_OEMESON = "-Ddeveloper_build=false" +EXTRA_OEMESON = "-Ddeveloper_build=false -Dwith_docs=false" DEPENDS += "glib-2.0 libyaml glib-2.0-native python3" -- 2.17.1