GTK+

Merge lp://qastaging/~larsu/gtk/3.10 into lp://qastaging/~ubuntu-desktop/gtk/ubuntugtk3

  1. 3.10
  2. Merge into ubuntugtk3
Proposed by Lars Karlitski
Status: Merged
Merged at revision: 310
Proposed branch: lp://qastaging/~larsu/gtk/3.10
Merge into: lp://qastaging/~ubuntu-desktop/gtk/ubuntugtk3
Diff against target: 2371 lines (+719/-742) (has conflicts)
21 files modified
debian/changelog (+46/-0)
debian/control (+21/-18)
debian/control.in (+7/-7)
debian/libgtk-3-0.symbols (+195/-27)
debian/patches/015_default-fallback-icon-theme.patch (+0/-11)
debian/patches/018_gdkenumtypes.c_location.patch (+6/-6)
debian/patches/031_ia64_children_test.patch (+0/-42)
debian/patches/032_mips_treeview_row_separator_height.patch (+2/-2)
debian/patches/073_treeview_almost_fixed.patch (+1/-1)
debian/patches/075_expose_gdkwidget_for_gtkrange.patch (+0/-83)
debian/patches/102_add_wayland_symbols.patch (+0/-43)
debian/patches/abicheck-dynamic-backends (+0/-54)
debian/patches/git-gtkmodelmenuitem-icon-support.patch (+0/-90)
debian/patches/git_bookmark_ellipsize.patch (+0/-25)
debian/patches/git_list_handlers.patch (+0/-26)
debian/patches/gtk-object-tests-run-under-local-environment.patch (+197/-0)
debian/patches/revert_git_a11y_stopped.patch (+0/-50)
debian/patches/series (+7/-9)
debian/patches/ubuntu_gtk_custom_menu_items.patch (+221/-231)
debian/patches/uimanager-guard-against-nested-node-updates.patch (+16/-13)
debian/rules (+0/-4)
Text conflict in debian/changelog
Text conflict in debian/patches/series
To merge this branch: bzr merge lp://qastaging/~larsu/gtk/3.10
Reviewer Review Type Date Requested Status
Sebastien Bacher Needs Fixing
Review via email: mp+194619@code.qastaging.launchpad.net

Description of the change

* New upstream version
* debian/patches/git-gtkmodelmenuitem-icon-support.patch,
  debian/patches/git_frame_disconnect.patch,
  debian/patches/git_frame_update.patch,
  debian/patches/git_list_handlers.patch,
  debian/patches/git_submenus_leak.patch,
  debian/patches/revert_git_a11y_stopped.patch,
  debian/patches/031_ia64_children_test.patch:
  - drop: fixed upstream
* debian/patches/abicheck-dynamic-backends:
  - drop: abicheck was removed upstream
* debian/patches/075_expose_gdkwidget_for_gtkrange.patch:
  - drop: ido doesn't use this anymore
* debian/patches/102_add_wayland_symbols.patch:
  - drop: symbols are exported automatically now
* debian/patches/015_default-fallback-icon-theme.patch,
  debian/patches/018_gdkenumtypes.c_location.patch,
  debian/patches/032_mips_treeview_row_separator_height.patch
  - update from debian
* debian/patches/uimanager-guard-against-nested-node-updates.patch:
  - update: make it apply (gtkuimanager.c was moved to deprecated)
* debian/patches/ubuntu_gtk_custom_menu_items.patch:
  - update: gtkmodelmenu was replaced by gtkmenutracker
* debian/patches/073_treeview_almost_fixed.patch:
  - update: property wrongly marked as readable (caught by the new tests)
