From 7e8f3e535491d3fdd8dee44d4ecaf50b2c1d3be0 Mon Sep 17 00:00:00 2001
From: LI Daobing <lidaobing@gmail.com>
Date: Thu, 1 Apr 2021 23:11:56 +0800
Subject: [PATCH 1/4] add bundle

---
 dist/macos/Info.plist   |  30 ++++++++++
 dist/macos/iptux.bundle | 126 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 156 insertions(+)
 create mode 100644 dist/macos/Info.plist
 create mode 100644 dist/macos/iptux.bundle

diff --git a/dist/macos/Info.plist b/dist/macos/Info.plist
new file mode 100644
index 000000000..dd25e1730
--- /dev/null
+++ b/dist/macos/Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleExecutable</key>
+    <string>Iptux</string>
+    <key>CFBundleGetInfoString</key>
+    <string>0.8.0-git, (C) 2008-2021 The Iptux Authors</string>
+    <key>CFBundleIdentifier</key>
+    <string>io.github.iptux_src.iptux</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>0.8.0-git</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>0.8.0-git</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>0.8.0-git, (C) 2008-2021 The Iptux Authors, GNU General Public License v2 or later.</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>10.13</string>
+    <key>NSHighResolutionCapable</key>
+    <true/>
+</dict>
+</plist>
diff --git a/dist/macos/iptux.bundle b/dist/macos/iptux.bundle
new file mode 100644
index 000000000..3f8823274
--- /dev/null
+++ b/dist/macos/iptux.bundle
@@ -0,0 +1,126 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<app-bundle>
+
+  <meta>
+    <!-- Where to pick up the GTK+ installation, icon themes,
+         etc. Note that "${env:JHBUILD_PREFIX}" is evaluated to the
+         value of the environment variable JHBUILD_PREFIX. You can
+         define additional prefixes and refer to them in paths
+         throughout this file on the form "${prefix:name}". This is
+         useful for installing certain libraries or even the
+         application itself separately. Note that JHBUILD_PREFIX is
+         defined by jhbuild, so it you are not using jhbuild you can
+         either define your own or just hardcode the path here.
+    -->
+    <!-- <prefix name="default">${env:JHBUILD_PREFIX}</prefix> -->
+    <prefix name="default">/opt/homebrew</prefix>
+
+    <!-- The project directory is the default location of the created
+         app. If you leave out the path, the current directory is
+         used. Note the usage of an environment variable here again.
+    -->
+    <destination overwrite="yes">${env:HOME}/Desktop</destination>
+
+    <image>
+      <!-- Not implemented yet (DMG image). -->
+    </image>
+
+    <!-- Comment this out to keep the install names in binaries -->
+    <run-install-name-tool/>
+
+    <!-- Optionally specify a launcher script to use. If the
+         application sets up everything needed itself, like
+         environment variable, linker paths, etc, a launcher script is
+         not needed. If the source path is left out, the default
+         script will be used.
+    -->
+    <!-- <launcher-script>${project}/gtk3-launcher.sh</launcher-script > -->
+
+    <!-- Not implemented: Optional runtime, could be python or mono
+         for example.
+    -->
+    <!-- runtime copy="yes">/usr/bin/python</runtime -->
+    <!-- Indicate the active gtk version to use. This is needed only
+         for gtk+-3.0 projects. -->
+    <gtk>gtk+-3.0</gtk>
+  </meta>
+
+  <!-- The special macro "${project}" refers to the directory where
+       this bundle file is located. The application name and bundle
+       identifier are taken from the plist file.
+  -->
+  <plist>${project}/Info.plist</plist>
+
+  <main-binary>${prefix}/bin/iptux</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. -->
+  <binary>
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so
+  </binary>
+
+<!-- And the print backends -->
+  <binary>
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
+  </binary>
+
+<!-- Starting with 2.24, gdk-pixbuf installs into its own directory. -->
+  <binary>
+    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so
+  </binary>
+
+  <binary>
+    ${prefix}/lib/gio/modules/libgiognutls.so
+  </binary>
+  <binary>
+    ${prefix}/lib/libiptux-core.0.dylib
+  </binary>
+  <binary>
+    ${prefix}/lib/libiptux-core.dylib
+  </binary>
+
+<!-- No longer needed for pango >= 1.38
+  <binary>
+    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
+  </binary>
+-->
+
+  <!-- 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.-->
+  <translations  name="gtk30">
+    ${prefix}/share/locale
+  </translations>
+
+
+  <!-- Data to copy in, usually Glade/UI files, images, sounds files
+       etc. The destination inside the bundle can be specified if the
+       files should end up at a different location, by using the
+       "dest" property. The destination must then start with the macro
+       "${bundle}", which refers to the bundle root directory.
+  -->
+  <data>
+    ${prefix}/share/iptux
+  </data>
+
+  <!-- Copy in the themes data. You may want to trim this to save space
+       in your bundle. -->
+  <data>
+    ${prefix}/share/themes
+  </data>
+
+  <data>
+    ${prefix}/share/icons
+  </data>
+
+  <!-- Copy icons. Note that the .icns file is an Apple format which
+       contains up to 4 sizes of icon. You can use
+       /Developer/Applications/Utilities/Icon Composer.app to import
+       artwork and create the file. >
+  <data dest="${bundle}/Contents/Resources">
+    ${project}/Giggle.icns
+  </data -->
+
+  </app-bundle>

