From f5953ed1b354c02c7b880a36251d6f633ae8cf34 Mon Sep 17 00:00:00 2001 From: Urs Schulz Date: Wed, 16 Feb 2022 16:58:21 +0100 Subject: [PATCH 1/3] lowdown: add shared library --- common/shlibs | 1 + srcpkgs/lowdown/patches/shared.patch | 43 ++++++++++++++++++++++++++++ srcpkgs/lowdown/template | 6 +++- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/lowdown/patches/shared.patch diff --git a/common/shlibs b/common/shlibs index 784375c7c9aa..677f7cc0a53b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4169,3 +4169,4 @@ libMatrix.so root-6.24.06_1 libThread.so root-6.24.06_1 libTMVA.so root-6.24.06_1 libMathCore.so root-6.24.06_1 +liblowdown.so lowdown-0.9.2_2 diff --git a/srcpkgs/lowdown/patches/shared.patch b/srcpkgs/lowdown/patches/shared.patch new file mode 100644 index 000000000000..acbe304aed93 --- /dev/null +++ b/srcpkgs/lowdown/patches/shared.patch @@ -0,0 +1,43 @@ +diff --git a/Makefile b/Makefile +Stolen from nixpkgs +https://github.com/obsidiansystems/nixpkgs/blob/0ceadf99f221cf461efa9edb34424ff6ad375119/pkgs/tools/typesetting/lowdown/shared.patch +(modified) +index 955f737..2c9532c 100644 +--- a/Makefile ++++ b/Makefile +@@ -80,7 +80,7 @@ REGRESS_ARGS += "--parse-no-autolink" + REGRESS_ARGS += "--parse-no-cmark" + REGRESS_ARGS += "--parse-no-deflists" + +-all: lowdown lowdown-diff lowdown.pc ++all: lowdown lowdown-diff liblowdown.so lowdown.pc + + www: $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512 + +@@ -101,6 +101,9 @@ lowdown-diff: lowdown + liblowdown.a: $(OBJS) $(COMPAT_OBJS) + $(AR) rs $@ $(OBJS) $(COMPAT_OBJS) + ++liblowdown.so: $(OBJS) $(COMPAT_OBJS) ++ $(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) ++ + install: all + mkdir -p $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig +@@ -111,7 +114,8 @@ install: all + $(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig + $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR) + $(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR) + $(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR) ++ $(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR) + $(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR) + for f in $(MANS) ; do \ + name=`basename $$f .html` ; \ +@@ -199,7 +202,8 @@ main.o: lowdown.h + + clean: + rm -f $(OBJS) $(COMPAT_OBJS) main.o + rm -f lowdown lowdown-diff liblowdown.a lowdown.pc ++ rm -f lowdown lowdown-diff liblowdown.so lowdown.pc + rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz + rm -f $(PDFS) $(HTMLS) $(THUMBS) diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template index c76c46601e44..5f69caa0588c 100644 --- a/srcpkgs/lowdown/template +++ b/srcpkgs/lowdown/template @@ -1,7 +1,7 @@ # Template file for 'lowdown' pkgname=lowdown version=0.9.2 -revision=1 +revision=2 build_style=configure configure_args="PREFIX=/usr MANDIR=/usr/share/man" make_check_target="regress" @@ -13,6 +13,10 @@ homepage="https://kristaps.bsd.lv/lowdown/" changelog="https://kristaps.bsd.lv/lowdown/archive.html" distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz" checksum=5c355d1db2071916b1ad6e789208de664be3781bd17dd8b6b09b1707a283a988 +shlib_provides="liblowdown.so" + +CFLAGS+=" -fPIE -fPIC" +LDFLAGS+=" -pie" post_install() { vlicense LICENSE.md From 3bf81cfbd8e1eeb3157f4a7fa0ea82cc71592f7d Mon Sep 17 00:00:00 2001 From: Urs Schulz Date: Sun, 8 May 2022 13:57:09 +0200 Subject: [PATCH 2/3] New package: nlohmann-json-3.10.5 --- srcpkgs/nlohmann-json/template | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/nlohmann-json/template diff --git a/srcpkgs/nlohmann-json/template b/srcpkgs/nlohmann-json/template new file mode 100644 index 000000000000..a2eee0eddd8b --- /dev/null +++ b/srcpkgs/nlohmann-json/template @@ -0,0 +1,22 @@ +# Template file for 'nlohmann-json' +pkgname=nlohmann-json +version=3.10.5 +revision=1 +wrksrc="json-${version}" +build_style=cmake +configure_args="-DCMAKE_BUILD_TYPE=None -DJSON_MultipleHeaders=ON" +short_desc="JSON for Modern C++" +maintainer="Urs Schulz " +license="MIT" +homepage="https://github.com/nlohmann/json" +#changelog="" +distfiles="https://github.com/nlohmann/json/archive/refs/tags/v${version}.tar.gz" +checksum=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 +# tests try to download test data +make_check=no + + +post_install() { + vdoc "README.md" + vlicense "LICENSE.MIT" +} From 49d09cac6f4e99a5dd2f0c1d32fbdca34ca3a36d Mon Sep 17 00:00:00 2001 From: Urs Schulz Date: Sun, 8 May 2022 14:26:54 +0200 Subject: [PATCH 3/3] nix: update to 2.8.0. --- srcpkgs/nix/template | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 6e481b3760af..e370a27d0cee 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,22 +1,23 @@ # Template file for 'nix' pkgname=nix -version=2.3.12 +version=2.8.0 revision=1 build_style=gnu-configure # Use /nix/var as suggested by the official Manual. configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh" -hostmakedepends="curl pkg-config flex tar xz" +hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook" makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel liblzma-devel openssl-devel libsodium-devel sqlite-devel - libseccomp-devel editline-devel" + libseccomp-devel editline-devel jq-devel libarchive-devel libcpuid-devel + gtest-devel lowdown-devel nlohmann-json" depends="curl tar xz" short_desc="Purely functional package manager" maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="https://nixos.org/nix/" changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes" -distfiles="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.xz" -checksum=213a7d49c461079b32361e4d008d248d7f68e34d2cc9347f3a8ff9029f9afb5d +distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz" +checksum=91a7f2bcdde3263927d842f04a345ed77319148c700e2c8be01498724e6808c0 CXXFLAGS="-Wno-deprecated-declarations" @@ -47,13 +48,14 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then fi pre_configure() { - if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - echo "libexpr_LDFLAGS += -latomic" >> src/libexpr/local.mk - echo "libutil_LDFLAGS += -latomic" >> src/libutil/local.mk - echo "libstore_LDFLAGS += -latomic" >> src/libstore/local.mk - fi - sed -i '/^CFLAGS=/d;/^CXXFLAGS=/d' configure - echo "GLOBAL_LDFLAGS += $LDFLAGS" >>mk/lib.mk + ./bootstrap.sh + #if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + # echo "libexpr_LDFLAGS += -latomic" >> src/libexpr/local.mk + # echo "libutil_LDFLAGS += -latomic" >> src/libutil/local.mk + # echo "libstore_LDFLAGS += -latomic" >> src/libstore/local.mk + #fi + #sed -i '/^CFLAGS=/d;/^CXXFLAGS=/d' configure + #echo "GLOBAL_LDFLAGS += $LDFLAGS" >>mk/lib.mk } post_install() {