diff --git a/recipes-lxqt/compton-conf/compton-conf_git.bb b/recipes-lxqt/compton-conf/compton-conf_git.bb index 966c7824..55c1cef0 100644 --- a/recipes-lxqt/compton-conf/compton-conf_git.bb +++ b/recipes-lxqt/compton-conf/compton-conf_git.bb @@ -6,8 +6,8 @@ inherit lxqt pkgconfig DEPENDS += "libconfig" -SRCREV = "166a42fcbb802a122ca8614871cae98604be061f" -PV = "0.3.0" +SRCREV = "c6a6dd01d53fcb5c778e3d2d76371f1e034ab676" +PV = "0.4.0" FILES_${PN} += "${datadir}/${BPN}/compton.conf.example" diff --git a/recipes-lxqt/libfm-qt/files/0001-fix-cross-include-path.patch b/recipes-lxqt/libfm-qt/files/0001-fix-cross-include-path.patch new file mode 100644 index 00000000..6a4287a0 --- /dev/null +++ b/recipes-lxqt/libfm-qt/files/0001-fix-cross-include-path.patch @@ -0,0 +1,38 @@ +From d77352eb287f457d0fb43689cbbbcd864097a9f2 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher +Date: Mon, 21 May 2018 11:16:35 +0000 +Subject: [PATCH] fix cross include path + +src/CMakeLists.txt uses the FM_INCLUDE_DIR variable to specify an additonal +includedir. FM_INCLUDE_DIR is read from the pkg config variable includedir +which does not get modified by the pkg config sysroot, so we add an "-I" +statement pointing to the build host's /usr/include which throws a compiler +warning and a OE QA WARNING. + +| cc1plus: warning: include location "/usr/include/libfm" is unsafe for cross-compilation [-Wpoison-system-directories] + +| WARNING: libfm-qt-0.12.0-r0 do_package_qa: QA Issue: libfm-qt: The compile log indicates that host include and/or library paths were used. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Max Krummenacher +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 0695854..bd6a715 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -142,7 +142,7 @@ target_include_directories(${LIBFM_QT_LIBRARY_NAME} + PRIVATE "${Qt5Gui_PRIVATE_INCLUDE_DIRS}" + PUBLIC + "${FM_INCLUDE_DIRS}" +- "${FM_INCLUDE_DIR}/libfm" # to workaround incorrect #include in fm-actions. ++ "$ENV{PKG_CONFIG_SYSROOT_DIR}${FM_INCLUDE_DIR}/libfm" # to workaround incorrect #include in fm-actions. + "${MENUCACHE_INCLUDE_DIRS}" + "${XCB_INCLUDE_DIRS}" + "${EXIF_INCLUDE_DIRS}" +-- +2.13.6 + diff --git a/recipes-lxqt/libfm-qt/files/0001-src-CMakeLists.txt-hard-code-xcb-link-target.patch b/recipes-lxqt/libfm-qt/files/0001-src-CMakeLists.txt-hard-code-xcb-link-target.patch deleted file mode 100644 index 9516a731..00000000 --- a/recipes-lxqt/libfm-qt/files/0001-src-CMakeLists.txt-hard-code-xcb-link-target.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e8711b9b3c93085063b8ee7ac31a62e5860dcae3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 27 Sep 2016 00:42:15 +0200 -Subject: [PATCH] src/CMakeLists.txt: hard code xcb link target -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -FindXCB.cmake default drags in absolute path - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f6ceea0..cc1ce27 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -112,7 +112,7 @@ target_link_libraries(${LIBFM_QT_LIBRARY_NAME} - ${LIBFM_LIBRARIES} - ${LIBMENUCACHE_LIBRARIES} - ${SYSTEM_LIBS_LIBRARIES} -- ${XCB_LIBRARIES} -+ xcb - ) - - # set libtool soname --- -2.5.5 - diff --git a/recipes-lxqt/libfm-qt/libfm-qt_git.bb b/recipes-lxqt/libfm-qt/libfm-qt_git.bb index ff2a5624..9605e1a9 100644 --- a/recipes-lxqt/libfm-qt/libfm-qt_git.bb +++ b/recipes-lxqt/libfm-qt/libfm-qt_git.bb @@ -10,8 +10,9 @@ DEPENDS += "qtx11extras glib-2.0 libfm menu-cache libxcb liblxqt" CMAKE_ALIGN_FILES_FIND = "*targets.cmake" -SRCREV = "6f8c1e9c3c61aa7fb07f64300a78933dfe183460" -PV = "0.12.0" +SRC_URI += "file://0001-fix-cross-include-path.patch" +SRCREV = "42c538bd1d4a30a53509ab8b2e8a9437482acbec" +PV = "0.13.0" FILES_${PN} += "${datadir}/mime" diff --git a/recipes-lxqt/liblxqt/liblxqt_git.bb b/recipes-lxqt/liblxqt/liblxqt_git.bb index 6a1e5e85..3bde9a3b 100644 --- a/recipes-lxqt/liblxqt/liblxqt_git.bb +++ b/recipes-lxqt/liblxqt/liblxqt_git.bb @@ -6,10 +6,10 @@ inherit lxqt distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -DEPENDS += "qttools libqtxdg kwindowsystem libxscrnsaver" +DEPENDS += "qttools libqtxdg kwindowsystem libxscrnsaver polkit-qt-1" -SRCREV = "9efc2eeb70c2275b985277a9a2238556aaf43f5d" -PV = "0.12.0" +SRCREV = "d9f9f62e48de432ce2fe3e9c4c91f21dc089d777" +PV = "0.13.0" EXTRA_OECMAKE += " \ -DCMAKE_INSTALL_DATAROOTDIR=share \ @@ -22,3 +22,8 @@ EXTRA_OECMAKE += " \ RPROVIDES_${PN} += "lxqt-common" RREPLACES_${PN} += "lxqt-common" RCONFLICTS_${PN} += "lxqt-common" + +FILES_${PN} += " \ + /usr/share/polkit-1/ \ + /usr/share/lxqt/ \ +" diff --git a/recipes-lxqt/libqtxdg/libqtxdg_git.bb b/recipes-lxqt/libqtxdg/libqtxdg_git.bb index 7082828c..3eb311b9 100644 --- a/recipes-lxqt/libqtxdg/libqtxdg_git.bb +++ b/recipes-lxqt/libqtxdg/libqtxdg_git.bb @@ -14,7 +14,7 @@ EXTRA_OECMAKE += " \ -DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=${OE_QMAKE_PATH_PLUGINS}/iconengines \ " -SRCREV = "7b46be496c67f65deabb84fdab2c66bcf54d288a" -PV = "3.1.0" +SRCREV = "3d586ec6179f30723b44342cb116986cdf90be77" +PV = "3.2.0" FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/iconengines" diff --git a/recipes-lxqt/libsysstat/libsysstat_git.bb b/recipes-lxqt/libsysstat/libsysstat_git.bb index bbbee717..514e7236 100644 --- a/recipes-lxqt/libsysstat/libsysstat_git.bb +++ b/recipes-lxqt/libsysstat/libsysstat_git.bb @@ -4,5 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da" inherit lxqt -SRCREV = "72477b8d81c0a9ba2e7e155b66a83efedca82988" -PV = "0.4.0" +SRCREV = "01a61d1c8f27fe8f9cd175967de687d2e9fdbbbf" +PV = "0.4.1" diff --git a/recipes-lxqt/lximage-qt/lximage-qt_git.bb b/recipes-lxqt/lximage-qt/lximage-qt_git.bb index deedb7d2..d1005460 100644 --- a/recipes-lxqt/lximage-qt/lximage-qt_git.bb +++ b/recipes-lxqt/lximage-qt/lximage-qt_git.bb @@ -1,4 +1,4 @@ -SUMMARY = "LXQt system settings center" +SUMMARY = "The image viewer and screenshot tool for LXQt" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b" @@ -8,7 +8,7 @@ inherit lxqt pkgconfig distro_features_check gtk-icon-cache mime DEPENDS += "qtx11extras qtsvg libfm-qt libexif libxfixes" -SRCREV = "84dc86611f3e3356dd6fbef6c72b29948278015a" -PV = "0.6.0" +SRCREV = "a577151ae6935dfa890b961f2dff833d21e3a4a9" +PV = "0.7.0" FILES_${PN} += "${datadir}/icons" diff --git a/recipes-lxqt/lxqt-about/lxqt-about_git.bb b/recipes-lxqt/lxqt-about/lxqt-about_git.bb index 73561726..31296125 100644 --- a/recipes-lxqt/lxqt-about/lxqt-about_git.bb +++ b/recipes-lxqt/lxqt-about/lxqt-about_git.bb @@ -8,5 +8,5 @@ DEPENDS += " \ liblxqt \ " -SRCREV = "d541d05cc72f129f6087d153710a41dc580c6a8d" -PV = "0.12.0" +SRCREV = "f085a04cbf523a961ac6110a5c5ab7c669b53652" +PV = "0.13.0" diff --git a/recipes-lxqt/lxqt-admin/lxqt-admin_git.bb b/recipes-lxqt/lxqt-admin/lxqt-admin_git.bb index 193b496e..2e229885 100644 --- a/recipes-lxqt/lxqt-admin/lxqt-admin_git.bb +++ b/recipes-lxqt/lxqt-admin/lxqt-admin_git.bb @@ -8,8 +8,8 @@ DEPENDS += " \ liblxqt \ " -SRCREV = "7c45baad1ffd2a68aef5bce8e9c3f7f07043b878" -PV = "0.12.0" +SRCREV = "01ae9e61c49a781dcdda933f147b0c3964979293" +PV = "0.13.0" FILES_${PN} += "${datadir}/polkit-1" diff --git a/recipes-lxqt/lxqt-build-tools/lxqt-build-tools_git.bb b/recipes-lxqt/lxqt-build-tools/lxqt-build-tools_git.bb index 3698eef5..a7495abb 100644 --- a/recipes-lxqt/lxqt-build-tools/lxqt-build-tools_git.bb +++ b/recipes-lxqt/lxqt-build-tools/lxqt-build-tools_git.bb @@ -10,8 +10,8 @@ do_configure_append() { } SRC_URI = "git://github.com/lxde/${BPN}.git;protocol=git;branch=master" -SRCREV = "496ff5c72403dbe0833d9543b90d986023e72923" -PV = "0.4.0" +SRCREV = "61ed15b7346771a0e24dfeed0f244596fb08fdce" +PV = "0.5.0" S = "${WORKDIR}/git" CMAKE_ALIGN_SYSROOT[1] = "lxqt-build-tools, -sgcc-ar, -S${TARGET_PREFIX}gcc-ar" diff --git a/recipes-lxqt/lxqt-config/lxqt-config/0001-timeoutdialog.cpp-include-QIcon-QStyle-explicitely.patch b/recipes-lxqt/lxqt-config/lxqt-config/0001-timeoutdialog.cpp-include-QIcon-QStyle-explicitely.patch deleted file mode 100644 index 9327ed6f..00000000 --- a/recipes-lxqt/lxqt-config/lxqt-config/0001-timeoutdialog.cpp-include-QIcon-QStyle-explicitely.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 32beef3ac2c308afcbc8ded14ebfc3c8a72d1a80 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Sun, 6 May 2018 11:26:25 +0000 -Subject: [PATCH] timeoutdialog.cpp: include QIcon, QStyle explicitely - -5.11 Qt headers do not indirectly include QIcon, QStyle resulting in compile -time errors like: - -| timeoutdialog.cpp:32:25: error: invalid use of incomplete type 'class QStyle' - -Upstream-Status: Submitted [https://github.com/lxqt/lxqt-config/pull/151] - -Signed-off-by: Max Krummenacher ---- - lxqt-config-monitor/timeoutdialog.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lxqt-config-monitor/timeoutdialog.cpp b/lxqt-config-monitor/timeoutdialog.cpp -index 55302a9..0862447 100644 ---- a/lxqt-config-monitor/timeoutdialog.cpp -+++ b/lxqt-config-monitor/timeoutdialog.cpp -@@ -20,6 +20,9 @@ - - #define TIMER_DURATION 10 - -+#include -+#include -+ - #include "timeoutdialog.h" - - TimeoutDialog::TimeoutDialog(QWidget* parent, Qt::WindowFlags f) : --- -2.13.6 - diff --git a/recipes-lxqt/lxqt-config/lxqt-config_git.bb b/recipes-lxqt/lxqt-config/lxqt-config_git.bb index e398f4d5..7b92f511 100644 --- a/recipes-lxqt/lxqt-config/lxqt-config_git.bb +++ b/recipes-lxqt/lxqt-config/lxqt-config_git.bb @@ -8,9 +8,8 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "qtsvg liblxqt libkscreen libxcursor" -SRC_URI += "file://0001-timeoutdialog.cpp-include-QIcon-QStyle-explicitely.patch" -SRCREV = "0ff80827f32f43cd1c1bfc832f69e285874dad5e" -PV = "0.12.0" +SRCREV = "9bd6ae9205909f70101aebaa7f316478965905fe" +PV = "0.13.0" # there are no dev files / pack liblxqt-config-cursor.so correctly FILES_${PN} += " \ diff --git a/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb b/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb index 28826a35..36979475 100644 --- a/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb +++ b/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb @@ -8,5 +8,5 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "liblxqt" -SRCREV = "84e9c3148e70bbb5338cb2edcf09d6ff6d74e082" -PV = "0.12.0" +SRCREV = "6bb0e30c9cbda5e7995d01b815692ff46294dda6" +PV = "0.13.0" diff --git a/recipes-lxqt/lxqt-l10n/lxqt-l10n_git.bb b/recipes-lxqt/lxqt-l10n/lxqt-l10n_git.bb index 176f76d7..8988d0d7 100644 --- a/recipes-lxqt/lxqt-l10n/lxqt-l10n_git.bb +++ b/recipes-lxqt/lxqt-l10n/lxqt-l10n_git.bb @@ -6,7 +6,7 @@ inherit lxqt qt5-translation DEPENDS += "liblxqt" -SRCREV = "338b1ff6308ca271902f72715f61a40c2f93de93" -PV = "0.12.0" +SRCREV = "91a536e5dec55d0b90ddaa8425d392fe9d7d7d8f" +PV = "0.13.0" ALLOW_EMPTY_${PN} = "1" diff --git a/recipes-lxqt/lxqt-notificationd/lxqt-notificationd/0001-notification.cpp-include-QStyleOption-explicitely.patch b/recipes-lxqt/lxqt-notificationd/lxqt-notificationd/0001-notification.cpp-include-QStyleOption-explicitely.patch deleted file mode 100644 index 618d87e7..00000000 --- a/recipes-lxqt/lxqt-notificationd/lxqt-notificationd/0001-notification.cpp-include-QStyleOption-explicitely.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 98549a470361691537e7feadc2e519ea5aeb8320 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Sun, 6 May 2018 09:27:54 +0000 -Subject: [PATCH] notification.cpp: include QStyleOption explicitely - -5.11 Qt headers do not indirectly include QStyleOption resulting in compile -time errors like: -| notification.cpp:219:5: error: 'QStyleOption' was not declared in this scope - -Upstream-Status: Submitted [https://github.com/lxqt/lxqt-notificationd/pull/79] - -Signed-off-by: Max Krummenacher ---- - src/notification.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/notification.cpp b/src/notification.cpp -index 4e1553d..333e974 100644 ---- a/src/notification.cpp -+++ b/src/notification.cpp -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #include "notification.h" - #include "notificationwidgets.h" --- -2.13.6 - diff --git a/recipes-lxqt/lxqt-notificationd/lxqt-notificationd_git.bb b/recipes-lxqt/lxqt-notificationd/lxqt-notificationd_git.bb index ecfb1ea6..f4b4ed1f 100644 --- a/recipes-lxqt/lxqt-notificationd/lxqt-notificationd_git.bb +++ b/recipes-lxqt/lxqt-notificationd/lxqt-notificationd_git.bb @@ -6,6 +6,5 @@ inherit lxqt DEPENDS += "liblxqt libqtxdg kwindowsystem" -SRC_URI += "file://0001-notification.cpp-include-QStyleOption-explicitely.patch" -SRCREV = "6a93910037d2d59bd885fa71e2ea713778376869" -PV = "0.12.0" +SRCREV = "488b7f82e4b12d94e5f988648c69e1f27aa99046" +PV = "0.13.0" diff --git a/recipes-lxqt/lxqt-openssh-askpass/lxqt-openssh-askpass_git.bb b/recipes-lxqt/lxqt-openssh-askpass/lxqt-openssh-askpass_git.bb index 902a061b..b8037a01 100644 --- a/recipes-lxqt/lxqt-openssh-askpass/lxqt-openssh-askpass_git.bb +++ b/recipes-lxqt/lxqt-openssh-askpass/lxqt-openssh-askpass_git.bb @@ -6,5 +6,5 @@ inherit lxqt DEPENDS += "liblxqt" -SRCREV = "c0d40adf480469e9817294c64589484b198a9585" -PV = "0.12.0" +SRCREV = "53d8d4efe765d4bb234c9e9ec94f64b03680b103" +PV = "0.13.0" diff --git a/recipes-lxqt/lxqt-panel/lxqt-panel/0001-lxqtmainmenuconfiguration.cpp-include-QAction-explic.patch b/recipes-lxqt/lxqt-panel/lxqt-panel/0001-lxqtmainmenuconfiguration.cpp-include-QAction-explic.patch deleted file mode 100644 index f6dfdefd..00000000 --- a/recipes-lxqt/lxqt-panel/lxqt-panel/0001-lxqtmainmenuconfiguration.cpp-include-QAction-explic.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cb2d1d8d5bab855f15e96dec6410ae1477e658ba Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Sun, 6 May 2018 09:39:03 +0000 -Subject: [PATCH] lxqtmainmenuconfiguration.cpp: include QAction explicitely - -5.11 Qt headers do not indirectly include QAction resulting in compile -time errors like: -| lxqtmainmenuconfiguration.cpp:71:105: error: no matching function for call to 'LXQtMainMenuConfiguration::connect(QAction*, const char [13], LXQtMainMenuConfiguration*, const char [17])' - -Upstream-Status: Submitted [https://github.com/lxqt/lxqt-panel/pull/467] - -Signed-off-by: Max Krummenacher ---- - plugin-mainmenu/lxqtmainmenuconfiguration.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plugin-mainmenu/lxqtmainmenuconfiguration.cpp b/plugin-mainmenu/lxqtmainmenuconfiguration.cpp -index b5c5f003..63a4c2ad 100644 ---- a/plugin-mainmenu/lxqtmainmenuconfiguration.cpp -+++ b/plugin-mainmenu/lxqtmainmenuconfiguration.cpp -@@ -33,6 +33,7 @@ - #include - #include - -+#include - #include - - LXQtMainMenuConfiguration::LXQtMainMenuConfiguration(PluginSettings *settings, GlobalKeyShortcut::Action * shortcut, const QString &defaultShortcut, QWidget *parent) : --- -2.13.6 - diff --git a/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb b/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb index 23ee6634..6069bdc9 100644 --- a/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb +++ b/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb @@ -17,10 +17,9 @@ DEPENDS += " \ SRC_URI += " \ file://0001-add-Qt5-X11Extras-to-QTX_LIBRARIES.patch \ - file://0001-lxqtmainmenuconfiguration.cpp-include-QAction-explic.patch \ " -SRCREV = "4b20a41f3442b121485664333f457ee9abc228b8" -PV = "0.12.0" +SRCREV = "7d97a5e331a05b4fd06a729a58d47cef0f584c5f" +PV = "0.13.0" PACKAGECONFIG[cpu_plugin] = "-DCPULOAD_PLUGIN=Yes,-DCPULOAD_PLUGIN=No, libstatgrab" PACKAGECONFIG[mount_plugin] = "-DMOUNT_PLUGIN=Yes,-DMOUNT_PLUGIN=No, solid" @@ -33,6 +32,7 @@ PACKAGECONFIG[volume_pulse_plugin] = "-DVOLUME_USE_PULSEAUDIO=Yes,-DVOLUME_USE_P PACKAGECONFIG ??= "cpu_plugin mount_plugin networkmonitor_plugin sensor_plugin sysstat_plugin volume_alsa_plugin volume_pulse_plugin" FILES_${PN} += " \ + ${datadir}/lxqt/panel.conf \ ${datadir}/lxqt/lxqt-panel/*.desktop \ ${datadir}/desktop-directories \ " diff --git a/recipes-lxqt/lxqt-policykit/lxqt-policykit_git.bb b/recipes-lxqt/lxqt-policykit/lxqt-policykit_git.bb index e1e139ac..754e6556 100644 --- a/recipes-lxqt/lxqt-policykit/lxqt-policykit_git.bb +++ b/recipes-lxqt/lxqt-policykit/lxqt-policykit_git.bb @@ -6,5 +6,5 @@ inherit lxqt pkgconfig DEPENDS += "polkit-qt-1 liblxqt libqtxdg" -SRCREV = "dee8dfa656f699f99868374e5f1673c3ef9c918c" -PV = "0.12.0" +SRCREV = "60c1322a23ababb4cf46dae11db8f74826473bd7" +PV = "0.13.0" diff --git a/recipes-lxqt/lxqt-powermanagement/lxqt-powermanagement_git.bb b/recipes-lxqt/lxqt-powermanagement/lxqt-powermanagement_git.bb index e5fa69e9..1eed0078 100644 --- a/recipes-lxqt/lxqt-powermanagement/lxqt-powermanagement_git.bb +++ b/recipes-lxqt/lxqt-powermanagement/lxqt-powermanagement_git.bb @@ -8,7 +8,7 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "qtsvg liblxqt libqtxdg solid kidletime" -SRCREV = "236f8873f750b149aa213916af5a96a5a86ebe95" -PV = "0.12.0" +SRCREV = "af56a1d21d074d7bd5eebdfd56b076d3c1815f44" +PV = "0.13.0" FILES_${PN} += "${datadir}/icons" diff --git a/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb b/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb index 8e6af932..86c17823 100644 --- a/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb +++ b/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb @@ -6,8 +6,8 @@ inherit lxqt DEPENDS += "liblxqt libdbusmenu-qt5 libfm-qt" -SRCREV = "7d2c98756f3088306ee0f2ae78f70eae8e47ffe1" -PV = "0.12.0" +SRCREV = "a335a6f2f5115f01fd3933f8ac3ed6918f99027c" +PV = "0.13.0" SRC_URI += " \ file://0001-set-installation-path-fixed-cmake-query-returns-sysr.patch \ " diff --git a/recipes-lxqt/lxqt-runner/lxqt-runner_git.bb b/recipes-lxqt/lxqt-runner/lxqt-runner_git.bb index f326af85..10a26632 100644 --- a/recipes-lxqt/lxqt-runner/lxqt-runner_git.bb +++ b/recipes-lxqt/lxqt-runner/lxqt-runner_git.bb @@ -8,8 +8,8 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "qtscript libqtxdg lxqt-globalkeys menu-cache muparser" -SRCREV = "ef1f1e83a5f168657dc8197a09a82ac2a10060ec" -PV = "0.12.0" +SRCREV = "aa5f0b43aafe42c352da25a26fc6d95bb3f6de38" +PV = "0.13.0" # REVISIT: These are poluted by host paths FILES_${PN}-dev += "${datadir}/lxqt/lxqt-runner/*.cmake" diff --git a/recipes-lxqt/lxqt-session/lxqt-session_git.bb b/recipes-lxqt/lxqt-session/lxqt-session_git.bb index 98edc327..898f414f 100644 --- a/recipes-lxqt/lxqt-session/lxqt-session_git.bb +++ b/recipes-lxqt/lxqt-session/lxqt-session_git.bb @@ -9,12 +9,13 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "liblxqt kwindowsystem" SRC_URI += "file://0001-do-not-check-for-xdg-udser-dirs-at-build-time-it-is-.patch" -SRCREV = "206b709cd1cd4a14f454dfa90a908844c11fefee" -PV = "0.12.0" +SRCREV = "74e18f354587add8c05e51a4be6366fc9aadb59e" +PV = "0.13.0" FILES_${PN} += " \ - ${datadir}/xsessions \ - ${datadir}/kdm \ + ${datadir}/lxqt/*.conf \ + ${datadir}/xsessions \ + ${datadir}/kdm \ " RDEPENDS_${PN} += "xdg-user-dirs" diff --git a/recipes-lxqt/lxqt-sudo/lxqt-sudo/0001-passworddialog.cpp-include-QIcon-explicitely.patch b/recipes-lxqt/lxqt-sudo/lxqt-sudo/0001-passworddialog.cpp-include-QIcon-explicitely.patch deleted file mode 100644 index ca1721c5..00000000 --- a/recipes-lxqt/lxqt-sudo/lxqt-sudo/0001-passworddialog.cpp-include-QIcon-explicitely.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b3031fa2b3e407c1db565424f5e2d49fda6c8f27 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Sun, 6 May 2018 09:14:10 +0000 -Subject: [PATCH] passworddialog.cpp: include QIcon explicitely - -5.11 Qt headers do not indirectly include QIcon resulting in compile -time errors like: -| passworddialog.cpp:44:33: error: incomplete type 'QIcon' used in nested name specifier - -Upstream-Status: Submitted [https://github.com/lxqt/lxqt-sudo/pull/34] - -Signed-off-by: Max Krummenacher ---- - passworddialog.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/passworddialog.cpp b/passworddialog.cpp -index 7b6de2a..e7a691d 100644 ---- a/passworddialog.cpp -+++ b/passworddialog.cpp -@@ -27,6 +27,7 @@ - - #include "passworddialog.h" - #include "ui_passworddialog.h" -+#include - - PasswordDialog::PasswordDialog(QStringList argv - , QWidget * parent/* = 0*/ --- -2.13.6 - diff --git a/recipes-lxqt/lxqt-sudo/lxqt-sudo_git.bb b/recipes-lxqt/lxqt-sudo/lxqt-sudo_git.bb index ab532fcd..ecd04638 100644 --- a/recipes-lxqt/lxqt-sudo/lxqt-sudo_git.bb +++ b/recipes-lxqt/lxqt-sudo/lxqt-sudo_git.bb @@ -6,6 +6,5 @@ inherit lxqt pkgconfig DEPENDS += "liblxqt" -SRC_URI += "file://0001-passworddialog.cpp-include-QIcon-explicitely.patch" -SRCREV = "1d8947c6124f40bf2a753c18de3f4fe124c5396a" -PV = "0.12.0" +SRCREV = "12271ddd3b022c52411728e57938b5f44760c0d0" +PV = "0.13.0" diff --git a/recipes-lxqt/lxqt-themes/lxqt-themes_git.bb b/recipes-lxqt/lxqt-themes/lxqt-themes_git.bb index 7049a867..d25b96e0 100644 --- a/recipes-lxqt/lxqt-themes/lxqt-themes_git.bb +++ b/recipes-lxqt/lxqt-themes/lxqt-themes_git.bb @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da" inherit lxqt pkgconfig gtk-icon-cache -SRCREV = "9d86cc594b7f181036b7e3ba128fd467b2e2e8fd" -PV = "0.12.0" +SRCREV = "601b21a9b2dd8707173bb5a89bc8d9e2b195b386" +PV = "0.13.0" FILES_${PN} += " \ ${datadir}/lxqt \ diff --git a/recipes-lxqt/obconf-qt/files/0001-finding-sed-does-not-work-and-is-not-neccessary.patch b/recipes-lxqt/obconf-qt/files/0001-finding-sed-does-not-work-and-is-not-neccessary.patch index bddf9369..09ee27b8 100644 --- a/recipes-lxqt/obconf-qt/files/0001-finding-sed-does-not-work-and-is-not-neccessary.patch +++ b/recipes-lxqt/obconf-qt/files/0001-finding-sed-does-not-work-and-is-not-neccessary.patch @@ -1,7 +1,7 @@ -From 76ba8b96c2a5281b1b549e6512b4d998e05b4304 Mon Sep 17 00:00:00 2001 +From 19c7b3eaa79eb7d6ed9037d6c9efac422356889d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 23 Jul 2015 16:34:45 +0200 -Subject: [PATCH 2/2] finding sed does not work and is not neccessary +Subject: [PATCH] finding sed does not work and is not neccessary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,23 +13,23 @@ Signed-off-by: Andreas Müller 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 912e8f7..ebde50e 100644 +index 9ed9cf4..5a611d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,6 @@ project(obconf-qt) # newer cmake is required for CMAKE_AUTOMOC Qt support - cmake_minimum_required(VERSION 2.8.12) + cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) -find_program(SED_PROGRAM sed) - include(GNUInstallDirs) - set(LXQTBT_MINIMUM_VERSION "0.1.0") + set(LXQTBT_MINIMUM_VERSION "0.5.0") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 20ca9f3..a744b17 100644 +index 88196b4..fb2d6bb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -46,7 +46,7 @@ endif() +@@ -48,7 +48,7 @@ set_property(SOURCE ${obconf-qt_UI_H} PROPERTY SKIP_AUTOMOC ON) # but we don't want that. Fix it with sed. add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ui_obconf_fixed.h @@ -39,5 +39,5 @@ index 20ca9f3..a744b17 100644 # DEPENDS MAIN_DEPENDENCY ${obconf-qt_UI_H} -- -2.7.4 +2.13.6 diff --git a/recipes-lxqt/obconf-qt/obconf-qt_git.bb b/recipes-lxqt/obconf-qt/obconf-qt_git.bb index f8dc7f56..da8b50d6 100644 --- a/recipes-lxqt/obconf-qt/obconf-qt_git.bb +++ b/recipes-lxqt/obconf-qt/obconf-qt_git.bb @@ -7,7 +7,7 @@ inherit lxqt pkgconfig DEPENDS += "qtx11extras openbox" SRC_URI += "file://0001-finding-sed-does-not-work-and-is-not-neccessary.patch" -SRCREV = "898dc78a214782f5dfddf80604b023fe6ac7dd97" -PV = "0.12.0" +SRCREV = "056881dd2c941936124bafe6657c111ca0627586" +PV = "0.13.0" FILES_${PN} += "${datadir}/icons" diff --git a/recipes-lxqt/pavucontrol-qt/pavucontrol-qt/0001-xxxwidget.h-include-QAction-explicitely.patch b/recipes-lxqt/pavucontrol-qt/pavucontrol-qt/0001-xxxwidget.h-include-QAction-explicitely.patch deleted file mode 100644 index 4a783012..00000000 --- a/recipes-lxqt/pavucontrol-qt/pavucontrol-qt/0001-xxxwidget.h-include-QAction-explicitely.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9c6a9dff17a8d660f8014ad7cc53d7d57e475787 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Sun, 6 May 2018 08:56:45 +0000 -Subject: [PATCH] xxxwidget.h: include QAction explicitely - -5.11 Qt headers do not indirectly include QAction resulting in compile -time errors like: -| devicewidget.cc:40:52: error: invalid use of incomplete type 'class QAction' - -Upstream-Status: Submitted [https://github.com/lxqt/pavucontrol-qt/pull/49] - -Signed-off-by: Max Krummenacher ---- - src/devicewidget.h | 1 + - src/streamwidget.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/devicewidget.h b/src/devicewidget.h -index dc6585c..be8524d 100644 ---- a/src/devicewidget.h -+++ b/src/devicewidget.h -@@ -25,6 +25,7 @@ - - #include "minimalstreamwidget.h" - #include "ui_devicewidget.h" -+#include - #include - #include - -diff --git a/src/streamwidget.h b/src/streamwidget.h -index ed7c9a5..8778e21 100644 ---- a/src/streamwidget.h -+++ b/src/streamwidget.h -@@ -25,6 +25,7 @@ - - #include "minimalstreamwidget.h" - #include "ui_streamwidget.h" -+#include - #include - - class MainWindow; --- -2.13.6 - diff --git a/recipes-lxqt/pavucontrol-qt/pavucontrol-qt_git.bb b/recipes-lxqt/pavucontrol-qt/pavucontrol-qt_git.bb index ddfd992b..a1344bd3 100644 --- a/recipes-lxqt/pavucontrol-qt/pavucontrol-qt_git.bb +++ b/recipes-lxqt/pavucontrol-qt/pavucontrol-qt_git.bb @@ -6,8 +6,7 @@ inherit lxqt DEPENDS += "glib-2.0 liblxqt pulseaudio" -SRC_URI += "file://0001-xxxwidget.h-include-QAction-explicitely.patch" -SRCREV = "d74f6f990905c43f01bbd609ae297f045b533045" -PV = "0.3.0" +SRCREV = "fe41fed80452c1788f03d9746921f5962bacad4a" +PV = "0.4.0" RDEPENDS_${PN} += "pulseaudio-server" diff --git a/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_git.bb b/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_git.bb index 12f767e2..46fe8e16 100644 --- a/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_git.bb +++ b/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_git.bb @@ -8,7 +8,7 @@ inherit lxqt pkgconfig distro_features_check DEPENDS += "libfm-qt" -SRCREV = "8ba67fdfc8d848e1882f992ee37eb8d795e857dd" -PV = "0.12.0" +SRCREV = "5ada22db99d3acd05c250fe3409dac8ecf7a3380" +PV = "0.13.0" RRECOMMENDS_${PN} = "gvfs gvfsd-trash eject" diff --git a/recipes-lxqt/qterminal/qterminal_git.bb b/recipes-lxqt/qterminal/qterminal_git.bb index 56b3183a..39eed914 100644 --- a/recipes-lxqt/qterminal/qterminal_git.bb +++ b/recipes-lxqt/qterminal/qterminal_git.bb @@ -8,8 +8,8 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "qtermwidget qtx11extras" -SRCREV = "e4a56827d31aee8e0b285a155dbda7516f371864" -PV = "0.8.0" +SRCREV = "aeb2f1f570d7a1773a5eb586e4b56c3218a78cea" +PV = "0.9.0" S = "${WORKDIR}/git" diff --git a/recipes-lxqt/qtermwidget/qtermwidget_git.bb b/recipes-lxqt/qtermwidget/qtermwidget_git.bb index c25849e1..61720107 100644 --- a/recipes-lxqt/qtermwidget/qtermwidget_git.bb +++ b/recipes-lxqt/qtermwidget/qtermwidget_git.bb @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b" inherit lxqt -SRCREV = "1e00757da69ef4dd926b31beb5bb7c73ab255782" -PV = "0.8.0" +SRCREV = "3079cbea3f48cb65d765bf952fe0a56e73e2b70d" +PV = "0.9.0" #EXTRA_OECMAKE += "-DUSE_QT5=ON -DBUILD_DESIGNER_PLUGIN=OFF"