[Libreoffice-commits] .: 3 commits - config_host.mk.in configure.ac external/mingw-dlls scp2/InstallModule_ooo.mk scp2/source vcl/win

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Nov 28 08:04:49 PST 2012


 config_host.mk.in                            |    1 
 configure.ac                                 |   40 ++++++++++++++-------------
 external/mingw-dlls/makefile.mk              |    1 
 scp2/InstallModule_ooo.mk                    |    2 +
 scp2/source/ooo/mingw_dlls.scp               |    6 ++++
 vcl/win/source/gdi/salnativewidgets-luna.cxx |   20 +++++++++++++
 6 files changed, 52 insertions(+), 18 deletions(-)

New commits:
commit 69c6ba951419413f7368f83506143327d4bd305c
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Nov 28 14:08:15 2012 +0100

    Update the Python checks for cross-compiling.
    
    Change-Id: I1066c9108fd31682bd238df50bdf1cab0a05d3ec

diff --git a/configure.ac b/configure.ac
index 161a8d9..2599d4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7389,8 +7389,8 @@ if test $enable_python = system; then
                 # 2.6.2 currently on OpenSUSE 12.1?
                 # rpm -q mingw32-python => mingw32-python-2.6.2-17.17.noarch
                 PYTHON_VERSION=$python_version.2
-                PYTHON_MAJOR=${python_version%.*}
-                PYTHON_MINOR=${python_version#*.}
+                PYTHON_VERSION_MAJOR=${python_version%.*}
+                PYTHON_VERSION_MINOR=${python_version#*.}
                 break
             fi
         done
@@ -7403,18 +7403,19 @@ case $enable_python in
 system)
     SYSTEM_PYTHON=YES
 
-    dnl Check if the headers really work
-    save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-    AC_CHECK_HEADER(Python.h, [],
-       [AC_MSG_ERROR([Python headers not found. You probably want to set both the PYTHON_CFLAGS and PYTHON_LIBS environment variables.])],
-       [])
-    CPPFLAGS="$save_CPPFLAGS"
-
-    AC_LANG_PUSH(C)
-    CFLAGS="$CFLAGS $PYTHON_CFLAGS"
-    AC_MSG_CHECKING([for correct python library version])
-       AC_RUN_IFELSE([AC_LANG_SOURCE([[
+    if test "$CROSS_COMPILING" != YES; then
+        dnl Check if the headers really work
+        save_CPPFLAGS="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
+        AC_CHECK_HEADER(Python.h, [],
+           [AC_MSG_ERROR([Python headers not found. You probably want to set both the PYTHON_CFLAGS and PYTHON_LIBS environment variables.])],
+           [])
+        CPPFLAGS="$save_CPPFLAGS"
+
+        AC_LANG_PUSH(C)
+        CFLAGS="$CFLAGS $PYTHON_CFLAGS"
+        AC_MSG_CHECKING([for correct python library version])
+           AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <Python.h>
 
 int main(int argc, char **argv) {
@@ -7422,11 +7423,12 @@ int main(int argc, char **argv) {
            (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 3)) return 0;
        else return 1;
 }
-       ]])],[AC_MSG_RESULT([ok])],[AC_MSG_ERROR([Python >= 3.3 is needed when building with Python 3, or Python >= 2.6 when building with Python 2])],[])
-    CFLAGS=$save_CFLAGS
-    AC_LANG_POP(C)
+           ]])],[AC_MSG_RESULT([ok])],[AC_MSG_ERROR([Python >= 3.3 is needed when building with Python 3, or Python >= 2.6 when building with Python 2])],[])
+        CFLAGS=$save_CFLAGS
+        AC_LANG_POP(C)
 
-    dnl FIXME Check if the Python library can be linked with, too?
+        dnl FIXME Check if the Python library can be linked with, too?
+    fi
     ;;
 
 internal)
commit 332bd4296e9e6ba620122b69d8941338798a6c63
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Nov 28 13:59:20 2012 +0100

    MinGW: Bundle also the libpoppler-*.dll
    
    Change-Id: I181e408e7bc585d93fbeb2ce76a32bc350845c91

diff --git a/config_host.mk.in b/config_host.mk.in
index d98442e..05507f3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -364,6 +364,7 @@ export MINGW_PIXMAN_DLL=@MINGW_PIXMAN_DLL@
 export MINGW_PLC4_DLL=@MINGW_PLC4_DLL@
 export MINGW_PLDS4_DLL=@MINGW_PLDS4_DLL@
 export MINGW_PNG15_DLL=@MINGW_PNG15_DLL@
+export MINGW_POPPLER_DLL=@MINGW_POPPLER_DLL@
 export MINGW_PYTHON_DLL=@MINGW_PYTHON_DLL@
 export MINGW_PYTHON_EXE=@MINGW_PYTHON_EXE@
 export MINGW_RAPTOR_DLL=@MINGW_RAPTOR_DLL@
diff --git a/configure.ac b/configure.ac
index c52316c..161a8d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9757,6 +9757,7 @@ if test "x$enable_pdfimport" != "xno"; then
       CXXFLAGS=$save_CXXFLAGS
       CPPFLAGS=$save_CPPFLAGS
       AC_LANG_POP([C++])
+      libo_MINGW_CHECK_DLL([POPPLER], [libpoppler])
   else
       AC_MSG_RESULT([internal])
       SYSTEM_POPPLER=NO
@@ -9771,6 +9772,7 @@ AC_SUBST(ENABLE_PDFIMPORT)
 AC_SUBST(SYSTEM_POPPLER)
 AC_SUBST(POPPLER_CFLAGS)
 AC_SUBST(POPPLER_LIBS)
+AC_SUBST([MINGW_POPPLER_DLL])
 
 AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
 if test "x$enable_ext_wiki_publisher" = "xyes" -a "x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then
diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk
index 51f1439..61fcaa5 100644
--- a/external/mingw-dlls/makefile.mk
+++ b/external/mingw-dlls/makefile.mk
@@ -81,6 +81,7 @@ MINGW_DLLS:= \
     $(MINGW_PLC4_DLL) \
     $(MINGW_PLDS4_DLL) \
     $(MINGW_PNG15_DLL) \
+    $(MINGW_POPPLER_DLL) \
     $(MINGW_RAPTOR_DLL) \
     $(MINGW_RASQAL_DLL) \
     $(MINGW_READLINE_DLL) \
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index d41db04..57676b3 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_NSS \
 	SYSTEM_OPENSSL \
 	SYSTEM_PANGO \
+	SYSTEM_POPPLER \
 	SYSTEM_PORTAUDIO \
 	SYSTEM_REDLAND \
 	SYSTEM_SNDFILE \
@@ -119,6 +120,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 	MINGW_PLC4_DLL \
 	MINGW_PLDS4_DLL \
 	MINGW_PNG15_DLL \
+	MINGW_POPPLER_DLL \
 	MINGW_RAPTOR_DLL \
 	MINGW_RASQAL_DLL \
 	MINGW_REDLAND_DLL \
diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp
index 7a3b093..19469fa 100644
--- a/scp2/source/ooo/mingw_dlls.scp
+++ b/scp2/source/ooo/mingw_dlls.scp
@@ -226,6 +226,12 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libboost_date_time, MINGW_BOOST_DATE_TIME_DL
 #endif
 #endif
 
+#ifdef SYSTEM_POPPLER
+#ifdef NEEDS_MINGW_POPPLER_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libpoppler, MINGW_POPPLER_DLL )
+#endif
+#endif
+
 #if defined(MINGW_GCCDLL)
 
 File gid_Brand_File_Lib_Mingw_GccS
commit 264cf8bffa598326b255e352d4e4a7a791cf8409
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Nov 28 13:45:31 2012 +0100

    Windows: Draw line between the bottom toolbar(s) and viewshell too.
    
    But do _not_ draw such a line for the vertical toolbars, it looks
    distracting.
    
    Change-Id: Icc1083c8c69f26740b5999b11214ee60078ea218

diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index f61ba64..abed118 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -492,6 +492,26 @@ void impl_drawAeroToolbar( HDC hDC, RECT rc, bool bHorizontal )
         HBRUSH hbrush = CreateSolidBrush( RGB( 0xf0, 0xf0, 0xf0 ) );
         FillRect( hDC, &rc, hbrush );
         DeleteObject( hbrush );
+
+        // darker line to distinguish the toolbar and viewshell
+        // it is drawn only for the horizontal toolbars; it did not look well
+        // when done for the vertical ones too
+        if ( bHorizontal )
+        {
+            long from_x, from_y, to_x, to_y;
+
+            from_x = rc.left;
+            to_x = rc.right;
+            from_y = to_y = rc.top;
+
+            HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xa0, 0xa0, 0xa0 ) );
+            SelectObject( hDC, hpen );
+
+            MoveToEx( hDC, from_x, from_y, NULL );
+            LineTo( hDC, to_x, to_y );
+
+            DeleteObject( hpen );
+        }
     }
 }
 


More information about the Libreoffice-commits mailing list