commit lxqt-config for openSUSE:Factory
Hello community, here is the log from the commit of package lxqt-config for openSUSE:Factory checked in at 2017-06-30 18:42:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxqt-config (Old) and /work/SRC/openSUSE:Factory/.lxqt-config.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lxqt-config" Fri Jun 30 18:42:37 2017 rev:12 rq:507071 version:0.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/lxqt-config/lxqt-config.changes 2017-03-12 19:59:00.520133138 +0100 +++ /work/SRC/openSUSE:Factory/.lxqt-config.new/lxqt-config.changes 2017-06-30 18:43:40.215091077 +0200 @@ -1,0 +2,6 @@ +Tue Jun 20 15:23:01 UTC 2017 - alarrosa@suse.com + +- Add add-include-directory-for-uic-files.diff to fix a failing build by + including the directory where uic files are generated. + +------------------------------------------------------------------- New: ---- add-include-directory-for-uic-files.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxqt-config.spec ++++++ --- /var/tmp/diff_new_pack.J7snFI/_old 2017-06-30 18:43:40.763014008 +0200 +++ /var/tmp/diff_new_pack.J7snFI/_new 2017-06-30 18:43:40.767013446 +0200 @@ -26,6 +26,8 @@ Source: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz Source1: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz.asc Source2: lxqt-config.keyring +# PATCH-FIX-UPSTREAM add-include-directory-for-uic-files.diff -- Fix build by including the directory where uic files are generated +Patch0: add-include-directory-for-uic-files.diff BuildRequires: cmake >= 3.0.2 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -58,6 +60,7 @@ %prep %setup -q +%patch0 -p1 # Changing LXQt into X-LXQt in desktop files to be freedesktop compliant and shut rpmlint warnings #find -name '*desktop.in*' -exec sed -ri 's/(LXQt;)/X-\1/' {} + ++++++ add-include-directory-for-uic-files.diff ++++++ Index: lxqt-config-0.11.1/liblxqt-config-cursor/CMakeLists.txt =================================================================== --- lxqt-config-0.11.1.orig/liblxqt-config-cursor/CMakeLists.txt +++ lxqt-config-0.11.1/liblxqt-config-cursor/CMakeLists.txt @@ -8,6 +8,7 @@ link_libraries(${XCB_LIBRARIES}) include_directories ( ${X11_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/xcr + ${AUTOGEN_TARGETS_FOLDER} ) set(lxqt-config-cursor_HDRS Index: lxqt-config-0.11.1/lxqt-config-appearance/CMakeLists.txt =================================================================== --- lxqt-config-0.11.1.orig/lxqt-config-appearance/CMakeLists.txt +++ lxqt-config-0.11.1/lxqt-config-appearance/CMakeLists.txt @@ -4,6 +4,7 @@ include_directories( ${Qt5Gui_PRIVATE_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../liblxqt-config-cursor" "${CMAKE_CURRENT_BINARY_DIR}/../liblxqt-config-cursor" + "${CMAKE_CURRENT_BINARY_DIR}/../liblxqt-config-cursor/lxqt-config-cursor_autogen/include" ) set(H_FILES Index: lxqt-config-0.11.1/lxqt-config-monitor/CMakeLists.txt =================================================================== --- lxqt-config-0.11.1.orig/lxqt-config-monitor/CMakeLists.txt +++ lxqt-config-0.11.1/lxqt-config-monitor/CMakeLists.txt @@ -3,6 +3,10 @@ project(lxqt-config-monitor) find_package(KF5Screen REQUIRED) find_package(Qt5Svg REQUIRED) +include_directories( + "${CMAKE_CURRENT_BINARY_DIR}/../liblxqt-config-cursor/lxqt-config-cursor_autogen/include" +) + set(HEADERS monitorsettingsdialog.h monitor.h Index: lxqt-config-0.11.1/lxqt-config-input/CMakeLists.txt =================================================================== --- lxqt-config-0.11.1.orig/lxqt-config-input/CMakeLists.txt +++ lxqt-config-0.11.1/lxqt-config-input/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories( ${X11_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/../liblxqt-config-cursor" "${CMAKE_CURRENT_BINARY_DIR}/../liblxqt-config-cursor" + "${CMAKE_CURRENT_BINARY_DIR}/../liblxqt-config-cursor/lxqt-config-cursor_autogen/include" ) set(lxqt-config-input_HDRS
participants (1)
-
root@hilbert.suse.de