From: Rafael Sadowski Subject: x11/qt5: Qt 5.15.18 + KDE patches To: ports@openbsd.org Date: Tue, 4 Nov 2025 12:43:59 +0100 The kde patchset collection has been rebased on top of qt 5.15.18. I decided to switch all ports to use the KDE "kde/5.15" branch (with a few exceptions where it does not exist because there are no patches) The good news is that QTWebEngine is now also at 5.15.18. (based on chromium version: 87.0.4280.144, patched with security patches up to: 130.0.6723.59) Feedback and review welcome. diff --git a/x11/qt5/makefile.inc b/x11/qt5/makefile.inc index 0609e0107a2..fec08642773 100644 --- a/x11/qt5/makefile.inc +++ b/x11/qt5/makefile.inc @@ -47,8 +47,8 @@ permit_package ?= yes .if defined(kde_version) && defined(kde_commit) dist_tuple += kde qt qt/${qt5name:l} ${kde_commit} . .else -sites ?= https://download.qt.io/official_releases/qt/${version:r}/${version}/submodules/ \ - https://mirrors.ocf.berkeley.edu/qt/official_releases/qt/${version:r}/${version}/submodules/ \ +sites ?= https://download.qt.io/archive/qt/${version:r}/${version}/submodules/ \ + https://mirrors.ocf.berkeley.edu/qt/archive/qt/${version:r}/${version}/submodules/ \ https://download.qt.io/archive/qt/${version:r}/${version}/submodules/ .endif diff --git a/x11/qt5/makefile.version b/x11/qt5/makefile.version index ff385165274..8b294d4976f 100644 --- a/x11/qt5/makefile.version +++ b/x11/qt5/makefile.version @@ -1,7 +1,6 @@ # common source for qt5 version -qt5_version ?= 5.15.16 -qt5_webengine_version = 5.15.17 +qt5_version ?= 5.15.18 # this one is used for building dependencies for examples and documentation, # which obviously should be in sync with core packages. diff --git a/x11/qt5/docs/makefile b/x11/qt5/docs/makefile index cfbf8036114..ebd8f3f3da5 100644 --- a/x11/qt5/docs/makefile +++ b/x11/qt5/docs/makefile @@ -1,12 +1,13 @@ comment-html = html documentation for qt5 comment-qch = qdoc-compiled documentation for qt5 +#kde_commit = ddb2afda6f713259fc8d95fb22a1c96bb448c36a +#kde_version = 0 + pkgname = qt5-docs-${qt5_version} pkgname-html = qt5-html-${qt5_version} pkgname-qch = qt5-qch-${qt5_version} -revision-html = 0 - multi_packages = -html -qch subpackage ?= -html diff --git a/x11/qt5/docs/distinfo b/x11/qt5/docs/distinfo index ec71d14852d..e015bd672ff 100644 --- a/x11/qt5/docs/distinfo +++ b/x11/qt5/docs/distinfo @@ -1,46 +1,46 @@ -sha256 (qt/qt3d-everywhere-opensource-src-5.15.16.tar.xz) = kyzwg4iirbnprsxpf27koc2k+o5kbcrqxw1kxxzzc9s= -sha256 (qt/qtcharts-everywhere-opensource-src-5.15.16.tar.xz) = j7ql7thge9jt9pvhgkcg5o5eo9jk3+qwqqo+evnkuoe= -sha256 (qt/qtdoc-everywhere-opensource-src-5.15.16.tar.xz) = 0itthqksik1akti7mg7vzfkcdks23gfdmyobgtk5wxe= -sha256 (qt/qtgamepad-everywhere-opensource-src-5.15.16.tar.xz) = sypaqnetkoab/mkpwv60cu65tlt2qobbly3ml50uvya= -sha256 (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.16.tar.xz) = 0ywbnzfzg1lygzpawpjdrkgve/6+n6uikkczpwmfzao= -sha256 (qt/qtimageformats-everywhere-opensource-src-5.15.16.tar.xz) = 5whekafrlvblev0a3y0kzhl91iyyfgirecssxsydgoi= -sha256 (qt/qtlocation-everywhere-opensource-src-5.15.16.tar.xz) = mwycmz66tnpqrgseaut7e5yeyfpgscbccrsh3mm2xic= -sha256 (qt/qtmultimedia-everywhere-opensource-src-5.15.16.tar.xz) = ykhohkvkbkbexy8vmkfffmo4tlwhmktg1s5jmoj0fzq= -sha256 (qt/qtnetworkauth-everywhere-opensource-src-5.15.16.tar.xz) = v6bbinmxuf+mfsxqbr7mghzlgcy8smppanupsoavsvc= -sha256 (qt/qtpurchasing-everywhere-opensource-src-5.15.16.tar.xz) = jbvfuj2es3j6qeo7eticzvlk1+zvyziywtj+sldtt34= -sha256 (qt/qtremoteobjects-everywhere-opensource-src-5.15.16.tar.xz) = wn7d1wqapr5jiug+zbnmz+jkd+blwwm5jun2gc1rbvg= -sha256 (qt/qtscript-everywhere-opensource-src-5.15.16.tar.xz) = c5i6pu7ofq54yfkn1n+vrsszcw9i8z0wvw/tisi27si= -sha256 (qt/qtscxml-everywhere-opensource-src-5.15.16.tar.xz) = ynqrb36l/t4ujbod/qntuh/3qbivvznu87coz4i783g= -sha256 (qt/qtsensors-everywhere-opensource-src-5.15.16.tar.xz) = zvzdjf2dae+aswzczhvi61wpg+cz9imnaow+ppkfqbi= -sha256 (qt/qtserialbus-everywhere-opensource-src-5.15.16.tar.xz) = jwahrzz1mu1wpnw4rojclk5pypkaqwqogyoa1j4o6ry= -sha256 (qt/qtserialport-everywhere-opensource-src-5.15.16.tar.xz) = 4tlxj3roccpp/gv2ixjolz14j6joe+l3nvwmxkkvtrw= -sha256 (qt/qtspeech-everywhere-opensource-src-5.15.16.tar.xz) = uzfa7o8wv+xfezdhggaag2crskgg57z0r6ja55asx9y= -sha256 (qt/qtsvg-everywhere-opensource-src-5.15.16.tar.xz) = ze4yais8kilcbluikexomuazrt6rjadargzbpicqc8e= -sha256 (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.16.tar.xz) = ea5nbkxtpimui89etzex04jf+mphlat67ekvok6xlx8= -sha256 (qt/qtwebchannel-everywhere-opensource-src-5.15.16.tar.xz) = 4xkwy5igpf+kbouyjlwbd8hwptkk0ggjwcthbkmhqxa= -sha256 (qt/qtwebsockets-everywhere-opensource-src-5.15.16.tar.xz) = b7dca7x13+1parbortjw4mszyhaxjt4+mrclhgunfm4= -sha256 (qt/qtx11extras-everywhere-opensource-src-5.15.16.tar.xz) = uhkb8yr622sbk2/8thh4lcofeln59heppudley+k4ri= -sha256 (qt/qtxmlpatterns-everywhere-opensource-src-5.15.16.tar.xz) = hiuxi/dxgll+7ocm/gjhwlabd9fl023k4y4ebxxyeua= -size (qt/qt3d-everywhere-opensource-src-5.15.16.tar.xz) = 118265056 -size (qt/qtcharts-everywhere-opensource-src-5.15.16.tar.xz) = 4246260 -size (qt/qtdoc-everywhere-opensource-src-5.15.16.tar.xz) = 5779544 -size (qt/qtgamepad-everywhere-opensource-src-5.15.16.tar.xz) = 380928 -size (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.16.tar.xz) = 14034764 -size (qt/qtimageformats-everywhere-opensource-src-5.15.16.tar.xz) = 1889480 -size (qt/qtlocation-everywhere-opensource-src-5.15.16.tar.xz) = 6548480 -size (qt/qtmultimedia-everywhere-opensource-src-5.15.16.tar.xz) = 3824912 -size (qt/qtnetworkauth-everywhere-opensource-src-5.15.16.tar.xz) = 135600 -size (qt/qtpurchasing-everywhere-opensource-src-5.15.16.tar.xz) = 300916 -size (qt/qtremoteobjects-everywhere-opensource-src-5.15.16.tar.xz) = 370484 -size (qt/qtscript-everywhere-opensource-src-5.15.16.tar.xz) = 2656892 -size (qt/qtscxml-everywhere-opensource-src-5.15.16.tar.xz) = 429268 -size (qt/qtsensors-everywhere-opensource-src-5.15.16.tar.xz) = 2051048 -size (qt/qtserialbus-everywhere-opensource-src-5.15.16.tar.xz) = 350832 -size (qt/qtserialport-everywhere-opensource-src-5.15.16.tar.xz) = 314732 -size (qt/qtspeech-everywhere-opensource-src-5.15.16.tar.xz) = 95716 -size (qt/qtsvg-everywhere-opensource-src-5.15.16.tar.xz) = 1881028 -size (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.16.tar.xz) = 10951872 -size (qt/qtwebchannel-everywhere-opensource-src-5.15.16.tar.xz) = 203080 -size (qt/qtwebsockets-everywhere-opensource-src-5.15.16.tar.xz) = 253084 -size (qt/qtx11extras-everywhere-opensource-src-5.15.16.tar.xz) = 137856 -size (qt/qtxmlpatterns-everywhere-opensource-src-5.15.16.tar.xz) = 5181984 +sha256 (qt/qt3d-everywhere-opensource-src-5.15.18.tar.xz) = zcqzznofj1n9k3zqcrqpg478ix+ercqcwctqlo3hs6m= +sha256 (qt/qtcharts-everywhere-opensource-src-5.15.18.tar.xz) = akit3kcdgrxhp8vslxlves+xmxqs3larwpzi87ezjlu= +sha256 (qt/qtdoc-everywhere-opensource-src-5.15.18.tar.xz) = wjnawgwdfn0/zsdytzsiyauvsctn2tl1ogi4vem/uxi= +sha256 (qt/qtgamepad-everywhere-opensource-src-5.15.18.tar.xz) = f1z2mlfiggdveos60nrj7xvcwlzlndemk3rvb1a1v5k= +sha256 (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.18.tar.xz) = 2+/kwq7x0fhhndlvdyj3pmfkzcoocaosxkp/ovbwmiu= +sha256 (qt/qtimageformats-everywhere-opensource-src-5.15.18.tar.xz) = v4yacighka96iq8s3zoq5z53gwllo1piatjzrvs5wgy= +sha256 (qt/qtlocation-everywhere-opensource-src-5.15.18.tar.xz) = 6i7vkwhzif440of5ca2kee1hb9ynjttfwkelm+wywjw= +sha256 (qt/qtmultimedia-everywhere-opensource-src-5.15.18.tar.xz) = thf7yb0q/f/kphsfkaipadd4w7sozzs9o55/rs0rw4w= +sha256 (qt/qtnetworkauth-everywhere-opensource-src-5.15.18.tar.xz) = atmipiu2h38mwtlzuhtbjlfwsyuunurxh3ylsntvniy= +sha256 (qt/qtpurchasing-everywhere-opensource-src-5.15.18.tar.xz) = u0cp4giytj8krhiekngihnbj2rbamusnofephdjohdk= +sha256 (qt/qtremoteobjects-everywhere-opensource-src-5.15.18.tar.xz) = zrqvohqkuxlziz2ilr3fcojz/cvvkzif2g9tnc+2svy= +sha256 (qt/qtscript-everywhere-opensource-src-5.15.18.tar.xz) = zxbsh40hrve/efd7evndfanyudo90gho+std6gd6gcg= +sha256 (qt/qtscxml-everywhere-opensource-src-5.15.18.tar.xz) = cojewgzeom+jwwktgwxg+nxlfpim8evzhq9wlorgzzg= +sha256 (qt/qtsensors-everywhere-opensource-src-5.15.18.tar.xz) = yasdaulbyzy+cbtc0yzxj06mmrebcscv2ugruc03iea= +sha256 (qt/qtserialbus-everywhere-opensource-src-5.15.18.tar.xz) = qwmp0oobs9+u0cu4h+rmz6n06x5a67tjdbjqcbz1/eg= +sha256 (qt/qtserialport-everywhere-opensource-src-5.15.18.tar.xz) = iicznw5fqs0/usxrypdyt2jmfzlek7whxxnenc7zpy8= +sha256 (qt/qtspeech-everywhere-opensource-src-5.15.18.tar.xz) = chibdbjrp3stm1sfushudk+zeifm+jd/t4uoey30fte= +sha256 (qt/qtsvg-everywhere-opensource-src-5.15.18.tar.xz) = 9a2i/3kleq81afy7bfn7e4nzetw5qtru/tciv1lniek= +sha256 (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.18.tar.xz) = rdvyzamwudx8q642x0hv2p7eue9vpf5mzfh8q5oq/gw= +sha256 (qt/qtwebchannel-everywhere-opensource-src-5.15.18.tar.xz) = gnbadhc+fe2cjrnw1tmwjumdb9mren0incm4s+0pfc8= +sha256 (qt/qtwebsockets-everywhere-opensource-src-5.15.18.tar.xz) = jpwt1kzatdcxxqipc2vhxfzssvkvs7jg5rktq+g+xha= +sha256 (qt/qtx11extras-everywhere-opensource-src-5.15.18.tar.xz) = mecr6pwfkjo7xbajq2f50jvpysh1vwzmqki0wvdwmrc= +sha256 (qt/qtxmlpatterns-everywhere-opensource-src-5.15.18.tar.xz) = tp+5h6rnew6quxqt06ayqp0bzg30afykztlnqf/pjym= +size (qt/qt3d-everywhere-opensource-src-5.15.18.tar.xz) = 118255028 +size (qt/qtcharts-everywhere-opensource-src-5.15.18.tar.xz) = 4232420 +size (qt/qtdoc-everywhere-opensource-src-5.15.18.tar.xz) = 5766900 +size (qt/qtgamepad-everywhere-opensource-src-5.15.18.tar.xz) = 366792 +size (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.18.tar.xz) = 14021560 +size (qt/qtimageformats-everywhere-opensource-src-5.15.18.tar.xz) = 1903016 +size (qt/qtlocation-everywhere-opensource-src-5.15.18.tar.xz) = 6534556 +size (qt/qtmultimedia-everywhere-opensource-src-5.15.18.tar.xz) = 3810252 +size (qt/qtnetworkauth-everywhere-opensource-src-5.15.18.tar.xz) = 121828 +size (qt/qtpurchasing-everywhere-opensource-src-5.15.18.tar.xz) = 501352 +size (qt/qtremoteobjects-everywhere-opensource-src-5.15.18.tar.xz) = 356972 +size (qt/qtscript-everywhere-opensource-src-5.15.18.tar.xz) = 2644892 +size (qt/qtscxml-everywhere-opensource-src-5.15.18.tar.xz) = 415812 +size (qt/qtsensors-everywhere-opensource-src-5.15.18.tar.xz) = 2037808 +size (qt/qtserialbus-everywhere-opensource-src-5.15.18.tar.xz) = 337096 +size (qt/qtserialport-everywhere-opensource-src-5.15.18.tar.xz) = 301032 +size (qt/qtspeech-everywhere-opensource-src-5.15.18.tar.xz) = 81340 +size (qt/qtsvg-everywhere-opensource-src-5.15.18.tar.xz) = 1867656 +size (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.18.tar.xz) = 10938608 +size (qt/qtwebchannel-everywhere-opensource-src-5.15.18.tar.xz) = 189272 +size (qt/qtwebsockets-everywhere-opensource-src-5.15.18.tar.xz) = 239240 +size (qt/qtx11extras-everywhere-opensource-src-5.15.18.tar.xz) = 123980 +size (qt/qtxmlpatterns-everywhere-opensource-src-5.15.18.tar.xz) = 5169388 diff --git a/x11/qt5/qt3d/makefile b/x11/qt5/qt3d/makefile index 0b5016293cb..eb1b9fadbed 100644 --- a/x11/qt5/qt3d/makefile +++ b/x11/qt5/qt3d/makefile @@ -1,8 +1,8 @@ qt5name = qt3d comment-main = qt5 components for 3d graphics -kde_commit = 1eecf07a4d5dadd1b5aaf785fc2a5ed03565599d -kde_version = 3 +kde_commit = 208f5835e6c2415c9dc5cbe92bba83aa28bab7ea +kde_version = 0 multi_packages = -main -examples diff --git a/x11/qt5/qt3d/distinfo b/x11/qt5/qt3d/distinfo index 1073c85c59e..1e45ed2ec1a 100644 --- a/x11/qt5/qt3d/distinfo +++ b/x11/qt5/qt3d/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qt-qt/qt3d-1eecf07a4d5dadd1b5aaf785fc2a5ed03565599d.tar.gz) = qpjcopyujls+oink6igtilkq0a5dgw8ykwsgv7ltjgq= -size (qt/qt-qt/qt3d-1eecf07a4d5dadd1b5aaf785fc2a5ed03565599d.tar.gz) = 84550544 +sha256 (qt/qt-qt/qt3d-208f5835e6c2415c9dc5cbe92bba83aa28bab7ea.tar.gz) = cpbxnqemuzpqaztul0h5mqultqm1v189sepjb591bku= +size (qt/qt-qt/qt3d-208f5835e6c2415c9dc5cbe92bba83aa28bab7ea.tar.gz) = 84550179 diff --git a/x11/qt5/qtbase/makefile b/x11/qt5/qtbase/makefile index cb26a901a60..ccbb2348a8a 100644 --- a/x11/qt5/qtbase/makefile +++ b/x11/qt5/qtbase/makefile @@ -1,9 +1,7 @@ qt5name = qtbase -kde_commit = 2529f7f0c2333d437089c775c9c30f624d1fd5bc -kde_version = 130 - -revision-main = 0 +kde_commit = bebdfd54917e25d1c100e6bd9f5dd53c2e645fd8 +kde_version = 109 comment-main = c++ general-purpose toolkit comment-global = global qt5 documentation internals @@ -24,7 +22,7 @@ dpb_properties = parallel shared_libs += qt5concurrent 4.1 # 5.15 shared_libs += qt5core 6.0 # 5.15 shared_libs += qt5dbus 3.0 # 5.15 -shared_libs += qt5gui 4.2 # 5.15 +shared_libs += qt5gui 4.3 # 5.15 shared_libs += qt5network 4.0 # 5.15 shared_libs += qt5opengl 3.0 # 5.15 shared_libs += qt5printsupport 3.0 # 5.15 @@ -35,13 +33,13 @@ shared_libs += qt5xml 3.0 # 5.15 shared_libs += qt5eglfsdeviceintegration 1.0 # 5.15 shared_libs += qt5eglfskmssupport 1.0 # 5.15 shared_libs += qt5openglextensions 0.0 # 5.15 -shared_libs += qt5xcbqpa 1.0 # 5.15 +shared_libs += qt5xcbqpa 2.0 # 5.15 wantlib-main += ${compiler_libcxx} egl gl ice sm x11 x11-xcb xext atk-1.0 wantlib-main += c cairo cairo-gobject crypto cups dbus-1 double-conversion wantlib-main += drm execinfo fontconfig freetype gbm gdk-3 gdk_pixbuf-2.0 wantlib-main += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-3 harfbuzz -wantlib-main += icudata icui18n icuuc jpeg m pango-1.0 pangocairo-1.0 +wantlib-main += icudata icui18n icuuc intl jpeg m pango-1.0 pangocairo-1.0 wantlib-main += pcre2-16 png sqlite3 ssl xcb xcb-glx xcb-icccm xcb-image wantlib-main += xcb-keysyms xcb-randr xcb-render xcb-render-util xcb-shape wantlib-main += xcb-shm xcb-sync xcb-xfixes xcb-xinerama xcb-xinput @@ -49,14 +47,9 @@ wantlib-main += xcb-xkb xkbcommon xkbcommon-x11 z zstd wantlib-global = -wantlib-mysql = ${compiler_libcxx} qt5core qt5sql -wantlib-mysql += m pthread mariadb - -wantlib-psql = ${compiler_libcxx} qt5core qt5sql -wantlib-psql += m pthread pq - -wantlib-tds = ${compiler_libcxx} qt5core qt5sql -wantlib-tds += m pthread sybdb +wantlib-mysql += ${compiler_libcxx} qt5core qt5sql m mariadb +wantlib-psql += ${compiler_libcxx} qt5core qt5sql m pq +wantlib-tds += ${compiler_libcxx} qt5core qt5sql m sybdb # there is no -sqlite3 because it's heavily used by qt itself (.qch files) multi_packages = -main -examples -global -mysql -psql -tds @@ -84,7 +77,6 @@ lib_depends-main = ${lib_depends} \ x11/xkbcommon>=1.0.1 # those come from gthread-2.0, not used by qt itself -wantlib-main += intl lib_depends-main += devel/gettext,-runtime lib_depends-global = diff --git a/x11/qt5/qtbase/distinfo b/x11/qt5/qtbase/distinfo index 5c6dca3c7fa..9613abf1ab0 100644 --- a/x11/qt5/qtbase/distinfo +++ b/x11/qt5/qtbase/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qt-qt/qtbase-2529f7f0c2333d437089c775c9c30f624d1fd5bc.tar.gz) = r2xgr8l/ous5sunwiqoy0qbcaixh1h8fdpxy2rtemiy= -size (qt/qt-qt/qtbase-2529f7f0c2333d437089c775c9c30f624d1fd5bc.tar.gz) = 69586499 +sha256 (qt/qt-qt/qtbase-bebdfd54917e25d1c100e6bd9f5dd53c2e645fd8.tar.gz) = vb06hqsdm4xmz2ctpbyaseiott77qdzntyw9nui4j8m= +size (qt/qt-qt/qtbase-bebdfd54917e25d1c100e6bd9f5dd53c2e645fd8.tar.gz) = 69832273 diff --git a/x11/qt5/qtcharts/makefile b/x11/qt5/qtcharts/makefile index e2bb195087e..2e1719c2c36 100644 --- a/x11/qt5/qtcharts/makefile +++ b/x11/qt5/qtcharts/makefile @@ -1,8 +1,8 @@ qt5name = qtcharts comment-main = qt5 components for drawing 2d charts -kde_commit = 4e4fc559c61d1fc2542add48d2b3c490214e9936 -kde_version = 3 +kde_commit = 1093fb53ced126100d14af30a8adffd29b7ef855 +kde_version = 0 multi_packages = -main -examples diff --git a/x11/qt5/qtcharts/distinfo b/x11/qt5/qtcharts/distinfo index 6f1035509d2..e90f78cd978 100644 --- a/x11/qt5/qtcharts/distinfo +++ b/x11/qt5/qtcharts/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qt-qt/qtcharts-4e4fc559c61d1fc2542add48d2b3c490214e9936.tar.gz) = er9uoblru8bhobv4pxqzv5tx/qbh413zr+ut3wxpjk0= -size (qt/qt-qt/qtcharts-4e4fc559c61d1fc2542add48d2b3c490214e9936.tar.gz) = 4730956 +sha256 (qt/qt-qt/qtcharts-1093fb53ced126100d14af30a8adffd29b7ef855.tar.gz) = 9iqpioj4s4eunxuavz+fettuoi1xgableu5eqnfcuek= +size (qt/qt-qt/qtcharts-1093fb53ced126100d14af30a8adffd29b7ef855.tar.gz) = 4730924 diff --git a/x11/qt5/qtcharts/pkg/plist-examples b/x11/qt5/qtcharts/pkg/plist-examples index 164aee7652c..77c257a3e4d 100644 --- a/x11/qt5/qtcharts/pkg/plist-examples +++ b/x11/qt5/qtcharts/pkg/plist-examples @@ -4,6 +4,8 @@ lib/qt5/examples/charts/areachart/ lib/qt5/examples/charts/areachart/areachart.pro lib/qt5/examples/charts/areachart/main.cpp lib/qt5/examples/charts/audio/ +lib/qt5/examples/charts/audio/apple/ +lib/qt5/examples/charts/audio/apple/info.qmake.plist lib/qt5/examples/charts/audio/audio.pro lib/qt5/examples/charts/audio/main.cpp lib/qt5/examples/charts/audio/widget.cpp diff --git a/x11/qt5/qtcharts/pkg/plist-main b/x11/qt5/qtcharts/pkg/plist-main index 2764da3f2ee..70e6ac7de81 100644 --- a/x11/qt5/qtcharts/pkg/plist-main +++ b/x11/qt5/qtcharts/pkg/plist-main @@ -280,8 +280,6 @@ lib/pkgconfig/qt5charts.pc lib/qt5/cmake/qt5charts/ lib/qt5/cmake/qt5charts/qt5chartsconfig.cmake lib/qt5/cmake/qt5charts/qt5chartsconfigversion.cmake -lib/qt5/examples/charts/audio/apple/ -lib/qt5/examples/charts/audio/apple/info.qmake.plist lib/qt5/libqt5charts.la lib/qt5/libqt5charts.prl @lib lib/qt5/libqt5charts.so.${libqt5charts_version} diff --git a/x11/qt5/qtconnectivity/makefile b/x11/qt5/qtconnectivity/makefile index b5098ee5b58..0426d42d666 100644 --- a/x11/qt5/qtconnectivity/makefile +++ b/x11/qt5/qtconnectivity/makefile @@ -1,8 +1,8 @@ qt5name = qtconnectivity comment-main = bluetooth and nfc support for qt5 -kde_commit = b242dc4fd4bd68809872d8c1d6c1e63825692893 -kde_version = 3 +kde_commit = f1be05c8efeb65b77a8bfd21763ab55bb5c04906 +kde_version = 1 shared_libs += qt5bluetooth 3.0 # 5.9 shared_libs += qt5nfc 3.0 # 5.9 diff --git a/x11/qt5/qtconnectivity/distinfo b/x11/qt5/qtconnectivity/distinfo index cbfb6053f87..69bf3cca446 100644 --- a/x11/qt5/qtconnectivity/distinfo +++ b/x11/qt5/qtconnectivity/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qt-qt/qtconnectivity-b242dc4fd4bd68809872d8c1d6c1e63825692893.tar.gz) = xvujgejjggq7fgy5zu5adcrqmyjxjcwbad/rntnlcv4= -size (qt/qt-qt/qtconnectivity-b242dc4fd4bd68809872d8c1d6c1e63825692893.tar.gz) = 3433417 +sha256 (qt/qt-qt/qtconnectivity-f1be05c8efeb65b77a8bfd21763ab55bb5c04906.tar.gz) = 9vkwllxvrr9sdw/iloaql5/7cffyto8nfjgp4dtbcpa= +size (qt/qt-qt/qtconnectivity-f1be05c8efeb65b77a8bfd21763ab55bb5c04906.tar.gz) = 3433855 diff --git a/x11/qt5/qtdatavis3d/makefile b/x11/qt5/qtdatavis3d/makefile index 6b35c02bebf..d5c0f3a7fca 100644 --- a/x11/qt5/qtdatavis3d/makefile +++ b/x11/qt5/qtdatavis3d/makefile @@ -1,8 +1,8 @@ qt5name = qtdatavis3d comment-main = qt5 3d data visualization components -kde_commit = db75c351cd0c2b93016ca489ffb9db806e6fd6e9 -kde_version = 3 +kde_commit = d9b988d3c5f9f34b97f3a9ac1347bfb55464cd60 +kde_version = 0 multi_packages = -main -examples diff --git a/x11/qt5/qtdatavis3d/distinfo b/x11/qt5/qtdatavis3d/distinfo index ab25187b7b4..706df87c870 100644 --- a/x11/qt5/qtdatavis3d/distinfo +++ b/x11/qt5/qtdatavis3d/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qt-qt/qtdatavis3d-db75c351cd0c2b93016ca489ffb9db806e6fd6e9.tar.gz) = bbxajui70n167sm3eseyvsyvfenn5xgnbqldbjricoc= -size (qt/qt-qt/qtdatavis3d-db75c351cd0c2b93016ca489ffb9db806e6fd6e9.tar.gz) = 5614442 +sha256 (qt/qt-qt/qtdatavis3d-d9b988d3c5f9f34b97f3a9ac1347bfb55464cd60.tar.gz) = qxx2trh9n8shc1ifzlreqs0pzgdd8p08if+wrtdd6r8= +size (qt/qt-qt/qtdatavis3d-d9b988d3c5f9f34b97f3a9ac1347bfb55464cd60.tar.gz) = 5614446 diff --git a/x11/qt5/qtdeclarative/makefile b/x11/qt5/qtdeclarative/makefile index 0b3c796c580..587a0c58244 100644 --- a/x11/qt5/qtdeclarative/makefile +++ b/x11/qt5/qtdeclarative/makefile @@ -1,14 +1,14 @@ qt5name = qtdeclarative comment-main = qt5 quick and qml components -kde_commit = e2b38659cb79104f157e1d0099c01e545d04d0db -kde_version = 3 +kde_commit = 1189557a50f11e7bc5716467a149cd09987a9f88 +kde_version = 22 multi_packages = -main -examples dpb_properties = parallel shared_libs = qt5qml 5.0 # 5.9 -shared_libs += qt5quick 6.1 # 5.9 +shared_libs += qt5quick 7.0 # 5.9 shared_libs += qt5quickparticles 3.0 # 5.9 shared_libs += qt5quicktest 3.0 # 5.9 shared_libs += qt5quickwidgets 3.0 # 5.9 diff --git a/x11/qt5/qtdeclarative/distinfo b/x11/qt5/qtdeclarative/distinfo index e4785aadd1c..45c1e3123f7 100644 --- a/x11/qt5/qtdeclarative/distinfo +++ b/x11/qt5/qtdeclarative/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qt-qt/qtdeclarative-e2b38659cb79104f157e1d0099c01e545d04d0db.tar.gz) = ccr6uc8qv3lyitznsbprn8vavnvjgkz+jj2cn0zo4xi= -size (qt/qt-qt/qtdeclarative-e2b38659cb79104f157e1d0099c01e545d04d0db.tar.gz) = 24429120 +sha256 (qt/qt-qt/qtdeclarative-1189557a50f11e7bc5716467a149cd09987a9f88.tar.gz) = 5/cd8netwyvl/u3i/frommxb67ywawms2wh+9bazara= +size (qt/qt-qt/qtdeclarative-1189557a50f11e7bc5716467a149cd09987a9f88.tar.gz) = 24427001 diff --git a/x11/qt5/qtgamepad/makefile b/x11/qt5/qtgamepad/makefile index 96370d8a44f..8e2c13f292c 100644 --- a/x11/qt5/qtgamepad/makefile +++ b/x11/qt5/qtgamepad/makefile @@ -1,6 +1,9 @@ qt5name = qtgamepad comment-main = qt5 gamepad events handling components +kde_commit = 269fc0731f6838a1c02877a83c0ada23659c69fc +kde_version = 0 + multi_packages = -main -examples shared_libs += qt5gamepad 1.0 # 5.9 @@ -15,4 +18,7 @@ flavors = debug modqmake_recursive = no +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtgamepad/distinfo b/x11/qt5/qtgamepad/distinfo index 4e85346bbfd..9ec6234d618 100644 --- a/x11/qt5/qtgamepad/distinfo +++ b/x11/qt5/qtgamepad/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtgamepad-everywhere-opensource-src-5.15.16.tar.xz) = sypaqnetkoab/mkpwv60cu65tlt2qobbly3ml50uvya= -size (qt/qtgamepad-everywhere-opensource-src-5.15.16.tar.xz) = 380928 +sha256 (qt/qt-qt/qtgamepad-269fc0731f6838a1c02877a83c0ada23659c69fc.tar.gz) = kj8ocv8exkbdgci6xypgtgo/kyaamt4pxpb9whjzxqg= +size (qt/qt-qt/qtgamepad-269fc0731f6838a1c02877a83c0ada23659c69fc.tar.gz) = 401211 diff --git a/x11/qt5/qtgraphicaleffects/makefile b/x11/qt5/qtgraphicaleffects/makefile index 65058f50f12..3ffbc78ddc5 100644 --- a/x11/qt5/qtgraphicaleffects/makefile +++ b/x11/qt5/qtgraphicaleffects/makefile @@ -1,6 +1,9 @@ qt5name = qtgraphicaleffects comment = ui effects library for qt quick +kde_commit = dfb2e7b2c98a9b7185c300d0b92b4048f5d89ba5 +kde_version = 0 + wantlib += ${compiler_libcxx} gl qt5core qt5gui qt5network qt5qml wantlib += qt5qmlmodels qt5quick m @@ -8,4 +11,7 @@ lib_depends = x11/qt5/qtdeclarative>=${qt5_version},<${qt5_next_version} flavors = debug +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtgraphicaleffects/distinfo b/x11/qt5/qtgraphicaleffects/distinfo index d9d1164376e..0c0b1482202 100644 --- a/x11/qt5/qtgraphicaleffects/distinfo +++ b/x11/qt5/qtgraphicaleffects/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.16.tar.xz) = 0ywbnzfzg1lygzpawpjdrkgve/6+n6uikkczpwmfzao= -size (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.16.tar.xz) = 14034764 +sha256 (qt/qt-qt/qtgraphicaleffects-dfb2e7b2c98a9b7185c300d0b92b4048f5d89ba5.tar.gz) = vrjjo3w90fqrmvy07hmc5v0xc0jrrnpq8+y17vnufle= +size (qt/qt-qt/qtgraphicaleffects-dfb2e7b2c98a9b7185c300d0b92b4048f5d89ba5.tar.gz) = 17163485 diff --git a/x11/qt5/qtimageformats/makefile b/x11/qt5/qtimageformats/makefile index f37389ab957..3a1c89321fb 100644 --- a/x11/qt5/qtimageformats/makefile +++ b/x11/qt5/qtimageformats/makefile @@ -1,8 +1,8 @@ qt5name = qtimageformats comment = support for additional image formats in qt5 -kde_commit = 7b25a0435edc2602f8999bd216c4bec711ffe09e -kde_version = 3 +kde_commit = c91e4c63c1eaf1e23806d9df10e3d5a9ae353c1d +kde_version = 2 wantlib += ${compiler_libcxx} gl qt5core qt5gui jasper m mng tiff wantlib += webp webpdemux webpmux diff --git a/x11/qt5/qtimageformats/distinfo b/x11/qt5/qtimageformats/distinfo index 882d881a734..7dda6341c0e 100644 --- a/x11/qt5/qtimageformats/distinfo +++ b/x11/qt5/qtimageformats/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qt-qt/qtimageformats-7b25a0435edc2602f8999bd216c4bec711ffe09e.tar.gz) = r2tzefowcbu7p9ozv05ekwoizvsvwzhzlxxahqnhiku= -size (qt/qt-qt/qtimageformats-7b25a0435edc2602f8999bd216c4bec711ffe09e.tar.gz) = 2489438 +sha256 (qt/qt-qt/qtimageformats-c91e4c63c1eaf1e23806d9df10e3d5a9ae353c1d.tar.gz) = sa/gfezejrp/9qskqaaubvlq0hupi+4jvb/2eprh1/o= +size (qt/qt-qt/qtimageformats-c91e4c63c1eaf1e23806d9df10e3d5a9ae353c1d.tar.gz) = 2520694 diff --git a/x11/qt5/qtlocation/makefile b/x11/qt5/qtlocation/makefile index 5535afd92dd..88a6832d8dd 100644 --- a/x11/qt5/qtlocation/makefile +++ b/x11/qt5/qtlocation/makefile @@ -1,13 +1,13 @@ qt5name = qtlocation comment-main = qt5 geo positioning apis -kde_commit = 6e89db9fcf76fa35c9275123c814e260610d355e -kde_version = 3 +kde_commit = ba48a8b5cedd157d972c08d371ac2581db166bf7 +kde_version = 7 shared_libs += qt5location 3.1 # 5.15 shared_libs += qt5positioning 3.0 # 5.9 shared_libs += qt5positioningquick 0.0 # 5.13 - +wantlib += ${compiler_libcxx} multi_packages = -main -examples wantlib-main += ${compiler_libcxx} gl qt5concurrent qt5core qt5dbus diff --git a/x11/qt5/qtlocation/distinfo b/x11/qt5/qtlocation/distinfo index 9f823a48f1a..5896c995266 100644 --- a/x11/qt5/qtlocation/distinfo +++ b/x11/qt5/qtlocation/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qt-qt/qtlocation-6e89db9fcf76fa35c9275123c814e260610d355e.tar.gz) = v5etkd04kuo/cea+2qoqfua0kcfnjwba2qbj1o93/ai= -size (qt/qt-qt/qtlocation-6e89db9fcf76fa35c9275123c814e260610d355e.tar.gz) = 5434809 +sha256 (qt/qt-qt/qtlocation-ba48a8b5cedd157d972c08d371ac2581db166bf7.tar.gz) = dl/t0ujm+x3kyqstkor92mq3dlcbkibunxpyjwjevzq= +size (qt/qt-qt/qtlocation-ba48a8b5cedd157d972c08d371ac2581db166bf7.tar.gz) = 5436890 diff --git a/x11/qt5/qtlottie/makefile b/x11/qt5/qtlottie/makefile index fc77f94a697..c85587e1ceb 100644 --- a/x11/qt5/qtlottie/makefile +++ b/x11/qt5/qtlottie/makefile @@ -1,6 +1,9 @@ qt5name = qtlottie comment = qml api for rendering graphics and animations +kde_commit = 27ed5a3c95a0810a96fac2a8661ea94d8ea3c44e +kde_version = 0 + shared_libs += qt5bodymovin 0.0 # 5.13 wantlib += ${compiler_libcxx} gl qt5core qt5gui qt5network qt5qml @@ -10,4 +13,7 @@ lib_depends = x11/qt5/qtdeclarative>=${qt5_version},<${qt5_next_version} flavors = debug +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtlottie/distinfo b/x11/qt5/qtlottie/distinfo index d5b5190d5ee..a15fd429354 100644 --- a/x11/qt5/qtlottie/distinfo +++ b/x11/qt5/qtlottie/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtlottie-everywhere-opensource-src-5.15.16.tar.xz) = jv/1y1fivizvwdd/pyoibmphkw9umpq+olrz/pmga9m= -size (qt/qtlottie-everywhere-opensource-src-5.15.16.tar.xz) = 76348 +sha256 (qt/qt-qt/qtlottie-27ed5a3c95a0810a96fac2a8661ea94d8ea3c44e.tar.gz) = yfmemcvadyri+famixq9r/cd/kx+er9ylb/wqp1mu6e= +size (qt/qt-qt/qtlottie-27ed5a3c95a0810a96fac2a8661ea94d8ea3c44e.tar.gz) = 89123 diff --git a/x11/qt5/qtmultimedia/makefile b/x11/qt5/qtmultimedia/makefile index 1f58cb4bad0..29b0657301b 100644 --- a/x11/qt5/qtmultimedia/makefile +++ b/x11/qt5/qtmultimedia/makefile @@ -1,19 +1,16 @@ qt5name = qtmultimedia comment-main = qt5 multimedia components -kde_commit = b7c7ff4ab8c0f43a03de51a76867aae691411410 +kde_commit = ff83d119c75cd8406f73ccc08958fe36747e7390 kde_version = 2 -revision-main = 0 -revision-examples = 0 - multi_packages = -main -examples shared_libs += qt5multimedia 3.0 # 5.9 shared_libs += qt5multimediawidgets 3.0 # 5.9 shared_libs += qt5multimediagsttools 0.0 # 5.13 shared_libs += qt5multimediaquick 0.0 # 5.13 - +wantlib += ${compiler_libcxx} wantlib-main += ${compiler_libcxx} gl qt5core qt5gui qt5network qt5qml wantlib-main += qt5qmlmodels qt5quick qt5widgets drm glib-2.0 gobject-2.0 wantlib-main += gstallocators-1.0 gstapp-1.0 gstaudio-1.0 gstbase-1.0 diff --git a/x11/qt5/qtmultimedia/distinfo b/x11/qt5/qtmultimedia/distinfo index 2602fb17fe0..6e237b34610 100644 --- a/x11/qt5/qtmultimedia/distinfo +++ b/x11/qt5/qtmultimedia/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qt-qt/qtmultimedia-b7c7ff4ab8c0f43a03de51a76867aae691411410.tar.gz) = jjdhgxf5q8rzmbkaz5a0hi95frpqi4j3fqo/p25g3hy= -size (qt/qt-qt/qtmultimedia-b7c7ff4ab8c0f43a03de51a76867aae691411410.tar.gz) = 6065096 +sha256 (qt/qt-qt/qtmultimedia-ff83d119c75cd8406f73ccc08958fe36747e7390.tar.gz) = mjsyj9c+m4wggpxjq/04swdnkpn5x4wcnsavlgsxgey= +size (qt/qt-qt/qtmultimedia-ff83d119c75cd8406f73ccc08958fe36747e7390.tar.gz) = 6065329 diff --git a/x11/qt5/qtmultimedia/patches/patch-src_plugins_gstreamer_camerabin_camerabinv4limageprocessing_cpp b/x11/qt5/qtmultimedia/patches/patch-src_plugins_gstreamer_camerabin_camerabinv4limageprocessing_cpp index 73e8aa92b51..b926bcb874c 100644 --- a/x11/qt5/qtmultimedia/patches/patch-src_plugins_gstreamer_camerabin_camerabinv4limageprocessing_cpp +++ b/x11/qt5/qtmultimedia/patches/patch-src_plugins_gstreamer_camerabin_camerabinv4limageprocessing_cpp @@ -3,8 +3,8 @@ allow our v4l2 to be used. index: src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp --- src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp.orig +++ src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp -@@ -43,7 +43,11 @@ - #include +@@ -45,7 +45,11 @@ + #include #include -#include diff --git a/x11/qt5/qtnetworkauth/makefile b/x11/qt5/qtnetworkauth/makefile index 3d54324ca8e..89455a88e10 100644 --- a/x11/qt5/qtnetworkauth/makefile +++ b/x11/qt5/qtnetworkauth/makefile @@ -1,6 +1,9 @@ qt5name = qtnetworkauth comment-main = qt5 network authorization components +kde_commit = 510687fa4fdee84dd3d6d166e8f080c484016199 +kde_version = 0 + multi_packages = -main -examples shared_libs += qt5networkauth 2.0 # 5.9 @@ -9,4 +12,7 @@ wantlib += ${compiler_libcxx} qt5core qt5network m flavors = debug +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtnetworkauth/distinfo b/x11/qt5/qtnetworkauth/distinfo index f809dc56547..b851923420a 100644 --- a/x11/qt5/qtnetworkauth/distinfo +++ b/x11/qt5/qtnetworkauth/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtnetworkauth-everywhere-opensource-src-5.15.16.tar.xz) = v6bbinmxuf+mfsxqbr7mghzlgcy8smppanupsoavsvc= -size (qt/qtnetworkauth-everywhere-opensource-src-5.15.16.tar.xz) = 135600 +sha256 (qt/qt-qt/qtnetworkauth-510687fa4fdee84dd3d6d166e8f080c484016199.tar.gz) = 6co5zidt2mkmmkbpcz/p12l1ogqm5clcvrqh0qxvaw0= +size (qt/qt-qt/qtnetworkauth-510687fa4fdee84dd3d6d166e8f080c484016199.tar.gz) = 151801 diff --git a/x11/qt5/qtpurchasing/makefile b/x11/qt5/qtpurchasing/makefile index fc696837daf..b552c987c6c 100644 --- a/x11/qt5/qtpurchasing/makefile +++ b/x11/qt5/qtpurchasing/makefile @@ -1,6 +1,9 @@ qt5name = qtpurchasing comment-main = in-app purchases in qt5 and qt5 quick applications +kde_commit = 8e9a5ec9f68639162c85c198b28e072e7150883c +kde_version = 0 + multi_packages = -main -examples shared_libs += qt5purchasing 1.0 # 5.9 @@ -12,4 +15,7 @@ lib_depends = x11/qt5/qtdeclarative>=${qt5_version},<${qt5_next_version} flavors = debug +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtpurchasing/distinfo b/x11/qt5/qtpurchasing/distinfo index 1d8d8ba7a99..b13073f54fd 100644 --- a/x11/qt5/qtpurchasing/distinfo +++ b/x11/qt5/qtpurchasing/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtpurchasing-everywhere-opensource-src-5.15.16.tar.xz) = jbvfuj2es3j6qeo7eticzvlk1+zvyziywtj+sldtt34= -size (qt/qtpurchasing-everywhere-opensource-src-5.15.16.tar.xz) = 300916 +sha256 (qt/qt-qt/qtpurchasing-8e9a5ec9f68639162c85c198b28e072e7150883c.tar.gz) = lb69bk2kz9rufllhjmgsnvh/adxyq8ebt6ypjprxetm= +size (qt/qt-qt/qtpurchasing-8e9a5ec9f68639162c85c198b28e072e7150883c.tar.gz) = 574230 diff --git a/x11/qt5/qtpurchasing/pkg/plist-main b/x11/qt5/qtpurchasing/pkg/plist-main index bf76d81920e..111a684c699 100644 --- a/x11/qt5/qtpurchasing/pkg/plist-main +++ b/x11/qt5/qtpurchasing/pkg/plist-main @@ -1,30 +1,5 @@ include/x11/qt5/qtpurchasing/ -include/x11/qt5/qtpurchasing/${version}/ -include/x11/qt5/qtpurchasing/${version}/qtpurchasing/ -include/x11/qt5/qtpurchasing/${version}/qtpurchasing/private/ -include/x11/qt5/qtpurchasing/${version}/qtpurchasing/private/qandroidinappproduct_p.h -include/x11/qt5/qtpurchasing/${version}/qtpurchasing/private/qandroidinapppurchasebackend_p.h -include/x11/qt5/qtpurchasing/${version}/qtpurchasing/private/qandroidinapptransaction_p.h -include/x11/qt5/qtpurchasing/${version}/qtpurchasing/private/qinapppurchasebackend_p.h -include/x11/qt5/qtpurchasing/${version}/qtpurchasing/private/qinapppurchasebackendfactory_p.h -include/x11/qt5/qtpurchasing/${version}/qtpurchasing/private/qinappstore_p.h -include/x11/qt5/qtpurchasing/${version}/qtpurchasing/private/qmacinapppurchasebackend_p.h -include/x11/qt5/qtpurchasing/${version}/qtpurchasing/private/qmacinapppurchaseproduct_p.h -include/x11/qt5/qtpurchasing/${version}/qtpurchasing/private/qmacinapppurchasetransaction_p.h -include/x11/qt5/qtpurchasing/${version}/qtpurchasing/private/qwinrtinappproduct_p.h -include/x11/qt5/qtpurchasing/${version}/qtpurchasing/private/qwinrtinapppurchasebackend_p.h -include/x11/qt5/qtpurchasing/${version}/qtpurchasing/private/qwinrtinapptransaction_p.h -include/x11/qt5/qtpurchasing/qinappproduct -include/x11/qt5/qtpurchasing/qinappstore -include/x11/qt5/qtpurchasing/qinapptransaction -include/x11/qt5/qtpurchasing/qtpurchasing include/x11/qt5/qtpurchasing/qtpurchasingdepends -include/x11/qt5/qtpurchasing/qtpurchasingversion -include/x11/qt5/qtpurchasing/qinappproduct.h -include/x11/qt5/qtpurchasing/qinappstore.h -include/x11/qt5/qtpurchasing/qinapptransaction.h -include/x11/qt5/qtpurchasing/qtpurchasingglobal.h -include/x11/qt5/qtpurchasing/qtpurchasingversion.h @lib lib/libqt5purchasing.so.${libqt5purchasing_version} lib/pkgconfig/qt5purchasing.pc lib/qt5/cmake/qt5purchasing/ diff --git a/x11/qt5/qtquickcontrols/makefile b/x11/qt5/qtquickcontrols/makefile index ce005e7110c..6a216cb215f 100644 --- a/x11/qt5/qtquickcontrols/makefile +++ b/x11/qt5/qtquickcontrols/makefile @@ -1,6 +1,9 @@ qt5name = qtquickcontrols comment-main = qt quick based ui controls +kde_commit = 0c3c18bf8bdac1ef1afdb8aade903edb5c2bc041 +kde_version = 0 + multi_packages = -main -examples wantlib += ${compiler_libcxx} gl qt5core qt5gui qt5network qt5qml @@ -10,4 +13,7 @@ lib_depends = x11/qt5/qtdeclarative>=${qt5_version},<${qt5_next_version} flavors = debug +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtquickcontrols/distinfo b/x11/qt5/qtquickcontrols/distinfo index 7b5d270e41a..d4c8c640421 100644 --- a/x11/qt5/qtquickcontrols/distinfo +++ b/x11/qt5/qtquickcontrols/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtquickcontrols-everywhere-opensource-src-5.15.16.tar.xz) = 5p9h13ic6edgpysxbhbeaovtq0tkj7lsevo6wtp6xn8= -size (qt/qtquickcontrols-everywhere-opensource-src-5.15.16.tar.xz) = 5974732 +sha256 (qt/qt-qt/qtquickcontrols-0c3c18bf8bdac1ef1afdb8aade903edb5c2bc041.tar.gz) = r7luvr4nst1bu3uedn7vpvejv1zozaufj03/isa/la4= +size (qt/qt-qt/qtquickcontrols-0c3c18bf8bdac1ef1afdb8aade903edb5c2bc041.tar.gz) = 6649944 diff --git a/x11/qt5/qtquickcontrols2/makefile b/x11/qt5/qtquickcontrols2/makefile index d7d82ecfd78..b114163d593 100644 --- a/x11/qt5/qtquickcontrols2/makefile +++ b/x11/qt5/qtquickcontrols2/makefile @@ -2,7 +2,7 @@ qt5name = qtquickcontrols2 comment-main = qt5 quick based ui controls from qt labs -kde_commit = 8f244d09b22ed68b3aefaa8e521c8d68d18cada7 +kde_commit = e464888c53a641ee44a34ff2350cfb156c8ed59f kde_version = 5 shared_libs += qt5quickcontrols2 1.1 # 5.9 diff --git a/x11/qt5/qtquickcontrols2/distinfo b/x11/qt5/qtquickcontrols2/distinfo index ad43fcb121e..67b176626a8 100644 --- a/x11/qt5/qtquickcontrols2/distinfo +++ b/x11/qt5/qtquickcontrols2/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qt-qt/qtquickcontrols2-8f244d09b22ed68b3aefaa8e521c8d68d18cada7.tar.gz) = qlzutubzkzqumgqso0yqbyg7ogy6jduvwzbhwrs66gq= -size (qt/qt-qt/qtquickcontrols2-8f244d09b22ed68b3aefaa8e521c8d68d18cada7.tar.gz) = 9257173 +sha256 (qt/qt-qt/qtquickcontrols2-e464888c53a641ee44a34ff2350cfb156c8ed59f.tar.gz) = r13hvbl8vnyt1lxz+zlnsv51yfboxvzatqix5ngyomo= +size (qt/qt-qt/qtquickcontrols2-e464888c53a641ee44a34ff2350cfb156c8ed59f.tar.gz) = 9257465 diff --git a/x11/qt5/qtremoteobjects/makefile b/x11/qt5/qtremoteobjects/makefile index e53c80f2735..ecf608ae773 100644 --- a/x11/qt5/qtremoteobjects/makefile +++ b/x11/qt5/qtremoteobjects/makefile @@ -1,6 +1,9 @@ qt5name = qtremoteobjects comment-main = inter-process communication using qt5 objects +kde_commit = b2740a7c7f5b6ac810240404a947ca5cff9de5f7 +kde_version = 1 + multi_packages = -main -examples shared_libs += qt5remoteobjects 1.0 # 5.9 @@ -12,4 +15,7 @@ lib_depends = x11/qt5/qtdeclarative>=${qt5_version},<${qt5_next_version} flavors = debug +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtremoteobjects/distinfo b/x11/qt5/qtremoteobjects/distinfo index bda80748af0..20d20b0b2d8 100644 --- a/x11/qt5/qtremoteobjects/distinfo +++ b/x11/qt5/qtremoteobjects/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtremoteobjects-everywhere-opensource-src-5.15.16.tar.xz) = wn7d1wqapr5jiug+zbnmz+jkd+blwwm5jun2gc1rbvg= -size (qt/qtremoteobjects-everywhere-opensource-src-5.15.16.tar.xz) = 370484 +sha256 (qt/qt-qt/qtremoteobjects-b2740a7c7f5b6ac810240404a947ca5cff9de5f7.tar.gz) = poucmdvxlt659ov/0q/i6kexgbzw+xw29bb9lxiqxbe= +size (qt/qt-qt/qtremoteobjects-b2740a7c7f5b6ac810240404a947ca5cff9de5f7.tar.gz) = 506238 diff --git a/x11/qt5/qtremoteobjects/pkg/plist-main b/x11/qt5/qtremoteobjects/pkg/plist-main index 19c8c03d926..8fdb23b70d4 100644 --- a/x11/qt5/qtremoteobjects/pkg/plist-main +++ b/x11/qt5/qtremoteobjects/pkg/plist-main @@ -1,67 +1,8 @@ include/x11/qt5/qtremoteobjects/ -include/x11/qt5/qtremoteobjects/${version}/ -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/ -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/ -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/qconnection_local_backend_p.h -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/qconnection_qnx_backend_p.h -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/qconnection_qnx_global_p.h -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/qconnection_qnx_qiodevices_p.h -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/qconnection_qnx_server_p.h -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/qconnection_tcpip_backend_p.h -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/qconnectionfactories_p.h -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/qremoteobjectabstractitemmodeladapter_p.h -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/qremoteobjectabstractitemmodelreplica_p.h -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/qremoteobjectnode_p.h -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/qremoteobjectpacket_p.h -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/qremoteobjectpendingcall_p.h -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/qremoteobjectregistrysource_p.h -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/qremoteobjectreplica_p.h -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/qremoteobjectsource_p.h -include/x11/qt5/qtremoteobjects/${version}/qtremoteobjects/private/qremoteobjectsourceio_p.h -include/x11/qt5/qtremoteobjects/qabstractitemmodelreplica -include/x11/qt5/qtremoteobjects/qioqnxsource -include/x11/qt5/qtremoteobjects/qinthash -include/x11/qt5/qtremoteobjects/qqnxnativeio -include/x11/qt5/qtremoteobjects/qqnxnativeserver -include/x11/qt5/qtremoteobjects/qremoteobjectabstractpersistedstore -include/x11/qt5/qtremoteobjects/qremoteobjectdynamicreplica -include/x11/qt5/qtremoteobjects/qremoteobjecthost -include/x11/qt5/qtremoteobjects/qremoteobjecthostbase -include/x11/qt5/qtremoteobjects/qremoteobjectnode -include/x11/qt5/qtremoteobjects/qremoteobjectpendingcall -include/x11/qt5/qtremoteobjects/qremoteobjectpendingcallwatcher -include/x11/qt5/qtremoteobjects/qremoteobjectpendingreply -include/x11/qt5/qtremoteobjects/qremoteobjectregistry -include/x11/qt5/qtremoteobjects/qremoteobjectregistryhost -include/x11/qt5/qtremoteobjects/qremoteobjectreplica -include/x11/qt5/qtremoteobjects/qremoteobjectsettingsstore -include/x11/qt5/qtremoteobjects/qremoteobjectsourcelocation -include/x11/qt5/qtremoteobjects/qremoteobjectsourcelocationinfo -include/x11/qt5/qtremoteobjects/qremoteobjectsourcelocations -include/x11/qt5/qtremoteobjects/qtremoteobjects include/x11/qt5/qtremoteobjects/qtremoteobjectsdepends -include/x11/qt5/qtremoteobjects/qtremoteobjectsversion -include/x11/qt5/qtremoteobjects/qconnection_qnx_qiodevices.h -include/x11/qt5/qtremoteobjects/qconnection_qnx_server.h -include/x11/qt5/qtremoteobjects/qremoteobjectabstractitemmodelreplica.h -include/x11/qt5/qtremoteobjects/qremoteobjectabstractitemmodeltypes.h -include/x11/qt5/qtremoteobjects/qremoteobjectdynamicreplica.h -include/x11/qt5/qtremoteobjects/qremoteobjectnode.h -include/x11/qt5/qtremoteobjects/qremoteobjectpendingcall.h -include/x11/qt5/qtremoteobjects/qremoteobjectregistry.h -include/x11/qt5/qtremoteobjects/qremoteobjectreplica.h -include/x11/qt5/qtremoteobjects/qremoteobjectsettingsstore.h -include/x11/qt5/qtremoteobjects/qremoteobjectsource.h -include/x11/qt5/qtremoteobjects/qtremoteobjectglobal.h -include/x11/qt5/qtremoteobjects/qtremoteobjectsversion.h include/x11/qt5/qtrepparser/ -include/x11/qt5/qtrepparser/qregexparser -include/x11/qt5/qtrepparser/qtrepparser include/x11/qt5/qtrepparser/qtrepparserdepends -include/x11/qt5/qtrepparser/qtrepparserversion include/x11/qt5/qtrepparser/parser.g -include/x11/qt5/qtrepparser/qregexparser.h -include/x11/qt5/qtrepparser/qtrepparserversion.h @lib lib/libqt5remoteobjects.so.${libqt5remoteobjects_version} lib/pkgconfig/qt5remoteobjects.pc lib/pkgconfig/qt5repparser.pc diff --git a/x11/qt5/qtscript/makefile b/x11/qt5/qtscript/makefile index 31c0d344f92..7ae45d0c4b7 100644 --- a/x11/qt5/qtscript/makefile +++ b/x11/qt5/qtscript/makefile @@ -1,7 +1,11 @@ qt5name = qtscript comment-main = ecmascript language for qt5 +kde_commit = 182ceff6560f68d70017ab980186a6106fd126a6 +kde_version = 0 + multi_packages = -main -examples + shared_libs += qt5script 3.0 # 5.9 shared_libs += qt5scripttools 3.0 # 5.9 @@ -11,4 +15,7 @@ run_depends-examples = x11/qt5/qtdeclarative>=${qt5_version},<${qt5_next_version flavors = debug +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtscript/distinfo b/x11/qt5/qtscript/distinfo index 7683e928878..184ca8f4a2f 100644 --- a/x11/qt5/qtscript/distinfo +++ b/x11/qt5/qtscript/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtscript-everywhere-opensource-src-5.15.16.tar.xz) = c5i6pu7ofq54yfkn1n+vrsszcw9i8z0wvw/tisi27si= -size (qt/qtscript-everywhere-opensource-src-5.15.16.tar.xz) = 2656892 +sha256 (qt/qt-qt/qtscript-182ceff6560f68d70017ab980186a6106fd126a6.tar.gz) = jryr6ksrx7q8itk87a3qybz/7isrhwz9eusixpf2yfq= +size (qt/qt-qt/qtscript-182ceff6560f68d70017ab980186a6106fd126a6.tar.gz) = 4079378 diff --git a/x11/qt5/qtscxml/makefile b/x11/qt5/qtscxml/makefile index 0047130fd81..8a4fc1c9ffd 100644 --- a/x11/qt5/qtscxml/makefile +++ b/x11/qt5/qtscxml/makefile @@ -1,6 +1,9 @@ qt5name = qtscxml comment-main = create state machines from scxml files +kde_commit = 57491f554bc53bd020978b5744437b7ac7e56a27 +kde_version = 0 + multi_packages = -main -examples shared_libs += qt5scxml 1.0 # 5.9 @@ -11,4 +14,7 @@ lib_depends = x11/qt5/qtdeclarative>=${qt5_version},<${qt5_next_version} flavors = debug +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtscxml/distinfo b/x11/qt5/qtscxml/distinfo index e59eddeb935..fce15dffc00 100644 --- a/x11/qt5/qtscxml/distinfo +++ b/x11/qt5/qtscxml/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtscxml-everywhere-opensource-src-5.15.16.tar.xz) = ynqrb36l/t4ujbod/qntuh/3qbivvznu87coz4i783g= -size (qt/qtscxml-everywhere-opensource-src-5.15.16.tar.xz) = 429268 +sha256 (qt/qt-qt/qtscxml-57491f554bc53bd020978b5744437b7ac7e56a27.tar.gz) = uqvxsw0nz9lixglq4dku7gvevxtnixn3ydrzy26w26y= +size (qt/qt-qt/qtscxml-57491f554bc53bd020978b5744437b7ac7e56a27.tar.gz) = 507749 diff --git a/x11/qt5/qtsensors/makefile b/x11/qt5/qtsensors/makefile index 7df3a2d5246..360fde29043 100644 --- a/x11/qt5/qtsensors/makefile +++ b/x11/qt5/qtsensors/makefile @@ -1,6 +1,9 @@ qt5name = qtsensors comment-main = qt5 hardware sensors support +kde_commit = 50a61b360877e7c1300df76b5aabf8d75554a398 +kde_version = 0 + multi_packages = -main -examples shared_libs += qt5sensors 3.0 # 5.9 @@ -14,4 +17,7 @@ flavors = debug modqmake_recursive = no +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtsensors/distinfo b/x11/qt5/qtsensors/distinfo index d9c0826ceeb..1f18dad8790 100644 --- a/x11/qt5/qtsensors/distinfo +++ b/x11/qt5/qtsensors/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtsensors-everywhere-opensource-src-5.15.16.tar.xz) = zvzdjf2dae+aswzczhvi61wpg+cz9imnaow+ppkfqbi= -size (qt/qtsensors-everywhere-opensource-src-5.15.16.tar.xz) = 2051048 +sha256 (qt/qt-qt/qtsensors-50a61b360877e7c1300df76b5aabf8d75554a398.tar.gz) = 5oabbihfswyexvnpkwe9rapsvbnfqtcq1qfmx415eto= +size (qt/qt-qt/qtsensors-50a61b360877e7c1300df76b5aabf8d75554a398.tar.gz) = 2405157 diff --git a/x11/qt5/qtserialbus/makefile b/x11/qt5/qtserialbus/makefile index 1627bd95009..4d4ca33bb5d 100644 --- a/x11/qt5/qtserialbus/makefile +++ b/x11/qt5/qtserialbus/makefile @@ -1,6 +1,9 @@ qt5name = qtserialbus comment-main = qt5 api for accessing serial bus devices +kde_commit = c23069351ec31563c9ea9fcdce42ccdba95ea518 +kde_version = 0 + multi_packages = -main -examples shared_libs += qt5serialbus 1.1 # 5.9 @@ -9,4 +12,9 @@ wantlib += ${compiler_libcxx} qt5core qt5network c m flavors = debug +build_depends = x11/qt5/qtserialport + +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtserialbus/distinfo b/x11/qt5/qtserialbus/distinfo index 397c3061bc9..60b5e5e1db5 100644 --- a/x11/qt5/qtserialbus/distinfo +++ b/x11/qt5/qtserialbus/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtserialbus-everywhere-opensource-src-5.15.16.tar.xz) = jwahrzz1mu1wpnw4rojclk5pypkaqwqogyoa1j4o6ry= -size (qt/qtserialbus-everywhere-opensource-src-5.15.16.tar.xz) = 350832 +sha256 (qt/qt-qt/qtserialbus-c23069351ec31563c9ea9fcdce42ccdba95ea518.tar.gz) = r9ng8qjmqmru8p4ly+yramylcnj/hwnydaakawfvc10= +size (qt/qt-qt/qtserialbus-c23069351ec31563c9ea9fcdce42ccdba95ea518.tar.gz) = 603051 diff --git a/x11/qt5/qtserialport/makefile b/x11/qt5/qtserialport/makefile index d262869b9c7..576f0d9d35e 100644 --- a/x11/qt5/qtserialport/makefile +++ b/x11/qt5/qtserialport/makefile @@ -1,6 +1,8 @@ qt5name = qtserialport comment-main = qt5 serial ports access components -pkgspec-main = qtserialport->=5.6 + +kde_commit = b64a7eeda9b6a65b5ed01b1b40b07177f0aa4c0f +kde_version = 0 multi_packages = -main -examples @@ -10,4 +12,7 @@ wantlib += ${compiler_libcxx} qt5core m flavors = debug +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtserialport/distinfo b/x11/qt5/qtserialport/distinfo index 461017d408c..2bf6b1c8b02 100644 --- a/x11/qt5/qtserialport/distinfo +++ b/x11/qt5/qtserialport/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtserialport-everywhere-opensource-src-5.15.16.tar.xz) = 4tlxj3roccpp/gv2ixjolz14j6joe+l3nvwmxkkvtrw= -size (qt/qtserialport-everywhere-opensource-src-5.15.16.tar.xz) = 314732 +sha256 (qt/qt-qt/qtserialport-b64a7eeda9b6a65b5ed01b1b40b07177f0aa4c0f.tar.gz) = twfjxsmiyq6emtmixs95cbqu94ypqlollryfgkh1wdy= +size (qt/qt-qt/qtserialport-b64a7eeda9b6a65b5ed01b1b40b07177f0aa4c0f.tar.gz) = 503594 diff --git a/x11/qt5/qtspeech/makefile b/x11/qt5/qtspeech/makefile index 554b88a1570..90c97d0fd7f 100644 --- a/x11/qt5/qtspeech/makefile +++ b/x11/qt5/qtspeech/makefile @@ -1,7 +1,7 @@ qt5name = qtspeech comment-main = qt5 text-to-speech components -kde_commit = fe7fc4f6295f644a93157707f940072b2676902d +kde_commit = aa2376f9b1302222edcd16b4641bbd7004318c00 kde_version = 1 multi_packages = -main -examples diff --git a/x11/qt5/qtspeech/distinfo b/x11/qt5/qtspeech/distinfo index 6941caf6170..f0ecc3b2257 100644 --- a/x11/qt5/qtspeech/distinfo +++ b/x11/qt5/qtspeech/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qt-qt/qtspeech-fe7fc4f6295f644a93157707f940072b2676902d.tar.gz) = c27czlakldmqialxapwu7dqvbi7ht9vi5nkilaug4cw= -size (qt/qt-qt/qtspeech-fe7fc4f6295f644a93157707f940072b2676902d.tar.gz) = 93374 +sha256 (qt/qt-qt/qtspeech-aa2376f9b1302222edcd16b4641bbd7004318c00.tar.gz) = 1j5kebi4wbz1e/fpnxf+hhnqhuyzgae2nvxcg+hnvvs= +size (qt/qt-qt/qtspeech-aa2376f9b1302222edcd16b4641bbd7004318c00.tar.gz) = 93363 diff --git a/x11/qt5/qtsvg/makefile b/x11/qt5/qtsvg/makefile index d26aa348a77..f16b214e9cc 100644 --- a/x11/qt5/qtsvg/makefile +++ b/x11/qt5/qtsvg/makefile @@ -1,7 +1,7 @@ qt5name = qtsvg comment-main = svg support for qt5 -kde_commit = 9c3d40626ddfccc87886966a59e5cd6b1b5ce739 +kde_commit = b74f7291f343dcbcb487b020868f042d8fe83098 kde_version = 5 dpb_properties = parallel diff --git a/x11/qt5/qtsvg/distinfo b/x11/qt5/qtsvg/distinfo index 1e4c3ce1dea..7cc49bd93bd 100644 --- a/x11/qt5/qtsvg/distinfo +++ b/x11/qt5/qtsvg/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qt-qt/qtsvg-9c3d40626ddfccc87886966a59e5cd6b1b5ce739.tar.gz) = borbft6b8s0rm9mglkok1s9rxtnof6/wjhkrxyq6au8= -size (qt/qt-qt/qtsvg-9c3d40626ddfccc87886966a59e5cd6b1b5ce739.tar.gz) = 2780509 +sha256 (qt/qt-qt/qtsvg-b74f7291f343dcbcb487b020868f042d8fe83098.tar.gz) = tpkmwztw8hftncqanbp1qbt3lluxsjkbvngl3yni+nw= +size (qt/qt-qt/qtsvg-b74f7291f343dcbcb487b020868f042d8fe83098.tar.gz) = 2780115 diff --git a/x11/qt5/qttools/makefile b/x11/qt5/qttools/makefile index a591f56b2ab..641579856cc 100644 --- a/x11/qt5/qttools/makefile +++ b/x11/qt5/qttools/makefile @@ -2,9 +2,8 @@ qt5name = qttools comment-main = qt development tools -kde_commit = 15deb8f202b838b4dd1b2ff84e852171e8587881 +kde_commit = fa40a2d3373b89be0cd0a43fe0c1d047e3d34058 kde_version = 3 -revision = 0 dpb_properties = parallel @@ -13,11 +12,9 @@ multi_packages = -main -examples shared_libs += qt5designer 3.1 # 5.9 shared_libs += qt5designercomponents 3.0 # 5.9 shared_libs += qt5help 3.0 # 5.9 - wantlib-main += ${compiler_libcxx} gl qt5core qt5dbus qt5gui qt5network wantlib-main += qt5printsupport qt5qml qt5qmlmodels qt5quick qt5quickwidgets wantlib-main += qt5sql qt5widgets qt5xml c m -wantlib-main += llvm${modclang_version}/lib/clang # avoid bdep on ourselves modqt5_deps = no diff --git a/x11/qt5/qttools/distinfo b/x11/qt5/qttools/distinfo index 2c03f10e18d..cd39580996d 100644 --- a/x11/qt5/qttools/distinfo +++ b/x11/qt5/qttools/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qt-qt/qttools-15deb8f202b838b4dd1b2ff84e852171e8587881.tar.gz) = o46dfqa6qhsdrcw3fattgfarv1lqf/jhospj5mq2rcq= -size (qt/qt-qt/qttools-15deb8f202b838b4dd1b2ff84e852171e8587881.tar.gz) = 12261732 +sha256 (qt/qt-qt/qttools-fa40a2d3373b89be0cd0a43fe0c1d047e3d34058.tar.gz) = x/lg+y8n/p6sz02qvnrqcmdtqukh8ocbszpmq86fcg8= +size (qt/qt-qt/qttools-fa40a2d3373b89be0cd0a43fe0c1d047e3d34058.tar.gz) = 12261887 diff --git a/x11/qt5/qttranslations/makefile b/x11/qt5/qttranslations/makefile index 9b03468da98..1126fd89db8 100644 --- a/x11/qt5/qttranslations/makefile +++ b/x11/qt5/qttranslations/makefile @@ -1,6 +1,9 @@ qt5name = qttranslations comment = unofficial qt5 translations +kde_commit = 3cbcceb8e3e2e63a4022f1be946c7118c527a83e +kde_version = 0 + run_depends = x11/qt5/qtbase>=${qt5_version},<${qt5_next_version} build_depends = x11/qt5/qtbase>=${qt5_version},<${qt5_next_version} \ x11/qt5/qttools>=${qt5_version},<${qt5_next_version} diff --git a/x11/qt5/qttranslations/distinfo b/x11/qt5/qttranslations/distinfo index 16c60642349..392ac925d6b 100644 --- a/x11/qt5/qttranslations/distinfo +++ b/x11/qt5/qttranslations/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qttranslations-everywhere-opensource-src-5.15.16.tar.xz) = qv27ucp138mnvpaeddvuvmdmhnvje85m+pa9o58geso= -size (qt/qttranslations-everywhere-opensource-src-5.15.16.tar.xz) = 1626988 +sha256 (qt/qt-qt/qttranslations-3cbcceb8e3e2e63a4022f1be946c7118c527a83e.tar.gz) = vy17jqld3db7wnaglloidridhnzhq572kb7fkuojhq0= +size (qt/qt-qt/qttranslations-3cbcceb8e3e2e63a4022f1be946c7118c527a83e.tar.gz) = 3019657 diff --git a/x11/qt5/qtvirtualkeyboard/makefile b/x11/qt5/qtvirtualkeyboard/makefile index d8120267f9d..e2197978fdb 100644 --- a/x11/qt5/qtvirtualkeyboard/makefile +++ b/x11/qt5/qtvirtualkeyboard/makefile @@ -1,11 +1,14 @@ qt5name = qtvirtualkeyboard comment-main = qt5 virtual keyboard plugin +kde_commit = 859d2a6ee329cc08414410b2ef8c0af77a6853d3 +kde_version = 0 + multi_packages = -main -examples shared_libs += qt5hunspellinputmethod 0.0 # 5.13 shared_libs += qt5virtualkeyboard 0.0 # 5.13 - +wantlib += ${compiler_libcxx} wantlib-main += ${compiler_libcxx} gl qt5core qt5gui qt5network qt5qml wantlib-main += qt5qmlmodels qt5quick qt5svg qt5widgets hunspell-1.7 wantlib-main += m @@ -18,4 +21,7 @@ flavors = debug modqmake_args += config+=disable-layouts +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtvirtualkeyboard/distinfo b/x11/qt5/qtvirtualkeyboard/distinfo index a078d72a305..6baf167d546 100644 --- a/x11/qt5/qtvirtualkeyboard/distinfo +++ b/x11/qt5/qtvirtualkeyboard/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.16.tar.xz) = ea5nbkxtpimui89etzex04jf+mphlat67ekvok6xlx8= -size (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.16.tar.xz) = 10951872 +sha256 (qt/qt-qt/qtvirtualkeyboard-859d2a6ee329cc08414410b2ef8c0af77a6853d3.tar.gz) = smxwfrqxb3brgd500+uxlvzp8tbolu2wj/rcvz0263i= +size (qt/qt-qt/qtvirtualkeyboard-859d2a6ee329cc08414410b2ef8c0af77a6853d3.tar.gz) = 13694253 diff --git a/x11/qt5/qtwayland/makefile b/x11/qt5/qtwayland/makefile index b25bec99184..c7ad1aaee45 100644 --- a/x11/qt5/qtwayland/makefile +++ b/x11/qt5/qtwayland/makefile @@ -1,10 +1,10 @@ qt5name = qtwayland comment = qt5 module for wayland support -kde_commit = 9340737a208b5dd4eda98eb74808951ddaef66c5 -kde_version = 59 +kde_commit = df49b9f3badce793a0a9ea850cf1a02cc5bafef6 +kde_version = 66 -shared_libs += qt5waylandclient 1.0 # 5.15 +shared_libs += qt5waylandclient 1.1 # 5.15 shared_libs += qt5waylandcompositor 0.0 # 5.15 wantlib += ${compiler_libcxx} egl gl qt5core qt5dbus qt5gui qt5network diff --git a/x11/qt5/qtwayland/distinfo b/x11/qt5/qtwayland/distinfo index e45de3215ef..7b9ba4e1a7e 100644 --- a/x11/qt5/qtwayland/distinfo +++ b/x11/qt5/qtwayland/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qt-qt/qtwayland-9340737a208b5dd4eda98eb74808951ddaef66c5.tar.gz) = tic22kh1vepfcfxxfwhwrngq2r8ehgz9ardvuavd+x8= -size (qt/qt-qt/qtwayland-9340737a208b5dd4eda98eb74808951ddaef66c5.tar.gz) = 836393 +sha256 (qt/qt-qt/qtwayland-df49b9f3badce793a0a9ea850cf1a02cc5bafef6.tar.gz) = 95kmelkzuizl4gx2qhjvf/jdjgn0bjvt0v0qzi4ulkg= +size (qt/qt-qt/qtwayland-df49b9f3badce793a0a9ea850cf1a02cc5bafef6.tar.gz) = 836527 diff --git a/x11/qt5/qtwebchannel/makefile b/x11/qt5/qtwebchannel/makefile index 594aee48cdf..113b5683144 100644 --- a/x11/qt5/qtwebchannel/makefile +++ b/x11/qt5/qtwebchannel/makefile @@ -1,7 +1,7 @@ qt5name = qtwebchannel comment-main = qt5 seamless html/javascript integration -kde_commit = b375bde968f7b9c273adfb8a89f9a6fb888f9af6 +kde_commit = 2a157921861e651f43456cb7941b250c89feb736 kde_version = 3 shared_libs += qt5webchannel 2.1 # 5.9 diff --git a/x11/qt5/qtwebchannel/distinfo b/x11/qt5/qtwebchannel/distinfo index 1ef03f8e5ab..557d8f6d612 100644 --- a/x11/qt5/qtwebchannel/distinfo +++ b/x11/qt5/qtwebchannel/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qt-qt/qtwebchannel-b375bde968f7b9c273adfb8a89f9a6fb888f9af6.tar.gz) = dhmqfzgegxj3ekxmvztdy3fs5omtvwp+csg2xlcug/e= -size (qt/qt-qt/qtwebchannel-b375bde968f7b9c273adfb8a89f9a6fb888f9af6.tar.gz) = 383821 +sha256 (qt/qt-qt/qtwebchannel-2a157921861e651f43456cb7941b250c89feb736.tar.gz) = ejro5+8k25su16a3gsu/7t3hmwkfx8yvr19s10ugagq= +size (qt/qt-qt/qtwebchannel-2a157921861e651f43456cb7941b250c89feb736.tar.gz) = 383839 diff --git a/x11/qt5/qtwebengine/makefile b/x11/qt5/qtwebengine/makefile index 655a923a76f..c34ec288a13 100644 --- a/x11/qt5/qtwebengine/makefile +++ b/x11/qt5/qtwebengine/makefile @@ -1,23 +1,18 @@ # many parts are copied from www/chromium port, so keep in sync # info # based on chromium version: 87.0.4280.144 -# patched with security patches up to: 119.0.6045.123 +# patched with security patches up to: 130.0.6723.59 use_wxneeded = yes use_nobtcfi = yes qt5name = qtwebengine -kde_commit = 17fd3176988586168bee8654008a097a5f23ec1d -kde_version = 11 -revision = 2 - -# override -version = ${qt5_webengine_version} -qt5_version = ${qt5_webengine_version} +kde_commit = 87ceb6a2ef5ee25d56f765dc533728c4ca4787e0 +kde_version = 2 # https://invent.kde.org/qt/qt/qtwebengine-chromium/-/commits/87-based?ref_type=heads dist_tuple += kde qt qt/qtwebengine-chromium \ - 1cbcced5046ed659707a4d6ce548a6fd04b20b4b src/3rdparty + 85337c28bae7d7d2c79282c4f4c92435cd7649b8 src/3rdparty only_for_archs = amd64 aarch64 i386 @@ -44,10 +39,9 @@ wantlib += qt5positioning qt5printsupport qt5qml qt5qmlmodels wantlib += qt5quick qt5quickwidgets qt5webchannel qt5widgets qt5xml wantlib += x11 x11-xcb xcomposite xdamage xext xfixes xi xrandr wantlib += xrender xtst c cbor crypto cups dbus-1 drm event execinfo -wantlib += expat fido2 fontconfig freetype gbm glib-2.0 graphite2 -wantlib += harfbuzz harfbuzz-subset intl jpeg kvm lcms2 lzma m -wantlib += minizip nspr4 nss3 nssutil3 opus pcre2-8 plc4 plds4 -wantlib += png sharpyuv smime3 snappy sndio usbhid util vpx webp +wantlib += expat fido2 fontconfig gbm harfbuzz harfbuzz-subset +wantlib += jpeg kvm lcms2 m minizip nspr4 nss3 nssutil3 opus plc4 +wantlib += plds4 png smime3 snappy sndio usbhid util vpx webp wantlib += webpdemux webpmux xcb xkbcommon xml2 xslt z # bsd-like, patents @@ -149,12 +143,4 @@ post-configure: ${chromesrc}/v8/tools/run.py \ ${chromesrc}/tools/protoc_wrapper/protoc_wrapper.py -pre-fake: -# fix version mismatches for cmake -.for module in webengine webenginecore webenginewidgets - sed -i 's,${qt5_webengine_version} $${_qt5${module}_find_version_exact},5.15.15 $${_qt5${module}_find_version_exact},g' \ - ${wrkbuild}/lib/cmake/qt5${module}/qt5${module}config.cmake -.endfor - - .include diff --git a/x11/qt5/qtwebengine/distinfo b/x11/qt5/qtwebengine/distinfo index f5f54924646..6d83181b6ec 100644 --- a/x11/qt5/qtwebengine/distinfo +++ b/x11/qt5/qtwebengine/distinfo @@ -1,4 +1,4 @@ -sha256 (qt/qt-qt/qtwebengine-17fd3176988586168bee8654008a097a5f23ec1d.tar.gz) = ul2xggxq2ucbzfowomt9xnvyua0n+amhhmm4sqwf/ba= -sha256 (qt/qt-qt/qtwebengine-chromium-1cbcced5046ed659707a4d6ce548a6fd04b20b4b.tar.gz) = z68kaf9u8zlxyjtgbhvolvnhszxx3whiczu9tt4f73s= -size (qt/qt-qt/qtwebengine-17fd3176988586168bee8654008a097a5f23ec1d.tar.gz) = 3779059 -size (qt/qt-qt/qtwebengine-chromium-1cbcced5046ed659707a4d6ce548a6fd04b20b4b.tar.gz) = 469454574 +sha256 (qt/qt-qt/qtwebengine-87ceb6a2ef5ee25d56f765dc533728c4ca4787e0.tar.gz) = gm08z2jnzu/4btgtrn/qkucbsxpyrpbj35a+zybkzxi= +sha256 (qt/qt-qt/qtwebengine-chromium-85337c28bae7d7d2c79282c4f4c92435cd7649b8.tar.gz) = e0udmjs6plnl0vuh7t7fwm7rnyl+oqhtkmer/gneq5s= +size (qt/qt-qt/qtwebengine-87ceb6a2ef5ee25d56f765dc533728c4ca4787e0.tar.gz) = 3777486 +size (qt/qt-qt/qtwebengine-chromium-85337c28bae7d7d2c79282c4f4c92435cd7649b8.tar.gz) = 469456308 diff --git a/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_v8_src_base_bit-field_h b/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_v8_src_base_bit-field_h new file mode 100644 index 00000000000..1cf5840f706 --- /dev/null +++ b/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_v8_src_base_bit-field_h @@ -0,0 +1,17 @@ +https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb7d0a7131b5a5938b12673f4b260d66cc1a527 + +index: src/3rdparty/chromium/v8/src/base/bit-field.h +--- src/3rdparty/chromium/v8/src/base/bit-field.h.orig ++++ src/3rdparty/chromium/v8/src/base/bit-field.h +@@ -39,8 +39,11 @@ class bitfield final { + static constexpr int klastusedbit = kshift + ksize - 1; + static constexpr u knumvalues = u{1} << ksize; + ++ #pragma clang diagnostic push ++ #pragma clang diagnostic ignored "-wenum-constexpr-conversion" + // value for the field with all bits set. + static constexpr t kmax = static_cast(knumvalues - 1); ++ #pragma clang diagnostic pop + + template + using next = bitfield; diff --git a/x11/qt5/qtwebglplugin/makefile b/x11/qt5/qtwebglplugin/makefile index 6f62b78f83c..08dd140d1f7 100644 --- a/x11/qt5/qtwebglplugin/makefile +++ b/x11/qt5/qtwebglplugin/makefile @@ -1,6 +1,9 @@ qt5name = qtwebglplugin comment = qpa webgl plugin for qt applications +kde_commit = b9aaac72d0853ba48f6bfd710a43df94d83d4701 +kde_version = 0 + wantlib += ${compiler_libcxx} gl qt5core qt5dbus qt5gui qt5network wantlib += qt5qml qt5qmlmodels qt5quick qt5websockets fontconfig wantlib += freetype glib-2.0 gthread-2.0 intl m z @@ -10,4 +13,7 @@ lib_depends = x11/qt5/qtdeclarative \ flavors = debug +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtwebglplugin/distinfo b/x11/qt5/qtwebglplugin/distinfo index ed492c964ad..1516505bd11 100644 --- a/x11/qt5/qtwebglplugin/distinfo +++ b/x11/qt5/qtwebglplugin/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtwebglplugin-everywhere-opensource-src-5.15.16.tar.xz) = 7fxdclmf+kjafgi1z3wh8ucnt0nripurpusf6qwv5bo= -size (qt/qtwebglplugin-everywhere-opensource-src-5.15.16.tar.xz) = 68148 +sha256 (qt/qt-qt/qtwebglplugin-b9aaac72d0853ba48f6bfd710a43df94d83d4701.tar.gz) = zpvfswcv3lbclmls2og+thbjofzp1xwzgkzpey8xbby= +size (qt/qt-qt/qtwebglplugin-b9aaac72d0853ba48f6bfd710a43df94d83d4701.tar.gz) = 65363 diff --git a/x11/qt5/qtwebsockets/makefile b/x11/qt5/qtwebsockets/makefile index 67493f3ffa7..84fb3a244c8 100644 --- a/x11/qt5/qtwebsockets/makefile +++ b/x11/qt5/qtwebsockets/makefile @@ -1,7 +1,7 @@ qt5name = qtwebsockets comment-main = qt5 implementation of websocket protocol -kde_commit = a0c1c335b691ad5ecaddbec17a14dcb2a129a177 +kde_commit = 0f910acb737cefc889ce1088fc60d15bc18efe9c kde_version = 2 shared_libs += qt5websockets 3.0 # 5.9 diff --git a/x11/qt5/qtwebsockets/distinfo b/x11/qt5/qtwebsockets/distinfo index 9521cfb0d44..c282d0df31c 100644 --- a/x11/qt5/qtwebsockets/distinfo +++ b/x11/qt5/qtwebsockets/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qt-qt/qtwebsockets-a0c1c335b691ad5ecaddbec17a14dcb2a129a177.tar.gz) = zpr7wloixge1yq+nf6wxujsgjja1my8xnhkx2msg+lw= -size (qt/qt-qt/qtwebsockets-a0c1c335b691ad5ecaddbec17a14dcb2a129a177.tar.gz) = 434870 +sha256 (qt/qt-qt/qtwebsockets-0f910acb737cefc889ce1088fc60d15bc18efe9c.tar.gz) = sdql7y1xyjnat9xposjteznvu41i1wh09nchccq6nck= +size (qt/qt-qt/qtwebsockets-0f910acb737cefc889ce1088fc60d15bc18efe9c.tar.gz) = 434877 diff --git a/x11/qt5/qtwebview/makefile b/x11/qt5/qtwebview/makefile index 533c0f909b8..6617567d152 100644 --- a/x11/qt5/qtwebview/makefile +++ b/x11/qt5/qtwebview/makefile @@ -1,6 +1,9 @@ qt5name = qtwebview comment-main = simple web viewing component for qt5 +kde_commit = 34342073a59f3a27ef3de02f6b21337c4f8db6cf +kde_version = 0 + multi_packages = -main -examples shared_libs += qt5webview 0.0 # 5.13 @@ -14,4 +17,7 @@ lib_depends = x11/qt5/qtdeclarative \ flavors = debug +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtwebview/distinfo b/x11/qt5/qtwebview/distinfo index 1e79f20cfd8..75cf50fd203 100644 --- a/x11/qt5/qtwebview/distinfo +++ b/x11/qt5/qtwebview/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtwebview-everywhere-opensource-src-5.15.16.tar.xz) = jc23f4obwy8r4nzwdpcijhjv2bea38hf5xlfqaszpmw= -size (qt/qtwebview-everywhere-opensource-src-5.15.16.tar.xz) = 128180 +sha256 (qt/qt-qt/qtwebview-34342073a59f3a27ef3de02f6b21337c4f8db6cf.tar.gz) = jrxtquvoakwyuiwiyutr1e0sansu6kwkjqwrmlczgns= +size (qt/qt-qt/qtwebview-34342073a59f3a27ef3de02f6b21337c4f8db6cf.tar.gz) = 132235 diff --git a/x11/qt5/qtx11extras/makefile b/x11/qt5/qtx11extras/makefile index 7c62170ed6a..ee28845b124 100644 --- a/x11/qt5/qtx11extras/makefile +++ b/x11/qt5/qtx11extras/makefile @@ -1,10 +1,16 @@ qt5name = qtx11extras comment = x11-specific parts of qt +kde_commit = c44c4fa86fa0794c25baef4ee1f6272aca8c511a +kde_version = 0 + shared_libs += qt5x11extras 3.0 # 5.9 wantlib += ${compiler_libcxx} gl qt5core qt5gui m flavors = debug +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtx11extras/distinfo b/x11/qt5/qtx11extras/distinfo index 4a0ec9e1825..d224eb4d61b 100644 --- a/x11/qt5/qtx11extras/distinfo +++ b/x11/qt5/qtx11extras/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtx11extras-everywhere-opensource-src-5.15.16.tar.xz) = uhkb8yr622sbk2/8thh4lcofeln59heppudley+k4ri= -size (qt/qtx11extras-everywhere-opensource-src-5.15.16.tar.xz) = 137856 +sha256 (qt/qt-qt/qtx11extras-c44c4fa86fa0794c25baef4ee1f6272aca8c511a.tar.gz) = ryl7wy6wyb3u9olrk3lwzb6rvbv0l+9swupepqjai5m= +size (qt/qt-qt/qtx11extras-c44c4fa86fa0794c25baef4ee1f6272aca8c511a.tar.gz) = 368259 diff --git a/x11/qt5/qtx11extras/pkg/plist b/x11/qt5/qtx11extras/pkg/plist index f264050593f..f6f9ae647d8 100644 --- a/x11/qt5/qtx11extras/pkg/plist +++ b/x11/qt5/qtx11extras/pkg/plist @@ -1,13 +1,7 @@ @conflict qt5-<5.6 @pkgpath x11/qt5/qtx11extras,-main include/x11/qt5/qtx11extras/ -include/x11/qt5/qtx11extras/qx11info -include/x11/qt5/qtx11extras/qtx11extras include/x11/qt5/qtx11extras/qtx11extrasdepends -include/x11/qt5/qtx11extras/qtx11extrasversion -include/x11/qt5/qtx11extras/qtx11extrasglobal.h -include/x11/qt5/qtx11extras/qtx11extrasversion.h -include/x11/qt5/qtx11extras/qx11info_x11.h @lib lib/libqt5x11extras.so.${libqt5x11extras_version} lib/pkgconfig/qt5x11extras.pc lib/qt5/cmake/qt5x11extras/ diff --git a/x11/qt5/qtxmlpatterns/makefile b/x11/qt5/qtxmlpatterns/makefile index b5c3dfeb9fe..aaa39eb68c3 100644 --- a/x11/qt5/qtxmlpatterns/makefile +++ b/x11/qt5/qtxmlpatterns/makefile @@ -1,6 +1,9 @@ qt5name = qtxmlpatterns comment-main = qt5 support for xpath, xquery, xslt and xml schema +kde_commit = 0b644263abca66503db1ce8a4e126cf358a34685 +kde_version = 0 + shared_libs += qt5xmlpatterns 3.0 # 5.9 wantlib += ${compiler_libcxx} qt5core qt5network qt5qml c m @@ -13,4 +16,7 @@ modqmake_recursive = no lib_depends = x11/qt5/qtdeclarative>=${qt5_version},<${qt5_next_version} +pre-configure: + ${qt5_gen_includes} + .include diff --git a/x11/qt5/qtxmlpatterns/distinfo b/x11/qt5/qtxmlpatterns/distinfo index 8a2dde05032..763fc22c98d 100644 --- a/x11/qt5/qtxmlpatterns/distinfo +++ b/x11/qt5/qtxmlpatterns/distinfo @@ -1,2 +1,2 @@ -sha256 (qt/qtxmlpatterns-everywhere-opensource-src-5.15.16.tar.xz) = hiuxi/dxgll+7ocm/gjhwlabd9fl023k4y4ebxxyeua= -size (qt/qtxmlpatterns-everywhere-opensource-src-5.15.16.tar.xz) = 5181984 +sha256 (qt/qt-qt/qtxmlpatterns-0b644263abca66503db1ce8a4e126cf358a34685.tar.gz) = 45eospr8txv5q4mscuill/pyn2aajnrunq15hwjc3cc= +size (qt/qt-qt/qtxmlpatterns-0b644263abca66503db1ce8a4e126cf358a34685.tar.gz) = 2117327