23.10.2014 14:58, Florian Hubold:
There should be a "proper" fix for master available now.
But if you want to go on complaining, feel free to do so. Just wanted to help.
Thank you.
Proper patches - in attachhes
and later on, maybe alsohttps://github.com/lxde/lxde-qt/issues/288
Patches are working fine here.
This is about 0.7.0.
I'm trying to package 0.8.0
Read again, applies to both 0.7 and 0.8. Patch works fine here for 0.8.
Thanks again.
I'll try after packagng whole of lxqt.
--- CMakeLists.txt.orig 2014-06-25 18:34:53.000000000 +0400
+++ CMakeLists.txt 2014-10-23 14:10:21.653606213 +0400
@@ -7,7 +7,7 @@
option(USE_QT5 "Build with Qt5." $ENV{USE_QT5})
set(MAJOR_VERSION 0)
-set(MINOR_VERSION 7)
+set(MINOR_VERSION 8)
set(PATCH_VERSION 0)
set(LXQTMOUNT_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
@@ -110,7 +110,7 @@
create_pkgconfig_file(${LXQTMOUNT_LIBRARY_NAME} "LXQt library for removable media/devices")
# cmake config file
-set(LXQTMOUNT_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/${LXQTMOUNT_LIBRARY_NAME})
+set(LXQTMOUNT_INCLUDE_DIR ${INCLUDE_INSTALL_DIR}/${LXQTMOUNT_LIBRARY_NAME})
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/cmake/lxqtmount-config.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/${LXQTMOUNT_LIBRARY_NAME}-config.cmake
--- cmake/lxqtmount-config.cmake.in.orig 2014-06-25 18:34:53.000000000 +0400
+++ cmake/lxqtmount-config.cmake.in 2014-10-23 14:08:53.970642345 +0400
@@ -25,7 +25,7 @@
set(LXQTMOUNT_INCLUDE_DIR @LXQTMOUNT_INCLUDE_DIR@)
set(LXQTMOUNT_LIBRARY @LXQTMOUNT_LIBRARY_NAME@)
-set(LXQTMOUNT_LIBRARY_DIRS @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@)
+set(LXQTMOUNT_LIBRARY_DIRS @LIB_INSTALL_DIR@)
set(LXQTMOUNT_LIBRARIES ${LXQTMOUNT_LIBRARY} )
set(LXQTMOUNT_INCLUDE_DIRS ${LXQTMOUNT_INCLUDE_DIR} )
--- cmake/sysstat-config.cmake.in.orig 2014-10-23 11:32:57.251716560 +0400
+++ cmake/sysstat-config.cmake.in 2014-10-23 11:34:12.008850175 +0400
@@ -27,7 +27,7 @@
set(SYSSTAT_LIBRARIES ${SYSSTAT_LIBRARY} )
set(SYSSTAT_INCLUDE_DIRS ${SYSSTAT_INCLUDE_DIR} )
-set(SYSSTAT_LIBRARY_DIRS @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@ )
+set(SYSSTAT_LIBRARY_DIRS @LIB_INSTALL_DIR@ )
set(SYSSTAT_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/sysstat_use.cmake)
set(SYSSTAT_FOUND 1)
--- cmake/lxqt_globalkeys-config.cmake.in.orig 2014-10-23 14:24:32.115852085 +0400
+++ cmake/lxqt_globalkeys-config.cmake.in 2014-10-23 14:24:53.280534753 +0400
@@ -30,7 +30,7 @@
set(LXQT_GLOBALKEYS_LIBRARIES ${LXQT_GLOBALKEYS_LIBRARY})
set(LXQT_GLOBALKEYS_INCLUDE_DIRS ${LXQT_GLOBALKEYS_INCLUDE_DIR})
-set(LXQT_GLOBALKEYS_LIBRARY_DIRS @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@)
+set(LXQT_GLOBALKEYS_LIBRARY_DIRS @LIB_INSTALL_DIR@)
set(LXQT_GLOBALKEYS_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/lxqt_globalkeys_use.cmake)
set(LXQT_GLOBALKEYS_FOUND 1)
--- cmake/lxqt_globalkeys_ui-config.cmake.in.orig 2014-10-23 14:24:37.914969145 +0400
+++ cmake/lxqt_globalkeys_ui-config.cmake.in 2014-10-23 14:25:08.976253041 +0400
@@ -30,7 +30,7 @@
set(LXQT_GLOBALKEYS_UI_LIBRARIES ${LXQT_GLOBALKEYS_UI_LIBRARY})
set(LXQT_GLOBALKEYS_UI_INCLUDE_DIRS ${LXQT_GLOBALKEYS_UI_INCLUDE_DIR})
-set(LXQT_GLOBALKEYS_UI_LIBRARY_DIRS @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@)
+set(LXQT_GLOBALKEYS_UI_LIBRARY_DIRS @LIB_INSTALL_DIR@)
set(LXQT_GLOBALKEYS_UI_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/lxqt_globalkeys_ui_use.cmake)
set(LXQT_GLOBALKEYS_UI_FOUND 1)
------------------------------------------------------------------------------
_______________________________________________
Lxde-list mailing list
Lxde-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxde-list
