From f2be3d9819146ee9c8ca5a9ddc1074d14cef8097 Mon Sep 17 00:00:00 2001 From: Rajab Natshah <r.natshah@vardot.com> Date: Sun, 26 Jun 2016 15:25:19 +0300 Subject: [PATCH] Issue #2755867: Added patches for number of modules --- composer.json | 56 +++++++++++++++++++++++++++++++++++++++---------- drupal-org.make | 10 +++++++++ 2 files changed, 55 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index db9696fd..a3dcd69d 100644 --- a/composer.json +++ b/composer.json @@ -19,17 +19,51 @@ } ], "extra": { - "installer-paths": { - "docroot/core": [ - "drupal/core" - ], - "modules/contrib/{$name}": [ - "type:drupal-module" - ], - "themes/contrib/{$name}": [ - "type:drupal-theme" - ] - } + "installer-paths": { + "docroot/core": [ + "drupal/core" + ], + "modules/contrib/{$name}": [ + "type:drupal-module" + ], + "themes/contrib/{$name}": [ + "type:drupal-theme" + ] + }, + "patches": { + "drupal/ctools": { + "2747739 - Mega patch": + "https://www.drupal.org/files/issues/ctools--8.x-3.0-alpha26--1fe3649.patch" + }, + "drupal/page_manager": { + "2747739 - Mega Patch": + "https://www.drupal.org/files/issues/page_manager--alpha23-09e79ff--2747739-3.patch" + }, + "drupal/panelizer": { + "2747739 - Mega Patch": + "https://www.drupal.org/files/issues/panelizer--alpha2-1ddfa61--2747739-5.patch", + "2701349 - Generate new UUIDs for displays when switching from default to field storage": + "https://www.drupal.org/files/issues/2701349-2.patch", + "2700597 - Explicitly set the Panels IPE URL root when saving in Panelizer": + "https://www.drupal.org/files/issues/panelizer-ipe-url-root-handling.patch", + "2664682 - Implement admin UI for editing Panelizer defaults": + "https://www.drupal.org/files/issues/2664682-45.patch" + }, + "drupal/panels": { + "2747739 - Mega Patch": + "https://www.drupal.org/files/issues/panels--beta4-4c4a3a7--2747739-2.patch", + "2667754 - Allow other modules to disable the IPE based on custom logic": + "https://www.drupal.org/files/issues/2667754-3.patch", + "Bandaid tempstore patch": + "https://www.drupal.org/files/issues/bandaid.patch", + "2697587 - Wizard API integration": + "https://www.drupal.org/files/issues/2697587-42.patch" + }, + "drush/drush": { + "Adding composer.json support to make-convert command": + "https://github.com/drush-ops/drush/commit/ce82b946d49b09cd33da5ca84feb24a6c35f8f8e.patch" + } + } }, "require": { "cweagans/composer-patches": "^1.5.0", diff --git a/drupal-org.make b/drupal-org.make index e9ea9b35..26a5a4cf 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -22,6 +22,7 @@ projects[ctools][subdir] = "contrib" projects[ctools][download][type] = git projects[ctools][download][url] = https://git.drupal.org/project/ctools projects[ctools][download][tag] = 8.x-3.0-alpha26 +projects[ctools][patch][] = https://www.drupal.org/files/issues/ctools--8.x-3.0-alpha26--1fe3649.patch projects[token][type] = module projects[token][subdir] = "contrib" @@ -40,18 +41,27 @@ projects[page_manager][subdir] = "contrib" projects[page_manager][download][type] = git projects[page_manager][download][url] = https://git.drupal.org/project/page_manager projects[page_manager][download][tag] = 8.x-1.0-alpha23 +projects[page_manager][patch][] = https://www.drupal.org/files/issues/page_manager--alpha23-09e79ff--2747739-3.patch projects[panels][type] = module projects[panels][subdir] = "contrib" projects[panels][download][type] = git projects[panels][download][url] = https://git.drupal.org/project/panels projects[panels][download][tag] = 8.x-3.0-beta4 +projects[panels][patch][] = https://www.drupal.org/files/issues/panels--beta4-4c4a3a7--2747739-2.patch +projects[panels][patch][] = https://www.drupal.org/files/issues/2667754-3.patch +projects[panels][patch][] = https://www.drupal.org/files/issues/bandaid.patch +projects[panels][patch][] = https://www.drupal.org/files/issues/2697587-42.patch projects[panelizer][type] = module projects[panelizer][subdir] = "contrib" projects[panelizer][download][type] = git projects[panelizer][download][url] = https://git.drupal.org/project/panelizer projects[panelizer][download][tag] = 8.x-3.0-alpha2 +projects[panelizer][patch][] = https://www.drupal.org/files/issues/panelizer--alpha2-1ddfa61--2747739-5.patch +projects[panelizer][patch][] = https://www.drupal.org/files/issues/2701349-2.patch +projects[panelizer][patch][] = https://www.drupal.org/files/issues/panelizer-ipe-url-root-handling.patch +projects[panelizer][patch][] = https://www.drupal.org/files/issues/2664682-45.patch projects[ds][type] = module projects[ds][subdir] = "contrib" -- GitLab