[Libreoffice-commits] .: Branch 'libreoffice-3-3' - distro-configs/SUSE-10.1.conf.in patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Fri Jan 7 09:57:59 PST 2011
distro-configs/SUSE-10.1.conf.in | 2
patches/dev300/apply | 15 +
patches/dev300/build-java-1.4-l10ntools.diff | 21 +-
patches/dev300/build-java-1.4-wizards.diff | 95 ++++++++---
patches/dev300/build-sled10-autoconf.diff | 13 +
patches/dev300/build-sled10-ixion-with-internal-boost.diff | 109 +++++++++++++
patches/dev300/libxmlsec-system-nss.diff | 20 +-
patches/dev300/sled10-splash.diff | 4
8 files changed, 231 insertions(+), 48 deletions(-)
New commits:
commit ac8e5f6df669240ed1c627e4ce8f04d6a7a38a69
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Jan 7 18:56:25 2011 +0100
Fix build on SLED10
They need not be signed by other person because they affect only
build --with-distro=SUSE-10.1
diff --git a/distro-configs/SUSE-10.1.conf.in b/distro-configs/SUSE-10.1.conf.in
index 107742b..b762d48 100644
--- a/distro-configs/SUSE-10.1.conf.in
+++ b/distro-configs/SUSE-10.1.conf.in
@@ -28,3 +28,5 @@
--without-junit
--without-myspell-dicts
--without-system-poppler
+--without-system-mesa-headers
+--without-stlport
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 128e797..b984f07 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2337,6 +2337,21 @@ oox-smartart-import.diff, thorsten
sled10-splash.diff, i#123456, pmladek
openlockedquerybox-alwaysontop.diff, n#656566, tml
+[ SUSE101 ]
+# fix build with the old autoconf
+build-sled10-autoconf.diff
+# fix ixon build with internal boost
+# FIXME: it is a hack:
+# * the tools ixion-parser ixion-sorter require boost/program_options.hpp
+# and the related library; we would need jam and some hacks in
+# the internal boost to provide it => it might be easier to make
+# the ixion-parser ixion-sorter optional; they are not needed in LO
+# * AC_PROG_GREP, _AS_ECHO_LOG, _AC_DO_STDERR are not provided by
+# autoconf-2.59
+# * change to AC_PREREQ([2.59]) is not valid because the original
+# boost.m4 can't be procced by it
+build-sled10-ixion-with-internal-boost.diff
+
[ Fixes ]
svx-ppt-bullet-offset-fix.diff, n#593609, rodo
diff --git a/patches/dev300/build-java-1.4-l10ntools.diff b/patches/dev300/build-java-1.4-l10ntools.diff
index 6d343a7..af4767f 100644
--- a/patches/dev300/build-java-1.4-l10ntools.diff
+++ b/patches/dev300/build-java-1.4-l10ntools.diff
@@ -1,15 +1,20 @@
---- l10ntools/java/jpropex/java/JPropEx.java.old 2010-07-22 13:49:22.000000000 +0200
-+++ l10ntools/java/jpropex/java/JPropEx.java 2010-08-06 19:27:55.000000000 +0200
-@@ -139,8 +139,11 @@ public class JPropEx
+--- l10ntools/java/jpropex/java/JPropEx.java.old 2010-11-11 16:22:47.000000000 +0100
++++ l10ntools/java/jpropex/java/JPropEx.java 2010-12-22 14:36:51.000000000 +0100
+@@ -143,11 +143,14 @@ public class JPropEx
{
- String path = makeAbs( filename );
- //String path = makeAbs( inputFileArg );
-- path = path.replace( rootArg + "/" , "" );
-- path = path.replace("/","\\");
+ String path = makeAbs( filename ).trim();
+ String myRootArg = makeAbs( rootArg ).trim();
+- myRootArg = myRootArg.replace( "\\","/");
+ // FIXME: we use .replaceAll only with Java 1.4
+ // it is not safe because rootArg should not be treated as regular expression
+ // it is only a helper tool, so the hack with replaceAll might be acceptable just for building on the very old system
-+ path = path.replaceAll( rootArg + "/" , "" );
++ myRootArg = myRootArg.replaceAll( "\\","/");
+ myRootArg += "/";
+- path = path.replace("\\","/");
+- path = path.replace( myRootArg, "" );
+- path = path.replace("/","\\");
++ path = path.replaceAll("\\","/");
++ path = path.replaceAll( myRootArg, "" );
+ path = path.replaceAll("/","\\");
// TODO: Make this static
java.text.SimpleDateFormat dateformat = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
diff --git a/patches/dev300/build-java-1.4-wizards.diff b/patches/dev300/build-java-1.4-wizards.diff
index c617ca4..2ed8c5b 100644
--- a/patches/dev300/build-java-1.4-wizards.diff
+++ b/patches/dev300/build-java-1.4-wizards.diff
@@ -310,15 +310,12 @@ diff -purN wizards.old/com/sun/star/wizards/db/DatabaseObjectWizard.java wizards
diff -purN wizards.old/com/sun/star/wizards/db/DBMetaData.java wizards/com/sun/star/wizards/db/DBMetaData.java
--- wizards.old/com/sun/star/wizards/db/DBMetaData.java 2010-08-25 22:34:06.000000000 +0200
+++ wizards/com/sun/star/wizards/db/DBMetaData.java 2010-09-07 20:11:52.000000000 +0200
-@@ -218,9 +218,9 @@ public class DBMetaData
+@@ -211,7 +211,7 @@ public class DBMetaData
{
this.xMSF = xMSF;
xDatabaseContext = (XInterface) xMSF.createInstance("com.sun.star.sdb.DatabaseContext");
- xNameAccess = UnoRuntime.queryInterface( XNameAccess.class, xDatabaseContext );
+ xNameAccess = (XNameAccess) UnoRuntime.queryInterface( XNameAccess.class, xDatabaseContext );
- XInterface xInteractionHandler = (XInterface) xMSF.createInstance("com.sun.star.task.InteractionHandler");
-- oInteractionHandler = UnoRuntime.queryInterface( XInteractionHandler.class, xInteractionHandler );
-+ oInteractionHandler = (XInteractionHandler) UnoRuntime.queryInterface( XInteractionHandler.class, xInteractionHandler );
DataSourceNames = xNameAccess.getElementNames();
}
catch (Exception exception)
@@ -390,13 +387,11 @@ diff -purN wizards.old/com/sun/star/wizards/db/DBMetaData.java wizards/com/sun/s
if (xDocu != null)
{
xModel = xDocu.getDatabaseDocument();
-@@ -601,8 +600,8 @@ public class DBMetaData
+@@ -586,7 +586,7 @@ public class DBMetaData
public void getDataSourceInterfaces() throws Exception
{
-- xCompleted = UnoRuntime.queryInterface( XCompletedConnection.class, getDataSource() );
- xDataSourcePropertySet = UnoRuntime.queryInterface( XPropertySet.class, getDataSource() );
-+ xCompleted = (XCompletedConnection) UnoRuntime.queryInterface( XCompletedConnection.class, getDataSource() );
+ xDataSourcePropertySet = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, getDataSource() );
bPasswordIsRequired = ((Boolean) xDataSourcePropertySet.getPropertyValue("IsPasswordRequired")).booleanValue();
}
@@ -521,7 +516,7 @@ diff -purN wizards.old/com/sun/star/wizards/db/DBMetaData.java wizards/com/sun/s
return xFormNameAccess.hasByName(_sFormName);
}
-@@ -946,23 +945,23 @@ public class DBMetaData
+@@ -930,23 +930,23 @@ public class DBMetaData
{
try
{
@@ -536,8 +531,9 @@ diff -purN wizards.old/com/sun/star/wizards/db/DBMetaData.java wizards/com/sun/s
NamedValueCollection creationArgs = new NamedValueCollection();
creationArgs.put( "Name", basename );
creationArgs.put( "URL", documentURL );
- creationArgs.put( "AsTemplate", new Boolean( i_createTemplate ) );
+- creationArgs.put( "AsTemplate", i_createTemplate );
- XMultiServiceFactory xDocMSF = UnoRuntime.queryInterface( XMultiServiceFactory.class, _xDocNameAccess );
++ creationArgs.put( "AsTemplate", new Boolean(i_createTemplate) );
+ XMultiServiceFactory xDocMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( XMultiServiceFactory.class, _xDocNameAccess );
Object oDBDocument = xDocMSF.createInstanceWithArguments( "com.sun.star.sdb.DocumentDefinition", creationArgs.getPropertyValues() );
- XHierarchicalNameContainer xHier = UnoRuntime.queryInterface( XHierarchicalNameContainer.class, _xDocNameAccess );
@@ -757,15 +753,44 @@ diff -purN wizards.old/com/sun/star/wizards/query/CallQueryWizard.java wizards/c
diff -purN wizards.old/com/sun/star/wizards/query/QueryWizard.java wizards/com/sun/star/wizards/query/QueryWizard.java
--- wizards.old/com/sun/star/wizards/query/QueryWizard.java 2010-08-25 22:34:06.000000000 +0200
+++ wizards/com/sun/star/wizards/query/QueryWizard.java 2010-09-07 20:11:52.000000000 +0200
-@@ -140,7 +140,7 @@ public class QueryWizard extends Databas
+@@ -197,7 +197,7 @@ public class QueryWizard extends Databas
buildSteps();
- this.CurDBCommandFieldSelection.preselectCommand( m_wizardContext, false );
+ this.m_DBCommandFieldSelectio.preselectCommand( m_wizardContext, false );
- XWindowPeer windowPeer = UnoRuntime.queryInterface( XWindowPeer.class, m_frame.getContainerWindow() );
+ XWindowPeer windowPeer = (XWindowPeer) UnoRuntime.queryInterface( XWindowPeer.class, m_frame.getContainerWindow() );
createWindowPeer(windowPeer);
- CurDBMetaData.setWindowPeer(this.xControl.getPeer());
+ m_DBMetaData.setWindowPeer(this.xControl.getPeer());
insertQueryRelatedSteps();
+@@ -467,8 +467,8 @@ public class QueryWizard extends Databas
+ private void enableWizardSteps(String[] NewItems)
+ {
+ boolean bEnabled = NewItems.length > 0;
+- setControlProperty("btnWizardNext", "Enabled", bEnabled);
+- setControlProperty("btnWizardFinish", "Enabled", bEnabled);
++ setControlProperty("btnWizardNext", "Enabled", new Boolean(bEnabled));
++ setControlProperty("btnWizardFinish", "Enabled", new Boolean(bEnabled));
+ enableRoadmapItems(NewItems, bEnabled); // Note: Performancewise this could be improved
+ }
+
+@@ -508,7 +508,7 @@ public class QueryWizard extends Databas
+ else
+ {
+ boolean bEnabled = (m_groupFieldSelection.getSelectedFieldNames().length > 0);
+- Helper.setUnoPropertyValue(getRoadmapItemByID(SOGROUPFILTER_PAGE), "Enabled", bEnabled);
++ Helper.setUnoPropertyValue(getRoadmapItemByID(SOGROUPFILTER_PAGE), "Enabled", new Boolean(bEnabled));
+ }
+ }
+
+@@ -541,7 +541,7 @@ public class QueryWizard extends Databas
+ }
+ else
+ {
+- Helper.setUnoPropertyValue(getRoadmapItemByID(SOGROUPFILTER_PAGE), "Enabled", bEnabled);
++ Helper.setUnoPropertyValue(getRoadmapItemByID(SOGROUPFILTER_PAGE), "Enabled", new Boolean(bEnabled));
+ }
+ }
+ }
diff -purN wizards.old/com/sun/star/wizards/report/CallReportWizard.java wizards/com/sun/star/wizards/report/CallReportWizard.java
--- wizards.old/com/sun/star/wizards/report/CallReportWizard.java 2010-08-25 22:34:06.000000000 +0200
+++ wizards/com/sun/star/wizards/report/CallReportWizard.java 2010-09-07 20:11:52.000000000 +0200
@@ -1208,37 +1233,51 @@ diff -purN wizards.old/com/sun/star/wizards/ui/FilterComponent.java wizards/com/
if (Index < oControlRows.length)
{
boolean bValue = oControlRows[Index - 1].isConditionComplete();
-@@ -289,9 +289,9 @@ public class FilterComponent
+@@ -243,19 +243,18 @@ public class FilterComponent
final String serviceName = "com.sun.star.beans.PropertyBag";
final XPropertyContainer column = (XPropertyContainer) UnoRuntime.queryInterface(XPropertyContainer.class, oQueryMetaData.xMSF.createInstance(serviceName));
- column.addProperty("Type", PropertyAttribute.BOUND, DataType.VARCHAR);
+ column.addProperty("Type", PropertyAttribute.BOUND, new Integer(DataType.VARCHAR));
column.addProperty("Name", PropertyAttribute.BOUND, "");
+ column.addProperty("Value", (short)( PropertyAttribute.MAYBEVOID | PropertyAttribute.REMOVABLE ), null );
- final XPropertySet columnSet = UnoRuntime.queryInterface(XPropertySet.class, column);
+ final XPropertySet columnSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, column);
- if ( oQueryMetaData.getSQLQueryComposer().getQuery().length() == 0)
+ if ( composer.getQuery().length() == 0)
{
-@@ -320,7 +320,8 @@ public class FilterComponent
+ final String fromClause = composer.getFromClause();
+- StringBuilder sql = new StringBuilder();
+- sql.append(composer.getSelectClause(true));
+- sql.append(' ');
+- sql.append(fromClause);
+- composer.getQueryComposer().setElementaryQuery(sql.toString());
++ String sql = composer.getSelectClause(true);
++ sql += " ";
++ sql += fromClause;
++ composer.getQueryComposer().setElementaryQuery(sql);
+ }
+ composer.getQueryComposer().setStructuredFilter( new PropertyValue[][] {} );
+ for (int i = 0; i < RowCount; i++)
+@@ -275,7 +275,8 @@ public class FilterComponent
{
case DataType.TIMESTAMP:
case DataType.DATE:
- value = ((Double)value) - oQueryMetaData.getNullDateCorrection();
-+ double correctedValue = ((Double)value).doubleValue() - oQueryMetaData.getNullDateCorrection();
++ double correctedValue = ((Double)value).doubleValue() - oQueryMetaData.getNullDateCorrection();
+ value = new Double(correctedValue);
break;
}
- column.addProperty("Value", PropertyAttribute.MAYBEVOID, value);
-@@ -336,7 +337,7 @@ public class FilterComponent
+ column.removeProperty( "Value" );
+@@ -302,7 +303,7 @@ public class FilterComponent
PropertyValue aduplicatecondition = filterconditions[iduplicate[0]][iduplicate[1]];
String smsgDuplicateCondition = getDisplayCondition(sDuplicateCondition, aduplicatecondition, null);
CurUnoDialog.showMessageBox("WarningBox", VclWindowPeerAttribute.OK, smsgDuplicateCondition);
- CurUnoDialog.vetoableChange(new java.beans.PropertyChangeEvent(CurUnoDialog, "Steps", Integer.valueOf(1), Integer.valueOf(2)));
-+ CurUnoDialog.vetoableChange(new java.beans.PropertyChangeEvent(CurUnoDialog, "Steps", new Integer(1), new Integer(2)));
- return new PropertyValue[][]
- {
- };
++ CurUnoDialog.vetoableChange(new java.beans.PropertyChangeEvent(CurUnoDialog, "Steps", new Integer(1), new Integer(2)));
+ return new PropertyValue[][]{};
+ }
+ }
@@ -448,7 +449,7 @@ public class FilterComponent
{
this.curHelpID = _firstHelpID;
@@ -1390,11 +1429,13 @@ diff -purN wizards.old/com/sun/star/wizards/ui/FilterComponent.java wizards/com/
});
ControlElements[SOTXTVALUE] = (XInterface) CurUnoDialog.insertFormattedField("txtValue" + sCompSuffix, SO_TEXTFIELDLIST[Index], new TextListenerImpl(),
new String[]
-@@ -767,13 +768,13 @@ public class FilterComponent
+@@ -771,14 +772,14 @@ public class FilterComponent
+ },
new Object[]
{
- Boolean.valueOf(isEnabled()),
+- Boolean.valueOf(isEnabled()),
- Integer.valueOf(13),
++ new Boolean(isEnabled()),
+ new Integer(13),
"HID:" + _firstRowHelpID++,
- Integer.valueOf(nPosX3),
@@ -1407,9 +1448,9 @@ diff -purN wizards.old/com/sun/star/wizards/ui/FilterComponent.java wizards/com/
+ new Short(curtabindex++),
+ new Integer(nValueWidth)
});
-
- // ControlElements[6] = CurUnoDialog.insertListBox((new StringBuilder()).append("lstBoolean").append(sCompSuffix).toString(), SO_BOOLEANLIST[Index], null, new ItemListenerImpl(), new String[] {
-@@ -909,10 +910,10 @@ public class FilterComponent
+ }
+ catch (Exception exception)
+@@ -807,10 +807,10 @@ public class FilterComponent
else if (AnyConverter.isBoolean(_filtercondition.Value))
{
boolean b = AnyConverter.toBoolean(_filtercondition.Value);
diff --git a/patches/dev300/build-sled10-autoconf.diff b/patches/dev300/build-sled10-autoconf.diff
new file mode 100644
index 0000000..7f77b2c
--- /dev/null
+++ b/patches/dev300/build-sled10-autoconf.diff
@@ -0,0 +1,13 @@
+--- boost.m4.old 2010-12-21 21:52:42.000000000 +0100
++++ boost.m4 2010-12-22 12:06:23.000000000 +0100
+@@ -1015,8 +1015,8 @@ boost_use_source=:
+ # If we already have a .o, re-use it. We change $ac_ext so that $ac_link
+ # tries to link the existing object file instead of compiling from source.
+ test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false &&
+- _AS_ECHO_LOG([re-using the existing conftest.$ac_objext])
+-AS_IF([_AC_DO_STDERR($ac_link) && {
++ AC_MSG_NOTICE([re-using the existing conftest.$ac_objext])
++AS_IF([_AC_EVAL_STDERR($ac_link) && {
+ test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
diff --git a/patches/dev300/build-sled10-ixion-with-internal-boost.diff b/patches/dev300/build-sled10-ixion-with-internal-boost.diff
new file mode 100644
index 0000000..87817c0
--- /dev/null
+++ b/patches/dev300/build-sled10-ixion-with-internal-boost.diff
@@ -0,0 +1,109 @@
+--- ixion/makefile.mk.old 2010-12-22 14:51:11.000000000 +0100
++++ ixion/makefile.mk 2010-12-22 20:32:45.000000000 +0100
+@@ -38,14 +38,19 @@ TARGET=ixion
+
+ TARFILE_NAME=ixion-0.2.0
+ TARFILE_MD5=0f63ee487fda8f21fafa767b3c447ac9
+-#PATCH_FILES=$(TARFILE_NAME).diff
++PATCH_FILES=ixion-0.2.0-internal-boost.patch
+ .IF "$(GUI)" != "UNX"
+ BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
+ BUILD_DIR=src$/libixion
+ .ELSE
+ CONFIGURE_DIR=
+-CONFIGURE_ACTION=.$/configure
+ CONFIGURE_FLAGS=--disable-shared --with-pic
++.IF "$(SYSTEM_BOOST)" == "YES"
++CONFIGURE_ACTION=.$/configure
++.ELSE # "$(SYSTEM_BOOST)" == "YES"
++CONFIGURE_FLAGS += --with-boost=$(SOLARVERSION)/$(INPATH)
++CONFIGURE_ACTION=aclocal -I m4 && autoconf -I m4 && automake && .$/configure
++.ENDIF # "$(SYSTEM_BOOST)" == "YES"
+ BUILD_ACTION=$(GNUMAKE)
+ BUILD_DIR=$(CONFIGURE_DIR)
+ OUT2LIB+=src/libixion/.libs$/libixion*.a
+--- ixion/ixion-0.2.0-internal-boost.patch.old 2010-12-22 20:32:36.000000000 +0100
++++ ixion/ixion-0.2.0-internal-boost.patch 2010-12-22 20:29:23.000000000 +0100
+@@ -0,0 +1,82 @@
++--- misc/build/ixion-0.2.0/configure.ac.old 2010-09-09 13:42:44.000000000 +0200
+++++ misc/build/ixion-0.2.0/configure.ac 2010-12-22 19:28:49.000000000 +0100
++@@ -11,7 +11,7 @@ m4_define([ixion_api_version],
++ [ixion_major_version.ixion_minor_api_version])
++
++
++-AC_PREREQ([2.63])
+++AC_PREREQ([2.59])
++ AC_INIT([ixion], [ixion_version])
++ AM_INIT_AUTOMAKE
++
++@@ -50,10 +50,9 @@ AC_CHECK_FUNCS([gettimeofday])
++
++ BOOST_REQUIRE([$BOOST_VERSION])
++ BOOST_THREADS
++-BOOST_PROGRAM_OPTIONS
++ BOOST_UNORDERED
++
++-CXXFLAGS="-D_REENTRANT"
+++CXXFLAGS="-D_REENTRANT $BOOST_CPPFLAGS"
++ AC_DEFINE(CXXFLAGS)
++
++ AC_CONFIG_FILES([Makefile
++--- misc/build/ixion-0.2.0/m4/boost.m4.old 2010-09-09 13:42:00.000000000 +0200
+++++ misc/build/ixion-0.2.0/m4/boost.m4 2010-12-22 17:36:21.000000000 +0100
++@@ -89,7 +89,6 @@ rm -rf conftest*
++ # Otherwise aborts with an error message.
++ AC_DEFUN([BOOST_REQUIRE],
++ [AC_REQUIRE([AC_PROG_CXX])dnl
++-AC_REQUIRE([AC_PROG_GREP])dnl
++ echo "$as_me: this is boost.m4[]_BOOST_SERIAL" >&AS_MESSAGE_LOG_FD
++ boost_save_IFS=$IFS
++ boost_version_req=$1
++@@ -131,7 +130,7 @@ m4_pattern_allow([^BOOST_VERSION$])dnl
++ case $with_boost in #(
++ ''|yes) set x '' /opt/local/include /usr/local/include /opt/include \
++ /usr/include C:/Boost/include;; #(
++- *) set x "$with_boost/include" "$with_boost";;
+++ *) set x "$with_boost/include" "$with_boost/inc" "$with_boost";;
++ esac
++ shift
++ for boost_dir
++@@ -146,7 +145,7 @@ m4_pattern_allow([^BOOST_VERSION$])dnl
++ #
++ # I didn't indent this loop on purpose (to avoid over-indented code)
++ boost_layout_system_search_list=`cd "$boost_dir" 2>/dev/null \
++- && ls -1 | "${GREP}" '^boost-' | sort -rn -t- -k2 \
+++ && ls -1 | grep '^boost-' | sort -rn -t- -k2 \
++ && echo .`
++ for boost_inc in $boost_layout_system_search_list
++ do
++@@ -1017,8 +1016,8 @@ boost_use_source=:
++ # If we already have a .o, re-use it. We change $ac_ext so that $ac_link
++ # tries to link the existing object file instead of compiling from source.
++ test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false &&
++- _AS_ECHO_LOG([re-using the existing conftest.$ac_objext])
++-AS_IF([_AC_DO_STDERR($ac_link) && {
+++ AC_MSG_NOTICE([re-using the existing conftest.$ac_objext])
+++AS_IF([_AC_EVAL_STDERR($ac_link) && {
++ test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext && {
++--- misc/build/ixion-0.2.0/src/Makefile.am.old 2010-09-07 16:10:23.000000000 +0200
+++++ misc/build/ixion-0.2.0/src/Makefile.am 2010-12-22 20:11:36.000000000 +0100
++@@ -2,16 +2,7 @@ SUBDIRS = libixion .
++
++ INCLUDES = -I$(top_srcdir)/inc
++
++-bin_PROGRAMS = ixion-parser ixion-sorter
++-ixion_parser_SOURCES = ixion_parser.cpp
++-ixion_parser_LDADD = libixion/libixion- at IXION_API_VERSION@.la \
++- $(BOOST_THREAD_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS)
++-ixion_parser_CPPFLAGS = -I$(top_builddir)/lib/libixion/libixion.la
++-
++-ixion_sorter_SOURCES = ixion_sorter.cpp
++-ixion_sorter_LDADD = libixion/libixion- at IXION_API_VERSION@.la \
++- $(BOOST_THREAD_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS)
++-ixion_sorter_CPPFLAGS = -I$(top_builddir)/lib/libixion/libixion.la
+++bin_PROGRAMS =
++
++ TESTS_ENVIRONMENT = $(SHELL) ./ixion-parser
++ TESTS = $(top_srcdir)/test/01-simple-arithmetic.txt \
diff --git a/patches/dev300/libxmlsec-system-nss.diff b/patches/dev300/libxmlsec-system-nss.diff
index 5b2ce35..55aa28e 100644
--- a/patches/dev300/libxmlsec-system-nss.diff
+++ b/patches/dev300/libxmlsec-system-nss.diff
@@ -27,18 +27,16 @@
+ fi
+
+ if test "z$NSS_FOUND" = "zno" ; then
---- libxmlsec/makefile.mk.old 2009-10-15 14:52:41.000000000 +0200
-+++ libxmlsec/makefile.mk 2009-10-28 22:09:40.000000000 +0100
-@@ -65,7 +65,8 @@ PATCH_FILES=\
+--- libxmlsec/makefile.mk.old 2010-11-11 16:35:21.000000000 +0100
++++ libxmlsec/makefile.mk 2010-12-20 18:45:39.000000000 +0100
+@@ -61,6 +61,7 @@ PATCH_FILES=\
+ xmlsec1-configure.patch \
+ xmlsec1-configure-libxml-libxslt.patch \
+ xmlsec1-olderlibxml2.patch \
++ xmlsec1-broken-system-nss.patch \
+ xmlsec1-nssdisablecallbacks.patch \
+ xmlsec1-customkeymanage.patch \
xmlsec1-nssmangleciphers.patch \
- xmlsec1-noverify.patch \
- xmlsec1-mingw32.patch \
-- xmlsec1-mingw-keymgr-mscrypto.patch
-+ xmlsec1-mingw-keymgr-mscrypto.patch \
-+ xmlsec1-broken-system-nss.patch
-
-
- ADDITIONAL_FILES= \
@@ -153,7 +154,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
.ENDIF
diff --git a/patches/dev300/sled10-splash.diff b/patches/dev300/sled10-splash.diff
index 20076e7..f27f907 100644
--- a/patches/dev300/sled10-splash.diff
+++ b/patches/dev300/sled10-splash.diff
@@ -5,8 +5,8 @@
REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb
REGISTRATIONURL http://survey.libreoffice.org/user/index.php
- PROGRESSBARCOLOR 126,170,23
-- PROGRESSSIZE 320,7
-- PROGRESSPOSITION 165,186
+- PROGRESSSIZE 319,10
+- PROGRESSPOSITION 164,225
- PROGRESSFRAMECOLOR 207,208,211
+ PROGRESSBARCOLOR 4,68,155
+ PROGRESSSIZE 412,7
More information about the Libreoffice-commits
mailing list