[arch-commits] Commit in libafterimage/repos/community-x86_64 (6 files)

Konstantin Gizdov kgizdov at archlinux.org
Mon May 25 14:54:32 UTC 2020


    Date: Monday, May 25, 2020 @ 14:54:24
  Author: kgizdov
Revision: 634433

archrelease: copy trunk to community-x86_64

Added:
  libafterimage/repos/community-x86_64/PKGBUILD
    (from rev 634432, libafterimage/trunk/PKGBUILD)
  libafterimage/repos/community-x86_64/header-install.patch
    (from rev 634432, libafterimage/trunk/header-install.patch)
  libafterimage/repos/community-x86_64/libafterimage-ldflags.patch
    (from rev 634432, libafterimage/trunk/libafterimage-ldflags.patch)
  libafterimage/repos/community-x86_64/libafterimage-libpng15.patch
    (from rev 634432, libafterimage/trunk/libafterimage-libpng15.patch)
Deleted:
  libafterimage/repos/community-x86_64/PKGBUILD
  libafterimage/repos/community-x86_64/libafterimage-libpng15.patch

------------------------------+
 PKGBUILD                     |   92 ++++++++++++++++++++++++-----------------
 header-install.patch         |   28 ++++++++++++
 libafterimage-ldflags.patch  |   12 +++++
 libafterimage-libpng15.patch |   62 +++++++++++++--------------
 4 files changed, 127 insertions(+), 67 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-25 14:54:05 UTC (rev 634432)
