[gentoo-commits] repo/gentoo:master commit in: app-arch/xdms/, app-arch/xdms/files/
commit: aae03c0fdc38634ec8804af63c685828b6e820bf
Author: Roman Dobosz gmail com>
AuthorDate: Mon Apr 26 13:32:37 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Apr 26 15:49:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aae03c0f
app-arch/xdms: fix build issues with GCC 10.
Patch origins from Debian.
Signed-off-by: Roman Dobosz gmail.com>
Bug: https://bugs.gentoo.org/721896
Closes: https://github.com/gentoo/gentoo/pull/20548
Signed-off-by: Sam James gentoo.org>
.../files/xdms-1.3.2-fix-build-with-gcc-10.patch | 80 ++
app-arch/xdms/xdms-1.3.2-r2.ebuild | 1 +
2 files changed, 81 insertions(+)
diff --git a/app-arch/xdms/files/xdms-1.3.2-fix-build-with-gcc-10.patch
b/app-arch/xdms/files/xdms-1.3.2-fix-build-with-gcc-10.patch
new file mode 100644
index 000..dad00addead
--- /dev/null
+++ b/app-arch/xdms/files/xdms-1.3.2-fix-build-with-gcc-10.patch
@@ -0,0 +1,80 @@
+https://sources.debian.org/patches/xdms/1.3.2-7/0002-Fix-build-with-gcc-10.patch/
+
+From: Jeff Law
+Date: Sat, 9 May 2020 15:16:39 +0200
+Subject: Fix build with gcc-10
+--- a/src/u_deep.c
b/src/u_deep.c
+@@ -17,9 +17,9 @@
+ #include "getbits.h"
+
+
+-INLINE USHORT DecodeChar(void);
+-INLINE USHORT DecodePosition(void);
+-INLINE void update(USHORT c);
++static INLINE USHORT DecodeChar(void);
++static INLINE USHORT DecodePosition(void);
++static INLINE void update(USHORT c);
+ static void reconst(void);
+
+
+@@ -98,7 +98,7 @@ USHORT Unpack_DEEP(UCHAR *in, UCHAR *out, USHORT origsize){
+
+
+
+-INLINE USHORT DecodeChar(void){
++static INLINE USHORT DecodeChar(void){
+ USHORT c;
+
+ c = son[R];
+@@ -117,7 +117,7 @@ INLINE USHORT DecodeChar(void){
+
+
+
+-INLINE USHORT DecodePosition(void){
++static INLINE USHORT DecodePosition(void){
+ USHORT i, j, c;
+
+ i = GETBITS(8); DROPBITS(8);
+@@ -171,7 +171,7 @@ static void reconst(void){
+
+ /* increment frequency of given code by one, and update tree */
+
+-INLINE void update(USHORT c){
++static INLINE void update(USHORT c){
+ USHORT i, j, k, l;
+
+ if (freq[R] == MAX_FREQ) {
+diff --git a/src/u_heavy.c b/src/u_heavy.c
+index fff93d3..8557b71 100644
+--- a/src/u_heavy.c
b/src/u_heavy.c
+@@ -30,8 +30,8 @@ USHORT heavy_text_loc;
+
+ static USHORT read_tree_c(void);
+ static USHORT read_tree_p(void);
+-INLINE USHORT decode_c(void);
+-INLINE USHORT decode_p(void);
++static INLINE USHORT decode_c(void);
++static INLINE USHORT decode_p(void);
+
+
+
+@@ -74,7 +74,7 @@ USHORT Unpack_HEAVY(UCHAR *in, UCHAR *out, UCHAR flags,
USHORT origsize){
+
+
+
+-INLINE USHORT decode_c(void){
++static INLINE USHORT decode_c(void){
+ USHORT i, j, m;
+
+ j = c_table[GETBITS(12)];
+@@ -96,7 +96,7 @@ INLINE USHORT decode_c(void){
+
+
+
+-INLINE USHORT decode_p(void){
++static INLINE USHORT decode_p(void){
+ USHORT i, j, m;
+
+ j = pt_table[GETBITS(8)];
diff --git a/app-arch/xdms/xdms-1.3.2-r2.ebuild
b/app-arch/xdms/xdms-1.3.2-r2.ebuild
index a1bc96f7f59..07dce668c10 100644
--- a/app-arch/xdms/xdms-1.3.2-r2.ebuild
+++ b/app-arch/xdms/xdms-1.3.2-r2.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="amd64 ~hppa ppc x86"
PATCHES=(
"${FILESDIR}"/${PN}-1.3.2-respect-DESTDIR.patch
"${FILESDIR}"/${PN}-1.3.2-dont-compress-man-pages.patch
+ "${FILESDIR}"/${PN}-1.3.2-fix-build-with-gcc-10.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-arch/xdms/, app-arch/xdms/files/, app-arch/cksfv/
commit: c5a1059bbb719c64407f073cf3c194792ff68027
Author: Sam James gentoo org>
AuthorDate: Sat Apr 17 01:51:13 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 18 01:38:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5a1059b
app-arch/xdms: respect DESTDIR, fix man dest, Darwin build
* EAPI 6->7
* Respect DESTDIR (similar patch to app-arch/cksfv, naturally)
* Fix VariableScope issue (${ED} in src_configure, see point 1)
* Fix man page destination
* Fix build on Darwin (append standard undefined lookup flag)
Bug: https://bugs.gentoo.org/721896
Signed-off-by: Sam James gentoo.org>
app-arch/cksfv/cksfv-1.3.15.ebuild | 2 +-
.../files/xdms-1.3.2-dont-compress-man-pages.patch | 13 +++
.../xdms/files/xdms-1.3.2-respect-DESTDIR.patch| 22
app-arch/xdms/xdms-1.3.2-r1.ebuild | 31 -
app-arch/xdms/xdms-1.3.2-r2.ebuild | 40 ++
5 files changed, 76 insertions(+), 32 deletions(-)
diff --git a/app-arch/cksfv/cksfv-1.3.15.ebuild
b/app-arch/cksfv/cksfv-1.3.15.ebuild
index f6c62153bb3..82027ff3bdc 100644
--- a/app-arch/cksfv/cksfv-1.3.15.ebuild
+++ b/app-arch/cksfv/cksfv-1.3.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/app-arch/xdms/files/xdms-1.3.2-dont-compress-man-pages.patch
b/app-arch/xdms/files/xdms-1.3.2-dont-compress-man-pages.patch
new file mode 100644
index 000..3396b59a309
--- /dev/null
+++ b/app-arch/xdms/files/xdms-1.3.2-dont-compress-man-pages.patch
@@ -0,0 +1,13 @@
+From: Sam James
+Subject: [PATCH 2/2] Don't compress man pages
+--- a/Makefile.in
b/Makefile.in
+@@ -11,5 +11,4 @@ install: xdms
+ install xdms.txt COPYING ChangeLog.txt
${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION}/
+ chmod og+rx ${DESTDIR}{PREFIX}/bin ${DESTDIR}{PREFIX}/bin/xdms
+ chmod -R og+rX ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION}
+- gzip < xdms.1 > xdms.1.gz
+- install xdms.1.gz ${DESTDIR}{PREFIX}/share/man/man1/
++ install xdms.1 ${DESTDIR}{PREFIX}/share/man/man1/
+--
+
diff --git a/app-arch/xdms/files/xdms-1.3.2-respect-DESTDIR.patch
b/app-arch/xdms/files/xdms-1.3.2-respect-DESTDIR.patch
new file mode 100644
index 000..3db96993208
--- /dev/null
+++ b/app-arch/xdms/files/xdms-1.3.2-respect-DESTDIR.patch
@@ -0,0 +1,22 @@
+From: Sam James
+Subject: [PATCH 1/2] Respect DESTDIR
+--- a/Makefile.in
b/Makefile.in
+@@ -6,10 +6,10 @@ clean:
+ $(MAKE) -C src clean
+
+ install: xdms
+- mkdir -p {PREFIX}/bin {PREFIX}/share/doc/xdms-{VERSION}
{PREFIX}/share/man/man1
+- install src/xdms {PREFIX}/bin/
+- install xdms.txt COPYING ChangeLog.txt
{PREFIX}/share/doc/xdms-{VERSION}/
+- chmod og+rx {PREFIX}/bin {PREFIX}/bin/xdms
+- chmod -R og+rX {PREFIX}/share/doc/xdms-{VERSION}
++ mkdir -p ${DESTDIR}{PREFIX}/bin
${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION} ${DESTDIR}{PREFIX}/share/man/man1
++ install src/xdms ${DESTDIR}{PREFIX}/bin/
++ install xdms.txt COPYING ChangeLog.txt
${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION}/
++ chmod og+rx ${DESTDIR}{PREFIX}/bin ${DESTDIR}{PREFIX}/bin/xdms
++ chmod -R og+rX ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION}
+ gzip < xdms.1 > xdms.1.gz
+- install xdms.1.gz {PREFIX}/share/man/man1/
++ install xdms.1.gz ${DESTDIR}{PREFIX}/share/man/man1/
+--
diff --git a/app-arch/xdms/xdms-1.3.2-r1.ebuild
b/app-arch/xdms/xdms-1.3.2-r1.ebuild
deleted file mode 100644
index 14f419cd4b8..000
--- a/app-arch/xdms/xdms-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="xDMS - Amiga DMS disk image decompressor"
-HOMEPAGE="https://zakalwe.fi/~shd/foss/xdms;
-SRC_URI="https://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2;
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86"
-IUSE=""
-
-pkg_setup() {
- tc-export CC
-}
-
-src_prepare() {
- default
- sed -i Makefile.in \
- -e "s:COPYING::" \
- -e "s:share/doc/xdms-{VERSION}:share/doc/xdms-${PF}:" || die
- sed -i -e "s:-O2::" src/Makefile.in || die
-}
-
-src_configure() {
- ./configure --prefix=/usr --package-prefix="${D}" || die
-}
diff --git a/app-arch/xdms/xdms-1.3.2-r2.ebuild
b/app-arch/xdms/xdms-1.3.2-r2.ebuild
new file mode 100644
index 000..a1bc96f7f59
--- /dev/null
+++ b/app-arch/xdms/xdms-1.3.2-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="xDMS - Amiga DMS disk image decompressor"
+HOMEPAGE="https://zakalwe.fi/~shd/foss/xdms;
[gentoo-commits] repo/gentoo:master commit in: app-arch/xdms/
commit: fca00fe97480c215984293ba7db3f71b43dc19ba Author: Sam James gentoo org> AuthorDate: Sat Apr 17 01:53:47 2021 + Commit: Sam James gentoo org> CommitDate: Sun Apr 18 01:38:22 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca00fe9 app-arch/xdms: add gitlab remote-id Signed-off-by: Sam James gentoo.org> app-arch/xdms/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app-arch/xdms/metadata.xml b/app-arch/xdms/metadata.xml index ec5a204b171..3a9a2090585 100644 --- a/app-arch/xdms/metadata.xml +++ b/app-arch/xdms/metadata.xml @@ -9,4 +9,7 @@ Can extract the files contained inside the DMS archives, if the compressed disk is an AmigaDOS disk, using readdisk made by Bernd Schmidt. Can process multiple files in batch with a single command, and also use stdin and stdout for input and output of data. + + heikkiorsila/xdms +
[gentoo-commits] repo/gentoo:master commit in: app-arch/xdms/
commit: 3b161501f045024523968e4c2151b53fed592cfa
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sat Jun 13 08:11:52 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon Jun 15 02:33:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b161501
app-arch/xdms: use HTTPS
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger gmail.com>
Signed-off-by: Aaron Bauman gentoo.org>
app-arch/xdms/xdms-1.3.2-r1.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-arch/xdms/xdms-1.3.2-r1.ebuild
b/app-arch/xdms/xdms-1.3.2-r1.ebuild
index 1282999e023..14f419cd4b8 100644
--- a/app-arch/xdms/xdms-1.3.2-r1.ebuild
+++ b/app-arch/xdms/xdms-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
inherit toolchain-funcs
DESCRIPTION="xDMS - Amiga DMS disk image decompressor"
-HOMEPAGE="http://zakalwe.fi/~shd/foss/xdms;
-SRC_URI="http://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2;
+HOMEPAGE="https://zakalwe.fi/~shd/foss/xdms;
+SRC_URI="https://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2;
LICENSE="public-domain"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: app-arch/xdms/
commit: d276dcd5e48429823e36f228be3a78f28bd5aa3e
Author: Manuel Rüger gentoo org>
AuthorDate: Tue Nov 7 13:23:35 2017 +
Commit: Manuel Rüger gentoo org>
CommitDate: Tue Nov 7 13:23:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d276dcd5
app-arch/xdms: Remove old
Package-Manager: Portage-2.3.12, Repoman-2.3.4
app-arch/xdms/xdms-1.3.2.ebuild | 29 -
1 file changed, 29 deletions(-)
diff --git a/app-arch/xdms/xdms-1.3.2.ebuild b/app-arch/xdms/xdms-1.3.2.ebuild
deleted file mode 100644
index f8fc4c99169..000
--- a/app-arch/xdms/xdms-1.3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="xDMS - Amiga DMS disk image decompressor"
-HOMEPAGE="http://zakalwe.fi/~shd/foss/xdms;
-SRC_URI="http://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2;
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86"
-IUSE=""
-
-src_unpack() {
- unpack ${A}
- sed -i -e 's:COPYING::' "${S}"/Makefile.in
-}
-
-src_compile() {
- ./configure --prefix=/usr --package-prefix="${D}" \
- || die "configure failed."
- emake CC="$(tc-getCC)" || die "emake failed."
-}
-
-src_install() {
- emake install || die "emake install failed."
- prepalldocs
-}
[gentoo-commits] repo/gentoo:master commit in: app-arch/xdms/
commit: b843d93183b224f696bc3b491ae0dc597afe27e1
Author: Manuel Rüger gentoo org>
AuthorDate: Tue Nov 7 13:23:20 2017 +
Commit: Manuel Rüger gentoo org>
CommitDate: Tue Nov 7 13:23:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b843d931
app-arch/xdms: Stable on amd64
Package-Manager: Portage-2.3.12, Repoman-2.3.4
app-arch/xdms/xdms-1.3.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-arch/xdms/xdms-1.3.2-r1.ebuild
b/app-arch/xdms/xdms-1.3.2-r1.ebuild
index ada56f75c22..1282999e023 100644
--- a/app-arch/xdms/xdms-1.3.2-r1.ebuild
+++ b/app-arch/xdms/xdms-1.3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2;
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ppc x86"
+KEYWORDS="amd64 ~hppa ppc x86"
IUSE=""
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: app-arch/xdms/
commit: fa756c72a148dd216cfa087c51bf037b3d5a0346
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Oct 29 20:14:28 2017 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Oct 29 21:07:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa756c72
app-arch/xdms: x86 stable (bug #627294)
Package-Manager: Portage-2.3.13, Repoman-2.3.4
app-arch/xdms/xdms-1.3.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-arch/xdms/xdms-1.3.2-r1.ebuild
b/app-arch/xdms/xdms-1.3.2-r1.ebuild
index 757acbdaf11..ada56f75c22 100644
--- a/app-arch/xdms/xdms-1.3.2-r1.ebuild
+++ b/app-arch/xdms/xdms-1.3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2;
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ppc ~x86"
+KEYWORDS="~amd64 ~hppa ppc x86"
IUSE=""
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: app-arch/xdms/
commit: 098e63214533c7dfda773770fae580517ec9dded
Author: Sergei Trofimovich gentoo org>
AuthorDate: Thu Oct 12 21:25:51 2017 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Oct 13 00:13:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=098e6321
app-arch/xdms: stable 1.3.2-r1 for ppc, bug #627294
Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc"
app-arch/xdms/xdms-1.3.2-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-arch/xdms/xdms-1.3.2-r1.ebuild
b/app-arch/xdms/xdms-1.3.2-r1.ebuild
index 3561bdcbd69..757acbdaf11 100644
--- a/app-arch/xdms/xdms-1.3.2-r1.ebuild
+++ b/app-arch/xdms/xdms-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2;
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~hppa ppc ~x86"
IUSE=""
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: app-arch/xdms/
commit: 1e3f09e05fd96cf49f3cffe816fcb94b2a912703
Author: Michael Palimaka gentoo org>
AuthorDate: Wed Jun 29 17:32:20 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Jun 29 17:32:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e3f09e0
app-arch/xdms: revision bump to avoid calling prepalldocs
Gentoo-bug: 587256
Package-Manager: portage-2.3.0
app-arch/xdms/xdms-1.3.2-r1.ebuild | 32
1 file changed, 32 insertions(+)
diff --git a/app-arch/xdms/xdms-1.3.2-r1.ebuild
b/app-arch/xdms/xdms-1.3.2-r1.ebuild
new file mode 100644
index 000..86711fc
--- /dev/null
+++ b/app-arch/xdms/xdms-1.3.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="xDMS - Amiga DMS disk image decompressor"
+HOMEPAGE="http://zakalwe.fi/~shd/foss/xdms;
+SRC_URI="http://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2;
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE=""
+
+pkg_setup() {
+ tc-export CC
+}
+
+src_prepare() {
+ default
+ sed -i Makefile.in \
+ -e "s:COPYING::" \
+ -e "s:share/doc/xdms-{VERSION}:share/doc/xdms-${PF}:" || die
+ sed -i -e "s:-O2::" src/Makefile.in || die
+}
+
+src_configure() {
+ ./configure --prefix=/usr --package-prefix="${D}" || die
+}
