From a2aed94e48cb4af8a73f9d711d5ed811ccd794da Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Tue, 11 Apr 2017 20:21:36 +0300
Subject: [PATCH] Issue #2865977 by RajabNatshah, josebc, abu-zakham, Mohammed
J. Razem: [8.4.x] Establishing profile inheritance for new distros
---
build-varbase.make | 8 +++++---
composer.json | 6 +++++-
drupal-org-core.make | 4 +++-
drupal-org.make | 14 +++++++-------
varbase.info.yml | 1 -
5 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/build-varbase.make b/build-varbase.make
index c32e5573..9352090b 100644
--- a/build-varbase.make
+++ b/build-varbase.make
@@ -1,5 +1,7 @@
-core = 8.x
api = 2
-
+core = 8.x
includes[] = drupal-org-core.make
-includes[] = drupal-org.make
+projects[varbase][type] = profile
+projects[varbase][download][type] = git
+projects[varbase][download][branch] = 8.x-4.x
+projects[varbase][download][tag] = 8.x-4.x-dev
diff --git a/composer.json b/composer.json
index 5669dff6..521c3377 100644
--- a/composer.json
+++ b/composer.json
@@ -107,6 +107,10 @@
]
},
"patches": {
+ "drupal/core": {
+ "Issue #1356276: Allow profiles to provide a base_parent profile and load them in the correct order":
+ "https://www.drupal.org/files/issues/1356276-303.patch"
+ },
"drupal/bootstrap_layouts": {
"Issue #2868095 by RajabNatshah: Fix for the issue of not having plugin.manager.core.layout on update.":
"https://www.drupal.org/files/issues/2868095-2.patch"
@@ -196,7 +200,6 @@
"drupal/fast_404": "1.0-alpha2",
"drupal/diff": "1.0-rc1",
"drupal/masquerade": "2.0-beta1",
- "drupal/libraries": "3.x-dev#08a46ab12b573f1f48e9d160ed21a36417b5f749",
"drupal/libraries_ui": "1.0",
"drupal/devel": "1.0-rc1",
"drupal/bootstrap": "3.3",
@@ -213,6 +216,7 @@
"drupal/recaptcha": "2.2",
"drupal/mailsystem": "4.1",
"drupal/smtp": "1.0-beta2",
+ "drupal/libraries": "3.x-dev#061ead081c92a6209b09eaf23b4e3103f360946e",
"drupal/layout_plugin": "1.0-alpha23",
"drupal/xmlsitemap": "1.0-alpha2",
"drupal/anchor_link": "1.3",
diff --git a/drupal-org-core.make b/drupal-org-core.make
index e591a4be..1f373be5 100644
--- a/drupal-org-core.make
+++ b/drupal-org-core.make
@@ -1,8 +1,10 @@
-core = 8.x
api = 2
+core = 8.x
; Drupal Core
projects[drupal][type] = "core"
projects[drupal][version] = "8.3.0"
+;; Issue #1356276: Allow profiles to provide a base_parent profile and load them in the correct order
+projects[drupal][patch][] = https://www.drupal.org/files/issues/1356276-303.patch
;; Issue #2853988: Add option to rewrite robots.txt on staging environments
projects[drupal][patch][] = https://www.drupal.org/files/issues/drupal_8-allow_stg_robots-2853988-2.patch
diff --git a/drupal-org.make b/drupal-org.make
index 24c004f9..ece53864 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -1,5 +1,5 @@
-core = 8.x
api = 2
+core = 8.x
;;;;;;;;;;;;;;;;;;;;;
;; Contrib modules
@@ -323,12 +323,6 @@ projects[masquerade][type] = module
projects[masquerade][subdir] = "contrib"
projects[masquerade][version] = 2.0-beta1
-projects[libraries][type] = module
-projects[libraries][subdir] = "contrib"
-projects[libraries][download][url] = https://git.drupal.org/project/libraries.git
-projects[libraries][download][revision] = 08a46ab12b573f1f48e9d160ed21a36417b5f749
-projects[libraries][download][branch] = 8.x-3.x
-
projects[libraries_ui][type] = module
projects[libraries_ui][subdir] = "contrib"
projects[libraries_ui][version] = 1.0
@@ -355,6 +349,12 @@ projects[adminimal_theme][version] = 1.3
;; - As a step to update or migrate and use new selected modules.
;;;;;;;;;;;;;;;;;;;;;
+projects[libraries][type] = module
+projects[libraries][subdir] = "contrib"
+projects[libraries][download][url] = https://git.drupal.org/project/libraries.git
+projects[libraries][download][revision] = 061ead081c92a6209b09eaf23b4e3103f360946e
+projects[libraries][download][branch] = 8.x-3.x
+
;; Layout plugin is in Drupal 8.3.x core under the name of [Layout Discovery]
projects[layout_plugin][type] = module
projects[layout_plugin][subdir] = "contrib"
diff --git a/varbase.info.yml b/varbase.info.yml
index 5dbe537c..d86fc5d7 100644
--- a/varbase.info.yml
+++ b/varbase.info.yml
@@ -48,7 +48,6 @@ dependencies:
# contrib modules
- entity
- - libraries
- config_update
- ctools
- ctools_block
--
GitLab