diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2011-03-11 08:41:33 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2011-03-11 08:41:33 +0000 |
| commit | a572fa63e192fa7138aa25ccee116c10589f3429 (patch) | |
| tree | 196986f15d945c7f074755c82cbc7fcddf5f30e4 /www-client/epiphany/files | |
| parent | add patch to fix building for parisc systems (diff) | |
| download | gentoo-2-a572fa63e192fa7138aa25ccee116c10589f3429.tar.gz gentoo-2-a572fa63e192fa7138aa25ccee116c10589f3429.tar.bz2 gentoo-2-a572fa63e192fa7138aa25ccee116c10589f3429.zip | |
Fix building with latest libnotify (bug #358043), fix introspection build by telling g-ir-scanner what the prefix is, ping dependencies to proper slots, bump to eapi3, prepare this for supporting introspection (without revbump as introspection USE flag is still masked and we will need to check the tree before unmasking it anyway).
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'www-client/epiphany/files')
| -rw-r--r-- | www-client/epiphany/files/epiphany-2.30.6-dbus-fix.patch | 20 | ||||
| -rw-r--r-- | www-client/epiphany/files/epiphany-2.30.6-introspection-prefix.patch | 21 |
2 files changed, 41 insertions, 0 deletions
diff --git a/www-client/epiphany/files/epiphany-2.30.6-dbus-fix.patch b/www-client/epiphany/files/epiphany-2.30.6-dbus-fix.patch new file mode 100644 index 000000000000..c50be67a2c60 --- /dev/null +++ b/www-client/epiphany/files/epiphany-2.30.6-dbus-fix.patch @@ -0,0 +1,20 @@ +From 174a51819570a975cc61e642f7f26cb4bc2f9c57 Mon Sep 17 00:00:00 2001 +From: Diego Escalante Urrelo <descalante@igalia.com> +Date: Mon, 01 Nov 2010 05:56:51 +0000 +Subject: tests: DBUS_LIBS is needed for libephymain.la + +--- +diff --git a/tests/Makefile.am b/tests/Makefile.am +index bd2c378..b973214 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -23,6 +23,7 @@ LDADD = \ + $(top_builddir)/lib/widgets/libephywidgets.la \ + $(top_builddir)/lib/libephymisc.la \ + $(top_builddir)/lib/egg/libegg.la \ ++ $(DBUS_LIBS) \ + $(DEPENDENCIES_LIBS) + + if ENABLE_NSS +-- +cgit v0.8.3.4 diff --git a/www-client/epiphany/files/epiphany-2.30.6-introspection-prefix.patch b/www-client/epiphany/files/epiphany-2.30.6-introspection-prefix.patch new file mode 100644 index 000000000000..2fe761a44482 --- /dev/null +++ b/www-client/epiphany/files/epiphany-2.30.6-introspection-prefix.patch @@ -0,0 +1,21 @@ +From 78b9eac0fca36e27c83c7678b18962ba286f041b Mon Sep 17 00:00:00 2001 +From: Vincent Untz <vuntz@gnome.org> +Date: Fri, 01 Oct 2010 16:36:23 +0000 +Subject: introspection: Fix build by telling g-ir-scanner what the prefix is + +https://bugzilla.gnome.org/show_bug.cgi?id=631119 +--- +diff --git a/src/Makefile.am b/src/Makefile.am +index e9d3715..acbf8ff 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -350,6 +350,7 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILE + --include=WebKit-1.0 \ + --program=./epiphany \ + --output $@ \ ++ --strip-prefix=Ephy \ + --pkg epiphany-$(EPIPHANY_API_VERSION) \ + -DEPIPHANY_COMPILATION \ + -I$(top_srcdir)/embed \ +-- +cgit v0.8.3.4 |