[arch-commits] Commit in pinfo/repos/community-x86_64 (6 files)
Antonio Rojas
arojas at gemini.archlinux.org
Sat Apr 23 10:09:07 UTC 2022
Date: Saturday, April 23, 2022 @ 10:09:06
Author: arojas
Revision: 1187560
archrelease: copy trunk to community-x86_64
Added:
pinfo/repos/community-x86_64/ChangeLog
(from rev 1187559, pinfo/trunk/ChangeLog)
pinfo/repos/community-x86_64/PKGBUILD
(from rev 1187559, pinfo/trunk/PKGBUILD)
pinfo/repos/community-x86_64/gcc10-stringop.diff
(from rev 1187559, pinfo/trunk/gcc10-stringop.diff)
Deleted:
pinfo/repos/community-x86_64/ChangeLog
pinfo/repos/community-x86_64/PKGBUILD
pinfo/repos/community-x86_64/gcc10-stringop.diff
---------------------+
ChangeLog | 6 +--
PKGBUILD | 90 ++++++++++++++++++++++++++------------------------
gcc10-stringop.diff | 56 +++++++++++++++----------------
3 files changed, 78 insertions(+), 74 deletions(-)
Deleted: ChangeLog
===================================================================
--- ChangeLog 2022-04-23 10:08:52 UTC (rev 1187559)
+++ ChangeLog 2022-04-23 10:09:06 UTC (rev 1187560)
@@ -1,3 +0,0 @@
-2007-06-28 tardo <tardo at nagi-fanboi.net>
-* Built for x86_64
-
Copied: pinfo/repos/community-x86_64/ChangeLog (from rev 1187559, pinfo/trunk/ChangeLog)
===================================================================
--- ChangeLog (rev 0)
+++ ChangeLog 2022-04-23 10:09:06 UTC (rev 1187560)
@@ -0,0 +1,3 @@
+2007-06-28 tardo <tardo at nagi-fanboi.net>
+* Built for x86_64
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-04-23 10:08:52 UTC (rev 1187559)
+++ PKGBUILD 2022-04-23 10:09:06 UTC (rev 1187560)
@@ -1,43 +0,0 @@
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
-
-pkgname=pinfo
-pkgver=0.6.13
-pkgrel=1
-pkgdesc="A hypertext info file viewer"
-arch=('x86_64')
-url="http://pinfo.sourceforge.net/"
-# https://fossies.org/linux/misc/pinfo-0.6.10.tar.gz/
-license=('GPL')
-depends=('ncurses' 'readline')
-#source=("https://alioth.debian.org/frs/download.php/file/3351/$pkgname-$pkgver.tar.bz2")
-#source=("https://arch.p5n.pp.ru/~sergej/dl/2014/pinfo-$pkgver.tar.bz2")
-#source=("https://fossies.org/linux/misc/old/pinfo-$pkgver.tar.bz2")
-source=("pinfo-$pkgver.tgz::https://github.com/baszoetekouw/pinfo/archive/v$pkgver.tar.gz"
- gcc10-stringop.diff)
-sha256sums=('9dc5e848a7a86cb665a885bc5f0fdf6d09ad60e814d75e78019ae3accb42c217'
- '876fd9e3fbb6e129abe183dceb4db03cbd152467e7f0b7edd7cb03c5bc201c32')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
- # remove on 0.6.14
- patch -Np1 -i ../gcc10-stringop.diff
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
- unset LDFLAGS
- [ -x configure ] || ./autogen.sh
- sed -i 's|nogroup|nobody|' src/pinforc.in src/utils.c
- [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --enable-cursor \
- --mandir=/usr/share/man --infodir=/usr/share/info
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
- rm -f "$pkgdir/usr/share/info/dir"
-}
Copied: pinfo/repos/community-x86_64/PKGBUILD (from rev 1187559, pinfo/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-04-23 10:09:06 UTC (rev 1187560)
@@ -0,0 +1,47 @@
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
+
+pkgname=pinfo
+pkgver=0.6.13
+pkgrel=2
+pkgdesc="A hypertext info file viewer"
+arch=('x86_64')
+url="http://pinfo.sourceforge.net/"
+# https://fossies.org/linux/misc/pinfo-0.6.10.tar.gz/
+license=('GPL')
+depends=('ncurses' 'readline')
+#source=("https://alioth.debian.org/frs/download.php/file/3351/$pkgname-$pkgver.tar.bz2")
+#source=("https://arch.p5n.pp.ru/~sergej/dl/2014/pinfo-$pkgver.tar.bz2")
+#source=("https://fossies.org/linux/misc/old/pinfo-$pkgver.tar.bz2")
+source=("pinfo-$pkgver.tgz::https://github.com/baszoetekouw/pinfo/archive/v$pkgver.tar.gz"
+ gcc10-stringop.diff
+ https://github.com/baszoetekouw/pinfo/commit/ab604fdb.patch)
+sha256sums=('9dc5e848a7a86cb665a885bc5f0fdf6d09ad60e814d75e78019ae3accb42c217'
+ '876fd9e3fbb6e129abe183dceb4db03cbd152467e7f0b7edd7cb03c5bc201c32'
+ '7690ed298a139b82b763979e59998afdac88b4265d867f746811e317a152f57d')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ # remove on 0.6.14
+ patch -Np1 -i ../gcc10-stringop.diff
+ # Fix build with -Werror=format
+ patch -p1 -i ../ab604fdb.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
+ unset LDFLAGS
+ [ -x configure ] || ./autogen.sh
+ sed -i 's|nogroup|nobody|' src/pinforc.in src/utils.c
+ [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --enable-cursor \
+ --mandir=/usr/share/man --infodir=/usr/share/info
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+ rm -f "$pkgdir/usr/share/info/dir"
+}
Deleted: gcc10-stringop.diff
===================================================================
--- gcc10-stringop.diff 2022-04-23 10:08:52 UTC (rev 1187559)
+++ gcc10-stringop.diff 2022-04-23 10:09:06 UTC (rev 1187560)
@@ -1,28 +0,0 @@
-diff --git a/src/utils.c b/src/utils.c
-index cb2fe76..2e4139c 100644
---- a/src/utils.c
-+++ b/src/utils.c
-@@ -848,10 +848,9 @@ char *
- make_tempfile()
- {
- char *filename;
-- size_t len;
-
- /* TODO: fix hardcoded /tmp */
-- char tmpfile_template[] = "/tmp/pinfo.XXXXXX";
-+ char tmpfile_template[32] = "/tmp/pinfo.XXXXXX";
-
- /* create a tmpfile */
- int fd = mkstemp(tmpfile_template);
-@@ -864,9 +863,8 @@ make_tempfile()
- }
-
- /* allocate a new string and copy the filename there */
-- len = strlen(tmpfile_template)+1;
-- filename = xmalloc(len+1); /* guarenteerd to be set to \0's */
-- strncpy(filename, tmpfile_template, len);
-+ filename = xmalloc(33); /* guarenteerd to be set to \0's */
-+ strncpy(filename, tmpfile_template, 32);
-
- /* close the file */
- close(fd);
Copied: pinfo/repos/community-x86_64/gcc10-stringop.diff (from rev 1187559, pinfo/trunk/gcc10-stringop.diff)
===================================================================
--- gcc10-stringop.diff (rev 0)
+++ gcc10-stringop.diff 2022-04-23 10:09:06 UTC (rev 1187560)
@@ -0,0 +1,28 @@
+diff --git a/src/utils.c b/src/utils.c
+index cb2fe76..2e4139c 100644
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -848,10 +848,9 @@ char *
+ make_tempfile()
+ {
+ char *filename;
+- size_t len;
+
+ /* TODO: fix hardcoded /tmp */
+- char tmpfile_template[] = "/tmp/pinfo.XXXXXX";
++ char tmpfile_template[32] = "/tmp/pinfo.XXXXXX";
+
+ /* create a tmpfile */
+ int fd = mkstemp(tmpfile_template);
+@@ -864,9 +863,8 @@ make_tempfile()
+ }
+
+ /* allocate a new string and copy the filename there */
+- len = strlen(tmpfile_template)+1;
+- filename = xmalloc(len+1); /* guarenteerd to be set to \0's */
+- strncpy(filename, tmpfile_template, len);
++ filename = xmalloc(33); /* guarenteerd to be set to \0's */
++ strncpy(filename, tmpfile_template, 32);
+
+ /* close the file */
+ close(fd);
More information about the arch-commits
mailing list