From 455eefa854ecdb735f06be020655c2b3ec25cd83 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 24 Sep 2022 20:41:09 -0400 Subject: [PATCH] gdk: Use gnome.mkenums_simple This lets us avoid template files, and works just as well. --- gdk/gdkenumtypes.c.template | 41 ------------------------------------- gdk/gdkenumtypes.h.template | 29 -------------------------- gdk/meson.build | 7 ++++--- 3 files changed, 4 insertions(+), 73 deletions(-) delete mode 100644 gdk/gdkenumtypes.c.template delete mode 100644 gdk/gdkenumtypes.h.template diff --git a/gdk/gdkenumtypes.c.template b/gdk/gdkenumtypes.c.template deleted file mode 100644 index 768210a839..0000000000 --- a/gdk/gdkenumtypes.c.template +++ /dev/null @@ -1,41 +0,0 @@ -/*** BEGIN file-header ***/ -#include "config.h" -#include "gdk.h" - -/*** END file-header ***/ - -/*** BEGIN file-production ***/ -/* enumerations from "@basename@" */ -/*** END file-production ***/ - -/*** BEGIN value-header ***/ -GType -@enum_name@_get_type (void) -{ - static gsize g_define_type_id__volatile = 0; - - if (g_once_init_enter (&g_define_type_id__volatile)) - { - static const G@Type@Value values[] = { -/*** END value-header ***/ - -/*** BEGIN value-production ***/ - { @VALUENAME@, "@VALUENAME@", "@valuenick@" }, -/*** END value-production ***/ - -/*** BEGIN value-tail ***/ - { 0, NULL, NULL } - }; - GType g_define_type_id = - g_@type@_register_static (g_intern_static_string ("@EnumName@"), values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - - return g_define_type_id__volatile; -} - -/*** END value-tail ***/ - -/*** BEGIN file-tail ***/ - /**/ -/*** END file-tail ***/ diff --git a/gdk/gdkenumtypes.h.template b/gdk/gdkenumtypes.h.template deleted file mode 100644 index e200000cdb..0000000000 --- a/gdk/gdkenumtypes.h.template +++ /dev/null @@ -1,29 +0,0 @@ -/*** BEGIN file-header ***/ -#ifndef __GDK_ENUM_TYPES_H__ -#define __GDK_ENUM_TYPES_H__ - -#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only can be included directly." -#endif - -#include -#include - -G_BEGIN_DECLS -/*** END file-header ***/ - -/*** BEGIN file-production ***/ - -/* enumerations from "@basename@" */ -/*** END file-production ***/ - -/*** BEGIN value-header ***/ -GDK_AVAILABLE_IN_ALL GType @enum_name@_get_type (void) G_GNUC_CONST; -#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ()) -/*** END value-header ***/ - -/*** BEGIN file-tail ***/ -G_END_DECLS - -#endif /* __GDK_ENUM_TYPES_H__ */ -/*** END file-tail ***/ diff --git a/gdk/meson.build b/gdk/meson.build index b18bf6117c..6c1deecc04 100644 --- a/gdk/meson.build +++ b/gdk/meson.build @@ -136,10 +136,11 @@ gdkresources = gnome.compile_resources('gdkresources', gdk_headers = gdk_public_headers -gdk_enums = gnome.mkenums('gdkenumtypes', +gdk_enums = gnome.mkenums_simple('gdkenumtypes', sources: gdk_public_headers, - c_template: 'gdkenumtypes.c.template', - h_template: 'gdkenumtypes.h.template', + decorator: 'GDK_AVAILABLE_IN_ALL', + body_prefix: '#include "config.h"', + header_prefix: '#include "gdkversionmacros.h"', install_dir: gtk_includedir / 'gtk-4.0/gdk', install_header: true, ) -- 2.30.2