[Libreoffice-commits] .: 2 commits - liborcus/liborcus_0.1.0-link-with-Boost.System.patch solenv/gbuild

[Libreoffice Gerrit user]

 liborcus/liborcus_0.1.0-link-with-Boost.System.patch |   35 -------------------
 solenv/gbuild/LinkTarget.mk                          |    5 --
 2 files changed, 1 insertion(+), 39 deletions(-)

New commits:
commit dd66b3f847f0061dcd9822104bbe6f45afbada63
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Nov 23 09:21:10 2012 +0100

    drop useless (and problematic) hunks
    
    The additional dependencies might trigger re-run of automake, which we
    really do not want.
    
    Change-Id: I5961c76c0ea047cbf7df541504349dd079137fd0

diff --git a/liborcus/liborcus_0.1.0-link-with-Boost.System.patch b/liborcus/liborcus_0.1.0-link-with-Boost.System.patch
index 0bf3569..55a6307 100644
--- a/liborcus/liborcus_0.1.0-link-with-Boost.System.patch
+++ b/liborcus/liborcus_0.1.0-link-with-Boost.System.patch
@@ -595,28 +595,6 @@ diff -up ./configure.dt ./configure
 diff -up ./src/liborcus/Makefile.in.dt ./src/liborcus/Makefile.in
 --- ./src/liborcus/Makefile.in.dt	2012-11-22 15:20:12.680747546 +0100
 +++ ./src/liborcus/Makefile.in	2012-11-22 15:20:55.181954251 +0100
-@@ -90,7 +90,11 @@ subdir = src/liborcus
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/depcomp
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
-+	$(top_srcdir)/m4/ax_boost_system.m4 \
-+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -128,7 +132,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- liborcus_ at ORCUS_API_VERSION@_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1)
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am__liborcus_ at ORCUS_API_VERSION@_la_SOURCES_DIST = dom_tree.cpp \
- 	exception.cpp global.cpp spreadsheet_interface.cpp \
- 	orcus_css.cpp orcus_csv.cpp orcus_xml.cpp pstring.cpp \
 @@ -303,6 +307,9 @@ AUTOCONF = @AUTOCONF@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -644,19 +622,6 @@ diff -up ./src/liborcus/Makefile.in.dt ./src/liborcus/Makefile.in
 diff -up ./src/Makefile.in.dt ./src/Makefile.in
 --- ./src/Makefile.in.dt	2012-11-22 15:20:04.274713103 +0100
 +++ ./src/Makefile.in	2012-11-22 15:20:55.059953542 +0100
-@@ -88,7 +88,11 @@ subdir = src
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/depcomp
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
-+	$(top_srcdir)/m4/ax_boost_system.m4 \
-+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
 @@ -288,6 +292,9 @@ AUTOCONF = @AUTOCONF@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
commit 26aae9238565de48324625315f2a44dba6f664d7
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Nov 23 07:11:05 2012 +0100

    ignore warnings in generated scanners
    
    Change-Id: I7c1e17ffba5b4e6d4f4229da8a93ac3db621253b

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e63892b..f2a5cfa 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -948,11 +948,8 @@ endef
 # gb_LinkTarget_add_scanner(<component>,<scanner file>)
 define gb_LinkTarget_add_scanner
 $(call gb_LexTarget_LexTarget,$(2))
-ifeq ($(OS),MACOSX)
-$(call gb_LinkTarget_add_generated_exception_object,$(1),LexTarget/$(2),$(3),-Wno-error)
-else
 $(call gb_LinkTarget_add_generated_exception_object,$(1),LexTarget/$(2),$(3))
-endif
+$(call gb_GenCxxObject_get_target,LexTarget/$(2)) : WARNINGS_NOT_ERRORS := $(true)
 $(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_LexTarget_get_clean_target,$(2))
 
 endef