From 037bed5266b5a3154f7b8d5e5bc545f0730b1b5eba6a53301ef59e03d8b0cdbb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 13 Apr 2018 06:43:15 +0000 Subject: [PATCH] Accepting request 593535 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/593535 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=315 --- gtk3.changes | 15 ++++++++++ gtk3.spec | 82 +++++++++++++++++----------------------------------- 2 files changed, 42 insertions(+), 55 deletions(-) diff --git a/gtk3.changes b/gtk3.changes index 642ee2f..813aff4 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Apr 4 10:22:08 UTC 2018 - fezhang@suse.com + +- Clean up specfile: Enable Wayland unconditionally. + +------------------------------------------------------------------- +Thu Mar 22 02:31:20 UTC 2018 - luc14n0@linuxmail.org + +- Drop icon_theme_cache_* and glib2_gsettings_schema_* post/postun + scriptlets, and glib2_gsettings_schema_requires macro: their + functionality has been moved to RPM file triggers + (RPM 4.13, suse_version 1330). +- Add cairo-gobject, gio-2.0, gio-unix-2.0 and harfbuzz pkgconfig + modules BuildRequires to avoid implicit dependencies. + ------------------------------------------------------------------- Tue Mar 20 17:12:52 UTC 2018 - dimstar@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index 0b447c5..ebff116 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -17,22 +17,17 @@ # -%define build_broadway_backend 1 -%if 0%{?suse_version} == 1315 -%define build_wayland_backend 0 -%else -%define build_wayland_backend 1 -%endif # When updating the binary version, do not forget to also update baselibs.conf -%define gtk_binary_version 3.0.0 -%define _name gtk+ +%define gtk_binary_version 3.0.0 +%define _name gtk+ +%bcond_without broadway Name: gtk3 Version: 3.22.29 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1-or-later Group: Development/Libraries/X11 -URL: http://www.gtk.org/ +Url: https://www.gtk.org/ Source: http://download.gnome.org/sources/gtk+/3.22/%{_name}-%{version}.tar.xz Source1: README.SUSE Source2: settings.ini @@ -41,7 +36,7 @@ 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 revert-forced-xftdpi.patch fvogt@opensuse.org -- Revert very controversal commit on GTK3, forcing DPI to 96 -Patch4: gtk3-revert-forced-xftdpi.patch +Patch1: gtk3-revert-forced-xftdpi.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -53,19 +48,27 @@ BuildRequires: xsltproc BuildRequires: pkgconfig(atk) >= 2.15.1 BuildRequires: pkgconfig(atk-bridge-2.0) BuildRequires: pkgconfig(cairo) >= 1.14.0 +BuildRequires: pkgconfig(cairo-gobject) >= 1.14.0 # Enable cloudproviders once upstream settles on a location and version #BuildRequires: pkgconfig(cloudproviders) >= 0.2.5 -BuildRequires: pkgconfig(colord) +BuildRequires: pkgconfig(colord) >= 0.1.9 BuildRequires: pkgconfig(epoxy) >= 1.0 BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.30.0 -BuildRequires: pkgconfig(glib-2.0) >= 2.49.1 +BuildRequires: pkgconfig(gio-2.0) >= 2.49.4 +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.49.4 +BuildRequires: pkgconfig(glib-2.0) >= 2.49.4 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.39.0 +BuildRequires: pkgconfig(harfbuzz) >= 0.9 BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(pango) >= 1.37.3 BuildRequires: pkgconfig(pangoft2) BuildRequires: pkgconfig(rest-0.7) +BuildRequires: pkgconfig(wayland-client) >= 1.9.91 +BuildRequires: pkgconfig(wayland-cursor) >= 1.9.91 +BuildRequires: pkgconfig(wayland-egl) +BuildRequires: pkgconfig(wayland-protocols) >= 1.9 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xcursor) @@ -74,14 +77,8 @@ BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xinerama) +BuildRequires: pkgconfig(xkbcommon) >= 0.2.0 BuildRequires: pkgconfig(xrandr) -%if %{build_wayland_backend} -BuildRequires: pkgconfig(wayland-client) >= 1.9.90 -BuildRequires: pkgconfig(wayland-cursor) -BuildRequires: pkgconfig(wayland-egl) -BuildRequires: pkgconfig(wayland-protocols) >= 1.7 -BuildRequires: pkgconfig(xkbcommon) -%endif %description GTK+ is a multi-platform toolkit for creating graphical user interfaces. @@ -285,7 +282,6 @@ ranging from small one-off projects to complete application suites. Summary: Config schema for the GTK+ toolkit library v3 Group: System/Libraries BuildArch: noarch -%glib2_gsettings_schema_requires %description schema GTK+ is a multi-platform toolkit for creating graphical user interfaces. @@ -319,7 +315,6 @@ Group: Development/Libraries/X11 Requires: gettext-its-%{name} >= %{version} Requires: libgtk-3-0 = %{version} Requires: typelib-1_0-Gtk-3_0 = %{version} -%glib2_gsettings_schema_requires %description devel GTK+ is a multi-platform toolkit for creating graphical user interfaces. @@ -354,7 +349,7 @@ done cp -a %{SOURCE1} . %patch0 -p1 %endif -%patch4 -p1 +%patch1 -p1 %build %configure \ @@ -362,13 +357,10 @@ cp -a %{SOURCE1} . --enable-man \ --enable-x11-backend \ --enable-introspection \ -%if %{build_broadway_backend} - --enable-broadway-backend \ -%endif -%if %{build_wayland_backend} + %{?with_broadway: \ + --enable-broadway-backend} \ --enable-wayland-backend \ --enable-explicit-deps=yes \ -%endif --enable-colord make %{?_smp_mflags} @@ -488,13 +480,6 @@ if [ "$(realpath %{_bindir}/gtk-update-icon-cache)" = "%{_bindir}/gtk-update-ico done fi -%post schema -%glib2_gsettings_schema_post - -%post devel -%icon_theme_cache_post -%glib2_gsettings_schema_post - %if 0 # No need to call gtk-query-immodules-3.0 in postun: # - if it's an upgrade, it will have been called in post @@ -526,9 +511,6 @@ fi %postun immodule-xim %{_gtk_query_immodules_update_cache} -%postun schema -%glib2_gsettings_schema_postun - %postun tools %if 0 # Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed @@ -537,13 +519,8 @@ if [ ! -f %{_bindir}/gtk-update-icon-cache-3.0 ]; then update-alternatives --remove gtk-update-icon-cache %{_bindir}/gtk-update-icon-cache-3.0 fi -%postun devel -%glib2_gsettings_schema_postun -%icon_theme_cache_post - %files -n libgtk-3-0 %license COPYING -%doc AUTHORS README NEWS %if "%{_lib}" == "lib64" %doc README.SUSE %endif @@ -600,6 +577,7 @@ fi %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-xim.so %files tools +%doc AUTHORS README NEWS %{_bindir}/broadwayd %{_bindir}/gtk3-icon-browser %{_bindir}/gtk-builder-tool @@ -636,10 +614,8 @@ fi %files branding-upstream %config %{_sysconfdir}/gtk-3.0/settings.ini -%files lang -f gtk30.lang -f gtk30-properties.lang - %files devel -%doc ChangeLog +%doc ChangeLog HACKING README.commits %doc %{_datadir}/gtk-doc/html/gail-libgail-util3/ %doc %{_datadir}/gtk-doc/html/gdk3/ %doc %{_datadir}/gtk-doc/html/gtk3/ @@ -663,20 +639,14 @@ fi %{_includedir}/gtk-3.0/ %{_libdir}/pkgconfig/gail-3.0.pc %{_libdir}/pkgconfig/gdk-3.0.pc -%if %{build_broadway_backend} +%if %{with broadway} %{_libdir}/pkgconfig/gdk-broadway-3.0.pc -%endif -%if %{build_wayland_backend} -%{_libdir}/pkgconfig/gdk-wayland-3.0.pc -%endif -%{_libdir}/pkgconfig/gdk-x11-3.0.pc -%{_libdir}/pkgconfig/gtk+-3.0.pc -%if %{build_broadway_backend} %{_libdir}/pkgconfig/gtk+-broadway-3.0.pc %endif -%if %{build_wayland_backend} +%{_libdir}/pkgconfig/gdk-wayland-3.0.pc %{_libdir}/pkgconfig/gtk+-wayland-3.0.pc -%endif +%{_libdir}/pkgconfig/gdk-x11-3.0.pc +%{_libdir}/pkgconfig/gtk+-3.0.pc %{_libdir}/pkgconfig/gtk+-unix-print-3.0.pc %{_libdir}/pkgconfig/gtk+-x11-3.0.pc %{_libdir}/libgailutil-3.so @@ -690,4 +660,6 @@ fi %{_datadir}/gettext/its/gtkbuilder.its %{_datadir}/gettext/its/gtkbuilder.loc +%files lang -f gtk30.lang -f gtk30-properties.lang + %changelog