Attachment #218276 for bug #249879




# $FreeBSD$

PORTNAME=	pango
PORTVERSION=	1.46.2
PORTREVISION=	4
CATEGORIES=	x11-toolkits
MASTER_SITES=	GNOME
DIST_SUBDIR=	gnome

MAINTAINER=	desktop@FreeBSD.org
COMMENT=	Open-source framework for the layout and rendering of i18n text

LICENSE=	LGPL20
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	help2man:misc/help2man
LIB_DEPENDS=	libfreetype.so:print/freetype2 \
		libharfbuzz.so:print/harfbuzz \
		libfontconfig.so:x11-fonts/fontconfig \
		libfribidi.so:converters/fribidi \
		libthai.so:devel/libthai
RUN_DEPENDS=	xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype \
		${FONTENCOD}:x11-fonts/encodings

PORTSCOUT=	limitw:1,even

USES=		compiler:c11 gettext gnome localbase meson pkgconfig \
		tar:xz xorg
USE_LDCONFIG=	yes
USE_GNOME=	cairo glib20 introspection:build
USE_XORG=	x11 xft xrender

VERSION=	1.8.0
LIBVERSION=	0.4600.2
PLIST_SUB+=     VERSION=${VERSION} LIBVERSION=${LIBVERSION}

FONTSCALE=	${LOCALBASE}/share/fonts/TTF/luximb.ttf

FONTENCOD=	${LOCALBASE}/share/fonts/encodings/encodings.dir

OPTIONS_SUB=	yes
OPTIONS_DEFINE= DOCS
OPTIONS_DEFAULT=X11

DOCS_MESON_TRUE=	gtk_doc
DOCS_BUILD_DEPENDS=	gtk-doc>=0:textproc/gtk-doc

X11_MESON_TRUE=	xft
X11_USES=	xorg
X11_USE=	XORG=x11,xft,xrender

pre-configure:
# .if !exists() evaluates too early before cairo has a chance to be installed
	@if ! pkg-config --exists cairo-gobject; then \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1536530045	1	TIMESTAMP = 1600700791
2	SHA256 (gnome2/pango-1.42.4.tar.xz) = 1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d	2	SHA256 (gnome/pango-1.46.2.tar.xz) = d89fab5f26767261b493279b65cfb9eb0955cd44c07c5628d36094609fc51841
3	SIZE (gnome2/pango-1.42.4.tar.xz) = 833876	3	SIZE (gnome/pango-1.46.2.tar.xz) = 535108




--- ../pango/pango-bidi-type.c.orig	2020-07-23 19:10:14.338937000 +0200
+++ ../pango/pango-bidi-type.c	2020-07-23 19:12:15.511836000 +0200
@@ -179,8 +179,11 @@ pango_log2vis_get_embedding_levels (const gchar    *te
   for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++)
     {
       gunichar ch = g_utf8_get_char (p);
-      FriBidiCharType char_type;
-      char_type = fribidi_get_bidi_type (ch);
+	  FriBidiCharType char_type = fribidi_get_bidi_type (ch);
+		  
+	  	if (i == n_chars)
+			break;
+
       bidi_types[i] = char_type;
       ored_types |= char_type;
       if (FRIBIDI_IS_STRONG (char_type))




--- docs/meson.build.orig	2018-04-24 19:46:15 UTC
+++ docs/meson.build
@@ -40,16 +40,20 @@ if host_system != 'darwin'
   ]
 endif
 
+xft_private_headers = [
+  'pangoxft.h',
+  'pangoxft-render.h',
+]
 if host_system != 'windows'
   private_headers += [
     'pangocairo-win32.h',
     'pangowin32.h',
   ]
+  if not get_option('xft')
+    private_headers += xft_private_headers
+  endif
 else
-  private_headers += [
-    'pangoxft.h',
-    'pangoxft-render.h',
-  ]
+  private_headers += xft_private_headers
 endif
 
 content_files = [
@@ -68,8 +72,10 @@ if build_pangoft2
   docdeps += libpangoft2_dep
 endif
 
-if xft_dep.found()
-  docdeps += libpangoxft_dep
+if get_option('xft')
+  if xft_dep.found()
+   docdeps += libpangoxft_dep
+  endif
 endif
 
 if cairo_dep.found()




--- meson.build.orig	2018-04-07 12:06:28.000000000 +0200
+++ meson.build	2018-05-08 15:01:59.098440000 +0200
@@ -297,11 +297,13 @@
   pango_deps += freetype_dep
 endif
 
-xft_dep = dependency('xft', version: xft_req_version, required: false)
-if xft_dep.found()
-  pango_conf.set('HAVE_XFT', 1)
-  pango_deps += dependency('xrender', required: false)
-  pango_deps += xft_dep
+if get_option('xft')
+  xft_dep = dependency('xft', version: xft_req_version, required: false)
+  if xft_dep.found()
+    pango_conf.set('HAVE_XFT', 1)
+    pango_deps += dependency('xrender', required: false)
+    pango_deps += xft_dep
+  endif
 endif
 
 if host_system == 'darwin'
@@ -481,9 +483,12 @@
   [ 'pango.pc' ],
   [ 'pangowin32.pc', host_system == 'windows' ],
   [ 'pangoft2.pc', build_pangoft2 ],
-  [ 'pangoxft.pc', xft_dep.found() ],
   [ 'pangocairo.pc', cairo_dep.found() ],
 ]
