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

pyqt: backport qt 6.7.0 support from PyQt6-6.7.0.dev2404171245 #913

Merged
merged 1 commit into from Apr 18, 2024

Conversation

cho-m
Copy link
Member

@cho-m cho-m commented Apr 18, 2024

Dropped some metadata modifications, public inheritance changes, and version number modification.


Needed for Homebrew/homebrew-core#169109 which should unblock LLVM PR.


Generated using PyQt6 stable source and https://www.riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-6.7.0.dev2404171245.tar.gz (linked from https://www.riverbankcomputing.com/software/pyqt/download)

It might be possible to pare down patch to only incompatible API and drop new API, but didn't seem worth time to do this.

Tested a local run with patch applied from branch on ARM macOS, e.g.

diff --git a/Formula/p/pyqt.rb b/Formula/p/pyqt.rb
index c98f9cfb4d0..974248ade23 100644
--- a/Formula/p/pyqt.rb
+++ b/Formula/p/pyqt.rb
@@ -53,6 +53,12 @@ class Pyqt < Formula
     sha256 "d50b984c3f85e409e692b156132721522d4e8cf9b6c25e0cf927eea2dfb39487"
   end
 
+  # Backport support for `qt` 6.7.0 API changes
+  patch do
+    url "https://raw.githubusercontent.com/Homebrew/formula-patches/d2fe147767b6eb46cd11dfc9d4f16b18e0d2997f/pyqt/qt-6.7.0.patch"
+    sha256 "2e1df66b5d6ad338269368bc3778f27ed77f66be891613f7c567fbdac2197f6d"
+  end
+
   def python3
     "python3.12"
   end
@@ -66,6 +72,7 @@ class Pyqt < Formula
       --target-dir #{site_packages}
       --scripts-dir #{bin}
       --confirm-license
+      --verbose
     ]
     system "sip-install", *args
 

No guarantee other platforms so may need to be tweaked after CI run.

Most of the changes applied while dropping metadata modifications and
public inheritance changes.

Signed-off-by: Michael Cho <[email protected]>
@cho-m
Copy link
Member Author

cho-m commented Apr 18, 2024

Will merge and can be reviewed as part of formula PR.

@cho-m cho-m merged commit 50173dd into master Apr 18, 2024
@cho-m cho-m deleted the pyqt-qt-6.7.0 branch April 18, 2024 20:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant