[meld] Add icon for Meld development version and accommodate in build

[Kai Willadsen <kaiw src gnome org>]

commit 48ede95c150cb6d5017b18aba7bcaae2307b587f
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon May 25 06:28:26 2020 +1000

    Add icon for Meld development version and accommodate in build
    
    The new development icon is generated thanks to App Icon Preview.
    
    This commit also renames the source icons to capitalise the application
    name, as favoured by general GNOME style. These were already *installed*
    to that name, but now they're appropriately named in source as well.

 data/icons/Makefile                                |  2 +-
 data/icons/README                                  |  6 ++-
 .../{org.gnome.meld.svg => org.gnome.Meld.svg}     |  0
 .../hicolor/scalable/apps/org.gnome.MeldDevel.svg  | 61 ++++++++++++++++++++++
 ...ld-symbolic.svg => org.gnome.Meld-symbolic.svg} |  0
 data/meson.build                                   |  4 +-
 meson.build                                        |  1 +
 7 files changed, 69 insertions(+), 5 deletions(-)
---
diff --git a/data/icons/Makefile b/data/icons/Makefile
index 89692e58..5ea08383 100644
--- a/data/icons/Makefile
+++ b/data/icons/Makefile
@@ -1,3 +1,3 @@
 
 all:
-       convert -background transparent hicolor/scalable/apps/org.gnome.meld.svg -define 
icon:auto-resize=16,22,32,48 org.gnome.meld.ico
+       convert -background transparent hicolor/scalable/apps/org.gnome.Meld.svg -define 
icon:auto-resize=16,22,32,48 org.gnome.meld.ico
diff --git a/data/icons/README b/data/icons/README
index e9e05e66..6aac915d 100644
--- a/data/icons/README
+++ b/data/icons/README
@@ -3,8 +3,10 @@ Application icons
 =================
 
 On *nix platforms we only ship SVG application icons: the regular Meld icon at
-`hicolor/scalable/apps/org.gnome.meld.svg`, and the symbolic icon for GNOME
-shell presentation at `hicolor/symbolic/apps/org.gnome.meld.svg`.
+`hicolor/scalable/apps/org.gnome.Meld.svg`, the development version of the
+icon `hicolor/scalable/apps/org.gnome.MeldDevel.svg`, and the symbolic icon
+for GNOME shell presentation at
+`hicolor/symbolic/apps/org.gnome.Meld-symbolic.svg`.
 
 The Windows `ico` file in this folder is converted from the SVG source. See
 the `Makefile` in this folder for the very simple command.
