bin/stubify.pl | 4 ++-- vcl/unx/gtk/window/gtkframe.cxx | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-)
New commits: commit 9bdfd1fa4dde2f4901900f7447b588c2640ff3f4 Author: Michael Meeks <michael.me...@suse.com> Date: Fri Dec 16 15:56:23 2011 +0000 teach old-style method about the new form of screen numbering fdo#43458 We number now with a flat set of indicees across Xinerama and more standard multi-screen setups. diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index a384375..06d29d5 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -4162,12 +4162,8 @@ gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext*, gint Size GtkSalDisplay::GetScreenSize( int nScreen ) { - GdkScreen *pScreen = gdk_display_get_screen (m_pGdkDisplay, nScreen); - if (!pScreen) - return Size(); - else - return Size( gdk_screen_get_width (pScreen), - gdk_screen_get_height (pScreen) ); + Rectangle aRect = m_pSys->GetDisplayScreenPosSizePixel( nScreen ); + return Size( aRect.GetWidth(), aRect.GetHeight() ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit ba26809ebb4aa999049093250d1dac3d13e8d397 Author: Michael Meeks <michael.me...@suse.com> Date: Fri Dec 16 15:33:20 2011 +0000 trivial pkgconfig fixes diff --git a/bin/stubify.pl b/bin/stubify.pl index 3564800..c61bc53 100755 --- a/bin/stubify.pl +++ b/bin/stubify.pl @@ -196,12 +196,12 @@ sub copy_and_stubify ($) { my $pc = shift; - `mkdir -p $destdir/lib/pkgconfig`; + `mkdir -p $destdir/usr/lib/pkgconfig`; `mkdir -p $destdir/$pc->{libdir}` if (defined $pc->{libdir}); `mkdir -p $destdir/$pc->{includedir}` if (defined $pc->{includedir}); # copy .pc across - FIXME, may need to re-write paths - `cp -a $pc->{_File} $destdir/lib/pkgconfig`; + `cp -a $pc->{_File} $destdir/usr/lib/pkgconfig`; # copy includes across my @includes = split (/ /, get_var ($pc, "Cflags")); _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits