gtk3: Update to 3.16.2

This commit is contained in:
Alexpux
2015-04-27 19:08:57 +03:00
parent d0f5452e3f
commit 6cc9a40495
3 changed files with 38 additions and 27 deletions

View File

@@ -2,7 +2,7 @@
_realname=gtk3
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.16.1
pkgver=3.16.2
pkgrel=1
pkgdesc="GObject-based multi-platform GUI toolkit (v3) (mingw-w64)"
arch=('any')
@@ -34,17 +34,15 @@ 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
do-not-check-xgettext.patch)
md5sums=('7458661889a718f93b46cb44b677cc41'
fix-crash-xgettext.patch)
md5sums=('321d14c72bd62ad7417d329859bf55af'
'9e0296da2986be7697cf343563b85d1f'
'21789d52c1debcab59f8b6a99232de68'
'3aa19ea25cc1d7693ae57f8e80f88440'
'ad383a497a9134355e0a549f844c3a33'
'31d098e6856ddc8dde7259ae572f8bf1'
'939ecf0b7c985e947c6bf48dfd3b8df0'
'864d4b2cd6f72115cc78a393ccd96b47'
'c345e55743b995f9bfcb0f67afd83d9c')
'3e1b90c42a90d83f7735b458589705bd')
prepare() {
cd "${srcdir}/gtk+-${pkgver}"
@@ -54,8 +52,7 @@ prepare() {
patch -Np1 -i "${srcdir}"/0037-W32-better-dwm-loading-and-support-dwm-detection.all.patch
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
patch -Np1 -i "${srcdir}"/fix-crash-xgettext.patch
autoreconf -i
}

View File

@@ -1,19 +0,0 @@
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*)

View File

@@ -0,0 +1,33 @@
From b10d63c085509bd7800493a85e7bf2df5eb1fe0a Mon Sep 17 00:00:00 2001
From: Daiki Ueno <dueno@src.gnome.org>
Date: Thu, 23 Apr 2015 09:42:45 +0900
Subject: build: Avoid xgettext crash on MSYS2
isatty() on MSYS2 returns non-zero if the fd is stdout and is redirected
to /dev/null. That lets xgettext to produce colorized output and leads
to an assertion failure during terminal type detection.
Although the problem should be fixed in MSYS2, isatty() could behave
wrongly in many ways on Windows. Since gtk+ doesn't need colorized
output, it would be safer to bypass the terminal dependent code.
See also:
https://lists.gnu.org/archive/html/bug-gettext/2015-04/msg00004.html
https://bugzilla.gnome.org/show_bug.cgi?id=748346
diff --git a/configure.ac b/configure.ac
index ba8954c..005c678 100644
--- a/configure.ac
+++ b/configure.ac
@@ -668,7 +668,7 @@ 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
+if $ac_cv_path_XGETTEXT --output=- --color=no --language=Glade $srcdir/gtk/ui/gtkfilechooserwidget.ui > /dev/null 2>&1; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
--
cgit v0.10.2