libwpd/UnpackedTarball_wpd.mk | 8 +++++++- libwpg/UnpackedTarball_wpg.mk | 7 +++++-- 2 files changed, 12 insertions(+), 3 deletions(-)
New commits: commit 58c97cffdcb46d2739b1eb2ae1ae2a36467d8ad6 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Sep 10 16:04:05 2012 +0200 Notes on upstream status of patches Change-Id: I6fa4a33d85dd227ec4fd408e9d30d96a6172903c diff --git a/libwpd/UnpackedTarball_wpd.mk b/libwpd/UnpackedTarball_wpd.mk index 1f42531..ab48207 100644 --- a/libwpd/UnpackedTarball_wpd.mk +++ b/libwpd/UnpackedTarball_wpd.mk @@ -16,6 +16,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,wpd,\ libwpd/libwpd-0.9.4-warning.patch \ libwpd/libwpd-0.9.4-msvc-warning.patch \ )) -# libwpd/libwpd-0.9.4-warning.patch: -Werror,-Wunused-private-field +# libwpd/libwpd-0.9.4-warning.patch: see upstream +# <http://libwpd.git.sourceforge.net/git/gitweb.cgi?p=libwpd/libwpd;a=commit; +# h=ca59d3ce82d1695e381255912ce1b60e826b2ca6> "-Werror,-Wunused-private-field" +# libwpd/libwpd-0.9.4-msvc-warning.patch: see upstream +# <http://libwpd.git.sourceforge.net/git/gitweb.cgi?p=libwpd/libwpd;a=commit; +# h=fb3827aeb5de64ed84eb1140bae9e32e50ca5133> "MSVC warning C4310: cast +# truncates constant value" # vim: set noet sw=4 ts=4: diff --git a/libwpg/UnpackedTarball_wpg.mk b/libwpg/UnpackedTarball_wpg.mk index a5e1746..d53cf5f 100644 --- a/libwpg/UnpackedTarball_wpg.mk +++ b/libwpg/UnpackedTarball_wpg.mk @@ -14,7 +14,10 @@ $(eval $(call gb_UnpackedTarball_set_tarball,wpg,$(WPG_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,wpg,\ libwpg/libwpg-0.2.1-warning.patch \ )) -# libwpg/libwpg-0.2.1-warning.patch: -Werror,-Wparentheses, -# -Werror,-Wunused-private-field +# libwpg/libwpg-0.2.1-warning.patch: see upstream +# <http://libwpg.git.sourceforge.net/git/gitweb.cgi?p=libwpg/libwpg;a=commit; +# h=5cf190eb365df00a1446738b3ab0d3e55291def3> "Fix clang build" and +# <http://libwpg.git.sourceforge.net/git/gitweb.cgi?p=libwpg/libwpg;a=commit; +# h=f98c1f4308b75ccbb2b98ed8b4011b4f84e841d3> "-Werror,-Wunused-private-field" # vim: set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits