public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Sandro Mani <manisandro@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/mingw-python-PyQt-builder] rawhide: Add pyqt_builder_no_abi_version.patch
Date: Thu, 24 Sep 2026 06:46:33 GMT	[thread overview]
Message-ID: <179023239372.1.2314729011001311669.rpms-mingw-python-PyQt-builder-c7ffeed45fb3@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/mingw-python-PyQt-builder
Branch : rawhide
Commit : c7ffeed45fb340a80f61af045202604229fa674e
Author : Sandro Mani <manisandro@gmail.com>
Date   : 2026-09-24T08:46:15+02:00
Stats  : +34/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/mingw-python-PyQt-builder/c/c7ffeed45fb340a80f61af045202604229fa674e?branch=rawhide

Log:
Add pyqt_builder_no_abi_version.patch

---
diff --git a/mingw-python-PyQt-builder.spec b/mingw-python-PyQt-builder.spec
index 555959b..83c0492 100644
--- a/mingw-python-PyQt-builder.spec
+++ b/mingw-python-PyQt-builder.spec
@@ -6,7 +6,7 @@
 Name:           mingw-python-%{pkg_name}
 Summary:        MinGW Python %{pkg_name}
 Version:        1.19.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 BuildArch:      noarch
 
 License:        BSD-2-Clause
@@ -16,6 +16,8 @@ Source0:        %{pypi_source pyqt_builder}
 Patch0:         PyQt-builder_mingw.patch
 # Drop setuptools scm dependency
 Patch1:         pyqt_builder_nosetuptoolsscm.patch
+# PyQt5 has %%MinimumABIVersion, drop fallback which causes a ABI requirement mismatch
+Patch2:         pyqt_builder_no_abi_version.patch
 
 
 BuildRequires:  mingw32-filesystem >= 102
@@ -83,6 +85,9 @@ rm -rf pyqtbuild/bundle/dlls/
 
 
 %changelog
+* Thu Sep 24 2026 Sandro Mani <manisandro@gmail.com> - 1.19.1-5
+- Add pyqt_builder_no_abi_version.patch
+
 * Wed Sep 23 2026 Sandro Mani <manisandro@gmail.com> - 1.19.1-4
 - Rebuild (mingw-python)
 

diff --git a/pyqt_builder_no_abi_version.patch b/pyqt_builder_no_abi_version.patch
new file mode 100644
index 0000000..6a40ee5
--- /dev/null
+++ b/pyqt_builder_no_abi_version.patch
@@ -0,0 +1,28 @@
+diff -rupN pyqt_builder-1.19.1/pyqtbuild/builder.py pyqt_builder-1.19.1-new/pyqtbuild/builder.py
+--- pyqt_builder-1.19.1/pyqtbuild/builder.py	2025-10-23 22:02:55.000000000 +0200
++++ pyqt_builder-1.19.1-new/pyqtbuild/builder.py	2026-09-24 08:29:14.692521459 +0200
+@@ -134,15 +134,15 @@ class QmakeBuilder(Builder):
+             if not project.sip_module:
+                 project.sip_module = 'PyQt{}.sip'.format(self.qt_version >> 16)
+ 
+-            # Set the default ABI major version of the sip module.  These
+-            # should track the versions specified by the latest versions of
+-            # PyQt5 and PyQt6 (and vice versa).  This can be removed completely
+-            # when PyQt5 and PyQt6 use %MinimumABIVersion unconditionaly.
+-            if not project.abi_version:
+-                if project.sip_module == 'PyQt5.sip':
+-                    project.abi_version = '12.15'
+-                elif project.sip_module == 'PyQt6.sip':
+-                    project.abi_version = '13.8'
++            # # Set the default ABI major version of the sip module.  These
++            # # should track the versions specified by the latest versions of
++            # # PyQt5 and PyQt6 (and vice versa).  This can be removed completely
++            # # when PyQt5 and PyQt6 use %MinimumABIVersion unconditionaly.
++            # if not project.abi_version:
++            #     if project.sip_module == 'PyQt5.sip':
++            #         project.abi_version = '12.15'
++            #     elif project.sip_module == 'PyQt6.sip':
++            #         project.abi_version = '13.8'
+ 
+         super().apply_user_defaults(tool)
+ 

                 reply	other threads:[~2026-09-24  6:46 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=179023239372.1.2314729011001311669.rpms-mingw-python-PyQt-builder-c7ffeed45fb3@fedoraproject.org \
    --to=manisandro@gmail.com \
    --cc=git-commits@fedoraproject.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