[gimp/osx-build: 33/50] OS X build: fix libsecret 0.18 code generation issue

[Sven Claussner <sclaussner src gnome org>]

commit bf1b64455edea27f032ea2e0c7834e8f7a9211b5
Author: Sven Claussner <sclaussner src gnome org>
Date:   Thu May 29 16:57:13 2014 +0200

    OS X build: fix libsecret 0.18 code generation issue
    
    The sed command on OS X is too old to handle sed '1i\' properly. Thus
    replace it by 'echo'.

 build/osx/gimp.modules                             |    7 ++-
 .../libsecret-fix-secret-dbus-generation.c.patch   |   53 ++++++++++++++++++++
 2 files changed, 58 insertions(+), 2 deletions(-)
---
diff --git a/build/osx/gimp.modules b/build/osx/gimp.modules
index d79d969..ac95e0b 100755
--- a/build/osx/gimp.modules
+++ b/build/osx/gimp.modules
@@ -539,9 +539,12 @@
                </dependencies>
        </autotools>
 
-       <autotools id="libsecret" autogen-sh="configure" autogenargs="">
+       <autotools id="libsecret" autogen-sh="configure" autogenargs="--disable-manpages">
                <branch module="libsecret/0.18/libsecret-0.18.tar.xz" version="0.18.0"
-                       hash="sha256:0c73aa762dbd1e38ba7b03de350e23ce818cb810b0784375e95ef61e004b02e3" />
+                       hash="sha256:0c73aa762dbd1e38ba7b03de350e23ce818cb810b0784375e95ef61e004b02e3">
+                       <patch file="libsecret-fix-secret-dbus-generation.c.patch"
+                               strip="1" />
+               </branch>
                <dependencies>
                        <dep package="sqlite" />
                        <dep package="gobject-introspection" />
diff --git a/build/osx/patches/libsecret-fix-secret-dbus-generation.c.patch 
b/build/osx/patches/libsecret-fix-secret-dbus-generation.c.patch
new file mode 100644
index 0000000..42ee971
--- /dev/null
+++ b/build/osx/patches/libsecret-fix-secret-dbus-generation.c.patch
@@ -0,0 +1,53 @@
+From efc3b9776d5058b7e6c4ca1056a7bf2f61280453 Mon Sep 17 00:00:00 2001
+From: Sven Claussner <sclaussner src gnome org>
+Date: Thu, 29 May 2014 16:42:48 +0200
+Subject: [PATCH] libsecret fix secret-dbus-generation.c
+
+The sed command on OS X is too old to handle sed '1i\' properly. Thus
+replace it by 'echo'.
+---
+ Makefile.in           | 6 +++---
+ libsecret/Makefile.am | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 2b3ab39..7694283 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -2776,11 +2776,11 @@ temp-dbus-generated.c: $(DBUS_XML_DEFINITIONS) Makefile.am
+       $(AM_V_GEN) gdbus-codegen --interface-prefix org.freedesktop.Secret. \
+               --generate-c-code temp-dbus-generated --c-namespace SecretGen $<
+ secret-dbus-generated.c: temp-dbus-generated.c Makefile.am
+-      $(AM_V_GEN) sed -e '1i\
+-      #define GLIB_DISABLE_DEPRECATION_WARNINGS' \
++      $(AM_V_GEN) echo        #define GLIB_DISABLE_DEPRECATION_WARNINGS \
++              > secret-dbus-generated.c && \
+               -e 's/secret_gen_/_secret_gen_/g' -e 's/type-/type/g' \
+               -e 's/temp-dbus-generated.h/secret-dbus-generated.h/g' \
+-              temp-dbus-generated.c > secret-dbus-generated.c
++              temp-dbus-generated.c >> secret-dbus-generated.c
+ secret-dbus-generated.h: temp-dbus-generated.c Makefile.am
+       $(AM_V_GEN) sed -e 's/secret_gen_/_secret_gen_/g' -e 's/type-/type/g' \
+               temp-dbus-generated.h > secret-dbus-generated.h
+diff --git a/libsecret/Makefile.am b/libsecret/Makefile.am
+index 0601460..0ccded6 100644
+--- a/libsecret/Makefile.am
++++ b/libsecret/Makefile.am
+@@ -89,11 +89,11 @@ temp-dbus-generated.c: $(DBUS_XML_DEFINITIONS) Makefile.am
+       $(AM_V_GEN) gdbus-codegen --interface-prefix org.freedesktop.Secret. \
+               --generate-c-code temp-dbus-generated --c-namespace SecretGen $<
+ secret-dbus-generated.c: temp-dbus-generated.c Makefile.am
+-      $(AM_V_GEN) sed -e '1i\
+-      #define GLIB_DISABLE_DEPRECATION_WARNINGS' \
++      $(AM_V_GEN) echo        #define GLIB_DISABLE_DEPRECATION_WARNINGS \
++              > secret-dbus-generated.c && \
+               -e 's/secret_gen_/_secret_gen_/g' -e 's/type-/type/g' \
+               -e 's/temp-dbus-generated.h/secret-dbus-generated.h/g' \
+-              temp-dbus-generated.c > secret-dbus-generated.c
++              temp-dbus-generated.c >> secret-dbus-generated.c
+ secret-dbus-generated.h: temp-dbus-generated.c Makefile.am
+       $(AM_V_GEN) sed -e 's/secret_gen_/_secret_gen_/g' -e 's/type-/type/g' \
+               temp-dbus-generated.h > secret-dbus-generated.h
+-- 
+2.0.0.rc2
+