rpms/galeon/devel galeon-2.0.7-confignspr.patch, NONE, 1.1 galeon-2.0.7-plugins.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 galeon.spec, 1.51, 1.52 sources, 1.13, 1.14 galeon-2.0.5-xulrunner.patch, 1.2, NONE galeon-2.0.6-plugins.patch, 1.1, NONE
Denis Leroy
denis at fedoraproject.org
Sat Sep 27 17:22:27 UTC 2008
- Previous message (by thread): rpms/kde-l10n/devel kde-l10n.spec,1.47,1.48
- Next message (by thread): rpms/flashrom/devel .cvsignore, 1.9, 1.10 flashrom.spec, 1.11, 1.12 import.log, 1.1, 1.2 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: denis
Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7383
Modified Files:
.cvsignore galeon.spec sources
Added Files:
galeon-2.0.7-confignspr.patch galeon-2.0.7-plugins.patch
Removed Files:
galeon-2.0.5-xulrunner.patch galeon-2.0.6-plugins.patch
Log Message:
- Update to 2.0.7
- Reworked plugins patch, added nspr test config patch
- Other patches upstreamed
galeon-2.0.7-confignspr.patch:
--- NEW FILE galeon-2.0.7-confignspr.patch ---
--- galeon-2.0.7/configure~ 2008-09-27 05:16:12.000000000 +0200
+++ galeon-2.0.7/configure 2008-09-27 14:48:41.000000000 +0200
@@ -23802,7 +23802,7 @@
for i in $TEST_MOZILLA_INCLUDE_DIRS ; do
CXXFLAGS="$CXXFLAGS -I$MOZILLA_INCLUDE_ROOT/$i"
done
-CXXFLAGS="$CXXFLAGS -DMOZILLA_STRICT_API=1"
+CXXFLAGS="$CXXFLAGS -DMOZILLA_STRICT_API=1 `pkg-config --cflags nspr`"
{ echo "$as_me:$LINENO: checking whether we have a mozilla debug build" >&5
galeon-2.0.7-plugins.patch:
--- NEW FILE galeon-2.0.7-plugins.patch ---
--- galeon-2.0.7/mozilla/Makefile.in.orig 2008-09-27 15:08:28.000000000 +0200
+++ galeon-2.0.7/mozilla/Makefile.in 2008-09-27 15:08:43.000000000 +0200
@@ -401,7 +401,7 @@
-I$(MOZILLA_INCLUDE_ROOT)/xpcom \
-I$(MOZILLA_INCLUDE_ROOT)/xpconnect \
-I$(MOZILLA_INCLUDE_ROOT)/xulapp $(GCONF_CFLAGS) \
- $(GALEON_DEPENDENCY_CFLAGS) -DLIB_DIR=\"$(pkglibdir)\" \
+ $(GALEON_DEPENDENCY_CFLAGS) -DTOP_LIB_DIR=\"$(libdir)\" -DLIB_DIR=\"$(pkglibdir)\" \
-DSHARE_DIR=\"$(pkgdatadir)\" -D_GNU_SOURCE=1 -include \
mozilla-config.h $(am__append_1)
noinst_LTLIBRARIES = libmozillaembed.la
--- galeon-2.0.7/mozilla/mozilla-embed-shell.cpp.orig 2008-09-03 06:58:17.000000000 +0200
+++ galeon-2.0.7/mozilla/mozilla-embed-shell.cpp 2008-09-27 15:11:01.000000000 +0200
@@ -230,6 +230,19 @@
#endif
}
+static int
+mozilla_setup_wrapped_plugin (void)
+{
+ char *p_viewer = "/usr/bin/mozilla-plugin-config";
+ gboolean ret;
+
+ if(g_file_test(p_viewer, G_FILE_TEST_EXISTS) == FALSE)
+ return(FALSE);
+
+ ret = g_spawn_command_line_sync(p_viewer,NULL,NULL,NULL,NULL);
+ return(ret);
+}
+
static void
mozilla_init_plugin_path ()
{
@@ -248,7 +261,12 @@
g_string_append (new_path, "/.mozilla/plugins");
/* Add /usr/lib/mozilla/plugins (bug 149812) */
- g_string_append (new_path, ":/usr/lib/mozilla/plugins");
+ if(mozilla_setup_wrapped_plugin()) {
+ g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins-wrapped");
+ }
+ else {
+ g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins");
+ }
#ifdef GALEON_MOZILLA_HOME
/* Add the current mozilla build's plugins dir */
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 10 Jul 2008 21:13:57 -0000 1.12
+++ .cvsignore 27 Sep 2008 17:21:56 -0000 1.13
@@ -1 +1 @@
-galeon-2.0.6.tar.bz2
+galeon-2.0.7.tar.bz2
Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- galeon.spec 10 Jul 2008 21:13:57 -0000 1.51
+++ galeon.spec 27 Sep 2008 17:21:56 -0000 1.52
@@ -2,20 +2,21 @@
Summary: GNOME2 Web browser based on Mozilla
Name: galeon
-Version: 2.0.6
+Version: 2.0.7
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Internet
URL: http://galeon.sourceforge.net/
Source0: http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
-Patch0: galeon-2.0.6-plugins.patch
-Patch2: galeon-2.0.5-xulrunner.patch
+Patch0: galeon-2.0.7-plugins.patch
+Patch1: galeon-2.0.7-confignspr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
BuildRequires: gettext desktop-file-utils
BuildRequires: gtk2-devel >= 2.4.0
BuildRequires: gnome-desktop-devel
BuildRequires: gecko-devel >= %{gecko_ver}
+BuildRequires: gecko-devel-unstable >= %{gecko_ver}
BuildRequires: libgnomeui-devel >= 2.5.2
BuildRequires: perl(XML::Parser) scrollkeeper
BuildRequires: intltool
@@ -41,7 +42,7 @@
%prep
%setup -q -n %{name}-%{version}%{?extraversion}
%patch0 -p1 -b .plugins
-%patch2 -p1 -b .xulrunner
+%patch1 -p1 -b .confignspr
%build
@@ -116,6 +117,11 @@
%changelog
+* Sat Sep 27 2008 Denis Leroy <denis at poolshark.org> - 2.0.7-1
+- Update to 2.0.7
+- Reworked plugins patch, added nspr test config patch
+- Other patches upstreamed
+
* Thu Jul 10 2008 Denis Leroy <denis at poolshark.org> - 2.0.6-1
- Update to upstraem 2.0.6
- Reworked configure patch for libxul-embedding
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 10 Jul 2008 21:13:57 -0000 1.13
+++ sources 27 Sep 2008 17:21:56 -0000 1.14
@@ -1 +1 @@
-7723816d29edac94945e5fd9a2a402f8 galeon-2.0.6.tar.bz2
+2eede1f43e3f6f2ac4ce7d4db99b15b2 galeon-2.0.7.tar.bz2
--- galeon-2.0.5-xulrunner.patch DELETED ---
--- galeon-2.0.6-plugins.patch DELETED ---
- Previous message (by thread): rpms/kde-l10n/devel kde-l10n.spec,1.47,1.48
- Next message (by thread): rpms/flashrom/devel .cvsignore, 1.9, 1.10 flashrom.spec, 1.11, 1.12 import.log, 1.1, 1.2 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list