[Libreoffice-commits] .: 7 commits - dbaccess/Library_dbui.mk i18npool/source solenv/gbuild svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk svl/Library_svl.mk svx/Library_svx.mk xmloff/Library_xo.mk

Eike Rathke erack at kemper.freedesktop.org
Fri Jan 13 13:42:48 PST 2012 

 dbaccess/Library_dbui.mk                  |    2 +-
 i18npool/source/localedata/data/it_IT.xml |    1 +
 i18npool/source/localedata/data/pt_AO.xml |    1 +
 i18npool/source/localedata/data/pt_BR.xml |    1 +
 i18npool/source/localedata/data/pt_PT.xml |    1 +
 i18npool/source/localedata/data/sl_SI.xml |    2 ++
 solenv/gbuild/platform/com_GCC_defs.mk    |    2 +-
 svl/Library_fsstorage.mk                  |    2 +-
 svl/Library_passwordcontainer.mk          |    2 +-
 svl/Library_svl.mk                        |    2 +-
 svx/Library_svx.mk                        |    2 +-
 xmloff/Library_xo.mk                      |    2 +-
 12 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit 92bf1c3f605f837214013d25396b3d3a34005e9c
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jan 13 22:41:21 2012 +0100

    use INCLUDE instead of SOLARINC, and after local includes

diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index a5e021b..f17a8b7 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,dbui,\
 	-I$(SRCDIR)/dbaccess/source/ui/inc \
 	-I$(SRCDIR)/dbaccess/source/ui/dlg \
 	-I$(SRCDIR)/dbaccess/source/inc \
