From cc31dd3e69cfe03f7b5eb89fde00aac983c585d1 Mon Sep 17 00:00:00 2001
From: Christian <git-developer@users.noreply.github.com>
Date: Thu, 3 Oct 2024 08:15:45 +0200
Subject: [PATCH 1/5] chore: update build setup

---
 AppImageBuilder.debian-bullseye.yml |  1 +
 AppImageBuilder.debian.yml          |  1 +
 AppImageBuilder.ubuntu-focal.yml    |  1 +
 AppImageBuilder.yml                 |  1 +
 Dockerfile                          | 22 +++++++++++++++-------
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/AppImageBuilder.debian-bullseye.yml b/AppImageBuilder.debian-bullseye.yml
index 880e39a0..76b2bc98 100644
--- a/AppImageBuilder.debian-bullseye.yml
+++ b/AppImageBuilder.debian-bullseye.yml
@@ -100,6 +100,7 @@ AppDir:
       - libbluetooth3
       - libgtk-3-0
       - librsvg2-common
+      - python-is-python3
       - python3-evdev
       - python3-gi-cairo
       - python3-pylibacl
diff --git a/AppImageBuilder.debian.yml b/AppImageBuilder.debian.yml
index b4c4bbe2..1d4c70c6 100644
--- a/AppImageBuilder.debian.yml
+++ b/AppImageBuilder.debian.yml
@@ -112,6 +112,7 @@ AppDir:
       - libbluetooth3
       - libgtk-3-0
       - librsvg2-common
+      - python-is-python3
       - python3-evdev
       - python3-gi-cairo
       - python3-pylibacl
diff --git a/AppImageBuilder.ubuntu-focal.yml b/AppImageBuilder.ubuntu-focal.yml
index 80cf0024..c9de37ac 100644
--- a/AppImageBuilder.ubuntu-focal.yml
+++ b/AppImageBuilder.ubuntu-focal.yml
@@ -104,6 +104,7 @@ AppDir:
       - libbluetooth3
       - libgtk-3-0
       - librsvg2-common
+      - python-is-python3
       - python3-evdev
       - python3-gi-cairo
       - python3-libusb1
diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml
index af0f4120..21cc54b0 100644
--- a/AppImageBuilder.yml
+++ b/AppImageBuilder.yml
@@ -106,6 +106,7 @@ AppDir:
       - libbluetooth3
       - libgtk-3-0
       - librsvg2-common
+      - python-is-python3
       - python3-evdev
       - python3-gi-cairo
       - python3-pylibacl
diff --git a/Dockerfile b/Dockerfile
index fd393313..6110aecf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,16 +14,22 @@ RUN <<EOR
 		linux-headers-generic \
 		python3-dev \
 		python3-setuptools \
-		python-is-python3 \
-		python3-build \
-		python3-poetry \
-		python3-installer
+		python-is-python3
+	for dep in build poetry installer; do
+		package="python3-${dep}"
+		if apt-cache search --names-only "^${package}$" | grep -q .; then
+			apt-get install -y --no-install-recommends "${package}"
+		else
+			apt-get install -y --no-install-recommends python3-pip
+			pip install "${dep}"
+		fi
+	done
 	apt-get clean && rm -rf /var/lib/apt/lists/*
 EOR
 # Prepare working directory and target
 COPY . /work
 WORKDIR /work
-ARG TARGET=/build/usr
+ARG TARGET=/build
 
 # Build and install
 RUN <<EOR
@@ -41,13 +47,15 @@ RUN <<EOR
 	find "${TARGET}" -type f -path "*/site-packages/*${suffix}" \
 		| while read -r path; do ln -sfr "${path}" "${path%${suffix}}.so"; done
 
+	share="${TARGET}/usr/share"
+
 	# Put AppStream metadata to required location according to https://wiki.debian.org/AppStream/Guidelines
-	metainfo=/build/usr/share/metainfo
+	metainfo="${share}/metainfo"
 	mkdir -p "${metainfo}"
 	cp -a scripts/sc-controller.appdata.xml "${metainfo}"
 
 	# Convert icon to png format (required for icons in .desktop file)
-	iconpath="${TARGET}/share/icons/hicolor/512x512/apps"
+	iconpath="${share}/icons/hicolor/512x512/apps"
 	mkdir -p "${iconpath}"
 	rsvg-convert --background-color none -o "${iconpath}/sc-controller.png" images/sc-controller.svg
 EOR

From a3ef4e5c8333428f3be296d2e8903d296771a0fd Mon Sep 17 00:00:00 2001
From: Christian <git-developer@users.noreply.github.com>
Date: Thu, 3 Oct 2024 17:37:32 +0200
Subject: [PATCH 2/5] chore: update build setup

---
 Dockerfile     | 32 ++++++++++++++++++++++----------
 pyproject.toml |  2 +-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6110aecf..2630a548 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,12 @@ FROM $BASE_OS:$BASE_CODENAME AS build-stage
 RUN <<EOR
 	set -eu
 
+	# Workaround for outstanding fix of https://bugs.launchpad.net/ubuntu/+source/python-build/+bug/1992108
+	if grep -q ^UBUNTU_CODENAME=jammy /etc/os-release; then
+		echo >>/etc/apt/sources.list.d/jammy-proposed.list 'deb http://archive.ubuntu.com/ubuntu/ jammy-proposed universe'
+		echo >>/etc/apt/sources.list.d/jammy-proposed.list 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-proposed universe'
+	fi
+
 	apt-get update
 	apt-get install -y --no-install-recommends \
 		gcc \
@@ -14,16 +20,19 @@ RUN <<EOR
 		linux-headers-generic \
 		python3-dev \
 		python3-setuptools \
+		python3-venv \
 		python-is-python3
-	for dep in build poetry installer; do
-		package="python3-${dep}"
-		if apt-cache search --names-only "^${package}$" | grep -q .; then
-			apt-get install -y --no-install-recommends "${package}"
-		else
-			apt-get install -y --no-install-recommends python3-pip
-			pip install "${dep}"
-		fi
-	done
+
+	# Workaround for Focal lacking an apt package for python3-build
+	dep=build
+	package="python3-${dep}"
+	if apt-cache search --names-only "^${package}$" | grep -q .; then
+		apt-get install -y --no-install-recommends "${package}"
+	else
+		apt-get install -y --no-install-recommends python3-pip
+		pip install "${dep}"
+	fi
+
 	apt-get clean && rm -rf /var/lib/apt/lists/*
 EOR
 # Prepare working directory and target
@@ -35,7 +44,10 @@ ARG TARGET=/build
 RUN <<EOR
 	set -eu
 	python -m build --wheel
-	python -m installer --destdir="${TARGET}" dist/*.whl
+	python -m venv .env
+	.env/bin/pip install --prefix "${TARGET}/usr" dist/*.whl
+	# fix shebangs of scripts from '#!/work/.env/bin/python'
+	find "${TARGET}/usr/bin" -type f | xargs sed -i 's:work/.env:usr:'
 
 	# Provide input-event-codes.h as fallback for runtime systems without linux headers
 	cp -a \
diff --git a/pyproject.toml b/pyproject.toml
index 37b0a6a9..189dc4d4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -43,7 +43,7 @@ sc-controller         = "scc.bin.sc_controller:main"
 
 [project.scripts]
 scc-daemon            = "scc.bin.scc_daemon:main"
-#scc                   = "scc.bin.scc:main"
+scc                   = "scc.scripts:main"
 scc-osd-dialog        = "scc.bin.scc_osd_dialog:main"
 scc-osd-keyboard      = "scc.bin.scc_osd_keyboard:main"
 scc-osd-launcher      = "scc.bin.scc_osd_launcher:main"

From 53a789d22de63eb939bc4f42c57771558ad231e1 Mon Sep 17 00:00:00 2001
From: Christian <git-developer@users.noreply.github.com>
Date: Thu, 3 Oct 2024 19:03:59 +0200
Subject: [PATCH 3/5] chore: update build setup for arm64

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2630a548..b0f65ce0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ RUN <<EOR
 
 	# Workaround for outstanding fix of https://bugs.launchpad.net/ubuntu/+source/python-build/+bug/1992108
 	if grep -q ^UBUNTU_CODENAME=jammy /etc/os-release; then
-		echo >>/etc/apt/sources.list.d/jammy-proposed.list 'deb http://archive.ubuntu.com/ubuntu/ jammy-proposed universe'
+		echo >>/etc/apt/sources.list.d/jammy-proposed.list 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/     jammy-proposed universe'
 		echo >>/etc/apt/sources.list.d/jammy-proposed.list 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-proposed universe'
 	fi
 

From ec791478fa242c8421beca4ed1a56b39971b73ed Mon Sep 17 00:00:00 2001
From: Christian <git-developer@users.noreply.github.com>
Date: Thu, 3 Oct 2024 19:45:27 +0200
Subject: [PATCH 4/5] chore: move scc to other executables

---
 pyproject.toml       | 2 +-
 {scripts => scc}/scc | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {scripts => scc}/scc (100%)

diff --git a/pyproject.toml b/pyproject.toml
index 189dc4d4..d1c3b392 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -43,7 +43,7 @@ sc-controller         = "scc.bin.sc_controller:main"
 
 [project.scripts]
 scc-daemon            = "scc.bin.scc_daemon:main"
-scc                   = "scc.scripts:main"
+scc                   = "scc.bin:main"
 scc-osd-dialog        = "scc.bin.scc_osd_dialog:main"
 scc-osd-keyboard      = "scc.bin.scc_osd_keyboard:main"
 scc-osd-launcher      = "scc.bin.scc_osd_launcher:main"
diff --git a/scripts/scc b/scc/scc
similarity index 100%
rename from scripts/scc
rename to scc/scc

From c9ca71033d5d1e8e7af56f044f49316711a6b6fa Mon Sep 17 00:00:00 2001
From: Christian <git-developer@users.noreply.github.com>
Date: Thu, 3 Oct 2024 20:08:31 +0200
Subject: [PATCH 5/5] chore: move scc to other executables

---
 pyproject.toml          | 2 +-
 scc/{scc => bin/scc.py} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename scc/{scc => bin/scc.py} (100%)

diff --git a/pyproject.toml b/pyproject.toml
index d1c3b392..9db71a50 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -43,7 +43,7 @@ sc-controller         = "scc.bin.sc_controller:main"
 
 [project.scripts]
 scc-daemon            = "scc.bin.scc_daemon:main"
-scc                   = "scc.bin:main"
+scc                   = "scc.bin.scc:main"
 scc-osd-dialog        = "scc.bin.scc_osd_dialog:main"
 scc-osd-keyboard      = "scc.bin.scc_osd_keyboard:main"
 scc-osd-launcher      = "scc.bin.scc_osd_launcher:main"
diff --git a/scc/scc b/scc/bin/scc.py
similarity index 100%
rename from scc/scc
rename to scc/bin/scc.py