-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #188 from JFronny/ci-adwaita
Extend windows-gtk workflow to also build a package with libadwaita
- Loading branch information
Showing
2 changed files
with
229 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| diff --git a/src/adw-about-dialog.c b/src/adw-about-dialog.c | ||
| index 235f77f4..d7471036 100644 | ||
| --- a/src/adw-about-dialog.c | ||
| +++ b/src/adw-about-dialog.c | ||
| @@ -7,7 +7,6 @@ | ||
|
|
||
| #include "config.h" | ||
| #include <glib/gi18n-lib.h> | ||
| -#include <appstream.h> | ||
|
|
||
| #include "adw-about-dialog.h" | ||
|
|
||
| @@ -429,12 +428,12 @@ legal_showing_cb (AdwAboutDialog *self) | ||
| self->legal_showing_idle_id = 0; | ||
| } | ||
|
|
||
| -static gboolean | ||
| +/*static gboolean | ||
| get_release_for_version (AsRelease *rel, | ||
| const char *version) | ||
| { | ||
| return !g_strcmp0 (as_release_get_version (rel), version); | ||
| -} | ||
| +}*/ | ||
|
|
||
| static void | ||
| update_credits_legal_group (AdwAboutDialog *self) | ||
| @@ -2008,7 +2007,8 @@ AdwDialog * | ||
| adw_about_dialog_new_from_appdata (const char *resource_path, | ||
| const char *release_notes_version) | ||
| { | ||
| - AdwAboutDialog *self; | ||
| + g_error("Appstream is not supported in this build"); | ||
| + /*AdwAboutDialog* self; | ||
| GFile *appdata_file; | ||
| char *appdata_uri; | ||
| AsMetadata *metadata; | ||
| @@ -2126,7 +2126,7 @@ adw_about_dialog_new_from_appdata (const char *resource_path, | ||
| } | ||
| } | ||
|
|
||
| - /* Handle deprecated SPDX IDs */ | ||
| + /* Handle deprecated SPDX IDs *//* | ||
| for (i = 0; i < G_N_ELEMENTS (license_aliases); i++) { | ||
| if (g_strcmp0 (license_aliases[i].spdx_id, project_license) == 0) { | ||
| adw_about_dialog_set_license_type (self, license_aliases[i].license); | ||
| @@ -2152,7 +2152,7 @@ adw_about_dialog_new_from_appdata (const char *resource_path, | ||
| g_free (application_id); | ||
| g_free (appdata_uri); | ||
|
|
||
| - return ADW_DIALOG (self); | ||
| + return ADW_DIALOG (self);*/ | ||
| } | ||
|
|
||
| /** | ||
| diff --git a/src/adw-about-window.c b/src/adw-about-window.c | ||
| index 2c17e129..c741283e 100644 | ||
| --- a/src/adw-about-window.c | ||
| +++ b/src/adw-about-window.c | ||
| @@ -6,7 +6,6 @@ | ||
|
|
||
| #include "config.h" | ||
| #include <glib/gi18n-lib.h> | ||
| -#include <appstream.h> | ||
|
|
||
| #include "adw-about-window.h" | ||
|
|
||
| @@ -421,12 +420,12 @@ legal_showing_cb (AdwAboutWindow *self) | ||
| g_idle_add_once ((GSourceOnceFunc) legal_showing_idle_cb, self); | ||
| } | ||
|
|
||
| -static gboolean | ||
| +/*static gboolean | ||
| get_release_for_version (AsRelease *rel, | ||
| const char *version) | ||
| { | ||
| return !g_strcmp0 (as_release_get_version (rel), version); | ||
| -} | ||
| +}*/ | ||
|
|
||
| static void | ||
| update_credits_legal_group (AdwAboutWindow *self) | ||
| @@ -2022,7 +2021,8 @@ GtkWidget * | ||
| adw_about_window_new_from_appdata (const char *resource_path, | ||
| const char *release_notes_version) | ||
| { | ||
| - AdwAboutWindow *self; | ||
| + g_error("Appstream is not supported in this build"); | ||
| + /*AdwAboutWindow* self; | ||
| GFile *appdata_file; | ||
| char *appdata_uri; | ||
| AsMetadata *metadata; | ||
| @@ -2140,7 +2140,7 @@ adw_about_window_new_from_appdata (const char *resource_path, | ||
| } | ||
| } | ||
|
|
||
| - /* Handle deprecated SPDX IDs */ | ||
| + /* Handle deprecated SPDX IDs *//* | ||
| for (i = 0; i < G_N_ELEMENTS (license_aliases); i++) { | ||
| if (g_strcmp0 (license_aliases[i].spdx_id, project_license) == 0) { | ||
| adw_about_window_set_license_type (self, license_aliases[i].license); | ||
| @@ -2166,7 +2166,7 @@ adw_about_window_new_from_appdata (const char *resource_path, | ||
| g_free (application_id); | ||
| g_free (appdata_uri); | ||
|
|
||
| - return GTK_WIDGET (self); | ||
| + return GTK_WIDGET (self);*/ | ||
| } | ||
|
|
||
| /** | ||
| diff --git a/src/meson.build b/src/meson.build | ||
| index 03b6c248..b8ceeec2 100644 | ||
| --- a/src/meson.build | ||
| +++ b/src/meson.build | ||
| @@ -313,20 +313,12 @@ gtk_min_version = '>= 4.15.2' | ||
|
|
||
| gio_dep = dependency('gio-2.0', version: glib_min_version) | ||
| gtk_dep = dependency('gtk4', version: gtk_min_version) | ||
| -appstream_dep = dependency('appstream', | ||
| - fallback : ['appstream', 'appstream_dep'], | ||
| - default_options : [ | ||
| - 'systemd=false', 'apidocs=false', 'install-docs=false', | ||
| - 'stemming=false', 'svg-support=false', 'gir=false', | ||
| - ], | ||
| -) | ||
|
|
||
| libadwaita_deps = [ | ||
| dependency('glib-2.0', version: glib_min_version), | ||
| dependency('fribidi'), | ||
| gio_dep, | ||
| gtk_dep, | ||
| - appstream_dep, | ||
| cc.find_library('m', required: false), | ||
| ] | ||
|
|
||
| diff --git a/subprojects/appstream.wrap b/subprojects/appstream.wrap | ||
| deleted file mode 100644 | ||
| index 4262a04b..00000000 | ||
| --- a/subprojects/appstream.wrap | ||
| +++ /dev/null | ||
| @@ -1,5 +0,0 @@ | ||
| -[wrap-git] | ||
| -directory = appstream | ||
| -url = https://github.com/ximion/appstream.git | ||
| -revision = main | ||
| -depth = 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters