From 32cddfa4ae0ccaf5881308ffdeab4c13885ccb8cce97a350aa984c761ba5a221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 24 Oct 2019 11:05:41 +0000 Subject: [PATCH] Accepting request 742245 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/742245 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=362 --- _service | 15 +++++++++++++++ _servicedata | 4 ++++ gtk+-3.24.12.tar.xz | 3 --- gtk-3.24.12+32.obscpio | 3 +++ gtk.obsinfo | 5 +++++ gtk3.changes | 22 ++++++++++++++++++++++ gtk3.spec | 15 ++++++++++----- 7 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 _service create mode 100644 _servicedata delete mode 100644 gtk+-3.24.12.tar.xz create mode 100644 gtk-3.24.12+32.obscpio create mode 100644 gtk.obsinfo diff --git a/_service b/_service new file mode 100644 index 0000000..a3aca17 --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + https://gitlab.gnome.org/GNOME/gtk.git + git + gtk-3-24 + @PARENT_TAG@+@TAG_OFFSET@ + enable + + + + *.tar + xz + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..ba78a7e --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://gitlab.gnome.org/GNOME/gtk.git + ff41436b594e04e106c0cd3859080ac80e6e6722 \ No newline at end of file diff --git a/gtk+-3.24.12.tar.xz b/gtk+-3.24.12.tar.xz deleted file mode 100644 index a42a300..0000000 --- a/gtk+-3.24.12.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1384eba5614fed160044ae0d32369e3df7b4f517b03f4b1f24d383e528f4be83 -size 20977596 diff --git a/gtk-3.24.12+32.obscpio b/gtk-3.24.12+32.obscpio new file mode 100644 index 0000000..5d9cf9b --- /dev/null +++ b/gtk-3.24.12+32.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ddca9e0ab18eda57749e72f6edc8adfa4ac26a797c8b5374082e4a3a86cb47a +size 97826318 diff --git a/gtk.obsinfo b/gtk.obsinfo new file mode 100644 index 0000000..7459089 --- /dev/null +++ b/gtk.obsinfo @@ -0,0 +1,5 @@ +name: gtk +version: 3.24.12+32 +mtime: 1571766043 +commit: 39e28ab93395c32cc2ed49a67bca24d31bac587e + diff --git a/gtk3.changes b/gtk3.changes index aeb16f3..d5b4d38 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Oct 23 10:06:55 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 3.24.12+32: + + gdk: Do not change the windowing selection when cancelling + source + + Revert "gdk: Do not call gdk_selection_owner_set() internally + to the backend" + + gtkwidget: Ensure to run key controllers in the bubble phase + + keycontroller: Fix ::key-released signal argument + + key controller: Don't eat modifier events + + gdk: Do not call gdk_selection_owner_set() internally to the + backend + + gdk: Shuffle the situations where a selection is unset + + gtkwidget: Forward unhandled scroll events through controllers +- Switch to gitcheckout of stable branch, needed to get fixes for + copy/paste between Xwayland and wayland programs. +- Following the above, add gtk-doc and libtool BuildRequires and + pass autogen.sh to bootstrap and --enable-gtk-doc to configure. +- No longer disable LTO, current versions of gtk3 builds fine with + it enabled. + ------------------------------------------------------------------- Fri Oct 4 11:03:57 UTC 2019 - Bjørn Lie diff --git a/gtk3.spec b/gtk3.spec index 18050e3..0a42b7d 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -19,16 +19,16 @@ # When updating the binary version, do not forget to also update baselibs.conf %define gtk_binary_version 3.0.0 -%define _name gtk+ +%define _name gtk %bcond_without broadway Name: gtk3 -Version: 3.24.12 +Version: 3.24.12+32 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1-or-later Group: Development/Libraries/X11 URL: https://www.gtk.org/ -Source0: https://download.gnome.org/sources/gtk+/3.24/%{_name}-%{version}.tar.xz +Source0: %{_name}-%{version}.tar.xz Source1: README.SUSE Source2: settings.ini Source3: macros.gtk3 @@ -37,11 +37,15 @@ Source99: baselibs.conf Patch0: gtk3-GTK_PATH64.patch # PATCH-FIX-OPENSUSE gtk3-revert-forced-xftdpi.patch fvogt@opensuse.org -- Revert very controversal commit on GTK3, forcing DPI to 96 Patch1: gtk3-revert-forced-xftdpi.patch + BuildRequires: cups-devel >= 1.7 BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: gettext-tools-mini >= 0.19.7 +BuildRequires: gtk-doc BuildRequires: hicolor-icon-theme +# libtool is needed since we are using a git checkout +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: translation-update-upstream BuildRequires: xsltproc @@ -351,7 +355,7 @@ This package enhances gettext with an International Tag Set for GTK+ 3 %lang_package %prep -%setup -q -n gtk+-%{version} +%setup -q -n %{_name}-%{version} translation-update-upstream translation-update-upstream po-properties gtk30-properties # remove incomplete translations caused by translation-update-upstream (global LINGUAS file, two domains) @@ -369,9 +373,10 @@ cp -a %{SOURCE1} . %patch1 -p1 %build -%define _lto_cflags %{nil} +NOCONFIGURE=1 ./autogen.sh %configure \ --disable-static \ + --enable-gtk-doc \ --enable-man \ --enable-x11-backend \ --enable-introspection \