blob: e86a70d662d070fdd850c3b4e78ac35e3a8c97eb (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
--- misc/gdk-pixbuf-2.23.0/configure 2010-12-23 15:18:11.000000000 +0100
+++ misc/build/gdk-pixbuf-2.23.0/configure 2011-02-28 18:49:26.000000000 +0100
@@ -16839,7 +16839,7 @@
-
+if false; then
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
@@ -17158,7 +17158,11 @@
rm -f conf.glibtest
-
+else
+ GLIB_MKENUMS=glib-mkenums
+ GLIB_GENMARSHAL=glib-genmarshal
+ GOBJECT_QUERY=gobject-query
+fi
# See if it's safe to turn G_DISABLE_DEPRECATED on.
GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
--- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c
+++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c
@@ -23,7 +23,9 @@
#include "config.h"
#include <string.h>
+#ifdef ENABLE_NLS
#include <libintl.h>
+#endif
#include "gdk-pixbuf-transform.h"
#include "gdk-pixbuf-private.h"
@@ -336,15 +336,19 @@
const gchar *
gdk_pixbuf_gettext (const gchar *msgid)
{
+#ifdef ENABLE_NLS
static gsize gettext_initialized = FALSE;
if (G_UNLIKELY (g_once_init_enter (&gettext_initialized))) {
bindtextdomain (GETTEXT_PACKAGE, GDK_PIXBUF_LOCALEDIR);
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#endif
g_once_init_leave (&gettext_initialized, TRUE);
}
return g_dgettext (GETTEXT_PACKAGE, msgid);
+#else
+ return msgid;
+#endif
}
|
