Hello community, here is the log from the commit of package gtk2 for openSUSE:Factory checked in at 2018-01-09 14:35:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtk2 (Old) and /work/SRC/openSUSE:Factory/.gtk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtk2" Tue Jan 9 14:35:40 2018 rev:163 rq:560577 version:2.24.31+20171209.61d5c82f5c Changes: -------- --- /work/SRC/openSUSE:Factory/gtk2/gtk2.changes 2017-12-12 21:20:22.521941582 +0100 +++ /work/SRC/openSUSE:Factory/.gtk2.new/gtk2.changes 2018-01-09 14:35:42.093017353 +0100 @@ -1,0 +2,43 @@ +Fri Dec 29 00:02:17 UTC 2017 - [email protected] + +- Sync summaries with gtk4. + +------------------------------------------------------------------- +Tue Dec 26 01:55:39 UTC 2017 - [email protected] + +- Manually move the position of "Group System/Libraries" line, + which was moved automatically by format_spec_file, above the + comment of "Requires: hicolor-icon-theme": + + https://lists.opensuse.org/opensuse-packaging/2017-07/msg00062.html + +------------------------------------------------------------------- +Thu Dec 21 20:17:29 UTC 2017 - [email protected] + +- Update to version 2.24.31+20171209.61d5c82f5c: + + Fix updating the widget accessible description when using its + tooltip + + Fix introspection builds on Visual Studio 2017 + + imcontextxim: Fix showing glyph in status window + + Visual Studio builds: Improve binary security + + Fixed: If can’t add child, don’t add to child info + + ComboBox: Don’t let modes disconnect each other + + Enter submenus when activating their parent item + + ComboBox: Don’t pile up ::grab-broken handlers + + testcombo: Test grid :row- and :column-span-column + + Updated translations. +- Switch to git checkout via source service. +- Following the above, remove gnome-common BuildRequires and + gnome-autogen.sh call. Replace with libtool BuildRequires and + autogen.sh call, also add gtk-doc BuildRequires and pass + --enable-gtk-doc to configure. +- Clean up patch numbering. +- Drop gtk2-window-dragging.patch: Fixed upstream (bgo#554057). +- Drop bugzilla-131498-allow-xim-for-all-languages.patch: This + patch was only applied to work around a missing recommends for + scim-32Bit, stop doing that, as we should not fix errors in other + packages in a toolkit. +- Conditionally apply translations-update-upstream BuildRequires + and macro for non-openSUSE only. + +------------------------------------------------------------------- Old: ---- bugzilla-131498-allow-xim-for-all-languages.patch gtk+-2.24.31.tar.xz gtk2-window-dragging.patch New: ---- _service _servicedata gtk+-2.24.31+20171209.61d5c82f5c.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2.spec ++++++ --- /var/tmp/diff_new_pack.VoyJng/_old 2018-01-09 14:35:43.620945680 +0100 +++ /var/tmp/diff_new_pack.VoyJng/_new 2018-01-09 14:35:43.620945680 +0100 @@ -20,61 +20,54 @@ %define gtk_binary_version 2.10.0 %define _name gtk+ Name: gtk2 -Version: 2.24.31 +Version: 2.24.31+20171209.61d5c82f5c Release: 0 # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer) Summary: The GTK+ toolkit library (version 2) License: LGPL-2.1+ Group: System/Libraries Url: http://www.gtk.org/ -Source: http://download.gnome.org/sources/gtk+/2.24/%{_name}-%{version}.tar.xz +#Source0: http://download.gnome.org/sources/gtk+/2.24/%%{_name}-%%{version}.tar.xz +Source: %{_name}-%{version}.tar.xz Source2: README.SUSE Source3: gtkrc Source4: baselibs.conf Source5: macros.gtk2 -# PATCH-FIX-UPSTREAM gtk2-window-dragging.patch bgo#611313 -- Taken from Fedora, to support window dragging from menubars/toolbars -Patch0: gtk2-window-dragging.patch -# PATCH-FEATURE-OPENSUSE gtk2-updateiconcache_sort.patch [email protected] -- Have gtp-update-icon-cache sort the file list before producing a cache -Patch1: gtk2-updateiconcache_sort.patch + # PATCH-FIX-OPENSUSE gtk2-GTK_PATH64.patch [email protected] - 64-bit dual install. Use GTK_PATH64 environment variable instead of GTK_PATH -Patch8: gtk2-GTK_PATH64.patch +Patch0: gtk2-GTK_PATH64.patch # PATCH-FEATURE-UPSTREAM bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff bnc129753 bgo319484 [email protected] - Translate the font styles in the GUI -Patch22: bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff -# PATCH-FIX-OPENSUSE bugzilla-131498-allow-xim-for-all-languages.patch bnc131498 [email protected] - Allow all languages to be run with the X Input Method -Patch23: bugzilla-131498-allow-xim-for-all-languages.patch +Patch1: bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff # PATCH-FIX-UPSTREAM gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff bnc130159 bgo319483 [email protected] - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages -Patch24: gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff -# Patches taken from upstream or slated to go upstream. We can expect these to become obsolete -# in future releases. -# Please don't delete this comment even if this section is empty -- "# empty" should -# be sufficient. -# FIXME: this section is incomplete, and that some of the patches listed earlier should -# be here instead. +Patch2: gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff # PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 -Patch53: gtk-path-local.patch +Patch3: gtk-path-local.patch # PATCH-FIX-UPSTREAM gtk2-default-printer.patch bgo#577642 [email protected] -- Save selected printer as default -Patch55: gtk2-default-printer.patch +Patch4: gtk2-default-printer.patch # PATCH-FIX-UPSTREAM gtk2-bgo625202-30-bit-drawables-remain-black.patch bgo#625202 [email protected] -- 30-bit drawables remain black -Patch56: gtk2-bgo625202-30-bit-drawables-remain-black.patch +Patch5: gtk2-bgo625202-30-bit-drawables-remain-black.patch # PATCH-FIX-UPSTREAM gtk2-bgo743166-remember-printing-authentication.patch bgo#674264 [email protected] -- Credentials from gnome-keyring is not used while printing in GTK 2 -Patch57: gtk2-bgo743166-remember-printing-authentication.patch +Patch6: gtk2-bgo743166-remember-printing-authentication.patch # PATCH-FEATURE-OPENSUSE gtk2-converter-python3.patch [email protected] -- Use python3 for gtk-build-converter -Patch100: gtk2-converter-python3.patch +Patch7: gtk2-converter-python3.patch +# PATCH-FEATURE-OPENSUSE gtk2-updateiconcache_sort.patch [email protected] -- Have gtp-update-icon-cache sort the file list before producing a cache +Patch8: gtk2-updateiconcache_sort.patch + BuildRequires: atk-devel BuildRequires: cairo-devel BuildRequires: cups-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gdk-pixbuf-devel -# Needed for patches touching the build system -BuildRequires: gnome-common BuildRequires: gnome-patch-translation BuildRequires: gobject-introspection-devel +BuildRequires: gtk-doc BuildRequires: libjasper-devel BuildRequires: libtiff-devel +# Needed for patches touching the build system / bootstrapping +BuildRequires: libtool BuildRequires: pango-devel BuildRequires: pkgconfig -BuildRequires: translation-update-upstream BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcomposite) @@ -86,6 +79,9 @@ BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xrandr) >= 1.2.99 BuildRequires: pkgconfig(xrender) +%if !0%{?is_opensuse} +BuildRequires: translation-update-upstream +%endif %description GTK+ is a multi-platform toolkit for creating graphical user interfaces. @@ -95,6 +91,7 @@ %package -n libgtk-2_0-0 Summary: The GTK+ toolkit library (version 2) Group: System/Libraries + # While hicolor is not a Requires strictly speaking, we put it as # such instead of as a Recommends because many applications just # assume it's there and we need to have a low-level package to @@ -126,7 +123,7 @@ ranging from small one-off projects to complete application suites. %package -n typelib-1_0-Gtk-2_0 -Summary: The GTK+ toolkit library (version 2) -- Introspection bindings +Summary: Introspection bindings for the GTK+ toolkit library v2 Group: System/Libraries %description -n typelib-1_0-Gtk-2_0 @@ -137,7 +134,7 @@ This package provides the GObject Introspection bindings for GTK+. %package immodule-amharic -Summary: The GTK+ toolkit library (version 2) -- Amharic Input Method +Summary: Amharic input method for the GTK+ toolkit library v2 Group: System/Libraries Requires: %{name} = %{version} Requires(post): %{name}-tools >= 2.24.20 @@ -152,7 +149,7 @@ This package provides an input method for Amharic. %package immodule-inuktitut -Summary: The GTK+ toolkit library (version 2) -- Inuktitut Input Method +Summary: Inuktitut input method for the GTK+ toolkit library v2 Group: System/Libraries Requires: %{name} = %{version} Requires(post): %{name}-tools >= 2.24.20 @@ -167,7 +164,7 @@ This package provides an input method for Inuktitut. %package immodule-multipress -Summary: The GTK+ toolkit library (version 2) -- Multipress Input Method +Summary: Multipress input method for the GTK+ toolkit library v2 Group: System/Libraries Requires: %{name} = %{version} Requires(post): %{name}-tools >= 2.24.20 @@ -182,7 +179,7 @@ multi-press method, as on a mobile phone. %package immodule-thai -Summary: The GTK+ toolkit library (version 2) -- Thai-Lao Input Method +Summary: Thai-Lao input method for the GTK+ toolkit library v2 Group: System/Libraries Requires: %{name} = %{version} Requires(post): %{name}-tools >= 2.24.20 @@ -198,7 +195,7 @@ This package provides an input method for Thai-Lao. %package immodules-tigrigna -Summary: The GTK+ toolkit library (version 2) -- Tigrigna Input Methods +Summary: Tigrigna input methods for the GTK+ toolkit library v2 Group: System/Libraries Requires: %{name} = %{version} Requires(post): %{name}-tools >= 2.24.20 @@ -213,7 +210,7 @@ This package provides two input methods for Tigrigna. %package immodule-vietnamese -Summary: The GTK+ toolkit library (version 2) -- Vietnamese Input Method +Summary: Vietnamese input method for the GTK+ toolkit library v2 Group: System/Libraries Requires: %{name} = %{version} Requires(post): %{name}-tools >= 2.24.20 @@ -228,7 +225,7 @@ This package provides an input method for Vietnamese. %package immodule-xim -Summary: The GTK+ toolkit library (version 2) -- X Input Method +Summary: X input method for the GTK+ toolkit library v2 Group: System/Libraries Requires: %{name} = %{version} Requires(post): %{name}-tools >= 2.24.20 @@ -246,7 +243,7 @@ This package provides an input method based on the X Input Method. %package tools -Summary: The GTK+ toolkit library (version 2) -- Tools +Summary: Auxiliary utilities for the GTK+ toolkit library v2 Group: System/Libraries Requires(post): update-alternatives Requires(postun): update-alternatives @@ -257,7 +254,7 @@ ranging from small one-off projects to complete application suites. %package data -Summary: The GTK+ toolkit library (version 2) -- Data Files +Summary: Data files for the GTK+ toolkit library v2 Group: System/Libraries BuildArch: noarch @@ -267,7 +264,7 @@ ranging from small one-off projects to complete application suites. %package branding-upstream -Summary: The GTK+ toolkit library (version 2) -- Upstream theme configuration +Summary: Upstream theme configuration for the GTK+ toolkit library v2 Group: System/Libraries Requires: libgtk-2_0-0 = %{version} Supplements: packageand(%{name}:branding-upstream) @@ -284,7 +281,7 @@ ranging from small one-off projects to complete application suites. %package devel -Summary: The GTK+ toolkit library (version 2) -- Development Files +Summary: Development files for the GTK+ toolkit library v2 Group: Development/Libraries/X11 Requires: libgtk-2_0-0 = %{version} # gtk-builder-convert needs this. @@ -308,6 +305,8 @@ %prep %setup -q -n %{_name}-%{version} + +%if !0%{?is_opensuse} translation-update-upstream translation-update-upstream po-properties gtk20-properties # remove incomplete translations caused by translation-update-upstream (global LINGUAS file, two domains) @@ -318,26 +317,26 @@ sed -i "/^$LNG\$/d" po/LINGUAS fi done +%endif gnome-patch-translation-prepare -%patch0 -p1 -%patch1 -p1 %if "%{_lib}" == "lib64" cp -a %{SOURCE2} . # WARNING: This patch does not patch not installed demos and tests. -%patch8 -p1 +%patch0 -p1 %endif -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch53 -%patch55 -p1 -%patch56 -p1 -%patch57 -p1 -%patch100 -p1 + +%patch1 -p1 +%patch2 -p1 +%patch3 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 gnome-patch-translation-update %build -NOCONFIGURE=1 gnome-autogen.sh +NOCONFIGURE=1 ./autogen.sh export CFLAGS="%{optflags}" export CFLAGS="$CFLAGS -fstack-protector" %ifarch ppc64 @@ -349,7 +348,8 @@ --disable-static \ --enable-man \ --with-xinput=xfree \ - --enable-introspection + --enable-introspection \ + --enable-gtk-doc make %{?_smp_mflags} %install ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">git://git.gnome.org/gtk+</param> <param name="scm">git</param> <param name="revision">gtk-2-24</param> <param name="versionformat">2.24.31+%cd.%h</param> <param name="changesgenerate">enable</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version" /> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://git.gnome.org/gtk+</param> <param name="changesrevision">61d5c82f5ca7d4f00f8182d17d30c350f43a4424</param></service></servicedata>
