[Git][debian-gis-team/qgis][master] 4 commits: Revert "Add upstream patches for sip6 support."
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sun Nov 7 13:09:00 GMT 2021
Bas Couwenberg pushed to branch master at Debian GIS Project / qgis
Commits:
3f7bdd19 by Bas Couwenberg at 2021-11-07T06:51:34+01:00
Revert "Add upstream patches for sip6 support."
This reverts commit ce78563091b57c25e5ab5294d5b8eb28412370e6.
- - - - -
bb0903db by Bas Couwenberg at 2021-11-07T06:52:03+01:00
Revert "Switch to sip6 as used by pyqt5. (closes: #998567)"
This reverts commit e7456d3d58fd30d80dd6564accdf1294ca682fcc.
- - - - -
3257f3d5 by Bas Couwenberg at 2021-11-07T09:41:51+01:00
Update symbols for amd64.
- - - - -
4e101f13 by Bas Couwenberg at 2021-11-07T09:41:51+01:00
Set distribution to experimental.
- - - - -
7 changed files:
- debian/changelog
- debian/control
- debian/libqgis-analysis3.16.13.symbols
- − debian/patches/pr45128-Add-sip5-sip6-sip-build-support.patch
- − debian/patches/pr45829-Set-release_gil-=-True-when-generating-bindings.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,12 +1,10 @@
-qgis (3.16.13+dfsg-1) UNRELEASED; urgency=medium
+qgis (3.16.13+dfsg-1~exp1) experimental; urgency=medium
* New upstream release.
- * Add upstream patches for sip6 support.
- * Switch to sip6 as used by pyqt5.
- (closes: #998567)
* Refresh patches.
+ * Update symbols for amd64.
- -- Bas Couwenberg <sebastic at debian.org> Fri, 05 Nov 2021 13:40:43 +0100
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 07 Nov 2021 06:52:12 +0100
qgis (3.16.12+dfsg-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -55,8 +55,8 @@ Build-Depends: bison,
python3-pyqt5.qsci,
python3-pyqt5.qtsql,
python3-pyqt5.qtsvg,
- python3-pyqtbuild,
- python3-sipbuild,
+ python3-sip-dev,
+ python3-sip,
python3-termcolor,
python3-yaml,
qt3d5-dev,
@@ -70,7 +70,6 @@ Build-Depends: bison,
qtpositioning5-dev,
qttools5-dev-tools,
qttools5-dev,
- sip-tools,
git,
doxygen,
graphviz,
@@ -274,13 +273,10 @@ Depends: grass-dev (>= 7.8.0),
python3-pyqt5,
python3-pyqt5.qsci,
python3-pyqt5.qtsql,
- python3-pyqt5.sip,
- python3-pyqtbuild,
qgis-sip (= ${source:Version}),
qtbase5-dev,
qtpositioning5-dev,
qttools5-dev,
- sip-tools,
${misc:Depends}
Recommends: libqgis-customwidgets
Provides: qgis-dev
@@ -366,11 +362,13 @@ Depends: python3-qgis-common (= ${source:Version}),
python3-pyqt5.qtsvg,
python3-pyqt5.qtwebkit,
python3-requests,
+ python3-sip,
python3-six,
python3-tz,
python3-yaml,
${python3:Depends},
${shlibs:Depends},
+ ${sip3:Depends},
${misc:Depends}
Description: Python bindings to QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and
=====================================
debian/libqgis-analysis3.16.13.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 3.16.12 arm64 armel armhf i386 ppc64 ppc64el s390x
+# SymbolsHelper-Confirmed: 3.16.13 amd64
libqgis_analysis.so.3.16.13 #PACKAGE# #MINVER#
* Build-Depends-Package: libqgis-dev
_ZN10QByteArrayD1Ev at Base 3.4.5
@@ -1248,8 +1248,6 @@ libqgis_analysis.so.3.16.13 #PACKAGE# #MINVER#
(optional=templinst|subst)_ZNSt10_HashtableIdSt4pairIKdiESaIS2_ENSt8__detail10_Select1stESt8equal_toIdESt4hashIdENS4_18_Mod_range_hashingENS4_20_Default_ranged_hashENS4_20_Prime_rehash_policyENS4_17_Hashtable_traitsILb0ELb0ELb1EEEE9_M_rehashE{size_t}RK{size_t}@Base 3.16.12
(optional=templinst)_ZNSt10_HashtableIdSt4pairIKdiESaIS2_ENSt8__detail10_Select1stESt8equal_toIdESt4hashIdENS4_18_Mod_range_hashingENS4_20_Default_ranged_hashENS4_20_Prime_rehash_policyENS4_17_Hashtable_traitsILb0ELb0ELb1EEEED1Ev at Base 3.16.4
(optional=templinst)_ZNSt10_HashtableIdSt4pairIKdiESaIS2_ENSt8__detail10_Select1stESt8equal_toIdESt4hashIdENS4_18_Mod_range_hashingENS4_20_Default_ranged_hashENS4_20_Prime_rehash_policyENS4_17_Hashtable_traitsILb0ELb0ELb1EEEED2Ev at Base 3.16.4
- (optional=templinst|arch=!arm64|subst)_ZNSt10_HashtableIddSaIdENSt8__detail9_IdentityESt8equal_toIdESt4hashIdENS1_18_Mod_range_hashingENS1_20_Default_ranged_hashENS1_20_Prime_rehash_policyENS1_17_Hashtable_traitsILb0ELb1ELb1EEEEC1IN9__gnu_cxx17__normal_iteratorIPdSt6vectorIdS0_EEEEET_SK_{size_t}RKS6_RKS4_RKS0_St17integral_constantIbLb1EE at Base 3.16.12
- (optional=templinst|arch=!arm64|subst)_ZNSt10_HashtableIddSaIdENSt8__detail9_IdentityESt8equal_toIdESt4hashIdENS1_18_Mod_range_hashingENS1_20_Default_ranged_hashENS1_20_Prime_rehash_policyENS1_17_Hashtable_traitsILb0ELb1ELb1EEEEC2IN9__gnu_cxx17__normal_iteratorIPdSt6vectorIdS0_EEEEET_SK_{size_t}RKS6_RKS4_RKS0_St17integral_constantIbLb1EE at Base 3.16.12
(optional=templinst)_ZNSt10_HashtableIddSaIdENSt8__detail9_IdentityESt8equal_toIdESt4hashIdENS1_18_Mod_range_hashingENS1_20_Default_ranged_hashENS1_20_Prime_rehash_policyENS1_17_Hashtable_traitsILb0ELb1ELb1EEEED1Ev at Base 3.16.4
(optional=templinst)_ZNSt10_HashtableIddSaIdENSt8__detail9_IdentityESt8equal_toIdESt4hashIdENS1_18_Mod_range_hashingENS1_20_Default_ranged_hashENS1_20_Prime_rehash_policyENS1_17_Hashtable_traitsILb0ELb1ELb1EEEED2Ev at Base 3.16.4
(optional=templinst|arch=armel armhf i386 mipsel)_ZNSt10_HashtableIiSt4pairIKiiESaIS2_ENSt8__detail10_Select1stESt8equal_toIiESt4hashIiENS4_18_Mod_range_hashingENS4_20_Default_ranged_hashENS4_20_Prime_rehash_policyENS4_17_Hashtable_traitsILb0ELb0ELb1EEEE9_M_rehashEjRKj at Base 3.16.4
=====================================
debian/patches/pr45128-Add-sip5-sip6-sip-build-support.patch deleted
=====================================
@@ -1,686 +0,0 @@
-Description: Add sip5/sip6 sip-build support
-Author: Sandro Mani <manisandro at gmail.com>
-Origin: https://github.com/qgis/QGIS/pull/45128
-Bug: https://github.com/qgis/QGIS/issues/38911
-Bug-Debian: https://bugs.debian.org/998567
-
---- a/cmake/FindSIP.cmake
-+++ b/cmake/FindSIP.cmake
-@@ -38,13 +38,13 @@ ELSE(SIP_VERSION)
- STRING(REGEX REPLACE "^sip_version:([^\n]+).*$" "\\1" SIP_VERSION ${sip_config})
- STRING(REGEX REPLACE ".*\nsip_version_num:([^\n]+).*$" "\\1" SIP_VERSION_NUM ${sip_config})
- STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${sip_config})
-- STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config})
- STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config})
- IF(${SIP_VERSION_STR} VERSION_LESS 5)
-+ STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config})
- STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config})
- STRING(REGEX REPLACE ".*\nsip_module_dir:([^\n]+).*$" "\\1" SIP_MODULE_DIR ${sip_config})
- ELSE(${SIP_VERSION_STR} VERSION_LESS 5)
-- FIND_PROGRAM(SIP_MODULE_EXECUTABLE sip-module)
-+ FIND_PROGRAM(SIP_BUILD_EXECUTABLE sip-build)
- ENDIF(${SIP_VERSION_STR} VERSION_LESS 5)
- SET(SIP_FOUND TRUE)
- ENDIF(sip_config)
---- a/cmake/FindSIP.py
-+++ b/cmake/FindSIP.py
-@@ -52,9 +52,6 @@ else: # Code for SIP v5
- print("sip_version_num:%d" % sipbuild.version.SIP_VERSION)
- print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
-
-- import shutil
-- print("sip_bin:%s" % shutil.which("sip5"))
--
- from distutils.sysconfig import get_python_lib
- python_modules_dir = get_python_lib(plat_specific=1)
- print("default_sip_dir:%s" % python_modules_dir)
---- a/cmake/SIPMacros.cmake
-+++ b/cmake/SIPMacros.cmake
-@@ -43,15 +43,13 @@ SET(SIP_EXTRA_OPTIONS)
- SET(SIP_EXTRA_OBJECTS)
-
- MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP SIP_FILES CPP_FILES)
-+
- STRING(REPLACE "." "/" _x ${MODULE_NAME})
- GET_FILENAME_COMPONENT(_parent_module_path ${_x} PATH)
- GET_FILENAME_COMPONENT(_child_module_name ${_x} NAME)
--
- GET_FILENAME_COMPONENT(_module_path ${MODULE_SIP} PATH)
- GET_FILENAME_COMPONENT(_abs_module_sip ${MODULE_SIP} ABSOLUTE)
-
-- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_module_path}) # Output goes in this dir.
--
- # If this is not need anymore (using input configuration file for SIP files)
- # SIP could be run in the source rather than in binary directory
- SET(_configured_module_sip ${CMAKE_CURRENT_BINARY_DIR}/${_module_path}/${_module_path}.sip)
-@@ -63,30 +61,8 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MO
- CONFIGURE_FILE(${_sip_file} ${_out_sip_file})
- ENDFOREACH (_sip_file)
-
--
-- SET(_sip_includes)
-- FOREACH (_inc ${SIP_INCLUDES})
-- GET_FILENAME_COMPONENT(_abs_inc ${_inc} ABSOLUTE)
-- LIST(APPEND _sip_includes -I ${_abs_inc})
-- ENDFOREACH (_inc )
--
-- SET(_sip_tags)
-- FOREACH (_tag ${SIP_TAGS})
-- LIST(APPEND _sip_tags -t ${_tag})
-- ENDFOREACH (_tag)
--
-- SET(_sip_x)
-- FOREACH (_x ${SIP_DISABLE_FEATURES})
-- LIST(APPEND _sip_x -x ${_x})
-- ENDFOREACH (_x ${SIP_DISABLE_FEATURES})
--
- SET(_message "-DMESSAGE=Generating CPP code for module ${MODULE_NAME}")
- SET(_sip_output_files)
-- FOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} )
-- IF( ${CONCAT_NUM} LESS ${SIP_CONCAT_PARTS} )
-- SET(_sip_output_files ${_sip_output_files} ${CMAKE_CURRENT_BINARY_DIR}/${_module_path}/sip${_child_module_name}part${CONCAT_NUM}.cpp )
-- ENDIF( ${CONCAT_NUM} LESS ${SIP_CONCAT_PARTS} )
-- ENDFOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} )
-
- # Suppress warnings
- IF(PEDANTIC)
-@@ -111,22 +87,67 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MO
- ADD_DEFINITIONS( /bigobj )
- ENDIF(MSVC)
-
-- SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} -I ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_configured_module_sip})
-- ADD_CUSTOM_COMMAND(
-- OUTPUT ${_sip_output_files}
-- COMMAND ${CMAKE_COMMAND} -E echo ${message}
-- COMMAND ${CMAKE_COMMAND} -E touch ${_sip_output_files}
-- COMMAND ${SIPCMD}
-- MAIN_DEPENDENCY ${_configured_module_sip}
-- DEPENDS ${SIP_EXTRA_FILES_DEPEND}
-- VERBATIM
-- )
-- IF (SIP_MODULE_EXECUTABLE)
-+ IF (SIP_BUILD_EXECUTABLE)
-+
-+ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_module_path}/build/${_child_module_name}) # Output goes in this dir.
-+
-+ FOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} )
-+ IF( ${CONCAT_NUM} LESS ${SIP_CONCAT_PARTS} )
-+ SET(_sip_output_files ${_sip_output_files} ${CMAKE_CURRENT_BINARY_DIR}/${_module_path}/build/${_child_module_name}/sip${_child_module_name}part${CONCAT_NUM}.cpp )
-+ ENDIF( ${CONCAT_NUM} LESS ${SIP_CONCAT_PARTS} )
-+ ENDFOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} )
-+
-+ SET(SIPCMD ${SIP_BUILD_EXECUTABLE} --no-make --concatenate=${SIP_CONCAT_PARTS} --qmake=${QMAKE_EXECUTABLE} --include-dir=${CMAKE_CURRENT_BINARY_DIR})
-+
- ADD_CUSTOM_COMMAND(
-- OUTPUT ${_sip_output_files} APPEND
-- COMMAND ${SIP_MODULE_EXECUTABLE} --target-dir ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} --sip-h ${PYQT5_SIP_IMPORT}
-+ OUTPUT ${_sip_output_files}
-+ COMMAND ${CMAKE_COMMAND} -E echo ${message}
-+ COMMAND ${SIPCMD}
-+ COMMAND ${CMAKE_COMMAND} -E touch ${_sip_output_files}
-+ WORKING_DIRECTORY ${_module_path}
-+ MAIN_DEPENDENCY ${_configured_module_sip}
-+ DEPENDS ${SIP_EXTRA_FILES_DEPEND}
-+ VERBATIM
- )
-- ENDIF (SIP_MODULE_EXECUTABLE)
-+
-+ ELSE (SIP_BUILD_EXECUTABLE)
-+
-+ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_module_path}) # Output goes in this dir.
-+
-+ SET(_sip_includes)
-+ FOREACH (_inc ${SIP_INCLUDES})
-+ GET_FILENAME_COMPONENT(_abs_inc ${_inc} ABSOLUTE)
-+ LIST(APPEND _sip_includes -I ${_abs_inc})
-+ ENDFOREACH (_inc )
-+
-+ SET(_sip_tags)
-+ FOREACH (_tag ${SIP_TAGS})
-+ LIST(APPEND _sip_tags -t ${_tag})
-+ ENDFOREACH (_tag)
-+
-+ SET(_sip_x)
-+ FOREACH (_x ${SIP_DISABLE_FEATURES})
-+ LIST(APPEND _sip_x -x ${_x})
-+ ENDFOREACH (_x ${SIP_DISABLE_FEATURES})
-+
-+ FOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} )
-+ IF( ${CONCAT_NUM} LESS ${SIP_CONCAT_PARTS} )
-+ SET(_sip_output_files ${_sip_output_files} ${CMAKE_CURRENT_BINARY_DIR}/${_module_path}/sip${_child_module_name}part${CONCAT_NUM}.cpp )
-+ ENDIF( ${CONCAT_NUM} LESS ${SIP_CONCAT_PARTS} )
-+ ENDFOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} )
-+
-+ SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} -I ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_configured_module_sip})
-+ ADD_CUSTOM_COMMAND(
-+ OUTPUT ${_sip_output_files}
-+ COMMAND ${CMAKE_COMMAND} -E echo ${message}
-+ COMMAND ${CMAKE_COMMAND} -E touch ${_sip_output_files}
-+ COMMAND ${SIPCMD}
-+ MAIN_DEPENDENCY ${_configured_module_sip}
-+ DEPENDS ${SIP_EXTRA_FILES_DEPEND}
-+ VERBATIM
-+ )
-+
-+ ENDIF (SIP_BUILD_EXECUTABLE)
-
- ADD_CUSTOM_TARGET(generate_sip_${MODULE_NAME}_cpp_files DEPENDS ${_sip_output_files})
-
-@@ -143,8 +164,17 @@ MACRO(BUILD_SIP_PYTHON_MODULE MODULE_NAM
- # tracking get confused.)
- STRING(REPLACE "." "_" _logical_name ${MODULE_NAME})
- SET(_logical_name "python_module_${_logical_name}")
-+ GET_FILENAME_COMPONENT(_module_path ${SIP_FILES} PATH)
-
- ADD_LIBRARY(${_logical_name} MODULE ${_sip_output_files} ${EXTRA_OBJECTS})
-+ SET_PROPERTY(TARGET ${_logical_name} PROPERTY AUTOMOC OFF)
-+ TARGET_INCLUDE_DIRECTORIES(${_logical_name} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/${_module_path}/build)
-+
-+ IF (${SIP_VERSION_STR} VERSION_LESS 5.0.0)
-+ # require c++14 only -- sip breaks with newer versions due to reliance on throw(...) annotations removed in c++17
-+ TARGET_COMPILE_FEATURES(${_logical_name} PRIVATE cxx_std_14)
-+ ENDIF (${SIP_VERSION_STR} VERSION_LESS 5.0.0)
-+
- SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES CXX_VISIBILITY_PRESET default)
- IF (NOT APPLE)
- TARGET_LINK_LIBRARIES(${_logical_name} ${PYTHON_LIBRARY})
---- /dev/null
-+++ b/python/3d/project.py.in
-@@ -0,0 +1,50 @@
-+import os
-+
-+from pyqtbuild import PyQtBindings, PyQtProject
-+from sipbuild import Option
-+
-+
-+class QGIS(PyQtProject):
-+ """ The QGIS project. """
-+
-+ def __init__(self):
-+ """ Initialize the project. """
-+ super().__init__()
-+ self.sip_files_dir = '.'
-+ self.bindings_factories = [Qgis3D]
-+
-+ def get_options(self):
-+ """ Return the list of configurable options. """
-+ options = super().get_options()
-+ options.append(
-+ Option('include_dirs', option_type=list,
-+ help="additional directory to search for .sip files",
-+ metavar="DIR"))
-+ return options
-+
-+ def apply_user_defaults(self, tool):
-+ """ Set default values for user options that haven't been set yet. """
-+ super().apply_user_defaults(tool)
-+ if self.include_dirs is not None:
-+ self.sip_include_dirs += self.include_dirs
-+
-+
-+class Qgis3D(PyQtBindings):
-+ """ The QGIS 3D bindings. """
-+
-+ def __init__(self, project):
-+ """ Initialize the bindings. """
-+ super().__init__(project, '3d')
-+ self.sip_file = '3d.sip'
-+ self.exceptions = True
-+ self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
-+
-+ def apply_user_defaults(self, tool):
-+ """ Set default values for user options that haven't been set yet. """
-+ if self.project.py_platform.startswith('win32'):
-+ self.tags.append('WS_WIN')
-+ elif self.project.py_platform == 'darwin':
-+ self.tags.append('WS_MACX')
-+ else:
-+ self.tags.append('WS_X11')
-+ super().apply_user_defaults(tool)
---- /dev/null
-+++ b/python/3d/pyproject.toml.in
-@@ -0,0 +1,14 @@
-+# Specify the build system.
-+[build-system]
-+requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
-+build-backend = "sipbuild.api"
-+
-+# Specify the PEP 566 metadata for the project.
-+[tool.sip.metadata]
-+name = "QGIS"
-+version = "@COMPLETE_VERSION@"
-+summary = "Python bindings for QGIS"
-+home-page = "https://qgis.org"
-+author = "The QGIS Community"
-+license = "GPL v2"
-+requires-dist = "PyQt5"
---- a/python/CMakeLists.txt
-+++ b/python/CMakeLists.txt
-@@ -216,6 +216,8 @@ if((${PYQT5_VERSION_STR} VERSION_EQUAL 5
- set(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} VECTOR_MAPPED_TYPE)
- endif()
-
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/core/project.py.in ${CMAKE_CURRENT_BINARY_DIR}/core/project.py @ONLY)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/core/pyproject.toml.in ${CMAKE_CURRENT_BINARY_DIR}/core/pyproject.toml @ONLY)
- GENERATE_SIP_PYTHON_MODULE_CODE(qgis._core core/core.sip "${sip_files_core}" cpp_files)
- BUILD_SIP_PYTHON_MODULE(qgis._core core/core.sip ${cpp_files} "" qgis_core)
- set(SIP_CORE_CPP_FILES ${cpp_files})
-@@ -251,6 +253,8 @@ if (WITH_GUI)
- set(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_QSCI_SIP)
- endif()
-
-+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gui/project.py.in ${CMAKE_CURRENT_BINARY_DIR}/gui/project.py @ONLY)
-+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gui/pyproject.toml.in ${CMAKE_CURRENT_BINARY_DIR}/gui/pyproject.toml @ONLY)
- GENERATE_SIP_PYTHON_MODULE_CODE(qgis._gui gui/gui.sip "${sip_files_gui}" cpp_files)
- BUILD_SIP_PYTHON_MODULE(qgis._gui gui/gui.sip ${cpp_files} "" qgis_core qgis_gui)
- endif()
-@@ -279,6 +283,8 @@ if (WITH_3D)
- set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_qgis3d.pyi)
- endif()
-
-+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/3d/project.py.in ${CMAKE_CURRENT_BINARY_DIR}/3d/project.py @ONLY)
-+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/3d/pyproject.toml.in ${CMAKE_CURRENT_BINARY_DIR}/3d/pyproject.toml @ONLY)
- GENERATE_SIP_PYTHON_MODULE_CODE(qgis._3d 3d/3d.sip "${sip_files_3d}" cpp_files)
- BUILD_SIP_PYTHON_MODULE(qgis._3d 3d/3d.sip ${cpp_files} "" qgis_core qgis_3d)
- endif()
-@@ -302,6 +308,9 @@ if (WITH_SERVER AND WITH_SERVER_PLUGINS)
- if((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18))
- set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_server.pyi)
- endif()
-+
-+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/server/project.py.in ${CMAKE_CURRENT_BINARY_DIR}/server/project.py @ONLY)
-+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/server/pyproject.toml.in ${CMAKE_CURRENT_BINARY_DIR}/server/pyproject.toml @ONLY)
- GENERATE_SIP_PYTHON_MODULE_CODE(qgis._server server/server.sip "${sip_files_server}" cpp_files)
- BUILD_SIP_PYTHON_MODULE(qgis._server server/server.sip ${cpp_files} "" qgis_core qgis_server)
- endif()
-@@ -338,6 +347,9 @@ if(WITH_ANALYSIS)
- if((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18))
- set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_analysis.pyi)
- endif()
-+
-+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/analysis/project.py.in ${CMAKE_CURRENT_BINARY_DIR}/analysis/project.py @ONLY)
-+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/analysis/pyproject.toml.in ${CMAKE_CURRENT_BINARY_DIR}/analysis/pyproject.toml @ONLY)
- GENERATE_SIP_PYTHON_MODULE_CODE(qgis._analysis analysis/analysis.sip "${sip_files_analysis}" cpp_files)
- BUILD_SIP_PYTHON_MODULE(qgis._analysis analysis/analysis.sip ${cpp_files} "" qgis_core qgis_analysis)
- endif()
---- /dev/null
-+++ b/python/analysis/project.py.in
-@@ -0,0 +1,50 @@
-+import os
-+
-+from pyqtbuild import PyQtBindings, PyQtProject
-+from sipbuild import Option
-+
-+
-+class QGIS(PyQtProject):
-+ """ The QGIS project. """
-+
-+ def __init__(self):
-+ """ Initialize the project. """
-+ super().__init__()
-+ self.sip_files_dir = '.'
-+ self.bindings_factories = [QgisAnalysis]
-+
-+ def get_options(self):
-+ """ Return the list of configurable options. """
-+ options = super().get_options()
-+ options.append(
-+ Option('include_dirs', option_type=list,
-+ help="additional directory to search for .sip files",
-+ metavar="DIR"))
-+ return options
-+
-+ def apply_user_defaults(self, tool):
-+ """ Set default values for user options that haven't been set yet. """
-+ super().apply_user_defaults(tool)
-+ if self.include_dirs is not None:
-+ self.sip_include_dirs += self.include_dirs
-+
-+
-+class QgisAnalysis(PyQtBindings):
-+ """ The QGIS Analysis bindings. """
-+
-+ def __init__(self, project):
-+ """ Initialize the bindings. """
-+ super().__init__(project, 'analysis')
-+ self.sip_file = 'analysis.sip'
-+ self.exceptions = True
-+ self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
-+
-+ def apply_user_defaults(self, tool):
-+ """ Set default values for user options that haven't been set yet. """
-+ if self.project.py_platform.startswith('win32'):
-+ self.tags.append('WS_WIN')
-+ elif self.project.py_platform == 'darwin':
-+ self.tags.append('WS_MACX')
-+ else:
-+ self.tags.append('WS_X11')
-+ super().apply_user_defaults(tool)
---- /dev/null
-+++ b/python/analysis/pyproject.toml.in
-@@ -0,0 +1,14 @@
-+# Specify the build system.
-+[build-system]
-+requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
-+build-backend = "sipbuild.api"
-+
-+# Specify the PEP 566 metadata for the project.
-+[tool.sip.metadata]
-+name = "QGIS"
-+version = "@COMPLETE_VERSION@"
-+summary = "Python bindings for QGIS"
-+home-page = "https://qgis.org"
-+author = "The QGIS Community"
-+license = "GPL v2"
-+requires-dist = "PyQt5"
---- a/python/core/auto_generated/qgsdiagramrenderer.sip.in
-+++ b/python/core/auto_generated/qgsdiagramrenderer.sip.in
-@@ -843,6 +843,11 @@ class QgsLinearlyInterpolatedDiagramRend
- public:
- QgsLinearlyInterpolatedDiagramRenderer();
- ~QgsLinearlyInterpolatedDiagramRenderer();
-+ QgsLinearlyInterpolatedDiagramRenderer( const QgsLinearlyInterpolatedDiagramRenderer &other );
-+%Docstring
-+Copy constructor
-+%End
-+
-
- virtual QgsLinearlyInterpolatedDiagramRenderer *clone() const /Factory/;
-
-@@ -928,11 +933,6 @@ Returns configuration of appearance of l
- virtual QSizeF diagramSize( const QgsFeature &, const QgsRenderContext &c ) const;
-
-
-- QgsLinearlyInterpolatedDiagramRenderer( const QgsLinearlyInterpolatedDiagramRenderer &other );
--%Docstring
--Copy constructor
--%End
--
- };
-
- /************************************************************************
---- a/python/core/auto_generated/raster/qgsrasterinterface.sip.in
-+++ b/python/core/auto_generated/raster/qgsrasterinterface.sip.in
-@@ -475,7 +475,7 @@ Fill in histogram defaults if not specif
- maximum = PyFloat_AsDouble( a4 );
- }
-
--#if defined(SIP_PROTECTED_IS_PUBLIC)
-+#if defined(SIP_PROTECTED_IS_PUBLIC) or SIP_VERSION >= 0x050000
- sipCpp->initHistogram( *a0, a1, a2, minimum, maximum, *a5, a6, a7 );
- #else
- sipCpp->sipProtect_initHistogram( *a0, a1, a2, minimum, maximum, *a5, a6, a7 );
---- /dev/null
-+++ b/python/core/project.py.in
-@@ -0,0 +1,50 @@
-+import os
-+
-+from pyqtbuild import PyQtBindings, PyQtProject
-+from sipbuild import Option
-+
-+
-+class QGIS(PyQtProject):
-+ """ The QGIS project. """
-+
-+ def __init__(self):
-+ """ Initialize the project. """
-+ super().__init__()
-+ self.sip_files_dir = '.'
-+ self.bindings_factories = [QgisCore]
-+
-+ def get_options(self):
-+ """ Return the list of configurable options. """
-+ options = super().get_options()
-+ options.append(
-+ Option('include_dirs', option_type=list,
-+ help="additional directory to search for .sip files",
-+ metavar="DIR"))
-+ return options
-+
-+ def apply_user_defaults(self, tool):
-+ """ Set default values for user options that haven't been set yet. """
-+ super().apply_user_defaults(tool)
-+ if self.include_dirs is not None:
-+ self.sip_include_dirs += self.include_dirs
-+
-+
-+class QgisCore(PyQtBindings):
-+ """ The QGIS Core bindings. """
-+
-+ def __init__(self, project):
-+ """ Initialize the bindings. """
-+ super().__init__(project, 'core')
-+ self.sip_file = 'core.sip'
-+ self.exceptions = True
-+ self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
-+
-+ def apply_user_defaults(self, tool):
-+ """ Set default values for user options that haven't been set yet. """
-+ if self.project.py_platform.startswith('win32'):
-+ self.tags.append('WS_WIN')
-+ elif self.project.py_platform == 'darwin':
-+ self.tags.append('WS_MACX')
-+ else:
-+ self.tags.append('WS_X11')
-+ super().apply_user_defaults(tool)
---- /dev/null
-+++ b/python/core/pyproject.toml.in
-@@ -0,0 +1,14 @@
-+# Specify the build system.
-+[build-system]
-+requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
-+build-backend = "sipbuild.api"
-+
-+# Specify the PEP 566 metadata for the project.
-+[tool.sip.metadata]
-+name = "QGIS"
-+version = "@COMPLETE_VERSION@"
-+summary = "Python bindings for QGIS"
-+home-page = "https://qgis.org"
-+author = "The QGIS Community"
-+license = "GPL v2"
-+requires-dist = "PyQt5"
---- /dev/null
-+++ b/python/gui/project.py.in
-@@ -0,0 +1,50 @@
-+import os
-+
-+from pyqtbuild import PyQtBindings, PyQtProject
-+from sipbuild import Option
-+
-+
-+class QGIS(PyQtProject):
-+ """ The QGIS project. """
-+
-+ def __init__(self):
-+ """ Initialize the project. """
-+ super().__init__()
-+ self.sip_files_dir = '.'
-+ self.bindings_factories = [QgisGui]
-+
-+ def get_options(self):
-+ """ Return the list of configurable options. """
-+ options = super().get_options()
-+ options.append(
-+ Option('include_dirs', option_type=list,
-+ help="additional directory to search for .sip files",
-+ metavar="DIR"))
-+ return options
-+
-+ def apply_user_defaults(self, tool):
-+ """ Set default values for user options that haven't been set yet. """
-+ super().apply_user_defaults(tool)
-+ if self.include_dirs is not None:
-+ self.sip_include_dirs += self.include_dirs
-+
-+
-+class QgisGui(PyQtBindings):
-+ """ The QGIS Gui bindings. """
-+
-+ def __init__(self, project):
-+ """ Initialize the bindings. """
-+ super().__init__(project, 'gui')
-+ self.sip_file = 'gui.sip'
-+ self.exceptions = True
-+ self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
-+
-+ def apply_user_defaults(self, tool):
-+ """ Set default values for user options that haven't been set yet. """
-+ if self.project.py_platform.startswith('win32'):
-+ self.tags.append('WS_WIN')
-+ elif self.project.py_platform == 'darwin':
-+ self.tags.append('WS_MACX')
-+ else:
-+ self.tags.append('WS_X11')
-+ super().apply_user_defaults(tool)
---- /dev/null
-+++ b/python/gui/pyproject.toml.in
-@@ -0,0 +1,14 @@
-+# Specify the build system.
-+[build-system]
-+requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
-+build-backend = "sipbuild.api"
-+
-+# Specify the PEP 566 metadata for the project.
-+[tool.sip.metadata]
-+name = "QGIS"
-+version = "@COMPLETE_VERSION@"
-+summary = "Python bindings for QGIS"
-+home-page = "https://qgis.org"
-+author = "The QGIS Community"
-+license = "GPL v2"
-+requires-dist = "PyQt5"
---- /dev/null
-+++ b/python/server/project.py.in
-@@ -0,0 +1,50 @@
-+import os
-+
-+from pyqtbuild import PyQtBindings, PyQtProject
-+from sipbuild import Option
-+
-+
-+class QGIS(PyQtProject):
-+ """ The QGIS project. """
-+
-+ def __init__(self):
-+ """ Initialize the project. """
-+ super().__init__()
-+ self.sip_files_dir = '.'
-+ self.bindings_factories = [QgisServer]
-+
-+ def get_options(self):
-+ """ Return the list of configurable options. """
-+ options = super().get_options()
-+ options.append(
-+ Option('include_dirs', option_type=list,
-+ help="additional directory to search for .sip files",
-+ metavar="DIR"))
-+ return options
-+
-+ def apply_user_defaults(self, tool):
-+ """ Set default values for user options that haven't been set yet. """
-+ super().apply_user_defaults(tool)
-+ if self.include_dirs is not None:
-+ self.sip_include_dirs += self.include_dirs
-+
-+
-+class QgisServer(PyQtBindings):
-+ """ The QGIS Server bindings. """
-+
-+ def __init__(self, project):
-+ """ Initialize the bindings. """
-+ super().__init__(project, 'server')
-+ self.sip_file = 'server.sip'
-+ self.exceptions = True
-+ self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
-+
-+ def apply_user_defaults(self, tool):
-+ """ Set default values for user options that haven't been set yet. """
-+ if self.project.py_platform.startswith('win32'):
-+ self.tags.append('WS_WIN')
-+ elif self.project.py_platform == 'darwin':
-+ self.tags.append('WS_MACX')
-+ else:
-+ self.tags.append('WS_X11')
-+ super().apply_user_defaults(tool)
---- /dev/null
-+++ b/python/server/pyproject.toml.in
-@@ -0,0 +1,14 @@
-+# Specify the build system.
-+[build-system]
-+requires = ["sip >=5.0.0, <7", "PyQt-builder >=1.6, <2"]
-+build-backend = "sipbuild.api"
-+
-+# Specify the PEP 566 metadata for the project.
-+[tool.sip.metadata]
-+name = "QGIS"
-+version = "@COMPLETE_VERSION@"
-+summary = "Python bindings for QGIS"
-+home-page = "https://qgis.org"
-+author = "The QGIS Community"
-+license = "GPL v2"
-+requires-dist = "PyQt5"
---- a/src/core/qgsdiagramrenderer.cpp
-+++ b/src/core/qgsdiagramrenderer.cpp
-@@ -659,6 +659,19 @@ QgsLinearlyInterpolatedDiagramRenderer::
- delete mDataDefinedSizeLegend;
- }
-
-+QgsLinearlyInterpolatedDiagramRenderer &QgsLinearlyInterpolatedDiagramRenderer::operator=( const QgsLinearlyInterpolatedDiagramRenderer &other )
-+{
-+ if ( &other == this )
-+ {
-+ return *this;
-+ }
-+ mSettings = other.mSettings;
-+ mInterpolationSettings = other.mInterpolationSettings;
-+ delete mDataDefinedSizeLegend;
-+ mDataDefinedSizeLegend = new QgsDataDefinedSizeLegend( *other.mDataDefinedSizeLegend );
-+ return *this;
-+}
-+
- QgsLinearlyInterpolatedDiagramRenderer *QgsLinearlyInterpolatedDiagramRenderer::clone() const
- {
- return new QgsLinearlyInterpolatedDiagramRenderer( *this );
---- a/src/core/qgsdiagramrenderer.h
-+++ b/src/core/qgsdiagramrenderer.h
-@@ -856,6 +856,10 @@ class CORE_EXPORT QgsLinearlyInterpolate
- public:
- QgsLinearlyInterpolatedDiagramRenderer();
- ~QgsLinearlyInterpolatedDiagramRenderer() override;
-+ //! Copy constructor
-+ QgsLinearlyInterpolatedDiagramRenderer( const QgsLinearlyInterpolatedDiagramRenderer &other );
-+
-+ QgsLinearlyInterpolatedDiagramRenderer &operator=( const QgsLinearlyInterpolatedDiagramRenderer &other );
-
- QgsLinearlyInterpolatedDiagramRenderer *clone() const override SIP_FACTORY;
-
-@@ -924,17 +928,12 @@ class CORE_EXPORT QgsLinearlyInterpolate
-
- QSizeF diagramSize( const QgsFeature &, const QgsRenderContext &c ) const override;
-
-- //! Copy constructor
-- QgsLinearlyInterpolatedDiagramRenderer( const QgsLinearlyInterpolatedDiagramRenderer &other );
--
- private:
- QgsDiagramSettings mSettings;
- QgsDiagramInterpolationSettings mInterpolationSettings;
-
- //! Stores more settings about how legend for varying size of symbols should be rendered
- QgsDataDefinedSizeLegend *mDataDefinedSizeLegend = nullptr;
--
-- QgsLinearlyInterpolatedDiagramRenderer &operator=( const QgsLinearlyInterpolatedDiagramRenderer & ) = delete;
- };
-
- #endif // QGSDIAGRAMRENDERER_H
---- a/src/core/raster/qgsrasterinterface.h
-+++ b/src/core/raster/qgsrasterinterface.h
-@@ -526,7 +526,7 @@ class CORE_EXPORT QgsRasterInterface
- maximum = PyFloat_AsDouble( a4 );
- }
-
--#if defined(SIP_PROTECTED_IS_PUBLIC)
-+#if defined(SIP_PROTECTED_IS_PUBLIC) or SIP_VERSION >= 0x050000
- sipCpp->initHistogram( *a0, a1, a2, minimum, maximum, *a5, a6, a7 );
- #else
- sipCpp->sipProtect_initHistogram( *a0, a1, a2, minimum, maximum, *a5, a6, a7 );
=====================================
debian/patches/pr45829-Set-release_gil-=-True-when-generating-bindings.patch deleted
=====================================
@@ -1,55 +0,0 @@
-Description: Set release_gil = True when generating bindings
-Author: Sandro Mani <manisandro at gmail.com>
-Bug: https://github.com/qgis/QGIS/issues/38911
-Bug-Debian: https://bugs.debian.org/998567
-
---- a/python/3d/project.py.in
-+++ b/python/3d/project.py.in
-@@ -37,6 +37,7 @@ class Qgis3D(PyQtBindings):
- super().__init__(project, '3d')
- self.sip_file = '3d.sip'
- self.exceptions = True
-+ self.release_gil = True
- self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
-
- def apply_user_defaults(self, tool):
---- a/python/analysis/project.py.in
-+++ b/python/analysis/project.py.in
-@@ -37,6 +37,7 @@ class QgisAnalysis(PyQtBindings):
- super().__init__(project, 'analysis')
- self.sip_file = 'analysis.sip'
- self.exceptions = True
-+ self.release_gil = True
- self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
-
- def apply_user_defaults(self, tool):
---- a/python/core/project.py.in
-+++ b/python/core/project.py.in
-@@ -37,6 +37,7 @@ class QgisCore(PyQtBindings):
- super().__init__(project, 'core')
- self.sip_file = 'core.sip'
- self.exceptions = True
-+ self.release_gil = True
- self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
-
- def apply_user_defaults(self, tool):
---- a/python/gui/project.py.in
-+++ b/python/gui/project.py.in
-@@ -37,6 +37,7 @@ class QgisGui(PyQtBindings):
- super().__init__(project, 'gui')
- self.sip_file = 'gui.sip'
- self.exceptions = True
-+ self.release_gil = True
- self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
-
- def apply_user_defaults(self, tool):
---- a/python/server/project.py.in
-+++ b/python/server/project.py.in
-@@ -37,6 +37,7 @@ class QgisServer(PyQtBindings):
- super().__init__(project, 'server')
- self.sip_file = 'server.sip'
- self.exceptions = True
-+ self.release_gil = True
- self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
-
- def apply_user_defaults(self, tool):
=====================================
debian/patches/series
=====================================
@@ -4,5 +4,3 @@ exclude-elvensword-resources.patch
grass78.patch
spelling-errors.patch
bug990636_include-geopackage-and-kml-in-.desktop.patch
-pr45128-Add-sip5-sip6-sip-build-support.patch
-pr45829-Set-release_gil-=-True-when-generating-bindings.patch
=====================================
debian/rules
=====================================
@@ -299,6 +299,7 @@ override_dh_installmime:
override_dh_python3:
dh_python3
dh_python3 usr/share/qgis/grass/scripts
+ dh_sip3 -ppython3-qgis
override_dh_compress:
dh_compress --exclude=pdf
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/compare/9d11d4017dcf8e36158b0f91c3e11509eb5ca26f...4e101f136b5ddae9fd497d317b12bae13675554e
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/compare/9d11d4017dcf8e36158b0f91c3e11509eb5ca26f...4e101f136b5ddae9fd497d317b12bae13675554e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20211107/58504840/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list