[neon-notifications] Changes in repo-metadata
Neon CI
noreply at kde.org
Sat Nov 30 18:46:24 GMT 2024
commit ede5ec8b9af842da05d48ce38b6a3b7e46c9dc19
Author: Andrew Shark <ashark at linuxcomp.ru>
Date: Fri Nov 29 21:33:18 2024 +0300
build-configs: Add qtwebengine to the qt6-set
Fixes #76
diff --git a/build-configs/qt6.yaml b/build-configs/qt6.yaml
index af3e3f12..c3f6b5b6 100644
--- a/build-configs/qt6.yaml
+++ b/build-configs/qt6.yaml
@@ -39,15 +39,10 @@ group qt6-set:
- qtwebsockets
- qthttpserver
- qtwebchannel
+ - qtwebengine # has significant and different build requirements.
- qtwebview
- qtdoc
- # if you want qtwebengine, add it to use-modules after "qtwebchannel" and
- # comment this out. Note qtwebengine has significant and different build
- # requirements of its own.
- ignore-projects:
- - qtwebengine
-
# Archiving API requires zstd support which may not be present in your CMake
cmake-options: -DQT_BUILD_TESTS=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_AVOID_CMAKE_ARCHIVING_API=TRUE
diff --git a/compare_mod_defs_and_build_confs.py b/compare_mod_defs_and_build_confs.py
index cd0e4fc7..50836b26 100644
--- a/compare_mod_defs_and_build_confs.py
+++ b/compare_mod_defs_and_build_confs.py
@@ -233,6 +233,13 @@ if __name__ == "__main__":
if isinstance(ksb_config_content[options_name][option], list): # for use-projects and ignore-projects
for el in ksb_config_content[options_name][option]:
if el not in yaml_config_content[options_name].get(option, []):
+
+ # Handling known differences
+ if el == "qtwebengine":
+ print("\t\tIgnoring qtwebengine")
+ continue
+ # End of handling known differences
+
found_diff = True
print("\t\tError: \"" + el + "\" is not contained in \"" + " ".join(yaml_config_content[options_name].get(option, [])) + "\"")
print(ksb_file, yaml_file)
commit 7db5ee74fde2e2e3ecbd94709d73bc833de79314
Author: Andrew Shark <ashark at linuxcomp.ru>
Date: Sat Nov 30 00:33:45 2024 +0300
Do not raise exception when key was not found
diff --git a/compare_mod_defs_and_build_confs.py b/compare_mod_defs_and_build_confs.py
index 354f6402..cd0e4fc7 100644
--- a/compare_mod_defs_and_build_confs.py
+++ b/compare_mod_defs_and_build_confs.py
@@ -175,20 +175,20 @@ class KSBParser:
if __name__ == "__main__":
def compare_two_configs(ksb_file, yaml_file):
- config_content = KSBParser.read_ksb_file(ksb_file)
+ ksb_config_content = KSBParser.read_ksb_file(ksb_file)
# Replace "true" and "false" strings to real boolean values
- for node in config_content:
- if not isinstance(config_content[node], dict):
+ for node in ksb_config_content:
+ if not isinstance(ksb_config_content[node], dict):
continue # "include" lines are not dicts
- for option, value in config_content[node].items():
+ for option, value in ksb_config_content[node].items():
if value == "true":
- config_content[node][option] = True
+ ksb_config_content[node][option] = True
if value == "false":
- config_content[node][option] = False
+ ksb_config_content[node][option] = False
# Rename entries: "module" -> "project"; "module-set" -> "group", "options" -> "override".
- old_keys = list(config_content.keys())
+ old_keys = list(ksb_config_content.keys())
for node in old_keys:
new_name = None
if node.startswith("module "):
@@ -200,45 +200,45 @@ if __name__ == "__main__":
# store the recognized node under new name, and remove old name
if new_name:
- config_content[new_name] = config_content[node]
- del config_content[node]
+ ksb_config_content[new_name] = ksb_config_content[node]
+ del ksb_config_content[node]
# Rename "use-modules" -> "use-projects"; "ignore-modules" -> "ignore-projects". Listify/dictify some options value.
- old_keys = list(config_content.keys())
+ old_keys = list(ksb_config_content.keys())
for node in old_keys:
- if not isinstance(config_content[node], dict):
+ if not isinstance(ksb_config_content[node], dict):
continue # "include" lines are not dicts
- old_item_keys = list(config_content[node].keys())
+ old_item_keys = list(ksb_config_content[node].keys())
for option in old_item_keys:
if option == "use-modules":
- config_content[node]["use-projects"] = config_content[node]["use-modules"].split(" ")
- del config_content[node]["use-modules"]
+ ksb_config_content[node]["use-projects"] = ksb_config_content[node]["use-modules"].split(" ")
+ del ksb_config_content[node]["use-modules"]
if option == "ignore-modules":
- config_content[node]["ignore-projects"] = config_content[node]["ignore-modules"].split(" ")
- del config_content[node]["ignore-modules"]
+ ksb_config_content[node]["ignore-projects"] = ksb_config_content[node]["ignore-modules"].split(" ")
+ del ksb_config_content[node]["ignore-modules"]
if option == "set-env":
- value = config_content[node]["set-env"]
+ value = ksb_config_content[node]["set-env"]
name, val = value.split(" ", maxsplit=1)
- config_content[node]["set-env"] = {name: val}
+ ksb_config_content[node]["set-env"] = {name: val}
with open(yaml_file, "r") as file:
yaml_config_content = yaml.safe_load(file)
# Now, compare the two configs
found_diff = False
- for options_name, options in config_content.items():
+ for options_name, options in ksb_config_content.items():
print(f"\tChecking {options_name}")
if isinstance(options, dict):
for option, value in options.items():
- if isinstance(config_content[options_name][option], list): # for use-projects and ignore-projects
- for el in config_content[options_name][option]:
- if el not in yaml_config_content[options_name][option]:
+ if isinstance(ksb_config_content[options_name][option], list): # for use-projects and ignore-projects
+ for el in ksb_config_content[options_name][option]:
+ if el not in yaml_config_content[options_name].get(option, []):
found_diff = True
- print("\t\tError: \"" + el + "\" is not contained in \"" + " ".join(yaml_config_content[options_name][option]) + "\"")
+ print("\t\tError: \"" + el + "\" is not contained in \"" + " ".join(yaml_config_content[options_name].get(option, [])) + "\"")
print(ksb_file, yaml_file)
sys.exit(1)
else:
- if config_content[options_name][option] != yaml_config_content[options_name].get(option, None):
+ if ksb_config_content[options_name][option] != yaml_config_content[options_name].get(option, None):
### Manual handling the known differences
if options_name == "override appstream":
if option == "configure-flags":
@@ -246,13 +246,13 @@ if __name__ == "__main__":
continue
### End of handling known differences
found_diff = True
- print("\t\tError: \"" + config_content[options_name][option] + " is not equal " + yaml_config_content[options_name][option])
+ print("\t\tError: \"" + ksb_config_content[options_name][option] + " is not equal " + yaml_config_content[options_name][option])
print(ksb_file, yaml_file)
sys.exit(1)
else:
- if config_content[options_name] != yaml_config_content[options_name]:
+ if ksb_config_content[options_name] != yaml_config_content[options_name]:
found_diff = True
- print("\t\tError: \"" + config_content[options_name] + " is not equal " + yaml_config_content[options_name])
+ print("\t\tError: \"" + ksb_config_content[options_name] + " is not equal " + yaml_config_content[options_name])
print(ksb_file, yaml_file)
sys.exit(1)
return not found_diff
commit 3a36b1708e9ab197ad0daafaa308fcc66c6d8688
Author: Andrew Shark <ashark at linuxcomp.ru>
Date: Sat Nov 30 17:33:41 2024 +0300
fix: Sync build-configs and module-definitions
- kdiff3 builds just fine, add it to the list (forgotten in a37a4fe4).
diff --git a/build-configs/kf6-extragear.yaml b/build-configs/kf6-extragear.yaml
index 318bfa4c..af928a92 100644
--- a/build-configs/kf6-extragear.yaml
+++ b/build-configs/kf6-extragear.yaml
@@ -67,6 +67,7 @@ group extragear-sdk:
- kcachegrind
- kdesdk-kio
- kdesdk-thumbnailers
+ - kdiff3
ignore-projects:
- kdesvn
- massif-visualizer
commit d1568bcd8375e5dda34b416a6ee9928634e0af21
Author: Luigi Toscano <luigi.toscano at tiscali.it>
Date: Fri Nov 29 23:35:45 2024 +0100
plank-player: moved to Qt6
See:
https://commits.kde.org/plank-player/5dcc4ffa298b9e94f9c8b4d34fdc065f2dad0b9c
diff --git a/projects-invent/plasma/plank-player/i18n.json b/projects-invent/plasma/plank-player/i18n.json
index 7d75af45..2106e4f3 100644
--- a/projects-invent/plasma/plank-player/i18n.json
+++ b/projects-invent/plasma/plank-player/i18n.json
@@ -1 +1 @@
-{"stable": "none", "trunk": "none", "stable_kf5": "Plasma/5.27", "trunk_kf5": "master"}
+{"stable": "none", "trunk": "none", "stable_kf5": "Plasma/5.27", "trunk_kf5": "none", "trunk_kf6": "master"}
commit 9ca3e9fc6de352f4994b0abd58bb6a653c6b16ac
Author: Luigi Toscano <luigi.toscano at tiscali.it>
Date: Fri Nov 29 23:32:44 2024 +0100
plasma-phone-settings: track as KF6 (but no translations)
diff --git a/projects-invent/plasma-mobile/plasma-phone-settings/i18n.json b/projects-invent/plasma-mobile/plasma-phone-settings/i18n.json
index 16d965ee..6ed346aa 100644
--- a/projects-invent/plasma-mobile/plasma-phone-settings/i18n.json
+++ b/projects-invent/plasma-mobile/plasma-phone-settings/i18n.json
@@ -1 +1 @@
-{"trunk": "none", "stable": "none", "stable_kf5": "none", "trunk_kf5": "master"}
\ No newline at end of file
+{"trunk": "none", "stable": "none", "stable_kf5": "none", "trunk_kf5": "none", "trunk_kf6": "master"}
diff --git a/projects-invent/plasma-mobile/trainer/i18n.json b/projects-invent/plasma-mobile/trainer/i18n.json
index 16d965ee..31dfafe5 100644
--- a/projects-invent/plasma-mobile/trainer/i18n.json
+++ b/projects-invent/plasma-mobile/trainer/i18n.json
@@ -1 +1 @@
-{"trunk": "none", "stable": "none", "stable_kf5": "none", "trunk_kf5": "master"}
\ No newline at end of file
+{"trunk": "none", "stable": "none", "stable_kf5": "none", "trunk_kf5": "master"}
More information about the neon-notifications
mailing list