Date: Monday, March 14, 2016 @ 15:45:53 Author: spupykin Revision: 166732
archrelease: copy trunk to community-i686, community-x86_64 Added: xplanet/repos/community-i686/PKGBUILD (from rev 166731, xplanet/trunk/PKGBUILD) xplanet/repos/community-i686/giflib6.patch (from rev 166731, xplanet/trunk/giflib6.patch) xplanet/repos/community-x86_64/PKGBUILD (from rev 166731, xplanet/trunk/PKGBUILD) xplanet/repos/community-x86_64/giflib6.patch (from rev 166731, xplanet/trunk/giflib6.patch) Deleted: xplanet/repos/community-i686/PKGBUILD xplanet/repos/community-i686/giflib6.patch xplanet/repos/community-x86_64/PKGBUILD xplanet/repos/community-x86_64/giflib6.patch --------------------------------+ /PKGBUILD | 66 ++++++++++++++++++ /giflib6.patch | 60 ++++++++++++++++ community-i686/PKGBUILD | 33 --------- community-i686/giflib6.patch | 141 --------------------------------------- community-x86_64/PKGBUILD | 33 --------- community-x86_64/giflib6.patch | 141 --------------------------------------- 6 files changed, 126 insertions(+), 348 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-03-14 14:45:36 UTC (rev 166731) +++ community-i686/PKGBUILD 2016-03-14 14:45:53 UTC (rev 166732) @@ -1,33 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: dorphell <dorph...@archlinux.org> -# Committer: Judd Vinet <jvi...@zeroflux.org> - -pkgname=xplanet -pkgver=1.3.0 -pkgrel=6 -pkgdesc="An Xearth wannabe" -arch=(i686 x86_64) -url="http://xplanet.sourceforge.net/" -license=('GPL') -depends=('pango' 'giflib' 'libtiff' 'libxss') -source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz - giflib6.patch) -md5sums=('41f7db2ccd1d8b4b989cacaf9adfe692' - '027342e9a912e8eaee3a913d6c710050') - -prepare() { - cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/giflib6.patch -} - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --with-freetype - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr install -} Copied: xplanet/repos/community-i686/PKGBUILD (from rev 166731, xplanet/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-03-14 14:45:53 UTC (rev 166732) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: dorphell <dorph...@archlinux.org> +# Committer: Judd Vinet <jvi...@zeroflux.org> + +pkgname=xplanet +pkgver=1.3.1 +pkgrel=1 +pkgdesc="An Xearth wannabe" +arch=(i686 x86_64) +url="http://xplanet.sourceforge.net/" +license=('GPL') +depends=('pango' 'giflib' 'libtiff' 'libxss') +source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz + giflib6.patch) +md5sums=('9797dbd9697d10205ca1671f728ea30d' + '4ccddbd3edfae97a8d4cf36ea571282f') + +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/giflib6.patch +} + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --with-freetype + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make prefix=$pkgdir/usr install +} Deleted: community-i686/giflib6.patch =================================================================== --- community-i686/giflib6.patch 2016-03-14 14:45:36 UTC (rev 166731) +++ community-i686/giflib6.patch 2016-03-14 14:45:53 UTC (rev 166732) @@ -1,141 +0,0 @@ -diff -wbBur xplanet-1.3.0/src/libimage/gif.c xplanet-1.3.0.my/src/libimage/gif.c ---- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300 -+++ xplanet-1.3.0.my/src/libimage/gif.c 2014-05-29 18:59:14.830652716 +0400 -@@ -20,7 +20,7 @@ - - #include <stdio.h> - #include <stdlib.h> -- -+#define FALSE 0 - #include <gif_lib.h> - - /* -@@ -42,11 +42,11 @@ - int color_index; - unsigned char *ptr = NULL; - -- infile = DGifOpenFileName(filename); -+ infile = DGifOpenFileName(filename, NULL); - - if (infile == NULL) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - -@@ -54,7 +54,7 @@ - { - if (DGifGetRecordType(infile, &record_type) == GIF_ERROR) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - -@@ -63,7 +63,7 @@ - case IMAGE_DESC_RECORD_TYPE: - if (DGifGetImageDesc(infile) == GIF_ERROR) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - -@@ -107,14 +107,14 @@ - GifByteType *ext; - if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - while (ext != NULL) - { - if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - } -@@ -154,7 +154,7 @@ - - free(buffer); - -- DGifCloseFile(infile); -+ DGifCloseFile(infile, NULL); - return(1); - } - -@@ -178,7 +178,7 @@ - return(0); - } - -- colormap = MakeMapObject(colormap_size, NULL); -+ colormap = GifMakeMapObject(colormap_size, NULL); - - for (i = 0; i < width * height; i++) - { -@@ -187,10 +187,10 @@ - blue[i] = (GifByteType) rgb[3*i+2]; - } - -- if (QuantizeBuffer(width, height, &colormap_size, red, green, blue, -+ if (GifQuantizeBuffer(width, height, &colormap_size, red, green, blue, - buffer, colormap->Colors) == GIF_ERROR) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - -@@ -198,24 +198,24 @@ - free(green); - free(blue); - -- outfile = EGifOpenFileName((char *) filename, FALSE); -+ outfile = EGifOpenFileName((char *) filename, FALSE, NULL); - if (outfile == NULL) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - - if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0, colormap) - == GIF_ERROR) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - - if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL) - == GIF_ERROR) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - -@@ -224,7 +224,7 @@ - { - if (EGifPutLine(outfile, ptr, width) == GIF_ERROR) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - ptr += width; -@@ -232,8 +232,8 @@ - - EGifSpew(outfile); - -- if (EGifCloseFile(outfile) == GIF_ERROR) -- PrintGifError(); -+ if (EGifCloseFile(outfile, NULL) == GIF_ERROR) -+ printf("%s\n", GifErrorString(GIF_ERROR)); - - free(buffer); - Copied: xplanet/repos/community-i686/giflib6.patch (from rev 166731, xplanet/trunk/giflib6.patch) =================================================================== --- community-i686/giflib6.patch (rev 0) +++ community-i686/giflib6.patch 2016-03-14 14:45:53 UTC (rev 166732) @@ -0,0 +1,30 @@ +diff -wbBur xplanet-1.3.1/src/libimage/gif.c xplanet-1.3.1.q/src/libimage/gif.c +--- xplanet-1.3.1/src/libimage/gif.c 2013-02-16 23:37:47.000000000 +0400 ++++ xplanet-1.3.1.q/src/libimage/gif.c 2016-03-14 17:41:14.244144734 +0300 +@@ -179,7 +179,7 @@ + } + } + +- if (DGifCloseFile(GifFile) == GIF_ERROR) { ++ if (DGifCloseFile(GifFile, NULL) == GIF_ERROR) { + return(0); + } + +@@ -493,7 +493,7 @@ + static void QuitGifError(GifFileType *GifFile) + { + fprintf(stderr, "Error writing GIF file\n"); +- if (GifFile != NULL) EGifCloseFile(GifFile); ++ if (GifFile != NULL) EGifCloseFile(GifFile, NULL); + } + + int +@@ -589,7 +589,7 @@ + Ptr += width; + } + +- if (EGifCloseFile(GifFile) == GIF_ERROR) ++ if (EGifCloseFile(GifFile, NULL) == GIF_ERROR) + + { + QuitGifError(GifFile); Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-03-14 14:45:36 UTC (rev 166731) +++ community-x86_64/PKGBUILD 2016-03-14 14:45:53 UTC (rev 166732) @@ -1,33 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: dorphell <dorph...@archlinux.org> -# Committer: Judd Vinet <jvi...@zeroflux.org> - -pkgname=xplanet -pkgver=1.3.0 -pkgrel=6 -pkgdesc="An Xearth wannabe" -arch=(i686 x86_64) -url="http://xplanet.sourceforge.net/" -license=('GPL') -depends=('pango' 'giflib' 'libtiff' 'libxss') -source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz - giflib6.patch) -md5sums=('41f7db2ccd1d8b4b989cacaf9adfe692' - '027342e9a912e8eaee3a913d6c710050') - -prepare() { - cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/giflib6.patch -} - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --with-freetype - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr install -} Copied: xplanet/repos/community-x86_64/PKGBUILD (from rev 166731, xplanet/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-03-14 14:45:53 UTC (rev 166732) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: dorphell <dorph...@archlinux.org> +# Committer: Judd Vinet <jvi...@zeroflux.org> + +pkgname=xplanet +pkgver=1.3.1 +pkgrel=1 +pkgdesc="An Xearth wannabe" +arch=(i686 x86_64) +url="http://xplanet.sourceforge.net/" +license=('GPL') +depends=('pango' 'giflib' 'libtiff' 'libxss') +source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz + giflib6.patch) +md5sums=('9797dbd9697d10205ca1671f728ea30d' + '4ccddbd3edfae97a8d4cf36ea571282f') + +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/giflib6.patch +} + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --with-freetype + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make prefix=$pkgdir/usr install +} Deleted: community-x86_64/giflib6.patch =================================================================== --- community-x86_64/giflib6.patch 2016-03-14 14:45:36 UTC (rev 166731) +++ community-x86_64/giflib6.patch 2016-03-14 14:45:53 UTC (rev 166732) @@ -1,141 +0,0 @@ -diff -wbBur xplanet-1.3.0/src/libimage/gif.c xplanet-1.3.0.my/src/libimage/gif.c ---- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300 -+++ xplanet-1.3.0.my/src/libimage/gif.c 2014-05-29 18:59:14.830652716 +0400 -@@ -20,7 +20,7 @@ - - #include <stdio.h> - #include <stdlib.h> -- -+#define FALSE 0 - #include <gif_lib.h> - - /* -@@ -42,11 +42,11 @@ - int color_index; - unsigned char *ptr = NULL; - -- infile = DGifOpenFileName(filename); -+ infile = DGifOpenFileName(filename, NULL); - - if (infile == NULL) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - -@@ -54,7 +54,7 @@ - { - if (DGifGetRecordType(infile, &record_type) == GIF_ERROR) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - -@@ -63,7 +63,7 @@ - case IMAGE_DESC_RECORD_TYPE: - if (DGifGetImageDesc(infile) == GIF_ERROR) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - -@@ -107,14 +107,14 @@ - GifByteType *ext; - if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - while (ext != NULL) - { - if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - } -@@ -154,7 +154,7 @@ - - free(buffer); - -- DGifCloseFile(infile); -+ DGifCloseFile(infile, NULL); - return(1); - } - -@@ -178,7 +178,7 @@ - return(0); - } - -- colormap = MakeMapObject(colormap_size, NULL); -+ colormap = GifMakeMapObject(colormap_size, NULL); - - for (i = 0; i < width * height; i++) - { -@@ -187,10 +187,10 @@ - blue[i] = (GifByteType) rgb[3*i+2]; - } - -- if (QuantizeBuffer(width, height, &colormap_size, red, green, blue, -+ if (GifQuantizeBuffer(width, height, &colormap_size, red, green, blue, - buffer, colormap->Colors) == GIF_ERROR) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - -@@ -198,24 +198,24 @@ - free(green); - free(blue); - -- outfile = EGifOpenFileName((char *) filename, FALSE); -+ outfile = EGifOpenFileName((char *) filename, FALSE, NULL); - if (outfile == NULL) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - - if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0, colormap) - == GIF_ERROR) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - - if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL) - == GIF_ERROR) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - -@@ -224,7 +224,7 @@ - { - if (EGifPutLine(outfile, ptr, width) == GIF_ERROR) - { -- PrintGifError(); -+ printf("%s\n", GifErrorString(GIF_ERROR)); - return(0); - } - ptr += width; -@@ -232,8 +232,8 @@ - - EGifSpew(outfile); - -- if (EGifCloseFile(outfile) == GIF_ERROR) -- PrintGifError(); -+ if (EGifCloseFile(outfile, NULL) == GIF_ERROR) -+ printf("%s\n", GifErrorString(GIF_ERROR)); - - free(buffer); - Copied: xplanet/repos/community-x86_64/giflib6.patch (from rev 166731, xplanet/trunk/giflib6.patch) =================================================================== --- community-x86_64/giflib6.patch (rev 0) +++ community-x86_64/giflib6.patch 2016-03-14 14:45:53 UTC (rev 166732) @@ -0,0 +1,30 @@ +diff -wbBur xplanet-1.3.1/src/libimage/gif.c xplanet-1.3.1.q/src/libimage/gif.c +--- xplanet-1.3.1/src/libimage/gif.c 2013-02-16 23:37:47.000000000 +0400 ++++ xplanet-1.3.1.q/src/libimage/gif.c 2016-03-14 17:41:14.244144734 +0300 +@@ -179,7 +179,7 @@ + } + } + +- if (DGifCloseFile(GifFile) == GIF_ERROR) { ++ if (DGifCloseFile(GifFile, NULL) == GIF_ERROR) { + return(0); + } + +@@ -493,7 +493,7 @@ + static void QuitGifError(GifFileType *GifFile) + { + fprintf(stderr, "Error writing GIF file\n"); +- if (GifFile != NULL) EGifCloseFile(GifFile); ++ if (GifFile != NULL) EGifCloseFile(GifFile, NULL); + } + + int +@@ -589,7 +589,7 @@ + Ptr += width; + } + +- if (EGifCloseFile(GifFile) == GIF_ERROR) ++ if (EGifCloseFile(GifFile, NULL) == GIF_ERROR) + + { + QuitGifError(GifFile);