Drop support for i686

See https://src.fedoraproject.org/rpms/cmake/pull-request/45. This
change may yet be reverted (see https://pagure.io/fesco/issue/3377 and
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/R43VT2ZK2KAUXWLCL7ZADKMKCMYMRMVB/),
but the workaround in this commit ensures the expected LIB_SUFFIX is set
no matter what.

.gitignore

@@ -43,3 +43,124 @@ qgis_1.5.0.tar.gz
 /qgis-2.18.20.tar.bz2
 /qgis-2.18.25.tar.bz2
 /qgis-3.4.4.tar.bz2
+/qgis-3.6.1.tar.bz2
+/qgis-3.6.2.tar.bz2
+/qgis-3.6.3.tar.bz2
+/qgis-3.8.1.tar.bz2
+/qgis-3.8.2.tar.bz2
+/qgis-3.8.3.tar.bz2
+/qgis-3.10.0.tar.bz2
+/qgis-3.10.1.tar.bz2
+/qgis-3.10.2.tar.bz2
+/qgis-3.12.0.tar.bz2
+/qgis-3.12.1.tar.bz2
+/qgis-3.14.16.tar.bz2
+/qgis-3.16.0.tar.bz2
+/qgis-3.16.1.tar.bz2
+/qgis-3.16.2.tar.bz2
+/qgis-3.16.3.tar.bz2
+/qgis-3.18.0.tar.bz2
+/qgis-3.18.1.tar.bz2
+/qgis-3.18.2.tar.bz2
+/qgis-3.18.3.tar.bz2
+/qgis-3.20.1.tar.bz2
+/qgis-3.20.2.tar.bz2
+/qgis-3.20.3.tar.bz2
+/qgis-3.22.0.tar.bz2
+/qgis-3.22.1.tar.bz2
+/qgis-3.22.2.tar.bz2
+/qgis-3.22.3.tar.bz2
+/qgis-3.24.0-vendor.tar.xz
+/qgis-3.24.0.tar.bz2
+/qgis-3.24.1.tar.bz2
+/qgis-3.24.1-vendor.tar.xz
+/qgis-3.24.2.tar.bz2
+/qgis-3.24.2-vendor.tar.xz
+/qgis-3.24.3-vendor.tar.xz
+/qgis-3.24.3.tar.bz2
+/qgis-3.26.0.tar.bz2
+/qgis-3.26.0-vendor.tar.xz
+/qgis-3.26.1.tar.bz2
+/qgis-3.26.1-vendor.tar.xz
+/qgis-3.26.2.tar.bz2
+/qgis-3.26.2-vendor.tar.xz
+/qgis-3.26.3.tar.bz2
+/qgis-3.26.3-vendor.tar.xz
+/qgis-3.28.0.tar.bz2
+/qgis-3.28.0-vendor.tar.xz
+/qgis-3.28.1.tar.bz2
+/qgis-3.28.1-vendor.tar.xz
+/qgis-3.28.2.tar.bz2
+/qgis-3.28.2-vendor.tar.xz
+/qgis-3.28.3.tar.bz2
+/qgis-3.28.3-vendor.tar.xz
+/qgis-3.30.0.tar.bz2
+/qgis-3.30.0-vendor.tar.xz
+/qgis-3.30.1.tar.bz2
+/qgis-3.30.1-vendor.tar.xz
+/qgis-3.30.2.tar.bz2
+/qgis-3.30.2-vendor.tar.xz
+/qgis-3.30.3.tar.bz2
+/qgis-3.30.3-vendor.tar.xz
+/qgis-3.32.0.tar.bz2
+/qgis-3.32.0-vendor.tar.xz
+/qgis-3.32.1.tar.bz2
+/qgis-3.32.1-vendor.tar.xz
+/qgis-3.32.2.tar.bz2
+/qgis-3.32.2-vendor.tar.xz
+/qgis-3.32.3-vendor.tar.xz
+/qgis-3.32.3.tar.bz2
+/qgis-3.34.0-vendor.tar.xz
+/qgis-3.34.0.tar.bz2
+/qgis-3.34.1.tar.bz2
+/qgis-3.34.1-vendor.tar.xz
+/qgis-3.34.2-vendor.tar.xz
+/qgis-3.34.2.tar.bz2
+/qgis-3.34.3.tar.bz2
+/qgis-3.34.3-vendor.tar.xz
+/qgis-3.36.0.tar.bz2
+/qgis-3.36.0-vendor.tar.xz
+/qgis-3.36.1.tar.bz2
+/qgis-3.36.1-vendor.tar.xz
+/qgis-3.36.2.tar.bz2
+/qgis-3.36.2-vendor.tar.xz
+/qgis-3.36.3.tar.bz2
+/qgis-3.36.3-vendor.tar.xz
+/qgis-3.38.0.tar.bz2
+/qgis-3.38.0-vendor.tar.xz
+/qgis-3.38.1.tar.bz2
+/qgis-3.38.1-vendor.tar.xz
+/qgis-3.38.2.tar.bz2
+/qgis-3.38.2-vendor.tar.xz
+/qgis-3.38.3.tar.bz2
+/qgis-3.38.3-vendor.tar.xz
+/qgis-3.40.0-vendor.tar.xz
+/qgis-3.40.0.tar.bz2
+/qgis-3.40.1.tar.bz2
+/qgis-3.40.1-vendor.tar.xz
+/qgis-3.40.2.tar.bz2
+/qgis-3.40.2-vendor.tar.xz
+/qgis-3.40.3.tar.bz2
+/qgis-3.40.3-vendor.tar.xz
+/qgis-3.42.0-vendor.tar.xz
+/qgis-3.42.0.tar.bz2
+/qgis-3.42.1.tar.bz2
+/qgis-3.42.1-vendor.tar.xz
+/qgis-3.42.2.tar.bz2
+/qgis-3.42.2-vendor.tar.xz
+/qgis-3.42.3.tar.bz2
+/qgis-3.42.3-vendor.tar.xz
+/qgis-3.44.0.tar.bz2
+/qgis-3.44.0-vendor.tar.xz
+/qgis-3.44.1.tar.bz2
+/qgis-3.44.1-vendor.tar.xz
+/qgis-3.44.2-vendor.tar.xz
+/qgis-3.44.2.tar.bz2
+/qgis-3.44.3.tar.bz2
+/qgis-3.44.3-vendor.tar.xz
+/qgis-3.44.4.tar.bz2
+/qgis-3.44.4-vendor.tar.xz
+/qgis-3.44.5.tar.bz2
+/qgis-3.44.5-vendor.tar.xz
+/qgis-3.44.6.tar.bz2
+/qgis-3.44.6-vendor.tar.xz

