summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-09-10 16:04:05 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-09-10 16:13:35 +0200
commit58c97cffdcb46d2739b1eb2ae1ae2a36467d8ad6 (patch)
tree740e21d82b35d42d32a919ac198a92dd8629a351
parent6266df99cc0782476478c45cbb6a48006c142489 (diff)
Notes on upstream status of patches
Change-Id: I6fa4a33d85dd227ec4fd408e9d30d96a6172903c
-rw-r--r--libwpd/UnpackedTarball_wpd.mk8
-rw-r--r--libwpg/UnpackedTarball_wpg.mk7
2 files changed, 12 insertions, 3 deletions
diff --git a/libwpd/UnpackedTarball_wpd.mk b/libwpd/UnpackedTarball_wpd.mk
index 1f4253101948..ab482071ca09 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 a5e1746c4a6b..d53cf5fef0fa 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: