binaryurp/prj/build.lst | 2 +- configure.in | 3 +++ solenv/gbuild/LinkTarget.mk | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit 3b6773c9d4550ad322248db8b16caa0206fbb3cb Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Tue Mar 13 13:45:15 2012 +0100 add bug-id directly to the error message diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index c547891..3d691cc 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -85,7 +85,7 @@ endif # require different compiler flags define gb_Object__owner $$(if $$(OBJECTOWNER),\ - $$(call gb_Output_error,$(1) is linked in by $$(OBJECTOWNER) $(2)))$(2) + $$(call gb_Output_error,fdo#47246: $(1) is linked in by $$(OBJECTOWNER) $(2)))$(2) endef # For every object there is a dep file (if gb_FULLDEPS is active). commit d54e03caf915d5d89d35f73ea5fdd0b8d2fdb9db Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Tue Mar 13 13:40:30 2012 +0100 binaryurp has cppunit tests diff --git a/binaryurp/prj/build.lst b/binaryurp/prj/build.lst index eba5c27..7a32eda 100644 --- a/binaryurp/prj/build.lst +++ b/binaryurp/prj/build.lst @@ -1,2 +1,2 @@ -bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offapi sal salhelper NULL +bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offapi sal salhelper CPPUNIT:cppunit NULL bu binaryurp\prj nmake - all bu_prj NULL commit 567a22f15ab35638ba04d51fdb1e8c91471bf8d1 Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Tue Mar 13 12:56:56 2012 +0100 upstream pkgconfig-mozilla-plugin.diff from Ubuntu/Debian packaging diff --git a/configure.in b/configure.in index 8ccb1e7..764b9c0 100644 --- a/configure.in +++ b/configure.in @@ -7274,6 +7274,9 @@ if test "$with_system_mozilla_headers" = "yes"; then if test "x$LOCATED" != "xyes"; then PKG_CHECK_MODULES(MOZILLA_HEADERS, libxul, [LOCATED=yes], [LOCATED=no]) fi + if test "x$LOCATED" != "xyes"; then + PKG_CHECK_MODULES(MOZILLA_HEADERS, mozilla-plugin, [LOCATED=yes], [LOCATED=no]) + fi # if still not found bail out if test "x$LOCATED" != "xyes"; then AC_MSG_ERROR([npapi.h header file not found]) commit 58f5a26e2d4d6998a30e423ac67335cf62e97226 Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Tue Mar 13 11:16:32 2012 +0100 fdo#47246: abort on duplicate linked objects diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 555a805..c547891 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -85,7 +85,7 @@ endif # require different compiler flags define gb_Object__owner $$(if $$(OBJECTOWNER),\ - $$(call gb_Output_warn,$(1) is linked in by $$(OBJECTOWNER) $(2)))$(2) + $$(call gb_Output_error,$(1) is linked in by $$(OBJECTOWNER) $(2)))$(2) endef # For every object there is a dep file (if gb_FULLDEPS is active). _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits