From: Jan Rękorajski Date: Sun, 23 Mar 2014 18:53:16 +0000 (+0100) Subject: - fix shell syntax X-Git-Tag: auto/th/mozilla-addon-gnome-keyring-0.6.9-3 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=1a4e1df253cf9d4c7aaf72485cfda8daef8379d1;p=packages%2Fmozilla-addon-gnome-keyring.git - fix shell syntax --- diff --git a/xulrunner-27.patch b/xulrunner-27.patch index cf95fab..e02e6d7 100644 --- a/xulrunner-27.patch +++ b/xulrunner-27.patch @@ -65,26 +65,27 @@ diff --git a/config.sh b/config.sh index bf50a68..4b32da2 100755 --- a/config.sh +++ b/config.sh -@@ -13,8 +13,20 @@ XUL_VERSION=$(echo '#include "mozilla-config.h"'| +@@ -13,8 +13,21 @@ XUL_VERSION=$(echo '#include "mozilla-config.h"'| XUL_VER_MIN=$(echo $XUL_VERSION | sed -r -e 's/([^.]+\.[^.]+).*/\1/g') XUL_VER_MAX=$(echo $XUL_VERSION | sed -rn -e 's/([^.]+).*/\1.*/gp') -HAVE_NSILMS_GETISLOGGEDIN=$({ echo '#include "'"$SRC_GNOME_KEYRING_H"'"'; echo 'NS_IMETHODIMP GnomeKeyring::GetIsLoggedIn(bool *aIsLoggedIn) { return NS_OK; }'; } | - $CXX $XUL_CFLAGS $GNOME_CFLAGS $CXXFLAGS -x c++ -w -c -o /dev/null - && echo 1 || echo 0) -+HAVE_NSILMS_GETISLOGGEDIN=$({ cat </dev/null && echo 1 || echo 0) ++HAVE_NSILMS_GETISLOGGEDIN=$({ cat </dev/null && echo 1 || echo 0 +#include "$SRC_GNOME_KEYRING_H" +NS_IMETHODIMP GnomeKeyring::GetIsLoggedIn(bool *aIsLoggedIn) { return NS_OK; } +EOF -+ -+HAVE_NSILMS_INITWITHFILE_2=$({ cat </dev/null && echo 1 || echo 0) ++) ++HAVE_NSILMS_INITWITHFILE_2=$({ cat </dev/null && echo 1 || echo 0 +#include "$SRC_GNOME_KEYRING_H" +NS_IMETHODIMP GnomeKeyring::InitWithFile(nsIFile *aInputFile, nsIFile *aOutputFile) { return NS_OK; } +EOF -+ -+HAVE_MOZ_BUG_956507=$({ cat </dev/null && echo 0 || echo 1) ++) ++HAVE_MOZ_BUG_956507=$({ cat </dev/null && echo 0 || echo 1 +#include +#include "mozilla/Char16.h" +EOF ++) HAVE_MOZGLUE=$($CXX $XUL_CFLAGS $XUL_LDFLAGS $XPCOM_ABI_FLAGS $CXXFLAGS $LDFLAGS -lmozglue -shared -o /dev/null && echo 1 || echo 0)