mirror of
git://git.savannah.gnu.org/guix.git
synced 2023-12-14 03:33:07 +01:00
c91d3fb7f4
* gnu/packages/boost.scm (boost): Update to 1.60.0. [source]: Remove patch. * gnu/packages/patches/boost-mips-avoid-m32.patch: Delete patch * gnu-system.am (dist_patch_DATA): Remove patch. Also fix dependent packages: * gnu/packages/patches/csound-header-ordering.patch: New patch. * gnu/packages/audio.scm (csound)[source]: Use it. [arguments]: Add 'set-flags phase. * gnu/packages/patches/libcmis-fix-test-onedrive.patch: New patch. * gnu/packages/libreoffice.scm (libcmis)[source]: Use it. (libreoffice)[arguments]: Add LDFLAGS to #:configure-flags. (librevenge)[inputs]: Move boost from here... [propogated-inputs]: to here. [arguments]: Add LDFLAGS to #:configure-flags. * gnu/packages/patches/openimageio-boost-1.60.patch: New patch. * gnu/packages/graphics.scm (openimageio): Use it. * gnu-system.am (dist_patch_DATA): Add patches.
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
Patch from resolution of http://sourceforge.net/p/libcmis/tickets/13/
|
|
|
|
From 814c7845d53688b35a747cf193c2ff99e40a8652 Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Wakely <jwakely@redhat.com>
|
|
Date: Wed, 2 Sep 2015 16:35:45 +0100
|
|
Subject: [PATCH 5/5] Remove invalid comments from test JSON file.
|
|
|
|
---
|
|
qa/libcmis/data/onedrive/search-result.json | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/qa/libcmis/data/onedrive/search-result.json b/qa/libcmis/data/onedrive/search-result.json
|
|
index 61d250a..2482429 100644
|
|
--- a/qa/libcmis/data/onedrive/search-result.json
|
|
+++ b/qa/libcmis/data/onedrive/search-result.json
|
|
@@ -8,7 +8,7 @@
|
|
},
|
|
"name":"OneDriveFile",
|
|
"description":"",
|
|
- "parent_id":"folderA", // path: /A/Wrong File
|
|
+ "parent_id":"folderA",
|
|
"size":18047,
|
|
"upload_location":"https://apis.live.net/v5.0/wrongFileId/content/",
|
|
"comments_count":0,
|
|
@@ -32,7 +32,7 @@
|
|
},
|
|
"name":"OneDriveFile",
|
|
"description":"",
|
|
- "parent_id":"folderC", // path: /A/B/C/Right File
|
|
+ "parent_id":"folderC",
|
|
"size":4,
|
|
"upload_location":"https://apis.live.net/v5.0/rightFileId/content/",
|
|
"comments_count":0,
|
|
--
|
|
2.4.3
|