Skip to content

qgis: update to 4.0.2; New package: libblend2d-devel-0.21.2 #60786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nezos wants to merge 3 commits into
base: master
Choose a base branch
from
+19 −25
Open

qgis: update to 4.0.2; New package: libblend2d-devel-0.21.2 #60786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5a5537
New package: libblend2d-devel-0.21.2
nezos May 27, 2026
fb34b21
qgis: update to 4.0.2
nezos May 27, 2026
4b66e21
qgis-4.0.2: drop support for 32bit
nezos May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions srcpkgs/libblend2d-devel/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Template file for 'libblend2d-devel'
pkgname=libblend2d-devel
Copy link
Copy Markdown
Member

@ahesford ahesford May 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be called libblend2d and have a -devel subpackage. Look at other library packages for examples. You'll also need an entry in common/shlibs.

Copy link
Copy Markdown
Contributor Author

@nezos nezos May 28, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ahesford I named the package this way cause I considered it only for development. The package contains header files, cmake files and a static library, i.e.:

/usr/include/blend2d/blend2d-debug.h
/usr/include/blend2d/blend2d-impl.h
/usr/include/blend2d/blend2d.h
/usr/include/blend2d/core/api-impl.h
/usr/include/blend2d/core/api.h
/usr/include/blend2d/core/array.h
/usr/include/blend2d/core/bitarray.h
/usr/include/blend2d/core/bitset.h
/usr/include/blend2d/core/context.h
/usr/include/blend2d/core/filesystem.h
/usr/include/blend2d/core/font.h
/usr/include/blend2d/core/fontdata.h
/usr/include/blend2d/core/fontdefs.h
/usr/include/blend2d/core/fontface.h
/usr/include/blend2d/core/fontfeaturesettings.h
/usr/include/blend2d/core/fontmanager.h
/usr/include/blend2d/core/fontvariationsettings.h
/usr/include/blend2d/core/format.h
/usr/include/blend2d/core/geometry.h
/usr/include/blend2d/core/glyphbuffer.h
/usr/include/blend2d/core/glyphrun.h
/usr/include/blend2d/core/gradient.h
/usr/include/blend2d/core/image.h
/usr/include/blend2d/core/imagecodec.h
/usr/include/blend2d/core/imagedecoder.h
/usr/include/blend2d/core/imageencoder.h
/usr/include/blend2d/core/matrix.h
/usr/include/blend2d/core/object.h
/usr/include/blend2d/core/path.h
/usr/include/blend2d/core/pattern.h
/usr/include/blend2d/core/pixelconverter.h
/usr/include/blend2d/core/random.h
/usr/include/blend2d/core/rgba.h
/usr/include/blend2d/core/runtime.h
/usr/include/blend2d/core/runtimescope.h
/usr/include/blend2d/core/string.h
/usr/include/blend2d/core/var.h
/usr/lib/cmake/blend2d/blend2d-config.cmake
/usr/lib/cmake/blend2d/blend2d-targets-none.cmake
/usr/lib/cmake/blend2d/blend2d-targets.cmake
/usr/lib/libblend2d.a

Should I change it?

Copy link
Copy Markdown
Member

@ahesford ahesford May 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should not be building only static libraries. Either build only the shared library or both.

version=0.21.2
revision=1
build_style=cmake
configure_args="-DBLEND2D_TEST=OFF -DBLEND2D_DEMOS=OFF -DBLEND2D_STATIC=ON
-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
Comment thread
nezos marked this conversation as resolved.
short_desc="High performance 2D vector graphics engine"
maintainer="Orphaned <you@example.com>"
Comment thread
nezos marked this conversation as resolved.
license="Zlib"
homepage="https://blend2d.com"
distfiles="https://blend2d.com/download/blend2d-${version}.tar.gz"
checksum=234ba57a64153c96885a6271f15fdcf6c594ac8cb03adaad19abb8d3b2b533fa
13 changes: 0 additions & 13 deletions srcpkgs/qgis/patches/ftbfs.patch
View file
Open in desktop

This file was deleted.

18 changes: 6 additions & 12 deletions srcpkgs/qgis/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'qgis'
pkgname=qgis
version=3.44.4
revision=4
version=4.0.2
Copy link
Copy Markdown
Contributor

@ar-jan ar-jan May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4.0.3 was just released

revision=1
Copy link
Copy Markdown
Contributor

@ar-jan ar-jan May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can add archs="~i686*" here as ahesford indicated (with a comment mentioning why)

Copy link
Copy Markdown
Member

@ahesford ahesford May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have more 32-bit architectures than i686.

Copy link
Copy Markdown
Contributor Author

@nezos nezos May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we have nocross, I was about to set:
archs="x86_64"
wouldn't this be correct?

Copy link
Copy Markdown
Contributor

@ar-jan ar-jan May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That seems the most readable version to me (though x86_64* for including musl)

Copy link
Copy Markdown
Member

@ahesford ahesford May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. We'll need to determine whether it can be built natively on aarch64.

Copy link
Copy Markdown
Member

@ahesford ahesford May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another option to preserve original intent would be to mark the template broken when $XBPS_TARGET_WORDSIZE is 32.

build_style=cmake
configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
-DBUILD_WITH_QT6=ON -DWITH_PDF4QT=ON -DWITH_QTWEBKIT=NO
Expand All @@ -20,8 +20,8 @@ makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
proj-devel protobuf-devel python3-devel python3-PyQt-builder
qt6-base-private-devel qt6-svg-devel qt6-position-devel qt6-qt5compat-devel
qt6-declarative-devel qt6-serialport-devel qt6-3d-devel
qt6-multimedia-devel
qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
qt6-multimedia-devel qt6-webengine qt6-webengine-devel libblend2d-devel
qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite OpenCL-CLHPP
qscintilla-qt6-devel qtkeychain-qt6-devel qca-qt6-devel qwt-qt6-devel
python3-pyqt6-bindings python3-pyqt6-qsci-devel python3-pyqt6-sip ${_pyqt}
python3-devel sqlite-devel zlib-devel libopenjpeg2-devel"
Expand All @@ -34,16 +34,10 @@ maintainer="Arjan Mossel <arjanmossel@gmail.com>"
license="GPL-2.0-only"
homepage="https://qgis.org"
distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
checksum=1396c84dd6c9c89c026de8b564319e0f6206c8bbc1b160bfdc0fdf49adb61748
checksum=1800a4ad63224821d4b391b87cc53cc8a53c8626193fde8235934c81223e617e
lib32disabled=yes
Comment thread
nezos marked this conversation as resolved.
nocross="due to grass"

post_configure() {
# No idea why the patch was removed on generated files
sed -i 's/[.]sip[.]in$/.sip/' ftbfs.patch
cd build
patch -Np1 -s -i ../ftbfs.patch
}

post_install() {
mv ${DESTDIR}/usr/share/qgis/python ${DESTDIR}/usr/lib/qgis/
ln -s ../../lib/qgis/python ${DESTDIR}/usr/share/qgis/python
Expand Down
Loading