pool/epiphany
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 17845 from GNOME:Factory

Browse Source 
Copy from GNOME:Factory/epiphany based on submit request 17845 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/17845
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany?expand=0&rev=45
This commit is contained in:
OBS User autobuild 2009-08-17 12:52:10 +00:00 committed by Git OBS Bridge
parent e962683280
commit 9a200f21a2
5 changed files with 28 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epiphany-2.27.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7025cd5b318f6d16f98b3538fde5d2951bb9a61b904a40b3e6d9e2266ff13ea9
size 5666889

3
epiphany-2.27.90.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2fc93193606330ad1a80e0877859d9ea6fcaa0b18f06a03323a0df1e4a26394e
size 5696273

119
epiphany-bgo300190-default-bookmarks.patch
View File

@ -1,119 +0,0 @@
diff -urN epiphany-2.27.4/data/default-bookmarks.rdf.xml.in epiphany-2.27.4.patched//data/default-bookmarks.rdf.xml.in
--- epiphany-2.27.4/data/default-bookmarks.rdf.xml.in 1970-01-01 01:00:00.000000000 +0100
+++ epiphany-2.27.4.patched//data/default-bookmarks.rdf.xml.in 2009-07-20 22:32:43.000000000 +0200
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<rdf:RDF xmlns="http://purl.org/rss/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ephy="http://gnome.org/ns/epiphany#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <channel rdf:about="file://@pkgdatadir@/bookmarks.rdf">
+ <title>Epiphany bookmarks</title>
+ <link>http://www.gnome.org/projects/epiphany/</link>
+ <items>
+ <rdf:Seq>
+ <rdf:li rdf:resource="http://www.google.com"/>
+ </rdf:Seq>
+ </items>
+ </channel>
+ <item rdf:about="http://www.google.com">
+ <_title>Search the web</_title>
+ <!-- Translators you should change these links to respect your locale.
+ For instance in .nl these should be
+ "http://www.google.nl" and "http://www.google.nl/search?q=%s" -->
+ <_link>http://www.google.com</_link>
+ <!-- Translators you should change these links to respect your locale.
+ For instance in .nl these should be
+ "http://www.google.nl" and "http://www.google.nl/search?q=%s" -->
+ <_ephy:smartlink>http://www.google.com/search?q=%s&amp;ie=UTF-8&amp;oe=UTF-8</_ephy:smartlink>
+ </item>
+</rdf:RDF>
diff -urN epiphany-2.27.4/data/Makefile.am epiphany-2.27.4.patched//data/Makefile.am
--- epiphany-2.27.4/data/Makefile.am 2009-04-17 08:06:40.000000000 +0200
+++ epiphany-2.27.4.patched//data/Makefile.am 2009-07-20 22:39:09.000000000 +0200
@@ -42,6 +42,17 @@
$(service_DATA): $(service_in_files) Makefile
@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
+# Default bookmarks
+# intltool hack: we name the file .xml.in so that intltool knows it's xml
+# format and can analyze it.
+# We don't put translations in the resulting rdf since the code can get
+# the translations via gettext (although it can also get translations
+# from the rdf if they are there and not available via gettext)
+default_bookmarksdir = $(pkgdatadir)
+default_bookmarks_in_files = default-bookmarks.rdf.xml.in
+default_bookmarks_DATA = $(default_bookmarks_in_files:.rdf.xml.in=.rdf)
+$(default_bookmarks_DATA): $(default_bookmarks_in_files) Makefile
+ @sed -e "s|\@pkgdatadir\@|$(pkgdatadir)|;s|_title|title|g;s|_link|link|g;s|_ephy:smartlink|ephy:smartlink|g" $< > $@
install-data-local: $(schema_DATA)
if GCONF_SCHEMAS_INSTALL
@@ -63,6 +74,7 @@
$(xsl_DATA) \
$(service_DATA) \
$(m4data_DATA) \
+ $(default_bookmarks_in_files) \
epiphany-service.xml \
check-mime.py
@@ -70,4 +82,5 @@
$(service_DATA) \
$(schema_in_files:.schemas.in=.schemas) \
$(pkgconfig_DATA) \
- $(desktop_DATA)
+ $(desktop_DATA) \
+ $(default_bookmarks_DATA)
diff -urN epiphany-2.27.4/po/POTFILES.in epiphany-2.27.4.patched//po/POTFILES.in
--- epiphany-2.27.4/po/POTFILES.in 2009-06-05 23:42:54.000000000 +0200
+++ epiphany-2.27.4.patched//po/POTFILES.in 2009-07-20 22:32:43.000000000 +0200
@@ -2,6 +2,7 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
data/bme.desktop.in.in
+data/default-bookmarks.rdf.xml.in
data/epiphany.desktop.in.in
data/epiphany-lockdown.schemas.in
data/epiphany.schemas.in
diff -urN epiphany-2.27.4/src/bookmarks/ephy-bookmarks.c epiphany-2.27.4.patched//src/bookmarks/ephy-bookmarks.c
--- epiphany-2.27.4/src/bookmarks/ephy-bookmarks.c 2009-04-17 08:06:40.000000000 +0200
+++ epiphany-2.27.4.patched//src/bookmarks/ephy-bookmarks.c 2009-07-20 22:32:43.000000000 +0200
@@ -100,15 +100,6 @@
const char *location;
} EphyBookmarksBookmarkInfo;
-static const EphyBookmarksBookmarkInfo default_bookmarks [] =
-{
- /* Translators you should change these links to respect your locale.
- * For instance in .nl these should be
- * "http://www.google.nl" and "http://www.google.nl/search?q=%s"
- */
- { N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") }
-};
-
static const char *default_topics [] =
{
N_("Entertainment"),
@@ -152,13 +143,7 @@
ephy_bookmarks_add_keyword (eb, _(default_topics[i]));
}
- for (i = 0; i < G_N_ELEMENTS (default_bookmarks); i++)
- {
- EphyNode *bmk;
-
- bmk = ephy_bookmarks_add (eb, _(default_bookmarks[i].title),
- _(default_bookmarks[i].location));
- }
+ ephy_bookmarks_import_rdf (eb, DATADIR "/default-bookmarks.rdf");
}
static void
diff -urN epiphany-2.27.4/src/bookmarks/Makefile.am epiphany-2.27.4.patched//src/bookmarks/Makefile.am
--- epiphany-2.27.4/src/bookmarks/Makefile.am 2009-04-17 08:06:40.000000000 +0200
+++ epiphany-2.27.4.patched//src/bookmarks/Makefile.am 2009-07-20 22:32:43.000000000 +0200
@@ -111,6 +111,7 @@
-I$(top_srcdir)/embed \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/lib/egg \
+ -DDATADIR=\""$(pkgdatadir)"\" \
$(AM_CPPFLAGS)
libephybookmarks_la_CFLAGS = \

