[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, master, updated. dd32885a133cf3c9c0a1336f938169c6188a0469



The following commit has been merged in the master branch:
commit d429fc9937ab14fc9210b3ccc9f7ca472ea689dd
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Mar 16 15:29:56 2011 +0000

    update for rc2

diff --git a/changelog b/changelog
index e30db00..d01461d 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,11 @@
-libreoffice (1:3.3.2~rc1-1) UNRELEASED; urgency=low
+libreoffice (1:3.3.2~rc2-1) UNRELEASED; urgency=low
 
   * new upstream release candidate
 
+  * debian/patches/arm-optimization.diff, debian/rules:
+    - remove ARM fixes introduced in last revision again,
+      better solution upstream
+
   * debian/control.mediawiki.in:
     - make -wiki-publisher depend on -java-common
   * debian/rules:
@@ -10,13 +14,13 @@ libreoffice (1:3.3.2~rc1-1) UNRELEASED; urgency=low
   * merge from Ubuntu:
     - added ppc fixes (LP: #727118)
 
- -- Rene Engelhard <rene@debian.org>  Fri, 11 Mar 2011 17:22:42 +0000
+ -- Rene Engelhard <rene@debian.org>  Wed, 16 Mar 2011 16:24:43 +0100
 
 libreoffice (1:3.3.1-1) unstable; urgency=low
 
   * LibreOffice 3.3.1 final (identical to rc2)
 
-  * debian/patches/arm-optimization: add explicit support for
+  * debian/patches/arm-optimization.diff: add explicit support for
     optimization for armv4t/6/7, based on i117017
   * debian/patches/javaldx-LibreOffice.diff: s/openoffice.org/libreoffice/
     for javaldx (closes: #614103)
diff --git a/patches/alpha-no-relax.diff b/patches/alpha-no-relax.diff
index 4f3ec49..ef6faef 100644
--- a/patches/alpha-no-relax.diff
+++ b/patches/alpha-no-relax.diff
@@ -15,9 +15,10 @@
 + BUILD64=1
 --- libreoffice-3.3.1/libreoffice-build/patches/dev300/apply-old	2011-02-21 20:41:23.000000000 +0100
 +++ libreoffice-3.3.1/libreoffice-build/patches/dev300/apply	2011-02-21 20:41:41.000000000 +0100
-@@ -2390,3 +2390,5 @@
- [ ARM ]
- arm-optimization.diff
+@@ -2372,3 +2372,6 @@
  
+ [ TemporaryHacks ]
+ hack-no-rm-fr-of-smoketest-userconfig.diff
++
 +[ AXP ]
 +alpha-no-relax.diff
diff --git a/patches/arm-optimization.diff b/patches/arm-optimization.diff
deleted file mode 100644
index c5c553b..0000000
--- a/patches/arm-optimization.diff
+++ /dev/null
@@ -1,168 +0,0 @@
---- /dev/null	2011-02-09 23:43:13.080975836 +0100
-+++ libreoffice-3.3.1/libreoffice-build/patches/dev300/arm-optimization.diff	2011-02-19 17:42:32.000000000 +0100
-@@ -0,0 +1,137 @@
-+--- configure.in-old	2011-02-20 18:17:53.000000000 +0100
-++++ configure.in	2011-02-20 18:20:55.000000000 +0100
-+@@ -1256,6 +1256,16 @@
-+                           can get up to CPUS*max_jobs. Defaults to 1, unless
-+                           you configure --enable-icecream - then to 10.
-+ ],,)
-++AC_ARG_WITH(arm-target,
-++[  --arm-target        The minimal targeted arm processor
-++                          used for the build environment.
-++                          Cases :
-++                            arm-target < 6 : armv4t compatibility
-++                            arm-target = 6 : exact armv6 compatibility
-++                           arm-target > 6 : armv7-a compatibility
-++
-++                          Usage: --with-arm-target=7
-++],with_arm_target=$withval,with_arm_target=4)
-+ 
-+ BUILD_TYPE="OOo"
-+ 
-+@@ -1354,6 +1364,25 @@
-+ AC_SUBST(PTHREAD_LIBS)
-+ 
-+ dnl ===================================================================
-++dnl Check the ARM target
-++dnl ===================================================================
-++
-++if test "$_os" = "Linux" && echo "$build_cpu" | $GREP -q arm; then
-++    # default value
-++    ARM_TARGET=ARMV4T
-++    AC_MSG_CHECKING([which ARM processor optimization to use])
-++    if test "$with_arm_target" -lt "6"; then
-++	ARM_TARGET=ARMV4T
-++    elif test "$with_arm_target" = "6"; then
-++	ARM_TARGET=ARMV6
-++    elif test "$with_arm_target" -gt "6"; then
-++	ARM_TARGET=ARMV7
-++    fi
-++    AC_MSG_RESULT([$ARM_TARGET])
-++    AC_SUBST(ARM_TARGET)
-++fi
-++
-++dnl ===================================================================
-+ dnl Set the ENABLE_CRASHDUMP variable.
-+ dnl ===================================================================
-+ AC_MSG_CHECKING([whether to enable crashdump feature])
-+diff -r 67e476e04669 sal/osl/unx/interlck.c
-+--- sal/osl/unx/interlck.c	Fri Nov 12 20:02:04 2010 +0100
-++++ sal/osl/unx/interlck.c	Fri Feb 18 21:47:58 2011 +0100
-+@@ -134,6 +134,54 @@
-+     return nCount;
-+ }
-+ 
-++#elif defined ( GCC ) && defined ( ARM )
-++
-++/*****************************************************************************/
-++/* osl_incrementInterlockedCount */
-++/*****************************************************************************/
-++oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount)
-++{
-++#if defined( ARMV7 ) || defined( ARMV6 )
-++    register oslInterlockedCount nCount __asm__ ("r1");
-++    int nResult;
-++
-++    __asm__ __volatile__ (
-++"1:	ldrex %0, [%3]\n"
-++"	add %0, %0, #1\n"
-++"	strex %1, %0, [%3]\n"
-++"	teq %1, #0\n"
-++"	bne 1b"
-++        : "=&r" (nCount), "=&r" (nResult), "=m" (*pCount)
-++        : "r" (pCount)
-++        : "memory");
-++
-++    return nCount;
-++#else
-++    return __sync_add_and_fetch( pCount, 1 );
-++#endif
-++}
-++
-++oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount)
-++{
-++#if defined( ARMV7 ) || defined( ARMV6 )
-++    register oslInterlockedCount nCount __asm__ ("r1");
-++    int nResult;
-++
-++    __asm__ __volatile__ (
-++"0:	ldrex %0, [%3]\n"
-++"	sub %0, %0, #1\n"
-++"	strex %1, %0, [%3]\n"
-++"	teq %1, #0\n"
-++"	bne 0b"
-++        : "=&r" (nCount), "=&r" (nResult), "=m" (*pCount)
-++        : "r" (pCount)
-++        : "memory");
-++    return nCount;
-++#else
-++    return __sync_sub_and_fetch( pCount, 1 );
-++#endif
-++}
-++
-+ #else
-+ /* use only if nothing else works, expensive due to single mutex for all reference counts */
-+ 
-+diff -r 67e476e04669 set_soenv.in
-+--- set_soenv.in	Fri Nov 12 20:02:04 2010 +0100
-++++ set_soenv.in	Fri Feb 18 21:47:58 2011 +0100
-+@@ -1694,6 +1694,7 @@
-+ ToFile( "SET_EXCEPTIONS",    $SET_EXCEPTIONS,    "e" );
-+ ToFile( "use_shl_versions",  $use_shl_versions,  "e" );
-+ ToFile( "FLIPCMD",           $FLIPCMD,           "e" );
-++ToFile( "ARM_TARGET",          "@ARM_TARGET@",     "e" );
-+ #
-+ # Writing the variables to file.
-+ # (c = comment, e = environment variable, a = alias, n = newline )
-+diff -r 67e476e04669 solenv/inc/unxlngr.mk
-+--- solenv/inc/unxlngr.mk	Fri Nov 12 20:02:04 2010 +0100
-++++ solenv/inc/unxlngr.mk	Fri Feb 18 21:47:58 2011 +0100
-+@@ -32,3 +32,19 @@
-+ CDEFS+=-DARM32
-+ CFLAGS+=-fno-omit-frame-pointer
-+ DLLPOSTFIX=lr
-++
-++.IF "$(ARM_TARGET)" == "ARMV4T"
-++ARCH_FLAGS+=-march=armv4t
-++CDEFS+=-DARMV4T
-++.ENDIF
-++
-++.IF "$(ARM_TARGET)" == "ARMV6"
-++ARCH_FLAGS+=-march=armv6
-++CDEFS+=-DARMV6
-++.ENDIF
-++
-++.IF "$(ARM_TARGET)" == "ARMV7"
-++ARCH_FLAGS+=-march=armv7-a -mtune=cortex-a8 -mfpu=neon
-++CDEFS+=-DARMV7
-++.ENDIF
-++
---- libreoffice-3.3.1/libreoffice-build/patches/dev300/apply-old	2011-02-19 17:44:18.000000000 +0100
-+++ libreoffice-3.3.1/libreoffice-build/patches/dev300/apply	2011-02-19 17:45:10.000000000 +0100
-@@ -34,7 +34,7 @@
- 	      KDE4Experimental, MinGW, CalcExperimental, \
- 	      OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
- 	      WriterNavigation \
--	      HPPA, AXP, Speed, GSoC2010, Toolbars
-+	      HPPA, AXP, ARM, Speed, GSoC2010, Toolbars
- DebianLooseSections: DebianBaseNoHelpContent
- # Optional sections
- Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes
-@@ -66,7 +66,7 @@
- # Slackware
- Slackware : LinuxCommon, SlackwareOnly, NotDebian, Mono, msaccess
- # Debian
--DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL
-+DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL, ARM
- Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, HPPA, AXP, kFreeBSD
- DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
- # Ubuntu
-@@ -2386,3 +2386,7 @@
- 
- [ TemporaryHacks ]
- hack-no-rm-fr-of-smoketest-userconfig.diff
-+
-+[ ARM ]
-+arm-optimization.diff
-+
diff --git a/patches/hack-no-rm-fr-of-smoketest-userconfig.diff b/patches/hack-no-rm-fr-of-smoketest-userconfig.diff
index e44cb54..252ea6e 100644
--- a/patches/hack-no-rm-fr-of-smoketest-userconfig.diff
+++ b/patches/hack-no-rm-fr-of-smoketest-userconfig.diff
@@ -42,10 +42,10 @@
 + javatest : $(MISC)/$(TARGET)/installation.flag
 --- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply-old	2010-11-10 11:46:58.000000000 +0100
 +++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply	2010-11-10 11:47:21.000000000 +0100