diff --git a/data/icons/hicolor/scalable/apps/org.gnome.meld.svg 
b/data/icons/hicolor/scalable/apps/org.gnome.Meld.svg
similarity index 100%
rename from data/icons/hicolor/scalable/apps/org.gnome.meld.svg
rename to data/icons/hicolor/scalable/apps/org.gnome.Meld.svg
diff --git a/data/icons/hicolor/scalable/apps/org.gnome.MeldDevel.svg 
b/data/icons/hicolor/scalable/apps/org.gnome.MeldDevel.svg
new file mode 100644
index 00000000..e5d6fcad
--- /dev/null
+++ b/data/icons/hicolor/scalable/apps/org.gnome.MeldDevel.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="12" x2="116" y1="64" y2="64">
+        <stop offset="0" stop-color="#1a5fb4"/>
+        <stop offset="0.1875" stop-color="#1c71d8"/>
+        <stop offset="0.375" stop-color="#1a5fb4"/>
+        <stop offset="1" stop-color="#1a5fb4"/>
+    </linearGradient>
+    <linearGradient id="b" gradientTransform="matrix(1 0 0 0.999971 0.000001 0.00335)" 
gradientUnits="userSpaceOnUse" x1="63.970703" x2="116" y1="112" y2="112">
+        <stop offset="0" stop-color="#c64600"/>
+        <stop offset="0.84624" stop-color="#c64600"/>
+        <stop offset="0.92312" stop-color="#e66100"/>
+        <stop offset="1" stop-color="#c64600"/>
+    </linearGradient>
+    <clipPath id="c">
+        <rect height="128" width="128"/>
+    </clipPath>
+    <clipPath id="d">
+        <rect height="128" width="128"/>
+    </clipPath>
+    <filter id="e" height="100%" width="100%" x="0%" y="0%">
+        <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+    </filter>
+    <mask id="f">
+        <g clip-path="url(#d)" filter="url(#e)">
+            <g clip-path="url(#c)">
+                <path d="m 51 12 h 26 c 21.539062 0 39 17.460938 39 39 v 22 c 0 21.539062 -17.460938 39 -39 
39 h -26 c -21.539062 0 -39 -17.460938 -39 -39 v -22 c 0 -21.539062 17.460938 -39 39 -39 z m 0 0" 
fill="#3584e4"/>
+                <path d="m 12 74.523438 v 4 h 0.039062 c 0.796876 20.894531 17.867188 37.476562 38.960938 
37.476562 h 26 l -13.03125 -0.003906 v -3.996094 h -12.96875 c -21.09375 0 -38.164062 -16.582031 -38.960938 
-37.476562 z m 0 0" fill="url(#a)"/>
+                <path d="m 116 104 c 0 4.433594 -3.566406 8 -8 8 h -44.03125 v 3.996094 l 13.03125 0.003906 
h 31 c 4.433594 0 8 -3.566406 8 -8 z m 0 0" fill="url(#b)"/>
+                <path d="m 20 12 c -4.433594 0 -8 3.566406 -8 8 v 37.324219 c 2.417969 6.195312 5.898438 
11.984375 10.605469 17.050781 c 5.503906 5.925781 13.683593 10.878906 22.144531 12.71875 c 8.460938 1.835938 
17.207031 0.558594 23.859375 -5.976562 c 2.277344 -2.234376 4.199219 -5.550782 4.878906 -8.949219 c 0.675781 
-3.398438 0.109375 -6.871094 -2.574219 -9.445313 c -0.855468 -0.816406 -2.117187 -1.511718 -3.394531 
-1.742187 c -1.269531 -0.230469 -2.558593 0 -3.480469 1.019531 c 1.03125 0.9375 1.261719 2.242188 1.03125 
3.523438 c -0.234374 1.292968 -0.933593 2.5625 -1.757812 3.425781 c -2.582031 2.699219 -6.082031 3.265625 
-9.488281 2.582031 c -3.410157 -0.679688 -6.734375 -2.601562 -8.980469 -4.886719 c -4.90625 -5 -6.855469 
-11.179687 -6.742188 -17.53125 c 0.035157 -2.121093 0.300782 -4.257812 0.761719 -6.375 c 1.839844 -8.472656 
6.796875 -16.65625 12.730469 -22.167969 c 3.785156 -3.519531 7.976562 -6.347656 12.4375 -8.570312 z m 0 0" 
fill="#ff9632"/>
+                <path d="m 76.886719 36.148438 c -6.339844 -0.109376 -12.507813 1.832031 -17.496094 6.734374 
c -2.277344 2.234376 -4.199219 5.554688 -4.875 8.949219 c -0.675781 3.398438 -0.113281 6.875 2.574219 
9.449219 c 0.851562 0.816406 2.113281 1.507812 3.390625 1.738281 c 1.273437 0.230469 2.558593 0 3.484375 
-1.019531 c -1.03125 -0.9375 -1.265625 -2.242188 -1.035156 -3.523438 c 0.234374 -1.292968 0.933593 -2.5625 
1.757812 -3.425781 c 2.585938 -2.699219 6.082031 -3.265625 9.492188 -2.582031 c 3.410156 0.679688 6.730468 
2.601562 8.976562 4.886719 c 4.90625 5 6.855469 11.179687 6.746094 17.53125 c -0.035156 2.121093 -0.300782 
4.257812 -0.761719 6.375 c -1.839844 8.472656 -6.796875 16.65625 -12.730469 22.167969 c -3.789062 3.519531 
-7.980468 6.347656 -12.441406 8.570312 h 44.03125 c 4.433594 0 8 -3.566406 8 -8 v -37.324219 c -2.417969 
-6.195312 -5.898438 -11.984375 -10.605469 -17.050781 c -5.503906 -5.925781 -13.679687 -10.878906 -22.144531 
-12.714844 c -2.113281 -0.460937 -4.2460
 94 -0.726562 -6.363281 -0.761718 z m 0 0" fill="#ff9632"/>
+            </g>
+        </g>
+    </mask>
+    <mask id="g">
+        <g filter="url(#e)">
+            <rect fill-opacity="0.8" height="128" width="128"/>
+        </g>
+    </mask>
+    <linearGradient id="h" gradientTransform="matrix(0 0.37 -0.98462 0 295.38501 -30.360001)" 
gradientUnits="userSpaceOnUse" x1="300" x2="428" y1="235" y2="235">
+        <stop offset="0" stop-color="#f9f06b"/>
+        <stop offset="1" stop-color="#f5c211"/>
+    </linearGradient>
+    <clipPath id="i">
+        <rect height="128" width="128"/>
+    </clipPath>
+    <clipPath id="j">
+        <rect height="128" width="128"/>
+    </clipPath>
+    <path d="m 51 12 h 26 c 21.539062 0 39 17.460938 39 39 v 22 c 0 21.539062 -17.460938 39 -39 39 h -26 c 
-21.539062 0 -39 -17.460938 -39 -39 v -22 c 0 -21.539062 17.460938 -39 39 -39 z m 0 0" fill="#3584e4"/>
+    <path d="m 12 74.523438 v 4 h 0.039062 c 0.796876 20.894531 17.867188 37.476562 38.960938 37.476562 h 26 
l -13.03125 -0.003906 v -3.996094 h -12.96875 c -21.09375 0 -38.164062 -16.582031 -38.960938 -37.476562 z m 0 
0" fill="url(#a)"/>
+    <path d="m 116 104 c 0 4.433594 -3.566406 8 -8 8 h -44.03125 v 3.996094 l 13.03125 0.003906 h 31 c 
4.433594 0 8 -3.566406 8 -8 z m 0 0" fill="url(#b)"/>
+    <path d="m 20 12 c -4.433594 0 -8 3.566406 -8 8 v 37.324219 c 2.417969 6.195312 5.898438 11.984375 
10.605469 17.050781 c 5.503906 5.925781 13.683593 10.878906 22.144531 12.71875 c 8.460938 1.835938 17.207031 
0.558594 23.859375 -5.976562 c 2.277344 -2.234376 4.199219 -5.550782 4.878906 -8.949219 c 0.675781 -3.398438 
0.109375 -6.871094 -2.574219 -9.445313 c -0.855468 -0.816406 -2.117187 -1.511718 -3.394531 -1.742187 c 
-1.269531 -0.230469 -2.558593 0 -3.480469 1.019531 c 1.03125 0.9375 1.261719 2.242188 1.03125 3.523438 c 
-0.234374 1.292968 -0.933593 2.5625 -1.757812 3.425781 c -2.582031 2.699219 -6.082031 3.265625 -9.488281 
2.582031 c -3.410157 -0.679688 -6.734375 -2.601562 -8.980469 -4.886719 c -4.90625 -5 -6.855469 -11.179687 
-6.742188 -17.53125 c 0.035157 -2.121093 0.300782 -4.257812 0.761719 -6.375 c 1.839844 -8.472656 6.796875 
-16.65625 12.730469 -22.167969 c 3.785156 -3.519531 7.976562 -6.347656 12.4375 -8.570312 z m 0 0" 
fill="#ff9632"/>
+    <path d="m 76.886719 36.148438 c -6.339844 -0.109376 -12.507813 1.832031 -17.496094 6.734374 c -2.277344 
2.234376 -4.199219 5.554688 -4.875 8.949219 c -0.675781 3.398438 -0.113281 6.875 2.574219 9.449219 c 0.851562 
0.816406 2.113281 1.507812 3.390625 1.738281 c 1.273437 0.230469 2.558593 0 3.484375 -1.019531 c -1.03125 
-0.9375 -1.265625 -2.242188 -1.035156 -3.523438 c 0.234374 -1.292968 0.933593 -2.5625 1.757812 -3.425781 c 
2.585938 -2.699219 6.082031 -3.265625 9.492188 -2.582031 c 3.410156 0.679688 6.730468 2.601562 8.976562 
4.886719 c 4.90625 5 6.855469 11.179687 6.746094 17.53125 c -0.035156 2.121093 -0.300782 4.257812 -0.761719 
6.375 c -1.839844 8.472656 -6.796875 16.65625 -12.730469 22.167969 c -3.789062 3.519531 -7.980468 6.347656 
-12.441406 8.570312 h 44.03125 c 4.433594 0 8 -3.566406 8 -8 v -37.324219 c -2.417969 -6.195312 -5.898438 
-11.984375 -10.605469 -17.050781 c -5.503906 -5.925781 -13.679687 -10.878906 -22.144531 -12.714844 c 
-2.113281 -0.460937 -4.246094 -0.726562
  -6.363281 -0.761718 z m 0 0" fill="#ff9632"/>
+    <g clip-path="url(#j)" mask="url(#f)">
+        <g clip-path="url(#i)" mask="url(#g)">
+            <path d="m 128 80.640625 v 47.359375 h -128 v -47.359375 z m 0 0" fill="url(#h)"/>
+            <path d="m 13.308594 80.640625 l 47.355468 47.359375 h 21.214844 l -47.359375 -47.359375 z m 
42.421875 0 l 47.363281 47.359375 h 21.214844 l -47.363282 -47.359375 z m 42.429687 0 l 29.839844 29.839844 v 
-21.210938 l -8.628906 -8.628906 z m -98.160156 7.90625 v 21.214844 l 18.238281 18.238281 h 21.214844 z m 0 
0"/>
+        </g>
+    </g>
+</svg>
diff --git a/data/icons/hicolor/symbolic/apps/org.gnome.meld-symbolic.svg 
b/data/icons/hicolor/symbolic/apps/org.gnome.Meld-symbolic.svg
similarity index 100%
rename from data/icons/hicolor/symbolic/apps/org.gnome.meld-symbolic.svg
rename to data/icons/hicolor/symbolic/apps/org.gnome.Meld-symbolic.svg
diff --git a/data/meson.build b/data/meson.build
index 2a6aedc4..c9d7e0d8 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -110,7 +110,7 @@ icon_sizes = ['scalable']
 
 foreach i : icon_sizes
   install_data(
-    join_paths('icons/hicolor', i , 'apps', resource_base_id + '.svg'),
+    join_paths('icons/hicolor', i , 'apps', application_id + '.svg'),
     install_dir: join_paths(icondir, 'hicolor', i , 'apps'),
     rename: '@0@.svg'.format(application_id)
   )
@@ -118,7 +118,7 @@ endforeach
 
 # Install the symbolic icon
 install_data(
-    join_paths('icons/hicolor/symbolic/apps', resource_base_id + '-symbolic.svg'),
+    join_paths('icons/hicolor/symbolic/apps', application_id_no_profile + '-symbolic.svg'),
     install_dir: join_paths(icondir, 'hicolor', 'symbolic', 'apps'),
     rename: '@0 -symbolic svg'.format(application_id)
 )
diff --git a/meson.build b/meson.build
index 90612a0a..db658029 100644
--- a/meson.build
+++ b/meson.build
@@ -32,6 +32,7 @@ else
 endif
 
 resource_base_id = 'org.gnome.meld'
+application_id_no_profile = 'org.gnome.Meld'
 application_id = 'org.gnome.Meld@0@'.format(profile)
 
 prefix = get_option('prefix')