[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac writerperfect/source
configure.ac|2 +- writerperfect/source/stream/WPXSvStream.cxx |4 2 files changed, 1 insertion(+), 5 deletions(-) New commits: commit 9a3d3ee99d5e751bd2cb6e64110d944f2dd6b427 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Jul 25 15:43:58 2013 +0200 Use inconditionally the libwpd = 0.9.5 path Since libwpd does not output the version number anymore (cherry picked from commit 93d0e38ccc06060f20073a9461c53f471a1b9c03) Conflicts: writerperfect/source/common/WPXSvStream.cxx Change-Id: I1bc3f7081552795fc2ed33f033a093fa5b40fda8 Reviewed-on: https://gerrit.libreoffice.org/5103 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/configure.ac b/configure.ac index e97379d..21b68cb 100644 --- a/configure.ac +++ b/configure.ac @@ -6996,7 +6996,7 @@ AC_MSG_CHECKING([which libwpd to use]) if test $with_system_libwpd = yes; then AC_MSG_RESULT([external]) SYSTEM_LIBWPD=YES -PKG_CHECK_MODULES( WPD, libwpd-0.9 libwpd-stream-0.9 ) +PKG_CHECK_MODULES( WPD, libwpd-0.9 = 0.9.5 libwpd-stream-0.9 = 0.9.5 ) elif test $_os = iOS; then AC_MSG_RESULT([none]) else diff --git a/writerperfect/source/stream/WPXSvStream.cxx b/writerperfect/source/stream/WPXSvStream.cxx index b058b87..5354b72 100644 --- a/writerperfect/source/stream/WPXSvStream.cxx +++ b/writerperfect/source/stream/WPXSvStream.cxx @@ -99,12 +99,8 @@ int WPXSvInputStream::seek(long offset, WPX_SEEK_TYPE seekType) sal_Int64 tmpOffset = offset; if (seekType == WPX_SEEK_CUR) tmpOffset += tmpPosition; -#if defined(LIBWPD_STREAM_VERSION_MAJOR) defined(LIBWPD_STREAM_VERSION_MINOR) defined(LIBWPD_STREAM_VERSION_REVISION) \ - (LIBWPD_STREAM_VERSION_MAJOR 0 || (LIBWPD_STREAM_VERSION_MAJOR == 0 (LIBWPD_STREAM_VERSION_MINOR 9 \ -|| (LIBWPD_STREAM_VERSION_MINOR == 9 LIBWPD_STREAM_VERSION_REVISION = 5 if (seekType == WPX_SEEK_END) tmpOffset += mnLength; -#endif int retVal = 0; if (tmpOffset 0) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac
configure.ac |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 3d736faef1cfc619f965d80c0eb112dc7c7426e3
Author: Michael Stahl mst...@redhat.com
Date: Fri May 31 15:24:34 2013 +0200
configure: use -isystem for GSTREAMER_CFLAGS
... to work around GCC 4.8.0 -Werror=literal-suffix in gst/video/video.h
definition of GST_VIDEO_CAPS_RGB8_PALETTED.
Change-Id: I514b29d58f348bad0b13c7ef66db4b3ee34516cd
(cherry picked from commit 18b0bda1be62da1b0f9c1fc40864ccc486d5b43c)
Signed-off-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/configure.ac b/configure.ac
index 299ee69..06e7954 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9509,6 +9509,7 @@ if test $build_gstreamer = yes; then
ENABLE_GSTREAMER=TRUE
AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( GSTREAMER, gstreamer-1.0 gstreamer-plugins-base-1.0
gstreamer-video-1.0 )
+GSTREAMER_CFLAGS=`echo $GSTREAMER_CFLAGS | sed -e
\s/-I/${ISYSTEM}/g\`
else
AC_MSG_RESULT([no])
fi
@@ -9528,6 +9529,7 @@ if test $build_gstreamer_0_10 = yes; then
PKG_CHECK_MODULES( [GSTREAMER_0_10], [gstreamer-0.10
gstreamer-plugins-base-0.10 gstreamer-interfaces-0.10],, [
PKG_CHECK_MODULES( [GSTREAMER_0_10], [gstreamer-0.10
gstreamer-plugins-base-0.10] )
])
+GSTREAMER_0_10_CFLAGS=`echo $GSTREAMER_0_10_CFLAGS | sed -e
\s/-I/${ISYSTEM}/g\`
else
AC_MSG_RESULT([no])
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac vcl/Library_vclplug_gtk.mk vcl/unx
configure.ac |2 ++ vcl/Library_vclplug_gtk.mk | 12 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |2 ++ vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx |2 ++ 4 files changed, 18 insertions(+) New commits: commit bfdab9aeb1290f970d11c3704cbb11992c0d6304 Author: Michael Meeks michael.me...@suse.com Date: Sat May 11 17:35:04 2013 +0100 fdo#64311 - don't encourage the fpicker to give us URLs we can't handle. (cherry picked from commit 8659ca5c350b9b08fb5f343c68955cdd6d361c96) Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch Conflicts: config_host/config_vclplug.h.in Change-Id: Ide7d833801e96a3375909238d036687082f34605 Reviewed-on: https://gerrit.libreoffice.org/3881 Reviewed-by: Michael Meeks michael.me...@suse.com Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/configure.ac b/configure.ac index 9a89227..17f792d 100644 --- a/configure.ac +++ b/configure.ac @@ -9266,6 +9266,7 @@ if test $_os != WINNT -a $_os != Darwin -a $enable_gnome_vfs = yes - ENABLE_GNOMEVFS=TRUE AC_MSG_RESULT([yes]) PKG_CHECK_MODULES( GNOMEVFS, gnome-vfs-2.0 = 2.6.0 ) +AC_DEFINE(ENABLE_GNOME_VFS) else AC_MSG_RESULT([no]) fi @@ -9405,6 +9406,7 @@ if test $test_gtk = yes; then ENABLE_GIO=TRUE AC_MSG_RESULT([yes]) PKG_CHECK_MODULES( GIO, gio-2.0 ) +AC_DEFINE(ENABLE_GIO) else AC_MSG_RESULT([no]) fi diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 153498c..86c1c6a 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -37,6 +37,18 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk,\ )) endif +ifeq ($(ENABLE_GIO),TRUE) +$(eval $(call gb_Library_add_defs,vclplug_gtk,\ + -DENABLE_GIO \ +)) +endif + +ifeq ($(ENABLE_GNOMEVFS),TRUE) +$(eval $(call gb_Library_add_defs,vclplug_gtk,\ + -DENABLE_GNOME_VFS \ +)) +endif + $(eval $(call gb_Library_use_sdk_api,vclplug_gtk)) $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index b4f1c6a..f2e1141 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -146,7 +146,9 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference uno::XComponentContext gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT ); +#if defined(ENABLE_GNOME_VFS) || defined (ENABLE_GIO) gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False ); +#endif gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), sal_False ); m_pVBox = gtk_vbox_new( sal_False, 0 ); diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index d062cda..b80d6f5 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -56,7 +56,9 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference uno::XComponentCon GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (char *)NULL ); gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT ); +#if defined(ENABLE_GNOME_VFS) || defined (ENABLE_GIO) gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False ); +#endif gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), sal_False ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac
configure.ac |9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) New commits: commit c3302a23d3539070103584816d554c871b0792b7 Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Mon May 6 22:20:49 2013 +0200 fdo#61092: force ENABLE_QUICKSTART_LIBPNG to None with --enable-headless Fixes compile issues with --enable-headless if png headers are installed. Backport of 37690fe74c4c585564c67c1ff7b8be353cf68033 Change-Id: Ia16b38ae61f485ba62cd2b802a2e1239697be088 Reviewed-on: https://gerrit.libreoffice.org/3802 Reviewed-by: Jan Holesovsky ke...@suse.cz Tested-by: Jan Holesovsky ke...@suse.cz diff --git a/configure.ac b/configure.ac index b196fe9..89feb7f 100644 --- a/configure.ac +++ b/configure.ac @@ -4353,7 +4353,7 @@ if test $enable_headless = yes; then test_tde=no test_kde=no test_kde4=no -test_unix_quickstarter=no +enable_unix_qstart_libpng=no enable_cairo_canvas=no enable_gnome_vfs=no fi @@ -9446,7 +9446,12 @@ AC_SUBST(TELEPATHY_LIBS) dnl === -PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG=TRUE, ENABLE_QUICKSTART_LIBPNG= ) +if test $enable_headless != yes; then +PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG=TRUE, ENABLE_QUICKSTART_LIBPNG= ) +else +LIBPNG_LIBS='' +LIBPNG_CFLAGS='' +fi AC_SUBST(LIBPNG_LIBS) AC_SUBST(LIBPNG_CFLAGS) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac
configure.ac |1 + 1 file changed, 1 insertion(+) New commits: commit 4a36c4544346cdf4d4133bdfc4b9b28e6a7d9743 Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Mon May 6 22:25:25 2013 +0200 configure: with --enable-headless disable opengl by default It makes no sense without a gui, one less one is forced to use with --enable-headless Issue fixed in master in 2ac38d1eac981a411f89b666c6f72aef88fa1f73 Change-Id: I28bd271ca1121070a331cd0a9b1d1ce823ce7c63 Reviewed-on: https://gerrit.libreoffice.org/3803 Reviewed-by: Jan Holesovsky ke...@suse.cz Tested-by: Jan Holesovsky ke...@suse.cz diff --git a/configure.ac b/configure.ac index 89feb7f..9a89227 100644 --- a/configure.ac +++ b/configure.ac @@ -4356,6 +4356,7 @@ if test $enable_headless = yes; then enable_unix_qstart_libpng=no enable_cairo_canvas=no enable_gnome_vfs=no +enable_opengl=no fi dnl === ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ca6943b8462b843a5f99fc3291cef86454f4ac7a Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Sat May 4 19:24:40 2013 +0200 configure: don't enable ENABLE_NPAPI_FROM_BROWSER with --enable-headless This fix a build error since otherwise X libraries are required Backport of 759cc27530a5f58b43721f2d760c9429561a12fd Change-Id: Iba718969dca90563ba9e60aa16944e6de67c7141 Reviewed-on: https://gerrit.libreoffice.org/3786 Reviewed-by: Andras Timar ati...@suse.com Tested-by: Andras Timar ati...@suse.com diff --git a/configure.ac b/configure.ac index 390b3eb..b196fe9 100644 --- a/configure.ac +++ b/configure.ac @@ -8304,7 +8304,7 @@ dnl === dnl Check for NPAPI interface to plug browser plugins into LibreOffice documents dnl === AC_MSG_CHECKING([whether to plug browser plugins into LibreOffice documents]) -if test $_os != Android -a $_os != iOS +if test $_os != Android -a $_os != iOS -a $enable_headless != yes then AC_MSG_RESULT([yes]) ENABLE_NPAPI_FROM_BROWSER=YES ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac
configure.ac |1 + 1 file changed, 1 insertion(+) New commits: commit 2c40a112923bf1c4441ea76bb8fe3a7a8aa10bef Author: Benedikt Morbach benedikt.morb...@googlemail.com Date: Sun Mar 10 15:19:09 2013 +0100 fdo#62110: GLU also needs -lGL to link Change-Id: Ida9d03564cf003cae282792f0daf5945cff34108 (cherry picked from commit fac49ace812a15ba10d30a3735b61ae30ac287c5) Signed-off-by: Michael Stahl mst...@redhat.com Conflicts: configure.ac diff --git a/configure.ac b/configure.ac index c561981..390b3eb 100644 --- a/configure.ac +++ b/configure.ac @@ -9548,6 +9548,7 @@ else AC_MSG_RESULT([yes]) AC_CHECK_LIB([GL], [main], [:], [AC_MSG_ERROR(libGL not installed or functional)], []) +LDFLAGS=$LDFLAGS -lGL AC_CHECK_LIB([GLU], [main], [:], [AC_MSG_ERROR(libGLU not installed or functional)], []) ENABLE_OPENGL=TRUE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f37c63e8cb203d9303a994a0369a2fab1e88d7ba Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Feb 27 15:37:22 2013 +0100 we need system libcmis 0.3.1 now Conflicts: configure.ac Change-Id: I6919a7630f1afc1524cf2f21482f40fc9aebf0c6 Reviewed-on: https://gerrit.libreoffice.org/2442 Reviewed-by: Niko Rönkkö ron...@iki.fi Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/configure.ac b/configure.ac index f07e35d..c561981 100644 --- a/configure.ac +++ b/configure.ac @@ -6957,7 +6957,7 @@ AC_MSG_CHECKING([which libcmis to use]) if test $with_system_libcmis = yes; then AC_MSG_RESULT([external]) SYSTEM_LIBCMIS=YES -PKG_CHECK_MODULES( CMIS, libcmis-0.3 = 0.3.0 ) +PKG_CHECK_MODULES( CMIS, libcmis-0.3 = 0.3.1 ) else AC_MSG_RESULT([internal]) SYSTEM_LIBCMIS=NO ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 91f86bd3ae0afa90f7ce5302b6cdb54c5338b128 Author: Norbert Thiebaud nthieb...@gmail.com Date: Mon Feb 11 13:37:15 2013 -0600 do not codesign by default on Mac. only codsigne if explicitely asked Change-Id: I0173599672755de30b0517291f3b64654988f7b8 (cherry picked from commit a2a8a159df82bc5e75c0c56af6ffef0f024c7b1d) Signed-off-by: Thorsten Behrens tbehr...@suse.com diff --git a/configure.ac b/configure.ac index e293023..f07e35d 100644 --- a/configure.ac +++ b/configure.ac @@ -2828,7 +2828,7 @@ if test $_os = Darwin; then AC_MSG_CHECKING([whether to do code signing]) -if test -z $enable_macosx_code_signing -o $enable_macosx_code_signing = yes; then +if test $enable_macosx_code_signing = yes; then # By default use the first suitable certificate (?). # http://stackoverflow.com/questions/13196291/difference-between-mac-developer-and-3rd-party-mac-developer-application ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 90ef7668265e7187d61842ec8950aa91770a53da Author: Andras Timar ati...@suse.com Date: Fri Feb 22 12:19:06 2013 +0100 fdo#54087 build npsoplugin on Windows, it does not depend on GTK+ there Change-Id: I033ee2316337dab549f1beddbfb7919a35d73c8e Reviewed-on: https://gerrit.libreoffice.org/2334 Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com diff --git a/configure.ac b/configure.ac index bc36fc1..e293023 100644 --- a/configure.ac +++ b/configure.ac @@ -8318,7 +8318,7 @@ dnl === dnl Check for NPAPI interface to plug LibreOffice into browser windows dnl === AC_MSG_CHECKING([whether to plug LibreOffice into browser windows]) -if test $_os != Android -a $_os != Darwin -a $_os != iOS -a \ +if test $_os == WINNT -o $_os != Android -a $_os != Darwin -a $_os != iOS -a \ $enable_headless != yes -a $enable_gtk != no then AC_MSG_RESULT([yes]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac sd/CppunitTest_sd_uimpress.mk sd/Library_sd.mk sd/source
configure.ac|2 sd/CppunitTest_sd_uimpress.mk | 11 sd/Library_sd.mk| 22 + sd/source/ui/remotecontrol/BluetoothServer.cxx | 299 +++- sd/source/ui/remotecontrol/BluetoothServer.hxx |2 sd/source/ui/remotecontrol/BluetoothServer.mm |1 sd/source/ui/remotecontrol/BufferedStreamSocket.hxx | 12 sd/source/ui/remotecontrol/Communicator.cxx |2 sd/source/ui/remotecontrol/Communicator.hxx | 10 sd/source/ui/remotecontrol/IBluetoothSocket.hxx | 41 ++ sd/source/ui/remotecontrol/OSXBluetooth.h | 33 ++ sd/source/ui/remotecontrol/OSXBluetooth.mm | 52 +++ sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx | 41 ++ sd/source/ui/remotecontrol/Server.cxx |1 sd/source/ui/remotecontrol/Transmitter.cxx |2 sd/source/ui/remotecontrol/Transmitter.hxx |8 16 files changed, 515 insertions(+), 24 deletions(-) New commits: commit c56593f029b17f35672b0b01b269e6914f80cbdf Author: Tor Lillqvist t...@iki.fi Date: Thu Feb 14 12:00:11 2013 +0200 Merge in Bluetooth code for the Impress Remote for OS X Thirteen commits from master squashed into one commit. Original commit messages in order below, so note that claims are in many cases overridden by later commits. === This is the 1st commit message: Work in progress. It sets up the SDP service record and registers it, and that seems to work. Does not do anything with it yet. I wonder if the current approach to use the standard SerialPort service class will work for Macs, as they by default have one SerialPort service running, Bluetooth-PDA-Sync, whatever that is. There is no code in the Android app to handle the case of there being several Serial Port services on the computer it wants to connect to, so what happens then when there are two will be interesting to see. (I can't find in the Android API any way to enumerate services that use the same service class. If there was, the app could choose the correct one based on its name.) So probably we should pretty soon switch to using a dedicated service class UUID instead of using the standard serial port one. As we already have the app out in the wild it will probably have to be modified to look for both Serial Port and our own service then? Sigh. === This is the 2nd commit message: Add this single-line file === This is the 3rd commit message: Fix build against Mac OS X SDK 10.4 === This is the 4th commit message: More work on the Impress Remote Control Bluetooth code for OS X Mostly the work of Thorsten, from December, adapted to compile against the current remote control code, and with one or two crucial things added. Plus lots of SAL_INFO calls added; once it works well many of them can be dropped. Does not work properly yet, do not cherry-pick just this to 4.0. === This is the 5th commit message: Nothing in the C standard about sockets === This is the 6th commit message: Fix compilation for Linux and hopefully Windows, too === This is the 7th commit message: Blind fix for WaE: class does not fully implement protocol The Xcode 3 compiler warns: class 'ChannelDelegate' does not fully implement the 'IOBluetoothRFCOMMChannelDelegate' protocol. === This is the 8th commit message: pragma GCC diagnostic is not available for 4.0.1 === This is the 9th commit message: std::vector::data() is C++11 === This is the 10th commit message: WaE: comparison is always true due to limited range of data type === This is the 11th commit message: Be specific in the logging as multiple threads involved Sure, each SAL_INFO output line includes the thread ID, but still, good to avoid confusion from where this line is coming. === This is the 12th commit message: Plug autorelease leak === This is the 13th commit message: Handle gracefully the remote end closing the RFCOMM channel Avoids a crash if one presses the back key on the Android remote control. (cherry picked from commit 100ac0876f1038aea7e7ef56f95d008ecc6aea3d) (cherry picked from commit c30e94a9cfc05ca8882fe78749b41207611910fb) (cherry picked from commit bc96a84370fb167ab2c63582c10535992f31768c) (cherry picked from commit f9685dc555cc79fe3a52caf9da39df37da750cd4) (cherry picked from commit dca5d2b1677ebffd1a4ff791c47b33a6252210b2) (cherry picked from commit bd6201ee4df1b7f54b1e768167a88ea5faa38fcc) (cherry picked from commit 05dbe2dda095aee2b595a29b95b5952acbe55e67) (cherry picked from commit
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac icon-themes/galaxy instsetoo_native/res instsetoo_native/util setup_native/source
configure.ac | 10 - icon-themes/galaxy/brand/flat_logo.svg | 170 +++ icon-themes/galaxy/brand/intro.png |binary icon-themes/galaxy/brand/shell/backing_left.png |binary icon-themes/galaxy/brand/shell/backing_right.png |binary icon-themes/galaxy/brand/shell/backing_rtl_left.png |binary icon-themes/galaxy/brand/shell/backing_rtl_right.png |binary icon-themes/galaxy/brand/shell/backing_space.png |binary icon-themes/galaxy/brand_dev/intro.png |binary instsetoo_native/res/nologobanner.bmp|binary instsetoo_native/res/nologoinstall.bmp |binary instsetoo_native/util/openoffice.lst | 10 - setup_native/source/mac/ooo/osxdndinstall.png|binary 13 files changed, 78 insertions(+), 112 deletions(-) New commits: commit 1825f33008c06f4f7a0b79771b1638b0de2af7e2 Author: Stefan Knorr heinzless...@gmail.com Date: Mon Feb 18 11:24:52 2013 +0100 Update Branding for 4.0 (.1) (c) Maxim Darak, Mirek Mazel 2013 Change-Id: I30fdb3234152e746e8a2a565310ab1b22115315c Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/configure.ac b/configure.ac index 703bb13..69bb2977 100644 --- a/configure.ac +++ b/configure.ac @@ -11623,7 +11623,7 @@ AC_SUBST(GIT_LINK_SRC) AC_MSG_CHECKING([for custom 'intro' progress bar color]) PROGRESSBARCOLOR= if test -z $with_intro_progressbar_color; then - PROGRESSBARCOLOR=255,255,255 + PROGRESSBARCOLOR=128,128,128 AC_MSG_RESULT([none]) else PROGRESSBARCOLOR=$with_intro_progressbar_color @@ -11634,7 +11634,7 @@ AC_SUBST(PROGRESSBARCOLOR) AC_MSG_CHECKING([for custom 'intro' progress bar size]) PROGRESSSIZE= if test -z $with_intro_progressbar_size; then - PROGRESSSIZE=407,6 + PROGRESSSIZE=409,8 AC_MSG_RESULT([none]) else PROGRESSSIZE=$with_intro_progressbar_size @@ -11645,7 +11645,7 @@ AC_SUBST(PROGRESSSIZE) AC_MSG_CHECKING([for custom 'intro' progress bar position]) PROGRESSPOSITION= if test -z $with_intro_progressbar_position; then - PROGRESSPOSITION=61,317 + PROGRESSPOSITION=72,189 AC_MSG_RESULT([none]) else PROGRESSPOSITION=$with_intro_progressbar_position @@ -11656,7 +11656,7 @@ AC_SUBST(PROGRESSPOSITION) AC_MSG_CHECKING([for custom 'intro' progress bar frame color]) PROGRESSFRAMECOLOR= if test -z $with_intro_progressbar_frame_color; then - PROGRESSFRAMECOLOR=20,136,3 + PROGRESSFRAMECOLOR=245,245,245 AC_MSG_RESULT([none]) else PROGRESSFRAMECOLOR=$with_intro_progressbar_frame_color @@ -11678,7 +11678,7 @@ AC_SUBST(PROGRESSTEXTCOLOR) AC_MSG_CHECKING([for custom 'intro' progress text baseline]) PROGRESSTEXTBASELINE= if test -z $with_intro_progressbar_text_baseline; then - PROGRESSTEXTBASELINE=287 + PROGRESSTEXTBASELINE=170 AC_MSG_RESULT([none]) else PROGRESSTEXTBASELINE=$with_intro_progressbar_text_baseline diff --git a/icon-themes/galaxy/brand/flat_logo.svg b/icon-themes/galaxy/brand/flat_logo.svg index 1559033..3a9051c 100644 --- a/icon-themes/galaxy/brand/flat_logo.svg +++ b/icon-themes/galaxy/brand/flat_logo.svg @@ -7,7 +7,6 @@ xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; xmlns:svg=http://www.w3.org/2000/svg; xmlns=http://www.w3.org/2000/svg; - xmlns:xlink=http://www.w3.org/1999/xlink; version=1.1 width=486 height=80 @@ -15,57 +14,15 @@ defs id=defs1207 clipPath - id=clipPath11479 + id=clipPath11479-0 rect width=530 height=87.272736 x=6.6086682e-06 y=-18.11 - id=rect11481 + id=rect11481-5 style=opacity:0.6;fill:#530260;fill-opacity:1;stroke:none / /clipPath -radialGradient - cx=372.53757 - cy=76.763672 - r=275.5 - fx=372.53757 - fy=76.763672 - id=radialGradient10422 - xlink:href=#linearGradient4015 - gradientUnits=userSpaceOnUse - gradientTransform=matrix(-1.4902096,1.5799259,-1.6480165,-1.5544337,967.06636,-628.31357) / -linearGradient - id=linearGradient4015 - stop - id=stop4017 - style=stop-color:#92e285;stop-opacity:1 - offset=0 / - stop - id=stop4019 - style=stop-color:#18a303;stop-opacity:1 - offset=1 / -/linearGradient -linearGradient - id=linearGradient13473 - stop - id=stop13475 - style=stop-color:#fde9a9;stop-opacity:0.78571427 - offset=0 / - stop - id=stop13477 - style=stop-color:#fde9a9;stop-opacity:0 - offset=1 / -/linearGradient -radialGradient - cx=520.80676 - cy=183.92038 - r=265 - fx=520.80676 - fy=183.92038 - id=radialGradient11592 - xlink:href=#linearGradient13473 - gradientUnits=userSpaceOnUse - gradientTransform=matrix(-0.92370346,0,0,-0.81991269,1087.8944,75.325519) / /defs
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac
configure.ac | 34 -- 1 file changed, 24 insertions(+), 10 deletions(-) New commits: commit 185e1be6cd1954b8cc5a302c879384f2549cd060 Author: Tor Lillqvist tlillqv...@suse.com Date: Tue Dec 4 11:26:39 2012 +0200 Let's try to enable compiling the Bluetooth code for Windows (cherry picked from commit 17f7ee8442472e3ef743891b4d4f1a6a8c063472) Change-Id: Ic761c6c7dd17b42098adc44f7f4435b83ed3d009 Reviewed-on: https://gerrit.libreoffice.org/2129 Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com diff --git a/configure.ac b/configure.ac index e7c06f2..bb3f96c 100644 --- a/configure.ac +++ b/configure.ac @@ -862,9 +862,8 @@ AC_ARG_ENABLE(sdremote, AC_ARG_ENABLE(sdremote-bluetooth, AS_HELP_STRING([--disable-sdremote-bluetooth], -[Determines whether to build sdremote with bluetooth support - Requires: dbus]), -,enable_sdremote_bluetooth=yes) +[Determines whether to build sdremote with bluetooth support. + Requires dbus on Linux.])) AC_ARG_ENABLE(gconf, AS_HELP_STRING([--disable-gconf], @@ -9298,12 +9297,28 @@ else fi AC_SUBST(ENABLE_PACKAGEKIT) -AC_MSG_CHECKING([whether to enable sd remotecontrol]) +AC_MSG_CHECKING([whether to enable Impress remote control]) if test -n $enable_sdremote -a $enable_sdremote != no; then AC_MSG_RESULT([yes]) ENABLE_SDREMOTE=YES -AC_MSG_CHECKING([whether to enable bluetooth support in sdremote]) -if test -n $enable_sdremote_bluetooth -a $enable_sdremote_bluetooth != no; then +AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote control]) + +# If not explicitly enabled or disabled, default +if test -z $enable_sdremote_bluetooth; then +case $OS in +LINUX|WNT) +# Default to yes for these +enable_sdremote_bluetooth=yes +;; +*) +# otherwise no +enable_sdremote_bluetooth=no +;; +esac +fi +# $enable_sdremote_bluetooth is guaranteed non-empty now + +if test $enable_sdremote_bluetooth != no; then if test $OS = LINUX; then if test $ENABLE_DBUS = TRUE; then AC_MSG_RESULT([yes]) @@ -9311,7 +9326,7 @@ if test -n $enable_sdremote -a $enable_sdremote != no; then dnl === dnl Check for system bluez dnl === -AC_MSG_CHECKING([which bluetooth header to use]) +AC_MSG_CHECKING([which Bluetooth header to use]) if test $with_system_bluez = yes; then AC_MSG_RESULT([external]) AC_CHECK_HEADER(bluetooth/bluetooth.h, [], @@ -9325,9 +9340,8 @@ if test -n $enable_sdremote -a $enable_sdremote != no; then ENABLE_SDREMOTE_BLUETOOTH=NO fi else -# FIXME: should this really be disabled in everything non-Linux? -AC_MSG_RESULT([no]) -ENABLE_SDREMOTE_BLUETOOTH=NO +AC_MSG_RESULT([yes]) +ENABLE_SDREMOTE_BLUETOOTH=YES fi else AC_MSG_RESULT([no]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac
configure.ac |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit 3251bb47527ebbc657902ad229ac1e076bf28c2a Author: Petr Mladek pmla...@suse.cz Date: Tue Feb 5 15:18:43 2013 +0100 use icerun wrapper only when available It is not provided by the old icecram-0.9.2 on SLED11 Change-Id: If8dc9b028276ac05733eb59c1ec62e352f4a2796 Reviewed-on: https://gerrit.libreoffice.org/2000 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/configure.ac b/configure.ac index 0cbc7e8..5bdbd37 100644 --- a/configure.ac +++ b/configure.ac @@ -12025,9 +12025,13 @@ dnl icerun is a wrapper that stops us spawning tens of processes dnl locally - for tools that can't be executed on the compile cluster dnl this avoids a dozen javac's ganging up on your laptop to kill it. dnl === +AC_MSG_CHECKING([whether to use icerun wrapper]) ICECREAM_RUN= -if test $enable_icecream = yes; then - ICECREAM_RUN=icerun +if test $enable_icecream = yes which icerun /dev/null 21 ; then +ICECREAM_RUN=icerun +AC_MSG_RESULT([yes]) +else +AC_MSG_RESULT([no]) fi AC_SUBST(ICECREAM_RUN) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
