Hello community, here is the log from the commit of package plplot for openSUSE:Factory checked in at 2018-12-06 12:16:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plplot (Old) and /work/SRC/openSUSE:Factory/.plplot.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plplot" Thu Dec 6 12:16:42 2018 rev:53 rq:653214 version:5.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/plplot/plplot.changes 2018-08-03 12:36:52.391531397 +0200 +++ /work/SRC/openSUSE:Factory/.plplot.new.19453/plplot.changes 2018-12-06 12:16:42.325559199 +0100 @@ -1,0 +2,7 @@ +Fri Nov 30 12:43:55 UTC 2018 - [email protected] + +- Add plplot-fix-pkgconfig-checks.patch: Fix pkg-config based + checks for installed dependencies; patch taken from upstream + git. + +------------------------------------------------------------------- New: ---- plplot-fix-pkgconfig-checks.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plplot.spec ++++++ --- /var/tmp/diff_new_pack.wJAdle/_old 2018-12-06 12:16:43.029558443 +0100 +++ /var/tmp/diff_new_pack.wJAdle/_new 2018-12-06 12:16:43.037558434 +0100 @@ -52,6 +52,8 @@ Source0: http://download.sf.net/plplot/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM plplot-5.9.9-ada-pic.patch [email protected] -- Compile Ada code with -fPIC Patch1: plplot-5.9.9-ada-pic.patch +# PATCH-FIX-UPSTREAM plplot-fix-pkgconfig-checks.patch [email protected] -- Fix pkg-config based checks for installed dependencies; patch taken from upstream git +Patch2: plplot-fix-pkgconfig-checks.patch BuildRequires: cmake >= 3.0.2 BuildRequires: fdupes BuildRequires: freefont @@ -926,6 +928,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 for file in NEWS README.release do ++++++ plplot-fix-pkgconfig-checks.patch ++++++ diff --git a/cmake/modules/cairo.cmake b/cmake/modules/cairo.cmake index 4580838cc..772fc1459 100644 --- a/cmake/modules/cairo.cmake +++ b/cmake/modules/cairo.cmake @@ -104,7 +104,7 @@ if( linkflags cflags version - _CAIRO + _PANGOCAIRO ) if(linkflags) # Check that the pangocairo library version is recent diff --git a/cmake/modules/pkg-config.cmake b/cmake/modules/pkg-config.cmake index c87275497..a0ca6b296 100644 --- a/cmake/modules/pkg-config.cmake +++ b/cmake/modules/pkg-config.cmake @@ -1,6 +1,6 @@ # cmake/modules/pkg-config.cmake # -# Copyright (C) 2006-2017 Alan W. Irwin +# Copyright (C) 2006-2018 Alan W. Irwin # # This file is part of PLplot. # @@ -96,6 +96,9 @@ if(PKG_CONFIG_EXECUTABLE) endif(cmake_cxx_implicit_link_library) endforeach(cmake_cxx_implicit_link_library ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES}) endif(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES) + # Some cmake versions (e.g., CMake-3.12.2) produce duplicate libraries in this + # list, but don't remove them in case these are needed for static linking. + # list(REMOVE_DUPLICATES cxx_compiler_library_pathname_list) message(STATUS "cxx_compiler_library_pathname_list = ${cxx_compiler_library_pathname_list}") else(PKG_CONFIG_EXECUTABLE) @@ -125,7 +128,7 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_DIR _link_FLAGS _cflags _v set(_xprefix ${_prefix}) endif(FORCE_EXTERNAL_STATIC) - _pkg_check_modules_internal(0 0 0 0 0 ${_prefix} "${_package}") + pkg_check_modules(${_prefix} "${_package}") if(${_prefix}_FOUND) cmake_link_flags(${_link_FLAGS} "${${_xprefix}_LDFLAGS}") @@ -152,12 +155,12 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_DIR _link_FLAGS _cflags _v set(${_version}) set(_return_VALUE 1) endif(${_prefix}_FOUND) - #message("${_prefix}_FOUND = ${${_prefix}_FOUND}") - #message("${_include_DIR} = ${${_include_DIR}}") - #message("${_link_DIR} = ${${_link_DIR}}") - #message("${_link_FLAGS} = ${${_link_FLAGS}}") - #message("${_cflags} = ${${_cflags}}") - #message("${_version} = ${${_version}}") + #message("DEBUG: ${_prefix}_FOUND = ${${_prefix}_FOUND}") + #message("DEBUG: ${_include_DIR} = ${${_include_DIR}}") + #message("DEBUG: ${_link_DIR} = ${${_link_DIR}}") + #message("DEBUG: ${_link_FLAGS} = ${${_link_FLAGS}}") + #message("DEBUG: ${_cflags} = ${${_cflags}}") + #message("DEBUG: ${_version} = ${${_version}}") endmacro(pkg_check_pkgconfig) function(pkg_config_link_flags link_flags_out link_flags_in)
