Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: atk1.0

atk1.0 (2.36.0-0ubuntu1) groovy; urgency=medium * New upstream version -- Sebastien Bacher <seb128@ubuntu.com> Tue, 11 Aug 2020 17:50:23 +0200 atk1.0 (2.35.1-1ubuntu2) focal; urgency=medium * control, gbp.conf: Update for ubuntu/master branch * Revert "atksocket: make get_extents return parent extents by default" This reverts upstream commit 4b5ed8630c5ae9ef37884c4199da8463b7e5a127. This commit causes an infinite loop and a crash in the Ubuntu installer. (LP: #1870508) -- Iain Lane <iain.lane@canonical.com> Fri, 17 Apr 2020 15:29:42 +0100 atk1.0 (2.35.1-1ubuntu1) focal; urgency=medium * Resynchronize with Debian, remaining changes * Make autopkgtests cross-test-friendly. -- Sebastien Bacher <seb128@ubuntu.com> Thu, 30 Jan 2020 12:26:23 +0100

Modifications :
  1. Download patch atk/meson.build

    --- 2.35.1-1/atk/meson.build 2019-09-14 09:54:51.000000000 +0000 +++ 2.36.0-0ubuntu1/atk/meson.build 2020-04-02 09:43:35.000000000 +0000 @@ -153,7 +153,7 @@ if get_option('introspection') endif libatk_dep = declare_dependency(link_with: libatk, - include_directories: atk_inc, + include_directories: [ root_inc, atk_inc ], dependencies: glib_dep, sources: atk_sources_dep, ) @@ -163,4 +163,5 @@ pkgconfig.generate(libatk, description: 'Accessibility Toolkit', subdirs: atk_api_name, filebase: 'atk', + requires: glib_dep, )
  2. Download patch po/ms.po
  3. Download patch meson.build

    --- 2.35.1-1/meson.build 2019-09-14 09:54:51.000000000 +0000 +++ 2.36.0-0ubuntu1/meson.build 2020-04-02 09:43:35.000000000 +0000 @@ -1,5 +1,5 @@ project('atk', 'c', - version: '2.35.1', + version: '2.36.0', license: 'LGPLv2.1+', default_options: [ 'buildtype=debugoptimized', @@ -44,7 +44,7 @@ darwin_versions = ['@0@'.format(current add_project_arguments([ '-DG_DISABLE_SINGLE_INCLUDES', '-DATK_DISABLE_SINGLE_INCLUDES' ], language: 'c') if cc.get_id() == 'msvc' - add_project_arguments([ '-FImsvc_recommended_pragmas.h' ], language: 'c') + add_project_arguments(cc.get_supported_arguments(['-FImsvc_recommended_pragmas.h', '-utf-8']), language: 'c') endif # Compiler and linker flags
  4. Download patch po/LINGUAS

    --- 2.35.1-1/po/LINGUAS 2019-09-14 09:54:51.000000000 +0000 +++ 2.36.0-0ubuntu1/po/LINGUAS 2020-04-02 09:43:35.000000000 +0000 @@ -13,6 +13,7 @@ bn_IN bs ca ca@valencia +ckb cs cy da
  5. Download patch debian/control

    --- 2.35.1-1/debian/control 2019-10-24 18:30:22.000000000 +0000 +++ 2.36.0-0ubuntu1/debian/control 2020-08-11 15:45:43.000000000 +0000 @@ -5,7 +5,8 @@ Source: atk1.0 Section: libs Priority: optional -Maintainer: Debian Accessibility Team <pkg-a11y-devel@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Accessibility Team <pkg-a11y-devel@lists.alioth.debian.org> Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Samuel Thibault <sthibault@debian.org>, Jeremy Bicha <jbicha@debian.org> Build-Depends: debhelper (>= 11.1.3), @@ -19,8 +20,10 @@ Build-Depends: debhelper (>= 11.1.3), Build-Depends-Indep: docbook-xml <!nodoc>, libglib2.0-doc <!nodoc>, Standards-Version: 4.4.0 -Vcs-Browser: https://salsa.debian.org/gnome-team/atk -Vcs-Git: https://salsa.debian.org/gnome-team/atk.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/atk +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/atk.git +Vcs-Browser: https://salsa.debian.org/gnome-team/atk/tree/ubuntu/master +Vcs-Git: https://salsa.debian.org/gnome-team/atk.git -b ubuntu/master Homepage: https://wiki.gnome.org/Accessibility Package: libatk1.0-0
  6. Download patch po/uk.po
  7. Download patch debian/control.in

    --- 2.35.1-1/debian/control.in 2019-10-24 18:30:22.000000000 +0000 +++ 2.36.0-0ubuntu1/debian/control.in 2020-08-11 15:45:43.000000000 +0000 @@ -1,7 +1,8 @@ Source: atk1.0 Section: libs Priority: optional -Maintainer: Debian Accessibility Team <pkg-a11y-devel@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Accessibility Team <pkg-a11y-devel@lists.alioth.debian.org> Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Samuel Thibault <sthibault@debian.org>, @GNOME_TEAM@ Build-Depends: debhelper (>= 11.1.3), @@ -15,8 +16,10 @@ Build-Depends: debhelper (>= 11.1.3), Build-Depends-Indep: docbook-xml <!nodoc>, libglib2.0-doc <!nodoc>, Standards-Version: 4.4.0 -Vcs-Browser: https://salsa.debian.org/gnome-team/atk -Vcs-Git: https://salsa.debian.org/gnome-team/atk.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/atk +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/atk.git +Vcs-Browser: https://salsa.debian.org/gnome-team/atk/tree/ubuntu/master +Vcs-Git: https://salsa.debian.org/gnome-team/atk.git -b ubuntu/master Homepage: https://wiki.gnome.org/Accessibility Package: libatk1.0-0
  8. Download patch debian/patches/atk_requires_glib

    --- 2.35.1-1/debian/patches/atk_requires_glib 2019-10-24 18:30:22.000000000 +0000 +++ 2.36.0-0ubuntu1/debian/patches/atk_requires_glib 2020-08-11 15:45:43.000000000 +0000 @@ -1,3 +1,7 @@ +From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +Date: Fri, 17 Apr 2020 15:12:19 +0100 +Subject: atk_requires_glib + https://gitlab.gnome.org/GNOME/atk/merge_requests/30 commit 099a6979e4bbac6650af2b2a6963423e73f3d12b @@ -8,6 +12,9 @@ Date: Mon Sep 9 22:43:56 2019 +0200 atkutil.h uses several glib/gobject functions in macros, so the caller will have to link against glib, atk.pc thus has to explicit this. +--- + atk/meson.build | 1 + + 1 file changed, 1 insertion(+) diff --git a/atk/meson.build b/atk/meson.build index 4760df8..dcde8a4 100644
  9. Download patch debian/tests/tests

    --- 2.35.1-1/debian/tests/tests 2019-10-24 18:30:22.000000000 +0000 +++ 2.36.0-0ubuntu1/debian/tests/tests 2020-08-11 15:45:43.000000000 +0000 @@ -4,8 +4,12 @@ set -e WORKDIR=$AUTOPKGTEST_TMP +if [ -n "$DEB_HOST_MULTIARCH" ]; then + export PKG_CONFIG_PATH="/usr/lib/$DEB_HOST_MULTIARCH/pkgconfig" + PREFIX="$DEB_HOST_GNU_TYPE-" +fi for i in testdocument testrole testrelation teststateset testvalue ; do - gcc tests/$i.c -o $WORKDIR/$i $(pkg-config --cflags --libs atk) + ${PREFIX}gcc tests/$i.c -o $WORKDIR/$i $(pkg-config --cflags --libs atk) echo "build: OK" [ -x $WORKDIR/$i ] $WORKDIR/$i
  10. Download patch NEWS

    --- 2.35.1-1/NEWS 2019-09-14 09:54:51.000000000 +0000 +++ 2.36.0-0ubuntu1/NEWS 2020-04-02 09:43:35.000000000 +0000 @@ -1,3 +1,29 @@ +Changes in version 2.36 +========================= + +* New API + * Added ATK_ROLE_MARK and ATK_ROLE_SUGGESTION + * Add ATK_TEX_ATTR_TEXT_POSITION to the list of possible AtkText + attributes (MR!33) + +* Documentation + * Updated documentation for atk_text_set_caret_offset (MR!18) + +* Building - meson + * Fix building atk as subproject + * Add Meson wrap file for GLib (MR!37) + +* Building - visual studio + * Use -utf-8 if available (MR!38) + +Contributors + Luca Bacci, Joanmarie Diggs, Samuel Thibault + +Translations + + Fran Dieguez (gl), Ryuta Fujii (ja), Daniel Korostil (uk), Jwtiyar + Nariman (ckb), Umarzuki Bin Mochlis Moktar (ms) + Changes in version 2.35.1 =========================
  11. Download patch subprojects/proxy-libintl.wrap

    --- 2.35.1-1/subprojects/proxy-libintl.wrap 1970-01-01 00:00:00.000000000 +0000 +++ 2.36.0-0ubuntu1/subprojects/proxy-libintl.wrap 2020-04-02 09:43:35.000000000 +0000 @@ -0,0 +1,4 @@ +[wrap-git] +directory=proxy-libintl +url=https://github.com/frida/proxy-libintl.git +revision=0.1
  12. Download patch debian/patches/Revert-atksocket-make-get_extents-return-parent-extents-b.patch

    --- 2.35.1-1/debian/patches/Revert-atksocket-make-get_extents-return-parent-extents-b.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.36.0-0ubuntu1/debian/patches/Revert-atksocket-make-get_extents-return-parent-extents-b.patch 2020-08-11 15:45:43.000000000 +0000 @@ -0,0 +1,72 @@ +From: Iain Lane <iain.lane@canonical.com> +Date: Fri, 17 Apr 2020 15:12:24 +0100 +Subject: Revert "atksocket: make get_extents return parent extents by + default" + +This reverts commit 4b5ed8630c5ae9ef37884c4199da8463b7e5a127. + +This commit causes an infinite loop and a crash in the Ubuntu installer. + +Forwarded: https://gitlab.gnome.org/GNOME/atk/-/issues/18 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ubiquity/+bug/1870508 +--- + atk/atksocket.c | 35 ----------------------------------- + 1 file changed, 35 deletions(-) + +diff --git a/atk/atksocket.c b/atk/atksocket.c +index 887fb5c..1743271 100644 +--- a/atk/atksocket.c ++++ b/atk/atksocket.c +@@ -56,13 +56,6 @@ static void atk_socket_finalize (GObject *obj); + + static void atk_component_interface_init (AtkComponentIface *iface); + +-static void atk_socket_component_real_get_extents (AtkComponent *component, +- gint *x, +- gint *y, +- gint *width, +- gint *height, +- AtkCoordType coord_type); +- + G_DEFINE_TYPE_WITH_CODE (AtkSocket, atk_socket, ATK_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)) + +@@ -101,7 +94,6 @@ atk_socket_finalize (GObject *_obj) + static void + atk_component_interface_init (AtkComponentIface *iface) + { +- iface->get_extents = atk_socket_component_real_get_extents; + } + + /** +@@ -170,30 +162,3 @@ atk_socket_is_occupied (AtkSocket* obj) + + return (obj->embedded_plug_id != NULL); + } +- +-static void +-atk_socket_component_real_get_extents (AtkComponent *component, +- gint *x, +- gint *y, +- gint *width, +- gint *height, +- AtkCoordType coord_type) +-{ +- AtkObject *parent = atk_object_get_parent (ATK_OBJECT (component)); +- +- if (parent == NULL || !ATK_IS_COMPONENT (parent)) +- { +- if (x) +- *x = -1; +- if (y) +- *y = -1; +- if (width) +- *width = -1; +- if (height) +- *height = -1; +- +- return; +- } +- +- atk_component_get_extents (ATK_COMPONENT (parent), x, y, width, height, coord_type); +-}
  13. Download patch subprojects/glib.wrap

    --- 2.35.1-1/subprojects/glib.wrap 1970-01-01 00:00:00.000000000 +0000 +++ 2.36.0-0ubuntu1/subprojects/glib.wrap 2020-04-02 09:43:35.000000000 +0000 @@ -0,0 +1,5 @@ +[wrap-git] +directory=glib +url=https://gitlab.gnome.org/GNOME/glib.git +push-url=git@gitlab.gnome.org:GNOME/glib.git +revision=master
  14. Download patch debian/patches/series

    --- 2.35.1-1/debian/patches/series 2019-10-24 18:30:22.000000000 +0000 +++ 2.36.0-0ubuntu1/debian/patches/series 2020-08-11 15:49:03.000000000 +0000 @@ -1 +1 @@ -atk_requires_glib +Revert-atksocket-make-get_extents-return-parent-extents-b.patch
  15. Download patch atk/atktext.c

    --- 2.35.1-1/atk/atktext.c 2019-09-14 09:54:51.000000000 +0000 +++ 2.36.0-0ubuntu1/atk/atktext.c 2020-04-02 09:43:35.000000000 +0000 @@ -135,6 +135,14 @@ static const guint8 underline_offsets[] 0, 5, 12, 19, 23 }; +static const char text_position[] = + "baseline\0" + "super\0" + "sub\0"; +static const guint8 text_position_offsets[] = { + 0, 9, 15, +}; + static void atk_text_base_init (AtkTextIface *class); static void atk_text_real_get_range_extents (AtkText *text, @@ -1031,6 +1039,22 @@ atk_text_set_selection (AtkText *text, * * Sets the caret (cursor) position to the specified @offset. * + * In the case of rich-text content, this method should either grab focus + * or move the sequential focus navigation starting point (if the application + * supports this concept) as if the user had clicked on the new caret position. + * Typically, this means that the target of this operation is the node containing + * the new caret position or one of its ancestors. In other words, after this + * method is called, if the user advances focus, it should move to the first + * focusable node following the new caret position. + * + * Calling this method should also scroll the application viewport in a way + * that matches the behavior of the application's typical caret motion or tab + * navigation as closely as possible. This also means that if the application's + * caret motion or focus navigation does not trigger a scroll operation, this + * method should not trigger one either. If the application does not have a caret + * motion or focus navigation operation, this method should try to scroll the new + * caret position into view while minimizing unnecessary scroll motion. + * * Returns: %TRUE if successful, %FALSE otherwise. **/ gboolean @@ -1319,6 +1343,9 @@ atk_text_attribute_get_value (AtkTextAtt case ATK_TEXT_ATTR_STYLE: g_assert (index >= 0 && index < G_N_ELEMENTS (style_offsets)); return style + style_offsets[index]; + case ATK_TEXT_ATTR_TEXT_POSITION: + g_assert (index >= 0 && index < G_N_ELEMENTS (text_position_offsets)); + return text_position + text_position_offsets[index]; default: return NULL; }
  16. Download patch subprojects/zlib.wrap

    --- 2.35.1-1/subprojects/zlib.wrap 1970-01-01 00:00:00.000000000 +0000 +++ 2.36.0-0ubuntu1/subprojects/zlib.wrap 2020-04-02 09:43:35.000000000 +0000 @@ -0,0 +1,10 @@ +[wrap-file] +directory = zlib-1.2.11 + +source_url = https://zlib.net/fossils/zlib-1.2.11.tar.gz +source_filename = zlib-1.2.11.tar.gz +source_hash = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 + +patch_url = https://github.com/mesonbuild/zlib/releases/download/1.2.11-3/zlib.zip +patch_filename = zlib-1.2.11-3-wrap.zip +patch_hash = f07dc491ab3d05daf00632a0591e2ae61b470615b5b73bcf9b3f061fff65cff0
  17. Download patch po/ckb.po
  18. Download patch atk/atktext.h

    --- 2.35.1-1/atk/atktext.h 2019-09-14 09:54:51.000000000 +0000 +++ 2.36.0-0ubuntu1/atk/atktext.h 2020-04-02 09:43:35.000000000 +0000 @@ -43,7 +43,7 @@ G_BEGIN_DECLS *@ATK_TEXT_ATTR_PIXELS_BELOW_LINES: Pixels of blank space to leave below each newline-terminated line. *@ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP: Pixels of blank space to leave between wrapped lines inside the same newline-terminated line (paragraph). *@ATK_TEXT_ATTR_BG_FULL_HEIGHT: "true" or "false" whether to make the background color for each character the height of the highest font used on the current line, or the height of the font used for the current character. - *@ATK_TEXT_ATTR_RISE: Number of pixels that the characters are risen above the baseline + *@ATK_TEXT_ATTR_RISE: Number of pixels that the characters are risen above the baseline. See also ATK_TEXT_ATTR_TEXT_POSITION. *@ATK_TEXT_ATTR_UNDERLINE: "none", "single", "double", "low", or "error" *@ATK_TEXT_ATTR_STRIKETHROUGH: "true" or "false" whether the text is strikethrough *@ATK_TEXT_ATTR_SIZE: The size of the characters in points. eg: 10 @@ -61,6 +61,7 @@ G_BEGIN_DECLS *@ATK_TEXT_ATTR_STRETCH: The stretch of the text, if set. Values are "ultra_condensed", "extra_condensed", "condensed", "semi_condensed", "normal", "semi_expanded", "expanded", "extra_expanded" or "ultra_expanded" *@ATK_TEXT_ATTR_VARIANT: The capitalization variant of the text, if set. Values are "normal" or "small_caps" *@ATK_TEXT_ATTR_STYLE: The slant style of the text, if set. Values are "normal", "oblique" or "italic" + *@ATK_TEXT_ATTR_TEXT_POSITION: The vertical position with respect to the baseline. Values are "baseline", "super", or "sub". Note that a super or sub text attribute refers to position with respect to the baseline of the prior character. *@ATK_TEXT_ATTR_LAST_DEFINED: not a valid text attribute, used for finding end of enumeration * * Describes the text attributes supported @@ -95,6 +96,7 @@ typedef enum ATK_TEXT_ATTR_STRETCH, ATK_TEXT_ATTR_VARIANT, ATK_TEXT_ATTR_STYLE, + ATK_TEXT_ATTR_TEXT_POSITION, ATK_TEXT_ATTR_LAST_DEFINED } AtkTextAttribute;
  19. Download patch po/ja.po
  20. Download patch subprojects/libffi.wrap

    --- 2.35.1-1/subprojects/libffi.wrap 1970-01-01 00:00:00.000000000 +0000 +++ 2.36.0-0ubuntu1/subprojects/libffi.wrap 2020-04-02 09:43:35.000000000 +0000 @@ -0,0 +1,4 @@ +[wrap-git] +directory=libffi +url=https://gitlab.freedesktop.org/gstreamer/meson-ports/libffi.git +revision=meson
  21. Download patch po/gl.po
  22. Download patch debian/tests/build

    --- 2.35.1-1/debian/tests/build 2019-10-24 18:30:22.000000000 +0000 +++ 2.36.0-0ubuntu1/debian/tests/build 2020-08-11 15:45:43.000000000 +0000 @@ -22,7 +22,11 @@ int main() } EOF -gcc -Wall -Werror -o atk1.0-dev_test atk1.0-dev_test.c `pkg-config --cflags --libs atk` +if [ -n "$DEB_HOST_MULTIARCH" ]; then + export PKG_CONFIG_PATH="/usr/lib/$DEB_HOST_MULTIARCH/pkgconfig" + PREFIX="$DEB_HOST_GNU_TYPE-" +fi +${PREFIX}gcc -Wall -Werror -o atk1.0-dev_test atk1.0-dev_test.c `pkg-config --cflags --libs atk` echo "build: OK" [ -x atk1.0-dev_test ] ./atk1.0-dev_test
  23. Download patch debian/gbp.conf

    --- 2.35.1-1/debian/gbp.conf 2019-10-24 18:30:22.000000000 +0000 +++ 2.36.0-0ubuntu1/debian/gbp.conf 2020-08-11 15:45:43.000000000 +0000 @@ -1,7 +1,8 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/master +debian-branch = ubuntu/master upstream-branch = upstream/latest +debian-tag=ubuntu/%(version)s [buildpackage] sign-tags = True
  24. Download patch atk/atkobject.h

    --- 2.35.1-1/atk/atkobject.h 2019-09-14 09:54:51.000000000 +0000 +++ 2.36.0-0ubuntu1/atk/atkobject.h 2020-04-02 09:43:35.000000000 +0000 @@ -223,6 +223,18 @@ G_BEGIN_DECLS *@ATK_ROLE_CONTENT_INSERTION: Content previously inserted or proposed to be * inserted, e.g. in revision history or a content view providing suggestions * from reviewers. (Since: 2.34) + *@ATK_ROLE_MARK: A run of content that is marked or highlighted, such as for + * reference purposes, or to call it out as having a special purpose. If the + * marked content has an associated section in the document elaborating on the + * reason for the mark, then %ATK_RELATION_DETAILS should be used on the mark + * to point to that associated section. In addition, the reciprocal relation + * %ATK_RELATION_DETAILS_FOR should be used on the associated content section + * to point back to the mark. (Since: 2.36) + *@ATK_ROLE_SUGGESTION: A container for content that is called out as a proposed + * change from the current version of the document, such as by a reviewer of the + * content. This role should include either %ATK_ROLE_CONTENT_DELETION and/or + * %ATK_ROLE_CONTENT_INSERTION children, in any order, to indicate what the + * actual change is. (Since: 2.36) *@ATK_ROLE_LAST_DEFINED: not a valid role, used for finding end of the enumeration * * Describes the role of an object @@ -358,6 +370,8 @@ typedef enum ATK_ROLE_FOOTNOTE, ATK_ROLE_CONTENT_DELETION, ATK_ROLE_CONTENT_INSERTION, + ATK_ROLE_MARK, + ATK_ROLE_SUGGESTION, ATK_ROLE_LAST_DEFINED } AtkRole;
  1. atk1.0