Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2015-10-12 10:01:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old) and /work/SRC/openSUSE:Factory/.kdelibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4-apidocs.changes 2015-10-03 20:29:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4-apidocs.changes 2015-10-12 10:01:14.000000000 +0200 @@ -2 +2,15 @@ -Sun Sep 20 18:50:12 UTC 2015 - [email protected] +Fri Oct 9 17:13:31 UTC 2015 - [email protected] + +- Update sync-with-upstream-FindGettext.patch to remain compatible + with all users of kdelibs' module + +------------------------------------------------------------------- +Thu Oct 8 16:38:24 UTC 2015 - [email protected] + +- Added patches to fix build for users of KDE4Macros and FindGettext + kdelibs' (> 4.14.11, where CMP0002 is set to NEW) modules: + sync-with-upstream-FindGettext.patch + Give-unique-names-to-the-targets-created-by-KDE4Macros.cmake.patch + +------------------------------------------------------------------- +Sun Sep 20 18:50:02 UTC 2015 - [email protected] --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2015-10-03 20:29:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2015-10-12 10:01:14.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Oct 9 17:13:31 UTC 2015 - [email protected] + +- Update sync-with-upstream-FindGettext.patch to remain compatible + with all users of kdelibs' module + +------------------------------------------------------------------- +Thu Oct 8 16:38:24 UTC 2015 - [email protected] + +- Added patches to fix build for users of KDE4Macros and FindGettext + kdelibs' (> 4.14.11, where CMP0002 is set to NEW) modules: + sync-with-upstream-FindGettext.patch + Give-unique-names-to-the-targets-created-by-KDE4Macros.cmake.patch + +------------------------------------------------------------------- New: ---- Give-unique-names-to-the-targets-created-by-KDE4Macros.cmake.patch sync-with-upstream-FindGettext.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.4Edg63/_old 2015-10-12 10:01:15.000000000 +0200 +++ /var/tmp/diff_new_pack.4Edg63/_new 2015-10-12 10:01:15.000000000 +0200 @@ -90,6 +90,10 @@ # PATCH-FIX-OPENSUSE 0001-Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch -- Nepomuk is only used in a private header, browserrun_p.h, # thus it is not needed as KParts public dependancy, makes it possible to drop libsoprano-devel from libkde4-devel Requires Patch15: 0001-Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch +# PATCH-FIX-OPENSUSE sync-with-upstream-FindGettext.patch +Patch16: sync-with-upstream-FindGettext.patch +# PATCH-FIX-OPENSUSE Give-unique-names-to-the-targets-created-by-KDE4Macros.cmake.patch +Patch17: Give-unique-names-to-the-targets-created-by-KDE4Macros.cmake.patch PreReq: permissions Requires: libattica0_4 >= %( echo `rpm -q --queryformat '%{VERSION}' libattica-devel`) Recommends: media-player-info @@ -149,6 +153,8 @@ %patch11 -p1 %patch12 -p1 %patch15 -p1 +%patch16 -p1 +%patch17 -p1 %build EXTRA_FLAGS="-DLIB_INSTALL_DIR=%{_kde4_libdir} \ ++++++ Give-unique-names-to-the-targets-created-by-KDE4Macros.cmake.patch ++++++ --- kdelibs-4.14.12/cmake/modules/KDE4Macros.cmake.orig 2015-09-14 21:58:46.000000000 +0200 +++ kdelibs-4.14.12/cmake/modules/KDE4Macros.cmake 2015-10-08 17:15:45.515243529 +0200 @@ -54,6 +54,11 @@ if(NOT COMMAND _AUTOMOC4_KDE4_PRE_TARGET endif(NOT COMMAND _AUTOMOC4_KDE4_PRE_TARGET_HANDLING) +macro(_SUGGEST_TARGET_NAME _out) + string(REPLACE "${CMAKE_SOURCE_DIR}/" "" ${_out} "${CMAKE_CURRENT_SOURCE_DIR}") + string(REGEX REPLACE "[^0-9a-zA-Z]" "-" ${_out} "${${_out}}") +endmacro() + macro (KDE4_ADD_KCFG_FILES _sources ) foreach (_current_ARG ${ARGN}) if( ${_current_ARG} STREQUAL "GENERATE_MOC" ) @@ -301,7 +306,7 @@ macro (KDE4_CREATE_HANDBOOK _docbook) DEPENDS ${_docs} ${_KDE4_MEINPROC_EXECUTABLE_DEP} ${_ssheet} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) - get_filename_component(_targ ${CMAKE_CURRENT_SOURCE_DIR} NAME) + _suggest_target_name(_targ) set(_targ "${_targ}-handbook") add_custom_target(${_targ} ALL DEPENDS ${_doc}) @@ -377,7 +382,7 @@ macro (KDE4_CREATE_MANPAGE _docbook _sec COMMAND ${KDE4_MEINPROC_EXECUTABLE} --stylesheet ${_ssheet} --check ${_bootstrapOption} ${_input} DEPENDS ${_input} ${_KDE4_MEINPROC_EXECUTABLE_DEP} ${_ssheet} ) - get_filename_component(_targ ${CMAKE_CURRENT_SOURCE_DIR} NAME) + _suggest_target_name(_targ) set(_targ "${_targ}-manpage-${_base}") add_custom_target(${_targ} ALL DEPENDS "${_outdoc}") ++++++ sync-with-upstream-FindGettext.patch ++++++ --- kdelibs-4.14.12/cmake/modules/FindGettext.cmake 2015-09-14 21:58:46.000000000 +0200 +++ kdelibs-4.14.12.new/cmake/modules/FindGettext.cmake 2015-10-09 19:11:20.000401894 +0200 @@ -100,6 +100,17 @@ FIND_PROGRAM(GETTEXT_MSGMERGE_EXECUTABLE FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt) +FUNCTION(_GETTEXT_GET_UNIQUE_TARGET_NAME _name _unique_name) + SET(propertyName "_GETTEXT_UNIQUE_COUNTER_${_name}") + GET_PROPERTY(currentCounter GLOBAL PROPERTY "${propertyName}") + IF(NOT currentCounter) + SET(currentCounter 1) + ENDIF() + SET(${_unique_name} "${_name}_${currentCounter}" PARENT_SCOPE) + MATH(EXPR currentCounter "${currentCounter} + 1") + SET_PROPERTY(GLOBAL PROPERTY ${propertyName} ${currentCounter} ) +ENDFUNCTION() + MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFile) SET(_gmoFiles) @@ -131,7 +142,15 @@ MACRO(GETTEXT_CREATE_TRANSLATIONS _potFi ENDFOREACH (_currentPoFile ) - ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles}) + IF(NOT TARGET translations) + ADD_CUSTOM_TARGET(translations) + ENDIF() + + _GETTEXT_GET_UNIQUE_TARGET_NAME(translations uniqueTargetName) + + ADD_CUSTOM_TARGET(${uniqueTargetName} ${_addToAll} DEPENDS ${_gmoFiles}) + + ADD_DEPENDENCIES(translations ${uniqueTargetName}) ENDMACRO(GETTEXT_CREATE_TRANSLATIONS ) @@ -188,7 +207,15 @@ MACRO(GETTEXT_PROCESS_POT_FILE _potFile) ENDFOREACH (_lang ) - ADD_CUSTOM_TARGET(potfile ${_addToAll} DEPENDS ${_gmoFiles}) + IF(NOT TARGET potfile) + ADD_CUSTOM_TARGET(potfile) + ENDIF() + + _GETTEXT_GET_UNIQUE_TARGET_NAME( potfile uniqueTargetName) + + ADD_CUSTOM_TARGET(${uniqueTargetName} ${_addToAll} DEPENDS ${_gmoFiles}) + + ADD_DEPENDENCIES(potfile ${uniqueTargetName}) ENDMACRO(GETTEXT_PROCESS_POT_FILE) @@ -229,7 +256,16 @@ MACRO(GETTEXT_PROCESS_PO_FILES _lang) ENDIF(_installDest) LIST(APPEND _gmoFiles ${_gmoFile}) ENDFOREACH(_current_PO_FILE) - ADD_CUSTOM_TARGET(pofiles ${_addToAll} DEPENDS ${_gmoFiles}) + + IF(NOT TARGET pofiles) + ADD_CUSTOM_TARGET(pofiles) + ENDIF() + + _GETTEXT_GET_UNIQUE_TARGET_NAME( pofiles uniqueTargetName) + + ADD_CUSTOM_TARGET(${uniqueTargetName} ${_addToAll} DEPENDS ${_gmoFiles}) + + ADD_DEPENDENCIES(pofiles ${uniqueTargetName}) ENDMACRO(GETTEXT_PROCESS_PO_FILES)
