diff --git a/epiphany-fix-introspection-build.patch b/epiphany-fix-introspection-build.patch new file mode 100644 index 0000000..d180f27 --- /dev/null +++ b/epiphany-fix-introspection-build.patch @@ -0,0 +1,32 @@ +commit 78b9eac0fca36e27c83c7678b18962ba286f041b +Author: Vincent Untz +Date: Fri Oct 1 18:36:23 2010 +0200 + + introspection: Fix build by telling g-ir-scanner what the prefix is + + https://bugzilla.gnome.org/show_bug.cgi?id=631119 + +Index: epiphany-2.30.6/src/Makefile.am +=================================================================== +--- epiphany-2.30.6.orig/src/Makefile.am ++++ epiphany-2.30.6/src/Makefile.am +@@ -350,6 +350,7 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: $( + --include=WebKit-1.0 \ + --program=./epiphany \ + --output $@ \ ++ --strip-prefix=Ephy \ + --pkg epiphany-$(EPIPHANY_API_VERSION) \ + -DEPIPHANY_COMPILATION \ + -I$(top_srcdir)/embed \ +Index: epiphany-2.30.6/src/Makefile.in +=================================================================== +--- epiphany-2.30.6.orig/src/Makefile.in ++++ epiphany-2.30.6/src/Makefile.in +@@ -1594,6 +1594,7 @@ stamp-ephy-dbus-client-bindings.h: $(top + @HAVE_INTROSPECTION_TRUE@ --include=WebKit-1.0 \ + @HAVE_INTROSPECTION_TRUE@ --program=./epiphany \ + @HAVE_INTROSPECTION_TRUE@ --output $@ \ ++@HAVE_INTROSPECTION_TRUE@ --strip-prefix=Ephy \ + @HAVE_INTROSPECTION_TRUE@ --pkg epiphany-$(EPIPHANY_API_VERSION) \ + @HAVE_INTROSPECTION_TRUE@ -DEPIPHANY_COMPILATION \ + @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir)/embed \ diff --git a/epiphany.changes b/epiphany.changes index cca0725..1ad8c7c 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 1 18:40:02 CEST 2010 - vuntz@opensuse.org + +- Add epiphany-fix-introspection-build.patch to fix build with + recent version of gobject-introspection. + ------------------------------------------------------------------- Sun Sep 19 00:40:55 CEST 2010 - vuntz@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index 441a593..f3d4bde 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -27,6 +27,8 @@ Group: Productivity/Networking/Web/Browsers Source: %{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE epiphany-hide-bookmark-editor.patch vuntz@opensuse.org -- Hide bookmark editors in menu Patch0: epiphany-hide-bookmark-editor.patch +# PATCH-FIX-UPSTREAM epiphany-fix-introspection-build.patch bgo#631119 vuntz@opensuse.org -- Fix build with recent g-i +Patch1: epiphany-fix-introspection-build.patch # PATCH-FEATURE-OPENSUSE epiphany-safe-one-click-install.patch bnc330070 vuntz@novell.com -- Make one-click install work with one-click Patch6: epiphany-safe-one-click-install.patch BuildRequires: NetworkManager-devel @@ -96,6 +98,7 @@ This package provides upstream Look and Feel for Epiphany. %setup -q translation-update-upstream %patch0 -p1 +%patch1 -p1 %patch6 -p1 %build