com.github.donadigo.appeditor.json

@@ -1,7 +1,7 @@
 {
     "app-id": "com.github.donadigo.appeditor",
     "runtime": "io.elementary.Platform",
-    "runtime-version": "6.1",
+    "runtime-version": "7.2",
     "sdk": "io.elementary.Sdk",
     "command": "appeditor-wrapper",
     "finish-args": [
@@ -18,14 +18,13 @@
             "buildsystem": "meson",
             "config-opts": [
                 "-Dtests=false",
-                "-Dselinux=disabled",
-                "-Dinternal_pcre=false"
+                "-Dselinux=disabled"
             ],
             "sources": [
                 {
                     "type": "archive",
-                    "path": "external/glib-2.70.0.tar.xz",
-                    "sha256": "200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742"
+                    "path": "external/glib-2.76.3.tar.xz",
+                    "sha256": "c0be444e403d7c3184d1f394f89f0b644710b5e9331b54fa4e8b5037813ad32a"
                 },
                 { 
                     "type": "patch",
@@ -66,4 +65,4 @@
             ]
         }
     ]
-}
+}

data/com.github.donadigo.appeditor.appdata.xml.in

@@ -31,6 +31,24 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release version="1.1.5" date="2023-08-06">
+      <description>
+        <p>This release makes AppEditor available on elementary OS 7. Many thanks to Ryo Nakano for his contributions to this release.</p>
+        <p>New translations:</p>
+        <ul>
+          <li>Czech (Amerey)</li>
+        </ul>
+      </description>
+    </release>
+    <release version="1.1.4" date="2022-01-03">
+      <description>
+        <p>This release fixes payments not working in the AppCenter.</p>
+        <p>New translations:</p>
+        <ul>
+          <li>Swedish (Åke Engelbrektson)</li>
+        </ul>
+      </description>
+    </release>
     <release version="1.1.3" date="2021-12-24">
       <description>
         <p>This release updates AppEditor for elementary OS 6.1.</p>
@@ -172,7 +190,7 @@
   </content_rating>
 
   <custom>
-    <value key="x-appcenter-stripe">pk_live_a5CWlfLgKcxATZoB4vRa50UP006vX7CjBc</value>
+    <value key="x-appcenter-stripe">pk_live_51GYBHwFaMxdOp98jXKA6CKhwcWWa77h7XLR5ZvyZBQ4l7G2S1E40rdhPlHHLZOWM5a70KthJmqEJjtvNX6XwiUpe00TsRKaWfU</value>
     <value key="x-appcenter-color-primary">#32e3ca</value>
     <value key="x-appcenter-color-primary-text">#0A332D</value>
     <value key="x-appcenter-suggested-price">5</value>

external/glib-appinfo.patch

@@ -2,25 +2,27 @@
 # so GAppInfo will ignore them
 
 diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 63ef0c045..fa5ade90a 100644
+index 1f161328a..4184d40f0 100644
 --- a/gio/gdesktopappinfo.c
 +++ b/gio/gdesktopappinfo.c
-@@ -1787,47 +1787,11 @@ g_desktop_app_info_load_from_keyfile (GDesktopAppInfo *info,
+@@ -1910,56 +1910,11 @@ g_desktop_app_info_load_from_keyfile (GDesktopAppInfo *info,
                                      G_KEY_FILE_DESKTOP_GROUP,
                                      G_KEY_FILE_DESKTOP_KEY_TRY_EXEC,
                                      NULL);
 -  if (try_exec && try_exec[0] != '\0')
 -    {
 -      char *t;
--      t = g_find_program_in_path (try_exec);
+-      /* Use the desktop file path (if any) as working dir to search program */
+-      t = GLIB_PRIVATE_CALL (g_find_program_for_path) (try_exec, NULL, path);
 -      if (t == NULL)
 -        {
+-          g_free (path);
 -          g_free (try_exec);
 -          return FALSE;
 -        }
 -      g_free (t);
 -    }
-
+ 
    exec = g_key_file_get_string (key_file,
                                  G_KEY_FILE_DESKTOP_GROUP,
                                  G_KEY_FILE_DESKTOP_KEY_EXEC,
@@ -31,25 +33,32 @@ index 63ef0c045..fa5ade90a 100644
 -      char **argv;
 -      if (!g_shell_parse_argv (exec, &argc, &argv, NULL))
 -        {
+-          g_free (path);
 -          g_free (exec);
 -          g_free (try_exec);
 -          return FALSE;
 -        }
 -      else
 -        {
 -          char *t;
--          t = g_find_program_in_path (argv[0]);
+-
+-          /* Since @exec is not an empty string, there must be at least one
+-           * argument, so dereferencing argv[0] should return non-NULL. */
+-          g_assert (argc > 0);
+-          /* Use the desktop file path (if any) as working dir to search program */
+-          t = GLIB_PRIVATE_CALL (g_find_program_for_path) (argv[0], NULL, path);
 -          g_strfreev (argv);
 -
 -          if (t == NULL)
 -            {
+-              g_free (path);
 -              g_free (exec);
 -              g_free (try_exec);
 -              return FALSE;
 -            }
 -          g_free (t);
 -        }
 -    }
-
+ 
    info->name = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_NAME, NULL, NULL);
    info->generic_name = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, GENERIC_NAME_KEY, NULL, NULL);

meson.build

@@ -1,23 +1,28 @@
 project('com.github.donadigo.appeditor', ['vala', 'c'],
-        version: '1.1.1')
+        version: '1.1.4')
 
 i18n = import('i18n')
 gnome = import('gnome')
 
+add_project_arguments(
+    '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
+    language: 'c'
+)
+
 conf = configuration_data()
+conf.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
 conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-configure_file(output: 'config.h', configuration: conf)
-config_h_dir = include_directories('.')
-
-c_args = [
-  '-include', 'config.h'
-]
+config_file = configure_file(
+    input: 'src' / 'Config.vala.in',
+    output: '@BASENAME@',
+    configuration: conf
+)
 
 vala = meson.get_compiler('vala')
 vala_flags = []
 
 deps = [
-  dependency('granite'),
+  dependency('granite', version: '>= 5.4.0'),
   dependency('gtk+-3.0'),
   dependency('gee-0.8'),
   vala.find_library('posix')
@@ -41,6 +46,7 @@ asresources = gnome.compile_resources(
 
 executable(
     meson.project_name(),
+    config_file,
     'src/Application.vala',
     'src/MainWindow.vala',
     'src/AppSourceList.vala',
@@ -62,7 +68,6 @@ executable(
     'src/IconRow.vala',
     'src/Constants.vala',
     asresources,
-    c_args: c_args,
     dependencies: [
         deps
     ],
@@ -72,4 +77,4 @@ executable(
 meson.add_install_script('meson/post_install.py')
 
 subdir('data')
-subdir('po')
+subdir('po')

po/LINGUAS

@@ -7,6 +7,7 @@ nl_NL
 pt
 pt_BR
 ru
+sv
 tr
 lt
 it