From 68ff5c691a9baf0d891b48f1aaf942f597843ae8 Mon Sep 17 00:00:00 2001
From: jordanmontt <sebastianjmt@protonmail.ch>
Date: Wed, 6 Aug 2025 10:51:12 +0200
Subject: [PATCH 1/4] Adding pastels themes to the baseline of Morphic.

---
 .../BaselineOfMorphic.class.st                  | 13 ++++++++++++-
 src/BaselineOfPharo/BaselineOfPharo.class.st    | 17 +++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/BaselineOfMorphic/BaselineOfMorphic.class.st b/src/BaselineOfMorphic/BaselineOfMorphic.class.st
index ec60f0c9fd2..eee0307c146 100644
--- a/src/BaselineOfMorphic/BaselineOfMorphic.class.st
+++ b/src/BaselineOfMorphic/BaselineOfMorphic.class.st
@@ -97,7 +97,8 @@ BaselineOfMorphic >> baseline: spec [
 				loads: 'core' ].
 
 		spec package: 'Polymorph-Widgets'.
-		spec package: 'DarkBlueTheme'.
+		"Custom themes"
+		self loadThemes: spec.
 
 		spec package: 'Images-Animated'.
 
@@ -241,6 +242,16 @@ BaselineOfMorphic >> loadBitmapSourcePro [
 	TextConstants TextSharedInformation at: #'Bitmap Source Code Pro' put: codePro.
 ]
 
+{ #category : 'baseline' }
+BaselineOfMorphic >> loadThemes: spec [
+
+	spec package: 'DarkBlueTheme'.
+	spec baseline: 'Pastels' with: [
+			spec
+				repository: (self classNamed: #BaselineOfPharo) pastelsRepository;
+				loads: 'default' ]
+]
+
 { #category : 'actions' }
 BaselineOfMorphic >> postload: loader package: packageSpec [
 
diff --git a/src/BaselineOfPharo/BaselineOfPharo.class.st b/src/BaselineOfPharo/BaselineOfPharo.class.st
index b083717654b..ca427fdb84c 100644
--- a/src/BaselineOfPharo/BaselineOfPharo.class.st
+++ b/src/BaselineOfPharo/BaselineOfPharo.class.st
@@ -104,6 +104,23 @@ BaselineOfPharo class >> newToolsRepository [
 	^ (self externalProjectNamed: 'NewTools') repository
 ]
 
+{ #category : 'accessing - external projects' }
+BaselineOfPharo class >> pastels [
+	<externalProject>
+	
+	^ PharoExternalProject 
+		newName: 'Pastels' 
+		owner: 'Ducasse' 
+		project: 'Pastels'
+		version: 'master' 
+]
+
+{ #category : 'repository urls' }
+BaselineOfPharo class >> pastelsRepository [
+
+	^ (self externalProjectNamed: 'Pastels') repository
+]
+
 { #category : 'class initialization' }
 BaselineOfPharo class >> reset [
 	<script>

From 112df4d60402135645ff2e6ad9366c2c758b957c Mon Sep 17 00:00:00 2001
From: jordanmontt <sebastianjmt@protonmail.ch>
Date: Wed, 6 Aug 2025 11:13:56 +0200
Subject: [PATCH 2/4] Adding themes dependency to Pastels ?

---
 src/BaselineOfMorphic/BaselineOfMorphic.class.st | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/BaselineOfMorphic/BaselineOfMorphic.class.st b/src/BaselineOfMorphic/BaselineOfMorphic.class.st
index eee0307c146..2adb93d62a4 100644
--- a/src/BaselineOfMorphic/BaselineOfMorphic.class.st
+++ b/src/BaselineOfMorphic/BaselineOfMorphic.class.st
@@ -248,6 +248,7 @@ BaselineOfMorphic >> loadThemes: spec [
 	spec package: 'DarkBlueTheme'.
 	spec baseline: 'Pastels' with: [
 			spec
+				requires: 'Polymorph-Widgets';
 				repository: (self classNamed: #BaselineOfPharo) pastelsRepository;
 				loads: 'default' ]
 ]

From f4d6aba61fbcf7edf84c1c116f8c62344e67b730 Mon Sep 17 00:00:00 2001
From: jordanmontt <sebastianjmt@protonmail.ch>
Date: Wed, 6 Aug 2025 11:33:40 +0200
Subject: [PATCH 3/4] Removing method

---
 .../BaselineOfMorphic.class.st                | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/BaselineOfMorphic/BaselineOfMorphic.class.st b/src/BaselineOfMorphic/BaselineOfMorphic.class.st
index 2adb93d62a4..e585eb13755 100644
--- a/src/BaselineOfMorphic/BaselineOfMorphic.class.st
+++ b/src/BaselineOfMorphic/BaselineOfMorphic.class.st
@@ -28,7 +28,7 @@ Class {
 	#package : 'BaselineOfMorphic'
 }
 
-{ #category : 'baseline' }
+{ #category : 'baselines' }
 BaselineOfMorphic >> baseline: spec [
 
 	<baseline>
@@ -98,7 +98,11 @@ BaselineOfMorphic >> baseline: spec [
 
 		spec package: 'Polymorph-Widgets'.
 		"Custom themes"
-		self loadThemes: spec.
+		spec package: 'DarkBlueTheme'.
+		spec baseline: 'Pastels' with: [
+		spec
+			repository: (self classNamed: #BaselineOfPharo) pastelsRepository;
+			loads: 'default' ].
 
 		spec package: 'Images-Animated'.
 
@@ -242,17 +246,6 @@ BaselineOfMorphic >> loadBitmapSourcePro [
 	TextConstants TextSharedInformation at: #'Bitmap Source Code Pro' put: codePro.
 ]
 
-{ #category : 'baseline' }
-BaselineOfMorphic >> loadThemes: spec [
-
-	spec package: 'DarkBlueTheme'.
-	spec baseline: 'Pastels' with: [
-			spec
-				requires: 'Polymorph-Widgets';
-				repository: (self classNamed: #BaselineOfPharo) pastelsRepository;
-				loads: 'default' ]
-]
-
 { #category : 'actions' }
 BaselineOfMorphic >> postload: loader package: packageSpec [
 

From 97e65ac6277104f138946967d07faa7520d429de Mon Sep 17 00:00:00 2001
From: jordanmontt <sebastianjmt@protonmail.ch>
Date: Wed, 6 Aug 2025 12:07:49 +0200
Subject: [PATCH 4/4] Trying to fix the dependency with morphic themes

---
 src/BaselineOfMorphic/BaselineOfMorphic.class.st | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/BaselineOfMorphic/BaselineOfMorphic.class.st b/src/BaselineOfMorphic/BaselineOfMorphic.class.st
index e585eb13755..c92d069e59d 100644
--- a/src/BaselineOfMorphic/BaselineOfMorphic.class.st
+++ b/src/BaselineOfMorphic/BaselineOfMorphic.class.st
@@ -99,10 +99,12 @@ BaselineOfMorphic >> baseline: spec [
 		spec package: 'Polymorph-Widgets'.
 		"Custom themes"
 		spec package: 'DarkBlueTheme'.
-		spec baseline: 'Pastels' with: [
+		spec project: 'Pastels' with: [
 		spec
+			baseline: 'Pastels';
 			repository: (self classNamed: #BaselineOfPharo) pastelsRepository;
-			loads: 'default' ].
+			loads: 'default';
+			requires: #('Polymorph-Widgets') ].
 
 		spec package: 'Images-Animated'.