[gnome-builder] flatpak: Update Builder manifest from gnome-apps-nightly



commit eaf6fff3bfd8e6d3bb2a2ee84d0af74ba9e23759
Author: Matthew Leeds <mleeds redhat com>
Date:   Wed Dec 21 23:58:47 2016 -0600

    flatpak: Update Builder manifest from gnome-apps-nightly

 .../0001-libgit2-http-pretend-to-be-git-1.7.patch  |   25 ++++++++++++++++++++
 org.gnome.Builder.json                             |    6 ++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/build/flatpak/0001-libgit2-http-pretend-to-be-git-1.7.patch 
b/build/flatpak/0001-libgit2-http-pretend-to-be-git-1.7.patch
new file mode 100644
index 0000000..6889fad
--- /dev/null
+++ b/build/flatpak/0001-libgit2-http-pretend-to-be-git-1.7.patch
@@ -0,0 +1,25 @@
+From ba5cc93f0de9a0e82eca918a7105b3eb685b3695 Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert redhat com>
+Date: Mon, 19 Dec 2016 14:09:17 -0800
+Subject: [PATCH] http: pretend to be git 1.7+
+
+---
+ src/transports/http.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/transports/http.c b/src/transports/http.c
+index ca1f504..eb1addd 100644
+--- a/src/transports/http.c
++++ b/src/transports/http.c
+@@ -208,7 +208,7 @@ static int gen_request(
+ 
+       git_buf_printf(buf, "%s %s%s HTTP/1.1\r\n", s->verb, path, s->service_url);
+ 
+-      git_buf_printf(buf, "User-Agent: git/1.0 (%s)\r\n", user_agent());
++      git_buf_printf(buf, "User-Agent: git/1.7 (%s)\r\n", user_agent());
+       git_buf_printf(buf, "Host: %s\r\n", t->connection_data.host);
+ 
+       if (s->chunked || content_length > 0) {
+-- 
+2.9.3
+
diff --git a/org.gnome.Builder.json b/org.gnome.Builder.json
index 898735b..a19dbd2 100644
--- a/org.gnome.Builder.json
+++ b/org.gnome.Builder.json
@@ -32,7 +32,7 @@
         "--talk-name=org.freedesktop.FileManager1",
         /* We need access to auth agents */
         "--talk-name=org.freedesktop.secrets",
-       "--filesystem=xdg-run/keyring",
+        "--filesystem=xdg-run/keyring",
         /* Needed for various SSL certificates to work */
         "--env=SSL_CERT_DIR=/etc/ssl/certs",
         "--filesystem=/etc/ssl:ro",
@@ -209,6 +209,10 @@
                     "type": "git",
                     "url": "https://github.com/libgit2/libgit2.git";,
                     "branch": "maint/v0.24"
+                },
+                {
+                    "type": "patch",
+                    "path": "build/flatpak/0001-libgit2-http-pretend-to-be-git-1.7.patch"
                 }
             ]
         },


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