From bfdac0281fb9ac46b812520c41c5279367e2d4e1 Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Tue, 4 Dec 2018 22:18:34 +0100
Subject: [PATCH] git subrepo pull packages/rang
subrepo:
subdir: "packages/rang"
merged: "cabe04d6d"
upstream:
origin: "git@github.com:agauniyal/rang.git"
branch: "master"
commit: "cabe04d6d"
git-subrepo:
version: "0.4.0"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "5d6aba9"
---
packages/rang/.gitrepo | 7 ++++---
packages/rang/conanfile.py | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/packages/rang/.gitrepo b/packages/rang/.gitrepo
index 6733a19fc..063e422be 100644
--- a/packages/rang/.gitrepo
+++ b/packages/rang/.gitrepo
@@ -6,6 +6,7 @@
[subrepo]
remote = git@github.com:agauniyal/rang.git
branch = master
- commit = f09d567d5afe5230de0676ddecef93daf4a09667
- parent = fb68ce0527e9597488748018bf8b37cb651270b3
- cmdver = 0.3.1
+ commit = cabe04d6d6b05356fa8f9741704924788f0dd762
+ parent = 61d96553d759fb36c6592e9b2b41a4af8acc45f1
+ cmdver = 0.4.0
+ method = merge
diff --git a/packages/rang/conanfile.py b/packages/rang/conanfile.py
index 4ad8ee762..9ec7632d3 100644
--- a/packages/rang/conanfile.py
+++ b/packages/rang/conanfile.py
@@ -10,6 +10,7 @@ class RangConan(ConanFile):
generators = "pkg_config"
build_requires = "doctest/1.2.6@bincrafters/stable"
exports_sources = "*"
+ settings = "build_type"
def build(self):
meson = Meson(self)
--
GitLab