* Add debian/patches/gtk-object-tests-run-under-local-environment.patch:
  - make new tests work non-installed (GNOME #711715)

To post a comment you must log in.
lp://qastaging/~larsu/gtk/3.10 updated
308. By Lars Karlitski

* New upstream version
* debian/patches/git-gtkmodelmenuitem-icon-support.patch,
  debian/patches/git_frame_disconnect.patch,
  debian/patches/git_frame_update.patch,
  debian/patches/git_list_handlers.patch,
  debian/patches/git_submenus_leak.patch,
  debian/patches/revert_git_a11y_stopped.patch,
  debian/patches/031_ia64_children_test.patch:
  - drop: fixed upstream
* debian/patches/abicheck-dynamic-backends:
  - drop: abicheck was removed upstream
* debian/patches/075_expose_gdkwidget_for_gtkrange.patch:
  - drop: ido doesn't use this anymore
* debian/patches/102_add_wayland_symbols.patch:
  - drop: symbols are exported automatically now
* debian/patches/015_default-fallback-icon-theme.patch,
  debian/patches/018_gdkenumtypes.c_location.patch,
  debian/patches/032_mips_treeview_row_separator_height.patch
  - update from debian
* debian/patches/uimanager-guard-against-nested-node-updates.patch:
  - update: make it apply (gtkuimanager.c was moved to deprecated)
* debian/patches/ubuntu_gtk_custom_menu_items.patch:
  - update: gtkmodelmenu was replaced by gtkmenutracker
* debian/patches/073_treeview_almost_fixed.patch:
  - update: property wrongly marked as readable (caught by the new tests)
* Add debian/patches/gtk-object-tests-run-under-local-environment.patch:
  - make new tests work non-installed (GNOME #711715)

Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks Lars! I've merged that locally (and did some extra tweak on top, mostly updated build-depends version to match the configure.ac ones).

The current version makes menu items unactive (well, at least those from traditional menus like gedit or eog, the "shell menus" are fine), I'm going to wait for that to be fixed to merged/upload to the ppa for extra testing

Some other small issues I noticed:
- the fileselector default geometry is a bit small (e.g the "open" dialog in gedit) and the desktop icon is a "icon not found" icon, but that's the only thing I noticed)
- the nautilus "cluebars" have no background color after the update
- the messaging menu actions (e.g "compose email) are unactive, that might be the same issue than the menus one

Out of that things work great, including the theme, good work!

review: Needs Fixing
Revision history for this message
Sebastien Bacher (seb128) wrote :

the overlay-scrollbar position marker is also missing since the update (could be a theming issue)

Revision history for this message
Sebastien Bacher (seb128) wrote :

one other issues: in update-manager the list of updates widget is shrinked when using the new GTK

Revision history for this message
Sebastien Bacher (seb128) wrote :

> the desktop icon is a "icon not found" icon

small follow up on that one, in fact they dropped "Desktop" (https://bugzilla.gnome.org/show_bug.cgi?id=711040) ... which makes sense for them since they don't use on in gnome-shell, that's still something other platforms probably want though

The "desktop" in my list is a bookmark entry in fact (still it lost its icon for some reason, I've just a line "file:///home/<username>/Bureau" in my .config/gtk-3.0/bookmarks)

Revision history for this message
Sebastien Bacher (seb128) wrote :

> the fileselector default geometry is a bit small

The default value is stored in gsettings, then it remembers its geometry by folder

To get the default value:
$ gsettings get org.gtk.Settings.FileChooser window-size

the schemas default is -1,-1, so it probably calculates it on first use ... I get (626, 494) here on a 1920x1080 screen, it feels like the computation could be improved

I've found that commit:
https://git.gnome.org/browse/gtk+/commit/gtk?h=gtk-3-10&id=a4332e7f694e8302391464759bdca5d178c8bbfa

I've opened an upstream bug on https://bugzilla.gnome.org/show_bug.cgi?id=712288

lp://qastaging/~larsu/gtk/3.10 updated
309. By Sebastien Bacher

* debian/control.in:
  - updated cairo, glib, wayland requirements
* Renamed some patches to follow in serie and indicate correct origin
* debian/patches/git_bookmark_ellipsize.patch:
  - dropped, the fix is in the new version
* debian/rules:
  - drop armhf -O0 workaround, gcc got fixed since

310. By Lars Karlitski

* 015_default-fallback-icon-theme.patch:
  - drop: fixed differently upstream
* debian/patches/git_GtkMenuTracker_set_action_namespace_correctly.patch:
  - fix "action-namespace" menu attribute (used by indicator-messages)

311. By Lars Karlitski

Bumb to 3.10.5 and remove obsolete patch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: