Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2014-08-16 15:41:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2014-07-10 09:31:14.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2014-08-16 15:41:32.000000000 +0200
@@ -1,0 +2,11 @@
+Sat Aug 2 10:20:07 UTC 2014 - [email protected]
+
+- Update to 1.1.0
+ * For more details please see:
+ http://www.kde.org/announcements/kde-frameworks-5.1.php
+- Add Source URL
+- Added 0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch from
+ upstream
+- Per patch, pkgconfig(Qt5Core) >= 5.2.0 for gcc-c++ Requires
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-1.0.0.tar.xz
New:
----
0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch
extra-cmake-modules-1.1.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.K2kiwD/_old 2014-08-16 15:41:33.000000000 +0200
+++ /var/tmp/diff_new_pack.K2kiwD/_new 2014-08-16 15:41:33.000000000 +0200
@@ -21,17 +21,19 @@
License: BSD-3-Clause
Group: Development/Tools/Other
Url:
https://projects.kde.org/projects/kdesupport/extra-cmake-modules
-Version: 1.0.0
+Version: 1.1.0
Release: 0
-Source0: %{name}-%{version}.tar.xz
+Source:
http://download.kde.org/stable/frameworks/5.1.0/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM 0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch
+Patch0: 0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake >= 2.8.12
BuildRequires: gcc-c++
BuildRequires: kf5-filesystem >= 4.100.0
BuildRequires: python-Sphinx
Requires: cmake >= 2.8.12
+Requires: gcc-c++
Requires: kf5-filesystem
-Requires: pkgconfig(Qt5Core) >= 5.2.0
Provides: kf5umbrella = 4.99.0
Obsoletes: kf5umbrella < 4.99.0
Recommends: %{name}-doc
@@ -55,6 +57,7 @@
%prep
%setup -q
+%patch0 -p1
%build
%cmake_kf5 -d build
++++++ 0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch ++++++
>From 5b43e2def89b278d84344e0adf8d91b235d0f89a Mon Sep 17 00:00:00 2001
From: Alex Merry <[email protected]>
Date: Sun, 3 Aug 2014 17:30:32 +0100
Subject: [PATCH 1/1] Remove Qt5 debugfull hack from ECMConfig.cmake
The original purpose of this was to set the QT_NO_DEBUG macro if the old
DebugFull configuration was used. We got rid of DebugFull (instead just
using Debug), so it is no longer relevant, and this hack never belonged
in ECMConfig.cmake anyway (it should have been in KDECompilerSettings).
CHANGELOG: ECM now works when the required CMake version is set to
3.0.0 or higher, and does not require Qt5Core to be available.
BUG: 331849
REVIEW: 119588
---
ECMConfig.cmake.in | 7 -------
1 file changed, 7 deletions(-)
diff --git a/ECMConfig.cmake.in b/ECMConfig.cmake.in
index ea47abf..b163e3a 100644
--- a/ECMConfig.cmake.in
+++ b/ECMConfig.cmake.in
@@ -16,10 +16,3 @@ set(ECM_KDE_MODULE_DIR "@PACKAGE_KDE_MODULES_INSTALL_DIR@")
set(ECM_MODULE_PATH "${ECM_MODULE_DIR}" "${ECM_FIND_MODULE_DIR}"
"${ECM_KDE_MODULE_DIR}")
include("${ECM_MODULE_DIR}/ECMUseFindModules.cmake")
-
-if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.13)
- find_package(Qt5Core 5.2.0 REQUIRED)
- set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_DEFINITIONS
QT_CORE_LIB $<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:DebugFull>>>:QT_NO_DEBUG>)
-else()
- message(FATAL_ERROR \"Remove this hack. Set
CMAKE_MAP_IMPORTED_TARGET_DEBUGFULL to DEBUG instead.\")
-endif()
--
2.0.3
++++++ extra-cmake-modules-1.0.0.tar.xz -> extra-cmake-modules-1.1.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-1.0.0/.reviewboardrc
new/extra-cmake-modules-1.1.0/.reviewboardrc
--- old/extra-cmake-modules-1.0.0/.reviewboardrc 2014-07-01
20:08:51.000000000 +0200
+++ new/extra-cmake-modules-1.1.0/.reviewboardrc 2014-08-01
19:07:16.000000000 +0200
@@ -1,4 +1,4 @@
REVIEWBOARD_URL = "https://git.reviewboard.kde.org";
REPOSITORY = 'git://anongit.kde.org/extra-cmake-modules'
BRANCH = 'master'
-TARGET_GROUPS = 'kdeframeworks, buildsystem, extracmakemodules'
+TARGET_GROUPS = 'extracmakemodules'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-1.0.0/CMakeLists.txt
new/extra-cmake-modules-1.1.0/CMakeLists.txt
--- old/extra-cmake-modules-1.0.0/CMakeLists.txt 2014-07-01
20:08:51.000000000 +0200
+++ new/extra-cmake-modules-1.1.0/CMakeLists.txt 2014-08-01
19:07:16.000000000 +0200
@@ -3,7 +3,7 @@
project(extra-cmake-modules NONE)
set(ECM_MAJOR_VERSION 1)
-set(ECM_MINOR_VERSION 0)
+set(ECM_MINOR_VERSION 1)
set(ECM_PATCH_VERSION 0)
set(ECM_VERSION ${ECM_MAJOR_VERSION}.${ECM_MINOR_VERSION}.${ECM_PATCH_VERSION})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.0.0/attic/modules/FindPyKDE4.cmake
new/extra-cmake-modules-1.1.0/attic/modules/FindPyKDE4.cmake
--- old/extra-cmake-modules-1.0.0/attic/modules/FindPyKDE4.cmake
2014-07-01 20:08:51.000000000 +0200
+++ new/extra-cmake-modules-1.1.0/attic/modules/FindPyKDE4.cmake
2014-08-01 19:07:16.000000000 +0200
@@ -25,7 +25,6 @@
STRING(REGEX REPLACE ".*\npykde_version_str:([^\n]+).*$" "\\1"
PYKDE4_VERSION_STR ${pykde_config})
STRING(REGEX REPLACE ".*\npykde_kde_sip_flags:([^\n]+).*$" "\\1"
PYKDE4_SIP_FLAGS ${pykde_config})
STRING(REGEX REPLACE ".*\npykde_sip_dir:([^\n]+).*$" "\\1" PYKDE4_SIP_DIR
${pykde_config})
- STRING(REGEX REPLACE ".*\npykde_version_tag:([^\n]+).*$" "\\1"
PYKDE4_VERSION_TAG ${pykde_config})
MESSAGE(STATUS "Found PyKDE4 version ${PYKDE4_VERSION_STR}
${PYKDE4_SIP_DIR}")
SET(PYKDE4_FOUND TRUE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.0.0/attic/modules/FindPyKDE4.py
new/extra-cmake-modules-1.1.0/attic/modules/FindPyKDE4.py
--- old/extra-cmake-modules-1.0.0/attic/modules/FindPyKDE4.py 2014-07-01
20:08:51.000000000 +0200
+++ new/extra-cmake-modules-1.1.0/attic/modules/FindPyKDE4.py 2014-08-01
19:07:16.000000000 +0200
@@ -1,46 +1,22 @@
-# By Simon Edwards <[email protected]>
-# modified by Paul Giannaros <[email protected]> to add better PyKDE4
-# sip directory finding
-# This file is in the public domain.
+# Copyright (c) 2014, Raphael Kubo da Costa <[email protected]>
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-import sys
-import os
-import PyKDE4.pykdeconfig
-import PyQt4.pyqtconfig
+import PyKDE4.kdecore
-if "_pkg_config" in dir(PyKDE4.pykdeconfig):
- _pkg_config = PyKDE4.pykdeconfig._pkg_config
+if __name__ == '__main__':
+ try:
+ import PyKDE4.pykdeconfig
+ pykdecfg = PyKDE4.pykdeconfig.Configuration()
+ sip_dir = pykdecfg.pykde_sip_dir
+ sip_flags = pykdecfg.pykde_kde_sip_flags
+ except ImportError:
+ # PyQt4 >= 4.10.0 was built with configure-ng.py instead of
+ # configure.py, so pyqtconfig.py and pykdeconfig.py are not installed.
+ sip_dir = PyKDE4.kdecore.PYKDE_CONFIGURATION['sip_dir']
+ sip_flags = PyKDE4.kdecore.PYKDE_CONFIGURATION['sip_flags']
- for varname in [
- 'kde_version',
- 'kde_version_extra',
- 'kdebasedir',
- 'kdeincdir',
- 'kdelibdir',
- 'libdir',
- 'pykde_kde_sip_flags',
- 'pykde_mod_dir',
- 'pykde_modules',
- 'pykde_sip_dir',
- 'pykde_version',
- 'pykde_version_str']:
- varvalue = _pkg_config[varname]
- if varname == 'pykde_sip_dir':
- d = os.path.join(_pkg_config[varname], 'PyKDE4')
- if os.path.exists(d):
- varvalue = d
- print("%s:%s\n" % (varname, varvalue))
- pykde_version_tag = ''
- in_t = False
- for item in _pkg_config['pykde_kde_sip_flags'].split():
- if item == "-t":
- in_t = True
- elif in_t:
- if item.startswith("KDE_"):
- pykde_version_tag = item
- else:
- in_t = False
- print("pykde_version_tag:%s" % pykde_version_tag)
-
-else:
- sys.exit(1)
+ print('pykde_version:%06.x' % PyKDE4.kdecore.version())
+ print('pykde_version_str:%s' % PyKDE4.kdecore.versionString())
+ print('pykde_sip_dir:%s' % sip_dir)
+ print('pykde_sip_flags:%s' % sip_flags)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-1.0.0/attic/modules/FindPyQt.py
new/extra-cmake-modules-1.1.0/attic/modules/FindPyQt.py
--- old/extra-cmake-modules-1.0.0/attic/modules/FindPyQt.py 2014-07-01
20:08:51.000000000 +0200
+++ new/extra-cmake-modules-1.1.0/attic/modules/FindPyQt.py 2014-08-01
19:07:16.000000000 +0200
@@ -1,24 +1,48 @@
# Copyright (c) 2007, Simon Edwards <[email protected]>
+# Copyright (c) 2014, Raphael Kubo da Costa <[email protected]>
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-import PyQt4.pyqtconfig
+import PyQt4.QtCore
+import os
+import sys
-pyqtcfg = PyQt4.pyqtconfig.Configuration()
-print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version)
-print("pyqt_version_str:%s" % pyqtcfg.pyqt_version_str)
-
-pyqt_version_tag = ""
-in_t = False
-for item in pyqtcfg.pyqt_sip_flags.split(' '):
- if item=="-t":
- in_t = True
- elif in_t:
- if item.startswith("Qt_4"):
- pyqt_version_tag = item
+def get_default_sip_dir():
+ # This is based on QScintilla's configure.py, and only works for the
+ # default case where installation paths have not been changed in PyQt's
+ # configuration process.
+ if sys.platform == 'win32':
+ pyqt_sip_dir = os.path.join(sys.prefix, 'sip', 'PyQt4')
else:
- in_t = False
-print("pyqt_version_tag:%s" % pyqt_version_tag)
+ pyqt_sip_dir = os.path.join(sys.prefix, 'share', 'sip', 'PyQt4')
+ return pyqt_sip_dir
+
+def get_qt4_tag(sip_flags):
+ in_t = False
+ for item in sip_flags.split(' '):
+ if item == '-t':
+ in_t = True
+ elif in_t:
+ if item.startswith('Qt_4'):
+ return item
+ else:
+ in_t = False
+ raise ValueError('Cannot find Qt\'s tag in PyQt4\'s SIP flags.')
+
+if __name__ == '__main__':
+ try:
+ import PyQt4.pyqtconfig
+ pyqtcfg = PyQt4.pyqtconfig.Configuration()
+ sip_dir = pyqtcfg.pyqt_sip_dir
+ sip_flags = pyqtcfg.pyqt_sip_flags
+ except ImportError:
+ # PyQt4 >= 4.10.0 was built with configure-ng.py instead of
+ # configure.py, so pyqtconfig.py is not installed.
+ sip_dir = get_default_sip_dir()
+ sip_flags = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags']
-print("pyqt_sip_dir:%s" % pyqtcfg.pyqt_sip_dir)
-print("pyqt_sip_flags:%s" % pyqtcfg.pyqt_sip_flags)
+ print('pyqt_version:%06.x' % PyQt4.QtCore.PYQT_VERSION)
+ print('pyqt_version_str:%s' % PyQt4.QtCore.PYQT_VERSION_STR)
+ print('pyqt_version_tag:%s' % get_qt4_tag(sip_flags))
+ print('pyqt_sip_dir:%s' % sip_dir)
+ print('pyqt_sip_flags:%s' % sip_flags)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.0.0/attic/modules/FindPyQt4.cmake
new/extra-cmake-modules-1.1.0/attic/modules/FindPyQt4.cmake
--- old/extra-cmake-modules-1.0.0/attic/modules/FindPyQt4.cmake 2014-07-01
20:08:51.000000000 +0200
+++ new/extra-cmake-modules-1.1.0/attic/modules/FindPyQt4.cmake 2014-08-01
19:07:16.000000000 +0200
@@ -9,16 +9,20 @@
# Find the installed version of PyQt4. FindPyQt4 should only be called after
# Python has been found.
#
-# This file defines the following variables:
+# This file defines the following variables, which can also be overriden by
+# users:
#
# PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number
-# suitable for comparision as a string
+# suitable for comparison as a string
#
# PYQT4_VERSION_STR - The version of PyQt4 as a human readable string.
#
-# PYQT4_VERSION_TAG - The PyQt version tag using by PyQt's sip files.
+# PYQT4_VERSION_TAG - The Qt4 version tag used by PyQt's sip files.
#
-# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files.
+# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. This can be unset
+# if PyQt4 was built using its new build system and pyqtconfig.py is not
+# present on the system, as in this case its value cannot be determined
+# automatically.
#
# PYQT4_SIP_FLAGS - The SIP flags used to build PyQt.
@@ -31,13 +35,27 @@
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt_py}
OUTPUT_VARIABLE pyqt_config)
IF(pyqt_config)
- STRING(REGEX REPLACE "^pyqt_version:([^\n]+).*$" "\\1" PYQT4_VERSION
${pyqt_config})
- STRING(REGEX REPLACE ".*\npyqt_version_str:([^\n]+).*$" "\\1"
PYQT4_VERSION_STR ${pyqt_config})
- STRING(REGEX REPLACE ".*\npyqt_version_tag:([^\n]+).*$" "\\1"
PYQT4_VERSION_TAG ${pyqt_config})
- STRING(REGEX REPLACE ".*\npyqt_sip_dir:([^\n]+).*$" "\\1" PYQT4_SIP_DIR
${pyqt_config})
- STRING(REGEX REPLACE ".*\npyqt_sip_flags:([^\n]+).*$" "\\1"
PYQT4_SIP_FLAGS ${pyqt_config})
+ STRING(REGEX MATCH "^pyqt_version:([^\n]+).*$" _dummy ${pyqt_config})
+ SET(PYQT4_VERSION "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a
6-digit hexadecimal number")
- SET(PYQT4_FOUND TRUE)
+ STRING(REGEX MATCH ".*\npyqt_version_str:([^\n]+).*$" _dummy
${pyqt_config})
+ SET(PYQT4_VERSION_STR "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as
a human-readable string")
+
+ STRING(REGEX MATCH ".*\npyqt_version_tag:([^\n]+).*$" _dummy
${pyqt_config})
+ SET(PYQT4_VERSION_TAG "${CMAKE_MATCH_1}" CACHE STRING "The Qt4 version tag
used by PyQt4's .sip files")
+
+ STRING(REGEX MATCH ".*\npyqt_sip_dir:([^\n]+).*$" _dummy ${pyqt_config})
+ SET(PYQT4_SIP_DIR "${CMAKE_MATCH_1}" CACHE PATH "The base directory where
PyQt4's .sip files are installed")
+
+ STRING(REGEX MATCH ".*\npyqt_sip_flags:([^\n]+).*$" _dummy ${pyqt_config})
+ SET(PYQT4_SIP_FLAGS "${CMAKE_MATCH_1}" CACHE STRING "The SIP flags used to
build PyQt4")
+
+ IF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}")
+ MESSAGE(WARNING "The base directory where PyQt4's SIP files are
installed could not be determined. This usually means PyQt4 was built with its
new build system and pyqtconfig.py is not present.\n"
+ "Please set the PYQT4_SIP_DIR variable manually.")
+ ELSE(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}")
+ SET(PYQT4_FOUND TRUE)
+ ENDIF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}")
ENDIF(pyqt_config)
IF(PYQT4_FOUND)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.0.0/kde-modules/KDEInstallDirs.cmake
new/extra-cmake-modules-1.1.0/kde-modules/KDEInstallDirs.cmake
--- old/extra-cmake-modules-1.0.0/kde-modules/KDEInstallDirs.cmake
2014-07-01 20:08:51.000000000 +0200
+++ new/extra-cmake-modules-1.1.0/kde-modules/KDEInstallDirs.cmake
2014-08-01 19:07:16.000000000 +0200
@@ -69,6 +69,9 @@
# ``KSERVICETYPES5DIR``
# service types for KDE Frameworks 5 (``DATAROOTDIR/kservicetypes5``)
# [``SERVICETYPES_INSTALL_DIR``]
+# ``KXMLGUI5DIR``
+# knotify description files (``DATAROOTDIR/kxmlgui5``)
+# [``KXMLGUI_INSTALL_DIR``]
# ``KNOTIFY5RCDIR``
# knotify description files (``DATAROOTDIR/knotifications5``)
# [``KNOTIFYRC_INSTALL_DIR``]
@@ -93,6 +96,8 @@
# ``MIMEDIR``
# mime description files (``DATAROOTDIR/mime/packages``)
# [``XDG_MIME_INSTALL_DIR``]
+# ``METAINFODIR``
+# AppStream component metadata files (``DATAROOTDIR/appdata``)
# ``MANDIR``
# man documentation (``DATAROOTDIR/man``) [``MAN_INSTALL_DIR``]
# ``INFODIR``
@@ -168,14 +173,15 @@
# by the _define_* macros in this module).
set(_LIBDIR_DEFAULT "lib")
# Override this default 'lib' with 'lib64' iff:
-# - we are on Linux system but NOT cross-compiling
+# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
# - we are NOT on debian
# - we are on a 64 bits system
# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
# See http://wiki.debian.org/Multiarch
-if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CROSSCOMPILING)
+if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL
"GNU")
+ AND NOT CMAKE_CROSSCOMPILING)
if (EXISTS "/etc/debian_version") # is this a debian system ?
if(CMAKE_LIBRARY_ARCHITECTURE)
set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
@@ -384,6 +390,9 @@
_define_relative(KNOTIFY5RCDIR DATAROOTDIR "knotifications5"
"knotify description files"
KNOTIFYRC_INSTALL_DIR)
+_define_relative(KXMLGUI5DIR DATAROOTDIR "kxmlgui5"
+ "kxmlgui .rc files"
+ KXMLGUI_INSTALL_DIR)
# Cross-desktop or other system things
_define_relative(ICONDIR DATAROOTDIR "icons"
@@ -410,6 +419,8 @@
_define_relative(MIMEDIR DATAROOTDIR "mime/packages"
"mime description files"
XDG_MIME_INSTALL_DIR)
+_define_relative(METAINFODIR DATAROOTDIR "appdata"
+ "AppStream component metadata")
_define_relative(MANDIR DATAROOTDIR "man"
"man documentation"
MAN_INSTALL_DIR)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.0.0/modules/ECMCreateQmFromPoFiles.cmake
new/extra-cmake-modules-1.1.0/modules/ECMCreateQmFromPoFiles.cmake
--- old/extra-cmake-modules-1.0.0/modules/ECMCreateQmFromPoFiles.cmake
2014-07-01 20:08:51.000000000 +0200
+++ new/extra-cmake-modules-1.1.0/modules/ECMCreateQmFromPoFiles.cmake
2014-08-01 19:07:16.000000000 +0200
@@ -113,6 +113,7 @@
find_program(lconvert_executable
NAMES lconvert-qt5 lconvert
PATHS ${lrelease_path}
+ NO_DEFAULT_PATH
)
if (catalog_name)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.0.0/modules/ECMInstallIcons.cmake
new/extra-cmake-modules-1.1.0/modules/ECMInstallIcons.cmake
--- old/extra-cmake-modules-1.0.0/modules/ECMInstallIcons.cmake 2014-07-01
20:08:51.000000000 +0200
+++ new/extra-cmake-modules-1.1.0/modules/ECMInstallIcons.cmake 2014-08-01
19:07:16.000000000 +0200
@@ -55,6 +55,7 @@
# * ``lo`` for locolor
# * ``cr`` for the Crystal icon theme
# * ``ox`` for the Oxygen icon theme
+# * ``br`` for the Breeze icon theme
#
# With this syntax, the file ``hi22-actions-menu_new.png`` would be installed
# into ``<icon_install_dir>/hicolor/22x22/actions/menu_new.png``
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-1.0.0/modules/ECMPoQmTools.cmake
new/extra-cmake-modules-1.1.0/modules/ECMPoQmTools.cmake
--- old/extra-cmake-modules-1.0.0/modules/ECMPoQmTools.cmake 2014-07-01
20:08:51.000000000 +0200
+++ new/extra-cmake-modules-1.1.0/modules/ECMPoQmTools.cmake 2014-08-01
19:07:16.000000000 +0200
@@ -129,6 +129,7 @@
find_program(lconvert_executable
NAMES lconvert-qt5 lconvert
PATHS ${lrelease_path}
+ NO_DEFAULT_PATH
)
# Create commands to turn po files into qm files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.0.0/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt
new/extra-cmake-modules-1.1.0/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt
---
old/extra-cmake-modules-1.0.0/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt
2014-07-01 20:08:51.000000000 +0200
+++
new/extra-cmake-modules-1.1.0/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt
2014-08-01 19:07:16.000000000 +0200
@@ -31,6 +31,7 @@
KF5_INCLUDE_INSTALL_DIR
KF5_LIBEXEC_INSTALL_DIR
KNOTIFYRC_INSTALL_DIR
+ KXMLGUI_INSTALL_DIR
LIBEXEC_INSTALL_DIR
LIB_INSTALL_DIR
LOCALE_INSTALL_DIR
@@ -73,6 +74,7 @@
CMAKE_INSTALL_KCFGDIR
CMAKE_INSTALL_KCONFUPDATEDIR
CMAKE_INSTALL_KNOTIFY5RCDIR
+ CMAKE_INSTALL_KXMLGUI5DIR
CMAKE_INSTALL_KSERVICES5DIR
CMAKE_INSTALL_KSERVICETYPES5DIR
CMAKE_INSTALL_LIBDIR
@@ -82,6 +84,7 @@
CMAKE_INSTALL_LOCALSTATEDIR
CMAKE_INSTALL_MANDIR
CMAKE_INSTALL_MIMEDIR
+ CMAKE_INSTALL_METAINFODIR
CMAKE_INSTALL_PLUGINDIR
CMAKE_INSTALL_QMLDIR
CMAKE_INSTALL_QTPLUGINDIR
@@ -117,6 +120,7 @@
CMAKE_INSTALL_FULL_KCFGDIR
CMAKE_INSTALL_FULL_KCONFUPDATEDIR
CMAKE_INSTALL_FULL_KNOTIFY5RCDIR
+ CMAKE_INSTALL_FULL_KXMLGUI5DIR
CMAKE_INSTALL_FULL_KSERVICES5DIR
CMAKE_INSTALL_FULL_KSERVICETYPES5DIR
CMAKE_INSTALL_FULL_LIBDIR
@@ -126,6 +130,7 @@
CMAKE_INSTALL_FULL_LOCALSTATEDIR
CMAKE_INSTALL_FULL_MANDIR
CMAKE_INSTALL_FULL_MIMEDIR
+ CMAKE_INSTALL_FULL_METAINFODIR
CMAKE_INSTALL_FULL_PLUGINDIR
CMAKE_INSTALL_FULL_QMLDIR
CMAKE_INSTALL_FULL_QTPLUGINDIR
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
