[gnome-continuous] Update the build-api patch for brotli



commit d61d3f946756cafa006e92cdcbbe3af505f40d6d
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Dec 4 20:08:19 2017 +0000

    Update the build-api patch for brotli
    
    Ignore the unknown options.

 patches/brotli-cmake-build-api.patch |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/patches/brotli-cmake-build-api.patch b/patches/brotli-cmake-build-api.patch
index d7210cf..89e40d4 100644
--- a/patches/brotli-cmake-build-api.patch
+++ b/patches/brotli-cmake-build-api.patch
@@ -1,4 +1,4 @@
-From 7620e444ae39c664fae2ef702a23c8aa3dba6980 Mon Sep 17 00:00:00 2001
+From 8e6a10b2f03ebc0da81dd5138a4a92d72ecb4317 Mon Sep 17 00:00:00 2001
 From: Emmanuele Bassi <ebassi gnome org>
 Date: Mon, 4 Dec 2017 19:58:16 +0000
 Subject: [PATCH] Conform to the build-api
@@ -6,17 +6,20 @@ Subject: [PATCH] Conform to the build-api
 Brotli already has a wrapper for CMake and it follows the GNU/Autotools
 standard directories. The problem is that, for some reason clearly
 involving bonghits, they decided to make `configure` not do anything.
+
+v2
+ - ignore (and warn) about unknown options instead of erroring out
 ---
- configure       | 324 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
- configure-cmake | 318 ------------------------------------------------------
- 2 files changed, 317 insertions(+), 325 deletions(-)
+ configure       | 323 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ configure-cmake | 318 -------------------------------------------------------
+ 2 files changed, 316 insertions(+), 325 deletions(-)
  delete mode 100755 configure-cmake
 
 diff --git a/configure b/configure
-index d96129a..6dfb92c 100755
+index d96129a..f74e7f9 100755
 --- a/configure
 +++ b/configure
-@@ -1,8 +1,318 @@
+@@ -1,8 +1,317 @@
  #!/usr/bin/env bash
 -echo "Use Autotools, Bazel, CMake or Premake5 to generate projects / build files."
 -echo "  Bazel: http://www.bazel.build/";
@@ -322,9 +325,8 @@ index d96129a..6dfb92c 100755
 +            ;;
 +
 +        *)
-+            echo "$0: error: unrecognized option: \`$1'" >&2
-+            echo "Try \`$0 --help' for more information" >&2
-+            exit -1
++            echo "$0: warning: unrecognized option: \`$1'" >&2
++            ;;
 +    esac;
 +    shift
 +done


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]