From owner-svn-ports-head@freebsd.org Wed Feb 24 07:24:08 2021 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 40753552B95; Wed, 24 Feb 2021 07:24:08 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DlnV01L0mz4WgV; Wed, 24 Feb 2021 07:24:07 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: by mail-lj1-f173.google.com with SMTP id u4so1275407lja.3; Tue, 23 Feb 2021 23:24:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=jbgwMI+pYL6jAQunha2XKEpI/LgFkJ+4H7AunZEdn2s=; b=lYRCzy86Yflqs0SuftgltFS62YprUMNWjDqBjcw41TjZihFJvFFeTQWXunU+6h4KCy kDIrIVH58U8cieOKRG9p5nAUsa0ZdeguDkeZ9fRaeKo/rnUfkBCMZHM4Fpc6sdpoS/3+ A5ZrgH630JreWG4h03RpGUTuo6vsZ8z75Mo6EG6c2WVy0qPxWXrD/iJx3cN1b6+Vy8kx IQTptHAh/Gh5KktJGGCUjD78dZ9zQ/QLLZFiX6kRtS69IhLrZrKI4xQeN19hpyFFrVre 0A5agx3PDQ3rLuLe3olQNJi6OpXsevEGixlFRHsO7Wol8Ss3hRxXdQngMzwBOGVlJRFq zhNQ== X-Gm-Message-State: AOAM531AlMASuvVrdslQx/QZncsH2G26gR15bHXXCCsjycQQXDtAPwA2 I5lZY6RnNoJ0eCtOf+WhfK6QtRmtgUnhocIVG5ZfZphRVpU= X-Google-Smtp-Source: ABdhPJwBTXsPEOhKz4L0BwmD+jAK0pw1Fj+rT6pesaPLFplvuSiX5WyYZlc397QRk8s1DJCqrp4h94RO0iZ3pK7jKLk= X-Received: by 2002:a2e:b537:: with SMTP id z23mr430152ljm.282.1614151445712; Tue, 23 Feb 2021 23:24:05 -0800 (PST) MIME-Version: 1.0 References: <202102232011.11NKBuTB080164@repo.freebsd.org> In-Reply-To: <202102232011.11NKBuTB080164@repo.freebsd.org> From: Antoine Brodin Date: Wed, 24 Feb 2021 08:23:57 +0100 Message-ID: Subject: Re: svn commit: r566427 - in head: Mk/Uses devel/qt5/files To: Adriaan de Groot Cc: ports-committers , svn-ports-all , svn-ports-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4DlnV01L0mz4WgV X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 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, 24 Feb 2021 07:24:08 -0000 On Tue, Feb 23, 2021 at 9:12 PM Adriaan de Groot wrote: > > Author: adridg > Date: Tue Feb 23 20:11:56 2021 > New Revision: 566427 > URL: https://svnweb.freebsd.org/changeset/ports/566427 > > Log: > Re-work Qt5 install- and deinstall scripts. > > Qt5 packages *together* manage a header file qconfig-modules.h which > `#includes` other headers. A given Qt5 package may get a line in there, > or it might not: that depends on package settings. > > On installing a package, add the line (if needed), on deinstall, remove > the line (if it was there). There's a tricky case, too: upgrading > a package that *had* a line, but no longer has one. That behaves like > deinstall. Previously we used @postexec and @postunexec lines, but > these were fragile in their own special way. See the linked PRs for > examples -- or tcberner's comment that his qconfig-modules.h file > *was* a screenful, and is now much shorter (and alphabetical, too!) > > An additional complication comes from needing to update qtchooser, > *if* it is installed and *if* the package needs it. There was another > set of @postexec lines for that. > > Migrate all the update logic to a shell script (there already was one > for deinstall, now make it do triple-duty). From the template file, > `pkg-change.in`, we generate a pkg-install and a pkg-deinstall > script that does the right thing. > > PR: 253356 253360 > Reported by: Nimaje on IRC > Reviewed by: tcberner Hi, A lot of qt5 ports fail to build after this change. /usr/local/include/qt5/QtCore/qconfig.h:1:10: fatal error: 'QtCore/qconfig-modules.h' file not found #include ^~~~~~~~~~~~~~~~~~~~~~~~~~ Antoine