* [PR PATCH] unrar: update to 6.1.3
@ 2021-12-21 21:42 the-eater
2021-12-21 21:50 ` paper42
` (12 more replies)
0 siblings, 13 replies; 14+ messages in thread
From: the-eater @ 2021-12-21 21:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
There is a new pull request by the-eater against master on the void-packages repository
https://github.com/the-eater/neo-void-packages pkg/unrar/6.1.3
https://github.com/void-linux/void-packages/pull/34651
unrar: update to 6.1.3
This also adds libunrar and libunrar-devel :)
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/34651.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/unrar/6.1.3-34651.patch --]
[-- Type: text/x-diff, Size: 1774 bytes --]
From 35e245cc2413bafbcf290329da4c8b61bcbfdcc7 Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Tue, 21 Dec 2021 22:39:09 +0100
Subject: [PATCH] unrar: update to 6.1.3
---
srcpkgs/libunrar | 1 +
srcpkgs/libunrar-devel | 1 +
srcpkgs/unrar/template | 21 +++++++++++++++++++++
3 files changed, 23 insertions(+)
create mode 120000 srcpkgs/libunrar
create mode 120000 srcpkgs/libunrar-devel
diff --git a/srcpkgs/libunrar b/srcpkgs/libunrar
new file mode 120000
index 000000000000..77165df2b259
--- /dev/null
+++ b/srcpkgs/libunrar
@@ -0,0 +1 @@
+unrar
\ No newline at end of file
diff --git a/srcpkgs/libunrar-devel b/srcpkgs/libunrar-devel
new file mode 120000
index 000000000000..77165df2b259
--- /dev/null
+++ b/srcpkgs/libunrar-devel
@@ -0,0 +1 @@
+unrar
\ No newline at end of file
diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template
index 11ce82028475..113ad5e6b888 100644
--- a/srcpkgs/unrar/template
+++ b/srcpkgs/unrar/template
@@ -11,14 +11,35 @@ distfiles="https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"
checksum=d05022442009202a792e588bec58921c123ff046fc755f7f2272871a5bd79636
repository=nonfree
+post_extract() {
+ cp -a . ../libunrar
+}
+
do_build() {
vsed -e 's/^\(CXXFLAGS\)=\(.*\)/\1+=\2/' \
-e 's/^\(LDFLAGS\)=\(.*\)/\1+=-lpthread \2/' \
-i makefile
make CXX="$CXX" LD="$LD" STRIP=: -f makefile
+ make CXX="$CXX" LD="$LD" STRIP=: -C ../libunrar -f makefile lib
}
do_install() {
vbin unrar
vlicense license.txt LICENSE
}
+
+libunrar_package() {
+ short_desc+= " - shared library"
+
+ pkg_install() {
+ vinstall ../libunrar/libunrar.so 0755 /usr/lib/
+ }
+}
+
+libunrar-devel_package() {
+ short_desc+= " - development files"
+
+ pkg_install() {
+ vinstall dll.hpp 644 /usr/include/unrar/
+ }
+}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: unrar: update to 6.1.3
2021-12-21 21:42 [PR PATCH] unrar: update to 6.1.3 the-eater
@ 2021-12-21 21:50 ` paper42
2021-12-21 21:56 ` [PR PATCH] [Updated] " the-eater
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-12-21 21:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/34651#issuecomment-999116751
Comment:
the update part of this PR was already done in 886ca45
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] unrar: update to 6.1.3
2021-12-21 21:42 [PR PATCH] unrar: update to 6.1.3 the-eater
2021-12-21 21:50 ` paper42
@ 2021-12-21 21:56 ` the-eater
2021-12-21 21:56 ` unrar: Expose library and header files the-eater
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: the-eater @ 2021-12-21 21:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 447 bytes --]
There is an updated pull request by the-eater against master on the void-packages repository
https://github.com/the-eater/neo-void-packages pkg/unrar/6.1.3
https://github.com/void-linux/void-packages/pull/34651
unrar: update to 6.1.3
This also adds libunrar and libunrar-devel :)
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/34651.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/unrar/6.1.3-34651.patch --]
[-- Type: text/x-diff, Size: 2025 bytes --]
From 2a5d1b03a926bb237511420018022f2357dd3b1c Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Tue, 21 Dec 2021 22:39:09 +0100
Subject: [PATCH] unrar: Expose library and header files
---
srcpkgs/libunrar | 1 +
srcpkgs/libunrar-devel | 1 +
srcpkgs/unrar/template | 23 ++++++++++++++++++++++-
3 files changed, 24 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/libunrar
create mode 120000 srcpkgs/libunrar-devel
diff --git a/srcpkgs/libunrar b/srcpkgs/libunrar
new file mode 120000
index 000000000000..77165df2b259
--- /dev/null
+++ b/srcpkgs/libunrar
@@ -0,0 +1 @@
+unrar
\ No newline at end of file
diff --git a/srcpkgs/libunrar-devel b/srcpkgs/libunrar-devel
new file mode 120000
index 000000000000..77165df2b259
--- /dev/null
+++ b/srcpkgs/libunrar-devel
@@ -0,0 +1 @@
+unrar
\ No newline at end of file
diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template
index 11ce82028475..c81e0fe1e15c 100644
--- a/srcpkgs/unrar/template
+++ b/srcpkgs/unrar/template
@@ -1,7 +1,7 @@
# Template file for 'unrar'
pkgname=unrar
version=6.1.3
-revision=1
+revision=2
wrksrc=unrar
short_desc="Unarchiver for .rar files (non-free version)"
maintainer="skmpz <dem.procopiou@gmail.com>"
@@ -11,14 +11,35 @@ distfiles="https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"
checksum=d05022442009202a792e588bec58921c123ff046fc755f7f2272871a5bd79636
repository=nonfree
+post_extract() {
+ cp -a . ../libunrar
+}
+
do_build() {
vsed -e 's/^\(CXXFLAGS\)=\(.*\)/\1+=\2/' \
-e 's/^\(LDFLAGS\)=\(.*\)/\1+=-lpthread \2/' \
-i makefile
make CXX="$CXX" LD="$LD" STRIP=: -f makefile
+ make CXX="$CXX" LD="$LD" STRIP=: -C ../libunrar -f makefile lib
}
do_install() {
vbin unrar
vlicense license.txt LICENSE
}
+
+libunrar_package() {
+ short_desc+= " - shared library"
+
+ pkg_install() {
+ vinstall ../libunrar/libunrar.so 0755 /usr/lib/
+ }
+}
+
+libunrar-devel_package() {
+ short_desc+= " - development files"
+
+ pkg_install() {
+ vinstall dll.hpp 644 /usr/include/unrar/
+ }
+}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: unrar: Expose library and header files
2021-12-21 21:42 [PR PATCH] unrar: update to 6.1.3 the-eater
2021-12-21 21:50 ` paper42
2021-12-21 21:56 ` [PR PATCH] [Updated] " the-eater
@ 2021-12-21 21:56 ` the-eater
2021-12-21 22:16 ` [PR REVIEW] " paper42
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: the-eater @ 2021-12-21 21:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New comment by the-eater on void-packages repository
https://github.com/void-linux/void-packages/pull/34651#issuecomment-999119849
Comment:
oh lol! fixed the title and commit :)
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] unrar: Expose library and header files
2021-12-21 21:42 [PR PATCH] unrar: update to 6.1.3 the-eater
` (2 preceding siblings ...)
2021-12-21 21:56 ` unrar: Expose library and header files the-eater
@ 2021-12-21 22:16 ` paper42
2021-12-21 22:25 ` paper42
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-12-21 22:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 402 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/34651#discussion_r773476244
Comment:
```suggestion
make CXX="$CXX" LD="$LD" STRIP=: -f makefile lib
```
Then we should be able to just vinstall from `$wrksrc`. We won't need `cp -a . ../libunrar` in post_install which is a bit problematic because `./xbps-src clean unrar` won't remove it.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] unrar: Expose library and header files
2021-12-21 21:42 [PR PATCH] unrar: update to 6.1.3 the-eater
` (3 preceding siblings ...)
2021-12-21 22:16 ` [PR REVIEW] " paper42
@ 2021-12-21 22:25 ` paper42
2021-12-21 22:29 ` the-eater
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-12-21 22:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 449 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/34651#discussion_r773476244
Comment:
```suggestion
make CXX="$CXX" LD="$LD" STRIP=: -f makefile
make CXX="$CXX" LD="$LD" STRIP=: -f makefile lib
```
Then we should be able to just vinstall from `$wrksrc`. We won't need `cp -a . ../libunrar` in post_install which is a bit problematic because `./xbps-src clean unrar` won't remove it.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] unrar: Expose library and header files
2021-12-21 21:42 [PR PATCH] unrar: update to 6.1.3 the-eater
` (4 preceding siblings ...)
2021-12-21 22:25 ` paper42
@ 2021-12-21 22:29 ` the-eater
2021-12-21 22:31 ` paper42
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: the-eater @ 2021-12-21 22:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 363 bytes --]
New review comment by the-eater on void-packages repository
https://github.com/void-linux/void-packages/pull/34651#discussion_r773481557
Comment:
ye I would like that, but the issue is that the make is destructive so can't build both the lib and the non-lib, I can copy the libunrar build folder inside the unrar wrksrc however, that should resolve your issue?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] unrar: Expose library and header files
2021-12-21 21:42 [PR PATCH] unrar: update to 6.1.3 the-eater
` (5 preceding siblings ...)
2021-12-21 22:29 ` the-eater
@ 2021-12-21 22:31 ` paper42
2021-12-21 22:33 ` the-eater
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-12-21 22:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/34651#discussion_r773482135
Comment:
hmm, I now see why you did it this way, but this could be better:
```sh
do_build() {
vsed -e 's/^\(CXXFLAGS\)=\(.*\)/\1+=\2/' \
-e 's/^\(LDFLAGS\)=\(.*\)/\1+=-lpthread \2/' \
-i makefile
make CXX="$CXX" LD="$LD" STRIP=: -f makefile
vbin unrar
make CXX="$CXX" LD="$LD" STRIP=: -f makefile lib
}
do_install() {
vlicense license.txt LICENSE
}
```
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] unrar: Expose library and header files
2021-12-21 21:42 [PR PATCH] unrar: update to 6.1.3 the-eater
` (6 preceding siblings ...)
2021-12-21 22:31 ` paper42
@ 2021-12-21 22:33 ` the-eater
2021-12-21 22:37 ` paper42
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: the-eater @ 2021-12-21 22:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New review comment by the-eater on void-packages repository
https://github.com/void-linux/void-packages/pull/34651#discussion_r773483307
Comment:
install in the build :scream:
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] unrar: Expose library and header files
2021-12-21 21:42 [PR PATCH] unrar: update to 6.1.3 the-eater
` (7 preceding siblings ...)
2021-12-21 22:33 ` the-eater
@ 2021-12-21 22:37 ` paper42
2021-12-21 22:40 ` the-eater
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-12-21 22:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 349 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/34651#discussion_r773484676
Comment:
Well, each makefile target depends on the clean target, and patching it out breaks the second build... If you want to fix it, go ahead, but I think this is much better than a second copy of the source.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] unrar: Expose library and header files
2021-12-21 21:42 [PR PATCH] unrar: update to 6.1.3 the-eater
` (8 preceding siblings ...)
2021-12-21 22:37 ` paper42
@ 2021-12-21 22:40 ` the-eater
2021-12-21 22:43 ` the-eater
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: the-eater @ 2021-12-21 22:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New review comment by the-eater on void-packages repository
https://github.com/void-linux/void-packages/pull/34651#discussion_r773486107
Comment:
well, it doesn't work either :/ the libunrar.so is never made
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] unrar: Expose library and header files
2021-12-21 21:42 [PR PATCH] unrar: update to 6.1.3 the-eater
` (9 preceding siblings ...)
2021-12-21 22:40 ` the-eater
@ 2021-12-21 22:43 ` the-eater
2021-12-21 22:44 ` [PR PATCH] [Updated] " the-eater
2021-12-22 18:16 ` [PR PATCH] [Merged]: " paper42
12 siblings, 0 replies; 14+ messages in thread
From: the-eater @ 2021-12-21 22:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New review comment by the-eater on void-packages repository
https://github.com/void-linux/void-packages/pull/34651#discussion_r773487020
Comment:
scratch that I am a dumbass and didn't update the vinstall lol
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] unrar: Expose library and header files
2021-12-21 21:42 [PR PATCH] unrar: update to 6.1.3 the-eater
` (10 preceding siblings ...)
2021-12-21 22:43 ` the-eater
@ 2021-12-21 22:44 ` the-eater
2021-12-22 18:16 ` [PR PATCH] [Merged]: " paper42
12 siblings, 0 replies; 14+ messages in thread
From: the-eater @ 2021-12-21 22:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
There is an updated pull request by the-eater against master on the void-packages repository
https://github.com/the-eater/neo-void-packages pkg/unrar/6.1.3
https://github.com/void-linux/void-packages/pull/34651
unrar: Expose library and header files
This also adds libunrar and libunrar-devel :)
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/34651.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/unrar/6.1.3-34651.patch --]
[-- Type: text/x-diff, Size: 1831 bytes --]
From 48a505e2bf7fd588aa4f719642cdfdcf25b55d9a Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Tue, 21 Dec 2021 22:39:09 +0100
Subject: [PATCH] unrar: Expose library and header files
---
srcpkgs/libunrar | 1 +
srcpkgs/libunrar-devel | 1 +
srcpkgs/unrar/template | 22 ++++++++++++++++++++--
3 files changed, 22 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/libunrar
create mode 120000 srcpkgs/libunrar-devel
diff --git a/srcpkgs/libunrar b/srcpkgs/libunrar
new file mode 120000
index 000000000000..77165df2b259
--- /dev/null
+++ b/srcpkgs/libunrar
@@ -0,0 +1 @@
+unrar
\ No newline at end of file
diff --git a/srcpkgs/libunrar-devel b/srcpkgs/libunrar-devel
new file mode 120000
index 000000000000..77165df2b259
--- /dev/null
+++ b/srcpkgs/libunrar-devel
@@ -0,0 +1 @@
+unrar
\ No newline at end of file
diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template
index 11ce82028475..77463ec7cc63 100644
--- a/srcpkgs/unrar/template
+++ b/srcpkgs/unrar/template
@@ -1,7 +1,7 @@
# Template file for 'unrar'
pkgname=unrar
version=6.1.3
-revision=1
+revision=2
wrksrc=unrar
short_desc="Unarchiver for .rar files (non-free version)"
maintainer="skmpz <dem.procopiou@gmail.com>"
@@ -16,9 +16,27 @@ do_build() {
-e 's/^\(LDFLAGS\)=\(.*\)/\1+=-lpthread \2/' \
-i makefile
make CXX="$CXX" LD="$LD" STRIP=: -f makefile
+ # early install of unrar because makefile deletes unrar on lib creation
+ vbin unrar
+ make -d CXX="$CXX" LD="$LD" STRIP=: -f makefile lib
}
do_install() {
- vbin unrar
vlicense license.txt LICENSE
}
+
+libunrar_package() {
+ short_desc+=" - shared library"
+
+ pkg_install() {
+ vinstall libunrar.so 0755 /usr/lib/
+ }
+}
+
+libunrar-devel_package() {
+ short_desc+=" - development files"
+
+ pkg_install() {
+ vinstall dll.hpp 644 /usr/include/unrar/
+ }
+}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Merged]: unrar: Expose library and header files
2021-12-21 21:42 [PR PATCH] unrar: update to 6.1.3 the-eater
` (11 preceding siblings ...)
2021-12-21 22:44 ` [PR PATCH] [Updated] " the-eater
@ 2021-12-22 18:16 ` paper42
12 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-12-22 18:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
There's a merged pull request on the void-packages repository
unrar: Expose library and header files
https://github.com/void-linux/void-packages/pull/34651
Description:
This also adds libunrar and libunrar-devel :)
#### Testing the changes
- I tested the changes in this PR: **YES**
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2021-12-22 18:16 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-21 21:42 [PR PATCH] unrar: update to 6.1.3 the-eater
2021-12-21 21:50 ` paper42
2021-12-21 21:56 ` [PR PATCH] [Updated] " the-eater
2021-12-21 21:56 ` unrar: Expose library and header files the-eater
2021-12-21 22:16 ` [PR REVIEW] " paper42
2021-12-21 22:25 ` paper42
2021-12-21 22:29 ` the-eater
2021-12-21 22:31 ` paper42
2021-12-21 22:33 ` the-eater
2021-12-21 22:37 ` paper42
2021-12-21 22:40 ` the-eater
2021-12-21 22:43 ` the-eater
2021-12-21 22:44 ` [PR PATCH] [Updated] " the-eater
2021-12-22 18:16 ` [PR PATCH] [Merged]: " paper42
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).