Accepting request 665005 from home:susnux:branches:devel:libraries:c_c++

- Update to version 5.3.0:
  * Introduced experimental chrono formatting support
  * Added experimental support for emphasis
   (bold, italic, underline, strikethrough), colored output to a
   file stream, and improved colored formatting API
  * Added support for 4-bit terminal colors
  * Made std::string_view work as a format string
  * Added wide string support to compile-time format string checks
  * Made colored print functions work with wide strings
  * Introduced experimental Unicode support
  * Removed undocumented basic_fixed_buffer which has been
   superseded by the iterator-based API
  * Disallowed repeated leading zeros in an argument ID
  * Deprecated fmt::visit, parse_context, and wparse_context.
   Use fmt::visit_format_arg, format_parse_context, and
   wformat_parse_context instead.
- Removed upstream merged fix-fmt_pc.patch

OBS-URL: https://build.opensuse.org/request/show/665005
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/fmt?expand=0&rev=5
This commit is contained in:
Luigi Baldoni 2019-01-13 12:48:15 +00:00 committed by Git OBS Bridge
parent 7b9578769d
commit 507c50d090
5 changed files with 27 additions and 85 deletions

View File

@ -1,77 +0,0 @@
From 9d0c9c4bb145a286f725cd38c90331eee7addc7f Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Wed, 24 Oct 2018 01:33:22 -0700
Subject: [PATCH] cmake: output share/fmt.pc
---
.gitignore | 1 +
CMakeLists.txt | 9 +++++++++
support/cmake/fmt.pc.in | 11 +++++++++++
3 files changed, 21 insertions(+)
create mode 100644 support/cmake/fmt.pc.in
diff --git a/.gitignore b/.gitignore
index 1e6172fe..694f8f8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ CMakeFiles
FMT.build
Makefile
run-msbuild.bat
+fmt.pc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7cf74829..d1bc9558 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,6 +202,7 @@ if (FMT_INSTALL)
"Installation directory for cmake files, relative to ${CMAKE_INSTALL_PREFIX}.")
set(version_config ${PROJECT_BINARY_DIR}/fmt-config-version.cmake)
set(project_config ${PROJECT_BINARY_DIR}/fmt-config.cmake)
+ set(pkgconfig ${PROJECT_BINARY_DIR}/fmt.pc)
set(targets_export_name fmt-targets)
set (INSTALL_TARGETS fmt)
@@ -215,11 +216,18 @@ if (FMT_INSTALL)
set(FMT_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR}/fmt CACHE STRING
"Installation directory for include files, relative to ${CMAKE_INSTALL_PREFIX}.")
+ set(FMT_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH
+ "Installation directory for pkgconfig (.pc) files, relative to ${CMAKE_INSTALL_PREFIX}.")
+
# Generate the version, config and target files into the build directory.
write_basic_package_version_file(
${version_config}
VERSION ${FMT_VERSION}
COMPATIBILITY AnyNewerVersion)
+ configure_file(
+ "${PROJECT_SOURCE_DIR}/support/cmake/fmt.pc.in"
+ "${pkgconfig}"
+ @ONLY)
configure_package_config_file(
${PROJECT_SOURCE_DIR}/support/cmake/fmt-config.cmake.in
${project_config}
@@ -240,6 +248,7 @@ if (FMT_INSTALL)
install(TARGETS ${INSTALL_TARGETS} EXPORT ${targets_export_name}
DESTINATION ${FMT_LIB_DIR})
install(FILES ${FMT_HEADERS} DESTINATION ${FMT_INC_DIR})
+ install(FILES "${pkgconfig}" DESTINATION "${FMT_PKGCONFIG_DIR}")
endif ()
if (FMT_DOC)
diff --git a/support/cmake/fmt.pc.in b/support/cmake/fmt.pc.in
new file mode 100644
index 00000000..4b82ddb0
--- /dev/null
+++ b/support/cmake/fmt.pc.in
@@ -0,0 +1,11 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@CMAKE_INSTALL_LIBDIR@
+includedir=@CMAKE_INSTALL_INCLUDEDIR@
+
+Name: fmt
+Description: A modern formatting library
+Version: @FMT_VERSION@
+Libs: -L${libdir} -lfmt
+Cflags: -I${includedir}
+

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3c812a18e9f72a88631ab4732a97ce9ef5bcbefb3235e9fd465f059ba204359b
size 648668

3
fmt-5.3.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:defa24a9af4c622a7134076602070b45721a43c51598c8456ec6f2c4dbb51c89
size 662493

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Sat Jan 12 18:29:40 UTC 2019 - Ferdinand Thiessen <rpm@fthiessen.de>
- Update to version 5.3.0:
* Introduced experimental chrono formatting support
* Added experimental support for emphasis
(bold, italic, underline, strikethrough), colored output to a
file stream, and improved colored formatting API
* Added support for 4-bit terminal colors
* Made std::string_view work as a format string
* Added wide string support to compile-time format string checks
* Made colored print functions work with wide strings
* Introduced experimental Unicode support
* Removed undocumented basic_fixed_buffer which has been
superseded by the iterator-based API
* Disallowed repeated leading zeros in an argument ID
* Deprecated fmt::visit, parse_context, and wparse_context.
Use fmt::visit_format_arg, format_parse_context, and
wformat_parse_context instead.
- Removed upstream merged fix-fmt_pc.patch
-------------------------------------------------------------------
Thu Dec 6 21:15:37 UTC 2018 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package fmt
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
%define sover 5
Name: fmt
Version: 5.2.1
Version: 5.3.0
Release: 0
Summary: A formatting library for C++
License: BSD-2-Clause
@ -26,8 +26,6 @@ Group: Development/Libraries/C and C++
URL: http://fmtlib.net/
Source0: https://github.com/fmtlib/fmt/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM fix-fmt_pc.patch
Patch0: fix-fmt_pc.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@ -52,7 +50,7 @@ Requires: libfmt%{sover} = %{version}
Development files for fmt, a formatting library for C++.
%prep
%autosetup -p1
%setup -q
%build
%cmake -DCMAKE_INSTALL_INCLUDEDIR:PATH=%{_includedir}