[arch-commits] Commit in mtpaint/repos (8 files)
Alexander Rødseth
arodseth at archlinux.org
Tue Aug 15 23:55:17 UTC 2017
Date: Tuesday, August 15, 2017 @ 23:55:16
Author: arodseth
Revision: 251230
archrelease: copy trunk to community-x86_64, community-i686
Added:
mtpaint/repos/community-i686/PKGBUILD
(from rev 251229, mtpaint/trunk/PKGBUILD)
mtpaint/repos/community-i686/giflib.patch
(from rev 251229, mtpaint/trunk/giflib.patch)
mtpaint/repos/community-x86_64/PKGBUILD
(from rev 251229, mtpaint/trunk/PKGBUILD)
mtpaint/repos/community-x86_64/giflib.patch
(from rev 251229, mtpaint/trunk/giflib.patch)
Deleted:
mtpaint/repos/community-i686/PKGBUILD
mtpaint/repos/community-i686/giflib.patch
mtpaint/repos/community-x86_64/PKGBUILD
mtpaint/repos/community-x86_64/giflib.patch
-------------------------------+
/PKGBUILD | 96 ++++++++++++++++++++++++++++++++++++++++
/giflib.patch | 58 ++++++++++++++++++++++++
community-i686/PKGBUILD | 52 ---------------------
community-i686/giflib.patch | 29 ------------
community-x86_64/PKGBUILD | 52 ---------------------
community-x86_64/giflib.patch | 29 ------------
6 files changed, 154 insertions(+), 162 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-08-15 23:54:56 UTC (rev 251229)
+++ community-i686/PKGBUILD 2017-08-15 23:55:16 UTC (rev 251230)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
-# Contributor: Roman Kyrylych <roman at archlinux.org>
-# Contributor: yosh64 <yosh64.at.gmail.dot.com>
-
-pkgname=mtpaint
-pkgver=3.40
-pkgrel=16
-pkgdesc='Simple paint program for creating icons and pixel based artwork'
-arch=('x86_64' 'i686')
-url='http://mtpaint.sourceforge.net/'
-license=('GPL3')
-depends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2'
- 'libtiff' 'libpng' 'freetype2')
-makedepends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2' 'libtiff' 'libpng'
- 'freetype2')
-optdepends=('gifsicle: for exporting GIF files from mtPaint')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
- 'giflib.patch')
-sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890'
- '38b3a50d7275e9dc3fe8c78e774b51fa55fc7bf11a490c13b4974455c7db830c')
-
-prepare() {
- cd "$pkgname-$pkgver"
-
- # GIFLIB patch for the file close function
- patch -p0 -i "$srcdir/giflib.patch"
-
- # Recommended by Mark Tyler himself
- sed -i 's:$LIBS $LDFLAGS:$LDFLAGS $LIBS:' configure
-
- # Needed for giflib 5. Not needed for mtpaint>3.40.
- sed -i 's:EGifOpenFileName(file_name, FALSE):EGifOpenFileName(file_name, FALSE, NULL):' src/png.c
- sed -i 's:DGifOpenFileName(file_name):DGifOpenFileName(file_name, NULL):g' src/png.c
- sed -i 's:MakeMapObject(:GifMakeMapObject(:g' src/png.c
- sed -i 's:FreeMapObject(:GifFreeMapObject(:g' src/png.c
-}
-
-build() {
- cd "$pkgname-$pkgver"
-
- export CFLAGS="-w `pkg-config libopenjpeg --cflags` $CFLAGS"
- ./configure --prefix=/usr --mandir=/usr/share/man man intl GIF jpeg tiff cflags lcms2 jp2
- make
-}
-
-package() {
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
-
Copied: mtpaint/repos/community-i686/PKGBUILD (from rev 251229, mtpaint/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-08-15 23:55:16 UTC (rev 251230)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
+# Contributor: Roman Kyrylych <roman at archlinux.org>
+# Contributor: yosh64 <yosh64.at.gmail.dot.com>
+
+pkgname=mtpaint
+pkgver=3.40
+pkgrel=16
+pkgdesc='Simple paint program for creating icons and pixel based artwork'
+arch=('x86_64' 'i686')
+url='http://mtpaint.sourceforge.net/'
+license=('GPL3')
+depends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2' 'libtiff' 'libpng')
+optdepends=('gifsicle: for exporting GIF files from mtPaint')
+source=("https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
+ giflib.patch)
+sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890'
+ '38b3a50d7275e9dc3fe8c78e774b51fa55fc7bf11a490c13b4974455c7db830c')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ # GIFLIB patch for the file close function
+ patch -p0 -i "$srcdir/giflib.patch"
+
+ # Recommended by Mark Tyler himself
+ sed -i 's:$LIBS $LDFLAGS:$LDFLAGS $LIBS:' configure
+
+ # Needed for giflib 5. Not needed for mtpaint>3.40.
+ sed -i 's:EGifOpenFileName(file_name, FALSE):EGifOpenFileName(file_name, FALSE, NULL):' src/png.c
+ sed -i 's:DGifOpenFileName(file_name):DGifOpenFileName(file_name, NULL):g' src/png.c
+ sed -i 's:MakeMapObject(:GifMakeMapObject(:g' src/png.c
+ sed -i 's:FreeMapObject(:GifFreeMapObject(:g' src/png.c
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ export CFLAGS="-w `pkg-config libopenjpeg --cflags` $CFLAGS"
+ ./configure --prefix=/usr --mandir=/usr/share/man man intl GIF jpeg tiff cflags lcms2 jp2
+ make
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}
+
+# vim:ts=2 sw=2 et:
Deleted: community-i686/giflib.patch
===================================================================
--- community-i686/giflib.patch 2017-08-15 23:54:56 UTC (rev 251229)
+++ community-i686/giflib.patch 2017-08-15 23:55:16 UTC (rev 251230)
@@ -1,29 +0,0 @@
---- src/png.c 2014-05-28 12:02:50.000000000 +0200
-+++ src2/png.c 2014-05-28 12:02:43.569815883 +0200
-@@ -1608,7 +1608,7 @@
- }
- res = 1;
- fail: mem_free_chanlist(w_set.img);
-- DGifCloseFile(giffy);
-+ DGifCloseFile(giffy, NULL);
- return (res);
- }
-
-@@ -1659,7 +1659,7 @@
- }
- }
- res = 1;
--fail: DGifCloseFile(giffy);
-+fail: DGifCloseFile(giffy, NULL);
- return (res);
- }
-
-@@ -1725,7 +1725,7 @@
- if (!settings->silent) progress_end();
- msg = 0;
-
--fail: EGifCloseFile(giffy);
-+fail: EGifCloseFile(giffy, NULL);
- #ifndef WIN32
- /* giflib creates files with 0600 permissions, which is nasty - WJ */
- mode = umask(0022);
Copied: mtpaint/repos/community-i686/giflib.patch (from rev 251229, mtpaint/trunk/giflib.patch)
===================================================================
--- community-i686/giflib.patch (rev 0)
+++ community-i686/giflib.patch 2017-08-15 23:55:16 UTC (rev 251230)
@@ -0,0 +1,29 @@
+--- src/png.c 2014-05-28 12:02:50.000000000 +0200
++++ src2/png.c 2014-05-28 12:02:43.569815883 +0200
+@@ -1608,7 +1608,7 @@
+ }
+ res = 1;
+ fail: mem_free_chanlist(w_set.img);
+- DGifCloseFile(giffy);
++ DGifCloseFile(giffy, NULL);
+ return (res);
+ }
+
+@@ -1659,7 +1659,7 @@
+ }
+ }
+ res = 1;
+-fail: DGifCloseFile(giffy);
++fail: DGifCloseFile(giffy, NULL);
+ return (res);
+ }
+
+@@ -1725,7 +1725,7 @@
+ if (!settings->silent) progress_end();
+ msg = 0;
+
+-fail: EGifCloseFile(giffy);
++fail: EGifCloseFile(giffy, NULL);
+ #ifndef WIN32
+ /* giflib creates files with 0600 permissions, which is nasty - WJ */
+ mode = umask(0022);
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-08-15 23:54:56 UTC (rev 251229)
+++ community-x86_64/PKGBUILD 2017-08-15 23:55:16 UTC (rev 251230)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
-# Contributor: Roman Kyrylych <roman at archlinux.org>
-# Contributor: yosh64 <yosh64.at.gmail.dot.com>
-
-pkgname=mtpaint
-pkgver=3.40
-pkgrel=16
-pkgdesc='Simple paint program for creating icons and pixel based artwork'
-arch=('x86_64' 'i686')
-url='http://mtpaint.sourceforge.net/'
-license=('GPL3')
-depends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2'
- 'libtiff' 'libpng' 'freetype2')
-makedepends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2' 'libtiff' 'libpng'
- 'freetype2')
-optdepends=('gifsicle: for exporting GIF files from mtPaint')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
- 'giflib.patch')
-sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890'
- '38b3a50d7275e9dc3fe8c78e774b51fa55fc7bf11a490c13b4974455c7db830c')
-
-prepare() {
- cd "$pkgname-$pkgver"
-
- # GIFLIB patch for the file close function
- patch -p0 -i "$srcdir/giflib.patch"
-
- # Recommended by Mark Tyler himself
- sed -i 's:$LIBS $LDFLAGS:$LDFLAGS $LIBS:' configure
-
- # Needed for giflib 5. Not needed for mtpaint>3.40.
- sed -i 's:EGifOpenFileName(file_name, FALSE):EGifOpenFileName(file_name, FALSE, NULL):' src/png.c
- sed -i 's:DGifOpenFileName(file_name):DGifOpenFileName(file_name, NULL):g' src/png.c
- sed -i 's:MakeMapObject(:GifMakeMapObject(:g' src/png.c
- sed -i 's:FreeMapObject(:GifFreeMapObject(:g' src/png.c
-}
-
-build() {
- cd "$pkgname-$pkgver"
-
- export CFLAGS="-w `pkg-config libopenjpeg --cflags` $CFLAGS"
- ./configure --prefix=/usr --mandir=/usr/share/man man intl GIF jpeg tiff cflags lcms2 jp2
- make
-}
-
-package() {
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
-
Copied: mtpaint/repos/community-x86_64/PKGBUILD (from rev 251229, mtpaint/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-08-15 23:55:16 UTC (rev 251230)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
+# Contributor: Roman Kyrylych <roman at archlinux.org>
+# Contributor: yosh64 <yosh64.at.gmail.dot.com>
+
+pkgname=mtpaint
+pkgver=3.40
+pkgrel=16
+pkgdesc='Simple paint program for creating icons and pixel based artwork'
+arch=('x86_64' 'i686')
+url='http://mtpaint.sourceforge.net/'
+license=('GPL3')
+depends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2' 'libtiff' 'libpng')
+optdepends=('gifsicle: for exporting GIF files from mtPaint')
+source=("https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
+ giflib.patch)
+sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890'
+ '38b3a50d7275e9dc3fe8c78e774b51fa55fc7bf11a490c13b4974455c7db830c')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ # GIFLIB patch for the file close function
+ patch -p0 -i "$srcdir/giflib.patch"
+
+ # Recommended by Mark Tyler himself
+ sed -i 's:$LIBS $LDFLAGS:$LDFLAGS $LIBS:' configure
+
+ # Needed for giflib 5. Not needed for mtpaint>3.40.
+ sed -i 's:EGifOpenFileName(file_name, FALSE):EGifOpenFileName(file_name, FALSE, NULL):' src/png.c
+ sed -i 's:DGifOpenFileName(file_name):DGifOpenFileName(file_name, NULL):g' src/png.c
+ sed -i 's:MakeMapObject(:GifMakeMapObject(:g' src/png.c
+ sed -i 's:FreeMapObject(:GifFreeMapObject(:g' src/png.c
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ export CFLAGS="-w `pkg-config libopenjpeg --cflags` $CFLAGS"
+ ./configure --prefix=/usr --mandir=/usr/share/man man intl GIF jpeg tiff cflags lcms2 jp2
+ make
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}
+
+# vim:ts=2 sw=2 et:
Deleted: community-x86_64/giflib.patch
===================================================================
--- community-x86_64/giflib.patch 2017-08-15 23:54:56 UTC (rev 251229)
+++ community-x86_64/giflib.patch 2017-08-15 23:55:16 UTC (rev 251230)
@@ -1,29 +0,0 @@
---- src/png.c 2014-05-28 12:02:50.000000000 +0200
-+++ src2/png.c 2014-05-28 12:02:43.569815883 +0200
-@@ -1608,7 +1608,7 @@
- }
- res = 1;
- fail: mem_free_chanlist(w_set.img);
-- DGifCloseFile(giffy);
-+ DGifCloseFile(giffy, NULL);
- return (res);
- }
-
-@@ -1659,7 +1659,7 @@
- }
- }
- res = 1;
--fail: DGifCloseFile(giffy);
-+fail: DGifCloseFile(giffy, NULL);
- return (res);
- }
-
-@@ -1725,7 +1725,7 @@
- if (!settings->silent) progress_end();
- msg = 0;
-
--fail: EGifCloseFile(giffy);
-+fail: EGifCloseFile(giffy, NULL);
- #ifndef WIN32
- /* giflib creates files with 0600 permissions, which is nasty - WJ */
- mode = umask(0022);
Copied: mtpaint/repos/community-x86_64/giflib.patch (from rev 251229, mtpaint/trunk/giflib.patch)
===================================================================
--- community-x86_64/giflib.patch (rev 0)
+++ community-x86_64/giflib.patch 2017-08-15 23:55:16 UTC (rev 251230)
@@ -0,0 +1,29 @@
+--- src/png.c 2014-05-28 12:02:50.000000000 +0200
++++ src2/png.c 2014-05-28 12:02:43.569815883 +0200
+@@ -1608,7 +1608,7 @@
+ }
+ res = 1;
+ fail: mem_free_chanlist(w_set.img);
+- DGifCloseFile(giffy);
++ DGifCloseFile(giffy, NULL);
+ return (res);
+ }
+
+@@ -1659,7 +1659,7 @@
+ }
+ }
+ res = 1;
+-fail: DGifCloseFile(giffy);
++fail: DGifCloseFile(giffy, NULL);
+ return (res);
+ }
+
+@@ -1725,7 +1725,7 @@
+ if (!settings->silent) progress_end();
+ msg = 0;
+
+-fail: EGifCloseFile(giffy);
++fail: EGifCloseFile(giffy, NULL);
+ #ifndef WIN32
+ /* giflib creates files with 0600 permissions, which is nasty - WJ */
+ mode = umask(0022);
More information about the arch-commits
mailing list