#4 Update to build with sip5+
Merged 2 years ago by kevin. Opened 2 years ago by swt2c.
rpms/ swt2c/qgis sip5  into  rawhide

file modified
+5 -3
@@ -8,7 +8,7 @@ 

  

  Name:           qgis

  Version:        3.18.3

- Release:        3%{?dist}

+ Release:        4%{?dist}

  Summary:        A user friendly Open Source Geographic Information System

  

  # http://issues.qgis.org/issues/3789
@@ -59,7 +59,7 @@ 

  BuildRequires:  python3-qscintilla-qt5

  BuildRequires:  python3-qscintilla-qt5-devel

  BuildRequires:  python3-qt5-devel

- BuildRequires:  python3-sip-devel

+ BuildRequires:  %{py3_dist sip}

  BuildRequires:  qca-qt5-devel

  BuildRequires:  qscintilla-qt5-devel

  BuildRequires:  qt5-qt3d-devel
@@ -128,7 +128,6 @@ 

  Requires:       python3-PyYAML

  Requires:       python3-qscintilla-qt5

  Requires:       python3-qt5-webkit

- %{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}}

  

  %description -n python3-qgis

  Python integration and plug-ins for QGIS.
@@ -296,6 +295,9 @@ 

  

  

  %changelog

+ * Tue Jun 08 2021 Scott Talbert <swt@techie.net> - 3.18.3-4

+ - Update to build with sip5+

+ 

  * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.18.3-3

  - Rebuilt for Python 3.10

  

Please DON'T MERGE but do provide comments/approval. This is part of a coordinated move to sip5 in F35+.

Any objections here?

No idea what's at work here but it fails to build:

[ 55%] Building CXX object src/app/dwg/libdxfrw/CMakeFiles/libdxfrw.dir/intern/dwgreader21.cpp.o
cd /builddir/build/BUILD/qgis-3.18.3/x86_64-redhat-linux-gnu/src/app/dwg/libdxfrw && /usr/bin/g++ -DPROJ_VERSION_MAJOR=8 -DQT_CONCURRENT_LIB -DQT_CORE_LIB -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050800 -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_POSITIONING_LIB -DQT_PRINTSUPPORT_LIB -DQT_SERIALPORT_LIB -DQT_SQL_LIB -DQT_SVG_LIB -DQT_USE_QSTRINGBUILDER -DQT_WEBKITWIDGETS_LIB -DQT_WEBKIT_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -DSIP_VERSION=0x050500 -DWITH_BINDINGS -DWITH_QTWEBKIT -I/builddir/build/BUILD/qgis-3.18.3/x86_64-redhat-linux-gnu/src/app/dwg/libdxfrw/libdxfrw_autogen/include -I/builddir/build/BUILD/qgis-3.18.3/x86_64-redhat-linux-gnu -I/builddir/build/BUILD/qgis-3.18.3/external/libdxfrw -I/builddir/build/BUILD/qgis-3.18.3/src/core -I/builddir/build/BUILD/qgis-3.18.3/x86_64-redhat-linux-gnu/src/core -I/builddir/build/BUILD/qgis-3.18.3/src/core/3d -I/builddir/build/BUILD/qgis-3.18.3/src/core/annotations -I/builddir/build/BUILD/qgis-3.18.3/src/core/auth -I/builddir/build/BUILD/qgis-3.18.3/src/core/callouts -I/builddir/build/BUILD/qgis-3.18.3/src/core/classification -I/builddir/build/BUILD/qgis-3.18.3/src/core/diagram -I/builddir/build/BUILD/qgis-3.18.3/src/core/dxf -I/builddir/build/BUILD/qgis-3.18.3/src/core/editform -I/builddir/build/BUILD/qgis-3.18.3/src/core/effects -I/builddir/build/BUILD/qgis-3.18.3/src/core/expression -I/builddir/build/BUILD/qgis-3.18.3/src/core/fieldformatter -I/builddir/build/BUILD/qgis-3.18.3/src/core/geometry -I/builddir/build/BUILD/qgis-3.18.3/src/core/geocms -I/builddir/build/BUILD/qgis-3.18.3/src/core/geocms/geonode -I/builddir/build/BUILD/qgis-3.18.3/src/core/geocoding -I/builddir/build/BUILD/qgis-3.18.3/src/core/gps -I/builddir/build/BUILD/qgis-3.18.3/src/core/labeling -I/builddir/build/BUILD/qgis-3.18.3/src/core/layertree -I/builddir/build/BUILD/qgis-3.18.3/src/core/layout -I/builddir/build/BUILD/qgis-3.18.3/src/core/locator -I/builddir/build/BUILD/qgis-3.18.3/src/core/mesh -I/builddir/build/BUILD/qgis-3.18.3/src/core/metadata -I/builddir/build/BUILD/qgis-3.18.3/src/core/network -I/builddir/build/BUILD/qgis-3.18.3/src/core/numericformats -I/builddir/build/BUILD/qgis-3.18.3/src/core/pal -I/builddir/build/BUILD/qgis-3.18.3/src/core/pointcloud -I/builddir/build/BUILD/qgis-3.18.3/src/core/processing -I/builddir/build/BUILD/qgis-3.18.3/src/core/processing/models -I/builddir/build/BUILD/qgis-3.18.3/src/core/project -I/builddir/build/BUILD/qgis-3.18.3/src/core/providers -I/builddir/build/BUILD/qgis-3.18.3/src/core/providers/arcgis -I/builddir/build/BUILD/qgis-3.18.3/src/core/providers/memory -I/builddir/build/BUILD/qgis-3.18.3/src/core/providers/gdal -I/builddir/build/BUILD/qgis-3.18.3/src/core/providers/ogr -I/builddir/build/BUILD/qgis-3.18.3/src/core/providers/meshmemory -I/builddir/build/BUILD/qgis-3.18.3/src/core/raster -I/builddir/build/BUILD/qgis-3.18.3/src/core/renderer -I/builddir/build/BUILD/qgis-3.18.3/src/core/scalebar -I/builddir/build/BUILD/qgis-3.18.3/src/core/symbology -I/builddir/build/BUILD/qgis-3.18.3/src/core/textrenderer -I/builddir/build/BUILD/qgis-3.18.3/src/core/validity -I/builddir/build/BUILD/qgis-3.18.3/src/core/vector -I/builddir/build/BUILD/qgis-3.18.3/src/core/vectortile -I/builddir/build/BUILD/qgis-3.18.3/external -I/builddir/build/BUILD/qgis-3.18.3/external/nlohmann -I/builddir/build/BUILD/qgis-3.18.3/external/kdbush/include -I/builddir/build/BUILD/qgis-3.18.3/external/nmea -I/builddir/build/BUILD/qgis-3.18.3/external/rtree/include -I/builddir/build/BUILD/qgis-3.18.3/external/meshOptimizer -I/builddir/build/BUILD/qgis-3.18.3/src/core/providers/ept -isystem /builddir/build/BUILD/qgis-3.18.3/BEFORE -isystem /usr/include/qt5 -isystem /usr/include/qt5/QtCore -isystem /usr/lib64/qt5/mkspecs/linux-g++ -isystem /usr/include/gdal -isystem /usr/include/qt5/QtCrypto -isystem /usr/include/qt5keychain -isystem /usr/include/qt5/QtSerialPort -isystem /usr/include/qt5/QtXml -isystem /usr/include/qt5/QtGui -isystem /usr/include/qt5/QtWidgets -isystem /usr/include/qt5/QtSvg -isystem /usr/include/qt5/QtPrintSupport -isystem /usr/include/qt5/QtNetwork -isystem /usr/include/qt5/QtWebKitWidgets -isystem /usr/include/qt5/QtWebKit -isystem /usr/include/qt5/QtSql -isystem /usr/include/qt5/QtConcurrent -isystem /usr/include/qt5/QtPositioning -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing -Wnon-virtual-dtor -Wno-redundant-move -Wno-deprecated-copy -fPIC -fvisibility=hidden -fPIC -std=gnu++11 -MD -MT src/app/dwg/libdxfrw/CMakeFiles/libdxfrw.dir/intern/dwgreader21.cpp.o -MF CMakeFiles/libdxfrw.dir/intern/dwgreader21.cpp.o.d -o CMakeFiles/libdxfrw.dir/intern/dwgreader21.cpp.o -c /builddir/build/BUILD/qgis-3.18.3/external/libdxfrw/intern/dwgreader21.cpp
AutoMoc: Reading dependencies from "SRC:/x86_64-redhat-linux-gnu/src/providers/postgres/postgresprovider_a_autogen/EWIEGA46WW/moc_qgspostgreslistener.cpp.d"
AutoMoc: Reading dependencies from "SRC:/x86_64-redhat-linux-gnu/src/providers/postgres/postgresprovider_a_autogen/EWIEGA46WW/moc_qgspostgrestransaction.cpp.d"
gmake[2]: *** [python/CMakeFiles/python_module_qgis__core_autogen.dir/build.make:727: python/core/sip_corepart0.cpp] Error 1
gmake[2]: *** Deleting file 'python/core/sip_corepart0.cpp'
gmake[2]: Leaving directory '/builddir/build/BUILD/qgis-3.18.3/x86_64-redhat-linux-gnu'
gmake[1]: *** [CMakeFiles/Makefile2:6819: python/CMakeFiles/python_module_qgis__core_autogen.dir/all] Error 2

Yeah, it needs to be built in conjunction with PyQt5, see this copr where I've built it:
https://copr.fedorainfracloud.org/coprs/swt2c/pyqt5-sip5/

Do you have any comments/issues with my changes?

I see. I have no issues although I'm not the package owner.

building in f35-build-side-43327

Pull-Request has been merged by kevin

2 years ago
Metadata