+
+if get_option('xft')
+  pkgconf_files += [[ 'pangoxft.pc', xft_dep.found() ]]
+endif
 
 foreach pkg: pkgconf_files
   pkg_name = pkg[0]




--- meson_options.txt.orig	2018-05-10 12:18:01.824158000 +0200
+++ meson_options.txt	2018-05-10 12:18:30.158458000 +0200
@@ -2,7 +2,15 @@
        description: 'Build API reference for Pango using GTK-Doc',
        type: 'boolean',
        value: false)
+option('enable_installed_tests',
+       description: 'Install test programs',
+       type: 'boolean',
+       value: false)
 option('gir',
        description: 'Build the GObject introspection data for Pango',
+       type: 'boolean',
+       value: true)
+option('xft',
+       description: 'Build Xft/XRender support',
        type: 'boolean',
        value: true)




--- pango/meson.build.orig	2018-07-17 19:43:45.000000000 -0400
+++ pango/meson.build	2018-09-03 14:20:00.192740000 -0400
@@ -239,59 +239,62 @@
 endif
 
 # Xft
-if xft_dep.found()
-  pangoxft_headers = [
-    'pangoxft.h',
-    'pangoxft-render.h',
-  ]
+if get_option('xft')
+  if xft_dep.found()
+    pangoxft_headers = [
+      'pangoxft.h',
+      'pangoxft-render.h',
+    ]
 
-  pangoxft_sources = [
-    'pangoxft-font.c',
-    'pangoxft-fontmap.c',
-    'pangoxft-render.c',
-  ]
+    pangoxft_sources = [
+      'pangoxft-font.c',
+      'pangoxft-fontmap.c',
+      'pangoxft-render.c',
+    ]
 
   install_headers(pangoxft_headers, subdir: pango_api_path)
+    install_headers(pangoxft_headers, subdir: pango_api_path)
 
-  libpangoxft = library(
-    'pangoxft-@0@'.format(pango_api_version),
-    sources: pangoxft_sources,
-    version: pango_libversion,
-    soversion: pango_soversion,
-    install: true,
-    dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ],
-    include_directories: [ root_inc, pango_inc ],
-    c_args: common_cflags + pango_debug_cflags + pango_cflags + [
-      '-DPANGO_DISABLE_DEPRECATION_WARNINGS',
-    ],
-    link_args: common_ldflags,
-  )
-  pangoxft_dep_sources = []
-
-  if build_gir
-    pangoxft_gir = gnome.generate_gir(
-      libpangoxft,
-      sources: pangoxft_headers + pangoxft_sources,
-      dependencies: [ libpango_dep, libpangoft2_dep, pango_gir_dep, pangoft2_gir_dep ],
-      namespace: 'PangoXft',
-      nsversion: pango_api_version,
-      identifier_prefix: 'PangoXft',
-      symbol_prefix: 'pango_xft',
-      export_packages: 'pangoxft',
-      includes: [ pango_gir[0], pangoft2_gir[0], 'GObject-2.0', 'xft-2.0', 'xlib-2.0' ],
-      header: 'pango/pangoxft.h',
+    libpangoxft = library(
+      'pangoxft-@0@'.format(pango_api_version),
+      sources: pangoxft_sources,
+      version: pango_libversion,
+      soversion: pango_soversion,
       install: true,
-      extra_args: gir_args,
+      dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ],
+      include_directories: [ root_inc, pango_inc ],
+      c_args: common_cflags + pango_debug_cflags + pango_cflags + [
+        '-DPANGO_DISABLE_DEPRECATION_WARNINGS',
+      ],
+      link_args: common_ldflags,
     )
-    pangoxft_dep_sources += pangoxft_gir
-  endif
+    pangoxft_dep_sources = []
 
-  libpangoxft_dep = declare_dependency(
-    link_with: libpangoxft,
-    include_directories: root_inc,
-    dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ],
-    sources: pangoxft_dep_sources,
-  )
+    if build_gir
+      pangoxft_gir = gnome.generate_gir(
+        libpangoxft,
+        sources: pangoxft_headers + pangoxft_sources,
+        dependencies: [ libpango_dep, libpangoft2_dep, pango_gir_dep, pangoft2_gir_dep ],
+        namespace: 'PangoXft',
+        nsversion: pango_api_version,
+        identifier_prefix: 'PangoXft',
+        symbol_prefix: 'pango_xft',
+        export_packages: 'pangoxft',
+        includes: [ pango_gir[0], pangoft2_gir[0], 'GObject-2.0', 'xft-2.0', 'xlib-2.0' ],
+        header: 'pango/pangoxft.h',
+        install: true,
+        extra_args: gir_args,
+      )
+      pangoxft_dep_sources += pangoxft_gir
+    endif
+
+    libpangoxft_dep = declare_dependency(
+      link_with: libpangoxft,
+      include_directories: root_inc,
+      dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ],
+      sources: pangoxft_dep_sources,
+    )
+  endif
 else
   # For usage as a subproject
   libpangoxft_dep = dependency('', required: false)




--- tests/meson.build.orig	2018-04-07 12:00:40.000000000 +0200
+++ tests/meson.build	2018-05-10 12:09:26.358132000 +0200
@@ -2,8 +2,10 @@
   '-DSRCDIR=@0@'.format(meson.current_source_dir()),
 ]
 
-if xft_dep.found()
-  test_cflags += [ '-DHAVE_X', '-DHAVE_XFT' ]
+if get_option('xft')
+  if xft_dep.found()
+    test_cflags += [ '-DHAVE_X', '-DHAVE_XFT' ]
+  endif
 endif
 
 if host_system == 'windows'
