From 15611f97a7d2f1148f457872596ec1aebebc453f44dfd6466fd343195fcd8ddd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 1 Oct 2010 20:58:34 +0000 Subject: [PATCH 1/3] Accepting request 49635 from home:vuntz:branches:GNOME:Factory Thanks OBS-URL: https://build.opensuse.org/request/show/49635 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=85 --- epiphany-fix-introspection-build.patch | 32 ++++++++++++++++++++++++++ epiphany.changes | 6 +++++ epiphany.spec | 3 +++ 3 files changed, 41 insertions(+) create mode 100644 epiphany-fix-introspection-build.patch 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 From f388b5eed2ea82d563fe26d306b74799c6e40f952245f442a0b6f2330e7a6288 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 15 Oct 2010 14:46:27 +0000 Subject: [PATCH 2/3] Accepting request 50661 from GNOME:Factory checked in (request 50661) OBS-URL: https://build.opensuse.org/request/show/50661 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=86 --- epiphany-fix-introspection-build.patch | 32 -------------------------- epiphany.changes | 6 ----- epiphany.spec | 3 --- 3 files changed, 41 deletions(-) delete mode 100644 epiphany-fix-introspection-build.patch diff --git a/epiphany-fix-introspection-build.patch b/epiphany-fix-introspection-build.patch deleted file mode 100644 index d180f27..0000000 --- a/epiphany-fix-introspection-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 1ad8c7c..cca0725 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -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 f3d4bde..441a593 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -27,8 +27,6 @@ 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 @@ -98,7 +96,6 @@ This package provides upstream Look and Feel for Epiphany. %setup -q translation-update-upstream %patch0 -p1 -%patch1 -p1 %patch6 -p1 %build From cd3a13ef2deb051eebf58422bb7457ba4c7f0c1b08d13c6aa7bf6dd0fb8b99ac Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 15 Oct 2010 14:46:28 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/epiphany revision 67.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=991a164b3baa92d546047cd49d191a26 --- epiphany-fix-introspection-build.patch | 32 ++++++++++++++++++++++++++ epiphany.changes | 6 +++++ epiphany.spec | 5 +++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 epiphany-fix-introspection-build.patch 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..4e42dd4 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -19,7 +19,7 @@ Name: epiphany Version: 2.30.6 -Release: 1 +Release: 2 License: GPLv2+ Summary: GNOME Web Browser Based on the WebKit Rendering Engine Url: http://www.gnome.org/projects/epiphany/ @@ -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