From 059ff2f79061969779e288273107a0f0bbc99b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 14 Feb 2015 20:03:52 +0100 Subject: [PATCH] add lximage-qt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...xt-do-not-completely-overwrite-CMAKE.patch | 32 +++++++++++++++++++ recipes-lxqt/lximage-qt/lximage-qt_git.bb | 18 +++++++++++ recipes-lxqt/packagegroups/lxqt-world.bb | 1 + 3 files changed, 51 insertions(+) create mode 100644 recipes-lxqt/lximage-qt/files/0001-src-CMakeLists.txt-do-not-completely-overwrite-CMAKE.patch create mode 100644 recipes-lxqt/lximage-qt/lximage-qt_git.bb diff --git a/recipes-lxqt/lximage-qt/files/0001-src-CMakeLists.txt-do-not-completely-overwrite-CMAKE.patch b/recipes-lxqt/lximage-qt/files/0001-src-CMakeLists.txt-do-not-completely-overwrite-CMAKE.patch new file mode 100644 index 00000000..b1476b74 --- /dev/null +++ b/recipes-lxqt/lximage-qt/files/0001-src-CMakeLists.txt-do-not-completely-overwrite-CMAKE.patch @@ -0,0 +1,32 @@ +From 21089835b9f3b7fdcb47e0b6b7367b70c2633811 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 14 Feb 2015 19:53:25 +0100 +Subject: [PATCH] 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 690ba7c..9219327 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") + + set(QTX_INCLUDE_DIRS "") + set(QTX_LIBRARIES Qt5::Widgets Qt5::Core Qt5::DBus Qt5::PrintSupport Qt5::X11Extras) +-- +1.9.3 + diff --git a/recipes-lxqt/lximage-qt/lximage-qt_git.bb b/recipes-lxqt/lximage-qt/lximage-qt_git.bb new file mode 100644 index 00000000..d8f798bb --- /dev/null +++ b/recipes-lxqt/lximage-qt/lximage-qt_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "LXQt system settings center" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b" + +REQUIRED_DISTRO_FEATURES = "x11" + +inherit lxqt pkgconfig + +DEPENDS += "qtx11extras glib-2.0 libexif pcmanfm-qt libxfixes" + +SRCREV = "d5a14991463bc01186914f489dfcb47bc772a3e2" +PV = "0.3.0" + +SRC_URI += "file://0001-src-CMakeLists.txt-do-not-completely-overwrite-CMAKE.patch" + +EXTRA_OECMAKE += "-DUSE_QT5=ON" + +FILES_${PN} += "${datadir}/icons" diff --git a/recipes-lxqt/packagegroups/lxqt-world.bb b/recipes-lxqt/packagegroups/lxqt-world.bb index e27df75e..ffff8c91 100644 --- a/recipes-lxqt/packagegroups/lxqt-world.bb +++ b/recipes-lxqt/packagegroups/lxqt-world.bb @@ -10,6 +10,7 @@ RDEPENDS_${PN} = " \ liblxqt-mount \ libqtxdg \ libsysstat \ + lximage-qt \ lxmenu-data \ lxqt-common \ lxqt-config \