[geany/geany-osx] fbec97: Update GTK 3 bundle config file

[Jiří Techet]

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Sun, 15 Oct 2017 22:12:33 UTC
Commit:      fbec97b2f137fc3c4d95f0353ffaf9cff6afb949
             https://github.com/geany/geany-osx/commit/fbec97b2f137fc3c4d95f0353ffaf9cff6afb949

Log Message:
-----------
Update GTK 3 bundle config file


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

Modified: geany-gtk2.bundle
10 lines changed, 2 insertions(+), 8 deletions(-)
===================================================================
@@ -83,12 +83,6 @@
     ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/*.so
   </binary>
 
-<!-- No longer needed for pango >= 1.38
-   <binary>
-    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
-  </binary>
--->
-
   <!-- VTE library -->
   <binary>
     ${prefix}/lib/libvte.9.dylib
@@ -112,7 +106,7 @@
     ${prefix}/lib/geany/*.so
   </binary>
 
- <!-- Translation filenames, one for each program or library that you
+  <!-- Translation filenames, one for each program or library that you
        want to copy in to the bundle. The "dest" attribute is
        optional, as usual. Bundler will find all translations of that
        library/program under the indicated directory and copy them.-->
@@ -136,7 +130,7 @@
        "dest" property. The destination must then start with the macro
        "${bundle}", which refers to the bundle root directory.
   -->
-  
+
   <!-- Geany's data files; glade, fildefs, default tags, etc. -->
   <data dest="${bundle}/Contents/Resources/share/geany">
     ${prefix}/share/geany


Modified: geany-gtk3.bundle
41 lines changed, 27 insertions(+), 14 deletions(-)
===================================================================
@@ -52,16 +52,13 @@
 
   <main-binary>${prefix}/bin/geany</main-binary>
 
-  <!-- Copy in the input methods. Dunno if they actually work with
-       OSX. Note the ${gtkdir} macro, which expands to the correct
-       library subdirectory for the specified gtk version. -->
+<!-- And the print backends -->
   <binary>
-    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
   </binary>
 
-<!-- And the print backends -->
   <binary>
-    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so
   </binary>
 
 <!-- Starting with 2.24, gdk-pixbuf installs into its own directory. -->
@@ -73,10 +70,16 @@
   <binary>
     ${prefix}/lib/libvte-2.91.0.dylib
   </binary>
-  <!--
-  <binary  dest="${bundle}/Contents/Resources/libexec/gnome-pty-helper">
-    ${prefix}/libexec/gnome-pty-helper
-  </binary>-->
+
+  <!-- libenchant modules needed by the spellchecker plugin -->
+  <binary>
+    ${prefix}/lib/enchant/*.so
+  </binary>
+
+  <!-- glib-networking modules used by libsoup, needed for HTTPS -->
+  <binary>
+    ${prefix}/lib/gio/modules/*.so
+  </binary>
 
   <!-- Geany's plugins -->
   <binary>
@@ -87,7 +90,7 @@
        want to copy in to the bundle. The "dest" attribute is
        optional, as usual. Bundler will find all translations of that
        library/program under the indicated directory and copy them.-->
-  <translations  name="gtk30">
+  <translations name="gtk30">
     ${prefix}/share/locale
   </translations>
   <translations name="vte-2.91">
@@ -131,12 +134,14 @@
 
   <!-- Copy in the themes data. You may want to trim this to save space
        in your bundle. -->
+
+  <!-- This theme contains the right key mappings for OS X -->
   <data>
-    ${prefix}/share/themes
+    ${prefix}/share/themes/Mac
   </data>
 
   <data>
-    ${prefix}/share/icons
+    ${prefix}/share/themes/Arc
   </data>
 
   <!-- Copy icons. Note that the .icns file is an Apple format which
@@ -147,4 +152,12 @@
     ${project}/Geany.icns
   </data>
 
-  </app-bundle>
+  <data>
+    ${prefix}/share/icons/hicolor
+  </data>
+
+  <data>
+    ${prefix}/share/icons/Papirus
+  </data>
+
+</app-bundle>



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