From 5b3029a8d061a3d0080e76efd98a570b01aef7d04d9b8d5e75d68a0e9468f3a2 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Mon, 25 Mar 2013 11:46:17 +0000 Subject: [PATCH] Accepting request 160818 from home:Zaitor:branches:GNOME:Factory Enable building of wayland backedend. I'm a bit worried by the buildlog, so please take a look there, this sr also includes sr#160508 from sbrabec OBS-URL: https://build.opensuse.org/request/show/160818 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=109 --- gtk3-find-wayland-includedir.patch | 12 +++++++++++ gtk3.changes | 21 +++++++++++++++++- gtk3.spec | 34 ++++++++++++++++++++++++++---- 3 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 gtk3-find-wayland-includedir.patch diff --git a/gtk3-find-wayland-includedir.patch b/gtk3-find-wayland-includedir.patch new file mode 100644 index 0000000..14b9195 --- /dev/null +++ b/gtk3-find-wayland-includedir.patch @@ -0,0 +1,12 @@ +--- gtk+-3.7.14-orig/gtk/Makefile.am 2013-03-18 23:38:08.000000000 +0100 ++++ gtk+-3.7.14/gtk/Makefile.am 2013-03-24 20:15:39.513000347 +0100 +@@ -53,7 +53,8 @@ + $(GMODULE_CFLAGS) \ + $(GTK_DEBUG_FLAGS) \ + $(GTK_DEP_CFLAGS) \ +- $(INCLUDED_IMMODULE_DEFINE) ++ $(INCLUDED_IMMODULE_DEFINE) \ ++ $(GDK_DEP_CFLAGS) + + if PLATFORM_WIN32 + no_undefined = -no-undefined diff --git a/gtk3.changes b/gtk3.changes index be336d7..3f9d9ca 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sun Mar 24 12:41:48 UTC 2013 - zaitor@opensuse.org + +- Add build_wayland_backend define and set it to 1. Build the + wayland backend. +- Conditionally, based on %{build_wayland_backend}, + + Pass --enable-wayland-backend to configure. + + BuildRequire pkgconfig(wayland-client, wayland-cursor and + xkbcommon). +- Add gtk3-find-wayland-includedir.patch, build does not find our + wayland headerfiles since they are in a non standard includedir + (bgo#696507). + +------------------------------------------------------------------- +Thu Mar 21 20:09:20 CET 2013 - sbrabec@suse.cz + +- Check completeness of translations sets introduced by + translation-update-upstream (bnc#690180). + ------------------------------------------------------------------- Tue Mar 19 23:29:20 UTC 2013 - sbrabec@suse.cz @@ -36,7 +55,7 @@ Wed Mar 6 09:52:29 UTC 2013 - dimstar@opensuse.org - Conditionally, based on %{enable_avahi_browsing}, + pass --enable-avahi-browsing to configure for the new avahi based printer autodetection. - + BuildRequre cups-devel >= 1.6 + + BuildRequire cups-devel >= 1.6 - Define enable_avahi_browsing to 0, as cups 1.6 is not available in Factory yet. diff --git a/gtk3.spec b/gtk3.spec index e9ce8b6..2765275 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -18,6 +18,7 @@ %define build_broadway_backend 1 +%define build_wayland_backend 1 # When updating the binary version, do not forget to also update baselibs.conf %define gtk_binary_version 3.0.0 @@ -41,10 +42,12 @@ Patch0: gtk3-GTK_PATH64.patch Patch1: gtk3-path-local.patch # PATCH-FIX-UPSTREAM gtk3-bnc130159-bgo319483-async-font-selection.patch bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages Patch3: gtk3-bnc130159-bgo319483-async-font-selection.patch +# PATCH-FIX-UPSTREAM gtk3-find-wayland-includedir.patch bgo#696507 zaitor@opensuse.org -- Make configure find wayland include files. +Patch4: gtk3-find-wayland-includedir.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes -# Needed for patch1 +# Needed for patch1 and patch4 BuildRequires: gnome-common BuildRequires: translation-update-upstream BuildRequires: xsltproc @@ -59,6 +62,11 @@ BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.32.0 BuildRequires: pkgconfig(pango) >= 1.32.4 BuildRequires: pkgconfig(pangoft2) +%if %{build_wayland_backend} +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-cursor) +BuildRequires: pkgconfig(xkbcommon) +%endif BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xcursor) @@ -289,24 +297,36 @@ This package contains the development files for GTK+ 3.x. %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) +for LNG in po/*.po ; do + LNG=`basename ${LNG%%.po}` + if ! test -f po-properties/$LNG.po ; then + echo "Removing incomplete $LNG from LINGUAS." + sed -i "/^$LNG\$/d" po/LINGUAS + fi +done %if "%_lib" == "lib64" cp -a %{S:1} . %patch0 -p1 %endif %patch1 -p0 %patch3 -p1 - +%patch4 -p1 %build -# Needed for patch1 +# Needed for patch1 and patch4 NOCONFIGURE=1 ./autogen.sh %configure \ --disable-static \ --enable-man \ --enable-x11-backend \ + --enable-introspection \ %if %{build_broadway_backend} --enable-broadway-backend \ %endif - --enable-introspection \ +%if %{build_wayland_backend} + --enable-wayland-backend \ + --enable-explicit-deps=yes \ +%endif --enable-colord %{__make} V=1 %{?_smp_mflags} @@ -563,11 +583,17 @@ fi %if %{build_broadway_backend} %{_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/gtk+-wayland-3.0.pc +%endif %{_libdir}/pkgconfig/gtk+-unix-print-3.0.pc %{_libdir}/pkgconfig/gtk+-x11-3.0.pc %{_libdir}/libgailutil-3.so