This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 706194dc908b822ecf2b90809be18e27ec47747f (commit) via d6ba15495378561e7558958c1c77407077601977 (commit) via 91890e3d610ed07ca8d901aabd66738f8512da02 (commit) from 3658e16a21e92e06f2c51ff8fbfa2248dcfba9f0 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 706194dc908b822ecf2b90809be18e27ec47747f Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 19 12:55:31 2022 +0000
pango: Update to 1.90.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d6ba15495378561e7558958c1c77407077601977 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 19 12:54:23 2022 +0000
cairo: Update to 1.17.6
This patch also changes that we use meson instead of autotools to build cairo. The autotools build seems to have been incomplete and did not allow us to build pango against cairo.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 91890e3d610ed07ca8d901aabd66738f8512da02 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 19 12:53:38 2022 +0000
harfbuzz: Enable GObject Introspection
This is required to build pango.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: cairo/cairo.nm | 31 +++-- cairo/patches/cairo-1.17.6-meson-fixes.patch | 178 +++++++++++++++++++++++++++ harfbuzz/harfbuzz.nm | 7 +- pango/pango.nm | 32 +++-- 4 files changed, 228 insertions(+), 20 deletions(-) create mode 100644 cairo/patches/cairo-1.17.6-meson-fixes.patch
Difference in files: diff --git a/cairo/cairo.nm b/cairo/cairo.nm index 5cdf4c8a3..d14e15a61 100644 --- a/cairo/cairo.nm +++ b/cairo/cairo.nm @@ -4,7 +4,8 @@ ###############################################################################
name = cairo -version = 1.16.0 +version = %{ver_maj}.6 +ver_maj = 1.17 release = 1
groups = System/Graphics @@ -17,28 +18,42 @@ description and print output. end
-source_dl = https://cairographics.org/releases/ +source_dl = https://download.gnome.org/sources/%%7Bname%7D/%%7Bver_maj%7D/ sources = %{thisapp}.tar.xz
build requires - binutils >= 2.21.51.0.8-2 + expat-devel fontconfig-devel >= 2.10 freetype-devel + ghostscript-devel glib2-devel >= 2.14 gobject-introspection-devel libxml2-devel libpng-devel + lzo-devel + meson + ninja pixman-devel >= 0.30.0 pkg-config zlib-devel end
- configure_options += \ - --enable-xml \ - --enable-gobject \ - --disable-gtk-doc \ - --disable-static + build + # Tests require poppler which we currently don't have + %{meson} \ + -Dtests=disabled \ + -Dspectre=disabled \ + -Dsymbol-lookup=disabled \ + -Dxcb=disabled \ + -Dxlib=disabled + + %{meson_build} + end + + install + %{meson_install} + end end
packages diff --git a/cairo/patches/cairo-1.17.6-meson-fixes.patch b/cairo/patches/cairo-1.17.6-meson-fixes.patch new file mode 100644 index 000000000..ea0244851 --- /dev/null +++ b/cairo/patches/cairo-1.17.6-meson-fixes.patch @@ -0,0 +1,178 @@ +diff -urN cairo-1.17.6.old/doc/public/meson.build cairo-1.17.6/doc/public/meson.build +--- cairo-1.17.6.old/doc/public/meson.build 1970-01-01 01:00:00.000000000 +0100 ++++ cairo-1.17.6/doc/public/meson.build 2022-03-20 16:22:31.018317576 +0000 +@@ -0,0 +1,156 @@ ++gnome = import('gnome') ++ ++ignore_headers = [ ++ # Sub-directories ++ 'win32', ++ ++ # Internal headers ++ 'cairoint.h', ++ 'cairo-features.h', ++ 'cairo-features-win32.h', ++ ++ # Inlined API ++ 'cairo-box-inline.h', ++ 'cairo-clip-inline.h', ++ 'cairo-combsort-inline.h', ++ 'cairo-contour-inline.h', ++ 'cairo-error-inline.h', ++ 'cairo-image-surface-inline.h', ++ 'cairo-line-inline.h', ++ 'cairo-list-inline.h', ++ 'cairo-pattern-inline.h', ++ 'cairo-recording-surface-inline.h', ++ 'cairo-surface-inline.h', ++ 'cairo-surface-observer-inline.h', ++ 'cairo-surface-snapshot-inline.h', ++ 'cairo-surface-subsurface-inline.h', ++ ++ # Private headers ++ 'cairo-analysis-surface-private.h', ++ 'cairo-arc-private.h', ++ 'cairo-array-private.h', ++ 'cairo-atomic-private.h', ++ 'cairo-backend-private.h', ++ 'cairo-boxes-private.h', ++ 'cairo-cache-private.h', ++ 'cairo-clip-private.h', ++ 'cairo-compiler-private.h', ++ 'cairo-composite-rectangles-private.h', ++ 'cairo-compositor-private.h', ++ 'cairo-contour-private.h', ++ 'cairo-damage-private.h', ++ 'cairo-default-context-private.h', ++ 'cairo-deprecated.h', ++ 'cairo-device-private.h', ++ 'cairo-error-private.h', ++ 'cairo-fixed-private.h', ++ 'cairo-fixed-type-private.h', ++ 'cairo-fontconfig-private.h', ++ 'cairo-freed-pool-private.h', ++ 'cairo-freelist-private.h', ++ 'cairo-freelist-type-private.h', ++ 'cairo-ft-private.h', ++ 'cairo-gstate-private.h', ++ 'cairo-hash-private.h', ++ 'cairo-image-info-private.h', ++ 'cairo-image-surface-private.h', ++ 'cairo-line-private.h', ++ 'cairo-list-private.h', ++ 'cairo-malloc-private.h', ++ 'cairo-mempool-private.h', ++ 'cairo-mutex-impl-private.h', ++ 'cairo-mutex-list-private.h', ++ 'cairo-mutex-private.h', ++ 'cairo-mutex-type-private.h', ++ 'cairo-output-stream-private.h', ++ 'cairo-paginated-private.h', ++ 'cairo-paginated-surface-private.h', ++ 'cairo-path-fixed-private.h', ++ 'cairo-path-private.h', ++ 'cairo-pattern-private.h', ++ 'cairo-pdf-operators-private.h', ++ 'cairo-pdf-shading-private.h', ++ 'cairo-pdf-surface-private.h', ++ 'cairo-pixman-private.h', ++ 'cairo-private.h', ++ 'cairo-ps-surface-private.h', ++ 'cairo-quartz-private.h', ++ 'cairo-recording-surface-private.h', ++ 'cairo-reference-count-private.h', ++ 'cairo-region-private.h', ++ 'cairo-rtree-private.h', ++ 'cairo-scaled-font-private.h', ++ 'cairo-scaled-font-subsets-private.h', ++ 'cairo-script-private.h', ++ 'cairo-slope-private.h', ++ 'cairo-spans-compositor-private.h', ++ 'cairo-spans-private.h', ++ 'cairo-stroke-dash-private.h', ++ 'cairo-surface-backend-private.h', ++ 'cairo-surface-clipper-private.h', ++ 'cairo-surface-fallback-private.h', ++ 'cairo-surface-observer-private.h', ++ 'cairo-surface-offset-private.h', ++ 'cairo-surface-private.h', ++ 'cairo-surface-snapshot-private.h', ++ 'cairo-surface-subsurface-private.h', ++ 'cairo-surface-wrapper-private.h', ++ 'cairo-svg-surface-private.h', ++ 'cairo-tag-attributes-private.h', ++ 'cairo-tag-stack-private.h', ++ 'cairo-tee-surface-private.h', ++ 'cairo-time-private.h', ++ 'cairo-traps-private.h', ++ 'cairo-tristrip-private.h', ++ 'cairo-truetype-subset-private.h', ++ 'cairo-type1-private.h', ++ 'cairo-type3-glyph-surface-private.h', ++ 'cairo-types-private.h', ++ 'cairo-user-font-private.h', ++ 'cairo-wideint-private.h', ++ 'cairo-wideint-type-private.h', ++ 'cairo-xcb-private.h', ++ 'cairo-xlib-private.h', ++ 'cairo-xlib-surface-private.h', ++ 'cairo-xlib-xrender-private.h', ++ 'test-compositor-surface-private.h', ++] ++ ++ignore_decorators = [ ++ 'cairo_public', ++ 'cairo_private', ++] ++ ++docpath = get_option('prefix') / get_option('datadir') / 'gtk-doc/html' ++version_conf = configuration_data() ++version_conf.set('CAIRO_VERSION', meson.project_version()) ++configure_file( ++ input: 'version.xml.in', ++ output: 'version.xml', ++ configuration: version_conf ++) ++ ++gnome.gtkdoc('cairo', ++ main_xml: 'cairo-docs.xml', ++ namespace: 'cairo', ++ mode: 'sgml', ++ src_dir: doc_srcdir, ++ dependencies: libcairo_dep, ++ scan_args: [ ++ '--ignore-decorators=' + '|'.join(ignore_decorators), ++ '--ignore-headers=' + ' '.join(ignore_headers), ++ ], ++ content_files: [ ++ 'language-bindings.xml', ++ ], ++ expand_content_files: [ ++ 'language-bindings.xml', ++ ], ++ html_assets: [ ++ ], ++ fixxref_args: [ ++ '--html-dir=' + docpath, ++ ], ++ install: true, ++ check: true, ++) +diff -urN cairo-1.17.6.old/doc/public/version.xml.in cairo-1.17.6/doc/public/version.xml.in +--- cairo-1.17.6.old/doc/public/version.xml.in 1970-01-01 01:00:00.000000000 +0100 ++++ cairo-1.17.6/doc/public/version.xml.in 2022-03-20 16:33:04.015756161 +0000 +@@ -0,0 +1 @@ ++@CAIRO_VERSION@ +diff -urN cairo-1.17.6.old/meson-cc-tests/check-unused-result.c cairo-1.17.6/meson-cc-tests/check-unused-result.c +--- cairo-1.17.6.old/meson-cc-tests/check-unused-result.c 1970-01-01 01:00:00.000000000 +0100 ++++ cairo-1.17.6/meson-cc-tests/check-unused-result.c 2022-03-20 15:55:39.285562258 +0000 +@@ -0,0 +1,9 @@ ++__attribute__((__warn_unused_result__)) void f (void) {} ++__attribute__((__warn_unused_result__)) int g; ++ ++int main(int c, char **v) ++{ ++ (void)c; ++ (void)v; ++ return 0; ++} diff --git a/harfbuzz/harfbuzz.nm b/harfbuzz/harfbuzz.nm index eb13ad787..e5f9c93da 100644 --- a/harfbuzz/harfbuzz.nm +++ b/harfbuzz/harfbuzz.nm @@ -5,7 +5,7 @@
name = harfbuzz version = 5.3.1 -release = 1 +release = 2
groups = System/Libraries url = https://freedesktop.org/wiki/Software/HarfBuzz @@ -24,6 +24,7 @@ build cairo-devel freetype-devel glib2-devel + gobject-introspection-devel icu-devel end
@@ -31,8 +32,10 @@ build --disable-static \ --with-gobject
+ export LD_LIBRARY_PATH=%{DIR_APP}/src/.libs + test - LD_LIBRARY_PATH=%{DIR_APP}/src/.libs make check || : + make check || : end end
diff --git a/pango/pango.nm b/pango/pango.nm index dc14b5564..5108ebdc3 100644 --- a/pango/pango.nm +++ b/pango/pango.nm @@ -5,12 +5,12 @@
name = pango version = %{ver_major}.%{ver_minor} -ver_major = 1.40 -ver_minor = 3 -release = 2 +ver_major = 1.90 +ver_minor = 0 +release = 1
groups = System/Libraries -url = http://www.pango.org/ +url = https://www.pango.org/ license = LGPLv2+ summary = System for layout and rendering of internationalized text.
@@ -19,27 +19,39 @@ description emphasis on internationalization. end
-source_dl = http://ftp.gnome.org/pub/GNOME/sources/%%7Bname%7D/%%7Bver_major%7D/ +source_dl = https://ftp.gnome.org/pub/GNOME/sources/%%7Bname%7D/%%7Bver_major%7D/ sources = %{thisapp}.tar.xz
+# Disable LTO +LTO_CFLAGS = + build requires + cairo-devel >= 1.17 cairo-gobject-devel fontconfig-devel freetype-devel + fribidi-devel gcc-c++ glib2-devel gobject-introspection-devel - harfbuzz-devel >= 0.9.9 + harfbuzz-devel >= 4.3.0 + libthai-devel + meson perl pkg-config end
- configure_options += \ - --enable-introspection=yes \ - --enable-installed-tests + build + %{meson} + %{meson_build} + end + + install + %{meson_install} + end
- export LD_LIBRARY_PATH = %{DIR_APP}/pango/.libs + #export LD_LIBRARY_PATH = %{DIR_APP}/pango/.libs end
packages
hooks/post-receive -- IPFire 3.x development tree