diff --git a/gtk+-3.20.9.tar.xz b/gtk+-3.20.9.tar.xz deleted file mode 100644 index aaf7317..0000000 --- a/gtk+-3.20.9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17 -size 17174872 diff --git a/gtk+-3.22.0.tar.xz b/gtk+-3.22.0.tar.xz new file mode 100644 index 0000000..78a5e02 --- /dev/null +++ b/gtk+-3.22.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88d0bb584be7ecec965b82ba88a9cf0aafd6f03eff7447653295ab2341c74134 +size 20787268 diff --git a/gtk3-widget-warn-consistency-check-only.patch b/gtk3-widget-warn-consistency-check-only.patch new file mode 100644 index 0000000..6edae80 --- /dev/null +++ b/gtk3-widget-warn-consistency-check-only.patch @@ -0,0 +1,13 @@ +Index: gtk+-3.22.0/gtk/gtkwidget.c +=================================================================== +--- gtk+-3.22.0.orig/gtk/gtkwidget.c ++++ gtk+-3.22.0/gtk/gtkwidget.c +@@ -6998,7 +6998,7 @@ gtk_widget_draw_internal (GtkWidget *wid + if (push_group) + cairo_push_group (cr); + +-#ifdef G_ENABLE_DEBUG ++#ifdef G_ENABLE_CONSISTENCY_CHECKS + if (_gtk_widget_get_alloc_needed (widget)) + g_warning ("%s %p is drawn without a current allocation. This should not happen.", G_OBJECT_TYPE_NAME (widget), widget); + #endif diff --git a/gtk3.changes b/gtk3.changes index f0be60b..ae5b76a 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,190 @@ +------------------------------------------------------------------- +Tue Sep 20 14:05:03 UTC 2016 - dimstar@opensuse.org + +- Add gtk3-widget-warn-consistency-check-only.patch: widget: Only + warn about missing allocation if G_ENABLE_CONSISTENCY_CHECKS. The + previously chosen G_ENABLE_DEBUG is by default set on gtk+ unless + it is explicitly disabled by configure --disable-debug. As the + default is too noisy, we move it to a flag that is only switched + on by configure --enable-debug. + +------------------------------------------------------------------- +Mon Sep 19 23:07:34 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.22.0: + + Reduce some noisy warnings. + + Improve positioning and sizing of popups on Wayland. + + Update Adwaita assets. + + Bugs fixed: bgo#602773, bgo#771117, bgo#771349, bgo#771568, + bgo#771561. + + Updated translations. + +------------------------------------------------------------------- +Tue Sep 13 19:19:33 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.6: + + GtkScrolledWindow sizing behavior has been changed back to the + previous behavior, with new API to change it. + + Some GtkPopover size allocation problems have been fixed. + + Wayland: We require xdg-shell version 6 now. + + Bugs fixed: bgo#764979, bgo#766569, bgo#767391, bgo#769498, + bgo#770278, bgo#770508, bgo#770614, bgo#770624, bgo#770703, + bgo#770745, bgo#770849, bgo#770906, bgo#771033. + + Updated translations. + +------------------------------------------------------------------- +Tue Aug 30 10:23:12 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.5: + + Make GtkShortcutLabel public. + + Add an API to obtain window IDs for sharing. + + Add explicit API to show/hide popovers with animation. + + Wayland: + - Switch to xdg-shell v6. + - Use tablet pad protocol to support Wacom tablets fully. + - Use the xdg_foreign protocol to export window handles. + - Improve menu positioning. + - Improve handling of tiled window state. + + Add GtkPadController to bind GActions to tablet pad events. + + Bugs fixed: bgo#569581, bgo#712760, bgo#755947, bgo#756579, + bgo#762260, bgo#764413, bgo#768017, bgo#768081, bgo#768138, + bgo#768722, bgo#768902, bgo#768930, bgo#768999, bgo#769003, + bgo#769004, bgo#769047, bgo#769126, bgo#769162, bgo#769205, + bgo#769236, bgo#769287, bgo#769402, bgo#769451, bgo#769485, + bgo#769568, bgo#769601, bgo#769603, bgo#769706, bgo#769937, + bgo#770026, bgo#770166, bgo#770236, bgo#770242, bgo#770332, + bgo#770374, bgo#769788, bgo#770458, bgo#770550, bgo#770307. + + Updated translations. + +------------------------------------------------------------------- +Wed Aug 17 15:47:40 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.4: + + GtkHeaderBar supports expanding children. + + GtkPrintDialog respects initially set capabilities. + + GtkApplication supports registering with the Xfce session + manager. + + Keep firefox working after the introduction of + GdkDrawingContext. + + css: Support for background-blend-mode has been added. + + Wayland: Fix some interoperability issues in clipboard + handling. + + Sandboxing: + - GtkFileChooserNative gained portal support. + - GtkPrintOperation gained portal support. + - gtk_show_uri gained portal support. + - GtkApplication gained portal support for inhibiting. + + New APIs: + - gtk_show_uri_on_window. + - gtk_file_filter_to/from_gvariant. + - gtk_file_chooser_add/remove/set/get_choice. + - gtk_print_settings_to/from_gvariant. + - gtk_paper_size_to/from_gvariant. + - gtk_page_setup_to/from_gvariant. + + Bugs fixed: bgo#693203, bgo#724332, bgo#767849, bgo#767851, + bgo#767965, bgo#768016, bgo#768025, bgo#768082, bgo#768142, + bgo#768184, bgo#768485, bgo#768499, bgo#768546, bgo#768657, + bgo#768659, bgo#768756. + + Updated translations. +- Stop passing V=1 to make, debugging is local, no need to clutter + obs build logs. + +------------------------------------------------------------------- +Wed Aug 17 15:47:39 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.3: + + GtkStack now has its own accessible implementation which only + shows the currently visible child. + + The GtkSizeGroup::ignore-hidden property has been documented as + not working. + + GDK_SOURCE_TRACKPOINT has been added to the GdkInputSource + enumeration to allow special-casing this kind of input device. + + Wayland: + - Use separate devices to differentiate between various sources + of scroll events. + - Fall back to using shm_open if memfds are unavailable. + + Styling of text in GtkScale and GtkProgressBar can now be + influenced by the proper CSS nodes. + + GtkScrolledWindow has new max-content-width/height properties + to control its size. + + GtkFileChooser search has been fixed to work with trackers FTS5 + syntax. + + Bugs fixed: bgo#79229, bgo#118959, bgo#556254, bgo#578626, + bgo#674215, bgo#708148, bgo#710471, bgo#742281, bgo#745622, + bgo#751409, bgo#753202, bgo#764203, bgo#765410, bgo#765595, + bgo#766341, bgo#766372, bgo#766569, bgo#766675, bgo#766860, + bgo#766878, bgo#767052, bgo#767058, bgo#767093, bgo#767100, + bgo#767108, bgo#767238, bgo#767241, bgo#767310, bgo#767312, + bgo#767468, bgo#767705, bgo#767766, bgo#767795. + + Updated translations. + +------------------------------------------------------------------- +Wed Aug 17 15:47:38 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.2: + + GTK+ is now using upstream gettext instead of the GLib + wrappers. This adds a requirement for the fairly recent gettext + 0.19.7 release. + + GDK has a new GdkMonitor api that offers richer information + about connected outputs. + + Bugs fixed: bgo#373745, bgo#682080, bgo#747206, bgo#756570, + bgo#759037, bgo#763852, bgo#764395, bgo#765471, bgo#765579, + bgo#765676, bgo#765700, bgo#765742, bgo#765790, bgo#765793, + bgo#765858, bgo#765907, bgo#765922, bgo#765924, bgo#765939, + bgo#765966, bgo#765973, bgo#765981, bgo#766049, bgo#766120, + bgo#766166, bgo#766175, bgo#766207, bgo#766233, bgo#766314, + bgo#766323, bgo#766336, bgo#766405, bgo#766440, bgo#766442, + bgo#766458, bgo#766530, bgo#766566, bgo#766569, bgo#766642, + bgo#766643, bgo#766737, bgo#766782. + + Updated translations. +- Disable gtk3-path-local.patch: It needs rebase again. Reverting + patch to original we had before last rebase. + +------------------------------------------------------------------- +Wed Aug 17 15:47:37 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.1: + + The GNU Affero General Public License has been added to the + list of predefined licenses in GtkAboutDialog. + + GtkShortcutWindow can now follow changes to accelerators. + + GdkSeat and GdkDevice gained API for device tools, to support + drawing tablets. + + GtkInspector can now slow down (or speed up) animations. This + functionality is also available via the GTK_SLOWDOWN + environment variable. + + GdkGLContext can now be instructed to use GLES. + + CSS: + - Inconsistencies in font size handling have been fixed. + - The font shorthand is now parsed according to the CSS spec. + + Windows: + - Clipboard handling has been optimized. + - The CSD implementation has been improved. + + Wayland: + - We print more debug information about pixel formats, outputs, + etc. + - The unstable tablet protocol is now supported. + - Virtual modifier handling has been improved. + - Reduce jitter in keyboard repeat. + - Fix problems with multiple display connections. + + Bugs fixed: bgo#573380, bgo#620065, bgo#693077, bgo#730821, + bgo#743746, bgo#749405, bgo#761651, bgo#763013, bgo#763600, + bgo#763627, bgo#763768, bgo#763783, bgo#763850, bgo#763851, + bgo#763907, bgo#763913, bgo#764022, bgo#764060, bgo#764170, + bgo#764210, bgo#764321, bgo#764376, bgo#764424, bgo#764664, + bgo#764712, bgo#764845, bgo#764846, bgo#764863, bgo#764879, + bgo#764925, bgo#764975, bgo#764996, bgo#765038, bgo#765065, + bgo#765066, bgo#765100, bgo#765118, bgo#765122, bgo#765195, + bgo#765213, bgo#765238, bgo#765259, bgo#765261, bgo#765270, + bgo#765284, bgo#765486, bgo#765493, bgo#765496, bgo#765567, + bgo#756570, bgo#765474, bgo#765565, bgo#765576, bgo#765577, + bgo#765632, bgo#765640, bgo#765644. + + Updated translations. +- Rebase gtk3-path-local.patch. +- Drop gtk3-gtkwindow-realize-toplevel-before-popover.patch: fixed + upstream. +- Conditionally apply translations-update-upstream BuildRequires + and macro for non-openSUSE only. + ------------------------------------------------------------------- Wed Aug 17 15:47:36 UTC 2016 - zaitor@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index f5fa5eb..6b434d0 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -29,29 +29,33 @@ Name: gtk3 %define _name gtk+ -Version: 3.20.9 +Version: 3.22.0 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1+ Group: System/Libraries Url: http://www.gtk.org/ -Source: http://download.gnome.org/sources/gtk+/3.20/%{_name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gtk+/3.22/%{_name}-%{version}.tar.xz Source1: README.SUSE Source2: settings.ini Source3: macros.gtk3 Source99: baselibs.conf # PATCH-FIX-OPENSUSE gtk3-GTK_PATH64.patch sbrabec@novell.com - 64-bit dual install. Use GTK_PATH64 environment variable instead of GTK_PATH Patch0: gtk3-GTK_PATH64.patch -# PATCH-FIX-OPENSUSE gtk3-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 +# PATCH-NEEDS-REBASE gtk3-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 -- Was PATCH-FIX-OPENSUSE Patch1: gtk3-path-local.patch +# PATCH-FIX-UPSTREAM gtk3-widget-warn-consistency-check-only.patch dimstar@opensuse.org -- : widget: Only warn about missing allocation if G_ENABLE_CONSISTENCY_CHECKS. +Patch2: gtk3-widget-warn-consistency-check-only.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes -# Needed for patch1 -BuildRequires: gettext-tools -BuildRequires: gnome-common +BuildRequires: gettext-tools >= 0.19.7 +# Needed for patch1 - disabled since patch is disabled... +# BuildRequires: gnome-common BuildRequires: hicolor-icon-theme +%if !0%{?is_opensuse} BuildRequires: translation-update-upstream +%endif BuildRequires: xsltproc BuildRequires: pkgconfig(atk) >= 2.15.1 BuildRequires: pkgconfig(atk-bridge-2.0) @@ -60,7 +64,7 @@ BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(epoxy) >= 1.0 BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.30.0 -BuildRequires: pkgconfig(glib-2.0) >= 2.45.8 +BuildRequires: pkgconfig(glib-2.0) >= 2.49.1 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.39.0 BuildRequires: pkgconfig(json-glib-1.0) @@ -80,7 +84,7 @@ BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(wayland-client) >= 1.9.90 BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-egl) -BuildRequires: pkgconfig(wayland-protocols) >= 1.0 +BuildRequires: pkgconfig(wayland-protocols) >= 1.7 BuildRequires: pkgconfig(xkbcommon) %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -318,9 +322,10 @@ This package contains the development files for GTK+ 3.x. %lang_package %prep %setup -q -n %{_name}-%{version} -# Translation this tmie intentionally disabled.. they fail -#translation-update-upstream -#translation-update-upstream po-properties gtk30-properties +%if !0%{?is_opensuse} +# Translation this time intentionally disabled.. they fail +translation-update-upstream +translation-update-upstream po-properties gtk30-properties # remove incomplete translations caused by translation-update-upstream (global LINGUAS file, two domains) for LNG in po/*.po ; do LNG=`basename ${LNG%%.po}` @@ -329,15 +334,19 @@ for LNG in po/*.po ; do sed -i "/^$LNG\$/d" po/LINGUAS fi done +%endif %if "%_lib" == "lib64" cp -a %{S:1} . %patch0 -p1 %endif -%patch1 -p0 +# Patch disabled, needs rebase. +#patch1 -p0 +%patch2 -p1 %build +# Disabled since patch 1 is in need of rebase # Needed for patch1 -NOCONFIGURE=1 ./autogen.sh +#NOCONFIGURE=1 ./autogen.sh %configure \ --disable-static \ --enable-man \ @@ -347,11 +356,11 @@ NOCONFIGURE=1 ./autogen.sh --enable-broadway-backend \ %endif %if %{build_wayland_backend} - --enable-wayland-backend \ - --enable-explicit-deps=yes \ + --enable-wayland-backend \ + --enable-explicit-deps=yes \ %endif --enable-colord -%{__make} V=1 %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install %makeinstall