diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-06-01 02:10:02 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-06-01 02:10:02 +0300 |
| commit | b51a5163e727c6cb5cd84cb1cca9ba31df69d1d7 (patch) | |
| tree | 7e55b770cfc97e44c26079f02bf3ee60e1591263 /gdk-pixbuf | |
| parent | 29a73db64c144fdfdfe05e25c3b9c4f16f856e69 (diff) | |
Don't use libintl in gdk-pixbuf either
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-2.23.0.patch | 32 | ||||
| -rw-r--r-- | gdk-pixbuf/makefile.mk | 3 |
2 files changed, 34 insertions, 1 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch index 1bff29333b62..cbad8406ac44 100644 --- a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch +++ b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch @@ -22,3 +22,35 @@ # 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 + } diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk index 663f0f252a47..e280f1d54183 100644 --- a/gdk-pixbuf/makefile.mk +++ b/gdk-pixbuf/makefile.mk @@ -56,8 +56,9 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ BASE_DEPENDENCIES_LIBS=" " \ .$/configure \ --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ + --disable-nls \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/libjpeg" \ - LDFLAGS="-L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0 -lintl" \ + LDFLAGS="-L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \ --disable-glibtest --without-libtiff --without-libjpeg BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) |