diff --git a/recipes-lxqt/libqtxdg/files/0001-do-not-add-CMAKE_INSTALL_PREFIX-to-header-install-lo.patch b/recipes-lxqt/libqtxdg/files/0001-do-not-add-CMAKE_INSTALL_PREFIX-to-header-install-lo.patch new file mode 100644 index 00000000..3b40dd96 --- /dev/null +++ b/recipes-lxqt/libqtxdg/files/0001-do-not-add-CMAKE_INSTALL_PREFIX-to-header-install-lo.patch @@ -0,0 +1,34 @@ +From 39e9032df3cbea903888f58b28f2ddf194791b98 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 11 May 2015 10:50:29 +0200 +Subject: [PATCH 1/2] do not add CMAKE_INSTALL_PREFIX to header install + location +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +it causses installation to /usr/usr/include + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 76ac4dd..5544d99 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -143,7 +143,7 @@ configure_file( + ) + + # Instalable ............................... +-set(QTXDG_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_FILE_NAME}") ++set(QTXDG_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_FILE_NAME}") + + set(QTXDG_PRIVATE_INCLUDE_DIR "${QTXDG_INCLUDE_DIR}/${QTXDG_VERSION_STRING}") + configure_file( +-- +1.9.3 + diff --git a/recipes-lxqt/libqtxdg/files/0002-remove-prefix-from-packageconfig.patch b/recipes-lxqt/libqtxdg/files/0002-remove-prefix-from-packageconfig.patch new file mode 100644 index 00000000..671777b4 --- /dev/null +++ b/recipes-lxqt/libqtxdg/files/0002-remove-prefix-from-packageconfig.patch @@ -0,0 +1,34 @@ +From 0fa6b3e3b30973e5db0d948b17e18b66eb0ae08d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 16 Jun 2015 14:59:53 +0200 +Subject: [PATCH 2/2] remove prefix from packageconfig +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 +--- + cmake/create_pkgconfig_file.cmake | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/cmake/create_pkgconfig_file.cmake b/cmake/create_pkgconfig_file.cmake +index 92592af..8346560 100644 +--- a/cmake/create_pkgconfig_file.cmake ++++ b/cmake/create_pkgconfig_file.cmake +@@ -13,9 +13,8 @@ macro (create_pkgconfig_file name desc requires include_rel_dir version) + + file(WRITE "${_pkgfname}" + "# file generated by razor-qt cmake build\n" +- "prefix=${CMAKE_INSTALL_PREFIX}\n" +- "libdir=\${prefix}/${CMAKE_INSTALL_LIBDIR}\n" +- "includedir=\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}\n" ++ "libdir=${CMAKE_INSTALL_LIBDIR}\n" ++ "includedir=${CMAKE_INSTALL_INCLUDEDIR}\n" + "\n" + "Name: ${name}\n" + "Description: ${desc}\n" +-- +1.9.3 + diff --git a/recipes-lxqt/libqtxdg/libqtxdg_git.bb b/recipes-lxqt/libqtxdg/libqtxdg_git.bb index 07abdacc..28a6aadd 100644 --- a/recipes-lxqt/libqtxdg/libqtxdg_git.bb +++ b/recipes-lxqt/libqtxdg/libqtxdg_git.bb @@ -7,8 +7,12 @@ inherit lxqt cmake-lib # libmagic is supplied by file DEPENDS += "file" -SRCREV = "87fb74a1e7618ba199b977ee0d1ac341a3c13ee6" -PV = "1.1.0" +SRC_URI += " \ + file://0001-do-not-add-CMAKE_INSTALL_PREFIX-to-header-install-lo.patch \ + file://0002-remove-prefix-from-packageconfig.patch \ +" +SRCREV = "da936792f2376327db2c287348738ede394e7bcc" +PV = "1.2.0" EXTRA_OECMAKE += "-DCMAKE_INSTALL_PREFIX=''"