[packages/python-PyQt4] - rediff patches

[baggins]

commit 232365ed8e5ce4cda77887018a3e229348b192a0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Feb 28 13:29:10 2021 +0100

    - rediff patches

 python-PyQt4-64bit.patch    | 11 ++++++-----
 python-PyQt4-dbuspath.patch |  9 +++++----
 2 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/python-PyQt4-64bit.patch b/python-PyQt4-64bit.patch
index fb76fe8..52b9892 100644
--- a/python-PyQt4-64bit.patch
+++ b/python-PyQt4-64bit.patch
@@ -1,6 +1,7 @@
---- PyQt-x11-gpl-4.9.2/configure.py.orig	2012-06-23 22:27:26.000000000 +0200
-+++ PyQt-x11-gpl-4.9.2/configure.py	2012-06-23 22:31:20.495786424 +0200
-@@ -965,6 +965,7 @@
+diff -urNp -x '*.orig' PyQt4_gpl_x11-4.12.1.org/configure.py PyQt4_gpl_x11-4.12.1/configure.py
+--- PyQt4_gpl_x11-4.12.1.org/configure.py	2021-02-28 13:28:37.354067283 +0100
++++ PyQt4_gpl_x11-4.12.1/configure.py	2021-02-28 13:28:37.554065223 +0100
+@@ -961,6 +961,7 @@ include(%s)
              else:
                  # Use distutils to get the additional configuration.
                  from distutils.sysconfig import get_config_vars
@@ -8,7 +9,7 @@
                  ducfg = get_config_vars()
  
                  config_args = ducfg.get("CONFIG_ARGS", "")
-@@ -979,18 +980,7 @@
+@@ -975,18 +976,7 @@ include(%s)
                      dynamic_pylib = "--enable-shared" in config_args
  
                  if dynamic_pylib:
@@ -26,5 +27,5 @@
 -                    link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi)
 +                    link = "-L%s -lpython%d.%d%s" % (get_python_lib(plat_specific=1, standard_lib=1), py_major, py_minor, abi)
                  else:
-                     sipconfig.inform("Qt Designer plugin disabled because Python library is static")
+                     sipconfig.inform("The Qt Designer plugin was disabled because a dynamic Python library couldn't be found")
                      opts.designer_plugin = False
diff --git a/python-PyQt4-dbuspath.patch b/python-PyQt4-dbuspath.patch
index 9524e44..4692799 100644
--- a/python-PyQt4-dbuspath.patch
+++ b/python-PyQt4-dbuspath.patch
@@ -1,6 +1,7 @@
---- PyQt-x11-gpl-4.4.3/configure.py.orig	2008-08-08 16:09:58.000000000 +0200
-+++ PyQt-x11-gpl-4.4.3/configure.py	2008-08-24 21:30:54.555681941 +0200
-@@ -146,6 +146,8 @@
+diff -urNp -x '*.orig' PyQt4_gpl_x11-4.12.1.org/configure.py PyQt4_gpl_x11-4.12.1/configure.py
+--- PyQt4_gpl_x11-4.12.1.org/configure.py	2021-02-28 13:28:36.840739238 +0100
++++ PyQt4_gpl_x11-4.12.1/configure.py	2021-02-28 13:28:37.047403776 +0100
+@@ -139,6 +139,8 @@ def create_optparser():
      p.add_option("-g", "--consolidate", action="store_true", default=False,
              dest="bigqt", help="create a single module which links against "
              "all the Qt libraries")
@@ -9,7 +10,7 @@
  
      # These are internal options used to build the mega Windows GPL package.
      p.add_option("--mwg-odbc", action="store_true", default=False,
-@@ -1055,7 +1058,10 @@
+@@ -1339,7 +1341,10 @@ def check_dbus():
          return
  
      global pydbusmoddir
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-PyQt4.git/commitdiff/232365ed8e5ce4cda77887018a3e229348b192a0