From a10d146ebe620e971003370f67117c2660b84fd6 Mon Sep 17 00:00:00 2001
From: LI Daobing <lidaobing@gmail.com>
Date: Thu, 1 Apr 2021 23:21:33 +0800
Subject: [PATCH 2/4] Update iptux.bundle

---
 dist/macos/iptux.bundle | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dist/macos/iptux.bundle b/dist/macos/iptux.bundle
index 3f8823274..fa7cd3892 100644
--- a/dist/macos/iptux.bundle
+++ b/dist/macos/iptux.bundle
@@ -77,7 +77,10 @@
     ${prefix}/lib/libiptux-core.0.dylib
   </binary>
   <binary>
-    ${prefix}/lib/libiptux-core.dylib
+    ${prefix}/lib/libjsoncpp.24.dylib
+  </binary>
+  <binary>
+    ${prefix}/lib/libglog.0.dylib
   </binary>
 
 <!-- No longer needed for pango >= 1.38

From 0cbc0007b60087e2af66ac6c73a5e93c00fc4676 Mon Sep 17 00:00:00 2001
From: LI Daobing <lidaobing@gmail.com>
Date: Fri, 2 Apr 2021 00:32:33 +0800
Subject: [PATCH 3/4] Update iptux.bundle

---
 dist/macos/iptux.bundle | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/dist/macos/iptux.bundle b/dist/macos/iptux.bundle
index fa7cd3892..799f1bfe1 100644
--- a/dist/macos/iptux.bundle
+++ b/dist/macos/iptux.bundle
@@ -13,7 +13,7 @@
          either define your own or just hardcode the path here.
     -->
     <!-- <prefix name="default">${env:JHBUILD_PREFIX}</prefix> -->
-    <prefix name="default">/opt/homebrew</prefix>
+    <prefix name="default">/usr/local</prefix>
 
     <!-- The project directory is the default location of the created
          app. If you leave out the path, the current directory is
@@ -73,15 +73,6 @@
   <binary>
     ${prefix}/lib/gio/modules/libgiognutls.so
   </binary>
-  <binary>
-    ${prefix}/lib/libiptux-core.0.dylib
-  </binary>
-  <binary>
-    ${prefix}/lib/libjsoncpp.24.dylib
-  </binary>
-  <binary>
-    ${prefix}/lib/libglog.0.dylib
-  </binary>
 
 <!-- No longer needed for pango >= 1.38
   <binary>

From b9eac4f4d33b9cf520355a88529d77a39c756701 Mon Sep 17 00:00:00 2001
From: LI Daobing <lidaobing@gmail.com>
Date: Sat, 3 Apr 2021 10:02:53 +0800
Subject: [PATCH 4/4] Update iptux.bundle

---
 dist/macos/iptux.bundle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dist/macos/iptux.bundle b/dist/macos/iptux.bundle
index 799f1bfe1..4375675fb 100644
--- a/dist/macos/iptux.bundle
+++ b/dist/macos/iptux.bundle
@@ -87,6 +87,9 @@
   <translations  name="gtk30">
     ${prefix}/share/locale
   </translations>
+  <translations  name="iptux">
+    ${prefix}/share/locale
+  </translations>
 
 
   <!-- Data to copy in, usually Glade/UI files, images, sounds files