From 65fc0536ff16b7833638444752cfe72a6ec77608fc62484b27efa1cba4e47e5a Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Thu, 16 May 2024 14:48:38 +0000 Subject: [PATCH] Accepting request 1173411 from home:AndnoVember:branches:X11:LXQt - Update to 2.0.0: * Ported to Qt6 * The existence of qApp is checked to prevent crashes. OBS-URL: https://build.opensuse.org/request/show/1173411 OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/lxqt-qtplugin?expand=0&rev=33 --- lxqt-qtplugin-1.4.1.tar.xz | 3 -- lxqt-qtplugin-1.4.1.tar.xz.asc | 17 --------- lxqt-qtplugin-2.0.0.tar.xz | 3 ++ lxqt-qtplugin-2.0.0.tar.xz.asc | 17 +++++++++ lxqt-qtplugin.changes | 7 ++++ lxqt-qtplugin.spec | 65 +++++++++++++--------------------- 6 files changed, 51 insertions(+), 61 deletions(-) delete mode 100644 lxqt-qtplugin-1.4.1.tar.xz delete mode 100644 lxqt-qtplugin-1.4.1.tar.xz.asc create mode 100644 lxqt-qtplugin-2.0.0.tar.xz create mode 100644 lxqt-qtplugin-2.0.0.tar.xz.asc diff --git a/lxqt-qtplugin-1.4.1.tar.xz b/lxqt-qtplugin-1.4.1.tar.xz deleted file mode 100644 index 862e24e..0000000 --- a/lxqt-qtplugin-1.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:953420cd55bc7281d9140640ded5c56bc769bc61fab5d85c63a0559e4677ecd4 -size 24252 diff --git a/lxqt-qtplugin-1.4.1.tar.xz.asc b/lxqt-qtplugin-1.4.1.tar.xz.asc deleted file mode 100644 index 060cb06..0000000 --- a/lxqt-qtplugin-1.4.1.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmYZGFAVHHRzdWphbjIw -MDBAZ21haWwuY29tAAoJEL55MAetIt9+hFUQAL7eGkhHf0tAoytxGJsJoi1BLnRB -5DHu78eb6sah3mE2Xpqs2c1nQydU3ilrbzfJI5nXRRQiVMWrq9moawYtdHlNsNEc -9yXy9BX4aZlR0NrbXO2ro59l1rCYzOedGUO0E7wm6iW0KAleUqWfBHMhQhWuVoP4 -bIOW+Kiaj+t/hf2VAkxrQkXF0z+VIdZMT1ytutzG/RKAm0fCTWVb09M6ZwLtZ9M+ -TF2MWhqi0z5u1RJuNg1jQKU9IEv3XPG7KCZBW96C3TvHhczMXJQiA97mGH2SF284 -4CVYhlFDU+N9URjc4YZKbrIrsFWQ8Rr7k0F68jRC7rDsu6Mh7COa9bmgHOzUy2e9 -/vl85togEaki8QQjSHv930UU6C+w96lI4oMAYw8wNSUMceXjr5JwLc1gXN++AhWx -aFpQoIlScpPG9ty7ioaPkU9VlDq/N8tdquDb1T6k/+o9XOfN7rIU2Rmk4HubcpTA -8TC/uED+06MZR+MO56/v8Pz5D8AAMZ3l8CxsC5JIFQJ6eH5oVIyI3oQ2qN7ouBPJ -aMdir6u1xRjCiDnM0VyQLiVNm+6GiX/rnYQXZ6gNZoj1WsZVujNw519qrjbAQvVn -LonlLiXcdBAgIrkx/qFC26k/sXZ2bTekhgC4Z9OftRegbxCtoIpmqCKy4uIWuneV -OdvCQWMy08VWe0d3 -=g/oV ------END PGP SIGNATURE----- diff --git a/lxqt-qtplugin-2.0.0.tar.xz b/lxqt-qtplugin-2.0.0.tar.xz new file mode 100644 index 0000000..1734148 --- /dev/null +++ b/lxqt-qtplugin-2.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd9563cfad565d1e3b3fbf2fee2224824f3c76d6b97fec868e332234cb245d8e +size 24128 diff --git a/lxqt-qtplugin-2.0.0.tar.xz.asc b/lxqt-qtplugin-2.0.0.tar.xz.asc new file mode 100644 index 0000000..0890a12 --- /dev/null +++ b/lxqt-qtplugin-2.0.0.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmYfqIIVHHRzdWphbjIw +MDBAZ21haWwuY29tAAoJEL55MAetIt9+7PcQALMrsiiw6q4KeUILrubMhfeCES0B +JkR7acVLKoDzzJNdwg+bqltbWh3haqepLezJHpO+NvTWqk7USII5txKO/0Ls3RkG +frm+r2rtpchVUvQjWqqybbxXu8znLbQqwVAEnN/Hz3bV7w+teX7yqluLsNd+3eVN +QzJLjhzvPuPbtakiDoJ3Jwd/HwKJ1Udu7dZIniC0SbxooQaqHD7qc1dYAm3oPL4W ++K+viKEEfpcGPg9A71Zze+Lk5vP28qRytzjbpE6B9JwzJMZlr75/qH9c1t5/P+YO +9EDlxiVjzWKY4ciwlAhI5eiFjE2RINIA/hvTBueqoqtFzdZ5xNISppawRHoPzDu5 +islUkwBfyHg8q5aDxd6Cd4n6kRgQw13mhL2xTPLL8G/S4wnQVKjrvJKj+sq7Lo2t +smfM4aIBgIUXr9EK/Ed8c11xeE9kcV0LD4m5ge1RgRndlqJt74/yKwJunNKHNf+z +N4ceqDk58WGGR/ebDYz8onEUaCradfDI8uu6vOl2Oy9MvJLAvmf/e3rFSetCi8Wu +S6hxpOkh8MBV5tr0V/3VwmXHGj0IytPtllxAvkS6btnXHxjrM9B+JXG8nD+4E4AJ +Z5G8z4xk/fJzxIbfxQKcLVnNNtLM/GQlWihkjynaNBKa/Tv3yf1ccV0327L9QXVI +jW1v1kDy2kAx9nzz +=MQX0 +-----END PGP SIGNATURE----- diff --git a/lxqt-qtplugin.changes b/lxqt-qtplugin.changes index 5c10477..31ba451 100644 --- a/lxqt-qtplugin.changes +++ b/lxqt-qtplugin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat May 11 09:20:11 UTC 2024 - Андрей Алыпов + +- Update to 2.0.0: + * Ported to Qt6 + * The existence of qApp is checked to prevent crashes. + ------------------------------------------------------------------- Fri Apr 12 14:12:24 UTC 2024 - Michael Vetter diff --git a/lxqt-qtplugin.spec b/lxqt-qtplugin.spec index cd76f5f..f44b0ef 100644 --- a/lxqt-qtplugin.spec +++ b/lxqt-qtplugin.spec @@ -17,63 +17,46 @@ Name: lxqt-qtplugin -Version: 1.4.1 +Version: 2.0.0 Release: 0 -Summary: LXQt platform integration plugin for Qt 5 +Summary: LXQt platform integration plugin License: LGPL-2.1-or-later Group: System/GUI/LXQt -URL: http://www.lxqt.org -Source: https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz -Source1: https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc +URL: https://github.com/lxqt/lxqt-qtplugin +Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz +Source1: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring -BuildRequires: cmake >= 3.1.0 +BuildRequires: cmake >= 3.18.0 BuildRequires: gcc-c++ -BuildRequires: libQt5Gui-private-headers-devel -BuildRequires: libexif-devel -BuildRequires: lxqt-build-tools-devel >= 0.13.0 BuildRequires: pkgconfig -BuildRequires: cmake(KF5WindowSystem) -BuildRequires: pkgconfig(Qt5Gui) >= 5.15.0 -BuildRequires: pkgconfig(Qt5UiTools) -BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: pkgconfig(Qt5Xdg) >= 3.11.0 -BuildRequires: pkgconfig(Qt5XdgIconLoader) -BuildRequires: pkgconfig(dbusmenu-qt5) -BuildRequires: pkgconfig(libfm-qt) >= 1.4.0 -BuildRequires: pkgconfig(lxqt) >= 1.4.0 -%if 0%{?fedora_version} -%requires_eq qt5-qtbase-gui -%else -%requires_eq libQt5Gui5 -%endif +BuildRequires: qt6-gui-private-devel +BuildRequires: cmake(Qt6DBus) +BuildRequires: cmake(Qt6Gui) >= 6.3.0 +BuildRequires: cmake(Qt6LinguistTools) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(fm-qt6) +BuildRequires: cmake(lxqt2-build-tools) +BuildRequires: pkgconfig(Qt6XdgIconLoader) +BuildRequires: pkgconfig(dbusmenu-lxqt) %description -With this plugin, all Qt-based programs can adopt settings of -LXQt, such as the icon theme. - -To use the plugin in Qt5, we have to export the environment -variable QT_QPA_PLATFORMTHEME=lxqt. Then every Qt5 program -can load the theme plugin. -If, for some unknown reasons, the plugin is not loaded, we can -debug the plugin by exporting QT_DEBUG_PLUGINS=1. -Then, Qt5 will print detailed information and error messages -about all plugins in the console when running any Qt5 programs. +A library libqtlxqt to integrate Qt with LXQt. With this plugin, all +Qt-based programs can adopt settings of LXQt, such as the icon theme. %prep -%setup -q +%autosetup %build -%cmake -make %{?_smp_mflags} +%cmake_qt6 +%{qt6_build} %install -%cmake_install +%{qt6_install} %files %license LICENSE -%doc AUTHORS README.md -%dir %{_libdir}/qt5/plugins -%dir %{_libdir}/qt5/plugins/platformthemes -%{_libdir}/qt5/plugins/platformthemes/libqtlxqt.so +%doc AUTHORS CHANGELOG README.md +%dir %{_qt6_pluginsdir}/platformthemes +%{_qt6_pluginsdir}/platformthemes/libqtlxqt.so %changelog