@@ -85,15 +87,18 @@
 installed_test_datadir = join_paths(pango_datadir, 'installed-tests', 'pango')
 installed_test_bindir = join_paths(pango_libexecdir, 'installed-tests', 'pango')
 
-install_data(installed_test_data, install_dir: installed_test_bindir)
-install_data(installed_test_layouts_data, install_dir: join_paths(installed_test_bindir, 'layouts'))
-install_data(installed_test_markups_data, install_dir: join_paths(installed_test_bindir, 'markups'))
+if get_option('enable_installed_tests')
+  install_data(installed_test_data, install_dir: installed_test_bindir)
+  install_data(installed_test_layouts_data, install_dir: join_paths(installed_test_bindir, 'layouts'))
+  install_data(installed_test_markups_data, install_dir: join_paths(installed_test_bindir, 'markups'))
+endif
 
 python = import('python3').find_python()
 gen_installed_test = files([ 'gen-installed-test.py' ])
 gen_all_unicode = files([ 'gen-all-unicode.py' ])
 
-custom_target('all-unicode',
+if get_option('enable_installed_tests')
+  custom_target('all-unicode',
               output: 'all-unicode.txt',
               command: [
                 python, gen_all_unicode, '@OUTPUT@'
@@ -101,29 +106,30 @@
               install: true,
               install_dir: installed_test_bindir)
 
-foreach t: tests
-  name = t[0]
-  src = t.get(1, [ '@0@.c'.format(name) ])
-  deps = t.get(2, [ libpango_dep ])
+  foreach t: tests
+    name = t[0]
+    src = t.get(1, [ '@0@.c'.format(name) ])
+    deps = t.get(2, [ libpango_dep ])
 
-  custom_target(name + '.test',
-                output: name + '.test',
-                command: [
-                  python, gen_installed_test,
-                  installed_test_bindir,
-                  name,
-                  '@OUTDIR@',
-                ],
-                install: true,
-                install_dir: installed_test_datadir)
+    custom_target(name + '.test',
+                  output: name + '.test',
+                  command: [
+                    python, gen_installed_test,
+                    installed_test_bindir,
+                    name,
+                    '@OUTDIR@',
+                  ],
+                  install: true,
+                  install_dir: installed_test_datadir)
 
-  bin = executable(name, src,
-                   dependencies: deps,
-                   include_directories: root_inc,
-                   c_args: common_cflags + pango_debug_cflags + test_cflags,
-                   cpp_args: common_cppflags + pango_debug_cflags + test_cflags,
-                   install: true,
-                   install_dir: installed_test_bindir)
+    bin = executable(name, src,
+                     dependencies: deps,
+                     include_directories: root_inc,
+                     c_args: common_cflags + pango_debug_cflags + test_cflags,
+                     cpp_args: common_cppflags + pango_debug_cflags + test_cflags,
+                     install: true,
+                     install_dir: installed_test_bindir)
 
-  test(name, bin, env: test_env)
-endforeach
+    test(name, bin, env: test_env)
+  endforeach
+endif




--- utils/meson.build.orig	2018-09-09 23:55:54.363487000 +0200
+++ utils/meson.build	2018-09-09 23:56:55.810617000 +0200
@@ -14,12 +14,14 @@
   pango_view_deps += libpangoft2_dep
 endif
 
-if xft_dep.found() and build_pangoft2
-  pango_view_sources += [
-    'viewer-pangoxft.c',
-    'viewer-x.c',
-  ]
-  pango_view_deps += [ libpangoft2_dep, libpangoxft_dep, ]
+if get_option('xft')
+  if xft_dep.found() and build_pangoft2
+    pango_view_sources += [
+      'viewer-pangoxft.c',
+      'viewer-x.c',
+    ]
+    pango_view_deps += [ libpangoft2_dep, libpangoxft_dep, ]
+  endif
 endif
 
 if cairo_dep.found()
@@ -54,7 +56,7 @@
                   help2man, help2man_opts, '--output=@OUTPUT@', pango_view
                 ],
                 install: true,
-                install_dir: join_paths(pango_datadir, 'man/man1'))
+                install_dir: join_paths(pango_prefix, 'man/man1'))
 endif
 
 if cairo_dep.found()

Return to bug 249879

Lines 2-12 Link Here

