From patchwork Wed May 22 07:02:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3119 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id CA5BB3F9F8 for ; Wed, 22 May 2024 09:03:03 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-57824f3e6absf519085a12.1 for ; Wed, 22 May 2024 00:03:03 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361383; cv=pass; d=google.com; s=arc-20160816; b=qXrplUE8is8PQde3o/SsIvdAUKrqMqgr6aC6w3BnXxJDQA1pnMi5RbVhS1teUETMPu n0cmjMI0aA0ydw4u7zyg8FEzFFTRN8JXxtQ3oI98/egMko3Ysj2DByBsVGflcnESKg7G K//g/23yQFb6Ir4ZuU5Os2pqUx438myalval1/joSvfUJG98mdjFRaH9dvXkgSNi7sDS zQ8pQbM6OEd/VRGcKjB5bno22CjU5oTd0wIkDphz7cLZjM24etb2QI13/j7rQ8J4gFUC gEQKtcyABqWiRX/e/ZAYb+0K5DCtqtrE028lYFfb7Gu+/BpqBaRSKSU8RlopIvavEkH6 MNXw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=yWYDJsC4W5NvbkyGvyxrRkepGZ+QxKCvVafMxup1Pso=; fh=D5NAzZlbUAFjW9wm+oXDpjZwUK7nZOXxnBKT9ubWyNY=; b=NMOwEnjt1QCd1kD6jpSq2WSIDj3ZalNLFm4Oit34QEyQcIvcMIgAf7X9meACWeg9wo qNzhko1tZ4o3yQnZ5XfcYFyGqfWxPbXTDFOFp2nwis26b1pOPvhEYDN2wxlOBOjETvSA 9L44FNChMOLxBzpKXGxwQNjq1V+YrEncuu2+3zfMla4KLbzVTrC1gJwDzAnbbzADWKiF dzlCg002pFUkx/Agxs4rV6v15C1YO2VkbYubztEaZwPX0gAmSMUAHMe44h2XgyVfiLnr x9nIB7hx7s8o75SkfCN5xvGy8gzJJE/rMTLaSpGryuYxkAxCAzE44iBulZ+iGLEONopA ZL4g==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="k6NnWS/c"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361383; x=1716966183; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=yWYDJsC4W5NvbkyGvyxrRkepGZ+QxKCvVafMxup1Pso=; b=r5oBEnSqYip5uYaLPPTOUqYnS1RdNNpmZeoqr15pZmSqjM0Tw0IgSkCsrv+cZn5uX1 chSZ3ExTtzdd+FwsfivYLmdKoihQPbRo0rnbzuoB5LxflLvd8dMRTL6W6QtY6ySa2M0F NSmzp0/sk8u3+5nor1g2UhuptjauSjxed17vY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361383; x=1716966183; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=yWYDJsC4W5NvbkyGvyxrRkepGZ+QxKCvVafMxup1Pso=; b=EoqVe5TFC0XBZTeP6wk8IRbFsKOy4Pl8ADQAIq5yJJDww9FcdlpJXXlLENq/GW6t7s +nKu/9AcMf+4yCb75+Gwl9tnpxegKTrilct4RncGE6PuKCr34GHd19uth8Tdy7sYfgin ORVHsFurWCkBhRFWjota8q6ExL1GMUSOGwlAXHXoF8SmwfazRO0ax/CVFtSun9v4byHY HkYJcGV4IGzMGcav3oZscVlqJXlZiGY3arjtuAeQgOe6T4G1pcVQZzo/xfhf3jnWRp14 wjPlxhInROxyqdA0pskY+cpbv5hc9laY9UpTEdhpOBM8y2hhbRTG1QmOtdQu4nri8vC9 Txzg== X-Forwarded-Encrypted: i=2; AJvYcCW/tQfTomUlX9+B8Ac0NPrbH2MGt/hq8/ucVkcKPLGzArbhQddEqtGU0ZrruKrtv82pEYdFdIo4AFTYzGCsG9YTgMZ/QSmSBbQbzADgx0ZZhwU4o1qX2v7on2n5ow== X-Gm-Message-State: AOJu0YwfsQ8OxsYDOgPaA1ZNNlcoviXggUogS06WbERGiI4AhvaBNjaQ yQnv8fglDnBIzH9eCaHp+oG0Ya2oGGGPlrRvSOaGQUayzjdd6x8yHzw+bD6taoLGOA== X-Google-Smtp-Source: AGHT+IExMIX7MS+AWWAeX1LCnUGH7Srz78b6Xv+rX4Inc3ddAg3CaoZR1tGrCqb2IWEJEhG7nvmLqQ== X-Received: by 2002:a50:bb0e:0:b0:574:f38a:289 with SMTP id 4fb4d7f45d1cf-57831180cd6mr800062a12.20.1716361382880; Wed, 22 May 2024 00:03:02 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:401b:b0:572:3ac4:56ed with SMTP id 4fb4d7f45d1cf-5783170aeafls399599a12.0.-pod-prod-00-eu; Wed, 22 May 2024 00:03:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVvA6etZlRHxKVFE8kt2F9XmYo39E2idzxeT57tSFT1B3Ls4oGjQBfbLO7XW8zbrKpF0XIUS8+aFP6wMCI+kq4v2BVg0MAIQDCf1D7QwNMjNO2n X-Received: by 2002:a50:d54c:0:b0:572:3b3c:754f with SMTP id 4fb4d7f45d1cf-57830ffcf17mr1040568a12.4.1716361381318; Wed, 22 May 2024 00:03:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361381; cv=none; d=google.com; s=arc-20160816; b=IxUi/R0khbzcrQW002psDXnaVXe62gU0RqLfZ6DTauNDGG+IqviPzx+n9xIWWVZi7Y hL9rL7qRwMS6cYFleWpb0GtVKR4zQ2ZBUvG7J6rkjgNpnB18nPgGlzGIeAJpwTA6OHF+ baNYpkgswSEEmKyNedq4HAvSnMxQfoiND7uDvZlKhI7Kh1yohQgUb0aHp9J2boF0YjkW KH0wxOeFIJVnUCHciMJ5tZDoJ3D5vy/kjwpqnwZQ7zAtE2WflSWyQLVyg47r/fFD6dUc afWFXeLEIrXiJE4gKp9VLF4o3ZGnYYjyVyL4Tw3YG4MdAwFwDU2Sj1xIFMRpd4Hwc+VR kXxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=rs0p4Tth8J3OSee/3C0gBi/pc/ucbnya7jKIqqamahw=; fh=A0YAPWOD3lX6nEInbqQjE47xr51aU/Kq+lNOfSVO9bI=; b=bhxn5ii664VFVxewkXuBD7TJnI6GXeJMsa7ni+96or2HlePIXBwI9FL//nIsrZW1zj r1uWB1xScY+Fyu7sBC4zUVK77I3IfmOelCZ6QlzLo8Lc0sF0MkyRSxIUqwYqQDLh7xQr grvJO4VXeZaYGUnD5li8w0UaznYDq/m/0WLF3lg2fL6apfraO+6xICY07WOPjrCrUICg VXWzgr5dkVrZaNNp1rYgJPTKua6C5bepf1/EGG+WnQPLAwqd3Y2HATLdKcCD8oqrKU4i F0tolspzdvYbwX/df15osqFAd8ZaNaAMrMR/wgZct3mXKjxONDIbVFc3HY5icjkkO+8R jQVg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="k6NnWS/c"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-5733bb3c2f9sor11505682a12.4.2024.05.22.00.03.01 for (Google Transport Security); Wed, 22 May 2024 00:03:01 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCWjnyRfkEIKerzpzMFzIfNRkAQbk6Npp0K3jG65mWjQ5KKDZeQr3c2FTwgm9s2sUXtjrwaxPHU8qwxqjHkLB/JzwGk4xHpG/d7LnrDtfpyWZFIV X-Received: by 2002:a50:954e:0:b0:574:f83d:b282 with SMTP id 4fb4d7f45d1cf-5752b3f847cmr10534532a12.2.1716361380413; Wed, 22 May 2024 00:03:00 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:03:00 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 10/18] package/libglib2: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:29 +0200 Message-ID: <20240522070238.3282121-11-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="k6NnWS/c"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- ...dd-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch index fb9905724278..8f87671167f0 100644 --- a/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch +++ b/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch @@ -1,4 +1,4 @@ -From ff3db531608eb0f9de8a88c1bc34fe0f1d93121c Mon Sep 17 00:00:00 2001 +From 03e9cae3f3a7e2bbd5110f1ce2739601571bc024 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 12 Nov 2021 18:01:05 +0100 Subject: [PATCH] meson.build: add girdir to gio-2.0.pc and glib-2.0.pc @@ -14,6 +14,8 @@ Fixes: - http://autobuild.buildroot.org/results/3088ef32b03e0bb984291b1227b187f1ff816eb7 Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Upstream: Never submitted --- gio/meson.build | 1 + @@ -21,22 +23,22 @@ Upstream: Never submitted 2 files changed, 2 insertions(+) diff --git a/gio/meson.build b/gio/meson.build -index 29473d26b..112d4ada9 100644 +index 462606f3b56c..e6b736167b8d 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -841,6 +841,7 @@ pkg.generate(libgio, +@@ -880,6 +880,7 @@ pkg.generate(libgio, variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), + 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'), 'giomoduledir=' + pkgconfig_giomodulesdir, 'gio=' + join_paths('${bindir}', 'gio'), - 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), + 'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'), diff --git a/glib/meson.build b/glib/meson.build -index f78f32969..6c5486699 100644 +index da76fc005e46..cde2edb197c7 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -384,6 +384,7 @@ pkg.generate(libglib, +@@ -441,6 +441,7 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), @@ -45,5 +47,5 @@ index f78f32969..6c5486699 100644 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], -- -2.33.0 +2.43.0