-@@ -2411,3 +2411,6 @@
- sd_effects_styles.diff, pixie
- symbols-20-august.diff, i#11167, jopsen
- vEdit-13-August.diff, jopsen
+@@ -2358,3 +2358,6 @@
+ [ Win32Packaging ]
+ # patch to create a multilang installer and helppacks by default
+ instsetoo_native-win32-packaging.diff, fridrich
 +
 +[ TemporaryHacks ]
 +hack-no-rm-fr-of-smoketest-userconfig.diff
diff --git a/patches/ppc-openjdk.diff b/patches/ppc-openjdk.diff
index 8591bd7..bb7c363 100644
--- a/patches/ppc-openjdk.diff
+++ b/patches/ppc-openjdk.diff
@@ -22,8 +22,8 @@
  	      KDE4Experimental, MinGW, CalcExperimental, \
  	      OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
  	      WriterNavigation \
--	      HPPA, AXP, ARM, Speed, GSoC2010, Toolbars
-+	      HPPA, AXP, ARM, PowerPC, Speed, GSoC2010, Toolbars
+-	      HPPA, AXP, Speed, GSoC2010, Toolbars, Win32Packaging
++	      HPPA, AXP, PowerPC, Speed, GSoC2010, Toolbars, Win32Packaging
  DebianLooseSections: DebianBaseNoHelpContent
  # Optional sections
  Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes
