[arch-commits] Commit in libafterimage/trunk (PKGBUILD header-install.patch)

[Felix Yan]

    Date: Sunday, September 30, 2018 @ 04:56:22
  Author: felixonmars
Revision: 388094

fix header installation (FS#60246)

Added:
  libafterimage/trunk/header-install.patch
Modified:
  libafterimage/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   17 ++++++++++++++---
 header-install.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-30 04:55:32 UTC (rev 388093)
+++ PKGBUILD	2018-09-30 04:56:22 UTC (rev 388094)
@@ -11,14 +11,25 @@
 depends=('librsvg')
 arch=('x86_64')
 source=("https://downloads.sourceforge.net/project/afterstep/libAfterImage/$pkgver/libAfterImage-$pkgver.tar.bz2"
-        libafterimage-libpng15.patch)
+        libafterimage-libpng15.patch
+        header-install.patch)
 md5sums=('17a0ab8a2e6b253f222934418705963e'
-         'bdb49e626cb91b2c218193f3d36c9f91')
+         'bdb49e626cb91b2c218193f3d36c9f91'
+         'c4f8b94d9a7dda3e3e55420747b1b5ca')
 
-build() {
+prepare() {
   cd libAfterImage-$pkgver
+
+  # Fix header installation (FS#60246)
+  patch -p1 -i ../header-install.patch
+
   # Apply Gentoo's libpng15 patch
   patch < ../libafterimage-libpng15.patch
+}
+
+build() {
+  cd libAfterImage-$pkgver
+
   ./configure --prefix=/usr --mandir=/usr/share/man \
               --enable-sharedlibs --disable-staticlibs
 

Added: header-install.patch
===================================================================
--- header-install.patch	                        (rev 0)
+++ header-install.patch	2018-09-30 04:56:22 UTC (rev 388094)
@@ -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)"; \