From nobody Fri Sep 08 15:11:44 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj02B6l5Nz4sQFn; Fri, 8 Sep 2023 15:11:46 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj02B6JQCz3XwB; Fri, 8 Sep 2023 15:11:46 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694185906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8ORAvssARR440V8jO1iWD4bxlAfX21pHBe8kEpBxTPg=; b=HsIb/35DRn8+IU6H5I4Au75PuZ1S1806lgtdHr79AwDsbjr8jQ/MHdFhPg4sdH29gxo+3J RFo4sXbZ+PJUw6PBy5POVuDujETHfgmlGLvdD3LBgvxf4eV+RzyBkkWWfkWaI3IF+NRmju 73rJdxKNzJTy4s4dBSdI9PipeIUFR1Pe3iAM3QDtGpB0gIemHvwneRC1dDgb6Gph9Z009c KqVA3q6H127VzzIXRBiVIBxFkXqhXKkbWFP6XVzKjhCkmDrTf/uD1qcQAYPbnBg24NLi/y 9pxrdTNX46GwwPyztJpH+3ea7ohawGJkw50X7n270G03dGgqxfq/DpS3bQTFoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694185906; a=rsa-sha256; cv=none; b=p1ly6bvaBq/Y31etTlgjb2HaAokxzofmCfFiMv/nMAcz0Ye+z3OiBXNGcUf3N8tXcwN7/b hAVYQjdW4Oxij7tSQ6GzVAVOm4SO2gm8+GtjiG7rLJA9wOrBxMdQrgk1UZvJEg1rTersQJ DfzA83Xh2eWVWAEt5tq9p55KBGyVe8HRZFoPlxTWvKq0CANbYX4MkhXpoLfz3jBUeg+Bpd eJaU6SMGfFr/8Jll3dzBExE242QbihptprbS3SkyHWCQqaNRSnsNVAIVS6gojXKNX09OW0 JR1aqqvUCypHV1c/hDxV0qOTTUH6oAGBadr3/+5jj7dm+UQpDHzGes+NFmxlTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694185906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8ORAvssARR440V8jO1iWD4bxlAfX21pHBe8kEpBxTPg=; b=PDT3waWQOTLnXGu6j+wSNWKulsNDbq4kHEZzS11mZWlUQgyY4G8g5HV7r+2FCB7s3l4rtj fL4Gf5MmYxsHeVU23lKAMkj3dTXdl+UM+RhZPw11V7wObuh8m1UWaNi/w9t53mVTtrvcJ6 tvuaWd+Whngio7cqW+pDJ3vY+6nQpatyGUw9zdct4nq+IkNkA7v1DRZwE+uPf/0qizFmPb cGiOQBkZH110Wv9iRiRW+9udSbBFAdbIqIu70OIDkXsRsHVk+4FHro8hPrfVuVvekHEMID lO8HjctSzh6ddwJy02ljUygCVvI2ueEg1jmhulel6WbXDIUcVBfHXLxvnUGFyg== Received: from [IPV6:2a01:e11:2002:4280::13:1] (unknown [IPv6:2a01:e11:2002:4280::13:1]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: madpilot/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Rj02B1lGGzB8s; Fri, 8 Sep 2023 15:11:46 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Message-ID: Date: Fri, 8 Sep 2023 17:11:44 +0200 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Subject: Re: git: f11ed4160472 - main - devel/libgit2: update to 1.6.4 Content-Language: en-US To: Matthias Fechner , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <202309081035.388AZWKP075486@gitrepo.freebsd.org> <6e61cd7f-fa81-a6e9-f601-996a3a21162b@FreeBSD.org> From: Guido Falsi In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 08/09/23 17:08, Matthias Fechner wrote: > Am 08.09.2023 um 17:06 schrieb Guido Falsi: >> /wrkdirs/usr/ports/devel/libgit2/work/libgit2-1.6.4/src/util/util.c:731:28: error: incompatible function pointer types passing 'int (void *, const void *, const void *)' to parameter of type 'int (*)(const void *, const void *, void *)' [-Wincompatible-function-pointer-types] >>         qsort_s(els, nel, elsize, git__qsort_r_glue_cmp, &glue); >>                                   ^~~~~~~~~~~~~~~~~~~~~ >> /usr/include/stdlib.h:396:11: note: passing argument to parameter here >>     int (*)(const void *, const void *, void *), void *); >>           ^ >> 1 error generated. >> >> >> The commit which added the patch to fix this is here: >> >> https://cgit.freebsd.org/ports/commit/devel/libgit2?id=a62f1b5796b641bb502b33f7f073238a49dc4d0c >> >> >> Looking at upstream it looks like this fix is included there only >> starting from version 1.7.0 (correct me if I'm wrong) >> >> I'll take a look at adding back the patch. > > sry, this was by accident. > I just cherry-picked the commit and will make a test-round if all is > fine and will push the commit after that. > Some testing I'm doing indicates a file has been renamed upstream, src/features.h.in to src/util/git2_features.h.in. Fixing that the patch applies fine. I still have to try to build it though. -- Guido Falsi