--- Makefile (révision 550015) +++ Makefile (copie de travail) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= pango -PORTVERSION= 1.42.4 -PORTREVISION= 4 +PORTVERSION= 1.46.2 CATEGORIES= x11-toolkits MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 +DIST_SUBDIR= gnome MAINTAINER= desktop@FreeBSD.org COMMENT= Open-source framework for the layout and rendering of i18n text @@ -14,22 +13,24 @@ 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 + 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 +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.4200.3 +LIBVERSION= 0.4600.2 PLIST_SUB+= VERSION=${VERSION} LIBVERSION=${LIBVERSION} FONTSCALE= ${LOCALBASE}/share/fonts/TTF/luximb.ttf @@ -36,16 +37,11 @@ FONTENCOD= ${LOCALBASE}/share/fonts/encodings/encodings.dir OPTIONS_SUB= yes -OPTIONS_DEFINE= X11 DOCS -OPTIONS_DEFAULT=X11 +OPTIONS_DEFINE= DOCS -DOCS_MESON_TRUE= enable_docs +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 \ --- distinfo (révision 550015) +++ distinfo (copie de travail) @@ -1,3 +1,3 @@ -TIMESTAMP = 1536530045 -SHA256 (gnome2/pango-1.42.4.tar.xz) = 1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d -SIZE (gnome2/pango-1.42.4.tar.xz) = 833876 +TIMESTAMP = 1600700791 +SHA256 (gnome/pango-1.46.2.tar.xz) = d89fab5f26767261b493279b65cfb9eb0955cd44c07c5628d36094609fc51841 +SIZE (gnome/pango-1.46.2.tar.xz) = 535108 --- files/CVE-20191010238 (révision 550015) +++ files/CVE-20191010238 (nonexistent) @@ -1,16 +0,0 @@ ---- ../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)) --- files/patch-docs-meson.build (révision 550015) +++ files/patch-docs-meson.build (nonexistent) @@ -1,40 +0,0 @@ ---- 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() --- files/patch-meson.build (révision 550015) +++ files/patch-meson.build (nonexistent) @@ -1,35 +0,0 @@ ---- 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] --- files/patch-meson_options.txt (révision 550015) +++ files/patch-meson_options.txt (nonexistent) @@ -1,18 +0,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) --- files/patch-pango_meson.build (révision 550015) +++ files/patch-pango_meson.build (nonexistent) @@ -1,111 +0,0 @@ ---- 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) --- files/patch-tests_meson.build (révision 550015) +++ files/patch-tests_meson.build (nonexistent) @@ -1,92 +0,0 @@ ---- 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 --- files/patch-utils_meson.build (révision 550015) +++ files/patch-utils_meson.build (nonexistent) @@ -1,32 +0,0 @@ ---- 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() --- pkg-plist (révision 550015) +++ pkg-plist (copie de travail) @@ -5,6 +5,7 @@ include/pango-1.0/pango/pango-break.h include/pango-1.0/pango/pango-context.h include/pango-1.0/pango/pango-coverage.h +include/pango-1.0/pango/pango-direction.h include/pango-1.0/pango/pango-engine.h include/pango-1.0/pango/pango-enum-types.h include/pango-1.0/pango/pango-features.h @@ -32,12 +33,14 @@ include/pango-1.0/pango/pangofc-font.h include/pango-1.0/pango/pangofc-fontmap.h include/pango-1.0/pango/pangoft2.h -%%X11%%include/pango-1.0/pango/pangoxft-render.h -%%X11%%include/pango-1.0/pango/pangoxft.h +include/pango-1.0/pango/pangoxft-render.h +include/pango-1.0/pango/pangoxft.h lib/girepository-1.0/Pango-1.0.typelib lib/girepository-1.0/PangoCairo-1.0.typelib lib/girepository-1.0/PangoFT2-1.0.typelib -%%X11%%lib/girepository-1.0/PangoXft-1.0.typelib +lib/girepository-1.0/PangoFc-1.0.typelib +lib/girepository-1.0/PangoOT-1.0.typelib +lib/girepository-1.0/PangoXft-1.0.typelib lib/libpango-1.0.so lib/libpango-1.0.so.0 lib/libpango-1.0.so.%%LIBVERSION%% @@ -47,24 +50,26 @@ lib/libpangoft2-1.0.so lib/libpangoft2-1.0.so.0 lib/libpangoft2-1.0.so.%%LIBVERSION%% -%%X11%%lib/libpangoxft-1.0.so -%%X11%%lib/libpangoxft-1.0.so.0 -%%X11%%lib/libpangoxft-1.0.so.%%LIBVERSION%% +lib/libpangoxft-1.0.so +lib/libpangoxft-1.0.so.0 +lib/libpangoxft-1.0.so.%%LIBVERSION%% libdata/pkgconfig/pango.pc libdata/pkgconfig/pangocairo.pc +libdata/pkgconfig/pangofc.pc libdata/pkgconfig/pangoft2.pc -%%X11%%libdata/pkgconfig/pangoxft.pc -man/man1/pango-view.1.gz +libdata/pkgconfig/pangoot.pc +libdata/pkgconfig/pangoxft.pc share/gir-1.0/Pango-1.0.gir share/gir-1.0/PangoCairo-1.0.gir share/gir-1.0/PangoFT2-1.0.gir -%%X11%%share/gir-1.0/PangoXft-1.0.gir +share/gir-1.0/PangoFc-1.0.gir +share/gir-1.0/PangoOT-1.0.gir +share/gir-1.0/PangoXft-1.0.gir %%PORTDOCS%%share/gtk-doc/html/pango/PangoEngineLang.html %%PORTDOCS%%share/gtk-doc/html/pango/PangoEngineShape.html %%PORTDOCS%%share/gtk-doc/html/pango/PangoFcDecoder.html %%PORTDOCS%%share/gtk-doc/html/pango/PangoFcFont.html %%PORTDOCS%%share/gtk-doc/html/pango/PangoFcFontMap.html -%%PORTDOCS%%share/gtk-doc/html/pango/PangoMarkupFormat.html %%PORTDOCS%%share/gtk-doc/html/pango/PangoRenderer.html %%PORTDOCS%%share/gtk-doc/html/pango/annotation-glossary.html %%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-10.html @@ -84,19 +89,23 @@ %%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-34.html %%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-38.html %%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-4.html -%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-40.html +%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-42.html +%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-44.html +%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-46.html %%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-6.html %%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-8.html %%PORTDOCS%%share/gtk-doc/html/pango/api-index-deprecated.html %%PORTDOCS%%share/gtk-doc/html/pango/api-index-full.html +%%PORTDOCS%%share/gtk-doc/html/pango/deprecated.html %%PORTDOCS%%share/gtk-doc/html/pango/home.png %%PORTDOCS%%share/gtk-doc/html/pango/index.html -%%PORTDOCS%%share/gtk-doc/html/pango/layout.gif +%%PORTDOCS%%share/gtk-doc/html/pango/layout.png %%PORTDOCS%%share/gtk-doc/html/pango/left-insensitive.png %%PORTDOCS%%share/gtk-doc/html/pango/left.png %%PORTDOCS%%share/gtk-doc/html/pango/lowlevel.html %%PORTDOCS%%share/gtk-doc/html/pango/pango-Bidirectional-Text.html %%PORTDOCS%%share/gtk-doc/html/pango/pango-Cairo-Rendering.html +%%PORTDOCS%%share/gtk-doc/html/pango/pango-Contexts.html %%PORTDOCS%%share/gtk-doc/html/pango/pango-CoreText-Fonts.html %%PORTDOCS%%share/gtk-doc/html/pango/pango-Coverage-Maps.html %%PORTDOCS%%share/gtk-doc/html/pango/pango-Engines.html @@ -104,6 +113,7 @@ %%PORTDOCS%%share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html %%PORTDOCS%%share/gtk-doc/html/pango/pango-Glyph-Storage.html %%PORTDOCS%%share/gtk-doc/html/pango/pango-Layout-Objects.html +%%PORTDOCS%%share/gtk-doc/html/pango/pango-Markup.html %%PORTDOCS%%share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html %%PORTDOCS%%share/gtk-doc/html/pango/pango-Modules.html %%PORTDOCS%%share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html @@ -118,6 +128,9 @@ %%PORTDOCS%%share/gtk-doc/html/pango/pango-hierarchy.html %%PORTDOCS%%share/gtk-doc/html/pango/pango.devhelp2 %%PORTDOCS%%share/gtk-doc/html/pango/pango.html +%%PORTDOCS%%share/gtk-doc/html/pango/pipeline.png +%%PORTDOCS%%share/gtk-doc/html/pango/rects1.png +%%PORTDOCS%%share/gtk-doc/html/pango/rects2.png %%PORTDOCS%%share/gtk-doc/html/pango/rendering.html %%PORTDOCS%%share/gtk-doc/html/pango/right-insensitive.png %%PORTDOCS%%share/gtk-doc/html/pango/right.png