[geany/geany-osx] dc3cf8: Copy icons to bundle manually because the bundler script doesn't respect symlinks

[Jiří Techet]

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Mon, 14 Oct 2019 22:46:06 UTC
Commit:      dc3cf87e47f2ba1b4d9af928367d85b54570f27c
             https://github.com/geany/geany-osx/commit/dc3cf87e47f2ba1b4d9af928367d85b54570f27c

Log Message:
-----------
Copy icons to bundle manually because the bundler script doesn't respect symlinks


Modified Paths:
--------------
    README.md
    geany-gtk2.bundle
    geany-gtk3.bundle

Modified: README.md
15 lines changed, 7 insertions(+), 8 deletions(-)
===================================================================
@@ -170,26 +170,25 @@ Bundling
 
 	and copy the `colorschemes` directory under `$PREFIX/share/geany`.
 
-4.	Go to the `geany-osx` directory and copy the icon theme to the GTK
-	icons directory:
+4.	Inside the `geany-osx` directory run the following command to create
+	the app bundle.
 	* **GTK 2**
 		```
-		cp -R Faience $PREFIX/share/icons
+		~/.local/bin/gtk-mac-bundler geany-gtk2.bundle
 		```
 	* **GTK 3**
 		```
-		cp -R Papirus $PREFIX/share/icons
+		~/.local/bin/gtk-mac-bundler geany-gtk3.bundle
 		```
 
-5.	Inside the `geany-osx` directory run the following command to create
-	the app bundle.
+5.	Go to the `geany-osx` directory and copy the icon theme to the bundle:
 	* **GTK 2**
 		```
-		~/.local/bin/gtk-mac-bundler geany-gtk2.bundle
+		cp -R Faience ./Geany.app/Contents/Resources/share/icons
 		```
 	* **GTK 3**
 		```
-		~/.local/bin/gtk-mac-bundler geany-gtk3.bundle
+		cp -R Papirus Papirus-Dark ./Geany.app/Contents/Resources/share/icons
 		```
 
 6.	Optionally if you have a development account at Apple and want to sign the


Modified: geany-gtk2.bundle
16 lines changed, 5 insertions(+), 11 deletions(-)
===================================================================
@@ -184,17 +184,11 @@
     ${project}/Greybird/close.png
   </data>
 
-  <!-- Icon themes to copy. The "icons" property can be either of
-       "auto", "all", or "none". All or none should be
-       self-explanatory, while auto means that the script will try to
-       figure out which icons are needed. This is done by getting all
-       the strings from all copied binaries, and matching them against
-       icon names. To be safe, you should use "all". "none" is useful
-       if you want just the index.theme file but no icons, mostly
-       needed for the "hicolor" base theme.
+  <!-- gtk-mac-bundler doesn't copy symlinks of icon themes so let's
+       just do the copy manually after the bundle is created
+  <data dest="${bundle}/Contents/Resources/share/icons/Faience">
+    ${project}/Faience
+  </data>
   -->
-  <icon-theme icons="all">
-    Faience
-  </icon-theme>
 
 </app-bundle>


Modified: geany-gtk3.bundle
6 lines changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -158,8 +158,14 @@
     ${prefix}/share/icons/hicolor
   </data>
 
+  <!-- gtk-mac-bundler doesn't copy symlinks of icon themes so let's
+       just do the copy manually after the bundle is created
   <data dest="${bundle}/Contents/Resources/share/icons/Papirus">
     ${project}/Papirus
   </data>
+  <data dest="${bundle}/Contents/Resources/share/icons/Papirus-Dark">
+    ${project}/Papirus-Dark
+  </data>
+  -->
 
 </app-bundle>



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).