This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch debian-experimental-5.1 in repository libreoffice.
commit 458b08ae2c062652e84304ded935c5e749b77824 Merge: 55cdd6b b769d03 Author: Rene Engelhard <r...@debian.org> Date: Fri Aug 28 14:12:42 2015 +0200 Merge remote-tracking branch 'origin/master' into debian-experimental-5.1 Conflicts: changelog patches/series rules changelog | 34 ++++++-- control | 34 +++++++- patches/gtk3-rtl.diff | 104 ------------------------ patches/mysqlcppconn-libmysqlclient-SONAME.diff | 4 +- patches/series | 2 +- rules | 29 +++---- 6 files changed, 76 insertions(+), 131 deletions(-) diff --cc changelog index 64bc1f6,c08df93..83fb474 --- a/changelog +++ b/changelog @@@ -1,17 -1,24 +1,34 @@@ - libreoffice (1:5.1.0~alpha1~git20150817-1) UNRELEASED; urgency=medium ++libreoffice (1:5.1.0~alpha1~git20150828-1) UNRELEASED; urgency=medium + + * New upstream snapshot + + * debian/rules, debian/vars.mips64*: + - add mips64{el,eb} architecture stuff which is now added upstream + * debian/uno-libs3.symbols: update + + -- Rene Engelhard <r...@debian.org> Mon, 01 Jun 2015 20:29:43 +0200 + - libreoffice (1:5.0.1~rc1-3) UNRELEASED; urgency=medium + libreoffice (1:5.0.1-1) UNRELEASED; urgency=medium - * debian/patches/gtk3-rtl.diff: backport GTk3 RTL fixes (arrows, checkboxes) - from libreoffice-5-0 + * LibreOffice 5.0.1 final (identical to rc2) + + * debian/patches/mysqlcppconn-libmysqlclient-SONAME.diff: update; fix internal + mysqlcppconn build + * debian/patches/kde4-rtl.diff: KDE4: fix RTL scrollbar handling, from + libreoffice-5-0 + + * debian/rules: + - two more s/src/tarballs/ I forgot + - add explicit --without-system-libxml for a eventual internal-libxml2 case + + -- Rene Engelhard <r...@debian.org> Mon, 24 Aug 2015 18:29:14 +0200 + + libreoffice (1:5.0.1~rc2-1) unstable; urgency=medium + + * New upstream release candidate + + * debian/patches/gtk3-rtl.diff: backport GTK3 RTL fixes (arrows, checkboxes, + spin buttons) from libreoffice-5-0 and master * debian/rules: - bump libmysqlcppconn-dev and libclucene-dev build-deps to their diff --cc control index 51adb1b,79df927..c14caac --- a/control +++ b/control @@@ -72,10 -72,10 +73,10 @@@ Build-Depends: ant (>= 1.7.0) [!mips64e libgraphite2-dev (>= 0.9.3), libgstreamer-plugins-base1.0-dev, libgstreamer1.0-dev, - libgtk-3-dev (>= 3.2~), + libgtk-3-dev (>= 3.8~), libgtk2.0-dev (>= 2.10), libharfbuzz-dev (>= 0.9.18), - libhsqldb1.8.0-java (>> 1.8.0.10), + libhsqldb1.8.0-java (>> 1.8.0.10) [!mips64eb], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libice-dev, @@@ -4272,9 -4274,32 +4275,32 @@@ Description: LibreOfficeKit -- header . This package contains the headers needed for using LibreOfficeKit. + Package: libreoffice-kde + Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc + Depends: libreoffice-core (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} + Recommends: ${kde-iconset-dep} + Suggests: kmail, konqueror, libreoffice-kab + Section: kde + Enhances: libreoffice + Replaces: libreoffice-core (= 1:3.5.0~beta2-1), + libreoffice-core (= 1:4.3.0~beta1-1), + openoffice.org-kde (<< 1:3.3.0~) + Description: office productivity suite -- KDE integration + LibreOffice is a full-featured office productivity suite that provides + a near drop-in replacement for Microsoft(R) Office. + . + This package contains the KDE plugin for drawing OOo's widgets with + KDE/Qt and a KDEish File Picker when running under KDE. + You can extend the functionality of this by installing these packages: + . + * konqueror / kmail + * libreoffice-kab: KDE Addressbook support + Package: libreoffice-sdbc-postgresql Section: misc -Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386 Depends: libreoffice-core (>= 1:3.5.0~beta), ${misc:Depends}, ${shlibs:Depends} Suggests: postgresql (>= 8.4) Breaks: ure (<< 1.5.1+OOo3.1.1-15) diff --cc patches/gtk3-rtl.diff index 3d9a72f,7c0f77e..0000000 deleted file mode 100644,100644 --- a/patches/gtk3-rtl.diff +++ /dev/null @@@ -1,104 -1,174 +1,0 @@@ --From a803ec69f69068e0c45a7825094941b9ea765c1c Mon Sep 17 00:00:00 2001 --From: Khaled Hosny <khaledho...@eglug.org> --Date: Mon, 17 Aug 2015 00:49:39 +0200 --Subject: Fix GTK3 right-to-left rendering --MIME-Version: 1.0 --Content-Type: text/plain; charset=UTF-8 --Content-Transfer-Encoding: 8bit -- --* Reverse the direction of arrows e.g. in menus --* Reverse the position of combobox button -- --They are lumped together because fixing one breaks the other -- --Change-Id: I65afb08785e67db72a72ad39f1de56db037b640a --Reviewed-on: https://gerrit.libreoffice.org/17788 --Tested-by: Jenkins <c...@libreoffice.org> --Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com> --Reviewed-on: https://gerrit.libreoffice.org/17845 --Reviewed-by: Caolán McNamara <caol...@redhat.com> --Tested-by: Caolán McNamara <caol...@redhat.com> -- --diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx --index 126d6d1..1f04b2e 100644 ----- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx --+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx --@@ -77,6 +77,11 @@ static void NWConvertVCLStateToGTKState( ControlState nVCLState, -- -- if ( nVCLState & ControlState::FOCUSED ) -- *nGTKState = (GtkStateFlags) (*nGTKState | GTK_STATE_FLAG_FOCUSED); --+ --+ if (AllSettings::GetLayoutRTL()) --+ { --+ *nGTKState = (GtkStateFlags) (*nGTKState | GTK_STATE_FLAG_DIR_RTL); --+ } -- } -- -- enum { --@@ -661,9 +666,11 @@ Rectangle GtkSalGraphics::NWGetComboBoxButtonRect( ControlType nType, -- nButtonWidth = nArrowWidth + padding.left + padding.right; -- if( nPart == PART_BUTTON_DOWN ) -- { --+ Point aPos = Point(aAreaRect.Left() + aAreaRect.GetWidth() - nButtonWidth, aAreaRect.Top()); --+ if (AllSettings::GetLayoutRTL()) --+ aPos.X() = aAreaRect.Left(); -- aButtonRect.SetSize( Size( nButtonWidth, aAreaRect.GetHeight() ) ); --- aButtonRect.SetPos( Point( aAreaRect.Left() + aAreaRect.GetWidth() - nButtonWidth, --- aAreaRect.Top() ) ); --+ aButtonRect.SetPos(aPos); -- } -- else if( nPart == PART_SUB_EDIT ) -- { --@@ -675,7 +682,10 @@ Rectangle GtkSalGraphics::NWGetComboBoxButtonRect( ControlType nType, -- aButtonRect.SetSize( Size( aAreaRect.GetWidth() - nButtonWidth - (adjust_left + adjust_right), -- aAreaRect.GetHeight() - (adjust_top + adjust_bottom)) ); -- Point aEditPos = aAreaRect.TopLeft(); --- aEditPos.X() += adjust_left; --+ if (AllSettings::GetLayoutRTL()) --+ aEditPos.X() += nButtonWidth; --+ else --+ aEditPos.X() += adjust_left; -- aEditPos.Y() += adjust_top; -- aButtonRect.SetPos( aEditPos ); -- } --@@ -703,6 +713,8 @@ void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, cairo_t *cr, -- -- Rectangle aEditBoxRect( areaRect ); -- aEditBoxRect.SetSize( Size( areaRect.GetWidth() - buttonRect.GetWidth(), aEditBoxRect.GetHeight() ) ); --+ if (AllSettings::GetLayoutRTL()) --+ aEditBoxRect.SetPos( Point( areaRect.Left() + buttonRect.GetWidth(), areaRect.Top() ) ); -- -- arrowRect.SetSize( Size( (gint)(ARROW_SIZE), -- (gint)(ARROW_SIZE) ) ); --@@ -719,7 +731,10 @@ void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, cairo_t *cr, -- { -- gtk_style_context_save(mpEntryStyle); -- gtk_style_context_set_state(mpEntryStyle, flags); --- gtk_style_context_set_junction_sides(mpEntryStyle, GTK_JUNCTION_RIGHT); --+ if (AllSettings::GetLayoutRTL()) --+ gtk_style_context_set_junction_sides(mpEntryStyle, GTK_JUNCTION_LEFT); --+ else --+ gtk_style_context_set_junction_sides(mpEntryStyle, GTK_JUNCTION_RIGHT); -- -- gtk_render_background(mpComboboxStyle, cr, -- 0, 0, --@@ -727,12 +742,13 @@ void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, cairo_t *cr, -- gtk_render_frame(mpComboboxStyle, cr, -- 0, 0, -- areaRect.GetWidth(), areaRect.GetHeight()); --- -- gtk_render_background(mpEntryStyle, cr, --- 0, 0, --+ (aEditBoxRect.Left() - areaRect.Left()), --+ (aEditBoxRect.Top() - areaRect.Top()), -- aEditBoxRect.GetWidth(), aEditBoxRect.GetHeight() ); -- gtk_render_frame(mpEntryStyle, cr, --- 0, 0, --+ (aEditBoxRect.Left() - areaRect.Left()), --+ (aEditBoxRect.Top() - areaRect.Top()), -- aEditBoxRect.GetWidth(), aEditBoxRect.GetHeight() ); -- -- gtk_style_context_restore(mpEntryStyle); --- -cgit v0.10.2 - -From e2582341af9f6b756e5d95c8ddd99652b62d1a41 Mon Sep 17 00:00:00 2001 -From: Khaled Hosny <khaledho...@eglug.org> -Date: Mon, 17 Aug 2015 04:00:49 +0200 -Subject: Fix GTK3 right-to-left rendering of spin buttons -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The button were not drawn at all - -Change-Id: I51dfa30a6daa1034b5e978b09bcdfcc83e859f3d -Reviewed-on: https://gerrit.libreoffice.org/17790 -Reviewed-by: Caolán McNamara <caol...@redhat.com> -Tested-by: Caolán McNamara <caol...@redhat.com> - -diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx -index 8ee0d0a..7344423 100644 ---- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx -+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx -@@ -139,25 +139,40 @@ Rectangle GtkSalGraphics::NWGetSpinButtonRect( ControlPart nPart, Rectangle aAre - buttonRect.SetSize(Size(buttonWidth, buttonHeight)); - buttonRect.setY(aAreaRect.Top()); - buttonRect.Bottom() = buttonRect.Top() + aAreaRect.GetHeight(); -+ Rectangle partRect(buttonRect); - if ( nPart == PART_BUTTON_UP ) - { -- buttonRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() - buttonRect.GetWidth())); -+ if (AllSettings::GetLayoutRTL()) -+ partRect.setX(aAreaRect.Left()); -+ else -+ partRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() - buttonRect.GetWidth())); - } - else if( nPart == PART_BUTTON_DOWN ) - { -- buttonRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() - 2*buttonRect.GetWidth())); -+ if (AllSettings::GetLayoutRTL()) -+ partRect.setX(aAreaRect.Left() + buttonRect.GetWidth()); -+ else -+ partRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() - 2 * buttonRect.GetWidth())); - } - else - { -- buttonRect.Right() = (aAreaRect.Left() + (aAreaRect.GetWidth() - 2*buttonRect.GetWidth()))-1; -- buttonRect.Left() = aAreaRect.Left(); -- buttonRect.Top() = aAreaRect.Top(); -- buttonRect.Bottom() = aAreaRect.Bottom(); -+ if (AllSettings::GetLayoutRTL()) -+ { -+ partRect.Right() = aAreaRect.Left() + aAreaRect.GetWidth(); -+ partRect.Left() = aAreaRect.Left() + (2 * buttonRect.GetWidth()) - 1; -+ } -+ else -+ { -+ partRect.Right() = (aAreaRect.Left() + (aAreaRect.GetWidth() - 2 * buttonRect.GetWidth())) - 1; -+ partRect.Left() = aAreaRect.Left(); -+ } -+ partRect.Top() = aAreaRect.Top(); -+ partRect.Bottom() = aAreaRect.Bottom(); - } - - gtk_style_context_restore(mpSpinStyle); - -- return buttonRect; -+ return partRect; - } - - Rectangle GtkSalGraphics::NWGetScrollButtonRect( ControlPart nPart, Rectangle aAreaRect ) ---- --cgit v0.10.2 -- diff --cc patches/series index 5b79ce8,e971940..5615335 --- a/patches/series +++ b/patches/series @@@ -28,4 -28,7 +28,4 @@@ odk-no-dot.dif hppa-is-32bit.diff gcj-no-bitness-check.diff rsc-no-error-about-unknown-switch.diff - #disable-tiledrendering-test.diff -liborcus-0.9.1.diff + disable-tiledrendering-test.diff -gtk3-rtl.diff -kde4-rtl.diff diff --cc rules index bf8abbc,57864d2..818e70b --- a/rules +++ b/rules @@@ -1282,7 -1283,8 +1284,7 @@@ els BUILD_DEPS += , libgtk2.0-dev (>= 2.10) endif ifeq "$(BUILD_GTK3)" "y" - BUILD_DEPS += , libgtk-3-dev (>= 3.2~) + BUILD_DEPS += , libgtk-3-dev (>= 3.8~) - CONFIGURE_FLAGS+= --enable-gtk3 ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF))) $(error GTK3 build fails without system-cairo!!) endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git