configure.ac | 18 ++++++++----------
lcms2/ExternalProject_lcms2.mk | 1 +
libexttextcat/ExternalPackage_exttextcat.mk | 2 +-
libexttextcat/android.patch | 4 ++--
offapi/org/freedesktop/PackageKit/XModify.idl | 6 +++---
shell/source/sessioninstall/SyncDbusSessionHelper.hxx | 6 +++---
6 files changed, 18 insertions(+), 19 deletions(-)
New commits:
commit 0d08bef014415c37c9914ca1e369e2a436a31e1c
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Nov 12 11:09:51 2012 +0000
fix to make MacOSX run again
Change-Id: I7a021c38e1c2e39641a28d95cc9cc7e3d5ee8225
diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk
index c2fd878..c8d93eb 100644
--- a/lcms2/ExternalProject_lcms2.mk
+++ b/lcms2/ExternalProject_lcms2.mk
@@ -37,6 +37,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
CPPFLAGS=" $(SOLARINC)" \
$(if $(filter-out WNTGCC,$(OS)$(COM)),,CPPFLAGS=" -DCMS_DLL_BUILD") \
$(if $(filter IOS ANDROID,$(OS)), --disable-shared --enable-static,
--enable-shared --disable-static) \
+ $(if $(filter
MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)
\
&& cd src \
&& $(MAKE) \
&& touch $@
commit 15055466e09872b69dbef87e5a37a8cc451d7307
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Nov 12 09:25:22 2012 +0000
fix annoying Ressource typo
Change-Id: Ie6cf3cc8e672ad9499c55bda7c29b50140c6a57a
diff --git a/offapi/org/freedesktop/PackageKit/XModify.idl
b/offapi/org/freedesktop/PackageKit/XModify.idl
index 79e2f79..05cc900 100644
--- a/offapi/org/freedesktop/PackageKit/XModify.idl
+++ b/offapi/org/freedesktop/PackageKit/XModify.idl
@@ -63,21 +63,21 @@ interface XModify : com::sun::star::uno::XInterface
* @since LibreOffice 3.7
*/
- void InstallFontconfigRessources( [in] unsigned long xid, [in] sequence<
string > resources, [in] string interaction);
+ void InstallFontconfigResources( [in] unsigned long xid, [in] sequence<
string > resources, [in] string interaction);
/**
* Installs GStreamer resources ( [in] usually codecs) from a configured
software source.
* @since LibreOffice 3.7
*/
- void InstalliGStreamerRessources( [in] unsigned long xid, [in] sequence<
string > resources, [in] string interaction);
+ void InstalliGStreamerResources( [in] unsigned long xid, [in] sequence<
string > resources, [in] string interaction);
/**
* Installs resources of a given type from a configured software source.
* @since LibreOffice 3.7
*/
- void InstallRessources( [in] unsigned long xid, [in] sequence< string >
types, [in] sequence< string > resources, [in] string interaction);
+ void InstallResources( [in] unsigned long xid, [in] sequence< string >
types, [in] sequence< string > resources, [in] string interaction);
/**
* Removes sequence< string > packages that provide the given local
sequence< string > files.
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
index 4aab68c..6f86ecb 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
@@ -33,11 +33,11 @@ namespace shell { namespace sessioninstall
{ throw ::com::sun::star::uno::RuntimeException(); } // not
implemented
virtual void SAL_CALL InstallMimeTypes( ::sal_uInt32 /* xid */,
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* mime_types */,
const ::rtl::OUString& /* interaction */ ) throw
(::com::sun::star::uno::RuntimeException)
{ throw ::com::sun::star::uno::RuntimeException(); } // not
implemented
- virtual void SAL_CALL InstallFontconfigRessources( ::sal_uInt32 /*
xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* resources
*/, const ::rtl::OUString& /* interaction */ ) throw
(::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL InstallFontconfigResources( ::sal_uInt32 /*
xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* resources
*/, const ::rtl::OUString& /* interaction */ ) throw
(::com::sun::star::uno::RuntimeException)
{ throw ::com::sun::star::uno::RuntimeException(); } // not
implemented
- virtual void SAL_CALL InstalliGStreamerRessources( ::sal_uInt32 /*
xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* resources
*/, const ::rtl::OUString& /* interaction */ ) throw
(::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL InstalliGStreamerResources( ::sal_uInt32 /*
xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* resources
*/, const ::rtl::OUString& /* interaction */ ) throw
(::com::sun::star::uno::RuntimeException)
{ throw ::com::sun::star::uno::RuntimeException(); } // not
implemented
- virtual void SAL_CALL InstallRessources( ::sal_uInt32 /* xid */,
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* types */, const
::com::sun::star::uno::Sequence< ::rtl::OUString >& /* resources */, const
::rtl::OUString& /* interaction */ ) throw
(::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL InstallResources( ::sal_uInt32 /* xid */,
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* types */, const
::com::sun::star::uno::Sequence< ::rtl::OUString >& /* resources */, const
::rtl::OUString& /* interaction */ ) throw
(::com::sun::star::uno::RuntimeException)
{ throw ::com::sun::star::uno::RuntimeException(); } // not
implemented
virtual void SAL_CALL RemovePackageByFiles( SAL_UNUSED_PARAMETER
::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString
>& /* files */, const ::rtl::OUString& /* interaction */ ) throw
(::com::sun::star::uno::RuntimeException)
{ throw ::com::sun::star::uno::RuntimeException(); } // not
implemented
commit 592f1e5b04ed3a2abb3286204b053afe9f2a49a9
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Nov 9 23:27:55 2012 +0000
bump to libexttextcat-3.4.0 for fixed Polish detection
now we are "post convert libexttextcat to gbuild" of
31219f0f97d081d94d927b5c3d08bb8677b22506 and no longer
need the deleted makefile.mk under windows
Change-Id: I1052ab7f6db28182c700f55b25ef897339dc69dd
diff --git a/configure.ac b/configure.ac
index 4978c98..d940aa9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8990,7 +8990,7 @@ if test "$with_system_libexttextcat" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBEXTTEXTCAT=NO
-
LIBEXTTEXTCAT_TARBALL="6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2"
+
LIBEXTTEXTCAT_TARBALL="dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2"
BUILD_TYPE="$BUILD_TYPE LIBEXTTEXTCAT"
fi
AC_SUBST(SYSTEM_LIBEXTTEXTCAT)
diff --git a/libexttextcat/ExternalPackage_exttextcat.mk
b/libexttextcat/ExternalPackage_exttextcat.mk
index cf79b28..6ceb585 100644
--- a/libexttextcat/ExternalPackage_exttextcat.mk
+++ b/libexttextcat/ExternalPackage_exttextcat.mk
@@ -13,7 +13,7 @@ ifneq ($(COM),MSC)
$(eval $(call gb_ExternalPackage_use_external_project,exttextcat,exttextcat))
-$(eval $(call
gb_ExternalPackage_add_file,exttextcat,lib/libexttextcat.a,src/.libs/libexttextcat-1.0.a))
+$(eval $(call
gb_ExternalPackage_add_file,exttextcat,lib/libexttextcat.a,src/.libs/libexttextcat-2.0.a))
ifeq ($(OS),WNT)
$(eval $(call
gb_ExternalPackage_add_file,exttextcat,bin/libexttextcat.dll,src/.libs/libexttextcat.dll))
endif
diff --git a/libexttextcat/android.patch b/libexttextcat/android.patch
index 36abf18..467caba 100644
--- a/libexttextcat/android.patch
+++ b/libexttextcat/android.patch
@@ -1,5 +1,5 @@
---- misc/libexttextcat-3.3.1/config.sub
-+++ misc/build/libexttextcat-3.3.1/config.sub
+--- misc/libexttextcat-3.4.0/config.sub
++++ misc/build/libexttextcat-3.4.0/config.sub
@@ -120,7 +120,7 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
commit 81a7805906da2b10cd268adbf7b3ebe173cfb4ff
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Nov 9 17:11:22 2012 +0000
fiddle system-db test to link on RHEL-6
Change-Id: Ic256a10dd45123ae45024f4e77edd3214bc4c931
diff --git a/configure.ac b/configure.ac
index d4ab49c..4978c98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7489,15 +7489,13 @@ if test "$with_system_db" = "yes"; then
SYSTEM_DB_CFLAGS="-DSYSTEM_DB_HEADER='<$db_header>'"
DB_LIB=
- dnl At least on OpenBSD dbver is not appended to the library
- if test "$_os" = "OpenBSD"; then
- dbver=''
- fi
- for dash in - ''; do
- AC_CHECK_LIB(db$dash$dbver, dbopen,
- [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ])
- AC_CHECK_LIB(db$dash$dbver, __db185_open,
- [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ])
+ dnl At least on OpenBSD and RHEL-6 dbver is not appended to the library
+ dnl even though the headers are in a versioned dir
+ for suffix in '' '-$dbver' '$dbver' ''; do
+ AC_CHECK_LIB(db$suffix, dbopen,
+ [ DB_LIB="db$suffix"; DB_CPPLIB="db_cxx$suffix"; break ])
+ AC_CHECK_LIB(db$suffix, __db185_open,
+ [ DB_LIB="db$suffix"; DB_CPPLIB="db_cxx$suffix"; break ])
done
if test -z "$DB_LIB"; then
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
