[neon/forks/pyqt5/Neon/release-lts] debian: Refresh debian/patches/public_sip.diff.

Dmitry Shachnev null at kde.org
Wed May 26 11:29:29 BST 2021


Git commit f099b0378b5d0380fec8de6490c2e61c57c55b03 by Dmitry Shachnev.
Committed on 08/06/2020 at 08:56.
Pushed by jriddell into branch 'Neon/release-lts'.

Refresh debian/patches/public_sip.diff.

M  +1    -0    debian/changelog
M  +4    -4    debian/patches/public_sip.diff

https://invent.kde.org/neon/forks/pyqt5/commit/f099b0378b5d0380fec8de6490c2e61c57c55b03

diff --git a/debian/changelog b/debian/changelog
index cdd30a8b..9297856f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pyqt5 (5.15.0+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Bump python3-sip-dev build-dependency to 4.19.23, following upstream.
+  * Refresh debian/patches/public_sip.diff.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 08 Jun 2020 11:54:19 +0300
 
diff --git a/debian/patches/public_sip.diff b/debian/patches/public_sip.diff
index 799eb772..51305e5f 100644
--- a/debian/patches/public_sip.diff
+++ b/debian/patches/public_sip.diff
@@ -10,10 +10,10 @@ Per https://www.debian.org/doc/debian-policy/ch-source.html#convenience-copies-o
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/configure.py b/configure.py
-index a361cf1..74f28af 100644
+index fdc86f2..afd6bea 100644
 --- a/configure.py
 +++ b/configure.py
-@@ -2491,7 +2491,7 @@ def get_sip_flags(target_config):
+@@ -2506,7 +2506,7 @@ def get_sip_flags(target_config):
      the target configuration.
      """
  
@@ -23,7 +23,7 @@ index a361cf1..74f28af 100644
      # If we don't check for signed interpreters, we exclude the 'VendorID'
      # feature
 diff --git a/designer/pluginloader.cpp b/designer/pluginloader.cpp
-index 87a006c..c237351 100644
+index d4fb17a..8fb5450 100644
 --- a/designer/pluginloader.cpp
 +++ b/designer/pluginloader.cpp
 @@ -167,7 +167,7 @@ bool PyCustomWidgets::importPlugins(const QString &dir, const QStringList &plugi
@@ -36,7 +36,7 @@ index 87a006c..c237351 100644
          if (!sip_unwrapinstance)
              return true;
 diff --git a/qmlscene/pluginloader.cpp b/qmlscene/pluginloader.cpp
-index 3825b0b..eadd038 100644
+index 635d31e..807a470 100644
 --- a/qmlscene/pluginloader.cpp
 +++ b/qmlscene/pluginloader.cpp
 @@ -412,9 +412,9 @@ PyObject *PyQt5QmlPlugin::getModuleAttr(const char *module, const char *attr)



More information about the Neon-commits mailing list