[ooo-build-commit] .: 6 commits - configure.in oowintool scp2/source set_soenv.in stlport/STLport-4.0.patch
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Sep 14 02:35:22 PDT 2010
configure.in | 42 +++++++++++++++++++++
oowintool | 1
scp2/source/graphicfilter/file_graphicfilter.scp | 1
scp2/source/graphicfilter/module_graphicfilter.scp | 2 -
scp2/source/ooo/file_library_ooo.scp | 2 +
scp2/source/writer/module_writer.scp | 2 -
scp2/source/writer/registryitem_writer.scp | 9 ++++
set_soenv.in | 6 +++
stlport/STLport-4.0.patch | 17 ++++++++
9 files changed, 80 insertions(+), 2 deletions(-)
New commits:
commit 1959fe3f93de6e1c6ea97eea1da4e78891f58aa8
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 11:29:54 2010 +0200
wpgimporter.diff: WPG Import filter
diff --git a/configure.in b/configure.in
index bcf96e1..29d808d 100644
--- a/configure.in
+++ b/configure.in
@@ -346,6 +346,9 @@ AC_ARG_WITH(system-libwpd,
AC_ARG_WITH(system-libwps,
[ --with-system-libwps Use libwps already on system
],,)
+AC_ARG_WITH(system-libwpg,
+[ --with-system-libwpg Use libwpg already on system
+],,)
AC_ARG_WITH(system-libxml,
[ --with-system-libxml Use libxml already on system
],,)
@@ -3712,6 +3715,24 @@ AC_SUBST(LIBWPS_CFLAGS)
AC_SUBST(LIBWPS_LIBS)
dnl ===================================================================
+dnl Check for system libwpg
+dnl ===================================================================
+AC_MSG_CHECKING([which libwpg to use])
+if test -n "$with_system_libwpg" -o -n "$with_system_libs" && \
+ test "$with_system_libwpg" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_LIBWPG=YES
+ PKG_CHECK_MODULES( LIBWPG, libwpg-0.1 )
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_LIBWPG=NO
+ BUILD_TYPE="$BUILD_TYPE LIBWPG"
+fi
+AC_SUBST(SYSTEM_LIBWPG)
+AC_SUBST(LIBWPG_CFLAGS)
+AC_SUBST(LIBWPG_LIBS)
+
+dnl ===================================================================
dnl Check whether freetype2 supports emboldening
dnl ===================================================================
if test "$test_freetype" = "yes"; then
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index 2cd0f53..4ba30a6 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -38,3 +38,4 @@ STD_UNO_LIB_FILE( gid_File_Lib_Flash, flash )
STD_UNO_LIB_FILE( gid_File_Lib_Svg, svgfilter )
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_WPGImport, wpgimport )
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp
index d5d9996..5b6dffb 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -33,6 +33,6 @@ Module gid_Module_Optional_Grfflt
Sortkey = "600";
ParentID = gid_Module_Optional;
Default = YES;
- Files = (gid_File_Lib_Svg, gid_File_Lib_Flash,
+ Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport,
gid_File_Share_Registry_Graphicfilter_Xcd);
End
diff --git a/set_soenv.in b/set_soenv.in
index 75f8b69..977f93e 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1863,6 +1863,9 @@ ToFile( "LIBWPD_LIBS", "@LIBWPD_LIBS@", "e" );
ToFile( "SYSTEM_LIBWPS", "@SYSTEM_LIBWPS@", "e" );
ToFile( "LIBWPS_CFLAGS", "@LIBWPS_CFLAGS@", "e" );
ToFile( "LIBWPS_LIBS", "@LIBWPS_LIBS@", "e" );
+ToFile( "SYSTEM_LIBWPG", "@SYSTEM_LIBWPG@", "e" );
+ToFile( "LIBWPG_CFLAGS", "@LIBWPG_CFLAGS@", "e" );
+ToFile( "LIBWPG_LIBS", "@LIBWPG_LIBS@", "e" );
ToFile( "SYSTEM_CPPUNIT", "@SYSTEM_CPPUNIT@", "e" );
ToFile( "CPPUNIT_CFLAGS", "@CPPUNIT_CFLAGS@", "e" );
ToFile( "CPPUNIT_LIBS", "@CPPUNIT_LIBS@", "e" );
commit f22f8b767d72720ba8ac4497eb130f0166b150fb
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 11:18:32 2010 +0200
wps-registry.diff: Register OOo as able to open MS Works files.
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 8c3f0a5..925c887 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -1341,6 +1341,15 @@ RegistryItem gid_Regitem_OpenOffice_WPD_OpenWith_Writer
Value = " ";
End
+// .WPS
+RegistryItem gid_Regitem_OpenOffice_WPS_OpenWith_Writer
+ ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ Subkey = ".wps\OpenWithProgIDs";
+ ModuleID = gid_Module_Prg_Wrt_Bin;
+ Name = "opendocument.WriterDocument.1";
+ Value = " ";
+End
+
// .HWP
RegistryItem gid_Regitem_OpenOffice_HWP_OpenWith_Writer
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
commit 38b74970a4442802ba7bcbd10ed747c20ac76919
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 11:05:38 2010 +0200
wpsimport-scp2.diff: WPS Import filter - packaging bits
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 3c5eea9..4e8c0ef 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -959,6 +959,8 @@ End
STD_UNO_LIB_FILE(gid_File_Lib_Wpft,wpft)
+STD_UNO_LIB_FILE(gid_File_Lib_Msworks,msworks)
+
STD_UNO_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
STD_UNO_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 0d959dd..fc9d52a 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -49,7 +49,7 @@ Module gid_Module_Prg_Wrt_Bin
gid_File_Lib_Swui,
gid_File_Lib_Msword,
gid_File_Lib_Wpft,
- gid_File_Lib_Writerfilter,
+ gid_File_Lib_Msworks,
gid_File_Lib_T602Filter,
gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml,
gid_File_Share_Config_Sofficecfg_Writerweb_Menubar_Xml,
commit 3c04485daf87bd8bad1b1d7803e7e69630a4d91c
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 11:01:32 2010 +0200
wpsimport-config_office.diff: WPS import filter - configure part.
diff --git a/configure.in b/configure.in
index 2acf2ab..bcf96e1 100644
--- a/configure.in
+++ b/configure.in
@@ -343,6 +343,9 @@ AC_ARG_WITH(system-expat,
AC_ARG_WITH(system-libwpd,
[ --with-system-libwpd Use libwpd already on system
],,)
+AC_ARG_WITH(system-libwps,
+[ --with-system-libwps Use libwps already on system
+],,)
AC_ARG_WITH(system-libxml,
[ --with-system-libxml Use libxml already on system
],,)
@@ -3691,6 +3694,24 @@ AC_SUBST(FREETYPE_CFLAGS)
AC_SUBST(FREETYPE_LIBS)
dnl ===================================================================
+dnl Check for system libwps
+dnl ===================================================================
+AC_MSG_CHECKING([which libwps to use])
+if test -n "$with_system_libwps" -o -n "$with_system_libs" && \
+ test "$with_system_libwps" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_LIBWPS=YES
+ PKG_CHECK_MODULES( LIBWPS, libwps-0.1 )
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_LIBWPS=NO
+ BUILD_TYPE="$BUILD_TYPE LIBWPS"
+fi
+AC_SUBST(SYSTEM_LIBWPS)
+AC_SUBST(LIBWPS_CFLAGS)
+AC_SUBST(LIBWPS_LIBS)
+
+dnl ===================================================================
dnl Check whether freetype2 supports emboldening
dnl ===================================================================
if test "$test_freetype" = "yes"; then
diff --git a/set_soenv.in b/set_soenv.in
index 68ff7ca..75f8b69 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1860,6 +1860,9 @@ ToFile( "XRANDR_DLOPEN", "@XRANDR_DLOPEN@", "e" );
ToFile( "SYSTEM_LIBWPD", "@SYSTEM_LIBWPD@", "e" );
ToFile( "LIBWPD_CFLAGS", "@LIBWPD_CFLAGS@", "e" );
ToFile( "LIBWPD_LIBS", "@LIBWPD_LIBS@", "e" );
+ToFile( "SYSTEM_LIBWPS", "@SYSTEM_LIBWPS@", "e" );
+ToFile( "LIBWPS_CFLAGS", "@LIBWPS_CFLAGS@", "e" );
+ToFile( "LIBWPS_LIBS", "@LIBWPS_LIBS@", "e" );
ToFile( "SYSTEM_CPPUNIT", "@SYSTEM_CPPUNIT@", "e" );
ToFile( "CPPUNIT_CFLAGS", "@CPPUNIT_CFLAGS@", "e" );
ToFile( "CPPUNIT_LIBS", "@CPPUNIT_LIBS@", "e" );
commit 69c16b0bff6d505f7b4fab77be2fb025a341a3af
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 10:54:49 2010 +0200
oowintool-java6.diff: Detect java 6 correctly.
diff --git a/oowintool b/oowintool
index 0b4be43..8d2e475 100755
--- a/oowintool
+++ b/oowintool
@@ -265,6 +265,7 @@ sub print_jdk_dir()
{
my $dir =
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.5/JavaHome") ||
+ reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.6/JavaHome") ||
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.4/JavaHome") ||
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.3/JavaHome");
print cygpath($dir, 'w', $output_format);
commit 51b6cbbd54613bb3fbac1aba7621b041192424aa
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 10:39:00 2010 +0200
stlport-solaris-fileno.diff: fix a Solaris build issue
diff --git a/stlport/STLport-4.0.patch b/stlport/STLport-4.0.patch
index 0d262b5..ea21ff9 100644
--- a/stlport/STLport-4.0.patch
+++ b/stlport/STLport-4.0.patch
@@ -3321,6 +3321,23 @@
inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
inline char* _FILE_I_end(const FILE& __f)
***************
+*** 92,98 ****
+ typedef unsigned char* _File_ptr_type;
+ #endif
+
+! inline int _FILE_fd(const FILE& __f) { return __f._file; }
+ inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._base; }
+ inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
+ inline char* _FILE_I_end(const FILE& __f)
+--- 92,98 ----
+ typedef unsigned char* _File_ptr_type;
+ #endif
+
+! inline int _FILE_fd(const FILE& __f) { return fileno(__CONST_CAST(FILE*,&__f)); }
+ inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._base; }
+ inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
+ inline char* _FILE_I_end(const FILE& __f)
+***************
*** 377,382 ****
--- 380,388 ----
# endif
More information about the ooo-build-commit
mailing list