diff options
| -rw-r--r-- | Mk/Uses/kde.mk | 3 | ||||
| -rw-r--r-- | Mk/bsd.gcc.mk | 4 | ||||
| -rw-r--r-- | databases/cego/Makefile | 2 | ||||
| -rw-r--r-- | databases/cego/distinfo | 6 | ||||
| -rw-r--r-- | devel/R-cran-pak/Makefile | 2 | ||||
| -rw-r--r-- | devel/R-cran-pak/distinfo | 6 | ||||
| -rw-r--r-- | devel/py-click-plugins/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/ffmpegthumbnailer/Makefile | 35 | ||||
| -rw-r--r-- | multimedia/ffmpegthumbnailer/distinfo | 8 | ||||
| -rw-r--r-- | multimedia/ffmpegthumbnailer/pkg-plist | 3 | ||||
| -rw-r--r-- | net-im/gomuks/Makefile | 30 | ||||
| -rw-r--r-- | net-im/gomuks/distinfo | 10 | ||||
| -rw-r--r-- | sysutils/openvox-agent8/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/openvox-agent8/files/patch-lib_puppet_util_monkey__patches.rb | 15 | ||||
| -rw-r--r-- | textproc/py-smile/Makefile | 2 | ||||
| -rw-r--r-- | textproc/py-smile/distinfo | 6 | ||||
| -rw-r--r-- | textproc/py-smile/pkg-plist | 1 | ||||
| -rw-r--r-- | www/py-fastapi-sso/Makefile | 2 | ||||
| -rw-r--r-- | www/py-fastapi-sso/distinfo | 6 | ||||
| -rw-r--r-- | x11-toolkits/qt6-declarative/Makefile | 1 | ||||
| -rw-r--r-- | x11-toolkits/qt6-declarative/files/patch-QTBUG-142331 | 229 | ||||
| -rw-r--r-- | x11/plasma6-plasma-desktop/Makefile | 10 |
22 files changed, 324 insertions, 61 deletions
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index 9072b81d1d13..b97470d23e8e 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -227,6 +227,9 @@ DIST_SUBDIR?= KDE/frameworks/${KDE_FRAMEWORKS_VERSION} DIST_SUBDIR= KDE/frameworks/${KDE_FRAMEWORKS_VERSION:R} DESCR= ${.CURDIR:H:H}/x11/kf6-frameworks/pkg-descr . endif +. if ${_KDE_VERSION:M5} +PORTSCOUT= limit:^5\. +. endif . else IGNORE?= unknown CATEGORY value '${_KDE_CATEGORY}' #' . endif diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk index d9abf9074757..c45d672dce05 100644 --- a/Mk/bsd.gcc.mk +++ b/Mk/bsd.gcc.mk @@ -22,10 +22,10 @@ # Examples: # USE_GCC= yes # port requires a current version of GCC # # as defined in bsd.default-versions.mk. -# USE_GCC= 12 # port requires GCC 12. +# USE_GCC= 13 # port requires GCC 13. # USE_GCC= yes:build # port requires a current version of GCC at # # build time only. -# USE_GCC= 12:build # port requires GCC 12 at build time only. +# USE_GCC= 13:build # port requires GCC 13 at build time only. # # If you are wondering what your port exactly does, use "make test-gcc" # to see some debugging. diff --git a/databases/cego/Makefile b/databases/cego/Makefile index 610ebe21321f..4837d3e572b5 100644 --- a/databases/cego/Makefile +++ b/databases/cego/Makefile @@ -1,5 +1,5 @@ PORTNAME= cego -PORTVERSION= 2.53.3 +PORTVERSION= 2.53.4 CATEGORIES= databases MASTER_SITES= http://www.lemke-it.com/ diff --git a/databases/cego/distinfo b/databases/cego/distinfo index d80d1e9ab581..0f9742807fda 100644 --- a/databases/cego/distinfo +++ b/databases/cego/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1765887376 -SHA256 (cego-2.53.3.tar.gz) = 0d72aa50fb61ec6b5368520330fa2f2124daeef8fbc35fd2c98f807de5a2bb98 -SIZE (cego-2.53.3.tar.gz) = 3322655 +TIMESTAMP = 1766471280 +SHA256 (cego-2.53.4.tar.gz) = 455f2c5f29eeb91ed1ce5385c7c0dacf8ea130a62e76b4b8a6392aba2d8afa7d +SIZE (cego-2.53.4.tar.gz) = 3322082 diff --git a/devel/R-cran-pak/Makefile b/devel/R-cran-pak/Makefile index a2e9ccf89dca..29a6fe20748c 100644 --- a/devel/R-cran-pak/Makefile +++ b/devel/R-cran-pak/Makefile @@ -1,5 +1,5 @@ PORTNAME= pak -DISTVERSION= 0.9.1 +DISTVERSION= 0.9.2 CATEGORIES= devel DISTNAME= ${PORTNAME}_${DISTVERSION} diff --git a/devel/R-cran-pak/distinfo b/devel/R-cran-pak/distinfo index 277e11e92c9c..4f9b1cacf29e 100644 --- a/devel/R-cran-pak/distinfo +++ b/devel/R-cran-pak/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1765807792 -SHA256 (pak_0.9.1.tar.gz) = 9f2422f52c507b82c37e7ab35327761e4faf1cde415e657502c470a043749ca1 -SIZE (pak_0.9.1.tar.gz) = 3324098 +TIMESTAMP = 1766468594 +SHA256 (pak_0.9.2.tar.gz) = 67315a4853787404c53134226075da92187c9942d6d1736fc9c967db6623a14b +SIZE (pak_0.9.2.tar.gz) = 3328805 diff --git a/devel/py-click-plugins/Makefile b/devel/py-click-plugins/Makefile index a6118a235e54..782b8b75701b 100644 --- a/devel/py-click-plugins/Makefile +++ b/devel/py-click-plugins/Makefile @@ -5,7 +5,7 @@ MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= ${PORTNAME:S/-/_/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} -MAINTAINER= ehaupt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Click extension to register CLI commands via setuptools WWW= https://pypi.org/project/click-plugins/ \ https://github.com/click-contrib/click-plugins diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile index cff34600230f..1e32b55f073c 100644 --- a/multimedia/ffmpegthumbnailer/Makefile +++ b/multimedia/ffmpegthumbnailer/Makefile @@ -1,11 +1,9 @@ PORTNAME= ffmpegthumbnailer -DISTVERSION= 2.2.3 +DISTVERSIONPREFIX= v +DISTVERSION= 2.3.0 CATEGORIES= multimedia graphics -PATCH_SITES= https://github.com/dirkvdb/ffmpegthumbnailer/commit/ -PATCHFILES= df789ec326ae0f2c619f91c8f2fc8b5e45b50a70.patch:-p1 - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= nxjoseph@protonmail.com COMMENT= Lightweight video thumbnailer that can be used by file managers WWW= https://github.com/dirkvdb/ffmpegthumbnailer @@ -15,27 +13,28 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libpng.so:graphics/png -USES= cmake:testing compiler:c++11-lib gnome jpeg localbase pathfix \ +USES= cmake:testing compiler:c++14-lang gnome jpeg localbase \ pkgconfig tar:bz2 -USE_GNOME= glib20 -USE_LDCONFIG= yes - +USE_CXXSTD= c++14 USE_GITHUB= yes GH_ACCOUNT= dirkvdb +USE_GNOME= glib20 +USE_LDCONFIG= yes -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar - +CMAKE_ON= ENABLE_GIO +CMAKE_OFF= ENABLE_TESTS CMAKE_TESTING_ON= ENABLE_TESTS -CMAKE_OFF= ENABLE_TESTS -CMAKE_ON= ENABLE_GIO +EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar -OPTIONS_DEFINE= THUMBNAILER -OPTIONS_DEFAULT=THUMBNAILER -OPTIONS_SUB= yes +OPTIONS_DEFINE= AUDIO_THUMBNAILER THUMBNAILER +OPTIONS_DEFAULT= AUDIO_THUMBNAILER THUMBNAILER +OPTIONS_SUB= yes -THUMBNAILER_DESC= Register as a system thumbnailer +AUDIO_THUMBNAILER_DESC= Register as a system thumbnailer for audio files +THUMBNAILER_DESC= Register as a system thumbnailer for video files -THUMBNAILER_CMAKE_BOOL= ENABLE_THUMBNAILER +AUDIO_THUMBNAILER_CMAKE_BOOL= ENABLE_AUDIO_THUMBNAILER +THUMBNAILER_CMAKE_BOOL= ENABLE_THUMBNAILER .include <bsd.port.mk> diff --git a/multimedia/ffmpegthumbnailer/distinfo b/multimedia/ffmpegthumbnailer/distinfo index bf651574e3f6..a05f0a3b95b0 100644 --- a/multimedia/ffmpegthumbnailer/distinfo +++ b/multimedia/ffmpegthumbnailer/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1758387041 -SHA256 (dirkvdb-ffmpegthumbnailer-2.2.3_GH0.tar.gz) = 8c9b9057c6cc8bce9d11701af224c8139c940f734c439a595525e073b09d19b8 -SIZE (dirkvdb-ffmpegthumbnailer-2.2.3_GH0.tar.gz) = 1291942 -SHA256 (df789ec326ae0f2c619f91c8f2fc8b5e45b50a70.patch) = b144efb0e8d914e1950e8a16299c532d59819768ffcb1ec152f72abf0d3a65fb -SIZE (df789ec326ae0f2c619f91c8f2fc8b5e45b50a70.patch) = 2591 +TIMESTAMP = 1766340673 +SHA256 (dirkvdb-ffmpegthumbnailer-v2.3.0_GH0.tar.gz) = ddf561e294385f07d0bd5a28d0aab9de79b8dbaed29b576f206d58f3df79b508 +SIZE (dirkvdb-ffmpegthumbnailer-v2.3.0_GH0.tar.gz) = 1296565 diff --git a/multimedia/ffmpegthumbnailer/pkg-plist b/multimedia/ffmpegthumbnailer/pkg-plist index be2ce5d1b341..6e2ac277caab 100644 --- a/multimedia/ffmpegthumbnailer/pkg-plist +++ b/multimedia/ffmpegthumbnailer/pkg-plist @@ -8,7 +8,8 @@ include/libffmpegthumbnailer/videothumbnailer.h include/libffmpegthumbnailer/videothumbnailerc.h lib/libffmpegthumbnailer.so lib/libffmpegthumbnailer.so.4 -lib/libffmpegthumbnailer.so.4.15.1 +lib/libffmpegthumbnailer.so.4.16.1 libdata/pkgconfig/libffmpegthumbnailer.pc share/man/man1/ffmpegthumbnailer.1.gz +%%AUDIO_THUMBNAILER%%share/thumbnailers/ffmpegthumbnailer-audio.thumbnailer %%THUMBNAILER%%share/thumbnailers/ffmpegthumbnailer.thumbnailer diff --git a/net-im/gomuks/Makefile b/net-im/gomuks/Makefile index bf9444a5dbd2..43096c82b72a 100644 --- a/net-im/gomuks/Makefile +++ b/net-im/gomuks/Makefile @@ -1,22 +1,38 @@ PORTNAME= gomuks -DISTVERSIONPREFIX= v -DISTVERSION= 0.3.1 -PORTREVISION= 12 +DISTVERSION= 25.12 CATEGORIES= net-im -MAINTAINER= ehaupt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Terminal Matrix client written in Go -WWW= https://github.com/tulir/gomuks +WWW= https://github.com/gomuks/gomuks LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libolm.so:security/olm +RUN_DEPENDS= ffmpeg:multimedia/ffmpeg -USES= go:modules +USES= go:1.25,modules -GO_MODULE= github.com/tulir/gomuks +GO_MODULE_VER= 0.${DISTVERSION:C/\.//}.0 +GO_MODULE= go.mau.fi/gomuks@v${GO_MODULE_VER} + +MAKE_ENV+= BINARY_NAME=${PORTNAME} \ + CGO_CFLAGS="-I${LOCALBASE}/include" \ + CGO_ENABLED=1 \ + CGO_LDFLAGS="-L${LOCALBASE}/lib" \ + MAU_VERSION_PACKAGE=${GO_MODNAME}/version PLIST_FILES= bin/gomuks +pre-build: + ${MKDIR} ${WRKSRC}/web/dist/ + ${TOUCH} ${WRKSRC}/web/dist/empty + +do-build: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO_CMD} tool maubuild + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + .include <bsd.port.mk> diff --git a/net-im/gomuks/distinfo b/net-im/gomuks/distinfo index f2227a194669..844f9f067c2e 100644 --- a/net-im/gomuks/distinfo +++ b/net-im/gomuks/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1721206088 -SHA256 (go/net-im_gomuks/gomuks-v0.3.1/v0.3.1.mod) = c35cf5ab17243fd22a91bc09a224c0885faf09032ad30698f80a2b11bd0dc0ff -SIZE (go/net-im_gomuks/gomuks-v0.3.1/v0.3.1.mod) = 1818 -SHA256 (go/net-im_gomuks/gomuks-v0.3.1/v0.3.1.zip) = 79285eec9a7f7c47d969a0fc6c7d67d1649715e36314fa0d3296c375910042b1 -SIZE (go/net-im_gomuks/gomuks-v0.3.1/v0.3.1.zip) = 353975 +TIMESTAMP = 1766154981 +SHA256 (go/net-im_gomuks/gomuks-25.12/v0.2512.0.mod) = c4c4852d4c244fceb4f8ae37da2dac73e06b398c7deef44929f8cefae2934f4e +SIZE (go/net-im_gomuks/gomuks-25.12/v0.2512.0.mod) = 2159 +SHA256 (go/net-im_gomuks/gomuks-25.12/v0.2512.0.zip) = 6c54448a524344ccd31541a801dd37e76c4892c740d46944556fbf6bf4e6b953 +SIZE (go/net-im_gomuks/gomuks-25.12/v0.2512.0.zip) = 1901569 diff --git a/sysutils/openvox-agent8/Makefile b/sysutils/openvox-agent8/Makefile index 8cc1bfc51a36..a76ba5328c4f 100644 --- a/sysutils/openvox-agent8/Makefile +++ b/sysutils/openvox-agent8/Makefile @@ -1,6 +1,6 @@ PORTNAME= openvox-agent PORTVERSION= 8.22.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= https://forge.puppet.com/v3/files/:forge PKGNAMESUFFIX= 8 diff --git a/sysutils/openvox-agent8/files/patch-lib_puppet_util_monkey__patches.rb b/sysutils/openvox-agent8/files/patch-lib_puppet_util_monkey__patches.rb new file mode 100644 index 000000000000..3099539ec99f --- /dev/null +++ b/sysutils/openvox-agent8/files/patch-lib_puppet_util_monkey__patches.rb @@ -0,0 +1,15 @@ +--- lib/puppet/util/monkey_patches.rb.orig 2025-12-22 21:26:30 UTC ++++ lib/puppet/util/monkey_patches.rb +@@ -52,12 +52,6 @@ unless Puppet::Util::Platform.jruby_fips? + require_relative '../../puppet/ssl/openssl_loader' + unless Puppet::Util::Platform.jruby_fips? + class OpenSSL::SSL::SSLContext +- if DEFAULT_PARAMS[:options] +- DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_SSLv3 +- else +- DEFAULT_PARAMS[:options] = OpenSSL::SSL::OP_NO_SSLv3 +- end +- + alias __original_initialize initialize + private :__original_initialize + diff --git a/textproc/py-smile/Makefile b/textproc/py-smile/Makefile index 246e7426a171..e1305b081226 100644 --- a/textproc/py-smile/Makefile +++ b/textproc/py-smile/Makefile @@ -1,5 +1,5 @@ PORTNAME= smile -DISTVERSION= 2.10.2 +DISTVERSION= 2.11.0 CATEGORIES= textproc python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-smile/distinfo b/textproc/py-smile/distinfo index 15023ea0b2d4..e43a8c64d2f7 100644 --- a/textproc/py-smile/distinfo +++ b/textproc/py-smile/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1757832551 -SHA256 (mijorus-smile-2.10.2_GH0.tar.gz) = 9edd8e54653e43b6a7eb7fc44721ce918a615082594bdff5204756e35d0c7512 -SIZE (mijorus-smile-2.10.2_GH0.tar.gz) = 2200972 +TIMESTAMP = 1766477216 +SHA256 (mijorus-smile-2.11.0_GH0.tar.gz) = a4e85c3af5783789498b1bf84211747a08299441305ac97d0210a754a55bd11e +SIZE (mijorus-smile-2.11.0_GH0.tar.gz) = 2216824 diff --git a/textproc/py-smile/pkg-plist b/textproc/py-smile/pkg-plist index fa4cb9b250da..71d92d40ce95 100644 --- a/textproc/py-smile/pkg-plist +++ b/textproc/py-smile/pkg-plist @@ -10,6 +10,7 @@ share/icons/hicolor/scalable/actions/checkmark-symbolic.svg share/icons/hicolor/scalable/actions/driving-symbolic.svg share/icons/hicolor/scalable/actions/flag-filled-symbolic.svg share/icons/hicolor/scalable/actions/history-undo-symbolic.svg +share/icons/hicolor/scalable/actions/horizontal-arrows-none-symbolic.svg share/icons/hicolor/scalable/actions/input-keyboard-numlock-symbolic.svg share/icons/hicolor/scalable/actions/it.mijorus.smile.crazy.svg share/icons/hicolor/scalable/actions/lightbulb-symbolic.svg diff --git a/www/py-fastapi-sso/Makefile b/www/py-fastapi-sso/Makefile index ad279b151b40..468240ee5e37 100644 --- a/www/py-fastapi-sso/Makefile +++ b/www/py-fastapi-sso/Makefile @@ -1,5 +1,5 @@ PORTNAME= fastapi-sso -DISTVERSION= 0.18.0 +DISTVERSION= 0.19.0 CATEGORIES= www python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-fastapi-sso/distinfo b/www/py-fastapi-sso/distinfo index 8257cc9f32e0..e738d365583f 100644 --- a/www/py-fastapi-sso/distinfo +++ b/www/py-fastapi-sso/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1757574194 -SHA256 (fastapi_sso-0.18.0.tar.gz) = d8df5a686af7a6a7be248817544b405cf77f7e9ffcd5d0d7d2a196fd071964bc -SIZE (fastapi_sso-0.18.0.tar.gz) = 16811 +TIMESTAMP = 1766460325 +SHA256 (fastapi_sso-0.19.0.tar.gz) = 629f00581f72ea7e57f7b8775f8d2c425629c428c194359a2b4ebaa6bcb8e12b +SIZE (fastapi_sso-0.19.0.tar.gz) = 17278 diff --git a/x11-toolkits/qt6-declarative/Makefile b/x11-toolkits/qt6-declarative/Makefile index bb9432d6a2fc..7c94487156b3 100644 --- a/x11-toolkits/qt6-declarative/Makefile +++ b/x11-toolkits/qt6-declarative/Makefile @@ -1,5 +1,6 @@ PORTNAME= declarative DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt6- diff --git a/x11-toolkits/qt6-declarative/files/patch-QTBUG-142331 b/x11-toolkits/qt6-declarative/files/patch-QTBUG-142331 new file mode 100644 index 000000000000..2e031cca4397 --- /dev/null +++ b/x11-toolkits/qt6-declarative/files/patch-QTBUG-142331 @@ -0,0 +1,229 @@ +From 9c6b2b78e9076f1c2676aa0c41573db9ca480654 Mon Sep 17 00:00:00 2001 +From: Ulf Hermann <ulf.hermann@qt.io> +Date: Tue, 02 Dec 2025 17:42:30 +0100 +Subject: [PATCH] QtQml: Invalidate fallback lookups after each call from AOT code + +Fallback property lookups are created for completely dynamic +metaobjects. Anything about them may change between any two calls. + +Pick-to: 6.8 6.5 +Fixes: QTBUG-142331 +Change-Id: Ib732c37a6f27ab8105bea0eeae000af7eb9c36d7 +Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> +(cherry picked from commit 9af6d2d6d0046b3c8369e15eb4791957cdc7ab7b) +Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> +--- + +--- src/qml/jsruntime/qv4lookup_p.h ++++ src/qml/jsruntime/qv4lookup_p.h +@@ -159,6 +159,10 @@ + const QQmlPropertyData *propertyData; + } qobjectMethodLookup; + struct { ++ // NB: None of this is actually cache-able. The metaobject may change at any time. ++ // We invalidate this data every time the lookup is invoked and thereby force a ++ // re-initialization next time. ++ + quintptr isConstant; // This is a bool, encoded as 0 or 1. Both values are ignored by gc + quintptr metaObject; // a (const QMetaObject* & 1) or nullptr + int coreIndex; +--- src/qml/qml/qqml.cpp ++++ src/qml/qml/qqml.cpp +@@ -1386,16 +1386,16 @@ + + static FallbackPropertyQmlData findFallbackPropertyQmlData(QV4::Lookup *lookup, QObject *object) + { +- QQmlData *qmlData = QQmlData::get(object); +- if (qmlData && qmlData->isQueuedForDeletion) +- return {qmlData, nullptr, PropertyResult::Deleted}; ++ // We've just initialized the lookup. So everything must be fine here. + ++ QQmlData *qmlData = QQmlData::get(object); ++ ++ Q_ASSERT(!qmlData || !qmlData->isQueuedForDeletion); + Q_ASSERT(!QQmlData::wasDeleted(object)); + + const QMetaObject *metaObject + = reinterpret_cast<const QMetaObject *>(lookup->qobjectFallbackLookup.metaObject - 1); +- if (!metaObject || metaObject != object->metaObject()) +- return {qmlData, nullptr, PropertyResult::NeedsInit}; ++ Q_ASSERT(metaObject == object->metaObject()); + + return {qmlData, metaObject, PropertyResult::OK}; + } +@@ -2585,6 +2585,7 @@ + break; + case QV4::Lookup::Call::ContextGetterScopeObjectPropertyFallback: + result = loadFallbackProperty(lookup, qmlScopeObject, target, this); ++ lookup->call = QV4::Lookup::Call::ContextGetterGeneric; + break; + default: + return false; +@@ -2616,6 +2617,7 @@ + break; + case QV4::Lookup::Call::ContextGetterScopeObjectPropertyFallback: + result = writeBackFallbackProperty(lookup, qmlScopeObject, source); ++ lookup->call = QV4::Lookup::Call::ContextGetterGeneric; + break; + default: + return false; +@@ -2816,6 +2818,7 @@ + result = lookup->asVariant + ? loadFallbackAsVariant(lookup, object, target, this) + : loadFallbackProperty(lookup, object, target, this); ++ lookup->call = QV4::Lookup::Call::GetterGeneric; + break; + default: + return false; +@@ -2850,6 +2853,7 @@ + result = lookup->asVariant + ? writeBackFallbackAsVariant(lookup, object, source) + : writeBackFallbackProperty(lookup, object, source); ++ lookup->call = QV4::Lookup::Call::GetterGeneric; + break; + default: + return false; +@@ -3010,6 +3014,7 @@ + result = lookup->asVariant + ? storeFallbackAsVariant(engine->handle(), lookup, object, value) + : storeFallbackProperty(lookup, object, value); ++ lookup->call = QV4::Lookup::Call::SetterGeneric; + break; + default: + return false; +--- tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt ++++ tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt +@@ -26,6 +26,7 @@ + multiforeign.h + objectwithmethod.h + person.cpp person.h ++ propertymap.h + qmlusing.h + recursiveObject.h + refuseWrite.h +@@ -282,6 +283,7 @@ + popContextAfterRet.qml + prefixedMetaType.qml + pressAndHoldButton.qml ++ propertyMap.qml + qmlUsing.qml + qtbug113150.qml + qtfont.qml +--- /dev/null ++++ tests/auto/qml/qmlcppcodegen/data/propertyMap.qml +@@ -0,0 +1,6 @@ ++pragma Strict ++import TestTypes ++ ++WithPropertyMap { ++ objectName: map.foo ++} +--- /dev/null ++++ tests/auto/qml/qmlcppcodegen/data/propertymap.h +@@ -0,0 +1,40 @@ ++// Copyright (C) 2025 The Qt Company Ltd. ++// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only ++ ++#ifndef PROPERTYMAP_H ++#define PROPERTYMAP_H ++ ++#include <QtCore/qobject.h> ++#include <QtQml/qqml.h> ++#include <QtQml/qqmlpropertymap.h> ++ ++class WithPropertyMap : public QObject ++{ ++ Q_OBJECT ++ QML_ELEMENT ++ Q_PROPERTY(QQmlPropertyMap *map READ map NOTIFY mapChanged) ++public: ++ WithPropertyMap(QObject *parent = nullptr) ++ : QObject(parent) ++ , m_map(new QQmlPropertyMap(this)) ++ { ++ } ++ ++ QQmlPropertyMap *map() const { return m_map; } ++ ++ void setProperties(const QVariantHash &properties) ++ { ++ delete m_map; ++ m_map = new QQmlPropertyMap(this); ++ m_map->insert(properties); ++ emit mapChanged(); ++ } ++ ++signals: ++ void mapChanged(); ++ ++private: ++ QQmlPropertyMap *m_map = nullptr; ++}; ++ ++#endif // PROPERTYMAP_H +--- tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp ++++ tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp +@@ -10,6 +10,7 @@ + #include <data/getOptionalLookup.h> + #include <data/listprovider.h> + #include <data/objectwithmethod.h> ++#include <data/propertymap.h> + #include <data/qmlusing.h> + #include <data/refuseWrite.h> + #include <data/resettable.h> +@@ -237,6 +238,7 @@ + void parentProperty(); + void popContextAfterRet(); + void prefixedType(); ++ void propertyMap(); + void propertyOfParent(); + void qmlUsing(); + void qtfont(); +@@ -4908,6 +4910,47 @@ + QCOMPARE(o->property("countH").toInt(), 11); + } + ++void tst_QmlCppCodegen::propertyMap() ++{ ++ QQmlEngine engine; ++ ++ const QUrl document(u"qrc:/qt/qml/TestTypes/propertyMap.qml"_s); ++ QQmlComponent c(&engine, document); ++ QVERIFY2(c.isReady(), qPrintable(c.errorString())); ++ ++ QTest::ignoreMessage( ++ QtWarningMsg, qPrintable( ++ document.toString() ++ + u":5:5: QML WithPropertyMap: Unable to assign [undefined] to \"objectName\"")); ++ ++ QScopedPointer<QObject> o(c.create()); ++ QVERIFY(o); ++ ++ WithPropertyMap *w = qobject_cast<WithPropertyMap *>(o.data()); ++ QVERIFY(w); ++ ++ QVERIFY(w->objectName().isEmpty()); ++ ++ w->setProperties({ ++ { u"foo"_s, u"aaa"_s }, ++ { u"bar"_s, u"bbb"_s }, ++ }); ++ ++ QCOMPARE(w->objectName(), u"aaa"_s); ++ ++ w->setProperties({ ++ { u"foo"_s, u"ccc"_s }, ++ }); ++ ++ QCOMPARE(w->objectName(), u"ccc"_s); ++ ++ w->setProperties({ ++ { u"foo"_s, 24.25 }, ++ }); ++ ++ QCOMPARE(w->objectName(), u"24.25"_s); ++} ++ + void tst_QmlCppCodegen::propertyOfParent() + { + QQmlEngine engine; diff --git a/x11/plasma6-plasma-desktop/Makefile b/x11/plasma6-plasma-desktop/Makefile index c73d347f819e..a2069448ae1f 100644 --- a/x11/plasma6-plasma-desktop/Makefile +++ b/x11/plasma6-plasma-desktop/Makefile @@ -6,7 +6,6 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE Plasma Desktop BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols \ - xf86-input-evdev>0:x11-drivers/xf86-input-evdev \ xf86-input-libinput>0:x11-drivers/xf86-input-libinput \ libinput>0:x11/libinput LIB_DEPENDS= libcanberra.so:audio/libcanberra \ @@ -19,9 +18,7 @@ LIB_DEPENDS= libcanberra.so:audio/libcanberra \ libxkbcommon.so:x11/libxkbcommon \ libxkbfile.so:x11/libxkbfile RUN_DEPENDS= noto-emoji>0:x11-fonts/noto-emoji \ - xdg-user-dir:devel/xdg-user-dirs \ - xf86-input-evdev>0:x11-drivers/xf86-input-evdev \ - xf86-input-libinput>0:x11-drivers/xf86-input-libinput + xdg-user-dir:devel/xdg-user-dirs USES= cmake gettext gl gnome kde:6 pkgconfig python qt:6 tar:xz xorg USE_GL= gl opengl @@ -39,7 +36,8 @@ USE_KDE= activities activities-stats attica auth baloo bookmarks \ USE_QT= 5compat base declarative svg wayland USE_XORG= x11 xcb xcursor xext xfixes xi xrender -OPTIONS_DEFINE= SDL +OPTIONS_DEFINE= SDL X11 +OPTIONS_DEFAULT= X11 OPTIONS_GROUP= IM IM_DESC= Input Method Support OPTIONS_GROUP_IM= IBUS SCIM @@ -58,4 +56,6 @@ SDL_USES= sdl SDL_USE= sdl=sdl2 SDL_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_SDL2 +X11_RUN_DEPENDS= xf86-input-libinput>0:x11-drivers/xf86-input-libinput + .include <bsd.port.mk> |