(-)Makefile (-14 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= pango	4	PORTNAME= pango
5	PORTVERSION= 1.42.4	5	PORTVERSION= 1.46.2
6	PORTREVISION= 4
7	CATEGORIES= x11-toolkits	6	CATEGORIES= x11-toolkits
8	MASTER_SITES= GNOME	7	MASTER_SITES= GNOME
9	DIST_SUBDIR= gnome2	8	DIST_SUBDIR= gnome
10		9
11	MAINTAINER= desktop@FreeBSD.org	10	MAINTAINER= desktop@FreeBSD.org
12	COMMENT= Open-source framework for the layout and rendering of i18n text	11	COMMENT= Open-source framework for the layout and rendering of i18n text
Lines 14-35 Link Here
14	LICENSE= LGPL20	13	LICENSE= LGPL20
15	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
16		15
17	BUILD_DEPENDS= help2man:misc/help2man
18	LIB_DEPENDS= libfreetype.so:print/freetype2 \	16	LIB_DEPENDS= libfreetype.so:print/freetype2 \
19	libharfbuzz.so:print/harfbuzz \	17	libharfbuzz.so:print/harfbuzz \
20	libfontconfig.so:x11-fonts/fontconfig \	18	libfontconfig.so:x11-fonts/fontconfig \
21	libfribidi.so:converters/fribidi	19	libfribidi.so:converters/fribidi \
		20	libthai.so:devel/libthai
22	RUN_DEPENDS= xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype \	21	RUN_DEPENDS= xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype \
23	${FONTENCOD}:x11-fonts/encodings	22	${FONTENCOD}:x11-fonts/encodings
24		23
25	PORTSCOUT= limitw:1,even	24	PORTSCOUT= limitw:1,even
26		25
27	USES= compiler:c11 gettext gnome localbase meson pkgconfig tar:xz	26	USES= compiler:c11 gettext gnome localbase meson pkgconfig \
		27	tar:xz xorg
28	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
29	USE_GNOME= cairo glib20 introspection:build	29	USE_GNOME= cairo glib20 introspection:build
		30	USE_XORG= x11 xft xrender
30		31
31	VERSION= 1.8.0	32	VERSION= 1.8.0
32	LIBVERSION= 0.4200.3	33	LIBVERSION= 0.4600.2
33	PLIST_SUB+= VERSION=${VERSION} LIBVERSION=${LIBVERSION}	34	PLIST_SUB+= VERSION=${VERSION} LIBVERSION=${LIBVERSION}
34		35
35	FONTSCALE= ${LOCALBASE}/share/fonts/TTF/luximb.ttf	36	FONTSCALE= ${LOCALBASE}/share/fonts/TTF/luximb.ttf
Lines 36-51 Link Here
36	FONTENCOD= ${LOCALBASE}/share/fonts/encodings/encodings.dir	37	FONTENCOD= ${LOCALBASE}/share/fonts/encodings/encodings.dir
37		38
38	OPTIONS_SUB= yes	39	OPTIONS_SUB= yes
39	OPTIONS_DEFINE= X11 DOCS	40	OPTIONS_DEFINE= DOCS
40	OPTIONS_DEFAULT=X11
41		41
42	DOCS_MESON_TRUE= enable_docs	42	DOCS_MESON_TRUE= gtk_doc
43	DOCS_BUILD_DEPENDS= gtk-doc>=0:textproc/gtk-doc	43	DOCS_BUILD_DEPENDS= gtk-doc>=0:textproc/gtk-doc
44		44
45	X11_MESON_TRUE= xft
46	X11_USES= xorg
47	X11_USE= XORG=x11,xft,xrender
48
49	pre-configure:	45	pre-configure:
50	# .if !exists() evaluates too early before cairo has a chance to be installed	46	# .if !exists() evaluates too early before cairo has a chance to be installed
51	@if ! pkg-config --exists cairo-gobject; then \	47	@if ! pkg-config --exists cairo-gobject; then \

Lines 1-16 Link Here

(-)files/CVE-20191010238 (-16 lines)
1	--- ../pango/pango-bidi-type.c.orig 2020-07-23 19:10:14.338937000 +0200
2	+++ ../pango/pango-bidi-type.c 2020-07-23 19:12:15.511836000 +0200
3	@@ -179,8 +179,11 @@ pango_log2vis_get_embedding_levels (const gchar *te
4	for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++)
5	{
6	gunichar ch = g_utf8_get_char (p);
7	- FriBidiCharType char_type;
8	- char_type = fribidi_get_bidi_type (ch);
9	+ FriBidiCharType char_type = fribidi_get_bidi_type (ch);
10	+
11	+ if (i == n_chars)
12	+ break;
13	+
14	bidi_types[i] = char_type;
15	ored_types \|= char_type;
16	if (FRIBIDI_IS_STRONG (char_type))

Lines 1-40 Link Here

(-)files/patch-docs-meson.build (-40 lines)
1	--- docs/meson.build.orig 2018-04-24 19:46:15 UTC
2	+++ docs/meson.build
3	@@ -40,16 +40,20 @@ if host_system != 'darwin'
4	]
5	endif
6
7	+xft_private_headers = [
8	+ 'pangoxft.h',
9	+ 'pangoxft-render.h',
10	+]
11	if host_system != 'windows'
12	private_headers += [
13	'pangocairo-win32.h',
14	'pangowin32.h',
15	]
16	+ if not get_option('xft')
17	+ private_headers += xft_private_headers
18	+ endif
19	else
20	- private_headers += [
21	- 'pangoxft.h',
22	- 'pangoxft-render.h',
23	- ]
24	+ private_headers += xft_private_headers
25	endif
26
27	content_files = [
28	@@ -68,8 +72,10 @@ if build_pangoft2
29	docdeps += libpangoft2_dep
30	endif
31
32	-if xft_dep.found()
33	- docdeps += libpangoxft_dep
34	+if get_option('xft')
35	+ if xft_dep.found()
36	+ docdeps += libpangoxft_dep
37	+ endif
38	endif
39
40	if cairo_dep.found()

Lines 1-35 Link Here

(-)files/patch-meson.build (-35 lines)
1	--- meson.build.orig 2018-04-07 12:06:28.000000000 +0200
2	+++ meson.build 2018-05-08 15:01:59.098440000 +0200
3	@@ -297,11 +297,13 @@
4	pango_deps += freetype_dep
5	endif
6
7	-xft_dep = dependency('xft', version: xft_req_version, required: false)
8	-if xft_dep.found()
9	- pango_conf.set('HAVE_XFT', 1)
10	- pango_deps += dependency('xrender', required: false)
11	- pango_deps += xft_dep
12	+if get_option('xft')
13	+ xft_dep = dependency('xft', version: xft_req_version, required: false)
14	+ if xft_dep.found()
15	+ pango_conf.set('HAVE_XFT', 1)
16	+ pango_deps += dependency('xrender', required: false)
17	+ pango_deps += xft_dep
18	+ endif
19	endif
20
21	if host_system == 'darwin'
22	@@ -481,9 +483,12 @@
23	[ 'pango.pc' ],
24	[ 'pangowin32.pc', host_system == 'windows' ],
25	[ 'pangoft2.pc', build_pangoft2 ],
26	- [ 'pangoxft.pc', xft_dep.found() ],
27	[ 'pangocairo.pc', cairo_dep.found() ],
28	]
29	+
30	+if get_option('xft')
31	+ pkgconf_files += [[ 'pangoxft.pc', xft_dep.found() ]]
32	+endif
33
34	foreach pkg: pkgconf_files
35	pkg_name = pkg[0]

Lines 1-18 Link Here

(-)files/patch-meson_options.txt (-18 lines)
1	--- meson_options.txt.orig 2018-05-10 12:18:01.824158000 +0200
2	+++ meson_options.txt 2018-05-10 12:18:30.158458000 +0200
3	@@ -2,7 +2,15 @@
4	description: 'Build API reference for Pango using GTK-Doc',
5	type: 'boolean',
6	value: false)
7	+option('enable_installed_tests',
8	+ description: 'Install test programs',
9	+ type: 'boolean',
10	+ value: false)
11	option('gir',
12	description: 'Build the GObject introspection data for Pango',
13	+ type: 'boolean',
14	+ value: true)
15	+option('xft',
16	+ description: 'Build Xft/XRender support',
17	type: 'boolean',
18	value: true)

