Maxime Gauduin pushed to branch main at Arch Linux / Packaging / Packages / fmt
Commits:
7b8ffdbb by Maxime Gauduin at 2024-01-04T17:48:44+01:00
upgpkg: 10.2.0-1
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- fmt-no-pip-no-virtualenv.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
pkgbase = fmt
pkgdesc = Open-source formatting library for C++
- pkgver = 10.1.1
+ pkgver = 10.2.0
pkgrel = 1
url = https://fmt.dev
arch = x86_64
@@ -18,11 +18,11 @@ pkgbase = fmt
makedepends = python-wheel
depends = gcc-libs
provides = libfmt.so
- source =
git+https://github.com/fmtlib/fmt.git#tag=f5e54359df4c26b6230fc61d38aa294581393084
+ source =
git+https://github.com/fmtlib/fmt.git#tag=67c0c0c09cf74d407d71a29c194761981614df3e
source = fmt-no-pip-no-virtualenv.patch
source = fmt-10.0.0-sphinx.patch
b2sums = SKIP
- b2sums =
4e19e7b2cd8fd049b7c692c0efbc4b2f1dd6062f44a600f4f47be81ed0ed14defb4285eb09b8d8fb8bb55441689c3a659e157e91d2cdd94e4d7b00c28b6534f2
+ b2sums =
0bc421afdc4c2527525ce2e21740c9f72e05431394fb4710c1a8fa6d3bb2ee20d0630e2a76ddbac3c0ba27c1ab08f0c8e27d060def1370721b1c94246cbbf0ff
b2sums =
4eabdf38317e22e6b650b91821f1fab50bb3641e4f9a63847cb9b823becd3a4106fe47df37c8dc886f5fe1d1d3e529136c867459105df07c359582214d6fa01f
pkgname = fmt
=====================================
PKGBUILD
=====================================
@@ -2,7 +2,7 @@
# Contributor: Mihai Bişog <mihai.bi...@gmail.com>
pkgname=fmt
-pkgver=10.1.1
+pkgver=10.2.0
pkgrel=1
pkgdesc='Open-source formatting library for C++'
arch=(x86_64)
@@ -23,14 +23,14 @@ makedepends=(
python-wheel
)
provides=(libfmt.so)
-_tag=f5e54359df4c26b6230fc61d38aa294581393084
+_tag=67c0c0c09cf74d407d71a29c194761981614df3e
source=(
git+https://github.com/fmtlib/fmt.git#tag=${_tag}
fmt-no-pip-no-virtualenv.patch
fmt-10.0.0-sphinx.patch
)
b2sums=('SKIP'
-
'4e19e7b2cd8fd049b7c692c0efbc4b2f1dd6062f44a600f4f47be81ed0ed14defb4285eb09b8d8fb8bb55441689c3a659e157e91d2cdd94e4d7b00c28b6534f2'
+
'0bc421afdc4c2527525ce2e21740c9f72e05431394fb4710c1a8fa6d3bb2ee20d0630e2a76ddbac3c0ba27c1ab08f0c8e27d060def1370721b1c94246cbbf0ff'
'4eabdf38317e22e6b650b91821f1fab50bb3641e4f9a63847cb9b823becd3a4106fe47df37c8dc886f5fe1d1d3e529136c867459105df07c359582214d6fa01f')
prepare() {
@@ -60,7 +60,7 @@ check() {
package() {
DESTDIR="${pkgdir}" cmake --build build --target install
- install -Dm 644 fmt/LICENSE.rst -t "${pkgdir}"/usr/share/licenses/fmt/
+ install -Dm 644 fmt/LICENSE -t "${pkgdir}"/usr/share/licenses/fmt/
}
# vim: ts=2 sw=2 et:
=====================================
fmt-no-pip-no-virtualenv.patch
=====================================
@@ -1,9 +1,9 @@
diff '--color=auto' -rupN fmt.orig/doc/build.py fmt/doc/build.py
---- fmt.orig/doc/build.py 2022-11-06 10:33:24.090111201 +0100
-+++ fmt/doc/build.py 2022-11-06 10:59:30.089304304 +0100
-@@ -6,34 +6,6 @@ from subprocess import check_call, Calle
-
- versions = ['1.0.0', '1.1.0', '2.0.0', '3.0.2', '4.0.0', '4.1.0', '5.0.0',
'5.1.0', '5.2.0', '5.2.1', '5.3.0', '6.0.0', '6.1.0', '6.1.1', '6.1.2',
'6.2.0', '6.2.1', '7.0.0', '7.0.1', '7.0.2', '7.0.3', '7.1.0', '7.1.1',
'7.1.2', '7.1.3', '8.0.0', '8.0.1', '8.1.0', '8.1.1', '9.0.0', '9.1.0']
+--- fmt.orig/doc/build.py 2024-01-04 17:40:34.014213222 +0100
++++ fmt/doc/build.py 2024-01-04 17:41:48.775161340 +0100
+@@ -11,34 +11,6 @@ versions = [
+ '7.1.3', '8.0.0', '8.0.1', '8.1.0', '8.1.1', '9.0.0', '9.1.0']
+ versions += ['10.0.0', '10.1.0', '10.1.1', '10.1.1', '10.2.0']
-class Pip:
- def __init__(self, venv_dir):
@@ -30,13 +30,13 @@ diff '--color=auto' -rupN fmt.orig/doc/build.py
fmt/doc/build.py
- # Jinja2 >= 3.1 incompatible with sphinx 3.3.0
- # See: https://github.com/sphinx-doc/sphinx/issues/10291
- pip.install('Jinja2<3.1')
-- pip.install('sphinx-doc/sphinx', 'v3.3.0')
+- pip.install('sphinx==3.3.0')
- pip.install('michaeljones/breathe', 'v4.25.0')
-
def build_docs(version='dev', **kwargs):
doc_dir = kwargs.get('doc_dir', os.path.dirname(os.path.realpath(__file__)))
work_dir = kwargs.get('work_dir', '.')
-@@ -99,13 +71,14 @@ def build_docs(version='dev', **kwargs):
+@@ -103,13 +75,14 @@ def build_docs(version='dev', **kwargs):
html_dir = os.path.join(work_dir, 'html')
main_versions = reversed(versions[-3:])
@@ -53,16 +53,9 @@ diff '--color=auto' -rupN fmt.orig/doc/build.py
fmt/doc/build.py
'--include-path=' + os.path.join(doc_dir, 'bootstrap'),
os.path.join(doc_dir, 'fmt.less'),
os.path.join(html_dir, '_static', 'fmt.css')])
-@@ -118,5 +91,4 @@ def build_docs(version='dev', **kwargs):
+@@ -122,5 +95,4 @@ def build_docs(version='dev', **kwargs):
return html_dir
if __name__ == '__main__':
- create_build_env()
build_docs(sys.argv[1])
-diff '--color=auto' -rupN fmt.orig/.git/FETCH_HEAD fmt/.git/FETCH_HEAD
---- fmt.orig/.git/FETCH_HEAD 1970-01-01 01:00:00.000000000 +0100
-+++ fmt/.git/FETCH_HEAD 2022-11-06 10:42:25.065548317 +0100
-@@ -0,0 +1,3 @@
-+fc07217d85e6dcec52878807d6bbd89a9d9156a5 branch 'master' of
https://github.com/fmtlib/fmt
-+3e8d2c57f3aee665e4672cd4e3fbf69cc2ebff2d not-for-merge branch '4.x' of
https://github.com/fmtlib/fmt
-+48f76dbb5211e9731b7f8aa19209ba86a1b8df23 not-for-merge branch 'text'
of https://github.com/fmtlib/fmt
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/fmt/-/commit/7b8ffdbbfc1a520a8336dba02b05cf7f9f36ada9
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/fmt/-/commit/7b8ffdbbfc1a520a8336dba02b05cf7f9f36ada9
You're receiving this email because of your account on gitlab.archlinux.org.