-	$$(SOLARINC) \
+	$$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_api,dbui,\
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 29b4653..2247c9a 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -31,13 +31,13 @@ $(eval $(call gb_Library_Library,fsstorage))
 $(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage))
 
 $(eval $(call gb_Library_set_include,fsstorage,\
-    $$(SOLARINC) \
     -I$(WORKDIR)/inc/svl \
     -I$(WORKDIR)/inc/ \
     -I$(realpath $(SRCDIR)/svl/inc) \
     -I$(realpath $(SRCDIR)/svl/inc/svl) \
     -I$(realpath $(SRCDIR)/svl/source/inc) \
     -I$(OUTDIR)/inc \
+    $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_api,fsstorage,\
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index d1a740c..6b577b6 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -31,13 +31,13 @@ $(eval $(call gb_Library_Library,passwordcontainer))
 $(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer))
 
 $(eval $(call gb_Library_set_include,passwordcontainer,\
-    $$(SOLARINC) \
     -I$(WORKDIR)/inc/svl \
     -I$(WORKDIR)/inc/ \
     -I$(realpath $(SRCDIR)/svl/inc) \
     -I$(realpath $(SRCDIR)/svl/inc/svl) \
     -I$(realpath $(SRCDIR)/svl/source/inc) \
     -I$(OUTDIR)/inc \
+    $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_api,passwordcontainer,\
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 216a80d..337e4ed 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -33,8 +33,8 @@ $(eval $(call gb_Library_add_package_headers,svl,svl_inc))
 $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl))
 
 $(eval $(call gb_Library_set_include,svl,\
-    $$(SOLARINC) \
     -I$(realpath $(SRCDIR)/svl/source/inc) \
+    $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_api,svl,\
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index d81363a..97db17f 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_componentfile,svx,svx/util/svx))
 $(eval $(call gb_Library_set_include,svx,\
     -I$(realpath $(SRCDIR)/svx/inc) \
     -I$(realpath $(SRCDIR)/svx/source/inc) \
-    $$(SOLARINC) \
+    $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_api,svx,\
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 11173d9..558b5f3 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -33,8 +33,8 @@ $(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo))
 $(eval $(call gb_Library_add_package_headers,xo,xmloff_inc))
 
 $(eval $(call gb_Library_set_include,xo,\
-    $$(SOLARINC) \
     -I$(realpath $(SRCDIR)/xmloff/inc) \
+    $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_defs,xo,\
commit 6ecf6ea77f36a444f985fed25a0d0502f5ae8ac4
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jan 13 22:41:20 2012 +0100

    ensure that /usr/include is _appended_ to INCLUDE
    
    At least with gcc 4.6.2 the situation was that if /usr/include was missing
    from the -I... includes, header files were pulled from /usr/include/
    instead of solver/$INPATH/inc/external/
    
    This clearly makes a difference for not --with-system-... libs where the
    internal version is to be used.

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 33aa936..7dddcbb 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -129,7 +129,7 @@ gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS)
 endif
 gb_COMPILERNOOPTFLAGS := -O0
 
-gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
+gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) -I$(SYSBASE)/usr/include
 gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
 
 
commit 90a94c55077cff0f0077ff46618365970c07223f
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jan 13 20:06:32 2012 +0100

    added [it-IT] date acceptance pattern "D/M"

diff --git a/i18npool/source/localedata/data/it_IT.xml b/i18npool/source/localedata/data/it_IT.xml
index 2027e3b..dd57250 100644
--- a/i18npool/source/localedata/data/it_IT.xml
+++ b/i18npool/source/localedata/data/it_IT.xml
@@ -35,6 +35,7 @@
     <MeasurementSystem>metric</MeasurementSystem>
   </LC_CTYPE>
   <LC_FORMAT>
+    <DateAcceptancePattern>D/M</DateAcceptancePattern>
     <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
       <FormatCode>Standard</FormatCode>
     </FormatElement>
commit e6dbc1aa978e4609a0ef5e7095cdca330cc07ed4
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jan 13 20:02:24 2012 +0100

    added [pt-AO] date acceptance pattern "D-M"

diff --git a/i18npool/source/localedata/data/pt_AO.xml b/i18npool/source/localedata/data/pt_AO.xml
index 0b6f369..67ac2a9 100644
--- a/i18npool/source/localedata/data/pt_AO.xml
+++ b/i18npool/source/localedata/data/pt_AO.xml
@@ -35,6 +35,7 @@
     <MeasurementSystem>Metric</MeasurementSystem>
   </LC_CTYPE>
   <LC_FORMAT>
+    <DateAcceptancePattern>D-M</DateAcceptancePattern>
     <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
       <FormatCode>DD-MM-AAAA</FormatCode>
     </FormatElement>
commit 74fea31257372746caf81148a1be9cff1fe36728
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jan 13 20:01:18 2012 +0100

    added [pt-BR] date acceptance pattern "D/M"

diff --git a/i18npool/source/localedata/data/pt_BR.xml b/i18npool/source/localedata/data/pt_BR.xml
index 3c87a21..fa910d9 100644
--- a/i18npool/source/localedata/data/pt_BR.xml
+++ b/i18npool/source/localedata/data/pt_BR.xml
@@ -35,6 +35,7 @@
     <MeasurementSystem>Metric</MeasurementSystem>
   </LC_CTYPE>
   <LC_FORMAT>
+    <DateAcceptancePattern>D/M</DateAcceptancePattern>
     <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
       <FormatCode>DD/MM/AA</FormatCode>
     </FormatElement>
commit c5fddb08424c54300b26fc3af19acbbfe84f9fd2
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jan 13 19:49:22 2012 +0100

    added [pt-PT] date acceptance pattern "D-M"

diff --git a/i18npool/source/localedata/data/pt_PT.xml b/i18npool/source/localedata/data/pt_PT.xml
index f6cd750..31cfe04 100644
--- a/i18npool/source/localedata/data/pt_PT.xml
+++ b/i18npool/source/localedata/data/pt_PT.xml
@@ -35,6 +35,7 @@
     <MeasurementSystem>Metric</MeasurementSystem>
   </LC_CTYPE>
   <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$$-816]">
+    <DateAcceptancePattern>D-M</DateAcceptancePattern>
     <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
       <FormatCode>DD-MM-AAAA</FormatCode>
     </FormatElement>
commit 0861854fe7a687d98abb9dacc4b6199954283fa3
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jan 13 19:36:18 2012 +0100

    added [sl-SI] date acceptance patterns

diff --git a/i18npool/source/localedata/data/sl_SI.xml b/i18npool/source/localedata/data/sl_SI.xml
index 2fb7b3d..34db29f 100644
--- a/i18npool/source/localedata/data/sl_SI.xml
+++ b/i18npool/source/localedata/data/sl_SI.xml
@@ -36,6 +36,8 @@
   </LC_CTYPE>
   <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$SIT-424]">
     <DateAcceptancePattern>D. M. Y</DateAcceptancePattern>
+    <DateAcceptancePattern>D.M.</DateAcceptancePattern>
+    <DateAcceptancePattern>D. M.</DateAcceptancePattern>
     <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
       <FormatCode>Standard</FormatCode>
     </FormatElement>

More information about the Libreoffice-commits mailing list