DisplayCAL: update to 3.9.12, add fix for python-3.12.

Closes: #51082 [via git-merge-pr]
This commit is contained in:
Daniel Martinez 2024-07-02 13:34:01 -04:00 committed by classabbyamp
parent cf3917f6a7
commit b349c6dfca
No known key found for this signature in database
GPG key ID: 6BE0755918A4C7F5
2 changed files with 107 additions and 3 deletions

View file

@ -0,0 +1,103 @@
From 0025940335eb1bd56f03f742aa095028d7ffa06f Mon Sep 17 00:00:00 2001
From: Erkan Ozgur Yilmaz <eoyilmaz@gmail.com>
Date: Sun, 24 Mar 2024 10:24:36 +0000
Subject: [PATCH] - Fixed #335
---
.github/workflows/pytest.yml | 3 +++
DisplayCAL/meta.py | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 02666a76..c9236a93 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -20,12 +20,15 @@ jobs:
- "3.9"
- "3.10"
- "3.11"
+ - "3.12"
wx-version:
- "4.1.1"
- "4.2.1"
exclude:
- python-version: "3.11"
wx-version: "4.1.1"
+ - python-version: "3.12"
+ wx-version: "4.1.1"
steps:
diff --git a/DisplayCAL/meta.py b/DisplayCAL/meta.py
index 30797cdf..fa52e733 100644
--- a/DisplayCAL/meta.py
+++ b/DisplayCAL/meta.py
@@ -62,7 +62,7 @@
name_html = '<span class="appname">Display<span>CAL</span></span>'
py_minversion = (3, 8)
-py_maxversion = (3, 11)
+py_maxversion = (3, 12)
version = VERSION_STRING
version_lin = VERSION_STRING # Linux
commit 64336cdc9af0eb858ceeab0522bb9747008a8466
Author: Patrick Zwerschke <patrick@p5k.org>
Date: Sun Mar 24 14:47:01 2024 +0100
updated testing environment to python 3.12
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index c9236a93..16d19983 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -32,7 +32,7 @@ jobs:
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Set Environment Variables
run: |
@@ -45,13 +45,10 @@ jobs:
echo "add_dir_str=cpython-310" >> $GITHUB_ENV
elif [ "${{ matrix.python-version }}" == "3.11" ]; then
echo "add_dir_str=cpython-311" >> $GITHUB_ENV
+ elif [ "${{ matrix.python-version }}" == "3.12" ]; then
+ echo "add_dir_str=cpython-312" >> $GITHUB_ENV
fi
- - name: Setup timezone
- uses: zcong1993/setup-timezone@master
- with:
- timezone: UTC
-
- name: Setup xvfb
run: |
sudo apt-get update
@@ -69,7 +66,7 @@ jobs:
sudo /usr/bin/Xvfb $DISPLAY -screen 0 1280x1024x24 &
- name: Setup Python ${{ matrix.python-version }}
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
diff --git a/DisplayCAL/RealDisplaySizeMM.py b/DisplayCAL/RealDisplaySizeMM.py
index 25b730d0..e77dcb43 100644
--- a/DisplayCAL/RealDisplaySizeMM.py
+++ b/DisplayCAL/RealDisplaySizeMM.py
@@ -27,6 +27,8 @@ else:
from DisplayCAL.lib64.python310.RealDisplaySizeMM import *
elif sys.version_info[:2] == (3, 11):
from DisplayCAL.lib64.python311.RealDisplaySizeMM import *
+ elif sys.version_info[:2] == (3, 12):
+ from DisplayCAL.lib64.python312.RealDisplaySizeMM import *
# else:
# pass
diff --git a/DisplayCAL/lib64/python312/__init__.py b/DisplayCAL/lib64/python312/__init__.py
new file mode 100644
index 00000000..e69de29b

View file

@ -1,7 +1,7 @@
# Template file for 'DisplayCAL'
pkgname=DisplayCAL
version=3.9.11
revision=2
version=3.9.12
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3-devel libXxf86vm-devel libXinerama-devel libXrandr-devel"
@ -12,7 +12,8 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/eoyilmaz/displaycal-py3"
distfiles="https://github.com/eoyilmaz/displaycal-py3/archive/refs/tags/${version}.tar.gz"
checksum=7769d19551c228d797fd98cb2469730cee84ff27bd0bf5d0463e191753921a5e
checksum=6ea182a5992f316f6aa63d55333e5e9caa065807224b8840470d461bb30e9ff8
make_check=no # checks fail to build
pre_configure() {
vsed -i misc/displaycal-vrml-to-x3d-converter.desktop \