[arch-commits] Commit in xcftools/repos/community-x86_64 (4 files)

Alexander Rødseth arodseth at archlinux.org
Fri Mar 19 11:49:57 UTC 2021


    Date: Friday, March 19, 2021 @ 11:49:57
  Author: arodseth
Revision: 894562

archrelease: copy trunk to community-x86_64

Added:
  xcftools/repos/community-x86_64/PKGBUILD
    (from rev 894561, xcftools/trunk/PKGBUILD)
  xcftools/repos/community-x86_64/xcftools.patch
    (from rev 894561, xcftools/trunk/xcftools.patch)
Deleted:
  xcftools/repos/community-x86_64/PKGBUILD
  xcftools/repos/community-x86_64/xcftools.patch

----------------+
 PKGBUILD       |   72 ++++++++++++++++++++++++++++---------------------------
 xcftools.patch |   54 ++++++++++++++++++++---------------------
 2 files changed, 64 insertions(+), 62 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-19 11:49:50 UTC (rev 894561)
+++ PKGBUILD	2021-03-19 11:49:57 UTC (rev 894562)
@@ -1,35 +0,0 @@
-# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
-# Contributor: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
-# Contributor: Jonathan Frawley <jonathanfrawley at gmail.com>
-
-pkgname=xcftools
-pkgver=1.0.7
-pkgrel=6
-pkgdesc='Command line tools for use with the open XCF image format (includes xcf2png)'
-# no https available
-url='http://henning.makholm.net/software'
-arch=(x86_64)
-license=(custom)
-depends=(libpng perl)
-source=("http://henning.makholm.net/xcftools/xcftools-$pkgver.tar.gz"
-        xcftools.patch)
-sha256sums=('1ebf6d8405348600bc551712d9e4f7c33cc83e416804709f68d0700afde920a6'
-            'fc70dbef790bc708b1609c4393a08e565f0617e697c735078e3368048dd33a4d')
-
-prepare() {
-  grep -A16 License "$pkgname-$pkgver/README" > LICENSE
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-  patch -i ../xcftools.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  make DESTDIR="$pkgdir" -C "$pkgname-$pkgver" install
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim: ts=2 sw=2 et:

Copied: xcftools/repos/community-x86_64/PKGBUILD (from rev 894561, xcftools/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-03-19 11:49:57 UTC (rev 894562)
@@ -0,0 +1,37 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
+# Contributor: Jonathan Frawley <jonathanfrawley at gmail.com>
+
+pkgname=xcftools
+pkgver=1.0.7
+pkgrel=7
+pkgdesc='Command line tools for use with the open XCF image format (includes xcf2png)'
+# no https available
+url='http://henning.makholm.net/software'
+arch=(x86_64)
+license=(custom)
+depends=(libpng perl)
+source=("http://henning.makholm.net/xcftools/xcftools-$pkgver.tar.gz"
+        xcftools.patch
+        fs70042.patch::https://github.com/j-jorge/xcftools/commit/59c38e3e45b9112c2bcb4392bccf56e297854f8a.patch)
+sha256sums=('1ebf6d8405348600bc551712d9e4f7c33cc83e416804709f68d0700afde920a6'
+            'fc70dbef790bc708b1609c4393a08e565f0617e697c735078e3368048dd33a4d'
+            'c3c6c3af9f4e47c0fc887543e6fae3e7c572bc4d4f627f40a02cbd8620dca3ae')
+
+prepare() {
+  grep -A16 License "$pkgname-$pkgver/README" > LICENSE
+  cd $pkgname-$pkgver
+  patch -i "$srcdir/xcftools.patch"
+  patch -i "$srcdir/fs70042.patch"
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  make DESTDIR="$pkgdir" -C $pkgname-$pkgver install
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Deleted: xcftools.patch
===================================================================
--- xcftools.patch	2021-03-19 11:49:50 UTC (rev 894561)
+++ xcftools.patch	2021-03-19 11:49:57 UTC (rev 894562)
@@ -1,27 +0,0 @@
-diff -rupN xcftools-1.0.7.old/Makefile.in xcftools-1.0.7/Makefile.in
---- xcftools-1.0.7.old/Makefile.in	2009-07-03 11:31:56.000000000 +0100
-+++ xcftools-1.0.7/Makefile.in	2012-01-03 13:03:51.152358830 +0000
-@@ -79,7 +79,7 @@ xcf2pnm$e: xcf2pnm.$o $(FILEIO).$o enums
- 
- xcf2png$e: xcf2png.$o $(FILEIO).$o enums.$o xcf-general.$o utils.$o nlsini.$o \
- 	   pixels.$o flatten.$o flatspec.$o scaletab.$o table.$o palette.$o
--	$(CC) $(LDFLAGS) $(LIBS) -lpng $^ -o $@
-+	$(CC) $(LDFLAGS) $(LIBS) $^ -lpng -o $@
- 
- xcfview: xcfview.in Makefile
- 	sed '1s,/usr/bin/perl, at PERL@,' < $< > $@
-diff -rupN xcftools-1.0.7.old/xcf2png.c xcftools-1.0.7/xcf2png.c
---- xcftools-1.0.7.old/xcf2png.c	2009-07-03 11:31:52.000000000 +0100
-+++ xcftools-1.0.7/xcf2png.c	2012-01-03 13:03:36.262509165 +0000
-@@ -71,9 +71,9 @@ init_output(void)
-   
-   outfile = openout(flatspec.output_filename);
-   libpng = png_create_write_struct(PNG_LIBPNG_VER_STRING,
--                                   png_voidp_NULL,
-+                                   (png_voidp)NULL,
-                                    my_error_callback,
--                                   png_error_ptr_NULL);
-+                                   (png_voidp)NULL);
-   if( !libpng )
-     FatalUnexpected(_("Couldn't initialize libpng library"));
-   

Copied: xcftools/repos/community-x86_64/xcftools.patch (from rev 894561, xcftools/trunk/xcftools.patch)
===================================================================
--- xcftools.patch	                        (rev 0)
+++ xcftools.patch	2021-03-19 11:49:57 UTC (rev 894562)
@@ -0,0 +1,27 @@
+diff -rupN xcftools-1.0.7.old/Makefile.in xcftools-1.0.7/Makefile.in
+--- xcftools-1.0.7.old/Makefile.in	2009-07-03 11:31:56.000000000 +0100
++++ xcftools-1.0.7/Makefile.in	2012-01-03 13:03:51.152358830 +0000
+@@ -79,7 +79,7 @@ xcf2pnm$e: xcf2pnm.$o $(FILEIO).$o enums
+ 
+ xcf2png$e: xcf2png.$o $(FILEIO).$o enums.$o xcf-general.$o utils.$o nlsini.$o \
+ 	   pixels.$o flatten.$o flatspec.$o scaletab.$o table.$o palette.$o
+-	$(CC) $(LDFLAGS) $(LIBS) -lpng $^ -o $@
++	$(CC) $(LDFLAGS) $(LIBS) $^ -lpng -o $@
+ 
+ xcfview: xcfview.in Makefile
+ 	sed '1s,/usr/bin/perl, at PERL@,' < $< > $@
+diff -rupN xcftools-1.0.7.old/xcf2png.c xcftools-1.0.7/xcf2png.c
+--- xcftools-1.0.7.old/xcf2png.c	2009-07-03 11:31:52.000000000 +0100
++++ xcftools-1.0.7/xcf2png.c	2012-01-03 13:03:36.262509165 +0000
+@@ -71,9 +71,9 @@ init_output(void)
+   
+   outfile = openout(flatspec.output_filename);
+   libpng = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                   png_voidp_NULL,
++                                   (png_voidp)NULL,
+                                    my_error_callback,
+-                                   png_error_ptr_NULL);
++                                   (png_voidp)NULL);
+   if( !libpng )
+     FatalUnexpected(_("Couldn't initialize libpng library"));
+   



More information about the arch-commits mailing list