Date: Tuesday, September 3, 2013 @ 21:37:05
Author: arodseth
Revision: 96737
archrelease: copy trunk to community-x86_64, community-i686
Added:
mtpaint/repos/community-i686/PKGBUILD
(from rev 96736, mtpaint/trunk/PKGBUILD)
mtpaint/repos/community-i686/mtpaint.install
(from rev 96736, mtpaint/trunk/mtpaint.install)
mtpaint/repos/community-x86_64/PKGBUILD
(from rev 96736, mtpaint/trunk/PKGBUILD)
mtpaint/repos/community-x86_64/mtpaint.install
(from rev 96736, mtpaint/trunk/mtpaint.install)
Deleted:
mtpaint/repos/community-i686/PKGBUILD
mtpaint/repos/community-i686/libpng15.patch
mtpaint/repos/community-i686/mtpaint.install
mtpaint/repos/community-x86_64/PKGBUILD
mtpaint/repos/community-x86_64/libpng15.patch
mtpaint/repos/community-x86_64/mtpaint.install
----------------------------------+
/PKGBUILD | 86 +++++++++++++++++++++++++++++++++++++
/mtpaint.install | 26 +++++++++++
community-i686/PKGBUILD | 50 ---------------------
community-i686/libpng15.patch | 21 ---------
community-i686/mtpaint.install | 13 -----
community-x86_64/PKGBUILD | 50 ---------------------
community-x86_64/libpng15.patch | 21 ---------
community-x86_64/mtpaint.install | 13 -----
8 files changed, 112 insertions(+), 168 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-09-03 19:36:54 UTC (rev 96736)
+++ community-i686/PKGBUILD 2013-09-03 19:37:05 UTC (rev 96737)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Alexander Rødseth <rods...@gmail.com>
-# Contributor: Roman Kyrylych <ro...@archlinux.org>
-# Contributor: yosh64 <yosh64.at.gmail.dot.com>
-
-pkgname=mtpaint
-pkgver=3.40
-pkgrel=10
-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' 'openjpeg' 'desktop-file-utils' 'lcms2' 'jasper')
-makedepends=('gtk2' 'giflib' 'openjpeg' 'lcms2' 'setconf' 'jasper')
-install='mtpaint.install'
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2";
- 'libpng15.patch')
-sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890'
- 'be51d45d1146d6c61d1c2c12d1712134da5048dd7314e2741ff336cac6838de3')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- patch -Np1 -i '../libpng15.patch'
- sed -i 's:openjpeg.h:openjpeg-1.5/openjpeg.h:' src/png.c
- 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 "$srcdir/$pkgname-$pkgver"
-
- export CFLAGS="`pkg-config gtk+-2.0 --cflags` $CFLAGS"
- ./configure --prefix=/usr --mandir=/usr/share/man man intl gif jpeg tiff
- sed -i 's:-lpng:-lpng -lgif:' _conf.txt
- sed -i 's:ungif:gif:g' _conf.txt
- setconf _conf.txt CC 'gcc -w'
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
-
Copied: mtpaint/repos/community-i686/PKGBUILD (from rev 96736,
mtpaint/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-09-03 19:37:05 UTC (rev 96737)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Alexander Rødseth <rods...@gmail.com>
+# Contributor: Roman Kyrylych <ro...@archlinux.org>
+# Contributor: yosh64 <yosh64.at.gmail.dot.com>
+
+pkgname=mtpaint
+pkgver=3.40
+pkgrel=11
+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' 'desktop-file-utils' 'lcms2'
'jasper')
+makedepends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2' 'jasper')
+install='mtpaint.install'
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2";)
+sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ 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() {
+ cd "$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
+
Deleted: community-i686/libpng15.patch
===================================================================
--- community-i686/libpng15.patch 2013-09-03 19:36:54 UTC (rev 96736)
+++ community-i686/libpng15.patch 2013-09-03 19:37:05 UTC (rev 96737)
@@ -1,21 +0,0 @@
-diff -upr mtpaint-3.31.orig/src/png.c mtpaint-3.31/src/png.c
---- mtpaint-3.31.orig/src/png.c 2010-01-25 00:43:07.000000000 +0200
-+++ mtpaint-3.31/src/png.c 2010-01-25 00:43:39.000000000 +0200
-@@ -539,7 +539,7 @@ static int load_png(char *file_name, ls_
- if (settings->bpp == 3)
- {
- png_set_strip_16(png_ptr);
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
- png_set_palette_to_rgb(png_ptr);
- png_set_gray_to_rgb(png_ptr);
-
-@@ -644,7 +644,7 @@ static int load_png(char *file_name, ls_
- png_set_strip_alpha(png_ptr);
- png_set_packing(png_ptr);
- if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8))
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
- for (i = 0; i < height; i++)
- {
- row_pointers[i] = settings->img[CHN_IMAGE] + i * width;
Deleted: community-i686/mtpaint.install
===================================================================
--- community-i686/mtpaint.install 2013-09-03 19:36:54 UTC (rev 96736)
+++ community-i686/mtpaint.install 2013-09-03 19:37:05 UTC (rev 96737)
@@ -1,13 +0,0 @@
-post_upgrade() {
- update-desktop-database -q
-}
-
-post_install() {
- post_upgrade
-}
-
-post_remove() {
- post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
Copied: mtpaint/repos/community-i686/mtpaint.install (from rev 96736,
mtpaint/trunk/mtpaint.install)
===================================================================
--- community-i686/mtpaint.install (rev 0)
+++ community-i686/mtpaint.install 2013-09-03 19:37:05 UTC (rev 96737)
@@ -0,0 +1,13 @@
+post_upgrade() {
+ update-desktop-database -q
+}
+
+post_install() {
+ post_upgrade
+}
+
+post_remove() {
+ post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-09-03 19:36:54 UTC (rev 96736)
+++ community-x86_64/PKGBUILD 2013-09-03 19:37:05 UTC (rev 96737)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Alexander Rødseth <rods...@gmail.com>
-# Contributor: Roman Kyrylych <ro...@archlinux.org>
-# Contributor: yosh64 <yosh64.at.gmail.dot.com>
-
-pkgname=mtpaint
-pkgver=3.40
-pkgrel=10
-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' 'openjpeg' 'desktop-file-utils' 'lcms2' 'jasper')
-makedepends=('gtk2' 'giflib' 'openjpeg' 'lcms2' 'setconf' 'jasper')
-install='mtpaint.install'
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2";
- 'libpng15.patch')
-sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890'
- 'be51d45d1146d6c61d1c2c12d1712134da5048dd7314e2741ff336cac6838de3')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- patch -Np1 -i '../libpng15.patch'
- sed -i 's:openjpeg.h:openjpeg-1.5/openjpeg.h:' src/png.c
- 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 "$srcdir/$pkgname-$pkgver"
-
- export CFLAGS="`pkg-config gtk+-2.0 --cflags` $CFLAGS"
- ./configure --prefix=/usr --mandir=/usr/share/man man intl gif jpeg tiff
- sed -i 's:-lpng:-lpng -lgif:' _conf.txt
- sed -i 's:ungif:gif:g' _conf.txt
- setconf _conf.txt CC 'gcc -w'
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
-
Copied: mtpaint/repos/community-x86_64/PKGBUILD (from rev 96736,
mtpaint/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-09-03 19:37:05 UTC (rev 96737)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Alexander Rødseth <rods...@gmail.com>
+# Contributor: Roman Kyrylych <ro...@archlinux.org>
+# Contributor: yosh64 <yosh64.at.gmail.dot.com>
+
+pkgname=mtpaint
+pkgver=3.40
+pkgrel=11
+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' 'desktop-file-utils' 'lcms2'
'jasper')
+makedepends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2' 'jasper')
+install='mtpaint.install'
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2";)
+sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ 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() {
+ cd "$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
+
Deleted: community-x86_64/libpng15.patch
===================================================================
--- community-x86_64/libpng15.patch 2013-09-03 19:36:54 UTC (rev 96736)
+++ community-x86_64/libpng15.patch 2013-09-03 19:37:05 UTC (rev 96737)
@@ -1,21 +0,0 @@
-diff -upr mtpaint-3.31.orig/src/png.c mtpaint-3.31/src/png.c
---- mtpaint-3.31.orig/src/png.c 2010-01-25 00:43:07.000000000 +0200
-+++ mtpaint-3.31/src/png.c 2010-01-25 00:43:39.000000000 +0200
-@@ -539,7 +539,7 @@ static int load_png(char *file_name, ls_
- if (settings->bpp == 3)
- {
- png_set_strip_16(png_ptr);
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
- png_set_palette_to_rgb(png_ptr);
- png_set_gray_to_rgb(png_ptr);
-
-@@ -644,7 +644,7 @@ static int load_png(char *file_name, ls_
- png_set_strip_alpha(png_ptr);
- png_set_packing(png_ptr);
- if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8))
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
- for (i = 0; i < height; i++)
- {
- row_pointers[i] = settings->img[CHN_IMAGE] + i * width;
Deleted: community-x86_64/mtpaint.install
===================================================================
--- community-x86_64/mtpaint.install 2013-09-03 19:36:54 UTC (rev 96736)
+++ community-x86_64/mtpaint.install 2013-09-03 19:37:05 UTC (rev 96737)
@@ -1,13 +0,0 @@
-post_upgrade() {
- update-desktop-database -q
-}
-
-post_install() {
- post_upgrade
-}
-
-post_remove() {
- post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
Copied: mtpaint/repos/community-x86_64/mtpaint.install (from rev 96736,
mtpaint/trunk/mtpaint.install)
===================================================================
--- community-x86_64/mtpaint.install (rev 0)
+++ community-x86_64/mtpaint.install 2013-09-03 19:37:05 UTC (rev 96737)
@@ -0,0 +1,13 @@
+post_upgrade() {
+ update-desktop-database -q
+}
+
+post_install() {
+ post_upgrade
+}
+
+post_remove() {
+ post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
