From bcb1eeadc471da819fd57bc100d0971bc8790430 Mon Sep 17 00:00:00 2001
From: Butta <repo@butta.fastem.com>
Date: Mon, 10 Aug 2020 18:09:36 +0530
Subject: [PATCH] babl: update patches

bump yadm and imagemagick on CI too
---
 packages/babl/babl-meson.build.patch  | 10 +++++-----
 packages/babl/tests-meson.build.patch |  8 ++++----
 packages/babl/tools-meson.build.patch |  8 ++++----
 packages/imagemagick/build.sh         |  2 +-
 packages/yadm/build.sh                |  3 +--
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/packages/babl/babl-meson.build.patch b/packages/babl/babl-meson.build.patch
index 15e14c0ab..9af25bc05 100644
--- a/packages/babl/babl-meson.build.patch
+++ b/packages/babl/babl-meson.build.patch
@@ -3,10 +3,10 @@ diff -u -r ../babl-0.1.70/babl/meson.build ./babl/meson.build
 +++ ./babl/meson.build	2019-08-08 09:55:50.648892290 +0000
 @@ -128,7 +128,7 @@
    c_args: babl_c_args,
-   link_whole: [ babl_base, ],
-   link_args: [ babl_link_args, ],
--  dependencies: [ math, thread, dl, lcms, ],
-+  dependencies: [ math, thread, dl, lcms, log, ],
-   link_depends: [ version_script_target, ],
+   link_whole: babl_base,
+   link_args: babl_link_args,
+-  dependencies: [math, thread, dl, lcms],
++  dependencies: [math, thread, dl, lcms, log],
+   link_depends: version_script,
    version: so_version,
    install: true,
diff --git a/packages/babl/tests-meson.build.patch b/packages/babl/tests-meson.build.patch
index d3b165533..692e76d31 100644
--- a/packages/babl/tests-meson.build.patch
+++ b/packages/babl/tests-meson.build.patch
@@ -3,10 +3,10 @@ diff -u -r ../babl-0.1.70/tests/meson.build ./tests/meson.build
 +++ ./tests/meson.build	2019-08-08 09:58:14.015259147 +0000
 @@ -41,7 +41,7 @@
      test_name + '.c',
-     include_directories: [ rootInclude, bablInclude, ],
-     link_with: [ babl, ],
--    dependencies: [ thread, ],
-+    dependencies: [ thread, log, ],
+     include_directories: [rootInclude, bablInclude],
+     link_with: babl,
+-    dependencies: thread,
++    dependencies: [thread, log],
      export_dynamic: true,
      install: false,
    )
diff --git a/packages/babl/tools-meson.build.patch b/packages/babl/tools-meson.build.patch
index 201deb2fc..d8aa23753 100644
--- a/packages/babl/tools-meson.build.patch
+++ b/packages/babl/tools-meson.build.patch
@@ -3,10 +3,10 @@ diff -u -r ../babl-0.1.70/tools/meson.build ./tools/meson.build
 +++ ./tools/meson.build	2019-08-08 09:59:07.362648769 +0000
 @@ -17,7 +17,7 @@
      tool_name + '.c',
-     include_directories: [ rootInclude, bablInclude, ],
-     link_with: [ babl, ],
--    dependencies: [ math, thread, ],
-+    dependencies: [ math, thread, log, ],
+     include_directories: [rootInclude, bablInclude],
+     link_with: babl,
+-    dependencies: [math, thread],
++    dependencies: [math, thread, log],
      install: false,
    )
  
diff --git a/packages/imagemagick/build.sh b/packages/imagemagick/build.sh
index d2d44cd19..d2ca26fb3 100644
--- a/packages/imagemagick/build.sh
+++ b/packages/imagemagick/build.sh
@@ -26,7 +26,7 @@ share/ImageMagick-7/francais.xml
 
 termux_step_pre_configure() {
 	if [ $TERMUX_ARCH = "i686" ]; then
-		# Avoid "libMagickCore-7.Q16HDRI.so: error: undefined reference to '__atomic_load'":
+		# Avoid "libMagickCore-7.Q16HDRI.so: error: undefined reference to '__atomic_load'"
 		LDFLAGS+=" -latomic"
 	fi
 }
diff --git a/packages/yadm/build.sh b/packages/yadm/build.sh
index 7e8e38d6f..a0ca9f69e 100644
--- a/packages/yadm/build.sh
+++ b/packages/yadm/build.sh
@@ -8,8 +8,7 @@ TERMUX_PKG_DEPENDS="git"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_make() {
-	# Do not try to run 'make' as this causes
-	# build failure.
+	# Do not try to run 'make' as it causes a build failure.
 	return
 }