From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] dispcalGUI: update to 3.9.11, replace with python3 fork
Date: Wed, 05 Jul 2023 03:43:59 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-44849@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 686 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages displaycal-py3
https://github.com/void-linux/void-packages/pull/44849
dispcalGUI: update to 3.9.11, replace with python3 fork
cc: @lemmi
launches and the initial interface works, but I think we need to update wxPython4:
![image](https://github.com/void-linux/void-packages/assets/5366828/b5b386e6-4ab0-483a-98d8-ffe27b3fb8a0)
#### Testing the changes
- I tested the changes in this PR: **briefly** (I don't have any hardware to test this with)
A patch file from https://github.com/void-linux/void-packages/pull/44849.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-displaycal-py3-44849.patch --]
[-- Type: text/x-diff, Size: 5148 bytes --]
From 9a6149c0ba2afac00a85595007cc99c80eb9fc56 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 4 Jul 2023 21:42:01 -0400
Subject: [PATCH] dispcalGUI: update to 3.9.11, replace with python3 fork
---
srcpkgs/DisplayCAL/template | 25 +++++++++++++++++++
srcpkgs/dispcalGUI | 1 +
srcpkgs/dispcalGUI/patches/error.patch | 33 --------------------------
srcpkgs/dispcalGUI/template | 25 -------------------
srcpkgs/dispcalGUI/update | 1 -
5 files changed, 26 insertions(+), 59 deletions(-)
create mode 100644 srcpkgs/DisplayCAL/template
create mode 120000 srcpkgs/dispcalGUI
delete mode 100644 srcpkgs/dispcalGUI/patches/error.patch
delete mode 100644 srcpkgs/dispcalGUI/template
delete mode 100644 srcpkgs/dispcalGUI/update
diff --git a/srcpkgs/DisplayCAL/template b/srcpkgs/DisplayCAL/template
new file mode 100644
index 000000000000..bc2d48e99116
--- /dev/null
+++ b/srcpkgs/DisplayCAL/template
@@ -0,0 +1,25 @@
+# Template file for 'DisplayCAL'
+pkgname=DisplayCAL
+version=3.9.11
+revision=1
+build_style=python3-module
+hostmakedepends="python3"
+makedepends="python3-devel libXxf86vm-devel libXinerama-devel libXrandr-devel"
+depends="python3-dbus python3-numpy wxPython4 argyllcms"
+short_desc="Display Calibration and Characterization"
+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
+
+pre_configure() {
+ vsed -i misc/displaycal-vrml-to-x3d-converter.desktop \
+ -e 's|MimeType=model/vrml;x-world/x-vrml;|MimeType=model/vrml;|'
+}
+
+dispcalGUI_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/dispcalGUI b/srcpkgs/dispcalGUI
new file mode 120000
index 000000000000..7b2ae7fe8eb1
--- /dev/null
+++ b/srcpkgs/dispcalGUI
@@ -0,0 +1 @@
+DisplayCAL
\ No newline at end of file
diff --git a/srcpkgs/dispcalGUI/patches/error.patch b/srcpkgs/dispcalGUI/patches/error.patch
deleted file mode 100644
index 169fc528b138..000000000000
--- a/srcpkgs/dispcalGUI/patches/error.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Reason: error(3) does not exist on musl, and on glibc the signature
-is (int, int, char*, ...) and not (char*, ...).
-Therefore the current code either results in garbled output or
-doesn't work at all. Replace it with a simple printf.
-
----
---- a/DisplayCAL/RealDisplaySizeMM.c 2018-07-25 16:47:01.000000000 +0200
-+++ b/DisplayCAL/RealDisplaySizeMM.c 2018-07-25 16:47:01.000000000 +0200
-@@ -822,13 +822,13 @@
- sprintf(desc1, "_ICC_PROFILE_%d",disps[ndisps]->uscreen);
-
- if ((disps[ndisps]->icc_atom = XInternAtom(mydisplay, desc1, False)) == None)
-- error("Unable to intern atom '%s'",desc1);
-+ fprintf(stderr, "Unable to intern atom '%s'",desc1);
-
- debugrr2((errout,"Root atom '%s'\n",desc1));
-
- /* Create the atom of the output that may contain the associated ICC profile */
- if ((disps[ndisps]->icc_out_atom = XInternAtom(mydisplay, "_ICC_PROFILE", False)) == None)
-- error("Unable to intern atom '%s'","_ICC_PROFILE");
-+ fprintf(stderr, "Unable to intern atom '%s'","_ICC_PROFILE");
-
- /* Grab the EDID from the output */
- {
-@@ -993,7 +993,7 @@
- sprintf(desc1, "_ICC_PROFILE_%d",disps[i]->uscreen);
-
- if ((disps[i]->icc_atom = XInternAtom(mydisplay, desc1, False)) == None)
-- error("Unable to intern atom '%s'",desc1);
-+ fprintf(stderr, "Unable to intern atom '%s'",desc1);
-
- /* See if we can locate the EDID of the monitor for this screen */
- for (j = 0; j < 2; j++) {
diff --git a/srcpkgs/dispcalGUI/template b/srcpkgs/dispcalGUI/template
deleted file mode 100644
index 05086b97e5a2..000000000000
--- a/srcpkgs/dispcalGUI/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'dispcalGUI'
-pkgname=dispcalGUI
-version=3.8.9.3
-revision=5
-_name="DisplayCAL"
-build_style=python2-module
-hostmakedepends="python"
-makedepends="python-devel libXxf86vm-devel libXinerama-devel libXrandr-devel"
-depends="python-dbus python-numpy wxPython argyllcms"
-short_desc="Display Calibration and Characterization"
-maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="GPL-3.0-or-later"
-homepage="https://displaycal.net/"
-changelog="https://displaycal.net/CHANGES.html"
-distfiles="${SOURCEFORGE_SITE}/dispcalgui/${_name}-${version}.tar.gz"
-checksum=7c34dfbd9f66f24f1d4c88de4a5a0de688aad719f095874b6259637d30893bea
-
-pre_configure() {
- sed -i 's|MimeType=model/vrml;x-world/x-vrml;|MimeType=model/vrml;|' misc/displaycal-vrml-to-x3d-converter.desktop
-}
-
-post_install() {
- find ${DESTDIR}/usr/ -exec chmod a+r \{\} +
- find ${DESTDIR}/usr/ -type d -exec chmod a+x \{\} +
-}
diff --git a/srcpkgs/dispcalGUI/update b/srcpkgs/dispcalGUI/update
deleted file mode 100644
index 6942393945c3..000000000000
--- a/srcpkgs/dispcalGUI/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="${_name}"
next reply other threads:[~2023-07-05 1:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-05 1:43 classabbyamp [this message]
2023-09-25 16:59 ` [PR PATCH] [Updated] " classabbyamp
2023-09-26 16:06 ` [PR PATCH] [Closed]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-44849@inbox.vuxu.org \
--to=classabbyamp@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).