* Re: [PR PATCH] [Updated] remove rpmextract from build, no conflicts with rpm anymore
2023-01-24 0:27 [PR PATCH] remove rpmextract from build, no conflicts with rpm anymore sgn
@ 2023-01-27 10:03 ` sgn
2023-01-27 10:15 ` sgn
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2023-01-27 10:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages rpm-extract-remove
https://github.com/void-linux/void-packages/pull/41831
remove rpmextract from build, no conflicts with rpm anymore
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpm-extract-remove-41831.patch --]
[-- Type: text/x-diff, Size: 7070 bytes --]
From 7a30114a20d14ae5e7647810eee875cf920a529f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:14:33 +0700
Subject: [PATCH 1/8] bff: no needs rpmextract
---
srcpkgs/bff/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/bff/template b/srcpkgs/bff/template
index 54cf5d44f49a..1e8a67152198 100644
--- a/srcpkgs/bff/template
+++ b/srcpkgs/bff/template
@@ -3,8 +3,6 @@ pkgname=bff
reverts=1.0.5_1
version=1.0
revision=3
-create_wrksrc="yes"
-hostmakedepends="rpmextract"
short_desc="Brainfuck interpreter (DBFI dialect)"
maintainer="ananteris <ananteris@mailinator.com>"
license="Public Domain"
From 2d39d1066254b11b9307830cf39812167b700e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:15:17 +0700
Subject: [PATCH 2/8] anydesk: no needs rpmextract
---
srcpkgs/anydesk/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 268c6c067c8a..21922027d154 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -3,8 +3,7 @@ pkgname=anydesk
version=6.2.0
revision=2
archs="x86_64"
-create_wrksrc="yes"
-hostmakedepends="patchelf rpmextract"
+hostmakedepends="patchelf"
depends="hicolor-icon-theme gtkglext"
short_desc="Fast remote desktop application"
maintainer="mobinmob <mobinmob@disroot.org>"
From 7f6f60569b2326424130293c2ab9c5e31626a7c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:16:58 +0700
Subject: [PATCH 3/8] brother-brscan4: remove custom do_extract
---
srcpkgs/brother-brscan4/template | 5 -----
1 file changed, 5 deletions(-)
diff --git a/srcpkgs/brother-brscan4/template b/srcpkgs/brother-brscan4/template
index ac642e3f69e1..82565cd229e8 100644
--- a/srcpkgs/brother-brscan4/template
+++ b/srcpkgs/brother-brscan4/template
@@ -3,7 +3,6 @@ pkgname=brother-brscan4
version=0.4.9
revision=1
archs="i686 x86_64"
-hostmakedepends="rpmextract"
depends="sane"
short_desc="SANE scanner driver for brscan4-compatible printers"
maintainer="Martijn van Buul <martijn.van.buul@gmail.com>"
@@ -32,10 +31,6 @@ else
_rpmlibdir="usr/lib"
fi
-do_extract() {
- rpmextract ${XBPS_SRCDISTDIR}/${pkgname}-${version}/brscan4-${version}-${_rpmpkgid}.rpm
-}
-
do_install() {
# binary package makes a fine mess of things, and installs stuff in very
# unwieldly locations. Some of this cannot be avoided.
From 492e3ddbb7ecf58bd9fc7d1402bed70ed2ce8726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:18:49 +0700
Subject: [PATCH 4/8] crack-attack: remove rpmextract
---
srcpkgs/crack-attack/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/crack-attack/template b/srcpkgs/crack-attack/template
index c107b5609851..0a9fdccd9812 100644
--- a/srcpkgs/crack-attack/template
+++ b/srcpkgs/crack-attack/template
@@ -2,11 +2,10 @@
pkgname=crack-attack
version=1.1.14
revision=10
-create_wrksrc=yes
build_wrksrc="$pkgname-$version"
build_style=gnu-configure
configure_args="--enable-sound=yes ac_cv_file__proc_self_maps=yes"
-hostmakedepends="pkg-config rpmextract"
+hostmakedepends="pkg-config"
makedepends="gtk+-devel SDL_mixer-devel libfreeglut-devel glu-devel
libXmu-devel libXi-devel"
depends="desktop-file-utils"
From 45ca0e25a567878b717d965fffe78f3b962b6461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:21:36 +0700
Subject: [PATCH 5/8] epson-inkjet-printer-escpr2: remove rpmextract
---
srcpkgs/epson-inkjet-printer-escpr2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/epson-inkjet-printer-escpr2/template b/srcpkgs/epson-inkjet-printer-escpr2/template
index 74f62e072bad..6fa318254b1e 100644
--- a/srcpkgs/epson-inkjet-printer-escpr2/template
+++ b/srcpkgs/epson-inkjet-printer-escpr2/template
@@ -6,7 +6,7 @@ archs="x86_64 i686 aarch64 armv7l"
build_style=gnu-configure
configure_args="--with-cupsfilterdir=/usr/lib/cups/filter
--with-cupsppddir=/usr/share/ppd"
-hostmakedepends="automake rpmextract"
+hostmakedepends="automake"
makedepends="cups-devel ghostscript-devel"
short_desc="Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux"
maintainer="André Cerqueira <acerqueira021@gmail.com>"
From 0ecadb2fbd0c90d494719b95113dfa75ee877f7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:23:24 +0700
Subject: [PATCH 6/8] opera: remove rpmextract
---
srcpkgs/opera/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index a2b2e37b91bf..ce8012e09d97 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -3,8 +3,6 @@ pkgname=opera
version=94.0.4606.76
revision=1
archs="x86_64"
-create_wrksrc=yes
-hostmakedepends="rpmextract"
depends="ffmpeg desktop-file-utils hicolor-icon-theme"
short_desc="Fast, secure, easy to use browser"
maintainer="mobinmob <mobinmob@disroot.org>"
From ce1094642d834e04e937a483c844ececc9e08b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:24:42 +0700
Subject: [PATCH 7/8] wps-office: no needs rpmetract
---
srcpkgs/wps-office/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 6aa21cc69389..96dcd6a22f23 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -3,8 +3,6 @@ pkgname=wps-office
version=11.1.0.10920
revision=1
archs="x86_64"
-create_wrksrc=yes
-makedepends="rpmextract"
short_desc="Linux office suite with similar appearance to MS Office"
maintainer="mobinmob <mobinmob@disroot.org>"
# The old Kingsoft WPS Community License has disappeared from the
From 168de2ef5765fca882785b5293ee719cc0330444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:25:28 +0700
Subject: [PATCH 8/8] zoom: no needs rpmextract
---
srcpkgs/zoom/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 9ddc81ef1aba..1935f5e00f4c 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -3,8 +3,6 @@ pkgname=zoom
version=5.13.0.599
revision=1
archs="x86_64"
-create_wrksrc=yes
-hostmakedepends="rpmextract"
depends="$(vopt_if systemqt 'qt5 qt5-graphicaleffects qt5-imageformats qt5-quickcontrols qt5-quickcontrols2 qt5-svg qt5-script qt5-declarative')
xcb-util-image xcb-util-keysyms glib libXfixes libXtst libgbm libglvnd
nss atk at-spi2-atk libXcomposite libXdamage libXrandr libxkbcommon pango
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] remove rpmextract from build, no conflicts with rpm anymore
2023-01-24 0:27 [PR PATCH] remove rpmextract from build, no conflicts with rpm anymore sgn
2023-01-27 10:03 ` [PR PATCH] [Updated] " sgn
@ 2023-01-27 10:15 ` sgn
2023-01-27 10:18 ` sgn
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2023-01-27 10:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages rpm-extract-remove
https://github.com/void-linux/void-packages/pull/41831
remove rpmextract from build, no conflicts with rpm anymore
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpm-extract-remove-41831.patch --]
[-- Type: text/x-diff, Size: 7352 bytes --]
From 7a30114a20d14ae5e7647810eee875cf920a529f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:14:33 +0700
Subject: [PATCH 1/8] bff: no needs rpmextract
---
srcpkgs/bff/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/bff/template b/srcpkgs/bff/template
index 54cf5d44f49a..1e8a67152198 100644
--- a/srcpkgs/bff/template
+++ b/srcpkgs/bff/template
@@ -3,8 +3,6 @@ pkgname=bff
reverts=1.0.5_1
version=1.0
revision=3
-create_wrksrc="yes"
-hostmakedepends="rpmextract"
short_desc="Brainfuck interpreter (DBFI dialect)"
maintainer="ananteris <ananteris@mailinator.com>"
license="Public Domain"
From 2d39d1066254b11b9307830cf39812167b700e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:15:17 +0700
Subject: [PATCH 2/8] anydesk: no needs rpmextract
---
srcpkgs/anydesk/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 268c6c067c8a..21922027d154 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -3,8 +3,7 @@ pkgname=anydesk
version=6.2.0
revision=2
archs="x86_64"
-create_wrksrc="yes"
-hostmakedepends="patchelf rpmextract"
+hostmakedepends="patchelf"
depends="hicolor-icon-theme gtkglext"
short_desc="Fast remote desktop application"
maintainer="mobinmob <mobinmob@disroot.org>"
From 7f6f60569b2326424130293c2ab9c5e31626a7c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:16:58 +0700
Subject: [PATCH 3/8] brother-brscan4: remove custom do_extract
---
srcpkgs/brother-brscan4/template | 5 -----
1 file changed, 5 deletions(-)
diff --git a/srcpkgs/brother-brscan4/template b/srcpkgs/brother-brscan4/template
index ac642e3f69e1..82565cd229e8 100644
--- a/srcpkgs/brother-brscan4/template
+++ b/srcpkgs/brother-brscan4/template
@@ -3,7 +3,6 @@ pkgname=brother-brscan4
version=0.4.9
revision=1
archs="i686 x86_64"
-hostmakedepends="rpmextract"
depends="sane"
short_desc="SANE scanner driver for brscan4-compatible printers"
maintainer="Martijn van Buul <martijn.van.buul@gmail.com>"
@@ -32,10 +31,6 @@ else
_rpmlibdir="usr/lib"
fi
-do_extract() {
- rpmextract ${XBPS_SRCDISTDIR}/${pkgname}-${version}/brscan4-${version}-${_rpmpkgid}.rpm
-}
-
do_install() {
# binary package makes a fine mess of things, and installs stuff in very
# unwieldly locations. Some of this cannot be avoided.
From 492e3ddbb7ecf58bd9fc7d1402bed70ed2ce8726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:18:49 +0700
Subject: [PATCH 4/8] crack-attack: remove rpmextract
---
srcpkgs/crack-attack/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/crack-attack/template b/srcpkgs/crack-attack/template
index c107b5609851..0a9fdccd9812 100644
--- a/srcpkgs/crack-attack/template
+++ b/srcpkgs/crack-attack/template
@@ -2,11 +2,10 @@
pkgname=crack-attack
version=1.1.14
revision=10
-create_wrksrc=yes
build_wrksrc="$pkgname-$version"
build_style=gnu-configure
configure_args="--enable-sound=yes ac_cv_file__proc_self_maps=yes"
-hostmakedepends="pkg-config rpmextract"
+hostmakedepends="pkg-config"
makedepends="gtk+-devel SDL_mixer-devel libfreeglut-devel glu-devel
libXmu-devel libXi-devel"
depends="desktop-file-utils"
From 45ca0e25a567878b717d965fffe78f3b962b6461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:21:36 +0700
Subject: [PATCH 5/8] epson-inkjet-printer-escpr2: remove rpmextract
---
srcpkgs/epson-inkjet-printer-escpr2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/epson-inkjet-printer-escpr2/template b/srcpkgs/epson-inkjet-printer-escpr2/template
index 74f62e072bad..6fa318254b1e 100644
--- a/srcpkgs/epson-inkjet-printer-escpr2/template
+++ b/srcpkgs/epson-inkjet-printer-escpr2/template
@@ -6,7 +6,7 @@ archs="x86_64 i686 aarch64 armv7l"
build_style=gnu-configure
configure_args="--with-cupsfilterdir=/usr/lib/cups/filter
--with-cupsppddir=/usr/share/ppd"
-hostmakedepends="automake rpmextract"
+hostmakedepends="automake"
makedepends="cups-devel ghostscript-devel"
short_desc="Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux"
maintainer="André Cerqueira <acerqueira021@gmail.com>"
From fe8a6116b1250d4b7b159579134102ee839d1509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:23:24 +0700
Subject: [PATCH 6/8] opera: remove rpmextract
---
srcpkgs/opera/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index a2b2e37b91bf..d18c926ee1c5 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -4,7 +4,6 @@ version=94.0.4606.76
revision=1
archs="x86_64"
create_wrksrc=yes
-hostmakedepends="rpmextract"
depends="ffmpeg desktop-file-utils hicolor-icon-theme"
short_desc="Fast, secure, easy to use browser"
maintainer="mobinmob <mobinmob@disroot.org>"
@@ -21,8 +20,8 @@ do_install() {
vmkdir usr/lib
# Copy files
- vcopy usr/lib64/opera /usr/lib/
- vcopy usr/share /usr/share/
+ vcopy usr/lib64/opera usr/lib/
+ vcopy usr/share usr/share/
# Link executable in path
ln -s ../lib/opera/opera "${DESTDIR}/usr/bin/opera"
From 3a26593536d2bd041eaee107475c02e0a1fefc14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:24:42 +0700
Subject: [PATCH 7/8] wps-office: no needs rpmetract
---
srcpkgs/wps-office/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 6aa21cc69389..96dcd6a22f23 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -3,8 +3,6 @@ pkgname=wps-office
version=11.1.0.10920
revision=1
archs="x86_64"
-create_wrksrc=yes
-makedepends="rpmextract"
short_desc="Linux office suite with similar appearance to MS Office"
maintainer="mobinmob <mobinmob@disroot.org>"
# The old Kingsoft WPS Community License has disappeared from the
From a1855ba87ff6ba7dc6d5e07eecfe7c3d058afdb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:25:28 +0700
Subject: [PATCH 8/8] zoom: no needs rpmextract
---
srcpkgs/zoom/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 9ddc81ef1aba..1935f5e00f4c 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -3,8 +3,6 @@ pkgname=zoom
version=5.13.0.599
revision=1
archs="x86_64"
-create_wrksrc=yes
-hostmakedepends="rpmextract"
depends="$(vopt_if systemqt 'qt5 qt5-graphicaleffects qt5-imageformats qt5-quickcontrols qt5-quickcontrols2 qt5-svg qt5-script qt5-declarative')
xcb-util-image xcb-util-keysyms glib libXfixes libXtst libgbm libglvnd
nss atk at-spi2-atk libXcomposite libXdamage libXrandr libxkbcommon pango
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] remove rpmextract from build, no conflicts with rpm anymore
2023-01-24 0:27 [PR PATCH] remove rpmextract from build, no conflicts with rpm anymore sgn
2023-01-27 10:03 ` [PR PATCH] [Updated] " sgn
2023-01-27 10:15 ` sgn
@ 2023-01-27 10:18 ` sgn
2023-01-27 13:27 ` sgn
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2023-01-27 10:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages rpm-extract-remove
https://github.com/void-linux/void-packages/pull/41831
remove rpmextract from build, no conflicts with rpm anymore
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpm-extract-remove-41831.patch --]
[-- Type: text/x-diff, Size: 7357 bytes --]
From 7a30114a20d14ae5e7647810eee875cf920a529f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:14:33 +0700
Subject: [PATCH 1/8] bff: no needs rpmextract
---
srcpkgs/bff/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/bff/template b/srcpkgs/bff/template
index 54cf5d44f49a..1e8a67152198 100644
--- a/srcpkgs/bff/template
+++ b/srcpkgs/bff/template
@@ -3,8 +3,6 @@ pkgname=bff
reverts=1.0.5_1
version=1.0
revision=3
-create_wrksrc="yes"
-hostmakedepends="rpmextract"
short_desc="Brainfuck interpreter (DBFI dialect)"
maintainer="ananteris <ananteris@mailinator.com>"
license="Public Domain"
From 401d381679a125c806c3b60ff7e60d847fd4e891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:15:17 +0700
Subject: [PATCH 2/8] anydesk: no needs rpmextract
---
srcpkgs/anydesk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 268c6c067c8a..90c4c112d45c 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -3,8 +3,8 @@ pkgname=anydesk
version=6.2.0
revision=2
archs="x86_64"
-create_wrksrc="yes"
-hostmakedepends="patchelf rpmextract"
+create_wrksrc=yes
+hostmakedepends="patchelf"
depends="hicolor-icon-theme gtkglext"
short_desc="Fast remote desktop application"
maintainer="mobinmob <mobinmob@disroot.org>"
From 6b86638b9c1b66b06df9c05b772704ae31b8d1a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:16:58 +0700
Subject: [PATCH 3/8] brother-brscan4: remove custom do_extract
---
srcpkgs/brother-brscan4/template | 5 -----
1 file changed, 5 deletions(-)
diff --git a/srcpkgs/brother-brscan4/template b/srcpkgs/brother-brscan4/template
index ac642e3f69e1..82565cd229e8 100644
--- a/srcpkgs/brother-brscan4/template
+++ b/srcpkgs/brother-brscan4/template
@@ -3,7 +3,6 @@ pkgname=brother-brscan4
version=0.4.9
revision=1
archs="i686 x86_64"
-hostmakedepends="rpmextract"
depends="sane"
short_desc="SANE scanner driver for brscan4-compatible printers"
maintainer="Martijn van Buul <martijn.van.buul@gmail.com>"
@@ -32,10 +31,6 @@ else
_rpmlibdir="usr/lib"
fi
-do_extract() {
- rpmextract ${XBPS_SRCDISTDIR}/${pkgname}-${version}/brscan4-${version}-${_rpmpkgid}.rpm
-}
-
do_install() {
# binary package makes a fine mess of things, and installs stuff in very
# unwieldly locations. Some of this cannot be avoided.
From 1ddd20b8637a61edf81c5938e2ee12b2b4630e42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:18:49 +0700
Subject: [PATCH 4/8] crack-attack: remove rpmextract
---
srcpkgs/crack-attack/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/crack-attack/template b/srcpkgs/crack-attack/template
index c107b5609851..0a9fdccd9812 100644
--- a/srcpkgs/crack-attack/template
+++ b/srcpkgs/crack-attack/template
@@ -2,11 +2,10 @@
pkgname=crack-attack
version=1.1.14
revision=10
-create_wrksrc=yes
build_wrksrc="$pkgname-$version"
build_style=gnu-configure
configure_args="--enable-sound=yes ac_cv_file__proc_self_maps=yes"
-hostmakedepends="pkg-config rpmextract"
+hostmakedepends="pkg-config"
makedepends="gtk+-devel SDL_mixer-devel libfreeglut-devel glu-devel
libXmu-devel libXi-devel"
depends="desktop-file-utils"
From 0195db87cf0a4b8d026444cc48af318cff90be61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:21:36 +0700
Subject: [PATCH 5/8] epson-inkjet-printer-escpr2: remove rpmextract
---
srcpkgs/epson-inkjet-printer-escpr2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/epson-inkjet-printer-escpr2/template b/srcpkgs/epson-inkjet-printer-escpr2/template
index 74f62e072bad..6fa318254b1e 100644
--- a/srcpkgs/epson-inkjet-printer-escpr2/template
+++ b/srcpkgs/epson-inkjet-printer-escpr2/template
@@ -6,7 +6,7 @@ archs="x86_64 i686 aarch64 armv7l"
build_style=gnu-configure
configure_args="--with-cupsfilterdir=/usr/lib/cups/filter
--with-cupsppddir=/usr/share/ppd"
-hostmakedepends="automake rpmextract"
+hostmakedepends="automake"
makedepends="cups-devel ghostscript-devel"
short_desc="Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux"
maintainer="André Cerqueira <acerqueira021@gmail.com>"
From 8f5c59378c4cc1d2906021fc9cc0d8be68795e57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:23:24 +0700
Subject: [PATCH 6/8] opera: remove rpmextract
---
srcpkgs/opera/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index a2b2e37b91bf..d18c926ee1c5 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -4,7 +4,6 @@ version=94.0.4606.76
revision=1
archs="x86_64"
create_wrksrc=yes
-hostmakedepends="rpmextract"
depends="ffmpeg desktop-file-utils hicolor-icon-theme"
short_desc="Fast, secure, easy to use browser"
maintainer="mobinmob <mobinmob@disroot.org>"
@@ -21,8 +20,8 @@ do_install() {
vmkdir usr/lib
# Copy files
- vcopy usr/lib64/opera /usr/lib/
- vcopy usr/share /usr/share/
+ vcopy usr/lib64/opera usr/lib/
+ vcopy usr/share usr/share/
# Link executable in path
ln -s ../lib/opera/opera "${DESTDIR}/usr/bin/opera"
From d802112ed749520066f665371316368c251ceabb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:24:42 +0700
Subject: [PATCH 7/8] wps-office: no needs rpmetract
---
srcpkgs/wps-office/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 6aa21cc69389..96dcd6a22f23 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -3,8 +3,6 @@ pkgname=wps-office
version=11.1.0.10920
revision=1
archs="x86_64"
-create_wrksrc=yes
-makedepends="rpmextract"
short_desc="Linux office suite with similar appearance to MS Office"
maintainer="mobinmob <mobinmob@disroot.org>"
# The old Kingsoft WPS Community License has disappeared from the
From 7474f86cba7944be7c127252d418808663e7936c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:25:28 +0700
Subject: [PATCH 8/8] zoom: no needs rpmextract
---
srcpkgs/zoom/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 9ddc81ef1aba..c0eb7be87236 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -4,7 +4,6 @@ version=5.13.0.599
revision=1
archs="x86_64"
create_wrksrc=yes
-hostmakedepends="rpmextract"
depends="$(vopt_if systemqt 'qt5 qt5-graphicaleffects qt5-imageformats qt5-quickcontrols qt5-quickcontrols2 qt5-svg qt5-script qt5-declarative')
xcb-util-image xcb-util-keysyms glib libXfixes libXtst libgbm libglvnd
nss atk at-spi2-atk libXcomposite libXdamage libXrandr libxkbcommon pango
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] remove rpmextract from build, no conflicts with rpm anymore
2023-01-24 0:27 [PR PATCH] remove rpmextract from build, no conflicts with rpm anymore sgn
` (2 preceding siblings ...)
2023-01-27 10:18 ` sgn
@ 2023-01-27 13:27 ` sgn
2023-01-28 2:47 ` sgn
2023-01-28 2:51 ` [PR PATCH] [Merged]: " sgn
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2023-01-27 13:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages rpm-extract-remove
https://github.com/void-linux/void-packages/pull/41831
remove rpmextract from build, no conflicts with rpm anymore
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpm-extract-remove-41831.patch --]
[-- Type: text/x-diff, Size: 8040 bytes --]
From 7a30114a20d14ae5e7647810eee875cf920a529f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:14:33 +0700
Subject: [PATCH 1/8] bff: no needs rpmextract
---
srcpkgs/bff/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/bff/template b/srcpkgs/bff/template
index 54cf5d44f49a..1e8a67152198 100644
--- a/srcpkgs/bff/template
+++ b/srcpkgs/bff/template
@@ -3,8 +3,6 @@ pkgname=bff
reverts=1.0.5_1
version=1.0
revision=3
-create_wrksrc="yes"
-hostmakedepends="rpmextract"
short_desc="Brainfuck interpreter (DBFI dialect)"
maintainer="ananteris <ananteris@mailinator.com>"
license="Public Domain"
From 401d381679a125c806c3b60ff7e60d847fd4e891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:15:17 +0700
Subject: [PATCH 2/8] anydesk: no needs rpmextract
---
srcpkgs/anydesk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 268c6c067c8a..90c4c112d45c 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -3,8 +3,8 @@ pkgname=anydesk
version=6.2.0
revision=2
archs="x86_64"
-create_wrksrc="yes"
-hostmakedepends="patchelf rpmextract"
+create_wrksrc=yes
+hostmakedepends="patchelf"
depends="hicolor-icon-theme gtkglext"
short_desc="Fast remote desktop application"
maintainer="mobinmob <mobinmob@disroot.org>"
From 6b86638b9c1b66b06df9c05b772704ae31b8d1a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:16:58 +0700
Subject: [PATCH 3/8] brother-brscan4: remove custom do_extract
---
srcpkgs/brother-brscan4/template | 5 -----
1 file changed, 5 deletions(-)
diff --git a/srcpkgs/brother-brscan4/template b/srcpkgs/brother-brscan4/template
index ac642e3f69e1..82565cd229e8 100644
--- a/srcpkgs/brother-brscan4/template
+++ b/srcpkgs/brother-brscan4/template
@@ -3,7 +3,6 @@ pkgname=brother-brscan4
version=0.4.9
revision=1
archs="i686 x86_64"
-hostmakedepends="rpmextract"
depends="sane"
short_desc="SANE scanner driver for brscan4-compatible printers"
maintainer="Martijn van Buul <martijn.van.buul@gmail.com>"
@@ -32,10 +31,6 @@ else
_rpmlibdir="usr/lib"
fi
-do_extract() {
- rpmextract ${XBPS_SRCDISTDIR}/${pkgname}-${version}/brscan4-${version}-${_rpmpkgid}.rpm
-}
-
do_install() {
# binary package makes a fine mess of things, and installs stuff in very
# unwieldly locations. Some of this cannot be avoided.
From 1ddd20b8637a61edf81c5938e2ee12b2b4630e42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:18:49 +0700
Subject: [PATCH 4/8] crack-attack: remove rpmextract
---
srcpkgs/crack-attack/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/crack-attack/template b/srcpkgs/crack-attack/template
index c107b5609851..0a9fdccd9812 100644
--- a/srcpkgs/crack-attack/template
+++ b/srcpkgs/crack-attack/template
@@ -2,11 +2,10 @@
pkgname=crack-attack
version=1.1.14
revision=10
-create_wrksrc=yes
build_wrksrc="$pkgname-$version"
build_style=gnu-configure
configure_args="--enable-sound=yes ac_cv_file__proc_self_maps=yes"
-hostmakedepends="pkg-config rpmextract"
+hostmakedepends="pkg-config"
makedepends="gtk+-devel SDL_mixer-devel libfreeglut-devel glu-devel
libXmu-devel libXi-devel"
depends="desktop-file-utils"
From 0195db87cf0a4b8d026444cc48af318cff90be61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:21:36 +0700
Subject: [PATCH 5/8] epson-inkjet-printer-escpr2: remove rpmextract
---
srcpkgs/epson-inkjet-printer-escpr2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/epson-inkjet-printer-escpr2/template b/srcpkgs/epson-inkjet-printer-escpr2/template
index 74f62e072bad..6fa318254b1e 100644
--- a/srcpkgs/epson-inkjet-printer-escpr2/template
+++ b/srcpkgs/epson-inkjet-printer-escpr2/template
@@ -6,7 +6,7 @@ archs="x86_64 i686 aarch64 armv7l"
build_style=gnu-configure
configure_args="--with-cupsfilterdir=/usr/lib/cups/filter
--with-cupsppddir=/usr/share/ppd"
-hostmakedepends="automake rpmextract"
+hostmakedepends="automake"
makedepends="cups-devel ghostscript-devel"
short_desc="Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux"
maintainer="André Cerqueira <acerqueira021@gmail.com>"
From 8f5c59378c4cc1d2906021fc9cc0d8be68795e57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:23:24 +0700
Subject: [PATCH 6/8] opera: remove rpmextract
---
srcpkgs/opera/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index a2b2e37b91bf..d18c926ee1c5 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -4,7 +4,6 @@ version=94.0.4606.76
revision=1
archs="x86_64"
create_wrksrc=yes
-hostmakedepends="rpmextract"
depends="ffmpeg desktop-file-utils hicolor-icon-theme"
short_desc="Fast, secure, easy to use browser"
maintainer="mobinmob <mobinmob@disroot.org>"
@@ -21,8 +20,8 @@ do_install() {
vmkdir usr/lib
# Copy files
- vcopy usr/lib64/opera /usr/lib/
- vcopy usr/share /usr/share/
+ vcopy usr/lib64/opera usr/lib/
+ vcopy usr/share usr/share/
# Link executable in path
ln -s ../lib/opera/opera "${DESTDIR}/usr/bin/opera"
From ce4b95abfd8339897bc0f9ff0f13e7a1a63ca21d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:24:42 +0700
Subject: [PATCH 7/8] wps-office: move to nonfree, remove unknown shlibs
---
srcpkgs/wps-office/template | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 6aa21cc69389..cb124583ef0e 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,10 +1,8 @@
# Template file for 'wps-office'
pkgname=wps-office
version=11.1.0.10920
-revision=1
+revision=2
archs="x86_64"
-create_wrksrc=yes
-makedepends="rpmextract"
short_desc="Linux office suite with similar appearance to MS Office"
maintainer="mobinmob <mobinmob@disroot.org>"
# The old Kingsoft WPS Community License has disappeared from the
@@ -18,6 +16,8 @@ checksum=e252ac96473291df1e9dbeff2d1aedd1299f5ef411fa012ad617cfcd47dc3462
allow_unknown_shlibs=yes
nodebug=yes
restricted=yes
+conflicts="EternalTerminal>=0"
+repository=nonfree
# The programs themselves are PIE, but the error reporter isn't :/
@@ -51,4 +51,9 @@ post_install() {
# Install third-party licenses
vlicense ${DESTDIR}/opt/kingsoft/wps-office/office6/thirdpartylegalnotices.txt
+
+ # Qt4
+ rm -f ${DESTDIR}/opt/Kingsoft/wps-office/office6/librpc{et,wps,wpp}api.so
+ # systemd
+ rm -f ${DESTDIR}/opt/Kingsoft/wps-office/office6/libdbus-1.so*
}
From 3e65d7922b20ad28f08f711d0bb14850ea0f2812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:25:28 +0700
Subject: [PATCH 8/8] zoom: no needs rpmextract
---
srcpkgs/zoom/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 9ddc81ef1aba..c0eb7be87236 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -4,7 +4,6 @@ version=5.13.0.599
revision=1
archs="x86_64"
create_wrksrc=yes
-hostmakedepends="rpmextract"
depends="$(vopt_if systemqt 'qt5 qt5-graphicaleffects qt5-imageformats qt5-quickcontrols qt5-quickcontrols2 qt5-svg qt5-script qt5-declarative')
xcb-util-image xcb-util-keysyms glib libXfixes libXtst libgbm libglvnd
nss atk at-spi2-atk libXcomposite libXdamage libXrandr libxkbcommon pango
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] remove rpmextract from build, no conflicts with rpm anymore
2023-01-24 0:27 [PR PATCH] remove rpmextract from build, no conflicts with rpm anymore sgn
` (3 preceding siblings ...)
2023-01-27 13:27 ` sgn
@ 2023-01-28 2:47 ` sgn
2023-01-28 2:51 ` [PR PATCH] [Merged]: " sgn
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2023-01-28 2:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages rpm-extract-remove
https://github.com/void-linux/void-packages/pull/41831
remove rpmextract from build, no conflicts with rpm anymore
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpm-extract-remove-41831.patch --]
[-- Type: text/x-diff, Size: 8195 bytes --]
From 7a30114a20d14ae5e7647810eee875cf920a529f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:14:33 +0700
Subject: [PATCH 1/8] bff: no needs rpmextract
---
srcpkgs/bff/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/bff/template b/srcpkgs/bff/template
index 54cf5d44f49a..1e8a67152198 100644
--- a/srcpkgs/bff/template
+++ b/srcpkgs/bff/template
@@ -3,8 +3,6 @@ pkgname=bff
reverts=1.0.5_1
version=1.0
revision=3
-create_wrksrc="yes"
-hostmakedepends="rpmextract"
short_desc="Brainfuck interpreter (DBFI dialect)"
maintainer="ananteris <ananteris@mailinator.com>"
license="Public Domain"
From 401d381679a125c806c3b60ff7e60d847fd4e891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:15:17 +0700
Subject: [PATCH 2/8] anydesk: no needs rpmextract
---
srcpkgs/anydesk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 268c6c067c8a..90c4c112d45c 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -3,8 +3,8 @@ pkgname=anydesk
version=6.2.0
revision=2
archs="x86_64"
-create_wrksrc="yes"
-hostmakedepends="patchelf rpmextract"
+create_wrksrc=yes
+hostmakedepends="patchelf"
depends="hicolor-icon-theme gtkglext"
short_desc="Fast remote desktop application"
maintainer="mobinmob <mobinmob@disroot.org>"
From 6b86638b9c1b66b06df9c05b772704ae31b8d1a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:16:58 +0700
Subject: [PATCH 3/8] brother-brscan4: remove custom do_extract
---
srcpkgs/brother-brscan4/template | 5 -----
1 file changed, 5 deletions(-)
diff --git a/srcpkgs/brother-brscan4/template b/srcpkgs/brother-brscan4/template
index ac642e3f69e1..82565cd229e8 100644
--- a/srcpkgs/brother-brscan4/template
+++ b/srcpkgs/brother-brscan4/template
@@ -3,7 +3,6 @@ pkgname=brother-brscan4
version=0.4.9
revision=1
archs="i686 x86_64"
-hostmakedepends="rpmextract"
depends="sane"
short_desc="SANE scanner driver for brscan4-compatible printers"
maintainer="Martijn van Buul <martijn.van.buul@gmail.com>"
@@ -32,10 +31,6 @@ else
_rpmlibdir="usr/lib"
fi
-do_extract() {
- rpmextract ${XBPS_SRCDISTDIR}/${pkgname}-${version}/brscan4-${version}-${_rpmpkgid}.rpm
-}
-
do_install() {
# binary package makes a fine mess of things, and installs stuff in very
# unwieldly locations. Some of this cannot be avoided.
From 1ddd20b8637a61edf81c5938e2ee12b2b4630e42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:18:49 +0700
Subject: [PATCH 4/8] crack-attack: remove rpmextract
---
srcpkgs/crack-attack/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/crack-attack/template b/srcpkgs/crack-attack/template
index c107b5609851..0a9fdccd9812 100644
--- a/srcpkgs/crack-attack/template
+++ b/srcpkgs/crack-attack/template
@@ -2,11 +2,10 @@
pkgname=crack-attack
version=1.1.14
revision=10
-create_wrksrc=yes
build_wrksrc="$pkgname-$version"
build_style=gnu-configure
configure_args="--enable-sound=yes ac_cv_file__proc_self_maps=yes"
-hostmakedepends="pkg-config rpmextract"
+hostmakedepends="pkg-config"
makedepends="gtk+-devel SDL_mixer-devel libfreeglut-devel glu-devel
libXmu-devel libXi-devel"
depends="desktop-file-utils"
From 0195db87cf0a4b8d026444cc48af318cff90be61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:21:36 +0700
Subject: [PATCH 5/8] epson-inkjet-printer-escpr2: remove rpmextract
---
srcpkgs/epson-inkjet-printer-escpr2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/epson-inkjet-printer-escpr2/template b/srcpkgs/epson-inkjet-printer-escpr2/template
index 74f62e072bad..6fa318254b1e 100644
--- a/srcpkgs/epson-inkjet-printer-escpr2/template
+++ b/srcpkgs/epson-inkjet-printer-escpr2/template
@@ -6,7 +6,7 @@ archs="x86_64 i686 aarch64 armv7l"
build_style=gnu-configure
configure_args="--with-cupsfilterdir=/usr/lib/cups/filter
--with-cupsppddir=/usr/share/ppd"
-hostmakedepends="automake rpmextract"
+hostmakedepends="automake"
makedepends="cups-devel ghostscript-devel"
short_desc="Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux"
maintainer="André Cerqueira <acerqueira021@gmail.com>"
From 8f5c59378c4cc1d2906021fc9cc0d8be68795e57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:23:24 +0700
Subject: [PATCH 6/8] opera: remove rpmextract
---
srcpkgs/opera/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index a2b2e37b91bf..d18c926ee1c5 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -4,7 +4,6 @@ version=94.0.4606.76
revision=1
archs="x86_64"
create_wrksrc=yes
-hostmakedepends="rpmextract"
depends="ffmpeg desktop-file-utils hicolor-icon-theme"
short_desc="Fast, secure, easy to use browser"
maintainer="mobinmob <mobinmob@disroot.org>"
@@ -21,8 +20,8 @@ do_install() {
vmkdir usr/lib
# Copy files
- vcopy usr/lib64/opera /usr/lib/
- vcopy usr/share /usr/share/
+ vcopy usr/lib64/opera usr/lib/
+ vcopy usr/share usr/share/
# Link executable in path
ln -s ../lib/opera/opera "${DESTDIR}/usr/bin/opera"
From 24c8302b6cd85c581811b2235bb6edde19ba3f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:24:42 +0700
Subject: [PATCH 7/8] wps-office: move to nonfree, remove unknown shlibs
---
srcpkgs/wps-office/template | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 6aa21cc69389..0f0d223fa812 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,10 +1,8 @@
# Template file for 'wps-office'
pkgname=wps-office
version=11.1.0.10920
-revision=1
+revision=2
archs="x86_64"
-create_wrksrc=yes
-makedepends="rpmextract"
short_desc="Linux office suite with similar appearance to MS Office"
maintainer="mobinmob <mobinmob@disroot.org>"
# The old Kingsoft WPS Community License has disappeared from the
@@ -15,9 +13,12 @@ license="custom:EULA"
homepage="http://wps-community.org"
changelog="https://www.wps.com/whatsnew/linux/"
checksum=e252ac96473291df1e9dbeff2d1aedd1299f5ef411fa012ad617cfcd47dc3462
-allow_unknown_shlibs=yes
+# allow_unknown_shlibs=yes
nodebug=yes
+nostrip=yes
restricted=yes
+conflicts="EternalTerminal>=0"
+repository=nonfree
# The programs themselves are PIE, but the error reporter isn't :/
@@ -51,4 +52,9 @@ post_install() {
# Install third-party licenses
vlicense ${DESTDIR}/opt/kingsoft/wps-office/office6/thirdpartylegalnotices.txt
+
+ # Qt4
+ rm -f ${DESTDIR}/opt/kingsoft/wps-office/office6/librpc{et,wps,wpp}api.so
+ # systemd
+ rm -f ${DESTDIR}/opt/kingsoft/wps-office/office6/libdbus-1.so*
}
From e72d7bec2f64708f25dddd7bf42f4dd9f411ee99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:25:28 +0700
Subject: [PATCH 8/8] zoom: no needs rpmextract
---
srcpkgs/zoom/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 9ddc81ef1aba..c0eb7be87236 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -4,7 +4,6 @@ version=5.13.0.599
revision=1
archs="x86_64"
create_wrksrc=yes
-hostmakedepends="rpmextract"
depends="$(vopt_if systemqt 'qt5 qt5-graphicaleffects qt5-imageformats qt5-quickcontrols qt5-quickcontrols2 qt5-svg qt5-script qt5-declarative')
xcb-util-image xcb-util-keysyms glib libXfixes libXtst libgbm libglvnd
nss atk at-spi2-atk libXcomposite libXdamage libXrandr libxkbcommon pango
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: remove rpmextract from build, no conflicts with rpm anymore
2023-01-24 0:27 [PR PATCH] remove rpmextract from build, no conflicts with rpm anymore sgn
` (4 preceding siblings ...)
2023-01-28 2:47 ` sgn
@ 2023-01-28 2:51 ` sgn
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2023-01-28 2:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1139 bytes --]
There's a merged pull request on the void-packages repository
remove rpmextract from build, no conflicts with rpm anymore
https://github.com/void-linux/void-packages/pull/41831
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 7+ messages in thread