Lines 1-111 Link Here

(-)files/patch-pango_meson.build (-111 lines)
1	--- pango/meson.build.orig 2018-07-17 19:43:45.000000000 -0400
2	+++ pango/meson.build 2018-09-03 14:20:00.192740000 -0400
3	@@ -239,59 +239,62 @@
4	endif
5
6	# Xft
7	-if xft_dep.found()
8	- pangoxft_headers = [
9	- 'pangoxft.h',
10	- 'pangoxft-render.h',
11	- ]
12	+if get_option('xft')
13	+ if xft_dep.found()
14	+ pangoxft_headers = [
15	+ 'pangoxft.h',
16	+ 'pangoxft-render.h',
17	+ ]
18
19	- pangoxft_sources = [
20	- 'pangoxft-font.c',
21	- 'pangoxft-fontmap.c',
22	- 'pangoxft-render.c',
23	- ]
24	+ pangoxft_sources = [
25	+ 'pangoxft-font.c',
26	+ 'pangoxft-fontmap.c',
27	+ 'pangoxft-render.c',
28	+ ]
29
30	install_headers(pangoxft_headers, subdir: pango_api_path)
31	+ install_headers(pangoxft_headers, subdir: pango_api_path)
32
33	- libpangoxft = library(
34	- 'pangoxft-@0@'.format(pango_api_version),
35	- sources: pangoxft_sources,
36	- version: pango_libversion,
37	- soversion: pango_soversion,
38	- install: true,
39	- dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ],
40	- include_directories: [ root_inc, pango_inc ],
41	- c_args: common_cflags + pango_debug_cflags + pango_cflags + [
42	- '-DPANGO_DISABLE_DEPRECATION_WARNINGS',
43	- ],
44	- link_args: common_ldflags,
45	- )
46	- pangoxft_dep_sources = []
47	-
48	- if build_gir
49	- pangoxft_gir = gnome.generate_gir(
50	- libpangoxft,
51	- sources: pangoxft_headers + pangoxft_sources,
52	- dependencies: [ libpango_dep, libpangoft2_dep, pango_gir_dep, pangoft2_gir_dep ],
53	- namespace: 'PangoXft',
54	- nsversion: pango_api_version,
55	- identifier_prefix: 'PangoXft',
56	- symbol_prefix: 'pango_xft',
57	- export_packages: 'pangoxft',
58	- includes: [ pango_gir[0], pangoft2_gir[0], 'GObject-2.0', 'xft-2.0', 'xlib-2.0' ],
59	- header: 'pango/pangoxft.h',
60	+ libpangoxft = library(
61	+ 'pangoxft-@0@'.format(pango_api_version),
62	+ sources: pangoxft_sources,
63	+ version: pango_libversion,
64	+ soversion: pango_soversion,
65	install: true,
66	- extra_args: gir_args,
67	+ dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ],
68	+ include_directories: [ root_inc, pango_inc ],
69	+ c_args: common_cflags + pango_debug_cflags + pango_cflags + [
70	+ '-DPANGO_DISABLE_DEPRECATION_WARNINGS',
71	+ ],
72	+ link_args: common_ldflags,
73	)
74	- pangoxft_dep_sources += pangoxft_gir
75	- endif
76	+ pangoxft_dep_sources = []
77
78	- libpangoxft_dep = declare_dependency(
79	- link_with: libpangoxft,
80	- include_directories: root_inc,
81	- dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ],
82	- sources: pangoxft_dep_sources,
83	- )
84	+ if build_gir
85	+ pangoxft_gir = gnome.generate_gir(
86	+ libpangoxft,
87	+ sources: pangoxft_headers + pangoxft_sources,
88	+ dependencies: [ libpango_dep, libpangoft2_dep, pango_gir_dep, pangoft2_gir_dep ],
89	+ namespace: 'PangoXft',
90	+ nsversion: pango_api_version,
91	+ identifier_prefix: 'PangoXft',
92	+ symbol_prefix: 'pango_xft',
93	+ export_packages: 'pangoxft',
94	+ includes: [ pango_gir[0], pangoft2_gir[0], 'GObject-2.0', 'xft-2.0', 'xlib-2.0' ],
95	+ header: 'pango/pangoxft.h',
96	+ install: true,
97	+ extra_args: gir_args,
98	+ )
99	+ pangoxft_dep_sources += pangoxft_gir
100	+ endif
101	+
102	+ libpangoxft_dep = declare_dependency(
103	+ link_with: libpangoxft,
104	+ include_directories: root_inc,
105	+ dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ],
106	+ sources: pangoxft_dep_sources,
107	+ )
108	+ endif
109	else
110	# For usage as a subproject
111	libpangoxft_dep = dependency('', required: false)

