[Libreoffice-commits] .: 7 commits -

[Jan Holesovsky]

 0 files changed

New commits:
commit 85e7f01992844cc9f1fbba855075f0c59b2942c4
Merge: 1f1bba5... 8dc8659...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Jul 28 10:14:02 2011 +0200

    Merge commit 'libreoffice-3.4.2.3'

commit 8dc86591498451811b17904eb30efe9f85afc47d
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jul 25 20:28:44 2011 +0200

    Version 3.4.2.3, tag libreoffice-3.4.2.3 (3.4.2-rc3)
commit 47998a63bbb72d237699a122383a1d408a1376d5
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 19 17:08:00 2011 +0200

    Version 3.4.2.2, tag libreoffice-3.4.2.2 (3.4.2-rc2)
commit 7da2335480d2c0f087ac227f67be481ddeda0916
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 12 16:41:12 2011 +0200

    Branch libreoffice-3-4-2
    
    This is 'libreoffice-3-4-2' - the stable branch for the 3.4.2 release.
    Only very safe changes, reviewed by three people are allowed.
    
    If you want to commit more complicated fix for the next 3.4.x release,
    please use the 'libreoffice-3-4' branch.
    
    If you want to build something cool, unstable, and risky, use master.
commit 6c406ff890b1525362f731692830ef324271dbc3
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 12 15:49:41 2011 +0200

    Version 3.4.2.1, tag libreoffice-3.4.2.1 (3.4.2-rc1)
commit dd0c9fdc119a991b8f08070316e86d44afac478d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 10 15:35:08 2011 +0300

    This makefile is for a standard Make, so use TABs
    (cherry picked from commit ff2c05d7b1411aeb67dc0ba415a1ec50db6331d6)
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/odk/settings/stdtarget.mk b/odk/settings/stdtarget.mk
index ba99722..938ab34 100644
--- a/odk/settings/stdtarget.mk
+++ b/odk/settings/stdtarget.mk
@@ -10,7 +10,8 @@ endif
 install: $(REGISTERFLAG)
 
 $(SDKTYPEFLAG):  #$(URE_TYPES) $(OFFICE_TYPES)
-    -$(MKDIR) $(subst /,$(PS),$(@D))
-    -$(DEL) $(subst \\,\,$(subst /,$(PS),$(SDKTYPEFLAG)))
-    $(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES)
-    echo flagged > $@
+# This is a makefile for a standard Make, so must be TABs below
+	-$(MKDIR) $(subst /,$(PS),$(@D))
+	-$(DEL) $(subst \\,\,$(subst /,$(PS),$(SDKTYPEFLAG)))
+	$(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES)
+	echo flagged > $@
commit 7b88a07f74525dba783ebc9d25cfdc0f3903d259
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 24 10:29:09 2011 +0100

    bad merge, fix to enable extensions to build again
    (cherry picked from commit 194da0076d3b4a6968496261fd2eaca9e8e955f9)

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index bbd18ee..e4fc05a 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -502,11 +502,9 @@ PLATFORM=kfreebsd
 ifeq "$(PROCTYPE)" "x86_64"
 PACKAGE_LIB_DIR=kfreebsd_x86_64.plt
 UNOPKG_PLATFORM=kFreeBSD_x86_64
-STLPORT=no
 else
 PACKAGE_LIB_DIR=kfreebsd_x86.plt
 UNOPKG_PLATFORM=kFreeBSD_x86
-STLPORT=no
 endif
 else
 PLATFORM=freebsd
@@ -570,10 +568,6 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID)
 SALHELPERLIB=-luno_salhelper$(COMID)
 REGLIB=-lreg
 STORELIB=-lstore
-ifeq "$(STLPORT)" "yes"
-endif
-else
-STLPORTLIB=
 
 EMPTYSTRING=
 PATH_SEPARATOR=: