From nobody Tue Aug 22 17:11:36 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 4RVbVJ4rcKz4r97s; Tue, 22 Aug 2023 17:11:36 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RVbVJ4JfYz3G0w; Tue, 22 Aug 2023 17:11:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692724296; 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; bh=gm2XHhKA8T1QYScY5uTgL3yA4glgMvHVyq6dBkZYAqk=; b=veFxK2dWtrjJxYvvwbgosum8uwC/Olic4Je77gShtBjtfowpJ07HdytSLo3vxStd6rAwji GvY/ucpELm9h/IA91ZhKJRKBtW8TJRGPox8JlVvm6zWbGQNMbxt4h1/b8CkdlIyyyw+KFU +U8pXMij0ErJfCwTUe9pRd85S84CelXGYiCeAU+vpBbXM9bB3yK8b3BLkHIANvjyPmNs7V cgkIB3i+U3PXVJT1hEJl5s4KvLcI7Qy5kWj3Pu3tCFmuZdSSRNsy0Np5Ht4Jnd/2mpavYh mnIbKtMefoZknckvEGtxLVjFkpxm7UUbUtqZVqbiqoFnFjmtoStHnEIx5iOpVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692724296; 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; bh=gm2XHhKA8T1QYScY5uTgL3yA4glgMvHVyq6dBkZYAqk=; b=LYGc3Ky9IXnA8MNRpSdto8LKx1JHnH1kLqh8NR1KB1KZMkkO71UxULwMu0l27Tz0l2N2CD KmXyjPMw+5EXwqwSYMPU/uAstgBU8zQVDgcj3aV8a42cjIyQfSlu0qh8Ze6ntIHpl8i7sh 3FhlQbCY/a/IlwmPDaVRoJnfq/NBFR0LiIUyENrEKitJ0qgupfVH42D/EFZ2+PiGAsKcqc s62VNspTT8r8PY+SD/n9UofmzuCR6SLgalmxRzpx9u7RIASawYo1L2DA33HwbNOFFQSBPR oBmVnrdVGcauJueJOQqXHil9IOF4YomWy7vWdXUOhVPAPWRIaCoT4BH2GjELiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692724296; a=rsa-sha256; cv=none; b=TQ8B19zyHct0UV1gc7PYr8SJ67qIfxARaYTPN4IuIRYelzK0/Ni8wo7jAKSBkurc2Fgvc1 VpUx8fRGwdO5d8/kPxGEI7vFnpvx7K03nRTU0l6FI1UmUSKviwhG1unTrFPYrV1TnyEXhI KHrZh1LyXoa1YD6hqHu7LfvMD4OMxKOlqmgO3zTZ0CenHYLx4BJhcP7jkrdrTHJEfZ+AcF Y/7WYczwHP8lK1JuHocBWawR4pHCFg7JpDKSBVO2jta6ocWkgOe2u5QaSKAMiCPQ9pBBF8 zl6zRIRBBtEHvjcHeeXpXhCG0qz8LHnjb4I/mHlsGIlmPzMuG9atDCdbGJyH3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVbVJ3P8Lz1B1n; Tue, 22 Aug 2023 17:11:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37MHBaQS096772; Tue, 22 Aug 2023 17:11:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MHBafi096769; Tue, 22 Aug 2023 17:11:36 GMT (envelope-from git) Date: Tue, 22 Aug 2023 17:11:36 GMT Message-Id: <202308221711.37MHBafi096769@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: c826fcf07d91 - main - x11-toolkits/vte3: introduce FRIBIDI, GNUTLS, GTK4 options 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c826fcf07d91dc7a3b0cf42709c5db69c421a122 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=c826fcf07d91dc7a3b0cf42709c5db69c421a122 commit c826fcf07d91dc7a3b0cf42709c5db69c421a122 Author: Alexey Dokuchaev AuthorDate: 2023-08-22 17:06:58 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-08-22 17:06:58 +0000 x11-toolkits/vte3: introduce FRIBIDI, GNUTLS, GTK4 options Keep them enabled by default to ensure featureful package. --- x11-toolkits/vte3/Makefile | 23 ++++++++++++++++------- x11-toolkits/vte3/pkg-plist | 38 +++++++++++++++++++------------------- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile index b22dfce01b9c..d759e50b527e 100644 --- a/x11-toolkits/vte3/Makefile +++ b/x11-toolkits/vte3/Makefile @@ -16,9 +16,7 @@ WWW= https://wiki.gnome.org/Apps/Terminal/VTE LICENSE= LGPL21 BUILD_DEPENDS= bash:shells/bash -LIB_DEPENDS= libgnutls.so:security/gnutls \ - libfribidi.so:converters/fribidi \ - libpcre2-8.so:devel/pcre2 \ +LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ libicuuc.so:devel/icu PORTSCOUT= limitw:1,even @@ -26,22 +24,33 @@ PORTSCOUT= limitw:1,even USES= compiler:c++11-lang gettext gnome localbase meson \ pkgconfig python tar:xz vala:build USE_LDCONFIG= yes -USE_GNOME= cairo gdkpixbuf2 gtk30 gtk40 introspection:build +USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build MESON_ARGS= -Da11y=true \ -Dgir=true \ - -Dfribidi=true \ -Dgtk3=true \ - -Dgtk4=true \ -Dicu=true \ -D_systemd=false \ -Dvapi=true -# shlib version numbers comes from gtk3/4 meson options not from PYTHON_VER +# shlib version numbers come from gtk3/4 meson options, not from PYTHON_VER PLIST_SUB= VERSION=2.91 VER3=3.91 BINARY_ALIAS= python3=${PYTHON_CMD} +OPTIONS_DEFINE= FRIBIDI GNUTLS GTK4 +OPTIONS_DEFAULT=FRIBIDI GNUTLS GTK4 +OPTIONS_SUB= yes + +FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi +FRIBIDI_MESON_OFF= -Dfribidi=false + +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +GNUTLS_MESON_OFF= -Dgnutls=false + +GTK4_USE= GNOME=gtk40 +GTK4_MESON_ON= -Dgtk4=true + .include .if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} < 1300109 diff --git a/x11-toolkits/vte3/pkg-plist b/x11-toolkits/vte3/pkg-plist index 2b4309e00e08..2323aac7f8fb 100644 --- a/x11-toolkits/vte3/pkg-plist +++ b/x11-toolkits/vte3/pkg-plist @@ -1,18 +1,18 @@ bin/vte-%%VERSION%% -bin/vte-%%VERSION%%-gtk4 +%%GTK4%%bin/vte-%%VERSION%%-gtk4 etc/profile.d/vte.csh etc/profile.d/vte.sh -include/vte-%%VERSION%%-gtk4/vte/vte.h -include/vte-%%VERSION%%-gtk4/vte/vtedeprecated.h -include/vte-%%VERSION%%-gtk4/vte/vteenums.h -include/vte-%%VERSION%%-gtk4/vte/vteglobals.h -include/vte-%%VERSION%%-gtk4/vte/vtemacros.h -include/vte-%%VERSION%%-gtk4/vte/vtepty.h -include/vte-%%VERSION%%-gtk4/vte/vteregex.h -include/vte-%%VERSION%%-gtk4/vte/vteterminal.h -include/vte-%%VERSION%%-gtk4/vte/vtetypebuiltins-gtk4.h -include/vte-%%VERSION%%-gtk4/vte/vtetypebuiltins.h -include/vte-%%VERSION%%-gtk4/vte/vteversion.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vte.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vtedeprecated.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vteenums.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vteglobals.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vtemacros.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vtepty.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vteregex.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vteterminal.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vtetypebuiltins-gtk4.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vtetypebuiltins.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vteversion.h include/vte-%%VERSION%%/vte/vte.h include/vte-%%VERSION%%/vte/vtedeprecated.h include/vte-%%VERSION%%/vte/vteenums.h @@ -25,17 +25,17 @@ include/vte-%%VERSION%%/vte/vtetypebuiltins-gtk3.h include/vte-%%VERSION%%/vte/vtetypebuiltins.h include/vte-%%VERSION%%/vte/vteversion.h lib/girepository-1.0/Vte-%%VERSION%%.typelib -lib/girepository-1.0/Vte-%%VER3%%.typelib -lib/libvte-%%VERSION%%-gtk4.so -lib/libvte-%%VERSION%%-gtk4.so.0 +%%GTK4%%lib/girepository-1.0/Vte-%%VER3%%.typelib +%%GTK4%%lib/libvte-%%VERSION%%-gtk4.so +%%GTK4%%lib/libvte-%%VERSION%%-gtk4.so.0 lib/libvte-%%VERSION%%.so lib/libvte-%%VERSION%%.so.0 lib/libvte-%%VERSION%%.so.0.7000.2 -libdata/pkgconfig/vte-%%VERSION%%-gtk4.pc +%%GTK4%%libdata/pkgconfig/vte-%%VERSION%%-gtk4.pc libdata/pkgconfig/vte-%%VERSION%%.pc libexec/vte-urlencode-cwd share/gir-1.0/Vte-%%VERSION%%.gir -share/gir-1.0/Vte-%%VER3%%.gir +%%GTK4%%share/gir-1.0/Vte-%%VER3%%.gir share/glade/catalogs/vte-%%VERSION%%.xml share/glade/pixmaps/hicolor/16x16/actions/widget-vte-terminal.png share/glade/pixmaps/hicolor/22x22/actions/widget-vte-terminal.png @@ -137,7 +137,7 @@ share/locale/xh/LC_MESSAGES/vte-%%VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/vte-%%VERSION%%.mo share/locale/zh_HK/LC_MESSAGES/vte-%%VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/vte-%%VERSION%%.mo -share/vala/vapi/vte-%%VERSION%%-gtk4.deps -share/vala/vapi/vte-%%VERSION%%-gtk4.vapi +%%GTK4%%share/vala/vapi/vte-%%VERSION%%-gtk4.deps +%%GTK4%%share/vala/vapi/vte-%%VERSION%%-gtk4.vapi share/vala/vapi/vte-%%VERSION%%.deps share/vala/vapi/vte-%%VERSION%%.vapi