[Libreoffice-commits] .: glib/glib-2.28.1.noise.patch glib/makefile.mk

[Christian Lohmaier]

 glib/glib-2.28.1.noise.patch |   12 ++++++++++++
 glib/makefile.mk             |    2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit a577f934f2b4a8979d80495c1659d8337146905f
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Jun 10 16:50:35 2011 +0200

    get rid of some noise in the buildlog due to missing msgfmt
    
    o test.mo ./de.po; \
    ../.././install-sh -c -d de/LC_MESSAGES; \
    cp -f test.mo de/LC_MESSAGES
    /bin/sh: line 1: o: command not found
    cp: test.mo: No such file or directory
    make[5]: [test.mo] Error 1 (ignored)

diff --git a/glib/glib-2.28.1.noise.patch b/glib/glib-2.28.1.noise.patch
new file mode 100644
index 0000000..f42b08a
--- /dev/null
+++ b/glib/glib-2.28.1.noise.patch
@@ -0,0 +1,12 @@
+--- misc/glib-2.28.1/gio/tests/Makefile.in	2011-02-18 16:22:00.000000000 +0100
++++ misc/build/glib-2.28.1/gio/tests/Makefile.in	2011-06-10 16:37:05.000000000 +0200
+@@ -1020,7 +1020,9 @@
+ proxy_LDADD = $(progs_ldadd) \
+ 	$(top_builddir)/gthread/libgthread-2.0.la
+ 
++ifneq ($(MSGFMT),)
+ MISC_STUFF = test.mo
++endif
+ DISTCLEANFILES = \
+ 	applications/mimeinfo.cache	\
+ 	org.gtk.test.enums.xml		\
diff --git a/glib/makefile.mk b/glib/makefile.mk
index c1bb069..1b31d39 100644
--- a/glib/makefile.mk
+++ b/glib/makefile.mk
@@ -49,7 +49,7 @@ TARFILE_MD5=9f6e85e1e38490c3956f4415bcd33e6e
 
 
 .IF "$(OS)"=="MACOSX" || "$(OS)"=="IOS"
-PATCH_FILES=glib-2.28.1.patch
+PATCH_FILES=glib-2.28.1.patch glib-2.28.1.noise.patch
 
 .IF "$(OS)"=="IOS"
 CONFIGURE_FLAGS= \