From 2c0a417276ce768fdd4ef96c19e4f1ba8e82aec3a7f85eb427fd7e6c4ca5347d Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Fri, 23 Feb 2024 20:08:33 +0000 Subject: [PATCH] KDE Gear 24.02 RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kontrast?expand=0&rev=92 --- applications.keyring | Bin 6936 -> 5710 bytes kontrast-23.08.4.tar.xz | 3 -- kontrast-23.08.4.tar.xz.sig | 16 -------- kontrast-24.01.95.tar.xz | 3 ++ kontrast-24.01.95.tar.xz.sig | 16 ++++++++ kontrast.changes | 6 +++ kontrast.spec | 76 +++++++++++++++++------------------ 7 files changed, 62 insertions(+), 58 deletions(-) delete mode 100644 kontrast-23.08.4.tar.xz delete mode 100644 kontrast-23.08.4.tar.xz.sig create mode 100644 kontrast-24.01.95.tar.xz create mode 100644 kontrast-24.01.95.tar.xz.sig diff --git a/applications.keyring b/applications.keyring index 9b6ab5c7fcff549a5c7c241e56901e15961ca2d85add060b3d44e0c17f90c88d..299808814995a7df8af874c79c21b829723206c7161c5b8fa8cfe0dc780a9ae5 100644 GIT binary patch delta 575 zcmV-F0>J&4HqI=t5dyPq1l9zz5CU8RvqK3p1hYUAZvua0`acK-2@=uIWdI5Z5ISm2 zxH;;k*T+;40GB(?H*yWMAZ-``_*e|R_d~@}b zcPza!RGVGD`Qt>8z4Pv1^*u-Q*}3*efL?z!Y^kQjR0ksk;$vLvv{#+63bg|LoJ93iAJM|vY1pr z#y5X)sUQLPg*L0NvWwfTJb9+63+Zy9PoTA2KzeN+WNLXq?(tU_2}vf0yAp5l52p1* z+mdZB^0;_=jDVe1(_3ht&hY0-j5eC(DU{HR<36y~o!!_x&iZfuJA_{_mEU9AWUUr zBgW_I!d=}VU3w&My`e#-Y5PhrU9(!`D56M>;}n-%Jak#+e{Ge}`Qb??shHd*cf?Sh zU4L$vB+`ly$;r{NiyS&+*lXh4+n?lLY22HZF0~(MTHp!salP&qmaOfwBNjL5hkV14tv8{-*&4JY30ft zQC0}Kr*u;^3RpiEEpiTf6BjdVsr^UAOIKoJ$?Q0{fqfjBi)#Q80RREC9z$qyX>)XM zaA+V#Wn*g~JY!~MV{1TbWMwXIa%Vn?0Zs%H0SEv%79j-kGIiv?5U;`CX%wd0($0xK zEgXjh0$EX{Mw77*8-D-_2@u=T&WS!P9EW*l2mB30+1^wyY6r5i$f8mrSjnMz8Y^+9 zKG1k2msyNa4sCq#{w-YKu2T#fxHST4G9FE8XPPX|wbX-Q|J%>pIA7LQQQ$$uhOf4e zYn2ceenhD(05I z7FQ$*Uwa2i6UWq8=9!B=*(IwWx%aI}d$NZ}g=%V&e;bh3`zOu| zQ|xo=$bTdis&<}zlh$;MS3wA8)|7WmrW}s|b%%a64 z53A>GNbf>23V-xl6xZ*}08T{4&K_t>0)jFIxd9CXSy7}$0SExgl%4Zmt=xRZe#wo= zx-e-0{fDVtT&%89@liy&tG>4Mmr|8gr$UcL6z_KIWJ***%K*!l;Pvd?9mHv4t zE{As`oojkypzerLlLSiv+zIaxt~R!xgsJTo9)C9*ntxvwl_8C0y7pU43kXLkEZQ)H zrAi9pc6@feKS20FvfC^N$1@DUHBSyJ?SGNNF>6Ag$h2Gfe?UldOcCR)q=d0By|vLd zS@W~*n9=$PY><-OP}vLH9J0F1RKGvv9TEgd&;7>e@tm%&ikFsxJKy9r^ zN-vhXqkoaNP48HT0iZagYFb&`v!+Xk<$4}*v;^((boVFI*8mX#00D^sHUt;}2ml}! zAq4U=b>zPgufgAG6sFtK&WS!P9ESx0Sy7}$0vikf3JDO~($0xKEgXkw69@o~SZO!L zc>v}|PYBq%^R(dy|8@oIcMS;t)u-ivv|q}v$$yL%ky4>C$u!8jr{1`fb`wne&v^{X z&0X5cBqOWf$FrfunTdPe=`)mJoa~_G${V0UIl2O)ZK|cfS1B5c8O4vt-`Q(W8eL(k znY%bS|v98{7aL68cnGQwrGAnL0JiK=7X={#;jGuS(5x zT3@KEDyEnLW{Qe8eA44yI=D#hxVs?&U5XgsY<-+hvRy?U%E~ z2+#9+dbO*F)->-IEF-%uaeF4|?U15jXUZJ?o%VAU;lS3z$W?#Y=QSiJ zo%rN5yd#%%xO+ngP;t@n)4HDo1JLtH5n=8~Z3FOgHyIy7Fz|L|xK`rNNw}}0vJ+Q3 zh9Di>Evd!oP(=5&CtVnlL8@$^KfF}}FZi@q(2cy@4UupNa0P>Yy)9Vp9^4oEjs_&2 z_XaqU4m6a|L?49)o*d%p(b#|e4HYFQ(~JHLti_hA0twdJ9$D1B^lPlJ7XoUrY;8{> z6)SGRqj0Zy`2$n77!NM6)ihJQEPNLj6Obmx!udS)#M2AQsuu4jkuw&&h5}fd#&RH( zXcJW5*9{;?R88R-JtfU?g{8XGpP%7Q@G&l8L;#EC(4j=@*jGp!s|OxQSakL>Mzm>T dFhI7^_lb;rB8RGZhpD!NUE`BDuCxCUPXtYPO@06X diff --git a/kontrast-23.08.4.tar.xz b/kontrast-23.08.4.tar.xz deleted file mode 100644 index 46a5565..0000000 --- a/kontrast-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d71d29221ba7db1bcd52e1e7ec369b272a58d0f7ee1d120d585b5a34e04c9fb0 -size 211820 diff --git a/kontrast-23.08.4.tar.xz.sig b/kontrast-23.08.4.tar.xz.sig deleted file mode 100644 index 7c713d9..0000000 --- a/kontrast-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVx8lYACgkQu0YzUNbv -Me+hQg/+Lshg0bR5WoBd4i1IZHlipiPa+Uyyf7ggL30AejtFa3tSMkRwPOMZDwmm -MADEH7zXGADRNr5nlOCB+kQ/NOEeip1xOVJAvWzXe+PzXkKuTzZHZ2j+ZnROb0KG -dNmImo/eVo4MgZQktAgosyLi2eb+k2OzS6M0hTNW6Whyc45LuqVwUMnokWvIHz34 -1mWhGGinvjNHD8/iwMeXS4bYcJQhDZC0e8WwHc05V05IVVuDO0Ht/qgWNn9TQKi6 -8Q5EQaLiKoZjYREMytdckUv42Pdv6bZqXyHxXNX6tsUvhhW+qom5XkbwW688Mg7P -47jtLKbN6cCAfhNsTtNrlrElB597bDaATXHUBtHDt2mi/Kk3AhhCDX30ILVrVA54 -qpgLIpX3JsRL8EbrBiLmeyaozr9nvWbK4apLAqIot3uvllkq+r+eGldhzQ93aL6U -Jl/PQi3/xetU+fqLaPfoxhFoz1bmAZaBqQe3uesFjo7Exu9WKTDtn3LN3VZGRQaI -0S164d889MXZfLOOfONpzKXwcvuy1L+OGsl/bsttNr9LCXMiRFmCdMyfqplOpSx2 -o3cXR8pkzWZ7O40+RuP1BqGwjsqqeJiUtjGITY6UvblxOdGcHUHrWjC3/bBlA46j -PW4hOdzvXbUDJpwAa4CpVT5tHebVZl+cdjqf92cXXdwxjEEXqzw= -=qFu3 ------END PGP SIGNATURE----- diff --git a/kontrast-24.01.95.tar.xz b/kontrast-24.01.95.tar.xz new file mode 100644 index 0000000..f7df6b4 --- /dev/null +++ b/kontrast-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:198ae8ce4796668cb06e7bf92f70d27df5286f1f95a8e014b9a80098df210968 +size 211304 diff --git a/kontrast-24.01.95.tar.xz.sig b/kontrast-24.01.95.tar.xz.sig new file mode 100644 index 0000000..a7bc37e --- /dev/null +++ b/kontrast-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW45FEACgkQOmpNuDnq +ptfosQ//WZI7uEOho/bZttydtkHzX6FaZSAZ0DJkP6rvratFRyThhBS69BA7afHW +Fh5l3sukYWpIoLSvMfIQGlNmvM6/AmwXrcdjbxbFy1bDvWCo/bO61mOBKlqcLIbl +9TZ/szSkg1QiI3vgqty4dtn7rtWleZMXvV3xlPONDVsgTLGCaZBU7+jbGxJw2qae +PWRHK9nJh81Y1h3RZdSRP6ZF+/zE5sIpc7Y2fELjS60gnm7KhRSIclqgPtjTGHUS +AlcaKkAY53ks4KyxIa47oDmV7CeWosYb47TYjSnz7Kejwaops1UaXijbXA6Ei2kC +zREsv0ohqk8jIAk3gWr2Np7gnSg9zzlANEhvYiatcVj1lCJxbZcGPepEL9oS0Hva +s7bTVlxQUgfZPDNJN4Ny3EuJNTBtFuiLQGeedzoSVwhyuNVBsU7cnkbpt6AXJos+ +qYPNzdDtrk9kz2f4+igTC2puCfMpXcjAYN+MB+yZJugvdQr3gPPOzUYTrAId8XYN +/T9ZVB2uY25XfHA4XG9qJsiJAHTlRM1EXGGtdCeghysR60eEhB6LB2SyTchK4GJs +zYmGyTLAXYKMC3yOLxP5t4AUm/WCDXNAQLfep/vHioZvBHqafycOnPYJbOSz9Ew8 +gAblYtYi8Ju4EK9D7P5Idpc4HhCUbOFhcD4reygfPYkMYu6QhcI= +=FiJz +-----END PGP SIGNATURE----- diff --git a/kontrast.changes b/kontrast.changes index 15e4200..dec52bf 100644 --- a/kontrast.changes +++ b/kontrast.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:09:06 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:20:01 UTC 2023 - Christophe Marin diff --git a/kontrast.spec b/kontrast.spec index 9275c72..eb22a7a 100644 --- a/kontrast.spec +++ b/kontrast.spec @@ -1,7 +1,7 @@ # # spec file for package kontrast # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,41 +16,41 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: kontrast -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: Contrast checker License: GPL-3.0-or-later AND CC0-1.0 URL: https://apps.kde.org/kontrast -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif -BuildRequires: extra-cmake-modules -%if 0%{?suse_version} == 1500 -# gcc10 is not enough. Missing std::coroutine_handle -BuildRequires: gcc12-c++ -BuildRequires: gcc12-PIE -%endif +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: update-desktop-files -BuildRequires: cmake(FutureSQL5) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5Declarative) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5Kirigami2) -BuildRequires: cmake(QCoro5Core) -BuildRequires: cmake(Qt5Core) >= 5.15.2 -BuildRequires: cmake(Qt5DBus) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Qml) -BuildRequires: cmake(Qt5QuickControls2) -BuildRequires: cmake(Qt5Sql) -BuildRequires: cmake(Qt5Svg) -Requires: kirigami2 -Requires: libqt5-qtquickcontrols +BuildRequires: cmake(FutureSQL6) +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6Kirigami) >= %{kf6_version} +BuildRequires: cmake(QCoro6Core) +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6DBus) >= %{qt6_version} +BuildRequires: cmake(Qt6Gui) >= %{qt6_version} +BuildRequires: cmake(Qt6Qml) >= %{qt6_version} +BuildRequires: cmake(Qt6QuickControls2) >= %{qt6_version} +BuildRequires: cmake(Qt6Sql) >= %{qt6_version} +BuildRequires: cmake(Qt6Svg) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +Requires: kf6-kirigami-imports >= %{kf6_version} +Requires: qt6-declarative-imports >= %{qt6_version} +Requires: qt6-sql-sqlite >= %{qt6_version} + %lang_package %description @@ -61,28 +61,26 @@ used together. %autosetup -p1 %build -%if 0%{?suse_version} == 1500 - export CXX=g++-12 -%endif -%cmake_kf5 -d build -%cmake_build +%cmake_kf6 + +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install -%find_lang %{name} -%{kf5_find_htmldocs} +%find_lang %{name} --with-html %suse_update_desktop_file -r org.kde.kontrast Qt KDE Utility Accessibility %files %license LICENSES/* -%doc %lang(en) %{_kf5_htmldir}/en/kontrast/ -%{_kf5_applicationsdir}/org.kde.kontrast.desktop -%{_kf5_appstreamdir}/org.kde.kontrast.appdata.xml -%{_kf5_bindir}/kontrast -%{_kf5_iconsdir}/hicolor/scalable/apps/org.kde.kontrast.svg +%doc %lang(en) %{_kf6_htmldir}/en/kontrast/ +%{_kf6_applicationsdir}/org.kde.kontrast.desktop +%{_kf6_appstreamdir}/org.kde.kontrast.appdata.xml +%{_kf6_bindir}/kontrast +%{_kf6_iconsdir}/hicolor/scalable/apps/org.kde.kontrast.svg %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/kontrast/ %changelog