Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sgmoore/add core24 support #5092

Merged
merged 74 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
95645cf
kde-neon-6: Fix long standing theming issues with Qt snaps.
ScarlettGatelyMoore Jun 28, 2024
7a3f71e
Merge branch 'main' into sgmoore/Fix_QT_snaps_theming
ScarlettGatelyMoore Jun 28, 2024
54ac164
Merge branch 'canonical:main' into sgmoore/Fix_QT_snaps_theming
ScarlettGatelyMoore Jul 5, 2024
cef25a0
Split kde themes into our own common themes snap including gtk themes.
ScarlettGatelyMoore Jul 5, 2024
669bdb9
Merge branch 'canonical:main' into sgmoore/Fix_QT_snaps_theming
ScarlettGatelyMoore Jul 8, 2024
bb29b70
Add back commit bc4ba441beda2a691213e713dd858f6523d6af1d that somehow
ScarlettGatelyMoore Jul 8, 2024
919cedb
Merge branch 'main' into sgmoore/Fix_QT_snaps_theming
ScarlettGatelyMoore Jul 10, 2024
b608c1f
Merge branch 'main' into sgmoore/Fix_QT_snaps_theming
ScarlettGatelyMoore Jul 10, 2024
e03a21a
Merge branch 'main' into sgmoore/Fix_QT_snaps_theming
mr-cal Jul 10, 2024
514c6f5
kde_neon_6: Add core24 support / Fix themeing connects.
ScarlettGatelyMoore Oct 3, 2024
7bea58e
Merge remote-tracking branch 'origin/main' into sgmoore/add_core24_su…
ScarlettGatelyMoore Oct 3, 2024
7ef9f48
kde-neon-6: Fix tests.
ScarlettGatelyMoore Oct 4, 2024
8411dd6
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Oct 4, 2024
fbf909f
Remove uneeded staticmethod.
ScarlettGatelyMoore Oct 4, 2024
969518b
Merge branch 'canonical:main' into sgmoore/add_core24_support
ScarlettGatelyMoore Oct 7, 2024
7647205
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Oct 7, 2024
b6cf912
Merge branch 'canonical:main' into sgmoore/add_core24_support
ScarlettGatelyMoore Oct 8, 2024
97d9802
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Oct 9, 2024
c43fe13
Ensure we are using our desktop integration bundled with runtime content
ScarlettGatelyMoore Oct 10, 2024
f1dc881
Fix black linter.
ScarlettGatelyMoore Oct 10, 2024
81acafd
Merge branch 'canonical:main' into sgmoore/add_core24_support
ScarlettGatelyMoore Oct 10, 2024
b38db8e
Revert "Fix black linter."
ScarlettGatelyMoore Oct 10, 2024
696ef98
Revert "Ensure we are using our desktop integration bundled with runt…
ScarlettGatelyMoore Oct 10, 2024
c5d0705
Create an interim desktop-launch to execute the command-chain in the kf6
ScarlettGatelyMoore Oct 10, 2024
15bccb5
Fix hooks for kde-neon-6 command chain.
ScarlettGatelyMoore Oct 10, 2024
c572f60
Fix desktop launch path. Fix breeze theme.
ScarlettGatelyMoore Oct 11, 2024
59aae18
Add test for core22 gpu layout to increase coverage.
ScarlettGatelyMoore Oct 11, 2024
0a19bc0
Fix linters.
ScarlettGatelyMoore Oct 11, 2024
19d47f7
Merge branch 'canonical:main' into sgmoore/add_core24_support
ScarlettGatelyMoore Oct 12, 2024
d1c5ecb
Remove make-parameters for core22 as it is only used in core24 gpu
ScarlettGatelyMoore Oct 14, 2024
74e1259
Typo..
ScarlettGatelyMoore Oct 14, 2024
d3a5dc6
Fix tests for new environment.
ScarlettGatelyMoore Oct 14, 2024
d675f3c
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Oct 16, 2024
3050b3b
Fix test for removed core22 make parameters.
ScarlettGatelyMoore Oct 16, 2024
143ae39
Remove breeze theme
ScarlettGatelyMoore Oct 16, 2024
4168918
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Oct 16, 2024
83c2d37
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Oct 17, 2024
b9d80c7
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Oct 18, 2024
7dd89d8
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Oct 21, 2024
1e97273
Fix app snippet test for core24
ScarlettGatelyMoore Oct 21, 2024
3b4cc83
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Oct 22, 2024
9a56161
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Oct 28, 2024
50c7cb6
Add qt5 core24 support. Add support for qt5 or qt6 in desktop launcher
ScarlettGatelyMoore Oct 31, 2024
5eef9ad
Another attempt coverage test for raise case.
ScarlettGatelyMoore Nov 1, 2024
26efb3d
Fix list extensions test.
ScarlettGatelyMoore Nov 1, 2024
612a963
Formatting list extensions.
ScarlettGatelyMoore Nov 1, 2024
85f4fa3
Fix kde-neon spread test by connecting content pack as it is not
ScarlettGatelyMoore Nov 8, 2024
2c01728
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Nov 8, 2024
89cb385
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Nov 11, 2024
8b81168
Fix kde-neon spread test with snap list the new content pack name.
ScarlettGatelyMoore Nov 11, 2024
4920d1f
Update extensions/desktop/command-chain-kde/run
ScarlettGatelyMoore Nov 14, 2024
4dcfbc8
Remove gpu-2404 X11 layout as it conflicts with the existing kf6 X11
ScarlettGatelyMoore Nov 18, 2024
6e27844
Remove extra bracket.
ScarlettGatelyMoore Nov 18, 2024
63af446
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Nov 18, 2024
cddfcec
Go back to core22 in spread test.
ScarlettGatelyMoore Nov 19, 2024
3c90d77
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Nov 25, 2024
f7c209e
Add libproxy to LD_LIBRARY_PATH as it can no longer find it's own libs.
ScarlettGatelyMoore Nov 26, 2024
b68df90
Remove whitespace.
ScarlettGatelyMoore Nov 26, 2024
9d31175
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Dec 2, 2024
58ffcac
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Dec 16, 2024
9c82a3d
docstring descriptions of new variables.
ScarlettGatelyMoore Dec 18, 2024
7bae3c3
update docstring for assumes version.
ScarlettGatelyMoore Dec 18, 2024
b00db13
Add spred test for kde-neon-6/core24.
ScarlettGatelyMoore Dec 18, 2024
8363306
Update extensions/desktop/command-chain-kde/run
ScarlettGatelyMoore Dec 18, 2024
a511a82
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Dec 18, 2024
0ef092e
Add docstring for qt5 vars too. Fix command chain tests.
ScarlettGatelyMoore Dec 18, 2024
1ee8f81
Undo command chain change..
ScarlettGatelyMoore Dec 19, 2024
3e69ae8
Update kde command chain.
ScarlettGatelyMoore Dec 19, 2024
0f22827
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Dec 20, 2024
df75448
Merge branch 'main' into sgmoore/add_core24_support
ScarlettGatelyMoore Dec 23, 2024
8a2bce7
Call desktop hook.
ScarlettGatelyMoore Dec 24, 2024
8510f5f
Revert "Update extensions/desktop/command-chain-kde/run "
ScarlettGatelyMoore Dec 24, 2024
322d290
Merge branch 'main' into sgmoore/add_core24_support
mr-cal Jan 6, 2025
0d6c38a
Merge branch 'main' into sgmoore/add_core24_support
mr-cal Jan 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions extensions/desktop/command-chain-kde/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/usr/bin/make -f

