mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
glib2: add back gettext dependencies
The libintl check is broken in meson.build. Patched it and added back the gettext build dependencies. Avoids the proxy-intl thing that glib2 likes to use. Updated configure options. Refreshed patches. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/gio/meson.build
|
||||
+++ b/gio/meson.build
|
||||
@@ -870,20 +870,6 @@ endif
|
||||
@@ -881,20 +881,6 @@ endif
|
||||
|
||||
# Dependencies used by executables below
|
||||
have_libelf = false
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -84,7 +84,7 @@ installed_tests_template = files('template.test.in')
|
||||
@@ -94,7 +94,7 @@ installed_tests_template = files('template.test.in')
|
||||
installed_tests_template_tap = files('template-tap.test.in')
|
||||
|
||||
# Don’t build the tests unless we can run them (either natively, in an exe wrapper, or by installing them for later use)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/glib/valgrind.h 2019-12-12 14:53:26.000200499 +0100
|
||||
+++ b/glib/valgrind.h 2019-12-12 14:49:45.056163300 +0100
|
||||
@@ -157,7 +157,7 @@
|
||||
@@ -158,7 +158,7 @@
|
||||
# define PLAT_s390x_linux 1
|
||||
#elif defined(__linux__) && defined(__mips__) && (__mips==64)
|
||||
# define PLAT_mips64_linux 1
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -1955,7 +1955,7 @@ endif
|
||||
# FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
|
||||
# implementations. This could be extended if issues are found in some platforms.
|
||||
libintl_deps = []
|
||||
-if cc.has_function('ngettext')
|
||||
+if false
|
||||
have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
|
||||
else
|
||||
# First just find the bare library.
|
||||
Reference in New Issue
Block a user