From 8963234499f45031f5b1b7deda4e6114f3590c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 16 Sep 2015 00:14:06 +0200 Subject: [PATCH] lxqt: update to latest revisions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qt 5.5 update caused trouble with main startmenu and panel taskmanager widget. Before starting to find a solution update sources (and hope behaviour is gone). Signed-off-by: Andreas Müller --- recipes-lxqt/liblxqt/liblxqt_git.bb | 2 +- recipes-lxqt/libqtxdg/libqtxdg_git.bb | 2 +- recipes-lxqt/libsysstat/libsysstat_git.bb | 2 +- recipes-lxqt/lximage-qt/lximage-qt_git.bb | 2 +- recipes-lxqt/lxqt-about/lxqt-about_git.bb | 2 +- recipes-lxqt/lxqt-common/lxqt-common_git.bb | 2 +- .../0001-fix-double-prefixed-RPATH.patch | 45 ++++++++++++++++++ recipes-lxqt/lxqt-config/lxqt-config_git.bb | 3 +- .../lxqt-globalkeys/lxqt-globalkeys_git.bb | 2 +- .../lxqt-notificationd_git.bb | 2 +- .../lxqt-openssh-askpass_git.bb | 2 +- ...1-add-Qt5-X11Extras-to-QTX_LIBRARIES.patch | 47 +++++++++++++++++++ ...001-panel-link-against-Qt5-X11Extras.patch | 32 ------------- recipes-lxqt/lxqt-panel/lxqt-panel_git.bb | 4 +- .../lxqt-policykit/lxqt-policykit_git.bb | 2 +- .../lxqt-powermanagement_git.bb | 2 +- .../lxqt-qtplugin/lxqt-qtplugin_git.bb | 2 +- recipes-lxqt/lxqt-runner/lxqt-runner_git.bb | 2 +- recipes-lxqt/lxqt-session/lxqt-session_git.bb | 2 +- ...does-not-work-and-is-not-neccessary.patch} | 0 ...xt-do-not-completely-overwrite-CMAKE.patch | 32 ------------- recipes-lxqt/obconf-qt/obconf-qt_git.bb | 5 +- recipes-lxqt/pcmanfm-qt/pcmanfm-qt_git.bb | 2 +- 23 files changed, 113 insertions(+), 85 deletions(-) create mode 100644 recipes-lxqt/lxqt-config/files/0001-fix-double-prefixed-RPATH.patch create mode 100644 recipes-lxqt/lxqt-panel/files/0001-add-Qt5-X11Extras-to-QTX_LIBRARIES.patch delete mode 100644 recipes-lxqt/lxqt-panel/files/0001-panel-link-against-Qt5-X11Extras.patch rename recipes-lxqt/obconf-qt/files/{0002-finding-sed-does-not-work-and-is-not-neccessary.patch => 0001-finding-sed-does-not-work-and-is-not-neccessary.patch} (100%) delete mode 100644 recipes-lxqt/obconf-qt/files/0001-src-CMakeLists.txt-do-not-completely-overwrite-CMAKE.patch diff --git a/recipes-lxqt/liblxqt/liblxqt_git.bb b/recipes-lxqt/liblxqt/liblxqt_git.bb index d86c7112..259d4a49 100644 --- a/recipes-lxqt/liblxqt/liblxqt_git.bb +++ b/recipes-lxqt/liblxqt/liblxqt_git.bb @@ -7,7 +7,7 @@ inherit lxqt cmake-lib DEPENDS += "libqtxdg kwindowsystem" SRC_URI += "file://0001-remove-Qt5X11Extras-dependency-it-is-not-required.patch" -SRCREV = "8fcfb6f5ed33b437f0e17f0bece46c6467ab4085" +SRCREV = "979e0ce7da8fbdcd0b65ea84c8ea80902e69de7d" PV = "0.9.0+git${SRCPV}" EXTRA_OECMAKE += "-DCMAKE_INSTALL_DATAROOTDIR=share -DLXQT_ETC_XDG_DIR=${sysconfdir}/xdg" diff --git a/recipes-lxqt/libqtxdg/libqtxdg_git.bb b/recipes-lxqt/libqtxdg/libqtxdg_git.bb index 230d293e..55417403 100644 --- a/recipes-lxqt/libqtxdg/libqtxdg_git.bb +++ b/recipes-lxqt/libqtxdg/libqtxdg_git.bb @@ -7,7 +7,7 @@ inherit lxqt cmake-lib # libmagic is supplied by file DEPENDS += "file" -SRCREV = "194df9fc35ebe77597a62983bb42ad7ac20a023a" +SRCREV = "d1bae674d698be6e2949b65c99ab06093cbe9600" PV = "1.2.0+git${SRCPV}" CMAKE_ALIGN_SYSROOT[1] = "qt5xdg, -S${includedir}, -S${STAGING_INCDIR}" diff --git a/recipes-lxqt/libsysstat/libsysstat_git.bb b/recipes-lxqt/libsysstat/libsysstat_git.bb index a7e81c6d..a830c2ca 100644 --- a/recipes-lxqt/libsysstat/libsysstat_git.bb +++ b/recipes-lxqt/libsysstat/libsysstat_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0964c689fcf4c21c6797ea87408416b6" inherit lxqt cmake-lib -SRCREV = "0a59c411aad006adb66755f677611da9a95b9164" +SRCREV = "e58d8be655bf631f0695e2d790e7d1a94faf8c94" PV = "0.3.0+git${SRCPV}" CMAKE_ALIGN_SYSROOT[1] = "sysstat-qt5, -S${includedir}, -S${STAGING_INCDIR}" diff --git a/recipes-lxqt/lximage-qt/lximage-qt_git.bb b/recipes-lxqt/lximage-qt/lximage-qt_git.bb index e4407237..16498a29 100644 --- a/recipes-lxqt/lximage-qt/lximage-qt_git.bb +++ b/recipes-lxqt/lximage-qt/lximage-qt_git.bb @@ -8,7 +8,7 @@ inherit lxqt pkgconfig distro_features_check gtk-icon-cache mime DEPENDS += "qtx11extras glib-2.0 libexif pcmanfm-qt libxfixes" -SRCREV = "512f1cfc43d46216efd8ff94100a7fc9e859e0e2" +SRCREV = "c4731e3ef3395114e29fccb6bb42b04ad04d9160" PV = "0.4.0+git${SRCPV}" 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 86a91915..eec9aff1 100644 --- a/recipes-lxqt/lxqt-about/lxqt-about_git.bb +++ b/recipes-lxqt/lxqt-about/lxqt-about_git.bb @@ -8,7 +8,7 @@ DEPENDS += " \ liblxqt \ " -SRCREV = "a287e724ea4a59557a88399e88e2dcb942b5640a" +SRCREV = "ab2b99ff12aa5223b5bc9d5f6ec254b2f5930fbf" PV = "0.9.0+git${SRCPV}" FILES_${PN}-dev += "${datadir}/lxqt/lxqt-about/KF5WindowSystemTargets-noconfig.cmake" diff --git a/recipes-lxqt/lxqt-common/lxqt-common_git.bb b/recipes-lxqt/lxqt-common/lxqt-common_git.bb index 7a3c64ea..2ba06b73 100644 --- a/recipes-lxqt/lxqt-common/lxqt-common_git.bb +++ b/recipes-lxqt/lxqt-common/lxqt-common_git.bb @@ -10,7 +10,7 @@ SRC_URI += " \ file://0001-startlxqt-enable-starting-from-console.patch \ file://0002-slightly-change-theme-defaults.patch \ " -SRCREV = "da721845de52526d71cc8457d6c1beb45a9278aa" +SRCREV = "2059e47b22bf9fd49a8d0abaeb8e250e7f17ad84" PV = "0.9.1+git${SRCPV}" FILES_${PN} += " \ diff --git a/recipes-lxqt/lxqt-config/files/0001-fix-double-prefixed-RPATH.patch b/recipes-lxqt/lxqt-config/files/0001-fix-double-prefixed-RPATH.patch new file mode 100644 index 00000000..4a8772c5 --- /dev/null +++ b/recipes-lxqt/lxqt-config/files/0001-fix-double-prefixed-RPATH.patch @@ -0,0 +1,45 @@ +From b341dc4629946d56a96d634c75859d9c31b501ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 15 Sep 2015 18:00:46 +0200 +Subject: [PATCH] fix double prefixed RPATH +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller +--- + lxqt-config-appearance/CMakeLists.txt | 2 +- + lxqt-config-input/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lxqt-config-appearance/CMakeLists.txt b/lxqt-config-appearance/CMakeLists.txt +index e160755..8c1674e 100644 +--- a/lxqt-config-appearance/CMakeLists.txt ++++ b/lxqt-config-appearance/CMakeLists.txt +@@ -77,7 +77,7 @@ target_link_libraries(${PROJECT_NAME} + + set_target_properties("${PROJECT_NAME}" + PROPERTIES +- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${LXQT_CONFIG_PROJECT}" ++ INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}/${LXQT_CONFIG_PROJECT}" + ) + + install(TARGETS +diff --git a/lxqt-config-input/CMakeLists.txt b/lxqt-config-input/CMakeLists.txt +index 5c42961..e495b37 100644 +--- a/lxqt-config-input/CMakeLists.txt ++++ b/lxqt-config-input/CMakeLists.txt +@@ -68,7 +68,7 @@ target_link_libraries(lxqt-config-input + + set_target_properties(lxqt-config-input + PROPERTIES +- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${LXQT_CONFIG_PROJECT}" ++ INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}/${LXQT_CONFIG_PROJECT}" + ) + + install(TARGETS +-- +2.1.0 + diff --git a/recipes-lxqt/lxqt-config/lxqt-config_git.bb b/recipes-lxqt/lxqt-config/lxqt-config_git.bb index 2aa76b08..8900817b 100644 --- a/recipes-lxqt/lxqt-config/lxqt-config_git.bb +++ b/recipes-lxqt/lxqt-config/lxqt-config_git.bb @@ -8,8 +8,9 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "qtsvg liblxqt" -SRCREV = "c7a9328c0e3a39e0fcd740df98eb4400623af40a" +SRCREV = "fc078770b882d1a325afe644aa3890e2a17cec16" PV = "0.9.0+git${SRCPV}" +SRC_URI += "file://0001-fix-double-prefixed-RPATH.patch" # 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 4deb7e09..1012d94f 100644 --- a/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb +++ b/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb @@ -8,7 +8,7 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "liblxqt" -SRCREV = "34e794531fa907b47adc087a0ac8bf33e81faed2" +SRCREV = "2f96d221d94be9481ebc07083f1e941294e03302" PV = "0.9.0+git${SRCPV}" CMAKE_ALIGN_SYSROOT[1] = "lxqt-globalkeys, -S${includedir}, -S${STAGING_INCDIR}" diff --git a/recipes-lxqt/lxqt-notificationd/lxqt-notificationd_git.bb b/recipes-lxqt/lxqt-notificationd/lxqt-notificationd_git.bb index fe2e7bf4..b2a12c02 100644 --- a/recipes-lxqt/lxqt-notificationd/lxqt-notificationd_git.bb +++ b/recipes-lxqt/lxqt-notificationd/lxqt-notificationd_git.bb @@ -6,5 +6,5 @@ inherit lxqt DEPENDS += "liblxqt libqtxdg kwindowsystem" -SRCREV = "119336efe28ccac9aacc54633ea2972cfbfaf6ba" +SRCREV = "c3750aac12171d3e35c045083b75b2f9a1a96366" PV = "0.9.0+git${SRCPV}" 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 9fa2fc1d..4bfc2b96 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 = "c5d9503c6d0439eabebf2610ebbc65211f9acd70" +SRCREV = "e353956f5f1153ea4e2c58cc889635c20f2b6c87" PV = "0.9.0+git${SRCPV}" diff --git a/recipes-lxqt/lxqt-panel/files/0001-add-Qt5-X11Extras-to-QTX_LIBRARIES.patch b/recipes-lxqt/lxqt-panel/files/0001-add-Qt5-X11Extras-to-QTX_LIBRARIES.patch new file mode 100644 index 00000000..7ea480cf --- /dev/null +++ b/recipes-lxqt/lxqt-panel/files/0001-add-Qt5-X11Extras-to-QTX_LIBRARIES.patch @@ -0,0 +1,47 @@ +From 7fa9b8774ea02de9d85eb7e01675fa80865dcf4c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 15 Sep 2015 17:27:07 +0200 +Subject: [PATCH] add Qt5::X11Extras to QTX_LIBRARIES +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +caused by our liblxqt modification + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller +--- + cmake/BuildPlugin.cmake | 2 +- + panel/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/BuildPlugin.cmake b/cmake/BuildPlugin.cmake +index a354255..d1c431c 100644 +--- a/cmake/BuildPlugin.cmake ++++ b/cmake/BuildPlugin.cmake +@@ -33,7 +33,7 @@ MACRO (BUILD_LXQT_PLUGIN NAME) + set (PLUGIN_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROGRAM}) + endif (NOT DEFINED PLUGIN_DIR) + +- set(QTX_LIBRARIES Qt5::Widgets) ++ set(QTX_LIBRARIES Qt5::Widgets Qt5::X11Extras) + if(QT_USE_QTXML) + set(QTX_LIBRARIES ${QTX_LIBRARIES} Qt5::Xml) + endif() +diff --git a/panel/CMakeLists.txt b/panel/CMakeLists.txt +index 4e23b53..da31e6c 100644 +--- a/panel/CMakeLists.txt ++++ b/panel/CMakeLists.txt +@@ -60,7 +60,7 @@ add_definitions(-DPLUGIN_DESKTOPS_DIR=\"${PLUGIN_DESKTOPS_DIR}\") + + project(${PROJECT}) + +-set(QTX_LIBRARIES Qt5::Widgets Qt5::Xml Qt5::DBus) ++set(QTX_LIBRARIES Qt5::Widgets Qt5::Xml Qt5::DBus Qt5::X11Extras) + + # Translations + lxqt_translate_ts(QM_FILES SOURCES +-- +2.1.0 + diff --git a/recipes-lxqt/lxqt-panel/files/0001-panel-link-against-Qt5-X11Extras.patch b/recipes-lxqt/lxqt-panel/files/0001-panel-link-against-Qt5-X11Extras.patch deleted file mode 100644 index c68eee14..00000000 --- a/recipes-lxqt/lxqt-panel/files/0001-panel-link-against-Qt5-X11Extras.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8b0b57e8a8813e62aeb7fc67007c67507c5c306d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 24 Jul 2015 16:34:48 +0200 -Subject: [PATCH] panel: link against Qt5::X11Extras -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -caused by out liblxqt modification - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller ---- - panel/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/panel/CMakeLists.txt b/panel/CMakeLists.txt -index fe634a9..26b455b 100644 ---- a/panel/CMakeLists.txt -+++ b/panel/CMakeLists.txt -@@ -100,6 +100,7 @@ target_link_libraries(${PROJECT} - ${LIBRARIES} - ${QTX_LIBRARIES} - KF5::WindowSystem -+ Qt5::X11Extras - ${STATIC_PLUGINS} - ) - --- -1.9.3 - diff --git a/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb b/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb index 6ddac5c2..41e4d427 100644 --- a/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb +++ b/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb @@ -15,8 +15,8 @@ DEPENDS += " \ kwindowsystem \ " -SRC_URI += "file://0001-panel-link-against-Qt5-X11Extras.patch" -SRCREV = "3da78ed149191d213cef6c0b66918c09963c3954" +SRC_URI += "file://0001-add-Qt5-X11Extras-to-QTX_LIBRARIES.patch" +SRCREV = "099f32df9e64d0059a7e395994477e6fdd55eff2" PV = "0.9.0+git${SRCPV}" PACKAGECONFIG[cpu_plugin] = "-DCPULOAD_PLUGIN=Yes,-DCPULOAD_PLUGIN=No, libstatgrab" diff --git a/recipes-lxqt/lxqt-policykit/lxqt-policykit_git.bb b/recipes-lxqt/lxqt-policykit/lxqt-policykit_git.bb index b5791d0c..26e49963 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 = "afc4614bc5024cc1d2d3aa3beab7d9e9ef183781" +SRCREV = "28a5fc85693cd7cc6a10f787c46473efa0c976d4" PV = "0.9.0+git${SRCPV}" diff --git a/recipes-lxqt/lxqt-powermanagement/lxqt-powermanagement_git.bb b/recipes-lxqt/lxqt-powermanagement/lxqt-powermanagement_git.bb index 9b3418a2..55b73390 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" -SRCREV = "92298941bf700a034b4ef3941e6f350a3c824f57" +SRCREV = "a49f1c98972b817a5f3e6489ffe00dd6afe010ec" PV = "0.9.0+git${SRCPV}" 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 2a8a5a10..350f442c 100644 --- a/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb +++ b/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb @@ -6,7 +6,7 @@ inherit lxqt DEPENDS += "liblxqt" -SRCREV = "052919d39fbc4977372e1114001af6b210a89b6f" +SRCREV = "6584ff0df727f8d5017a66034b849f427d79bbc4" PV = "0.9.0+git${SRCPV}" 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 c2dc1271..eafdefc2 100644 --- a/recipes-lxqt/lxqt-runner/lxqt-runner_git.bb +++ b/recipes-lxqt/lxqt-runner/lxqt-runner_git.bb @@ -8,7 +8,7 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "qtscript libqtxdg lxqt-globalkeys menu-cache" -SRCREV = "c02fc4b867aaa7e7772730420c3635e858db1b5f" +SRCREV = "7d49b685fbc33f74022e2138b89eaf43a006023c" PV = "0.9.0+git${SRCPV}" # REVISIT: These are poluted by host paths diff --git a/recipes-lxqt/lxqt-session/lxqt-session_git.bb b/recipes-lxqt/lxqt-session/lxqt-session_git.bb index beefcfca..e48d0b5d 100644 --- a/recipes-lxqt/lxqt-session/lxqt-session_git.bb +++ b/recipes-lxqt/lxqt-session/lxqt-session_git.bb @@ -8,5 +8,5 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "liblxqt kwindowsystem" -SRCREV = "15d40800eee8612073caf2a1895a9d8ace6c450d" +SRCREV = "3037ea5685007a4e01566d1c1659b19c4a5bfaef" PV = "0.9.0+git${SRCPV}" diff --git a/recipes-lxqt/obconf-qt/files/0002-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 similarity index 100% rename from recipes-lxqt/obconf-qt/files/0002-finding-sed-does-not-work-and-is-not-neccessary.patch rename to recipes-lxqt/obconf-qt/files/0001-finding-sed-does-not-work-and-is-not-neccessary.patch diff --git a/recipes-lxqt/obconf-qt/files/0001-src-CMakeLists.txt-do-not-completely-overwrite-CMAKE.patch b/recipes-lxqt/obconf-qt/files/0001-src-CMakeLists.txt-do-not-completely-overwrite-CMAKE.patch deleted file mode 100644 index df4f0640..00000000 --- a/recipes-lxqt/obconf-qt/files/0001-src-CMakeLists.txt-do-not-completely-overwrite-CMAKE.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 65de29e11d7bb4932aefd56aa8b3a48c76402bb7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 23 Jul 2015 16:41:36 +0200 -Subject: [PATCH 1/2] src/CMakeLists.txt: do not completely overwrite - CMAKE_CXX_FLAGS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -causes for hardfloat machine: - -/usr/include/gnu/stubs.h:7:29: fatal error: gnu/stubs-soft.h: No such file or directory - -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 85b8c25..d2843a2 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,5 +1,5 @@ - # set visibility to hidden to hide symbols, unlesss they're exporeted manually in the code --set(CMAKE_CXX_FLAGS "-DQT_NO_KEYWORDS -fno-exceptions") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_KEYWORDS -fno-exceptions") - - if(USE_QT4) - set(QTX_INCLUDE_DIRS ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTDBUS_DIR}) --- -1.9.3 - diff --git a/recipes-lxqt/obconf-qt/obconf-qt_git.bb b/recipes-lxqt/obconf-qt/obconf-qt_git.bb index c7816c62..7524a7a0 100644 --- a/recipes-lxqt/obconf-qt/obconf-qt_git.bb +++ b/recipes-lxqt/obconf-qt/obconf-qt_git.bb @@ -7,10 +7,9 @@ inherit lxqt pkgconfig DEPENDS += "qtx11extras openbox" SRC_URI += " \ - file://0001-src-CMakeLists.txt-do-not-completely-overwrite-CMAKE.patch \ - file://0002-finding-sed-does-not-work-and-is-not-neccessary.patch \ + file://0001-finding-sed-does-not-work-and-is-not-neccessary.patch \ " -SRCREV = "1ce85f193385adba843d9257639442578db4170e" +SRCREV = "9be460975407638ef8362f026a4097437d6a2538" PV = "0.9.0+git${SRCPV}" FILES_${PN} += "${datadir}/icons" diff --git a/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_git.bb b/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_git.bb index f7558cfe..85f18b7b 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 += "qtx11extras glib-2.0 libxcb libfm menu-cache" -SRCREV = "cfdbb92cef6df49b5f2d8fcf955db6c230771349" +SRCREV = "1af5a3d1e71994cb80b3f367f8bf0c2fcd109ece" PV = "0.9.0+git${SRCPV}" RRECOMMENDS_${PN} = "gvfs gvfsd-trash udisks eject"