From owner-svn-ports-head@freebsd.org Wed Sep 23 15:37:38 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C12F63FD1D1; Wed, 23 Sep 2020 15:37:38 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BxMkV4pXDz3W0d; Wed, 23 Sep 2020 15:37:38 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 89C0E12B4A; Wed, 23 Sep 2020 15:37:38 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08NFbctS098140; Wed, 23 Sep 2020 15:37:38 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08NFbc5w098139; Wed, 23 Sep 2020 15:37:38 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202009231537.08NFbc5w098139@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 23 Sep 2020 15:37:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549742 - head/devel/glib20/files X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/devel/glib20/files X-SVN-Commit-Revision: 549742 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Sep 2020 15:37:38 -0000 Author: bapt Date: Wed Sep 23 15:37:37 2020 New Revision: 549742 URL: https://svnweb.freebsd.org/changeset/ports/549742 Log: Fix bad patch Modified: head/devel/glib20/files/patch-glib_gfileutils.c Modified: head/devel/glib20/files/patch-glib_gfileutils.c ============================================================================== --- head/devel/glib20/files/patch-glib_gfileutils.c Wed Sep 23 15:35:28 2020 (r549741) +++ head/devel/glib20/files/patch-glib_gfileutils.c Wed Sep 23 15:37:37 2020 (r549742) @@ -12,31 +12,3 @@ Index: glib/gfileutils.c { int errno_save = errno; if (errno != ENOENT || !p) -https://gitlab.gnome.org/GNOME/glib/merge_requests/832 - -Index: glib/gfileutils.c ---- glib/gfileutils.c.orig -+++ glib/gfileutils.c -@@ -259,7 +259,7 @@ g_mkdir_with_parents (const gchar *pathname, - - if (!g_file_test (fn, G_FILE_TEST_EXISTS)) - { -- if (g_mkdir (fn, mode) == -1 && errno != EEXIST) -+ if (g_mkdir (fn, mode) == -1 && errno != EEXIST && (p ? (errno != ENOENT) : (-1))) - { - int errno_save = errno; - if (errno != ENOENT || !p) -https://gitlab.gnome.org/GNOME/glib/merge_requests/832 - -Index: glib/gfileutils.c ---- glib/gfileutils.c.orig -+++ glib/gfileutils.c -@@ -259,7 +259,7 @@ g_mkdir_with_parents (const gchar *pathname, - - if (!g_file_test (fn, G_FILE_TEST_EXISTS)) - { -- if (g_mkdir (fn, mode) == -1 && errno != EEXIST) -+ if (g_mkdir (fn, mode) == -1 && errno != EEXIST && (p ? (errno != ENOENT) : (-1))) - { - int errno_save = errno; - if (errno != ENOENT || !p)