20216N/Adiff -rup glib-2.28.6/gio/tests/de.po ../amd64/glib-2.28.6/gio/tests/de.po
20216N/A--- glib-2.28.6/gio/tests/de.po 2010-09-27 20:48:33.000000000 +0200
20216N/A+++ ../amd64/glib-2.28.6/gio/tests/de.po 2011-04-18 10:56:45.263772192 +0200
20216N/A@@ -12,6 +12,5 @@ msgstr ""
20216N/A msgid "\"Unnamed\""
20216N/A msgstr "\"Unbenannt\""
20216N/A
20216N/A-msgctxt "keyboard label"
20216N/A msgid "\"BackSpace\""
20216N/A msgstr "\"Löschen\""
20216N/Adiff -rup glib-2.28.6/glib/Makefile.am ../amd64/glib-2.28.6/glib/Makefile.am
20216N/A--- glib-2.28.6/glib/Makefile.am 2011-04-14 00:55:29.000000000 +0200
20216N/A+++ ../amd64/glib-2.28.6/glib/Makefile.am 2011-04-18 10:56:31.979293844 +0200
20778N/A@@ -355,10 +355,10 @@ INSTALL_PROGS=
20216N/A
20216N/A if ENABLE_DTRACE
20216N/A glib_probes.h: glib_probes.d Makefile
20778N/A- $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
20778N/A+ $(AM_V_GEN) $(DTRACE) $(DFLAGS) -C -h -s $< -o $@.tmp
20778N/A @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
20216N/A glib_probes.o: glib_probes.d Makefile
20778N/A- $(AM_V_GEN) $(DTRACE) -G -s $< -o $@
20778N/A+ $(AM_V_GEN) $(DTRACE) $(DFLAGS) -G -s $< -o $@
20216N/A BUILT_SOURCES += glib_probes.h glib_probes.o
20216N/A CLEANFILES += glib_probes.h glib_probes.h.tmp
20216N/A libglib_2_0_la_LIBADD += glib_probes.o
20903N/A--- glib-2.32.1/glib/tests/Makefile.am-orig 2012-04-30 02:43:00.786262102 -0500
20903N/A+++ glib-2.32.1/glib/tests/Makefile.am 2012-04-30 02:50:38.186059900 -0500
20903N/A@@ -47,6 +47,7 @@ rand_LDADD = $(progs_ldadd) -lm
20903N/A TEST_PROGS += strfuncs
20903N/A strfuncs_SOURCES = strfuncs.c
20903N/A strfuncs_LDADD = $(progs_ldadd) -lm
20903N/A+strfuncs_CFLAGS = -xc99
20903N/A
20903N/A TEST_PROGS += string
20903N/A string_SOURCES = string.c
20903N/A@@ -266,7 +267,7 @@ gwakeup_fallback_LDADD = $(progs_ldad
20903N/A endif
20903N/A
20903N/A if OS_UNIX
20903N/A-private_LDFLAGS = -pthread
20903N/A+#private_LDFLAGS = -pthread
20903N/A
20903N/A TEST_PROGS += unix-multithreaded
20903N/A unix_multithreaded_SOURCES = $(top_srcdir)/glib/tests/unix.c
20903N/A--- glib-2.32.1/glib/tests/mem-overflow.c-orig 2012-04-30 02:46:52.355266148 -0500
20903N/A+++ glib-2.32.1/glib/tests/mem-overflow.c 2012-04-30 02:47:01.821642110 -0500
20903N/A@@ -128,6 +128,7 @@ mem_overflow (void)
20903N/A
20216N/A typedef struct
20216N/A {
20903N/A+ gboolean dummy;
20216N/A } Empty;
20903N/A
20903N/A static void
20903N/A--- glib-2.32.1/gio/gsocket.c-orig 2012-04-30 03:31:25.633875422 -0500
20903N/A+++ glib-2.32.1/gio/gsocket.c 2012-04-30 03:27:30.732696618 -0500
20903N/A@@ -43,6 +43,9 @@
20903N/A # include <unistd.h>
20903N/A # include <sys/ioctl.h>
20903N/A #endif
20903N/A+#ifdef __sun
20903N/A+#include <sys/filio.h>
20216N/A+#endif
20216N/A
20903N/A #ifdef HAVE_SYS_UIO_H
20903N/A #include <sys/uio.h>