[gentoo-commits] repo/gentoo:master commit in: media-gfx/aview/
commit: 9d878977f8b660910341814fa902aea621639927
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sat Nov 26 15:23:40 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Dec 9 06:53:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d878977
media-gfx/aview: use HTTPS, fix LICENSE
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/aview/aview-1.3.0_rc1-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
index 0f64724a6032..df9349646162 100644
--- a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
+++ b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
@@ -8,11 +8,11 @@ inherit autotools
MY_P=${P/_/}
DESCRIPTION="ASCII Image Viewer"
-HOMEPAGE="http://aa-project.sourceforge.net/aview/;
+HOMEPAGE="https://aa-project.sourceforge.net/aview/;
SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P/rc*/}"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/aview/, media-gfx/aview/files/
commit: 825bc29ea1ac5c3f1b45041dad97cc1441c9a2ad
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Oct 9 04:40:54 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Oct 9 05:31:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=825bc29e
media-gfx/aview: fix build with upcoming clang16
Closes: https://bugs.gentoo.org/871249
Signed-off-by: Ionen Wolkens gentoo.org>
media-gfx/aview/aview-1.3.0_rc1-r3.ebuild | 1 +
media-gfx/aview/files/aview-1.3.0_rc1-clang16.patch | 15 +++
2 files changed, 16 insertions(+)
diff --git a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
index 6c5269da95c3..0f64724a6032 100644
--- a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
+++ b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-asciiview.patch
"${FILESDIR}"/${P}-includes.patch
+ "${FILESDIR}"/${P}-clang16.patch
)
src_prepare() {
diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-clang16.patch
b/media-gfx/aview/files/aview-1.3.0_rc1-clang16.patch
new file mode 100644
index ..6ae962bbb06b
--- /dev/null
+++ b/media-gfx/aview/files/aview-1.3.0_rc1-clang16.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/871249
+--- a/flip.c
b/flip.c
+@@ -10,4 +10,5 @@
+ #include
+ #include
++#include
+ #include
+ #include
+@@ -59,4 +60,5 @@
+ static char *graph_mem;
+
++int f_getkey(void);
+
+ static void dcd_color_64( char *data ) {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/aview/
commit: e5ef98dd7c0c6c83d38486af828c60bb797b78f3
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Oct 9 04:36:20 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Oct 9 05:31:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5ef98dd
media-gfx/aview: EAPI7->8, tidy
Signed-off-by: Ionen Wolkens gentoo.org>
media-gfx/aview/aview-1.3.0_rc1-r3.ebuild | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
index 728a22350066..6c5269da95c3 100644
--- a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
+++ b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools
MY_P=${P/_/}
-DESCRIPTION="An ASCII Image Viewer"
+DESCRIPTION="ASCII Image Viewer"
HOMEPAGE="http://aa-project.sourceforge.net/aview/;
SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P/rc*/}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-DEPEND="media-libs/aalib:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P/rc*/}"
+RDEPEND="media-libs/aalib"
+DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-asciiview.patch
@@ -27,6 +26,6 @@ PATCHES=(
src_prepare() {
default
- mv configure.{in,ac} || die
+
eautoreconf
}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/aview/files/, media-gfx/aview/
commit: 3c0f9aaeb80e3846c609e9e13647bf85885de795
Author: David Seifert gentoo org>
AuthorDate: Fri Dec 13 15:07:03 2019 +
Commit: David Seifert gentoo org>
CommitDate: Fri Dec 13 15:07:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c0f9aae
media-gfx/aview: Port to EAPI 7
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert gentoo.org>
media-gfx/aview/aview-1.3.0_rc1-r3.ebuild | 32 +++
.../aview/files/aview-1.3.0_rc1-asciiview.patch| 4 +--
.../aview/files/aview-1.3.0_rc1-includes.patch | 36 +++---
3 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
index 4487794334e..728a2235006 100644
--- a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
+++ b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
@@ -1,42 +1,32 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
-inherit base
+inherit autotools
MY_P=${P/_/}
-S=${WORKDIR}/${MY_P/rc*/}
+
DESCRIPTION="An ASCII Image Viewer"
-SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
HOMEPAGE="http://aa-project.sourceforge.net/aview/;
+SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
-SLOT="0"
LICENSE="GPL-2"
+SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE=""
-DEPEND=">=media-libs/aalib-1.4_rc4"
+DEPEND="media-libs/aalib:="
RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MY_P/rc*/}"
+
PATCHES=(
"${FILESDIR}"/${P}-asciiview.patch
"${FILESDIR}"/${P}-includes.patch
)
src_prepare() {
- base_src_prepare
-
- sed -i -e 's:#include :#include :g' "${S}"/*.c ||
die
-}
-
-src_compile() {
- make aview
-}
-
-src_install() {
- dobin aview asciiview
-
- doman *.1
- dodoc ANNOUNCE ChangeLog README TODO
+ default
+ mv configure.{in,ac} || die
+ eautoreconf
}
diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch
b/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch
index 6d71bbb967b..6d547ea0f13 100644
--- a/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch
+++ b/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch
@@ -10,8 +10,8 @@ asciiview script (bug #293654) by Kevin McCarthy
Rollup patch created by Kevin McCarthy
asciiview
-+++ asciiview
+--- a/asciiview
b/asciiview
@@ -3,13 +3,13 @@
clear()
{
diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-includes.patch
b/media-gfx/aview/files/aview-1.3.0_rc1-includes.patch
index 3e5006b4c54..79b819e9588 100644
--- a/media-gfx/aview/files/aview-1.3.0_rc1-includes.patch
+++ b/media-gfx/aview/files/aview-1.3.0_rc1-includes.patch
@@ -1,7 +1,25 @@
-Index: aview-1.3.0/main.c
-===
aview-1.3.0.orig/main.c
-+++ aview-1.3.0/main.c
+--- a/flip.c
b/flip.c
+@@ -7,6 +7,7 @@
+
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+--- a/image.c
b/image.c
+@@ -1,6 +1,6 @@
+ #include
+ #include
+-#include
++#include
+ #include "config.h"
+
+ int imgwidth, imgheight;
+--- a/main.c
b/main.c
@@ -1,4 +1,6 @@
#include
+#include
@@ -9,3 +27,13 @@ Index: aview-1.3.0/main.c
#include "image.h"
#include "ui.h"
#include "config.h"
+--- a/ui.c
b/ui.c
+@@ -1,6 +1,6 @@
+ #include
+ #include
+-#include
++#include
+ #include
+ #include
+ #include "shrink.h"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/aview/
commit: 35e9a718bc3c2a38370c1abaa62ac9fbaca78f24 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Feb 15 19:36:33 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Feb 15 19:39:50 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e9a718 media-gfx/aview: amd64 stable wrt bug #676548 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 RepoMan-Options: --include-arches="amd64" media-gfx/aview/aview-1.3.0_rc1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild index 0cc3e7352ca..4487794334e 100644 --- a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild +++ b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://aa-project.sourceforge.net/aview/; SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="" DEPEND=">=media-libs/aalib-1.4_rc4"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/aview/, media-gfx/aview/files/
commit: 3510c4511535a1cb22340f2016e164e1b17295b5
Author: Mikle Kolyada gentoo org>
AuthorDate: Fri Feb 15 19:39:28 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Fri Feb 15 19:39:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3510c451
media-gfx/aview: Drop old
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-gfx/aview/aview-1.3.0_rc1-r1.ebuild | 39
.../files/aview-1.3.0_rc1-filename-spaces.patch| 53 --
.../aview/files/aview-1.3.0_rc1-tmp_creation.patch | 46 ---
3 files changed, 138 deletions(-)
diff --git a/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild
b/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild
deleted file mode 100644
index d7700f08235..000
--- a/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit base
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P/rc*/}
-DESCRIPTION="An ASCII Image Viewer"
-SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
-HOMEPAGE="http://aa-project.sourceforge.net/aview/;
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=media-libs/aalib-1.4_rc4"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-filename-spaces.patch
- "${FILESDIR}"/${P}-tmp_creation.patch
- "${FILESDIR}"/${P}-includes.patch
-)
-
-src_compile() {
- econf || die
- make aview || die
-}
-
-src_install() {
- into /usr
- dobin aview asciiview
-
- doman *.1
- dodoc ANNOUNCE ChangeLog README TODO
-}
diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch
b/media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch
deleted file mode 100644
index e42ed0d5c58..000
--- a/media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -ur aview-1.3.0-orig/asciiview aview-1.3.0/asciiview
aview-1.3.0-orig/asciiview 2005-08-15 21:20:16.0 -0400
-+++ aview-1.3.0/asciiview 2005-08-15 21:20:19.0 -0400
-@@ -7,9 +7,9 @@
- }
- myconvert()
- {
-- if anytopnm $1 >/tmp/aview$$.pgm 2>/dev/null ; then
-+ if anytopnm "$1" >/tmp/aview$$.pgm 2>/dev/null ; then
- exit
-- elif convert -colorspace gray $1 pgm:- 2>/dev/null ; then
-+ elif convert -colorspace gray "$1" pgm:- 2>/dev/null ; then
- exit
-fi
-echo "Failed to convert file format to PNM by both convert and anytopnm"
>&2
-@@ -44,8 +44,13 @@
- options="$options $1"
- shift
- ;;
--*)
-- filenames="$filenames $1"
-+*)
-+ if [ "$filenames" = "" ]
-+ then
-+filenames=$1 #avoid leading null
-+ else
-+filenames=$(echo -e "$filenames\000$1")
-+ fi
- shift
- ;;
- esac
-@@ -53,15 +58,16 @@
- trap clear 0
- mkfifo /tmp/aview$$.pgm
- outfile=/tmp/aview$$.pgm
--for name in $filenames ; do
--if test -r $name ; then
--case $name in
-+IFS=$(echo -e "\000")
-+echo $filenames | while read name; do
-+if test -r "$name" ; then
-+case "$name" in
- *.fli | *.lfc | *.flic )
- PATH="$PATH:."
-- aaflip $options $name
-+ aaflip $options "$name"
- ;;
- *)
-- myconvert $name >/tmp/aview$$.pgm &
-+ myconvert "$name" >/tmp/aview$$.pgm &
- pid=$!
- PATH="$PATH:."
- aview $options /tmp/aview$$.pgm
diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-tmp_creation.patch
b/media-gfx/aview/files/aview-1.3.0_rc1-tmp_creation.patch
deleted file mode 100644
index f792e8bfebb..000
--- a/media-gfx/aview/files/aview-1.3.0_rc1-tmp_creation.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Fix insecure temporary file creation, see:
-https://bugs.gentoo.org/show_bug.cgi?id=235808
-
-Index: aview-1.3.0/asciiview
-===
aview-1.3.0.orig/asciiview
-+++ aview-1.3.0/asciiview
-@@ -3,11 +3,11 @@
- clear()
- {
- kill $! 2>/dev/null
-- rm -f /tmp/aview$$.pgm 2>/dev/null
-+ rm -rf $tmpdir 2>/dev/null
- }
- myconvert()
- {
-- if anytopnm "$1" >/tmp/aview$$.pgm 2>/dev/null ; then
-+ if anytopnm "$1" >"$2" 2>/dev/null ; then
- exit
-elif convert -colorspace gray "$1" pgm:- 2>/dev/null ; then
- exit
-@@ -56,8 +56,9 @@ while [ "$1" != "" ]; do
- esac
- done
- trap clear 0
--mkfifo /tmp/aview$$.pgm
--outfile=/tmp/aview$$.pgm
-+tmpdir=`mktemp -t -d`
-+outfile=$tmpdir/aview.pgm
-+mkfifo $outfile
- IFS=$(echo -e "\000")
- echo $filenames | while read name; do
- if test -r "$name" ; then
-@@ -67,10 +68,10 @@ case "$name" in
- aaflip $options "$name"
- ;;
- *)
-- myconvert "$name" >/tmp/aview$$.pgm &
-+ myconvert "$name" "$outfile" >"$outfile" &
- pid=$!
- PATH="$PATH:."
-- aview $options /tmp/aview$$.pgm
-+ aview $options $outfile
- kill $pid 2>/dev/null
- esac
- else
[gentoo-commits] repo/gentoo:master commit in: media-gfx/aview/
commit: 85959423b0d54f3eb1dc48a894d87a460d300e36 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Feb 15 01:26:48 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Feb 15 01:36:48 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85959423 media-gfx/aview: x86 stable (bug #676548) Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> media-gfx/aview/aview-1.3.0_rc1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild index 938ed7cb773..0cc3e7352ca 100644 --- a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild +++ b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://aa-project.sourceforge.net/aview/; SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="~amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="" DEPEND=">=media-libs/aalib-1.4_rc4"