CVE-2024-55565.prebundle.patch

@@ -0,0 +1,17 @@
+diff -rupN qgis-3.42.1/resources/server/src/landingpage/yarn.lock qgis-3.42.1-new/resources/server/src/landingpage/yarn.lock
+--- qgis-3.42.1/resources/server/src/landingpage/yarn.lock	2025-03-21 13:35:59.000000000 +0100
++++ qgis-3.42.1-new/resources/server/src/landingpage/yarn.lock	2025-03-23 10:16:16.924733787 +0100
+@@ -7719,13 +7719,6 @@ shellwords@^0.1.1:
+   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
+ 
+-shortid@^2.2.15:
+-  version "2.2.16"
+-  resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608"
+-  integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g==
+-  dependencies:
+-    nanoid "^2.1.0"
+-
+ side-channel-list@^1.0.0:
+   version "1.0.0"
+   resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"

prepare_vendor.sh

@@ -0,0 +1,108 @@
+#!/bin/bash
+
+PKG_URL=$(spectool *.spec --source 0 | sed -e 's/Source0:[ ]*//g')
+PKG_TARBALL=$(basename $PKG_URL)
+PKG_NAME=$(rpmspec -q --queryformat="%{NAME}" *.spec --srpm)
+PKG_VERSION=$(rpmspec -q --queryformat="%{VERSION}" *.spec --srpm)
+PKG_SRCDIR="${PKG_NAME}-${PKG_VERSION}"
+PKG_DIR="$(pwd)"
+PKG_TMPDIR=$(mktemp --tmpdir -d ${PKG_NAME}-XXXXXXXX)
+PKG_PATH="$PKG_TMPDIR/$PKG_SRCDIR/resources/server/src/landingpage/"
+
+echo "URL:     $PKG_URL"
+echo "TARBALL: $PKG_TARBALL"
+echo "NAME:    $PKG_NAME"
+echo "VERSION: $PKG_VERSION"
+echo "PATH:    $PKG_PATH"
+
+cleanup_tmpdir() {
+    popd 2>/dev/null
+    rm -rf $PKG_TMPDIR
+}
+trap cleanup_tmpdir SIGINT
+
+cleanup_and_exit() {
+    cleanup_tmpdir
+    if test "$1" = 0 -o -z "$1" ; then
+        exit 0
+    else
+        exit $1
+    fi
+}
+
+if [ ! -w "$PKG_TARBALL" ]; then
+    wget "$PKG_URL"
+fi
+
+
+mkdir -p $PKG_TMPDIR
+tar -xf $PKG_TARBALL -C $PKG_TMPDIR
+
+pushd $PKG_TMPDIR/$PKG_SRCDIR
+echo ">>>>>> Applying prebundle patches"
+for file in $(ls -1 $PKG_DIR/*.prebundle.patch 2>/dev/null); do
+patch -p1 < $file
+done
+popd
+
+pushd $PKG_PATH
+
+export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
+echo ">>>>>> Install npm modules"
+yarn install --frozen-lockfile --ignore-engines
+if [ $? -ne 0 ]; then
+    echo "ERROR: yarn install failed"
+    cleanup_and_exit 1
+fi
+
+echo ">>>>>> Cleanup object dirs"
+find node_modules/ -type d -name "*.o.d" | xargs rm -rf
+find node_modules/ -type d -name "__pycache__" | xargs rm -rf
+
+
+echo ">>>>>> Cleanup object files"
+find node_modules/ -name "*.node" | xargs rm -rf
+
+find node_modules/ -name "*.dll" | grep -v signal-client | xargs rm -f
+find node_modules/ -name "*.dylib" -delete
+find node_modules/ -name "*.so" -delete
+find node_modules/ -name "*.o" -delete
+find node_modules/ -name "*.a" -delete
+find node_modules/ -name "*.snyk-*.flag" -delete
+
+echo ">>>>>> Cleanup build info"
+find node_modules/ -name "builderror.log" -delete
+find node_modules/ -name "yarn-error.log" -delete
+find node_modules/ -name "yarn.lock" -delete
+find node_modules/ -name ".deps" -type d | xargs rm -rf
+find node_modules/ -name "Makefile" -delete
+find node_modules/ -name "*.target.mk" -delete
+find node_modules/ -name "config.gypi" -delete
+find node_modules/ -name "package.json" -exec sed -i "s#$PKG_PATH#/tmp#g" {} \;
+
+echo ">>>>>> Cleanup yarn taballs"
+find node_modules/ -name ".yarn-tarball.tgz" -delete
+
+echo ">>>>>> Cleanup source maps"
+find node_modules/ -name "*.js.map" -delete
+find node_modules/ -name "*.ts.map" -delete
+find node_modules/ -name "*.mjs.map" -delete
+find node_modules/ -name "*.cjs.map" -delete
+find node_modules/ -name "*.css.map" -delete
+find node_modules/ -name "*.min.map" -delete
+
+echo ">>>>>> Package vendor files"
+rm -f $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz
+XZ_OPT="-T$(nproc)" tar cJf $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz .package-cache
+if [ $? -ne 0 ]; then
+    cleanup_and_exit 1
+fi
+
+yarn add license-checker --ignore-engines
+yarn license-checker --summary | sed "s#$PKG_PATH#/tmp#g" > $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor-licenses.txt
+cp -a yarn.lock $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-yarn.lock
+
+popd
+
+rm -rf .package-cache
+cleanup_and_exit 0

qgis-3.44.6-vendor-licenses.txt

@@ -0,0 +1,26 @@
+yarn run v1.22.22
+$ /tmpnode_modules/.bin/license-checker --summary
+├─ MIT: 1056
+├─ ISC: 78
+├─ BSD-3-Clause: 34
+├─ BSD-2-Clause: 29
+├─ Apache-2.0: 25
+├─ MIT*: 4
+├─ (MIT OR CC0-1.0): 4
+├─ Unlicense: 3
+├─ (MIT OR Apache-2.0): 2
+├─ CC0-1.0: 2
+├─ (MIT AND CC-BY-3.0): 2
+├─ 0BSD: 2
+├─ UNLICENSED: 1
+├─ Python-2.0: 1
+├─ CC-BY-4.0: 1
+├─ BSD*: 1
+├─ (BSD-3-Clause OR GPL-2.0): 1
+├─ (WTFPL OR MIT): 1
+├─ MIT,Apache2: 1
+├─ (MIT AND BSD-3-Clause): 1
+├─ CC-BY-3.0: 1
+└─ MPL-2.0: 1
+
+Done in 2.65s.

qgis-lib64.patch

@@ -1,12 +0,0 @@
-diff -rupN qgis-2.18.25/cmake/PyQtMacros.cmake qgis-2.18.25-new/cmake/PyQtMacros.cmake
---- qgis-2.18.25/cmake/PyQtMacros.cmake	2018-10-26 13:59:08.000000000 +0200
-+++ qgis-2.18.25-new/cmake/PyQtMacros.cmake	2018-11-14 00:15:36.247074662 +0100
-@@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles )
-   ELSE(WIN32)
-     # TODO osx
-     SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
--    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
-+    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
-   ENDIF(WIN32)
- 
-   FOREACH(it ${ARGN})

qgis-mime.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-
-  <mime-type type="application/x-qgis-project">
-    <comment>QGIS Project</comment>
-    <comment xml:lang="de">QGIS-Projekt</comment>
-    <sub-class-of type="application/xml"/>
-    <alias type="application/x-qgis"/>
-    <icon name="qgis-mime"/>
-    <magic priority="50">
-      <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
-        <match type="string" offset="0:256" value="&lt;qgis projectname"/>
-      </match>
-    </magic>
-    <glob pattern="*.qgs"/>
-  </mime-type>
-
-  <mime-type type="application/x-qgis-layer-settings">
-    <comment>QGIS layer settings</comment>
-    <comment xml:lang="de">QGIS Layer Einstellungen</comment>
-    <sub-class-of type="application/xml"/>
-    <icon name="qgis-mime"/>
-    <magic priority="50">
-      <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
-        <match type="string" offset="0:256" value="&lt;qgis version"/>
-      </match>
-    </magic>
-    <glob pattern="*.qml"/>
-  </mime-type>
-</mime-info>

qgis-server-README.fedora

@@ -29,33 +29,3 @@ Please fill in the metadata tab for your QGIS project.
 
 You can easily test your WMS by adding it as a WMS layer in QGIS.
 
-==================================================
-
-The traditional QGIS server configuration is less comfortable and
-I don't encourage it, unless you have a good reason to use it:
-
-This approach only allows for a single map service.
-
-It uses two configuration files, that must be located in the same
-directory as the FCGI binary:
-
- - admin.sld
- - wms_metadata.xml
-
-"admin.sld" uses extended SLD syntax (Style Layer Descriptor) to
-describe symbolization of data.
-
-"wms_metadata.xml" supplies metadata for your WMS. You may also use this
-file with the kind of configuration mentioned on top. But if you want to
-serve different projects, and metadata varies between them, that file
-won't work for you. Please see above for how to define project specific
-metadata!
-
-Both configuration files are included as documentation.
-
-==================================================
-
-Further information: http://karlinapp.ethz.ch/qgis_wms
-
-    Volker Fröhlich
-    volker27@gmx.at

qgis-server-httpd.conf

@@ -26,3 +26,7 @@ ScriptAlias /qgis/ "/usr/libexec/qgis/"
    </IfModule>
 
 </Directory>
+
+# Uncomment to output QGIS Server log to apache error_log
+# FcgidInitialEnv QGIS_SERVER_LOG_STDERR 1
+# FcgidInitialEnv QGIS_SERVER_LOG_LEVEL 0

qgis-serverprefix.patch

@@ -0,0 +1,15 @@
+diff -rupN --no-dereference qgis-3.44.6/src/core/qgsapplication.cpp qgis-3.44.6-new/src/core/qgsapplication.cpp
+--- qgis-3.44.6/src/core/qgsapplication.cpp	2025-12-19 13:02:37.000000000 +0100
++++ qgis-3.44.6-new/src/core/qgsapplication.cpp	2025-12-20 13:43:24.341223415 +0100
+@@ -387,6 +387,11 @@ void QgsApplication::init( QString profi
+         {
+           myDir.cdUp();
+         }
++        // Fix for server which is one level deeper in /usr/libexec/qgis
++        else if ( applicationDirPath().contains( QStringLiteral( "libexec/qgis" ) ) )
++        {
++          myDir.cdUp();
++        }
+         myDir.cdUp(); // Go from /usr/bin or /usr/lib (for server) to /usr
+         QString myPrefix = myDir.absolutePath();
+         setPrefixPath( myPrefix, true );

qgis-yarn-offline.patch

@@ -0,0 +1,12 @@
+diff -rupN --no-dereference qgis-3.44.6/resources/CMakeLists.txt qgis-3.44.6-new/resources/CMakeLists.txt
+--- qgis-3.44.6/resources/CMakeLists.txt	2025-12-19 13:02:37.000000000 +0100
++++ qgis-3.44.6-new/resources/CMakeLists.txt	2025-12-20 13:43:26.680887755 +0100
+@@ -47,7 +47,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP)
+   # add_custom_command does not support OUTPUT_QUIET, so we need to make a cmake subcommand first:
+   file(WRITE ${CMAKE_BINARY_DIR}/yarn_commands.cmake
+   "execute_process(
+-      COMMAND ${YARN} install --frozen-lockfile
++      COMMAND ${YARN} install --frozen-lockfile --offline
+       WORKING_DIRECTORY ${LANDINGPAGE_OUTPUT_PATH}
+       OUTPUT_QUIET
+       ERROR_FILE ${CMAKE_BINARY_DIR}/yarn_error.log

sources

@@ -1 +1,2 @@
-SHA512 (qgis-3.4.4.tar.bz2) = 6f38f189f40081fa90128e0c8be8a64c522f84ba22929178d498e855b50de0047539de5ec2968736cfe9a0dfdd8dc856726f4ff51e4c3b6f629aca7151c1ea66
+SHA512 (qgis-3.44.6.tar.bz2) = 7ab868fb214f571b7feac5172a4c60b1bba617df3cf55a6a3167b6ca87737be5fddec94155d3f0ec8ce0ca9efba19ee719d33ee3fba851c9fae6db409bf86f85
+SHA512 (qgis-3.44.6-vendor.tar.xz) = 04f711a21a75e06c2f327cb542b4b50cae8f6f2db5817173ffaf9057d2bd81c596fd067bf8cc4952f9d0bdc04e3b389d7dd3c8d8928c767975dab884f0f1705a