Lines 1-92 Link Here

(-)files/patch-tests_meson.build (-92 lines)
1	--- tests/meson.build.orig 2018-04-07 12:00:40.000000000 +0200
2	+++ tests/meson.build 2018-05-10 12:09:26.358132000 +0200
3	@@ -2,8 +2,10 @@
4	'-DSRCDIR=@0@'.format(meson.current_source_dir()),
5	]
6
7	-if xft_dep.found()
8	- test_cflags += [ '-DHAVE_X', '-DHAVE_XFT' ]
9	+if get_option('xft')
10	+ if xft_dep.found()
11	+ test_cflags += [ '-DHAVE_X', '-DHAVE_XFT' ]
12	+ endif
13	endif
14
15	if host_system == 'windows'
16	@@ -85,15 +87,18 @@
17	installed_test_datadir = join_paths(pango_datadir, 'installed-tests', 'pango')
18	installed_test_bindir = join_paths(pango_libexecdir, 'installed-tests', 'pango')
19
20	-install_data(installed_test_data, install_dir: installed_test_bindir)
21	-install_data(installed_test_layouts_data, install_dir: join_paths(installed_test_bindir, 'layouts'))
22	-install_data(installed_test_markups_data, install_dir: join_paths(installed_test_bindir, 'markups'))
23	+if get_option('enable_installed_tests')
24	+ install_data(installed_test_data, install_dir: installed_test_bindir)
25	+ install_data(installed_test_layouts_data, install_dir: join_paths(installed_test_bindir, 'layouts'))
26	+ install_data(installed_test_markups_data, install_dir: join_paths(installed_test_bindir, 'markups'))
27	+endif
28
29	python = import('python3').find_python()
30	gen_installed_test = files([ 'gen-installed-test.py' ])
31	gen_all_unicode = files([ 'gen-all-unicode.py' ])
32
33	-custom_target('all-unicode',
34	+if get_option('enable_installed_tests')
35	+ custom_target('all-unicode',
36	output: 'all-unicode.txt',
37	command: [
38	python, gen_all_unicode, '@OUTPUT@'
39	@@ -101,29 +106,30 @@
40	install: true,
41	install_dir: installed_test_bindir)
42
43	-foreach t: tests
44	- name = t[0]
45	- src = t.get(1, [ '@0@.c'.format(name) ])
46	- deps = t.get(2, [ libpango_dep ])
47	+ foreach t: tests
48	+ name = t[0]
49	+ src = t.get(1, [ '@0@.c'.format(name) ])
50	+ deps = t.get(2, [ libpango_dep ])
51
52	- custom_target(name + '.test',
53	- output: name + '.test',
54	- command: [
55	- python, gen_installed_test,
56	- installed_test_bindir,
57	- name,
58	- '@OUTDIR@',
59	- ],
60	- install: true,
61	- install_dir: installed_test_datadir)
62	+ custom_target(name + '.test',
63	+ output: name + '.test',
64	+ command: [
65	+ python, gen_installed_test,
66	+ installed_test_bindir,
67	+ name,
68	+ '@OUTDIR@',
69	+ ],
70	+ install: true,
71	+ install_dir: installed_test_datadir)
72
73	- bin = executable(name, src,
74	- dependencies: deps,
75	- include_directories: root_inc,
76	- c_args: common_cflags + pango_debug_cflags + test_cflags,
77	- cpp_args: common_cppflags + pango_debug_cflags + test_cflags,
78	- install: true,
79	- install_dir: installed_test_bindir)
80	+ bin = executable(name, src,
81	+ dependencies: deps,
82	+ include_directories: root_inc,
83	+ c_args: common_cflags + pango_debug_cflags + test_cflags,
84	+ cpp_args: common_cppflags + pango_debug_cflags + test_cflags,
85	+ install: true,
86	+ install_dir: installed_test_bindir)
87
88	- test(name, bin, env: test_env)
89	-endforeach
90	+ test(name, bin, env: test_env)
91	+ endforeach
92	+endif

Lines 1-32 Link Here

(-)files/patch-utils_meson.build (-32 lines)
1	--- utils/meson.build.orig 2018-09-09 23:55:54.363487000 +0200
2	+++ utils/meson.build 2018-09-09 23:56:55.810617000 +0200
3	@@ -14,12 +14,14 @@
4	pango_view_deps += libpangoft2_dep
5	endif
6
7	-if xft_dep.found() and build_pangoft2
8	- pango_view_sources += [
9	- 'viewer-pangoxft.c',
10	- 'viewer-x.c',
11	- ]
12	- pango_view_deps += [ libpangoft2_dep, libpangoxft_dep, ]
13	+if get_option('xft')
14	+ if xft_dep.found() and build_pangoft2
15	+ pango_view_sources += [
16	+ 'viewer-pangoxft.c',
17	+ 'viewer-x.c',
18	+ ]
19	+ pango_view_deps += [ libpangoft2_dep, libpangoxft_dep, ]
20	+ endif
21	endif
22
23	if cairo_dep.found()
24	@@ -54,7 +56,7 @@
25	help2man, help2man_opts, '--output=@OUTPUT@', pango_view
26	],
27	install: true,
28	- install_dir: join_paths(pango_datadir, 'man/man1'))
29	+ install_dir: join_paths(pango_prefix, 'man/man1'))
30	endif
31
32	if cairo_dep.found()

