Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: zlib-ng-2.0.1
@ 2021-03-17 17:28 Logarithmus
  2021-03-17 17:45 ` [PR REVIEW] " ericonr
                   ` (39 more replies)
  0 siblings, 40 replies; 41+ messages in thread
From: Logarithmus @ 2021-03-17 17:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 878 bytes --]

There is a new pull request by Logarithmus against master on the void-packages repository

https://github.com/Logarithmus/void-packages zlib-ng
https://github.com/void-linux/void-packages/pull/29544

New package: zlib-ng-2.0.1
- New package: zlib-ng-2.0.1

<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Maybe I should use `virtualpkg` instead of `alternatives`?


A patch file from https://github.com/void-linux/void-packages/pull/29544.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zlib-ng-29544.patch --]
[-- Type: text/x-diff, Size: 3406 bytes --]

From 85786abe77be7c3a5e96c99436925d9a8b698de5 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Wed, 17 Mar 2021 17:47:46 +0300
Subject: [PATCH 1/2] zlib: add alternatives for zlib-ng compatibility

---
 srcpkgs/zlib/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index ec437ea6df4a..a02a77828202 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,21 +1,27 @@
-# Template build file for 'zlib'
+# Template file for 'zlib'
 pkgname=zlib
 version=1.2.11
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
-short_desc="A compression/decompression Library"
+short_desc="Compression/decompression Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="zlib"
+license="Zlib"
 homepage="http://www.zlib.net"
 distfiles="$homepage/$pkgname-$version.tar.gz"
 checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+alternatives="zlib:libz.so.1:/usr/lib/libz.so.${version}"
 
 do_configure() {
 	LDFLAGS= LDSHAREDLIBC= ./configure --prefix=/usr --shared
 }
 
+post_install() {
+	rm "${DESTDIR}/usr/lib/libz.so.1"
+}
+
 zlib-devel_package() {
+	conflicts="zlib-ng-devel"
 	depends="zlib>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {

From 37669e5fce4f102f9f52fa37e7af61c43d0904d0 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Wed, 17 Mar 2021 17:48:51 +0300
Subject: [PATCH 2/2] New package: zlib-ng-2.0.1

---
 common/shlibs            |  1 +
 srcpkgs/zlib-ng-devel    |  1 +
 srcpkgs/zlib-ng/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/zlib-ng-devel
 create mode 100644 srcpkgs/zlib-ng/template

diff --git a/common/shlibs b/common/shlibs
index bba9a0eb1939..ddd93b6bf829 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -48,6 +48,7 @@ libpcprofile.so glibc-2.32_1
 libcidn.so.1 glibc-2.32_1
 libmvec.so.1 glibc-2.32_1
 libz.so.1 zlib-1.2.3_1
+libz.so.1 zlib-ng-2.0.1_1
 libbz2.so.1 bzip2-1.0.5_1
 libarchive.so.13 libarchive-3.5.1_2
 libcc1.so.0 gcc-6.2.1_1
diff --git a/srcpkgs/zlib-ng-devel b/srcpkgs/zlib-ng-devel
new file mode 120000
index 000000000000..65f4ecb07e5b
--- /dev/null
+++ b/srcpkgs/zlib-ng-devel
@@ -0,0 +1 @@
+zlib-ng
\ No newline at end of file
diff --git a/srcpkgs/zlib-ng/template b/srcpkgs/zlib-ng/template
new file mode 100644
index 000000000000..a9cc005b8db5
--- /dev/null
+++ b/srcpkgs/zlib-ng/template
@@ -0,0 +1,29 @@
+# Template file for 'zlib-ng'
+pkgname=zlib-ng
+version=2.0.1
+revision=1
+build_style=cmake
+configure_args="-DZLIB_COMPAT=ON"
+short_desc="Zlib replacement with optimizations for \"next generation\" systems"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
+license="Zlib"
+homepage="https://github.com/zlib-ng/zlib-ng"
+distfiles="https://github.com/zlib-ng/zlib-ng/archive/${version}.tar.gz"
+checksum=8599893f9b78bf979c1a1d6549b730367c9186560c6879590354998cc55428cf
+alternatives="zlib:libz.so.1:/usr/lib/libz.so.1.2.11.zlib-ng"
+
+post_install() {
+	rm "${DESTDIR}/usr/lib/libz.so.1"
+}
+
+zlib-ng-devel_package() {
+	conflicts="zlib-devel"
+	depends="${pkgname}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

^ permalink raw reply	[flat|nested] 41+ messages in thread
end of thread, other threads:[~2021-06-07 13:56 UTC | newest]

Thread overview: 41+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-17 17:28 [PR PATCH] New package: zlib-ng-2.0.1 Logarithmus
2021-03-17 17:45 ` [PR REVIEW] " ericonr
2021-03-17 17:45 ` ericonr
2021-03-17 17:45 ` ericonr
2021-03-17 17:45 ` ericonr
2021-03-17 18:12 ` Logarithmus
2021-03-17 18:26 ` Logarithmus
2021-03-17 18:27 ` Logarithmus
2021-03-17 18:30 ` [PR REVIEW] " Logarithmus
2021-03-17 18:31 ` [PR PATCH] [Updated] " Logarithmus
2021-03-17 18:32 ` [PR REVIEW] " Logarithmus
2021-03-17 18:32 ` Logarithmus
2021-03-17 18:39 ` ericonr
2021-03-17 18:40 ` ericonr
2021-03-17 18:41 ` ericonr
2021-03-17 19:29 ` [PR PATCH] [Updated] " Logarithmus
2021-03-26 20:38 ` [PR PATCH] [Updated] New package: zlib-ng-2.0.2 Logarithmus
2021-03-26 20:39 ` Logarithmus
2021-03-26 21:08 ` ericonr
2021-03-26 21:21 ` Logarithmus
2021-03-26 21:21 ` Logarithmus
2021-03-26 21:22 ` Logarithmus
2021-03-26 21:24 ` Logarithmus
2021-03-26 21:27 ` jnbr
2021-03-26 21:29 ` jnbr
2021-03-26 21:35 ` ericonr
2021-03-26 21:36 ` ericonr
2021-03-27 13:22 ` Logarithmus
2021-03-27 16:21 ` ericonr
2021-03-29  6:38 ` Logarithmus
2021-03-29  6:39 ` Logarithmus
2021-03-29  7:59 ` Logarithmus
2021-03-29 13:53 ` sgn
2021-03-29 13:54 ` [PR REVIEW] " sgn
2021-03-29 13:56 ` sgn
2021-03-29 13:56 ` sgn
2021-03-30 14:13 ` sgn
2021-03-30 14:14 ` sgn
2021-03-31  2:08 ` sgn
2021-06-07 13:56 ` ericonr
2021-06-07 13:56 ` [PR PATCH] [Closed]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).