Skip to content

Fix #14423: Add support for Cairo, GLib, GTK and ATK version check macros #8147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrchr-github merged 2 commits into from
Jan 22, 2026
Merged

Fix #14423: Add support for Cairo, GLib, GTK and ATK version check macros #8147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17b125e
cfg: Add CAIRO_VERSION_ENCODE()
b4n Jan 21, 2026
3bb7367
cfg: Add version check macros for GLib, GTK and ATK
b4n Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cfg/cairo.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<define name="CAIRO_MIME_TYPE_PNG" value="&quot;image/png&quot;"/>
<define name="CAIRO_MIME_TYPE_URI" value="&quot;text/x-uri&quot;"/>
<define name="CAIRO_MIME_TYPE_UNIQUE_ID" value="&quot;application/x-cairo.uuid&quot;"/>
<define name="CAIRO_VERSION_ENCODE(major, minor, micro)" value="(((major) * 10000) + ((minor) * 100) + ((micro) * 1))"/>
<!-- ########## cairo Allocation / Deallocation ########## -->
<!-- ########## cairo Functions ########## -->
<!-- cairo_t * cairo_create (cairo_surface_t *target); -->
Expand Down
4 changes: 4 additions & 0 deletions cfg/gtk.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23079,4 +23079,8 @@
<define name="GTK_PRIORITY_HIGH" value="G_PRIORITY_HIGH"/>
<define name="GTK_PRIORITY_RESIZE" value="(G_PRIORITY_HIGH_IDLE+10)"/>
<define name="GTK_PRIORITY_REDRAW" value="(G_PRIORITY_HIGH_IDLE+20)"/>
<!-- version check for GLib, ATK and GTK -->
<define name="GLIB_CHECK_VERSION(major, minor, micro)" value="1"/>
<define name="ATK_CHECK_VERSION(major, minor, micro)" value="1"/>
<define name="GTK_CHECK_VERSION(major, minor, micro)" value="1"/>
</def>
3 changes: 3 additions & 0 deletions test/cfg/cairo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@

#include <cairo.h>

#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 2, 3)
#endif

void validCode(cairo_surface_t *target)
{
cairo_t * cairo1 = cairo_create(target);
Expand Down
8 changes: 8 additions & 0 deletions test/cfg/gtk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,16 @@
#include <glib.h>
#include <glib/gtypes.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>


#if GLIB_CHECK_VERSION(2, 3, 4)
#endif
#if GTK_CHECK_VERSION(4, 5, 6)
#endif
#if ATK_CHECK_VERSION(2, 3, 6)
#endif

void validCode(int argInt, GHashTableIter * hash_table_iter, GHashTable * hash_table)
{
g_assert_cmpint(4 + 1, >=, 5);
Expand Down
Loading