Lines 5-10 Link Here

(-)pkg-plist (-12 / +25 lines)
5	include/pango-1.0/pango/pango-break.h	5	include/pango-1.0/pango/pango-break.h
6	include/pango-1.0/pango/pango-context.h	6	include/pango-1.0/pango/pango-context.h
7	include/pango-1.0/pango/pango-coverage.h	7	include/pango-1.0/pango/pango-coverage.h
		8	include/pango-1.0/pango/pango-direction.h
8	include/pango-1.0/pango/pango-engine.h	9	include/pango-1.0/pango/pango-engine.h
9	include/pango-1.0/pango/pango-enum-types.h	10	include/pango-1.0/pango/pango-enum-types.h
10	include/pango-1.0/pango/pango-features.h	11	include/pango-1.0/pango/pango-features.h
Lines 32-43 Link Here
32	include/pango-1.0/pango/pangofc-font.h	33	include/pango-1.0/pango/pangofc-font.h
33	include/pango-1.0/pango/pangofc-fontmap.h	34	include/pango-1.0/pango/pangofc-fontmap.h
34	include/pango-1.0/pango/pangoft2.h	35	include/pango-1.0/pango/pangoft2.h
35	%%X11%%include/pango-1.0/pango/pangoxft-render.h	36	include/pango-1.0/pango/pangoxft-render.h
36	%%X11%%include/pango-1.0/pango/pangoxft.h	37	include/pango-1.0/pango/pangoxft.h
37	lib/girepository-1.0/Pango-1.0.typelib	38	lib/girepository-1.0/Pango-1.0.typelib
38	lib/girepository-1.0/PangoCairo-1.0.typelib	39	lib/girepository-1.0/PangoCairo-1.0.typelib
39	lib/girepository-1.0/PangoFT2-1.0.typelib	40	lib/girepository-1.0/PangoFT2-1.0.typelib
40	%%X11%%lib/girepository-1.0/PangoXft-1.0.typelib	41	lib/girepository-1.0/PangoFc-1.0.typelib
		42	lib/girepository-1.0/PangoOT-1.0.typelib
		43	lib/girepository-1.0/PangoXft-1.0.typelib
41	lib/libpango-1.0.so	44	lib/libpango-1.0.so
42	lib/libpango-1.0.so.0	45	lib/libpango-1.0.so.0
43	lib/libpango-1.0.so.%%LIBVERSION%%	46	lib/libpango-1.0.so.%%LIBVERSION%%
Lines 47-70 Link Here
47	lib/libpangoft2-1.0.so	50	lib/libpangoft2-1.0.so
48	lib/libpangoft2-1.0.so.0	51	lib/libpangoft2-1.0.so.0
49	lib/libpangoft2-1.0.so.%%LIBVERSION%%	52	lib/libpangoft2-1.0.so.%%LIBVERSION%%
50	%%X11%%lib/libpangoxft-1.0.so	53	lib/libpangoxft-1.0.so
51	%%X11%%lib/libpangoxft-1.0.so.0	54	lib/libpangoxft-1.0.so.0
52	%%X11%%lib/libpangoxft-1.0.so.%%LIBVERSION%%	55	lib/libpangoxft-1.0.so.%%LIBVERSION%%
53	libdata/pkgconfig/pango.pc	56	libdata/pkgconfig/pango.pc
54	libdata/pkgconfig/pangocairo.pc	57	libdata/pkgconfig/pangocairo.pc
		58	libdata/pkgconfig/pangofc.pc
55	libdata/pkgconfig/pangoft2.pc	59	libdata/pkgconfig/pangoft2.pc
56	%%X11%%libdata/pkgconfig/pangoxft.pc	60	libdata/pkgconfig/pangoot.pc
57	man/man1/pango-view.1.gz	61	libdata/pkgconfig/pangoxft.pc
58	share/gir-1.0/Pango-1.0.gir	62	share/gir-1.0/Pango-1.0.gir
59	share/gir-1.0/PangoCairo-1.0.gir	63	share/gir-1.0/PangoCairo-1.0.gir
60	share/gir-1.0/PangoFT2-1.0.gir	64	share/gir-1.0/PangoFT2-1.0.gir
61	%%X11%%share/gir-1.0/PangoXft-1.0.gir	65	share/gir-1.0/PangoFc-1.0.gir
		66	share/gir-1.0/PangoOT-1.0.gir
		67	share/gir-1.0/PangoXft-1.0.gir