@@ -31,8 +31,8 @@
  # Slackware
  Slackware : LinuxCommon, SlackwareOnly, NotDebian, Mono, msaccess
  # Debian
--DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL, ARM
-+DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL, ARM, PowerPC
+-DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL
++DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL, PowerPC
  Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, HPPA, AXP, kFreeBSD
  DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
  # Ubuntu
diff --git a/patches/series b/patches/series
index b205ec4..c9ca641 100644
--- a/patches/series
+++ b/patches/series
@@ -4,7 +4,6 @@ buildfix-patches.diff
 hack-no-rm-fr-of-smoketest-userconfig.diff
 do-not-switch-workspaces-of-wm.diff
 bridges-mkstemp-error-better-message.diff
-arm-optimization.diff
 alpha-no-relax.diff
 ppc-openjdk.diff
 no-minimaltoc.diff
diff --git a/rules b/rules
index 76cea39..48f88a8 100755
--- a/rules
+++ b/rules
@@ -82,7 +82,7 @@ MILESTONE=m19
 TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
 GIT_TAG=$(MWS)_$(MILESTONE)
 OOO_BUILD_BRANCH=libreoffice-3-3-2
-OOO_BUILD_VERSION=3.3.2.1
+OOO_BUILD_VERSION=3.3.2.2
 # in ooo-build releases the same as OOO_BUILD_VERSION
 OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION)
 OOO_BUILD_TAG=libreoffice-$(OOO_BUILD_TARBALL_VERSION)
@@ -352,14 +352,6 @@ ifeq "$(ARCH)" "i386"
 	USE_STLPORT=y
 endif
 
-# ARM target
-ifeq "$(ARCH)" "armel"
-	CONFIGURE_FLAGS += --with-arm-target=4
-endif
-ifeq "$(ARCH)" "armhf"
-	CONFIGURE_FLAGS += --with-arm-target=7
-endif
-
 ifeq "$(ENABLE_OPENGL)" "y"
   # doesn't make that much sense on armel and mips(el), does it? :)
   OOO_OGLTRANS_ARCHS = $(filter-out armel mips%, $(OOO_ARCHS))

-- 
LibreOffice packaging repository


Reply to: