Hello community, here is the log from the commit of package lxqt-build-tools for openSUSE:Factory checked in at 2017-10-24 22:22:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxqt-build-tools (Old) and /work/SRC/openSUSE:Factory/.lxqt-build-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxqt-build-tools" Tue Oct 24 22:22:52 2017 rev:3 rq:535971 version:0.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lxqt-build-tools/lxqt-build-tools.changes 2017-06-21 13:58:07.411483183 +0200 +++ /work/SRC/openSUSE:Factory/.lxqt-build-tools.new/lxqt-build-tools.changes 2017-10-24 22:23:03.705300621 +0200 @@ -1,0 +2,14 @@ +Mon Oct 23 09:48:31 UTC 2017 - mvet...@suse.com + +- Update to 0.4.0: + * Bump version to 0.4.0 + * Added needed versions + * remove version set from LXQtConfigVars.in + * Move LXQt version to liblxqt + * Fixes a FTBFS with superbuild mode + * Adds a FindExif module + * LXQtCompilerSettings: Fixes a typo in diagnostics-color + * Adds (Ninja) colored diagnostics for GCC (>=4.9) + * Enable strict iterators for debug builds + +------------------------------------------------------------------- Old: ---- lxqt-build-tools-0.3.2.tar.xz lxqt-build-tools-0.3.2.tar.xz.asc New: ---- lxqt-build-tools-0.4.0.tar.xz lxqt-build-tools-0.4.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxqt-build-tools.spec ++++++ --- /var/tmp/diff_new_pack.LdHygH/_old 2017-10-24 22:23:04.297272950 +0200 +++ /var/tmp/diff_new_pack.LdHygH/_new 2017-10-24 22:23:04.301272762 +0200 @@ -17,7 +17,7 @@ Name: lxqt-build-tools -Version: 0.3.2 +Version: 0.4.0 Release: 0 Summary: Core build tools for LXQt License: BSD-3-Clause @@ -26,7 +26,8 @@ Source: https://github.com/lxde/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz Source1: https://github.com/lxde/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc BuildRequires: cmake >= 3.0.2 -BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Core) >= 5.6.1 +BuildRequires: pkgconfig(glib-2.0) >= 2.50 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ lxqt-build-tools-0.3.2.tar.xz -> lxqt-build-tools-0.4.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-build-tools-0.3.2/CHANGELOG new/lxqt-build-tools-0.4.0/CHANGELOG --- old/lxqt-build-tools-0.3.2/CHANGELOG 2017-01-14 00:21:35.000000000 +0100 +++ new/lxqt-build-tools-0.4.0/CHANGELOG 2017-09-22 23:29:22.000000000 +0200 @@ -1,7 +1,21 @@ -lxqt-build-tools-0.3.2 / 2017-01-14 +lxqt-build-tools-0.4.0 / 2017-09-22 =================================== + * Bump version to 0.4.0 + * Added needed versions + * remove version set from LXQtConfigVars.in + * Move LXQt version to liblxqt + * Fixes a FTBFS with superbuild mode + * Adds a FindExif module + * LXQtCompilerSettings: Fixes a typo in diagnostics-color + * Adds (Ninja) colored diagnostics for GCC (>=4.9) + * Enable strict iterators for debug builds + +0.3.2 / 2017-01-14 +================== + + * Release 0.3.2: Update changelog * Bump version to 0.3.2 - finally the build tools are arch: all (#15) * Warnings (#16) * Remove arched bits from version.cmake-file (#14) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-build-tools-0.3.2/CMakeLists.txt new/lxqt-build-tools-0.4.0/CMakeLists.txt --- old/lxqt-build-tools-0.3.2/CMakeLists.txt 2017-01-14 00:21:35.000000000 +0100 +++ new/lxqt-build-tools-0.4.0/CMakeLists.txt 2017-09-22 23:29:22.000000000 +0200 @@ -5,14 +5,16 @@ option(WITH_XDG_DIRS_FALLBACK "Use our XDG_CONFIG_DIRS fallback" ON) set(LXQT_BUILD_TOOLS_MAJOR_VERSION 0) -set(LXQT_BUILD_TOOLS_MINOR_VERSION 3) -set(LXQT_BUILD_TOOLS_PATCH_VERSION 2) +set(LXQT_BUILD_TOOLS_MINOR_VERSION 4) +set(LXQT_BUILD_TOOLS_PATCH_VERSION 0) set(LXQT_BUILD_TOOLS_VERSION ${LXQT_BUILD_TOOLS_MAJOR_VERSION}.${LXQT_BUILD_TOOLS_MINOR_VERSION}.${LXQT_BUILD_TOOLS_PATCH_VERSION}) -set(LXQT_MAJOR_VERSION 0) -set(LXQT_MINOR_VERSION 11) -set(LXQT_PATCH_VERSION 1) -set(LXQT_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_PATCH_VERSION}) + +# Check for needed versions +# We need at least Qt 5.6.1 and glib-2.0 >= 2.50 to build all LXQt parts +find_package(PkgConfig REQUIRED) +find_package(Qt5Core "5.6.1" REQUIRED) +pkg_check_modules(GLIB2 glib-2.0>=2.50 REQUIRED) include(CMakePackageConfigHelpers) include(GNUInstallDirs) # Standard directories for installation @@ -103,7 +105,7 @@ # The package version file is common to superbuild and installable mode configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/lxqt-build-tools-config-version.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/lxqt-build-tools-config-version.cmake" + "${CMAKE_BINARY_DIR}/lxqt-build-tools-config-version.cmake" @ONLY ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-build-tools-0.3.2/cmake/LXQtConfigVars.cmake.in new/lxqt-build-tools-0.4.0/cmake/LXQtConfigVars.cmake.in --- old/lxqt-build-tools-0.3.2/cmake/LXQtConfigVars.cmake.in 2017-01-14 00:21:35.000000000 +0100 +++ new/lxqt-build-tools-0.4.0/cmake/LXQtConfigVars.cmake.in 2017-09-22 23:29:22.000000000 +0200 @@ -16,11 +16,6 @@ # added to XDG_DATA_DIRS by the startlxqt script. -set(LXQT_MAJOR_VERSION "@LXQT_MAJOR_VERSION@") -set(LXQT_MINOR_VERSION "@LXQT_MINOR_VERSION@") -set(LXQT_PATCH_VERSION "@LXQT_PATCH_VERSION@") -set(LXQT_VERSION "@LXQT_VERSION@") - set(LXQT_LIBRARY_NAME "@LXQT_LIBRARY_NAME@") set(LXQT_RELATIVE_SHARE_DIR "@LXQT_RELATIVE_SHARE_DIR@") set(LXQT_SHARE_DIR "@LXQT_SHARE_DIR@") @@ -37,4 +32,3 @@ add_definitions("-DLXQT_GRAPHICS_DIR=\"${LXQT_GRAPHICS_DIR}\"") add_definitions("-DLXQT_ETC_XDG_DIR=\"${LXQT_ETC_XDG_DIR}\"") add_definitions("-DLXQT_DATA_DIR=\"${LXQT_DATA_DIR}\"") -add_definitions("-DLXQT_VERSION=\"${LXQT_VERSION}\"") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-build-tools-0.3.2/cmake/find-modules/FindExif.cmake new/lxqt-build-tools-0.4.0/cmake/find-modules/FindExif.cmake --- old/lxqt-build-tools-0.3.2/cmake/find-modules/FindExif.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-build-tools-0.4.0/cmake/find-modules/FindExif.cmake 2017-09-22 23:29:22.000000000 +0200 @@ -0,0 +1,80 @@ +# Distributed under the OSI-approved BSD 3-Clause License. See accompanying +# BSD-3-Clause file for details. + +#.rst: +# FindExif +# ----------- +# +# Try to find the Exif library +# +# Once done this will define +# +# :: +# +# EXIF_FOUND - System has the Exif library +# EXIF_INCLUDE_DIR - The Exif library include directory +# EXIF_INCLUDE_DIRS - Location of the headers needed to use the Exif library +# EXIF_LIBRARIES - The libraries needed to use the Exif library +# EXIF_DEFINITIONS - Compiler switches required for using the Exif library +# EXIF_VERSION_STRING - the version of the Exif library found + + +# use pkg-config to get the directories and then use these values +# in the find_path() and find_library() calls +find_package(PkgConfig QUIET) +pkg_check_modules(PC_EXIF QUIET libexif) +set(EXIF_DEFINITIONS ${PC_EXIF_CFLAGS_OTHER}) + +find_path(EXIF_INCLUDE_DIR NAMES libexif/exif-data.h + HINTS + ${PC_EXIF_INCLUDEDIR} + ${PC_EXIF_INCLUDE_DIRS} + PATH_SUFFIXES libexif +) + +find_library(EXIF_LIBRARIES NAMES exif libexif + HINTS + ${PC_EXIF_LIBDIR} + ${PC_EXIF_LIBRARY_DIRS} +) + + +# iterate over all dependencies +unset(FD_LIBRARIES) +foreach(depend ${PC_EXIF_LIBRARIES}) + find_library(_DEPEND_LIBRARIES + NAMES + ${depend} + HINTS + ${PC_EXIF_LIBDIR} + ${PC_EXIF_LIBRARY_DIRS} + ) + + if (_DEPEND_LIBRARIES) + list(APPEND FD_LIBRARIES ${_DEPEND_LIBRARIES}) + endif() + unset(_DEPEND_LIBRARIES CACHE) +endforeach() + +set(EXIF_VERSION_STRING ${PC_EXIF_VERSION}) +set(EXIF_INCLUDE_DIR ${PC_EXIF_INCLUDEDIR}) + +list(APPEND EXIF_INCLUDE_DIRS + ${EXIF_INCLUDE_DIR} + ${PC_EXIF_INCLUDE_DIRS} +) +list(REMOVE_DUPLICATES EXIF_INCLUDE_DIRS) + +list(APPEND EXIF_LIBRARIES + ${FD_LIBRARIES} +) + +list(REMOVE_DUPLICATES EXIF_LIBRARIES) +# handle the QUIETLY and REQUIRED arguments and set EXIF_FOUND to TRUE if +# all listed variables are TRUE +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Exif + REQUIRED_VARS EXIF_LIBRARIES EXIF_INCLUDE_DIR EXIF_INCLUDE_DIRS + VERSION_VAR EXIF_VERSION_STRING) + +mark_as_advanced(EXIF_INCLUDE_DIR EXIF_LIBRARIES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-build-tools-0.3.2/cmake/modules/LXQtCompilerSettings.cmake new/lxqt-build-tools-0.4.0/cmake/modules/LXQtCompilerSettings.cmake --- old/lxqt-build-tools-0.3.2/cmake/modules/LXQtCompilerSettings.cmake 2017-01-14 00:21:35.000000000 +0100 +++ new/lxqt-build-tools-0.4.0/cmake/modules/LXQtCompilerSettings.cmake 2017-09-22 23:29:22.000000000 +0200 @@ -75,6 +75,10 @@ -DQT_USE_QSTRINGBUILDER ) +if (CMAKE_BUILD_TYPE MATCHES "Debug") + add_definitions(-DQT_STRICT_ITERATORS) +endif() + #----------------------------------------------------------------------------- # Detect Clang compiler @@ -189,9 +193,12 @@ #----------------------------------------------------------------------------- # Enable colored diagnostics for the CLang/Ninja combination #----------------------------------------------------------------------------- -if (LXQT_COMPILER_IS_CLANGCXX AND CMAKE_GENERATOR STREQUAL "Ninja") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcolor-diagnostics") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics") +if (CMAKE_GENERATOR STREQUAL "Ninja" AND + # Rationale: https://public.kitware.com/Bug/view.php?id=15502 + ((CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9) OR + (LXQT_COMPILER_IS_CLANGCXX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5))) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always") endif()
