icons: embed application icon as a resource too

Before this patch not-installed meld or meld built for windows
has problems loading its own svg icon,
since the icon doesn't present in resources
and were never installed into the OS.

This leads to lack of application icon on non-Gnome linux DE's
and lack of icon inside about window on all platforms.

This patch embeds application icon into resources,
so it is usable from inside meld even if it is not installed.

This change can lead to a situation when builtin icon
overrides the icon from a user-configured icon theme.

Author: Vasily Galkin

bin/meld

@@ -273,6 +273,7 @@ def setup_resources():
                 "glib-compile-resources",
                 "--target={}".format(resource_file),
                 "--sourcedir=meld/resources",
+                "--sourcedir=data/icons/hicolor",
                 "meld/resources/meld.gresource.xml",
             ],
             cwd=melddir

meld/build_helpers.py

@@ -117,6 +117,7 @@ def get_data_files(self):
             "glib-compile-resources",
             "--target={}".format(target),
             "--sourcedir={}".format(resource_dir),
+            "--sourcedir={}".format("data/icons/hicolor"),
             self.resource_source,
         ])
 

meld/resources/meld.gresource.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
+  <gresource prefix="/org/gnome/meld/icons">
+    <file>scalable/apps/org.gnome.Meld.svg</file>
+    <file>scalable/apps/org.gnome.MeldDevel.svg</file>
+  </gresource>
   <gresource prefix="/org/gnome/meld">
     <file>gtk/help-overlay.ui</file>
     <file>gtk/menus.ui</file>

meld/resources/meson.build

@@ -2,7 +2,10 @@ gnome.compile_resources(
   application_id,
   meson.project_name() + '.gresource.xml',
   gresource_bundle: true,
-  source_dir: meson.current_build_dir(),
+  source_dir: [
+    meson.current_build_dir(),
+    meson.current_source_dir() + '/../../data/icons/hicolor'
+    ],
   install_dir: pkgdatadir,
   install: true,
 )