Allow target-specific patches, add those for glib

Signed-off-by: falkTX <falktx@falktx.com>

bootstrap.sh

@@ -61,7 +61,9 @@ if [ -n "${GLIB_VERSION}" ]; then
     fi
 
     download glib ${GLIB_VERSION} "http://caesar.ftp.acc.umu.se/pub/GNOME/sources/glib/${GLIB_MVERSION}" "${GLIB_TAR_EXT}"
-#     remove_file glib ${GLIB_VERSION} "m4macros/glib-gettext.m4"
+    if [ "${MACOS}" -eq 1 ]; then
+        remove_file glib ${GLIB_VERSION} "m4macros/glib-gettext.m4"
+    fi
     build_autoconfgen glib ${GLIB_VERSION} "${GLIB_EXTRAFLAGS}"
 fi
 

patches/glib/macos/01_skip-gettext.patch

@@ -0,0 +1,89 @@
+diff --git a/acinclude.m4 b/acinclude.m4
+index cac7f21..aff165a 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -449,4 +449,3 @@ AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
+ m4_include(acglib.m4)dnl
+ m4_include(glib/libcharset/codeset.m4)dnl
+ m4_include(glib/libcharset/glibc21.m4)dnl
+-m4_include(m4macros/glib-gettext.m4)dnl
+diff --git a/autogen.sh b/autogen.sh
+old mode 100644
+new mode 100755
+diff --git a/configure.ac b/configure.ac
+index b6640da..55262f3 100644
+--- a/configure.in
++++ b/configure.in
+@@ -454,13 +454,6 @@ ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
+ AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
+ GLIB_GNU_GETTEXT
+ 
+-if test "$gt_cv_have_gettext" != "yes" ; then
+-  AC_MSG_ERROR([
+-*** You must have either have gettext support in your C library, or use the 
+-*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
+-])
+-fi
+-
+ LIBS="$INTLLIBS $LIBS"
+ 
+ GETTEXT_PACKAGE=glib20
+diff --git a/gio/gunixconnection.c b/gio/gunixconnection.c
+index 3bfbd4f..f27e731 100644
+--- a/gio/gunixconnection.c
++++ b/gio/gunixconnection.c
+@@ -26,6 +26,8 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
++#define ngettext(t1, t2, n) t1
++
+ /**
+  * SECTION:gunixconnection
+  * @title: GUnixConnection
+diff --git a/glib/ggettext.c b/glib/ggettext.c
+index bf74ccb..2430a0d 100644
+--- a/glib/ggettext.c
++++ b/glib/ggettext.c
+@@ -40,7 +40,6 @@
+ 
+ #include <string.h>
+ #include <locale.h>
+-#include <libintl.h>
+ 
+ #ifdef G_OS_WIN32
+ 
+diff --git a/glib/gi18n.h b/glib/gi18n.h
+index f765c3d..2c950cd 100644
+--- a/glib/gi18n.h
++++ b/glib/gi18n.h
+@@ -20,13 +20,13 @@
+ 
+ #include <glib.h>
+ 
+-#include <libintl.h>
+ #include <string.h>
+ 
+-#define  _(String) gettext (String)
+-#define Q_(String) g_dpgettext (NULL, String, 0)
++#define  _(String) String
+ #define N_(String) (String)
+-#define C_(Context,String) g_dpgettext (NULL, Context "\004" String, strlen (Context) + 1)
+ #define NC_(Context, String) (String)
+ 
++#define textdomain(...)
++#define bindtextdomain(...)
++
+ #endif  /* __G_I18N_H__ */
+diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am
+index 971871c..8a4f40c 100644
+--- a/m4macros/Makefile.am
++++ b/m4macros/Makefile.am
+@@ -1,6 +1,6 @@
+ include $(top_srcdir)/glib.mk
+ 
+-installed_m4= glib-2.0.m4 glib-gettext.m4 gsettings.m4
++installed_m4= glib-2.0.m4 gsettings.m4
+ 
+ EXTRA_DIST+=$(installed_m4)
+ 

patches/glib/win32/01_skip-gettext.patch

@@ -0,0 +1,40 @@
+diff --git a/Makefile.in b/Makefile.in
+index 3402627..27210f1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -401,7 +401,7 @@ EXTRA_DIST = ChangeLog.pre-2-20 ChangeLog.pre-2-18 ChangeLog.pre-2-16 \
+ 	gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
+ TEST_PROGS = 
+ AUTOMAKE_OPTIONS = 1.7
+-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
++SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po
+ DIST_SUBDIRS = $(SUBDIRS) build
+ bin_SCRIPTS = glib-gettextize
+ AM_CPPFLAGS = \
+diff --git a/configure.in b/configure.in
+index b9c3342..e421aa0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -465,13 +465,6 @@ ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
+ AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
+ GLIB_GNU_GETTEXT
+ 
+-if test "$gt_cv_have_gettext" != "yes" ; then
+-  AC_MSG_ERROR([
+-*** You must have either have gettext support in your C library, or use the 
+-*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
+-])
+-fi
+-
+ LIBS="$INTLLIBS $LIBS"
+ 
+ GETTEXT_PACKAGE=glib20
+@@ -2682,8 +2675,6 @@ dnl **************************
+ dnl *** Checks for gtk-doc ***
+ dnl **************************
+ 
+-GTK_DOC_CHECK([1.11])
+-
+ AC_ARG_ENABLE(man,
+               [AC_HELP_STRING([--enable-man],
+                               [regenerate man pages from Docbook [default=no]])],enable_man=yes,

patches/glib/win64

@@ -0,0 +1 @@
+win32

setup/functions.sh

@@ -92,6 +92,15 @@ function _prebuild() {
         done
     fi
 
+    if [ -d "${PAWPAW_ROOT}/patches/${name}/${PAWPAW_TARGET}" ]; then
+        for p in $(ls "${PAWPAW_ROOT}/patches/${name}/${PAWPAW_TARGET}/" | grep "\.patch" | sort); do
+            if [ ! -f "${pkgdir}/.stamp_applied_${p}" ]; then
+                patch -p1 -d "${pkgdir}" -i "${PAWPAW_ROOT}/patches/${name}/${PAWPAW_TARGET}/${p}"
+                touch "${pkgdir}/.stamp_applied_${p}"
+            fi
+        done
+    fi
+
     if [ ! -f "${pkgdir}/.stamp_configured" ]; then
         rm -f "${pkgdir}/.stamp_built"
         rm -f "${pkgdir}/.stamp_installed"