George Rawlinson pushed to branch main at Arch Linux / Packaging / Packages / displaycal
Commits: 3c9da6ad by loqs at 2026-06-19T18:03:12+01:00 Remove pkg_resourses - Removed upstream in https://github.com/eoyilmaz/displaycal-py3/commit/a196371013f5464b0c23f5388b9accc9c535dcfc. - Removed upstream in https://github.com/eoyilmaz/displaycal-py3/commit/746f85b7ebe1f397385eba3944bfc8a7e083b370. - Related https://archlinux.org/todo/python-pkg_resources-deprecation/. - - - - - 4 changed files: - .SRCINFO - PKGBUILD - REUSE.toml - + display-3.19.2-remove-pkg_resources.patch Changes: ===================================== .SRCINFO ===================================== @@ -26,7 +26,9 @@ pkgbase = displaycal optdepends = colord-kde: profile installation for KDE Plasma source = https://github.com/eoyilmaz/displaycal-py3/releases/download/3.9.17/DisplayCAL-3.9.17.tar.gz source = python-3.14.patch + source = display-3.19.2-remove-pkg_resources.patch sha256sums = 715f31d47c7e29052138eceac3ff3d420a19f7ef36be1c06ae11b5dcaa44f55c sha256sums = 89cda094c8ac5555be1bf51b31c2ee3261a95701eaa6a1a691a72777a9a26165 + sha256sums = 71b197a876157d0d3727563c0cba9b5c2e5f165a76da9eef276892be640eeb62 pkgname = displaycal ===================================== PKGBUILD ===================================== @@ -19,13 +19,16 @@ makedepends=(libxrandr libxxf86vm python-build python-installer optdepends=('gnome-color-manager: profile installation for GNOME' 'colord-kde: profile installation for KDE Plasma') source=(${url}/releases/download/${pkgver}/${_pkgname}-${pkgver}.tar.gz - python-3.14.patch) + python-3.14.patch + display-3.19.2-remove-pkg_resources.patch) sha256sums=('715f31d47c7e29052138eceac3ff3d420a19f7ef36be1c06ae11b5dcaa44f55c' - '89cda094c8ac5555be1bf51b31c2ee3261a95701eaa6a1a691a72777a9a26165') + '89cda094c8ac5555be1bf51b31c2ee3261a95701eaa6a1a691a72777a9a26165' + '71b197a876157d0d3727563c0cba9b5c2e5f165a76da9eef276892be640eeb62') prepare() { cd $pkgname-$pkgver patch -p1 -i ../python-3.14.patch + patch -p1 -i ../display-3.19.2-remove-pkg_resources.patch # hack to force creating dist/net.displaycal... (missed due pyproject) sed -i -e 's|create_appdata = |create_appdata = True or |' setup.py ===================================== REUSE.toml ===================================== @@ -24,6 +24,7 @@ SPDX-License-Identifier = "0BSD" [[annotations]] path = [ "python-3.14.patch", + "display-3.19.2-remove-pkg_resources.patch", ] SPDX-FileCopyrightText = "displaycal contributors" SPDX-License-Identifier = "GPL-3.0-or-later" ===================================== display-3.19.2-remove-pkg_resources.patch ===================================== @@ -0,0 +1,18 @@ +diff --git a/DisplayCAL/chromecast_patterngenerator.py b/DisplayCAL/chromecast_patterngenerator.py +index 546f86d0..6757cde3 100644 +--- a/DisplayCAL/chromecast_patterngenerator.py ++++ b/DisplayCAL/chromecast_patterngenerator.py +@@ -16,13 +16,8 @@ if not getattr(sys, "frozen", False): + ): + if "google" in sys.modules: + del sys.modules["google"] +- try: +- import pkg_resources +- except ImportError: +- import pkgutil + syspath = sys.path[:] + sys.path[:] = [pth] +- import google.protobuf + + sys.path[:] = syspath + break View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/displaycal/-/commit/3c9da6ad4b7c9e0a2b3ebe4bd95ac77ea2f173a1 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/displaycal/-/commit/3c9da6ad4b7c9e0a2b3ebe4bd95ac77ea2f173a1 You're receiving this email because of your account on gitlab.archlinux.org. Manage all notifications: https://gitlab.archlinux.org/-/profile/notifications | Help: https://gitlab.archlinux.org/help