22
epiphany.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Mon Aug 10 21:32:57 CEST 2009 - vuntz@novell.com
- Update to version 2.27.90:
+ Port PDM's password viewer to gnome-keyring so that it works
again. (bgo#579217)
+ Fix address normalization when opening URLs from the command
line.
+ Fix spurious whitespace when hiding downloader status
icons. (bgo#591189)
+ Re-add the spinner so that we have some kind of progress
notification before we receive any response from the
server. (bgo#585035)
+ Workaround bug in WebKitGTK+ that made us never stop the
progress notification while loading in some pages. (bgo#590170)
+ Move default bookmarks to a separate RDF file instead of
hardcoding them. (bgo#300190)
+ Do not show about:recover URLs for now, since the service is
not implemented. (bgo#583953)
- Add gnome-keyring-devel BuildRequires.
- Drop epiphany-bgo300190-default-bookmarks.patch: fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 3 22:56:06 CEST 2009 - vuntz@novell.com Mon Aug 3 22:56:06 CEST 2009 - vuntz@novell.com

8
epiphany.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package epiphany (Version 2.27.5) # spec file for package epiphany (Version 2.27.90)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -27,6 +27,7 @@ BuildRequires: gir-repository
BuildRequires: gnome-common BuildRequires: gnome-common
BuildRequires: gnome-doc-utils-devel BuildRequires: gnome-doc-utils-devel
BuildRequires: gnome-icon-theme BuildRequires: gnome-icon-theme
BuildRequires: gnome-keyring-devel
BuildRequires: gnome-themes BuildRequires: gnome-themes
BuildRequires: gobject-introspection-devel BuildRequires: gobject-introspection-devel
BuildRequires: gtk-doc BuildRequires: gtk-doc
@ -42,7 +43,7 @@ BuildRequires: lsb-release
BuildRequires: startup-notification-devel BuildRequires: startup-notification-devel
BuildRequires: translation-update-upstream BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
Version: 2.27.5 Version: 2.27.90
Release: 1 Release: 1
%define major_version 2.27 %define major_version 2.27
License: GPL v2 or later License: GPL v2 or later
@ -51,8 +52,6 @@ Summary: GNOME Web Browser Based on the Mozilla Rendering Engine
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
# PATCH-FEATURE-UPSTREAM epiphany-user-agent.patch bgo580903 vuntz@novell.com -- Set user agent with a vendor part, via a gconf key # PATCH-FEATURE-UPSTREAM epiphany-user-agent.patch bgo580903 vuntz@novell.com -- Set user agent with a vendor part, via a gconf key
Patch0: epiphany-user-agent.patch Patch0: epiphany-user-agent.patch
# PATCH-FEATURE-UPSTREAM epiphany-bgo300190-default-bookmarks.patch bgo300190 vuntz@novell.com -- Use rdf to specify default bookmarks
Patch5: epiphany-bgo300190-default-bookmarks.patch
# PATCH-FEATURE-OPENSUSE epiphany-safe-one-click-install.patch bnc330070 vuntz@novell.com -- Make one-click install work with one-click # 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 Patch6: epiphany-safe-one-click-install.patch
Url: http://www.gnome.org/projects/epiphany/ Url: http://www.gnome.org/projects/epiphany/
@ -110,7 +109,6 @@ This package provides upstream Look and Feel for Epiphany.
%setup -q %setup -q
translation-update-upstream translation-update-upstream
%patch0 -p1 %patch0 -p1
%patch5 -p1
%patch6 -p1 %patch6 -p1
%build %build