marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add locale-subset support to add-extension

tingping/wmclass
Alexander Larsson 2017-09-21 17:05:12 +02:00
parent 709b71a268
commit 2c86d53b63
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/flatpak-manifest.xml
View File

@ -317,7 +317,7 @@
are supported, and put directly into the metadata file:
autodelete, no-autodownload, subdirectories,
add-ld-path, download-if, enable-if, merge-dirs,
subdirectory-suffix, version, versions.
subdirectory-suffix, locale-subset, version, versions.
</para>
</refsect2>
<refsect2>

19
src/builder-extension.c
View File

@ -44,6 +44,7 @@ struct BuilderExtension
gboolean bundle;
gboolean autodelete;
gboolean no_autodownload;
gboolean locale_subset;
gboolean subdirectories;
char *add_ld_path;
char *download_if;
@ -71,6 +72,7 @@ enum {
PROP_ENABLE_IF,
PROP_MERGE_DIRS,
PROP_NO_AUTODOWNLOAD,
PROP_LOCALE_SUBSET,
PROP_SUBDIRECTORIES,
PROP_SUBDIRECTORY_SUFFIX,
PROP_VERSION,
@ -122,6 +124,10 @@ builder_extension_get_property (GObject *object,
g_value_set_boolean (value, self->autodelete);
break;
case PROP_LOCALE_SUBSET:
g_value_set_boolean (value, self->locale_subset);
break;
case PROP_SUBDIRECTORIES:
g_value_set_boolean (value, self->autodelete);
break;
@ -186,6 +192,10 @@ builder_extension_set_property (GObject *object,
self->no_autodownload = g_value_get_boolean (value);
break;
case PROP_LOCALE_SUBSET:
self->locale_subset = g_value_get_boolean (value);
break;
case PROP_SUBDIRECTORIES:
self->subdirectories = g_value_get_boolean (value);
break;
@ -267,6 +277,13 @@ builder_extension_class_init (BuilderExtensionClass *klass)
"",
FALSE,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_LOCALE_SUBSET,
g_param_spec_boolean ("locale-subset",
"",
"",
FALSE,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_SUBDIRECTORIES,
g_param_spec_boolean ("subdirectories",
@ -392,6 +409,7 @@ builder_extension_add_finish_args (BuilderExtension *self,
add_arg (self, args, FLATPAK_METADATA_KEY_DIRECTORY, self->directory);
add_argb (self, args, FLATPAK_METADATA_KEY_AUTODELETE, self->autodelete);
add_argb (self, args, FLATPAK_METADATA_KEY_NO_AUTODOWNLOAD, self->no_autodownload);
add_argb (self, args, FLATPAK_METADATA_KEY_LOCALE_SUBSET, self->locale_subset);
add_argb (self, args, FLATPAK_METADATA_KEY_SUBDIRECTORIES, self->subdirectories);
add_arg (self, args, FLATPAK_METADATA_KEY_ADD_LD_PATH, self->add_ld_path);
add_arg (self, args, FLATPAK_METADATA_KEY_DOWNLOAD_IF, self->download_if);
@ -413,6 +431,7 @@ builder_extension_checksum (BuilderExtension *self,
builder_cache_checksum_boolean (cache, self->bundle);
builder_cache_checksum_boolean (cache, self->autodelete);
builder_cache_checksum_boolean (cache, self->no_autodownload);
builder_cache_checksum_boolean (cache, self->locale_subset);
builder_cache_checksum_boolean (cache, self->subdirectories);
builder_cache_checksum_str (cache, self->add_ld_path);
builder_cache_checksum_str (cache, self->download_if);

1
src/builder-flatpak-utils.h
View File

@ -46,6 +46,7 @@ typedef void (*FlatpakLoadUriProgress) (guint64 downloaded_bytes,
#define FLATPAK_METADATA_KEY_ENABLE_IF "enable-if"
#define FLATPAK_METADATA_KEY_MERGE_DIRS "merge-dirs"
#define FLATPAK_METADATA_KEY_NO_AUTODOWNLOAD "no-autodownload"
#define FLATPAK_METADATA_KEY_LOCALE_SUBSET "locale-subset"
#define FLATPAK_METADATA_KEY_SUBDIRECTORIES "subdirectories"
#define FLATPAK_METADATA_KEY_SUBDIRECTORY_SUFFIX "subdirectory-suffix"
#define FLATPAK_METADATA_KEY_VERSION "version"