various osx fixes

meson.build

@@ -58,7 +58,6 @@ foreach locale : locales
   space_sep_locales += locale + ' '
 endforeach
 space_sep_locales.strip ()
-breeze_dark_path = get_option ('breeze-dark-path')
 trial_true_false = build_trial ? 'true' : 'false'
 is_arch = distro.contains ('arch')
 is_debian = distro.contains ('debian') or distro.contains ('ubuntu')
@@ -129,8 +128,6 @@ global_conf.set (
   'LILV_VERSION', get_option ('lilv-ver'))
 global_conf.set (
   'JACK_VERSION', get_option ('jack-ver'))
-global_conf.set (
-  'BREEZE_DARK_PATH', breeze_dark_path)
 global_conf.set (
   'SUPPORTING_TEXT',
   build_trial ? 'trying out' : 'supporting')
@@ -221,7 +218,6 @@ endif
 summary ({
   'prefix': prefix,
   'libdir': libdir,
-  'Breeze dark path': get_option ('breeze-dark-path'),
   'Packages dir': get_option ('packages-dir'),
   'PDF dir': get_option ('pdf-dir'),
   }, section: 'Directories')

meson_options.txt

@@ -42,7 +42,7 @@ option (
 
 option (
   'carla-git-ver', type: 'string',
-  value: '0c5addb4b8b532156ed6034e101b608bd3bb5da3',
+  value: 'a45be16cc4e54e9ab6f4cac56678f991a40e6c36',
   description: 'Carla version')
 
 option (

osx-brew/make_zip.sh.in

@@ -1,6 +1,6 @@
 #!@BASH@
 
-set -e
+set -ex
 
 out_file="$1"
 zrythm_formula_file=$2
@@ -11,6 +11,7 @@ private_dir=$6
 
 dash_trial="@DASH_TRIAL@"
 manuals_zip="@MANUALS_ZIP_FILE@"
+breeze_dark="@BREEZE_DARK@"
 
 inner_dir_name="${out_file%.*}"
 inner_dir_name="`basename $inner_dir_name`"
@@ -26,7 +27,7 @@ cp $installer_sh_file $inner_dir/installer.sh
 cp $readme_file $inner_dir/README
 cp $carla_bottle_file $inner_dir/bin/carla-git.catalina.bottle.tar.gz
 cp $zrythm_formula_file $inner_dir/formulae/
-cp -r /tmp/breeze-dark $inner_dir/icons/
+cp -r "$breeze_dark" $inner_dir/icons/
 
 if [ "$dash_trial" != "-trial" ]; then
   echo "adding user manuals" ;

osx-brew/meson.build

@@ -17,7 +17,7 @@
 
 osx_brew_conf = configuration_data ()
 osx_brew_conf.merge_from (global_conf)
-carla_bottle_ver = '0.1.2'
+carla_bottle_ver = '0.1.3'
 carla_bottle_filename = 'carla-git--' + carla_bottle_ver + '.catalina.bottle.tar.gz'
 zrythm_bottle_filename = 'zrythm' + dash_trial + '--' + zrythm_pkg_ver + '.catalina.bottle.tar.gz'
 osx_brew_conf.set (
@@ -41,18 +41,11 @@ osx_brew_conf.set (
 installer_zip_filename = 'zrythm' + dash_trial + '-' + zrythm_pkg_ver + '-osx-installer.zip'
 osx_brew_conf.set (
   'OSX_INSTALLER_ZIP_FILENAME', installer_zip_filename)
-
-make_breeze_icons = custom_target (
-  'osx-breeze-icons',
-  output: 'breeze-dark',
-  input: breeze_dark_path,
-  command: [
-    'rm', '-rf', '@OUTPUT@', '&&',
-    'cp', '-R', '@INPUT@', '@OUTPUT@', '&&',
-    'cp', '-R', '@INPUT@', '/tmp/breeze-dark',
-    ],
-  install: false,
-  )
+osx_brew_conf.set (
+  'BREEZE_DARK', breeze_icons.full_path ())
+osx_brew_conf.set (
+  'BUILT_ZPLUGINS_DIR',
+  zplugins_installation.full_path ())
 
 # configure scripts
 make_bottle_sh = configure_file (
@@ -117,7 +110,7 @@ zrythm_bottle = custom_target (
     '@INPUT1@', '@PRIVATE_DIR@',
     '@INPUT3@',
     ],
-  depends: [ make_breeze_icons, zplugins_installation, ],
+  depends: [ breeze_icons, zplugins_installation, ],
   console: true,
   install: false,
   )

osx-brew/zrythm.rb.in

@@ -39,10 +39,11 @@ class Zrythm@DASH_TRIAL@ < Formula
         "-Dfallback_version=@ZRYTHM_PKG_VERSION@",
         # manpage fails
         "-Dmanpage=false",
+        "-Dstatic_libs=true",
         ".."
       system "ninja", "-v"
       system "ninja", "install", "-v"
-      system "cp", "-r", "/tmp/breeze-dark", "#{share}/icons/breeze-dark"
+      system "cp", "-r", "@BREEZE_DARK@", "#{share}/icons/breeze-dark"
       system "mkdir", "-p", "#{lib}/zrythm/lib"
       system "cp", "-RLv", "@BUILT_ZPLUGINS_DIR@", "#{lib}/zrythm/lib/lv2"
     end

sources/make_breeze_icons.sh.in

@@ -0,0 +1,16 @@
+#!@BASH@
+
+set -ex
+
+out_dir="$1"
+breeze_zip="$2"
+private_dir="$3"
+
+rm -rf $out_dir
+rm -rf $private_dir
+
+#out_dir_parent="`pwd`/$out_dir"
+#out_dir_parent="`dirname $out_dir_parent`"
+
+unzip "$breeze_zip" -d $private_dir
+mv $private_dir/breeze-icons-master/icons-dark $out_dir

sources/meson.build

@@ -21,6 +21,11 @@ make_zrythm_tarball = configure_file (
   input: 'make_zrythm_tarball.sh.in',
   configuration: global_conf,
   )
+make_breeze_icons = configure_file (
+  output: 'make_breeze_icons.sh',
+  input: 'make_breeze_icons.sh.in',
+  configuration: global_conf,
+  )
 
 orig_zrythm_src_tarball = custom_target (
   'orig-zrythm-source-tarball',
@@ -28,7 +33,6 @@ orig_zrythm_src_tarball = custom_target (
   command: [
     'wget', orig_zrythm_src_tarball_url, '-O', '@OUTPUT@',
     ],
-  console: true,
   install: false,
   )
 
@@ -42,7 +46,6 @@ zrythm_src_tarball = custom_target (
     bash, '-c', '@INPUT0@ "$1" "$2" "$3"', '_ignored',
     '@OUTPUT@', '@INPUT1@', '@PRIVATE_DIR@'
     ],
-  console: true,
   install: false,
   )
 
@@ -59,7 +62,6 @@ carla_src_zip = custom_target (
   command: [
     'wget', url, '-O', '@OUTPUT@',
     ],
-  console: true,
   install: false,
   )
 
@@ -70,7 +72,6 @@ zplugins_src_tarball = custom_target (
   command: [
     'wget', url, '-O', '@OUTPUT@',
     ],
-  console: true,
   install: false,
   )
 
@@ -81,6 +82,27 @@ lsp_dsp_lib_src_tarball = custom_target (
   command: [
     'wget', url, '-O', '@OUTPUT@',
     ],
-  console: true,
+  install: false,
+  )
+
+breeze_icons_zip = custom_target (
+  'breeze-icons-zip',
+  output: 'breeze-icons.zip',
+  command: [
+    'wget',
+    'https://github.com/KDE/breeze-icons/archive/master.zip',
+    '-O', '@OUTPUT@',
+    ],
+  install: false,
+  )
+
+breeze_icons = custom_target (
+  'breeze-icons',
+  output: 'breeze-dark',
+  input: [ make_breeze_icons, breeze_icons_zip, ],
+  command: [
+    bash, '-c', '@INPUT0@ "$1" "$2" "$3"', '_ignored',
+    '@OUTPUT@', '@INPUT1@', '@PRIVATE_DIR@',
+    ],
   install: false,
   )