From gitlab-mirror at kemper.freedesktop.org Thu Oct 3 22:04:03 2024 From: gitlab-mirror at kemper.freedesktop.org (GitLab Mirror) Date: Thu, 3 Oct 2024 22:04:03 +0000 (UTC) Subject: 2 commits - src/cairo-ft-private.h Message-ID: <20241003220403.4D884761E7@kemper.freedesktop.org> src/cairo-ft-private.h | 2 ++ 1 file changed, 2 insertions(+) New commits: commit 21e6b2c6ad40d2647542be372ebf8283ea2807d5 Merge: b9eed915f 9607e19a9 Author: Adrian Johnson Date: Thu Oct 3 22:04:01 2024 +0000 Merge branch 'feature/bugfix-include-ft-color' into 'master' cairo-ft-private.h: fix missing FT_Color error Closes #792 See merge request cairo/cairo!597 commit 9607e19a9e4c1784e7b656772e1df82aea26f6e7 Author: Thomas Devoogdt Date: Sun Nov 12 09:58:05 2023 +0100 cairo-ft-private.h: fix missing FT_Color error In file included from ../src/cairo-colr-glyph-render.c:37: ../src/cairo-ft-private.h:87:30: error: unknown type name 'FT_Color' 87 | FT_Color *palette, | ^~~~~~~~ Fixes https://gitlab.freedesktop.org/cairo/cairo/-/issues/792 Signed-off-by: Thomas Devoogdt diff --git a/src/cairo-ft-private.h b/src/cairo-ft-private.h index 836f7e523..6b0e30223 100644 --- a/src/cairo-ft-private.h +++ b/src/cairo-ft-private.h @@ -43,6 +43,8 @@ #if CAIRO_HAS_FT_FONT +#include FT_COLOR_H + CAIRO_BEGIN_DECLS typedef struct _cairo_ft_unscaled_font cairo_ft_unscaled_font_t; From gitlab-mirror at kemper.freedesktop.org Sun Oct 13 22:19:16 2024 From: gitlab-mirror at kemper.freedesktop.org (GitLab Mirror) Date: Sun, 13 Oct 2024 22:19:16 +0000 (UTC) Subject: 3 commits - meson.build perf/cairo-perf-print.c test/pdf-structure.c Message-ID: <20241013221916.EA0AC76106@kemper.freedesktop.org> meson.build | 1 + perf/cairo-perf-print.c | 3 +++ test/pdf-structure.c | 3 +++ 3 files changed, 7 insertions(+) New commits: commit 5111be12d470cf1b8da05ef061ed9069f5c87d01 Merge: 21e6b2c6a 78f7dbcba Author: Emmanuele Bassi Date: Sun Oct 13 22:19:15 2024 +0000 Merge branch 'solaris' into 'master' Fix cairo-perf-print & pdf-structure test builds on Solaris See merge request cairo/cairo!599 commit 78f7dbcba8c068d5383de9a8aec82d7bb3cfdda3 Author: Alan Coopersmith Date: Sun Oct 13 11:06:18 2024 -0700 Fix cairo-perf-print build on Solaris Adds include of if system has it, in order to fix: ../perf/cairo-perf-print.c: In function ?report_print?: ../perf/cairo-perf-print.c:62:28: error: storage size of ?ws? isn?t known 62 | struct winsize ws; | ^~ ../perf/cairo-perf-print.c:64:26: error: ?TIOCGWINSZ? undeclared (first use in this function) 64 | if(ioctl(fd, TIOCGWINSZ, &ws) == 0 ) { | ^~~~~~~~~~ Signed-off-by: Alan Coopersmith diff --git a/meson.build b/meson.build index e45e441f3..162b2927c 100644 --- a/meson.build +++ b/meson.build @@ -138,6 +138,7 @@ check_headers = [ ['sys/ioctl.h'], ['intsafe.h'], ['alloca.h'], + ['termios.h'], ] check_types = [ diff --git a/perf/cairo-perf-print.c b/perf/cairo-perf-print.c index ab1440f55..e9c493fa3 100644 --- a/perf/cairo-perf-print.c +++ b/perf/cairo-perf-print.c @@ -43,6 +43,9 @@ #if USE_TERMINAL_SIZE #include #include +#if HAVE_TERMIOS_H +#include +#endif #endif static void commit 936f20c37e6152354f74d0304eaa029f35c3b45d Author: Alan Coopersmith Date: Sun Oct 13 11:01:59 2024 -0700 Fix pdf-structure test build on Solaris Adds include of if system has it, in order to fix: ../test/pdf-structure.c: In function ?check_pdf?: ../test/pdf-structure.c:551:21: error: implicit declaration of function ?WIFEXITED? [-Wimplicit-function-declaration] 551 | WIFEXITED (ret) ? WEXITSTATUS (ret) : -1); | ^~~~~~~~~ ../test/pdf-structure.c:551:39: error: implicit declaration of function ?WEXITSTATUS? [-Wimplicit-function-declaration] 551 | WIFEXITED (ret) ? WEXITSTATUS (ret) : -1); | ^~~~~~~~~~~ Signed-off-by: Alan Coopersmith diff --git a/test/pdf-structure.c b/test/pdf-structure.c index a9125d2b7..a12d0305f 100644 --- a/test/pdf-structure.c +++ b/test/pdf-structure.c @@ -33,6 +33,9 @@ #ifdef HAVE_UNISTD_H #include /* __unix__ */ #endif +#if HAVE_SYS_WAIT_H +#include +#endif #include #include From gitlab-mirror at kemper.freedesktop.org Sat Oct 19 09:11:37 2024 From: gitlab-mirror at kemper.freedesktop.org (GitLab Mirror) Date: Sat, 19 Oct 2024 09:11:37 +0000 (UTC) Subject: 2 commits - BUGS HACKING Message-ID: <20241019091137.6EFF076106@kemper.freedesktop.org> BUGS | 19 +++++++++---------- HACKING | 4 ++-- 2 files changed, 11 insertions(+), 12 deletions(-) New commits: commit 17ea368a18a7484f5ca46198edb97cc5efacd91c Merge: 5111be12d 6702561c7 Author: Uli Schlachter Date: Sat Oct 19 09:11:31 2024 +0000 Merge branch 'gitlab' into 'master' BUGS: update bug database links to use gitlab instead of bugzilla See merge request cairo/cairo!598 commit 6702561c74de8b0eb4906f8ff1ed597c8177dcbf Author: Alan Coopersmith Date: Mon Sep 30 18:58:00 2024 -0700 BUGS: update bug database links to use gitlab instead of bugzilla Signed-off-by: Alan Coopersmith diff --git a/BUGS b/BUGS index 452d52300..a2631e9f4 100644 --- a/BUGS +++ b/BUGS @@ -6,22 +6,22 @@ extra effort users put in to providing high-quality bug reports. There are two acceptable ways to report cairo bugs, and you can choose which you prefer: -1) Bugzilla bug tracking database: +1) Gitlab bug tracking database: You can use the following web interface to report new bugs, follow up on previous bug reports, and search for existing, known - bugs. Just use the "cairo" product: + bugs: - https://bugs.freedesktop.org + https://gitlab.freedesktop.org/cairo/cairo/-/issues It is necessary to go through a quick account creation process, (with email address verification), in order to be able to report - new bugs in bugzilla. We apologize for any inconvenience that might + new bugs in gitlab. We apologize for any inconvenience that might cause, and hope it won't prevent you from reporting bugs. 2) Cairo mailing list: - For people who cannot stand the bugzilla interface, you can just + For people who cannot stand the gitlab interface, you can just send an email to cairo mailing list (cairo at cairographics.org). The mailing list only allows posting from subscribers, so use the following page for subscription instructions: @@ -39,8 +39,8 @@ which you prefer: Which of the above you use to report bugs depends on your own preferences. Some people find just typing an email message much easier -than using the web-based forms on bugzilla. Others greatly prefer the -ability to check back on a specific bug entry in bugzilla without +than using the web-based forms on gitlab. Others greatly prefer the +ability to check back on a specific bug entry in gitlab without having to ask on the mailing list if an issue has been resolved. Regardless of which method you use, here are some general tips that @@ -48,9 +48,8 @@ will help you improve the quality of your bug report, (which will help in getting the bug fixed sooner): 1) Check to see if the bug has been reported already. It's pretty easy - to run a search or two against the cairo product in the - https://bugs.freedesktop.org bugzilla database. Another place to - look for known bugs is the cairo ROADMAP: + to run a search or two against the cairo product in the gitlab + database. Another place to look for known bugs is the cairo ROADMAP: https://cairographics.org/ROADMAP diff --git a/HACKING b/HACKING index bc97f5324..b771e5813 100644 --- a/HACKING +++ b/HACKING @@ -46,9 +46,9 @@ the -commit and -bugs lists. Bug Tracking System ------------------- -We use a standard bugzilla bug tracking system available at: +We use a standard gitlab bug tracking system available at: - https://bugs.freedesktop.org/ + https://gitlab.freedesktop.org/cairo/cairo/-/issues See file named BUGS for detailed information on reporting bugs. In short, for straight bug reports, it's best to report them there such that they From gitlab-mirror at kemper.freedesktop.org Sat Oct 26 14:29:22 2024 From: gitlab-mirror at kemper.freedesktop.org (GitLab Mirror) Date: Sat, 26 Oct 2024 14:29:22 +0000 (UTC) Subject: 2 commits - src/win32 Message-ID: <20241026142922.A52A276106@kemper.freedesktop.org> src/win32/cairo-dwrite-font.cpp | 4 ++-- src/win32/dw-extra.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) New commits: commit 33173d9f1a79a58d518ffbe0e597bd4ca9bf1464 Merge: 17ea368a1 0835add95 Author: Tim-Philipp M?ller Date: Sat Oct 26 14:29:19 2024 +0000 Merge branch 'mingw11' into 'master' dwrite: Fix build with MinGW 11 Closes #874 See merge request cairo/cairo!600 commit 0835add95c1391164e52c551569a9c46a6fcd90c Author: Nirbheek Chauhan Date: Fri Oct 18 02:36:48 2024 +0530 dwrite: Fix build with MinGW 11 DWRITE_GLYPH_IMAGE_FORMATS is now defined by dcommon.h In file included from C:/msys64/ucrt64/include/minwindef.h:163, from C:/msys64/ucrt64/include/windef.h:9, from C:/msys64/ucrt64/include/windows.h:69, from ..\src/cairo-mutex-impl-private.h:182, from ..\src/cairo-mutex-type-private.h:45, from ..\src/cairo-scaled-font-private.h:45, from ..\src/cairoint.h:415, from ../src/win32/cairo-dwrite-font.cpp:37: ../src/win32/dw-extra.h:26:1: error: redefinition of 'DWRITE_GLYPH_IMAGE_FORMATS operator|(DWRITE_GLYPH_IMAGE_FORMATS, DWRITE_GLYPH_IMAGE_FORMATS)' 26 | DEFINE_ENUM_FLAG_OPERATORS(DWRITE_GLYPH_IMAGE_FORMATS); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ C:/msys64/ucrt64/include/dcommon.h:67:1: note: 'DWRITE_GLYPH_IMAGE_FORMATS operator|(DWRITE_GLYPH_IMAGE_FORMATS, DWRITE_GLYPH_IMAGE_FORMATS)' previously defined here 67 | DEFINE_ENUM_FLAG_OPERATORS(DWRITE_GLYPH_IMAGE_FORMATS) | ^~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/src/win32/cairo-dwrite-font.cpp b/src/win32/cairo-dwrite-font.cpp index b6931b367..f7d1c4767 100644 --- a/src/win32/cairo-dwrite-font.cpp +++ b/src/win32/cairo-dwrite-font.cpp @@ -1047,13 +1047,13 @@ _cairo_dwrite_scaled_font_init_glyph_color_surface(cairo_dwrite_scaled_font_t *s matrix = _cairo_dwrite_matrix_from_matrix(&scaled_font->mat); /* The list of glyph image formats this renderer is prepared to support. */ - DWRITE_GLYPH_IMAGE_FORMATS supported_formats = + DWRITE_GLYPH_IMAGE_FORMATS supported_formats = static_cast( DWRITE_GLYPH_IMAGE_FORMATS_COLR | DWRITE_GLYPH_IMAGE_FORMATS_SVG | DWRITE_GLYPH_IMAGE_FORMATS_PNG | DWRITE_GLYPH_IMAGE_FORMATS_JPEG | DWRITE_GLYPH_IMAGE_FORMATS_TIFF | - DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8; + DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8); RefPtr fontFace2; UINT32 palette_count = 0; diff --git a/src/win32/dw-extra.h b/src/win32/dw-extra.h index 424fb606d..a9daced21 100644 --- a/src/win32/dw-extra.h +++ b/src/win32/dw-extra.h @@ -23,6 +23,8 @@ struct DWRITE_COLOR_GLYPH_RUN1_WORKAROUND : DWRITE_COLOR_GLYPH_RUN typedef DWRITE_COLOR_GLYPH_RUN1 DWRITE_COLOR_GLYPH_RUN1_WORKAROUND; #endif +#if !defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 11 DEFINE_ENUM_FLAG_OPERATORS(DWRITE_GLYPH_IMAGE_FORMATS); +#endif #endif /* DWRITE_EXTRA_H */