BIN_DIR := $(DESTDIR)/snap/command-chain
GPU_WRAPPER :=

scripts = hooks-configure-desktop desktop-launch run $(GPU_WRAPPER)

*:
install -D -m755 "$@" "$(BIN_DIR)"/"$@"

install: $(scripts)

.PHONY: $(scripts)
15 changes: 15 additions & 0 deletions extensions/desktop/command-chain-kde/desktop-launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash

if [ "$QT_VERSION" == "6" ]; then

set -- "${SNAP}/kf6/snap/command-chain/desktop-launch6" "$@"
# shellcheck source=/dev/null
source "${SNAP}/snap/command-chain/run"

elif [ "$QT_VERSION" == "5" ]; then

set -- "${SNAP}/kf5/snap/command-chain/desktop-launch" "$@"
# shellcheck source=/dev/null
source "${SNAP}/snap/command-chain/run"

fi
5 changes: 5 additions & 0 deletions extensions/desktop/command-chain-kde/gpu-2404-wrapper
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash

set -- "${SNAP}/gpu-2404/bin/gpu-2404-provider-wrapper" "$@"
# shellcheck source=/dev/null
source "${SNAP}/snap/command-chain/run"
5 changes: 5 additions & 0 deletions extensions/desktop/command-chain-kde/hooks-configure-desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash

set -- "${SNAP}/kf6/command-chain/hooks-configure-desktop" "$@"
# shellcheck source=/dev/null
source "${SNAP}/snap/command-chain/run"
5 changes: 5 additions & 0 deletions extensions/desktop/command-chain-kde/hooks-configure-fonts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash

set -- "${SNAP}/kf6/command-chain/hooks-configure-fonts" "$@"
# shellcheck source=/dev/null
source "${SNAP}/snap/command-chain/run"
25 changes: 25 additions & 0 deletions extensions/desktop/command-chain-kde/run
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

if [ -z "$1" ]; then
echo "Usage: run <command>"
exit 1
fi

if [ -z "${SNAP}" ]; then
echo "Not running inside a snap context: SNAP not declared"
exit
fi


if [ ! -f "$1" ]; then
echo "Content snap command-chain for $1 not found: ensure slot is connected"
exit
ScarlettGatelyMoore marked this conversation as resolved.
Show resolved Hide resolved
fi

# emulate "exec $@" using "source"
# have to disable "unused variables" because checkshell doesn't know that $BASH_ARGV0 is $0
# shellcheck disable=SC2034 # Unused variables left for readability
BASH_ARGV0=$1
shift
# shellcheck source=/dev/null
source "$0"
Loading
Loading