From 653c92042811b4d01efefef93f2069bd6a8e569f Mon Sep 17 00:00:00 2001 From: Ignacio Casal Quinteiro Date: Tue, 24 Mar 2015 13:03:07 +0100 Subject: [PATCH] gtk3: do not check gettext For some reason xgettext crashes when run from the configure script. Remove that check for now since anyway we know we have the right gettext. --- mingw-w64-gtk3/PKGBUILD | 7 +++++-- mingw-w64-gtk3/do-not-check-xgettext.patch | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 mingw-w64-gtk3/do-not-check-xgettext.patch diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD index 0c4024d847..824e956d90 100644 --- a/mingw-w64-gtk3/PKGBUILD +++ b/mingw-w64-gtk3/PKGBUILD @@ -33,7 +33,8 @@ source=("http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver} 0037-W32-better-dwm-loading-and-support-dwm-detection.all.patch 0054-no-transparency-for-children.all.patch 0055-skip-testsuite.all.patch - Make-reftest-plugins-W32-compatible.patch) + Make-reftest-plugins-W32-compatible.patch + do-not-check-xgettext.patch) md5sums=('11c97ce2527956e0ddb5ad5b236e4572' '9e0296da2986be7697cf343563b85d1f' '21789d52c1debcab59f8b6a99232de68' @@ -41,7 +42,8 @@ md5sums=('11c97ce2527956e0ddb5ad5b236e4572' 'ad383a497a9134355e0a549f844c3a33' '31d098e6856ddc8dde7259ae572f8bf1' '939ecf0b7c985e947c6bf48dfd3b8df0' - '864d4b2cd6f72115cc78a393ccd96b47') + '864d4b2cd6f72115cc78a393ccd96b47' + 'c345e55743b995f9bfcb0f67afd83d9c') prepare() { cd "${srcdir}/gtk+-${pkgver}" @@ -52,6 +54,7 @@ prepare() { patch -Np1 -i "${srcdir}"/0054-no-transparency-for-children.all.patch patch -Np1 -i "${srcdir}"/0055-skip-testsuite.all.patch #patch -Np1 -i "${srcdir}"/Make-reftest-plugins-W32-compatible.patch + patch -Np1 -i "${srcdir}"/do-not-check-xgettext.patch autoreconf -i } diff --git a/mingw-w64-gtk3/do-not-check-xgettext.patch b/mingw-w64-gtk3/do-not-check-xgettext.patch new file mode 100644 index 0000000000..101c5cb407 --- /dev/null +++ b/mingw-w64-gtk3/do-not-check-xgettext.patch @@ -0,0 +1,19 @@ +diff --git a/configure.ac b/configure.ac +index f7c6438..4b141ba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -666,14 +666,6 @@ fi + ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`" + AM_GLIB_GNU_GETTEXT + +-AC_MSG_CHECKING([whether xgettext supports ui files]) +-if $ac_cv_path_XGETTEXT --output=- --language=Glade $srcdir/gtk/ui/gtkfilechooserwidget.ui > /dev/null 2>&1; then +- AC_MSG_RESULT([yes]) +-else +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([GNU gettext 0.18.3 or newer is required]) +-fi +- + LIBS="$LIBS $INTLLIBS" + AC_CONFIG_COMMANDS([po-properties], + [[case "$CONFIG_FILES" in *po-properties/Makefile.in*)