OBS User unknown 2007-05-28 13:08:08 +00:00 committed by Git OBS Bridge
parent fc8c9adbde
commit b1cd8478fd
7 changed files with 39 additions and 30 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92c8f698a101ff2fdd9a83b96a5a37376be839df9d918c084c6551a7db587fd5
size 4658364

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8f32d7c2c342680d4a12462279a70a9fe9911f50e26b06d2d17e9d880889fe34
size 4660147

View File

@ -1,12 +1,22 @@
--- embed/mozilla/Makefile.am
+++ embed/mozilla/Makefile.am
@@ -143,6 +143,7 @@
-DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \
-DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\" \
-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
+ -DSUSE_PLUGINSDIR=\"$(libdir)/browser-plugins\" \
-DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" \
-DALLOW_PRIVATE_API \
$(AM_CPPFLAGS)
--- embed/mozilla/mozilla-embed-single.cpp
+++ embed/mozilla/mozilla-embed-single.cpp
@@ -322,7 +322,8 @@
new_path = g_strconcat (user_path ? user_path : "",
user_path ? ":" : "",
MOZILLA_PREFIX "/lib/mozilla/plugins"
- ":" MOZILLA_HOME "/plugins",
+ ":" MOZILLA_HOME "/plugins:",
+ "/usr/@LIB@/browser-plugins",
@@ -366,8 +366,7 @@
MOZILLA_PREFIX "/lib/mozilla/plugins");
list = mozilla_init_plugin_add_unique_path (list,
MOZILLA_HOME "/plugins");
- list = mozilla_init_plugin_add_unique_path (list,
- MOZILLA_NATIVE_PLUGINSDIR);
+ list = mozilla_init_plugin_add_unique_path (list, SUSE_PLUGINSDIR);
#ifdef HAVE_PRIVATE_PLUGINS
":" PLUGINDIR,
list = mozilla_init_plugin_add_unique_path (list, PLUGINDIR);
#endif

View File

@ -1,12 +0,0 @@
--- embed/mozilla/mozilla-embed-single.cpp
+++ embed/mozilla/mozilla-embed-single.cpp
@@ -588,6 +588,9 @@
g_unsetenv ("XPSERVERLIST");
#endif
+ /* Work-around Flash Player crash (#149062) */
+ setenv ("XLIB_SKIP_ARGB_VISUALS", "1", 0);
+
#ifdef HAVE_GECKO_1_9
NS_LogInit ();
#endif

View File

@ -1,6 +1,6 @@
--- gnome-doc-utils.make
+++ gnome-doc-utils.make
@@ -658,8 +658,7 @@
@@ -661,8 +661,7 @@
$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \
done
@if test "x$(_ENABLE_SK)" = "xtrue"; then \

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon May 28 13:12:16 CEST 2007 - sbrabec@suse.cz
- Update to version 2.18.1:
* Fixed printing of frames.
* Fixed Epiphany not finding some Gecko plugins.
- Removed Flash crash work-around (upstream part of ephy-main.c).
-------------------------------------------------------------------
Tue Apr 3 22:04:27 CEST 2007 - maw@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package epiphany (Version 2.18.0)
# spec file for package epiphany (Version 2.18.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -30,8 +30,8 @@ Requires: mozilla = %{mozilla_ver}
%endif
License: GNU General Public License (GPL)
Group: Productivity/Networking/Web/Browsers
Version: 2.18.0
Release: 2
Version: 2.18.1
Release: 1
%define interface_version 2.18
Summary: GNOME Web Browser Based on the Mozilla Rendering Engine
Source: %{name}-%{version}.tar.bz2
@ -40,7 +40,6 @@ Patch4: 59950.diff
Patch5: 59949.diff
Patch9: %{name}-desktop.patch
Patch11: epiphany-no-root.patch
Patch12: epiphany-flash-crash.patch
Patch13: epiphany-browser-plugins.patch
URL: http://www.gnome.org/projects/epiphany/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -114,8 +113,7 @@ Authors:
%patch5
%patch9
%patch11
%patch12
cat %{P:13} | sed s/@LIB@/%{_lib}/g | patch -p0
%patch13
%build
#cp -i data/default-prefs-gecko-1-8.js data/default-prefs-xulrunner.js
@ -189,6 +187,11 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/epiphany
%changelog
* Mon May 28 2007 - sbrabec@suse.cz
- Update to version 2.18.1:
* Fixed printing of frames.
* Fixed Epiphany not finding some Gecko plugins.
- Removed Flash crash work-around (upstream part of ephy-main.c).
* Tue Apr 03 2007 - maw@suse.de
- Remove all references to
epiphany-dbus-connection-close-fix-thoenig-01.patch (#260495).