From aa1029a15a504e2209fc5fae583e3aaff0492245 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jvanderwaa@redhat.com>
Date: Fri, 14 Mar 2025 09:59:45 +0100
Subject: [PATCH] Port to PF6

---
 Makefile               | 2 +-
 package.json           | 8 ++++----
 src/index.tsx          | 2 +-
 test/check-application | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 4f29b99..9823892 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ COCKPIT_REPO_FILES = \
 	$(NULL)
 
 COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git
-COCKPIT_REPO_COMMIT = 1609250d9b4238e75d96da41838fdf037a0ce336 # 335 + 16 commits
+COCKPIT_REPO_COMMIT = b43b68ce4831d44e0c513d1f96a4f3a5c3e8823a # 336 + pf fixes
 
 $(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP)
 COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}'
diff --git a/package.json b/package.json
index 74c76bd..0586207 100644
--- a/package.json
+++ b/package.json
@@ -49,10 +49,10 @@
     "typescript": "5.8.2"
   },
   "dependencies": {
-    "@patternfly/patternfly": "5.4.2",
-    "@patternfly/react-core": "5.4.14",
-    "@patternfly/react-icons": "5.4.2",
-    "@patternfly/react-styles": "5.4.1",
+    "@patternfly/patternfly": "6.1.0",
+    "@patternfly/react-core": "6.1.0",
+    "@patternfly/react-icons": "6.1.0",
+    "@patternfly/react-styles": "6.1.0",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   }
diff --git a/src/index.tsx b/src/index.tsx
index 51254c0..c01c34c 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -24,7 +24,7 @@ import "cockpit-dark-theme";
 
 import { Application } from './app.jsx';
 
-import "patternfly/patternfly-5-cockpit.scss";
+import "patternfly/patternfly-6-cockpit.scss";
 import './app.scss';
 
 document.addEventListener("DOMContentLoaded", () => {
diff --git a/test/check-application b/test/check-application
index 3e85d0f..9373e41 100755
--- a/test/check-application
+++ b/test/check-application
@@ -18,16 +18,16 @@ class TestApplication(testlib.MachineCase):
 
         self.login_and_go("/starter-kit")
         # verify expected heading
-        b.wait_text(".pf-v5-c-card__title", "Starter Kit")
+        b.wait_text(".pf-v6-c-card__title", "Starter Kit")
 
         # verify expected host name
         hostname = m.execute("cat /etc/hostname").strip()
-        b.wait_in_text(".pf-v5-c-alert__title", "Running on " + hostname)
+        b.wait_in_text(".pf-v6-c-alert__title", "Running on " + hostname)
 
         # change current hostname
         self.write_file("/etc/hostname", "new-" + hostname)
         # verify new hostname name
-        b.wait_in_text(".pf-v5-c-alert__title", "Running on new-" + hostname)
+        b.wait_in_text(".pf-v6-c-alert__title", "Running on new-" + hostname)
 
         # change language to German
         b.switch_to_top()
@@ -46,7 +46,7 @@ class TestApplication(testlib.MachineCase):
         b.go("/starter-kit")
         b.enter_page("/starter-kit")
         # page label (from js) should be translated
-        b.wait_in_text(".pf-v5-c-alert__title", "Läuft auf")
+        b.wait_in_text(".pf-v6-c-alert__title", "Läuft auf")
 
 
 if __name__ == '__main__':