+++ PKGBUILD	2020-05-25 14:54:24 UTC (rev 634433)
@@ -1,36 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Mike Sampson <mike at sambodata dot com>
-# Contributor: Bernhard Walle <bernhard.walle at gmx.de>
-
-pkgname=libafterimage
-pkgver=1.20
-pkgrel=3
-pkgdesc="Generic image manipulation library"
-url="http://www.afterstep.org/afterimage"
-license=('GPL')
-depends=('librsvg')
-arch=('i686' 'x86_64')
-source=("https://downloads.sourceforge.net/project/afterstep/libAfterImage/$pkgver/libAfterImage-$pkgver.tar.bz2"
-        libafterimage-libpng15.patch)
-md5sums=('17a0ab8a2e6b253f222934418705963e'
-         'bdb49e626cb91b2c218193f3d36c9f91')
-
-build() {
-  cd libAfterImage-$pkgver
-  # Apply Gentoo's libpng15 patch
-  patch < ../libafterimage-libpng15.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-              --enable-sharedlibs --disable-staticlibs
-
-  # don't run ldconfig
-  sed -i -e 's/`uname`/"hack"/g' Makefile
-
-  make
-}
-
-package() {
-  cd libAfterImage-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# :mode=shellscript:

Copied: libafterimage/repos/community-x86_64/PKGBUILD (from rev 634432, libafterimage/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-25 14:54:24 UTC (rev 634433)
@@ -0,0 +1,56 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Mike Sampson <mike at sambodata dot com>
+# Contributor: Bernhard Walle <bernhard.walle at gmx.de>
+
+pkgname=libafterimage
+pkgver=1.20
+pkgrel=4
+pkgdesc="Generic image manipulation library"
+url="http://www.afterstep.org/afterimage"
+license=('GPL')
+depends=('librsvg')
+arch=('x86_64')
+source=("https://downloads.sourceforge.net/project/afterstep/libAfterImage/$pkgver/libAfterImage-$pkgver.tar.bz2"
+        libafterimage-libpng15.patch
+        libafterimage-ldflags.patch
+        header-install.patch)
+sha256sums=('6e233253f4d1dd22dfce9f9a245cc036d814fc99ba7f6732f4e345de62cfe458'
+            'bbf95bcddc4c48dcde88745dc9cb772ca53b625e8e466b9d565e4183ce71dbe3'
+            'b7e1b16af975b4f3b66fd91ca1244d4fc44db398027f2829ad24882b79b882b8'
+            '6e1c5fd8acbbbc1c83f0ca490f08b7602d37a2295cb4741eef6f3b88fb638203')
+
+prepare() {
+  cd libAfterImage-$pkgver
+
+  # Fix header installation (FS#60246)
+  patch -p1 -i ../header-install.patch
+
+  # Apply Gentoo's libpng15 patch
+  patch < ../libafterimage-libpng15.patch
+
+  # Make sure LDFLAGS are passed to lib
+  patch < ../libafterimage-ldflags.patch
+}
+
+build() {
+  cd libAfterImage-$pkgver
+
+  CPPFLAGS="${CPPFLAGS}" \
+  CFLAGS="${CFLAGS}" \
+  CXXFLAGS="${CXXFLAGS}" \
+  LDFLAGS="${LDFLAGS}" \
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+              --enable-sharedlibs --disable-staticlibs
+
+  # don't run ldconfig
+  sed -i -e 's/`uname`/"hack"/g' Makefile
+
+  make
+}
+
+package() {
+  cd libAfterImage-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# :mode=shellscript:

Copied: libafterimage/repos/community-x86_64/header-install.patch (from rev 634432, libafterimage/trunk/header-install.patch)
===================================================================
--- header-install.patch	                        (rev 0)
+++ header-install.patch	2020-05-25 14:54:24 UTC (rev 634433)
@@ -0,0 +1,28 @@
+diff --git a/Makefile.in.orig b/Makefile.in
+index 1faabd7..98203d6 100644
+--- a/Makefile.in.orig
++++ b/Makefile.in
+@@ -202,17 +202,17 @@ install.inc:
+ 		    $(RM) $(AFTER_INC_DIR)/*; \
+ 		 else \
+ 		    if [ -d $(INCLUDEDIR) ]; then \
+-		       echo "$(MKDIR) $(AFTER_INC_DIR)"; \
+-		       if $(MKDIR) $(AFTER_INC_DIR); then \
++		       echo "$(MKDIR) -p $(AFTER_INC_DIR)"; \
++		       if $(MKDIR) -p $(AFTER_INC_DIR); then \
+ 		          echo " ">/dev/null; \
+ 		       else \
+ 		    	  echo "failed to create include directory: $(AFTER_INC_DIR)"; \
+ 		       fi; \
+ 		    else \
+-		       echo "$(MKDIR) $(INCLUDEDIR)"; \
+-		       if $(MKDIR) $(INCLUDEDIR); then \
+-		          echo "$(MKDIR) $(AFTER_INC_DIR)"; \
+-		          if $(MKDIR) $(AFTER_INC_DIR) >/dev/null; then \
++		       echo "$(MKDIR) -p $(INCLUDEDIR)"; \
++		       if $(MKDIR) -p $(INCLUDEDIR); then \
++		          echo "$(MKDIR) -p $(AFTER_INC_DIR)"; \
++		          if $(MKDIR) -p $(AFTER_INC_DIR) >/dev/null; then \
+ 		             echo " ">/dev/null; \
+ 		          else \
+ 		             echo "failed to create include directory: $(AFTER_INC_DIR)"; \

Copied: libafterimage/repos/community-x86_64/libafterimage-ldflags.patch (from rev 634432, libafterimage/trunk/libafterimage-ldflags.patch)
===================================================================
--- libafterimage-ldflags.patch	                        (rev 0)
+++ libafterimage-ldflags.patch	2020-05-25 14:54:24 UTC (rev 634433)
@@ -0,0 +1,12 @@
+diff -aur --color libAfterImage-1.20-old/Makefile.in libAfterImage-1.20-new/Makefile.in
+--- libAfterImage-1.20-old/Makefile.in	2020-05-25 17:48:04.321292472 +0300
++++ libAfterImage-1.20-new/Makefile.in	2020-05-25 17:48:30.511292257 +0300
+@@ -398,7 +398,7 @@
+ 
+ $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h
+ 	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
+-	 $(LIB_OBJS)
++	 $(LIB_OBJS) ${USER_LD_FLAGS}
+ 
+ install.man:
+ 		@if [ -d doc/man ] ; then \

Deleted: libafterimage-libpng15.patch
===================================================================
--- libafterimage-libpng15.patch	2020-05-25 14:54:05 UTC (rev 634432)
+++ libafterimage-libpng15.patch	2020-05-25 14:54:24 UTC (rev 634433)
@@ -1,31 +0,0 @@
---- export.c
-+++ export.c
-@@ -496,7 +496,7 @@
- 	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
-     if ( png_ptr != NULL )
-     	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
--			if( setjmp(png_ptr->jmpbuf) )
-+			if( setjmp(png_jmpbuf(png_ptr)) )
- 			{
- 				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
- 				info_ptr = NULL ;
---- import.c
-+++ import.c
-@@ -1251,7 +1251,7 @@
- 			 * the normal method of doing things with libpng).  REQUIRED unless you
- 			 * set up your own error handlers in the png_create_read_struct() earlier.
- 			 */
--			if ( !setjmp (png_ptr->jmpbuf))
-+			if ( !setjmp (png_jmpbuf(png_ptr)))
- 			{
- 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
- 
-@@ -1468,7 +1468,7 @@
- 
- static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
- {
--   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
-+   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
-    memcpy(data, buf->buffer, length);
-    buf->buffer += length;
- }

Copied: libafterimage/repos/community-x86_64/libafterimage-libpng15.patch (from rev 634432, libafterimage/trunk/libafterimage-libpng15.patch)
===================================================================
--- libafterimage-libpng15.patch	                        (rev 0)
+++ libafterimage-libpng15.patch	2020-05-25 14:54:24 UTC (rev 634433)
@@ -0,0 +1,31 @@
+--- export.c
++++ export.c
+@@ -496,7 +496,7 @@
+ 	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
+     if ( png_ptr != NULL )
+     	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
+-			if( setjmp(png_ptr->jmpbuf) )
++			if( setjmp(png_jmpbuf(png_ptr)) )
+ 			{
+ 				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
+ 				info_ptr = NULL ;
+--- import.c
++++ import.c
+@@ -1251,7 +1251,7 @@
+ 			 * the normal method of doing things with libpng).  REQUIRED unless you
+ 			 * set up your own error handlers in the png_create_read_struct() earlier.
+ 			 */
+-			if ( !setjmp (png_ptr->jmpbuf))
++			if ( !setjmp (png_jmpbuf(png_ptr)))
+ 			{
+ 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
+ 
+@@ -1468,7 +1468,7 @@
+ 
+ static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+ {
+-   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
++   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
+    memcpy(data, buf->buffer, length);
+    buf->buffer += length;
+ }


More information about the arch-commits mailing list