[arch-commits] Commit in metapixel/repos/community-x86_64 (6 files)
Lukas Fleischer
lfleischer at archlinux.org
Sun May 24 13:28:52 UTC 2020
Date: Sunday, May 24, 2020 @ 13:28:51
Author: lfleischer
Revision: 632817
archrelease: copy trunk to community-x86_64
Added:
metapixel/repos/community-x86_64/PKGBUILD
(from rev 632816, metapixel/trunk/PKGBUILD)
metapixel/repos/community-x86_64/fix-manpage-path.patch
(from rev 632816, metapixel/trunk/fix-manpage-path.patch)
metapixel/repos/community-x86_64/metapixel-giflib-5.1.0-compat.patch
(from rev 632816, metapixel/trunk/metapixel-giflib-5.1.0-compat.patch)
Deleted:
metapixel/repos/community-x86_64/PKGBUILD
metapixel/repos/community-x86_64/fix-manpage-path.patch
metapixel/repos/community-x86_64/metapixel-giflib-5.1.0-compat.patch
-------------------------------------+
PKGBUILD | 95 ++++++++++++++++------------------
fix-manpage-path.patch | 70 ++++++++++++-------------
metapixel-giflib-5.1.0-compat.patch | 46 ++++++++--------
3 files changed, 105 insertions(+), 106 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-24 13:28:42 UTC (rev 632816)
+++ PKGBUILD 2020-05-24 13:28:51 UTC (rev 632817)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de>
-
-pkgname=metapixel
-pkgver=1.0.2
-pkgrel=9
-pkgdesc='A program for generating photomosaics.'
-arch=('x86_64')
-url='http://www.complang.tuwien.ac.at/schani/metapixel/'
-license=('GPL')
-depends=('giflib' 'libjpeg' 'libpng' 'perl' 'glib2')
-makedepends=('git' 'docbook-xsl')
-source=("git://github.com/schani/metapixel.git#commit=4ad7be9e82"
- "fix-manpage-path.patch"
- "metapixel-giflib-5.1.0-compat.patch")
-md5sums=('SKIP'
- '166d31ddce400bcc4f7d16a8fc399c0a'
- 'b959c6d1b14064aee3a73ae568a82555')
-
-prepare() {
- cd "${srcdir}/${pkgname}"
-
- git submodule init
- git submodule update
-
- # Fix man page installation path (FS#44543)
- patch -p1 -i ../fix-manpage-path.patch
-
- cd rwimg
- patch -p1 -i ../../metapixel-giflib-5.1.0-compat.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}"
-
- # Build librwimg first, make dependencies seem to be bugged.
- make librwimg
- make MANPAGE_XSL="/usr/share/xml/docbook/xsl-stylesheets-*/manpages/docbook.xsl"
-}
-
-package() {
- cd "${srcdir}/${pkgname}"
-
- install -dm0755 "${pkgdir}/usr/share/man/man1"
-
- make PREFIX="${pkgdir}/usr" install
-}
Copied: metapixel/repos/community-x86_64/PKGBUILD (from rev 632816, metapixel/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-05-24 13:28:51 UTC (rev 632817)
@@ -0,0 +1,47 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de>
+
+pkgname=metapixel
+pkgver=1.0.2
+pkgrel=10
+pkgdesc='A program for generating photomosaics.'
+arch=('x86_64')
+url='https://www.complang.tuwien.ac.at/schani/metapixel/'
+license=('GPL')
+depends=('giflib' 'libjpeg' 'libpng' 'perl' 'glib2')
+makedepends=('git' 'docbook-xsl')
+source=("git://github.com/schani/metapixel.git#commit=4ad7be9e82"
+ "fix-manpage-path.patch"
+ "metapixel-giflib-5.1.0-compat.patch")
+md5sums=('SKIP'
+ '166d31ddce400bcc4f7d16a8fc399c0a'
+ 'b959c6d1b14064aee3a73ae568a82555')
+
+prepare() {
+ cd "${srcdir}/${pkgname}"
+
+ git submodule init
+ git submodule update
+
+ # Fix man page installation path (FS#44543)
+ patch -p1 -i ../fix-manpage-path.patch
+
+ cd rwimg
+ patch -p1 -i ../../metapixel-giflib-5.1.0-compat.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}"
+
+ # Build librwimg first, make dependencies seem to be bugged.
+ make librwimg
+ make MANPAGE_XSL="/usr/share/xml/docbook/xsl-stylesheets-*/manpages/docbook.xsl"
+}
+
+package() {
+ cd "${srcdir}/${pkgname}"
+
+ install -dm0755 "${pkgdir}/usr/share/man/man1"
+
+ make PREFIX="${pkgdir}/usr" install
+}
Deleted: fix-manpage-path.patch
===================================================================
--- fix-manpage-path.patch 2020-05-24 13:28:42 UTC (rev 632816)
+++ fix-manpage-path.patch 2020-05-24 13:28:51 UTC (rev 632817)
@@ -1,35 +0,0 @@
-From b19b164aa0ecff48824a21976b71f954dcff527b Mon Sep 17 00:00:00 2001
-From: Pierre Neidhardt <ambrevar at gmail.com>
-Date: Sat, 11 Apr 2015 10:27:16 +0200
-Subject: [PATCH] Makefile: Fix man page installation path
-
-Latest FHS replaces /usr/man by /usr/share/man.
-
-If folder `man1` does not exist, `$(INSTALL) metapixel.1 $(MANDIR)/man1` will
-install the man page as `man1`, hence the -D flag to force folder creation.
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index e40e0e1..dc1ccaf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@ INSTALL = install
- MANPAGE_XSL = /usr/share/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl
-
- BINDIR = $(PREFIX)/bin
--MANDIR = $(PREFIX)/man
-+MANDIR = $(PREFIX)/share/man
-
- VERSION = 1.1.0
-
-@@ -66,7 +66,7 @@ install : metapixel metapixel.1
- $(INSTALL) -d $(BINDIR)
- $(INSTALL) metapixel $(BINDIR)
- $(INSTALL) metapixel-prepare $(BINDIR)
-- $(INSTALL) metapixel.1 $(MANDIR)/man1
-+ $(INSTALL) -D metapixel.1 $(MANDIR)/man1/metapixel.1
- # $(INSTALL) imagesize $(BINDIR)
- # $(INSTALL) sizesort $(BINDIR)
-
Copied: metapixel/repos/community-x86_64/fix-manpage-path.patch (from rev 632816, metapixel/trunk/fix-manpage-path.patch)
===================================================================
--- fix-manpage-path.patch (rev 0)
+++ fix-manpage-path.patch 2020-05-24 13:28:51 UTC (rev 632817)
@@ -0,0 +1,35 @@
+From b19b164aa0ecff48824a21976b71f954dcff527b Mon Sep 17 00:00:00 2001
+From: Pierre Neidhardt <ambrevar at gmail.com>
+Date: Sat, 11 Apr 2015 10:27:16 +0200
+Subject: [PATCH] Makefile: Fix man page installation path
+
+Latest FHS replaces /usr/man by /usr/share/man.
+
+If folder `man1` does not exist, `$(INSTALL) metapixel.1 $(MANDIR)/man1` will
+install the man page as `man1`, hence the -D flag to force folder creation.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e40e0e1..dc1ccaf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,7 @@ INSTALL = install
+ MANPAGE_XSL = /usr/share/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl
+
+ BINDIR = $(PREFIX)/bin
+-MANDIR = $(PREFIX)/man
++MANDIR = $(PREFIX)/share/man
+
+ VERSION = 1.1.0
+
+@@ -66,7 +66,7 @@ install : metapixel metapixel.1
+ $(INSTALL) -d $(BINDIR)
+ $(INSTALL) metapixel $(BINDIR)
+ $(INSTALL) metapixel-prepare $(BINDIR)
+- $(INSTALL) metapixel.1 $(MANDIR)/man1
++ $(INSTALL) -D metapixel.1 $(MANDIR)/man1/metapixel.1
+ # $(INSTALL) imagesize $(BINDIR)
+ # $(INSTALL) sizesort $(BINDIR)
+
Deleted: metapixel-giflib-5.1.0-compat.patch
===================================================================
--- metapixel-giflib-5.1.0-compat.patch 2020-05-24 13:28:42 UTC (rev 632816)
+++ metapixel-giflib-5.1.0-compat.patch 2020-05-24 13:28:51 UTC (rev 632817)
@@ -1,23 +0,0 @@
-diff --git a/rwgif.c b/rwgif.c
-index e67ac3c..6b19a28 100644
---- a/rwgif.c
-+++ b/rwgif.c
-@@ -54,8 +54,7 @@ open_gif_file (const char *filename, int *width, int *height)
-
- assert(data != 0);
-
-- int error;
-- data->file = DGifOpenFileName(filename, &error);
-+ data->file = DGifOpenFileName(filename, NULL);
-
- assert(data->file !=0);
-
-@@ -138,7 +137,7 @@ open_gif_file (const char *filename, int *width, int *height)
- }
- free(buffer);
-
-- assert(DGifCloseFile(data->file) == GIF_OK);
-+ assert(DGifCloseFile(data->file, NULL) == GIF_OK);
-
- return data;
- }
Copied: metapixel/repos/community-x86_64/metapixel-giflib-5.1.0-compat.patch (from rev 632816, metapixel/trunk/metapixel-giflib-5.1.0-compat.patch)
===================================================================
--- metapixel-giflib-5.1.0-compat.patch (rev 0)
+++ metapixel-giflib-5.1.0-compat.patch 2020-05-24 13:28:51 UTC (rev 632817)
@@ -0,0 +1,23 @@
+diff --git a/rwgif.c b/rwgif.c
+index e67ac3c..6b19a28 100644
+--- a/rwgif.c
++++ b/rwgif.c
+@@ -54,8 +54,7 @@ open_gif_file (const char *filename, int *width, int *height)
+
+ assert(data != 0);
+
+- int error;
+- data->file = DGifOpenFileName(filename, &error);
++ data->file = DGifOpenFileName(filename, NULL);
+
+ assert(data->file !=0);
+
+@@ -138,7 +137,7 @@ open_gif_file (const char *filename, int *width, int *height)
+ }
+ free(buffer);
+
+- assert(DGifCloseFile(data->file) == GIF_OK);
++ assert(DGifCloseFile(data->file, NULL) == GIF_OK);
+
+ return data;
+ }
More information about the arch-commits
mailing list