Date: Thu, 02 Jan 2020 20:40:08 +0000 From: bugzilla-noreply@freebsd.org To: gnome@FreeBSD.org Subject: [Bug 237822] x11-toolkits/pango: Fails to configure with DOCS=ON X11=OFF: ERROR: Unknown variable "xft_dep". (since 1.42.4_2, ports r500960) Message-ID: <bug-237822-6497-dAsN69jkoh@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-237822-6497@https.bugs.freebsd.org/bugzilla/> References: <bug-237822-6497@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D237822 --- Comment #45 from Michael Osipov <michael.osipov@siemens.com> --- (In reply to John Hein from comment #44) Patch does not work here: root@deblndw011x1j:/usr/ports/x11-toolkits/pango # svnlite info Path: . Working Copy Root Path: /usr/ports URL: https://svn.freebsd.org/ports/branches/2020Q1/x11-toolkits/pango Relative URL: ^/branches/2020Q1/x11-toolkits/pango Repository Root: https://svn.freebsd.org/ports Repository UUID: 35697150-7ecd-e111-bb59-0022644237b5 Revision: 521832 Node Kind: directory Schedule: normal Last Changed Author: swills Last Changed Rev: 519952 Last Changed Date: 2019-12-12 23:13:32 +0100 (Do., 12 Dez. 2019) root@deblndw011x1j:/usr/ports/x11-toolkits/pango # make =3D=3D=3D> License LGPL20 accepted by the user =3D=3D=3D> pango-1.42.4_3 depends on file: /usr/local/sbin/pkg - found =3D=3D=3D> Fetching all distfiles required by pango-1.42.4_3 for building =3D=3D=3D> Extracting for pango-1.42.4_3 =3D> SHA256 Checksum OK for gnome2/pango-1.42.4.tar.xz. =3D=3D=3D> Patching for pango-1.42.4_3 =3D=3D=3D> Applying FreeBSD patches for pango-1.42.4_3 =3D=3D=3D> Ignoring patchfile patch-docs-meson.build.orig File to patch: root@deblndw011x1j:/usr/ports/x11-toolkits/pango # svnlite diff Index: files/patch-docs-meson.build =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- files/patch-docs-meson.build (revision 521832) +++ files/patch-docs-meson.build (working copy) @@ -1,14 +1,31 @@ ---- docs/meson.build.orig 2019-07-31 21:41:55 UTC +--- docs/meson.build.orig 2018-04-24 19:46:15 UTC +++ docs/meson.build -@@ -45,7 +45,6 @@ if host_system !=3D 'windows' +@@ -40,16 +40,20 @@ if host_system !=3D 'darwin' + ] + endif + ++xft_private_headers =3D [ ++ 'pangoxft.h', ++ 'pangoxft-render.h', ++] + if host_system !=3D 'windows' + private_headers +=3D [ 'pangocairo-win32.h', 'pangowin32.h', ] --else - private_headers +=3D [ - 'pangoxft.h', - 'pangoxft-render.h', -@@ -68,8 +67,10 @@ if build_pangoft2 ++ if not get_option('xft') ++ private_headers +=3D xft_private_headers ++ endif + else +- private_headers +=3D [ +- 'pangoxft.h', +- 'pangoxft-render.h', +- ] ++ private_headers +=3D xft_private_headers + endif + + content_files =3D [ +@@ -68,8 +72,10 @@ if build_pangoft2 docdeps +=3D libpangoft2_dep endif --=20 You are receiving this mail because: You are on the CC list for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-237822-6497-dAsN69jkoh>