AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 06:00:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bump-meson-req' into 'main'

Browse Source 
Bump the meson requirement

See merge request GNOME/gtk!5051
This commit is contained in:
Matthias Clasen 2022-09-25 17:24:53 +00:00
commit 85043a2d1b
7 changed files with 9 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gdk/gdkenumtypes.c.template
View File

@ -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 ***/

29
gdk/gdkenumtypes.h.template
View File

@ -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 <gdk/gdk.h> can be included directly."
#endif
#include <glib-object.h>
#include <gdk/gdkversionmacros.h>
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 ***/

7
gdk/meson.build
View File

@ -136,10 +136,11 @@ gdkresources = gnome.compile_resources('gdkresources',
gdk_headers = gdk_public_headers gdk_headers = gdk_public_headers
gdk_enums = gnome.mkenums('gdkenumtypes', gdk_enums = gnome.mkenums_simple('gdkenumtypes',
sources: gdk_public_headers, sources: gdk_public_headers,
c_template: 'gdkenumtypes.c.template', decorator: 'GDK_AVAILABLE_IN_ALL',
h_template: 'gdkenumtypes.h.template', body_prefix: '#include "config.h"',
header_prefix: '#include "gdkversionmacros.h"',
install_dir: gtk_includedir / 'gtk-4.0/gdk', install_dir: gtk_includedir / 'gtk-4.0/gdk',
install_header: true, install_header: true,
) )

42
gtk/gtktypebuiltins.c.template
View File

@ -1,42 +0,0 @@
/*** BEGIN file-header ***/
#include "config.h"
#include "gtk.h"
#include "gtkprivate.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 ***/

29
gtk/gtktypebuiltins.h.template
View File

@ -1,29 +0,0 @@
/*** BEGIN file-header ***/
#ifndef __GTK_TYPE_BUILTINS_H__
#define __GTK_TYPE_BUILTINS_H__
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#include <glib-object.h>
#include <gdk/gdk.h>
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 /* __GTK_TYPE_BUILTINS_H__ */
/*** END file-tail ***/

7
gtk/meson.build
View File

@ -1031,10 +1031,11 @@ gtkmarshalers = gnome.genmarshal('gtkmarshalers',
gtkmarshal_h = gtkmarshalers[1] gtkmarshal_h = gtkmarshalers[1]
gtktypebuiltins = gnome.mkenums('gtktypebuiltins', gtktypebuiltins = gnome.mkenums_simple('gtktypebuiltins',
sources: gtk_public_headers + gtk_deprecated_headers, sources: gtk_public_headers + gtk_deprecated_headers,
c_template: 'gtktypebuiltins.c.template', decorator: 'GDK_AVAILABLE_IN_ALL',
h_template: 'gtktypebuiltins.h.template', body_prefix: '#include "config.h"',
header_prefix: '#include <gdk/gdk.h>',
install_dir: gtk_includedir / 'gtk-4.0/gtk', install_dir: gtk_includedir / 'gtk-4.0/gtk',
install_header: true, install_header: true,
) )

2
meson.build
View File

@ -7,7 +7,7 @@ project('gtk', 'c',
# https://github.com/mesonbuild/meson/issues/2289 # https://github.com/mesonbuild/meson/issues/2289
'c_std=gnu99', 'c_std=gnu99',
], ],
meson_version : '>= 0.59', meson_version : '>= 0.60.0',
license: 'LGPL-2.1-or-later') license: 'LGPL-2.1-or-later')
glib_req = '>= 2.66.0' glib_req = '>= 2.66.0'