From dd122f9b73b5b7936d95d49d239af58c90a8e58d Mon Sep 17 00:00:00 2001 From: Tom Schoonjans Date: Tue, 26 Sep 2017 08:55:13 +0100 Subject: [PATCH] macOS: update bundke script --- bin/xmimsim-gui.c | 2 +- osx/makebundle.sh | 6 ++---- osx/settings.ini | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/bin/xmimsim-gui.c b/bin/xmimsim-gui.c index 5efdb2d8..b79c8ef0 100644 --- a/bin/xmimsim-gui.c +++ b/bin/xmimsim-gui.c @@ -3283,7 +3283,7 @@ static void about_click(GtkWidget *widget, gpointer data) { NULL }; - static const gchar copyright[] = "Copyright \xc2\xa9 2010-2016 Tom Schoonjans, Philip Brondeel and Laszlo Vincze"; + static const gchar copyright[] = "Copyright \xc2\xa9 2010-2017 Tom Schoonjans, Philip Brondeel and Laszlo Vincze"; static const gchar comments[] = "A tool for the Monte Carlo simulation of ED-XRF spectrometers\n\n\nPlease read carefully the License section and the links therein."; diff --git a/osx/makebundle.sh b/osx/makebundle.sh index 0f04ef23..34dc926f 100755 --- a/osx/makebundle.sh +++ b/osx/makebundle.sh @@ -3,7 +3,6 @@ set -x export PATH=$PATH:$HOME/.local/bin rm -rf .xmimsim-gui.app gtk-mac-bundler xmimsim.bundle || exit 1 -#find XMI-MSIM.app -name '*.svg' | xargs rm gtk-update-icon-cache-3.0 --include-image-data --quiet XMI-MSIM.app/Contents/Resources/share/icons/hicolor gtk-update-icon-cache-3.0 --include-image-data --quiet XMI-MSIM.app/Contents/Resources/share/icons/Adwaita update-mime-database XMI-MSIM.app/Contents/Resources/share/mime @@ -11,6 +10,5 @@ mkdir -p XMI-MSIM.app/Contents/Resources/etc/gtk-3.0 cp settings.ini XMI-MSIM.app/Contents/Resources/etc/gtk-3.0/ mkdir -p XMI-MSIM.app/Contents/Library/QuickLook cp -a ../build/osx/quicklook/xmi-msim.qlgenerator XMI-MSIM.app/Contents/Library/QuickLook/ -#cp libintl.8.dylib libxrl.7.dylib XMI-MSIM.app/Contents/Resources/lib/ -#install_name_tool -change /opt/local/lib/libiconv.2.dylib @executable_path/../Resources/lib/libiconv.2.dylib XMI-MSIM.app/Contents/Resources/lib/libintl.8.dylib -#cp /usr/local/share/xmimsim/xmimsimdata.h5 XMI-MSIM.app/Contents/Resources/ +cp /usr/local/share/xmimsim/xmimsimdata.h5 XMI-MSIM.app/Contents/Resources/ +cp -a ~/Downloads/Gnome\ OSX-III-1.0 XMI-MSIM.app/Contents/Resources/share/themes/Gnome-OSX-III-1.0 diff --git a/osx/settings.ini b/osx/settings.ini index f936be55..ac9ac7dc 100644 --- a/osx/settings.ini +++ b/osx/settings.ini @@ -1,5 +1,5 @@ [Settings] -gtk-theme-name = Gnome-OSX-II-NT-2-5-1 +gtk-theme-name = Gnome-OSX-III-1.0 #gtk-theme-name = OSX-Arc-White gtk-icon-theme-name = Adwaita gtk-fallback-icon-theme = hicolor