62	%%PORTDOCS%%share/gtk-doc/html/pango/PangoEngineLang.html	68	%%PORTDOCS%%share/gtk-doc/html/pango/PangoEngineLang.html
63	%%PORTDOCS%%share/gtk-doc/html/pango/PangoEngineShape.html	69	%%PORTDOCS%%share/gtk-doc/html/pango/PangoEngineShape.html
64	%%PORTDOCS%%share/gtk-doc/html/pango/PangoFcDecoder.html	70	%%PORTDOCS%%share/gtk-doc/html/pango/PangoFcDecoder.html
65	%%PORTDOCS%%share/gtk-doc/html/pango/PangoFcFont.html	71	%%PORTDOCS%%share/gtk-doc/html/pango/PangoFcFont.html
66	%%PORTDOCS%%share/gtk-doc/html/pango/PangoFcFontMap.html	72	%%PORTDOCS%%share/gtk-doc/html/pango/PangoFcFontMap.html
67	%%PORTDOCS%%share/gtk-doc/html/pango/PangoMarkupFormat.html
68	%%PORTDOCS%%share/gtk-doc/html/pango/PangoRenderer.html	73	%%PORTDOCS%%share/gtk-doc/html/pango/PangoRenderer.html
69	%%PORTDOCS%%share/gtk-doc/html/pango/annotation-glossary.html	74	%%PORTDOCS%%share/gtk-doc/html/pango/annotation-glossary.html
70	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-10.html	75	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-10.html
Lines 84-102 Link Here
84	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-34.html	89	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-34.html
85	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-38.html	90	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-38.html
86	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-4.html	91	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-4.html
87	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-40.html	92	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-42.html
		93	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-44.html
		94	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-46.html
88	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-6.html	95	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-6.html
89	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-8.html	96	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-8.html
90	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-deprecated.html	97	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-deprecated.html
91	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-full.html	98	%%PORTDOCS%%share/gtk-doc/html/pango/api-index-full.html
		99	%%PORTDOCS%%share/gtk-doc/html/pango/deprecated.html
92	%%PORTDOCS%%share/gtk-doc/html/pango/home.png	100	%%PORTDOCS%%share/gtk-doc/html/pango/home.png
93	%%PORTDOCS%%share/gtk-doc/html/pango/index.html	101	%%PORTDOCS%%share/gtk-doc/html/pango/index.html
94	%%PORTDOCS%%share/gtk-doc/html/pango/layout.gif	102	%%PORTDOCS%%share/gtk-doc/html/pango/layout.png
95	%%PORTDOCS%%share/gtk-doc/html/pango/left-insensitive.png	103	%%PORTDOCS%%share/gtk-doc/html/pango/left-insensitive.png
96	%%PORTDOCS%%share/gtk-doc/html/pango/left.png	104	%%PORTDOCS%%share/gtk-doc/html/pango/left.png
97	%%PORTDOCS%%share/gtk-doc/html/pango/lowlevel.html	105	%%PORTDOCS%%share/gtk-doc/html/pango/lowlevel.html
98	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Bidirectional-Text.html	106	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Bidirectional-Text.html
99	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Cairo-Rendering.html	107	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Cairo-Rendering.html
		108	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Contexts.html
100	%%PORTDOCS%%share/gtk-doc/html/pango/pango-CoreText-Fonts.html	109	%%PORTDOCS%%share/gtk-doc/html/pango/pango-CoreText-Fonts.html
101	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Coverage-Maps.html	110	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Coverage-Maps.html
102	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Engines.html	111	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Engines.html
Lines 104-109 Link Here
104	%%PORTDOCS%%share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html	113	%%PORTDOCS%%share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html
105	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Glyph-Storage.html	114	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Glyph-Storage.html
106	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Layout-Objects.html	115	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Layout-Objects.html
		116	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Markup.html
107	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html	117	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html
108	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Modules.html	118	%%PORTDOCS%%share/gtk-doc/html/pango/pango-Modules.html
109	%%PORTDOCS%%share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html	119	%%PORTDOCS%%share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html
Lines 118-123 Link Here
118	%%PORTDOCS%%share/gtk-doc/html/pango/pango-hierarchy.html	128	%%PORTDOCS%%share/gtk-doc/html/pango/pango-hierarchy.html
119	%%PORTDOCS%%share/gtk-doc/html/pango/pango.devhelp2	129	%%PORTDOCS%%share/gtk-doc/html/pango/pango.devhelp2
120	%%PORTDOCS%%share/gtk-doc/html/pango/pango.html	130	%%PORTDOCS%%share/gtk-doc/html/pango/pango.html
		131	%%PORTDOCS%%share/gtk-doc/html/pango/pipeline.png
		132	%%PORTDOCS%%share/gtk-doc/html/pango/rects1.png
		133	%%PORTDOCS%%share/gtk-doc/html/pango/rects2.png
121	%%PORTDOCS%%share/gtk-doc/html/pango/rendering.html	134	%%PORTDOCS%%share/gtk-doc/html/pango/rendering.html
122	%%PORTDOCS%%share/gtk-doc/html/pango/right-insensitive.png	135	%%PORTDOCS%%share/gtk-doc/html/pango/right-insensitive.png
123	%%PORTDOCS%%share/gtk-doc/html/pango/right.png	136	%%PORTDOCS%%share/gtk-doc/html/pango/right.png