Added patch for libgpg-error

aferrero2707 · Jun 19, 2017 · 3fb2b2d · 3fb2b2d
1 parent 0e13f8c
commit 3fb2b2d
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/modulesets/gnome-external-deps-2.32.modules b/modulesets/gnome-external-deps-2.32.modules
@@ -394,7 +394,10 @@
     <branch module="libgpg-error/libgpg-error-1.8.tar.bz2"
             repo="gnupg.org" version="1.8"
             hash="sha256:bdfbf2677147239d2d26d4e37f44635d9fd97c133c9ef9fd9793a12a059508c5"
-            md5sum="1d2005268a2f096db28cf9cf77b3229a" size="435341" />
+            md5sum="1d2005268a2f096db28cf9cf77b3229a" size="435341">
+      <patch file="libgpg-error-fix-mkerrorcodes-1.patch" strip="1"/>
+      <patch file="libgpg-error-fix-mkerrorcodes-2.patch" strip="1"/>
+    </branch>
   </autotools>
 
   <autotools id="libgcrypt" autogen-sh="configure" check-target="false"  supports-non-srcdir-builds="no">

diff --git a/modulesets/patches/libgpg-error-fix-mkerrorcodes-1.patch b/modulesets/patches/libgpg-error-fix-mkerrorcodes-1.patch
@@ -0,0 +1,15 @@
+*** libgpg-error-1.8/src/Makefile.am	2010-04-14 11:16:44.000000000 +0200
+--- libgpg-error-1.8-new/src/Makefile.am	2017-06-19 10:15:56.947739999 +0200
+***************
+*** 134,138 ****
+  mkerrcodes.h: Makefile mkerrcodes.awk $(gpg_extra_headers)
+  	$(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@
+! 	$(CPP) $(extra_cppflags) _$@ | grep GPG_ERR_ | \
+                 $(AWK) -f $(srcdir)/mkerrcodes.awk >$@
+  	-rm _$@
+--- 134,138 ----
+  mkerrcodes.h: Makefile mkerrcodes.awk $(gpg_extra_headers)
+  	$(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@
+! 	$(CPP) $(extra_cppflags) -P _$@ | grep GPG_ERR_ | \
+                 $(AWK) -f $(srcdir)/mkerrcodes.awk >$@
+  	-rm _$@
diff --git a/modulesets/patches/libgpg-error-fix-mkerrorcodes-2.patch b/modulesets/patches/libgpg-error-fix-mkerrorcodes-2.patch
@@ -0,0 +1,15 @@
+*** libgpg-error-1.8/src/Makefile.in	2010-05-06 15:14:16.000000000 +0200
+--- libgpg-error-1.8-new/src/Makefile.in	2017-06-19 10:16:13.371524000 +0200
+***************
+*** 842,846 ****
+  mkerrcodes.h: Makefile mkerrcodes.awk $(gpg_extra_headers)
+  	$(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@
+! 	$(CPP) $(extra_cppflags) _$@ | grep GPG_ERR_ | \
+                 $(AWK) -f $(srcdir)/mkerrcodes.awk >$@
+  	-rm _$@
+--- 842,846 ----
+  mkerrcodes.h: Makefile mkerrcodes.awk $(gpg_extra_headers)
+  	$(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@
+! 	$(CPP) $(extra_cppflags) -P _$@ | grep GPG_ERR_ | \
+                 $(AWK) -f $(srcdir)/mkerrcodes.awk >$@
+  	-rm _$@