[packages/seamonkey] - up to 2.15.2

qboosh qboosh at pld-linux.org
Sun Feb 24 21:03:40 CET 2013 

commit 16e155ba88049e6e28c09e6b083f91baf7234771
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 24 21:04:00 2013 +0100

    - up to 2.15.2

 makefile.patch                    |   9 +--
 seamonkey-agent.patch             |   6 +-
 seamonkey-gyp-slashism.patch      |  66 +++++++++++++++++
 seamonkey-pld-branding.patch      |  15 ++++
 seamonkey-pld-homepage.patch      |  24 ------
 seamonkey-system-virtualenv.patch |  24 ++++++
 seamonkey-system-xulrunner.patch  |  11 +++
 seamonkey.spec                    | 149 +++++++++++++++++++++++---------------
 system-cairo.patch                |  32 ++------
 9 files changed, 217 insertions(+), 119 deletions(-)
---
diff --git a/seamonkey.spec b/seamonkey.spec
index 232d67f..dd92102 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -13,10 +13,10 @@
 %undefine	with_gnomeui
 %endif
 
-%define		enigmail_ver	1.4.1
-%define		nspr_ver	4.9
-%define		nss_ver		3.13.3
-%define		xulrunner_ver	12.0
+%define		enigmail_ver	1.5.1
+%define		nspr_ver	4.9.3
+%define		nss_ver		3.14.1
+%define		xulrunner_ver	18.0.2
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -28,26 +28,30 @@ Summary(es.UTF-8):	Navegador de Internet SeaMonkey Community Edition
 Summary(pl.UTF-8):	SeaMonkey Community Edition - przeglądarka WWW
 Summary(pt_BR.UTF-8):	Navegador SeaMonkey Community Edition
 Name:		seamonkey
-Version:	2.9.1
+Version:	2.15.2
 Release:	1
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
-Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/source/%{name}-%{version}.source.tar.bz2
-# Source0-md5:	8dd18d93a6570c3c9f3873bb177ccc6b
+Source0:	http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/source/%{name}-%{version}.source.tar.bz2
+# Source0-md5:	1938c5a9673e94e9f5c809f5dbfe8d29
 Source1:	http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
-# Source1-md5:	0eba75fbcf8f0bb32d538df102fbb8e9
-Source2:	%{name}.desktop
-Source3:	%{name}-composer.desktop
-Source4:	%{name}-chat.desktop
-Source5:	%{name}-mail.desktop
-Source6:	%{name}-venkman.desktop
-Source7:	%{name}.sh
-Patch0:		%{name}-pld-homepage.patch
-Patch1:		%{name}-agent.patch
-Patch2:		%{name}-glueload-fix.patch
-Patch3:		system-mozldap.patch
-Patch4:		makefile.patch
-Patch5:		system-cairo.patch
+# Source1-md5:	3e71f84ed2c11471282412ebe4f5eb2d
+Source4:	%{name}.desktop
+Source5:	%{name}-composer.desktop
+Source6:	%{name}-chat.desktop
+Source7:	%{name}-mail.desktop
+Source8:	%{name}-venkman.desktop
+Source9:	%{name}.sh
+Patch1:		%{name}-pld-branding.patch
+Patch2:		%{name}-agent.patch
+Patch3:		%{name}-glueload-fix.patch
+Patch4:		system-mozldap.patch
+Patch5:		makefile.patch
+Patch6:		system-cairo.patch
+# Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
+Patch7:		%{name}-system-virtualenv.patch
+Patch8:		%{name}-gyp-slashism.patch
+Patch9:		%{name}-system-xulrunner.patch
 URL:		http://www.seamonkey-project.org/
 BuildRequires:	GConf2-devel >= 1.2.1
 BuildRequires:	OpenGL-devel
@@ -70,7 +74,9 @@ BuildRequires:	libffi-devel >= 6:3.0.9
 %{?with_gnomeui:BuildRequires:  libgnome-keyring-devel}
 %{?with_gnomeui:BuildRequires:  libgnomeui-devel >= 2.2.0}
 BuildRequires:	libiw-devel
+# requires libjpeg-turbo implementing at least libjpeg 6b API
 BuildRequires:	libjpeg-devel >= 6b
+BuildRequires:	libjpeg-turbo-devel
 BuildRequires:	libnotify-devel >= 0.4
 BuildRequires:	libpng(APNG)-devel >= 0.10
 BuildRequires:	libpng-devel >= 1.4.1
@@ -84,6 +90,7 @@ BuildRequires:	perl-modules >= 5.004
 BuildRequires:	pkgconfig
 BuildRequires:	python >= 1:2.5
 BuildRequires:	python-modules
+BuildRequires:	python-virtualenv
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.601
 BuildRequires:	sed >= 4.0
@@ -95,6 +102,7 @@ BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXt-devel
 %if %{with xulrunner}
 BuildRequires:	xulrunner-devel >= 2:%{xulrunner_ver}
+BuildRequires:	xulrunner-devel < 2:19
 %endif
 BuildRequires:	yasm
 BuildRequires:	zip
@@ -109,6 +117,7 @@ Requires:	browser-plugins >= 2.0
 Requires:	cairo >= 1.10.2-5
 Requires:	dbus-glib >= 0.60
 Requires:	gtk+2 >= 2:2.18
+Requires:	libjpeg-turbo
 Requires:	libpng >= 1.4.1
 Requires:	libpng(APNG) >= 0.10
 Requires:	myspell-common
@@ -127,6 +136,7 @@ Obsoletes:	seamonkey-calendar
 Obsoletes:	seamonkey-libs
 Obsoletes:	seamonkey-mailnews
 Obsoletes:	seamonkey-gnomevfs
+Conflicts:	seamonkey-lang-resources < %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		topdir		%{_builddir}/%{name}-%{version}
@@ -247,12 +257,15 @@ chrome w SeaMonkey Community Edition lub tworzących strony WWW.
 %setup -qc
 cd comm-release
 tar -C mailnews/extensions -zxf %{SOURCE1}
-#patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p2
 
 %build
 cd comm-release
@@ -373,6 +386,7 @@ EOF
 	STRIP="/bin/true" \
 	MOZ_MAKE_FLAGS="%{?_smp_mflags}" \
 	installdir=%{_libdir}/%{name} \
+	XLIBS="-lX11 -lXt" \
 	CC="%{__cc}" \
 	CXX="%{__cxx}"
 
@@ -388,6 +402,11 @@ cd mailnews/extensions/enigmail
 	STRIP="/bin/true" \
 	CC="%{__cc}" \
 	CXX="%{__cxx}"
+
+%{__make} -C %{objdir}/mailnews/extensions/enigmail xpi \
+	STRIP="/bin/true" \
+	CC="%{__cc}" \
+	CXX="%{__cxx}"
 %endif
 
 %install
@@ -464,10 +483,10 @@ ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/hyphenation
 %endif
 
-sed 's, at LIBDIR@,%{_libdir},' %{SOURCE7} > $RPM_BUILD_ROOT%{_bindir}/seamonkey
+sed 's, at LIBDIR@,%{_libdir},' %{SOURCE9} > $RPM_BUILD_ROOT%{_bindir}/seamonkey
 chmod a+rx $RPM_BUILD_ROOT%{_bindir}/seamonkey
 
-install %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} \
+install %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} \
 	$RPM_BUILD_ROOT%{_desktopdir}
 
 cp -p %{topdir}/comm-release/suite/branding/nightly/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
@@ -495,15 +514,14 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/register
 
 %if %{with enigmail}
 ext_dir=$RPM_BUILD_ROOT%{_libdir}/%{name}/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\}
-install -d $ext_dir/{chrome,components,defaults/preferences}
+install -d $ext_dir/{chrome,components,defaults/preferences,modules}
 cd mozilla/dist/bin
-#cp -rfLp chrome/enigmail.jar $ext_dir/chrome
-#cp -rfLp chrome/enigmime.jar $ext_dir/chrome
+cp -rfLp chrome/enigmail.jar $ext_dir/chrome
 cp -rfLp components/enig* $ext_dir/components
 cp -rfLp components/libenigmime.so $ext_dir/components
-cp -rfLp components/libipc.so $ext_dir/components
-cp -rfLp components/ipc.xpt $ext_dir/components
 cp -rfLp defaults/preferences/enigmail.js $ext_dir/defaults/preferences
+cp -rfLp modules/{commonFuncs,enigmailCommon,keyManagement,pipeConsole,subprocess}.jsm $ext_dir/modules
+cp -rfLp modules/{subprocess_worker_unix,subprocess_worker_win}.js $ext_dir/modules
 cd -
 cp -p %{topdir}/comm-release/mailnews/extensions/enigmail/package/install.rdf $ext_dir
 cp -p %{topdir}/comm-release/mailnews/extensions/enigmail/package/chrome.manifest $ext_dir/chrome.manifest
@@ -564,20 +582,48 @@ fi
 
 %dir %{_libdir}/%{name}/components
 
+%{_libdir}/%{name}/components/Aitc.js
+%{_libdir}/%{name}/components/AlarmsManager.js
+%{_libdir}/%{name}/components/AppsService.js
+%{_libdir}/%{name}/components/BrowserElementParent.js
+%{_libdir}/%{name}/components/ColorAnalyzer.js
+%{_libdir}/%{name}/components/ContactManager.js
 %{_libdir}/%{name}/components/FeedConverter.js
 %{_libdir}/%{name}/components/FeedWriter.js
+%{_libdir}/%{name}/components/SettingsManager.js
+%{_libdir}/%{name}/components/SiteSpecificUserAgent.js
+%{_libdir}/%{name}/components/TCPSocket.js
+%{_libdir}/%{name}/components/TCPSocketParentIntermediary.js
 %{_libdir}/%{name}/components/Weave.js
+%{_libdir}/%{name}/components/Webapps.js
 %{_libdir}/%{name}/components/WebContentConverter.js
-%{_libdir}/%{name}/components/browser.xpt
+%{_libdir}/%{name}/components/messageWakeupService.js
+%{_libdir}/%{name}/components/newMailNotificationService.js
+%{_libdir}/%{name}/components/nsAbout.js
 %{_libdir}/%{name}/components/nsBrowserContentHandler.js
+%{_libdir}/%{name}/components/nsComposerCmdLineHandler.js
+%{_libdir}/%{name}/components/nsDOMIdentity.js
+%{_libdir}/%{name}/components/nsIDService.js
 %{_libdir}/%{name}/components/nsSessionStartup.js
 %{_libdir}/%{name}/components/nsSessionStore.js
+%{_libdir}/%{name}/components/nsSetDefault.js
 %{_libdir}/%{name}/components/nsSidebar.js
+%{_libdir}/%{name}/components/nsSuiteDownloadManagerUI.js
+%{_libdir}/%{name}/components/nsSuiteGlue.js
+%{_libdir}/%{name}/components/nsTypeAheadFind.js
+%{_libdir}/%{name}/components/nsUrlClassifierHashCompleter.js
+%{_libdir}/%{name}/components/nsUrlClassifierLib.js
+%{_libdir}/%{name}/components/nsUrlClassifierListManager.js
+%{_libdir}/%{name}/components/smileApplication.js
 
+%{_libdir}/%{name}/components/browser.xpt
 %{_libdir}/%{name}/components/components.manifest
 %{_libdir}/%{name}/components/interfaces.manifest
 
+%attr(755,root,root) %{_libdir}/%{name}/components/libsuite.so
+
 %if %{without xulrunner}
+%{_libdir}/%{name}/dependentlibs.list
 %{_libdir}/%{name}/platform.ini
 %{_libdir}/%{name}/components/ConsoleAPI.js
 %{_libdir}/%{name}/components/FeedProcessor.js
@@ -611,51 +657,26 @@ fi
 %{_libdir}/%{name}/components/nsPlacesAutoComplete.js
 %{_libdir}/%{name}/components/nsPlacesExpiration.js
 %{_libdir}/%{name}/components/nsPrompter.js
-%{_libdir}/%{name}/components/nsProxyAutoConfig.js
 %{_libdir}/%{name}/components/nsSearchService.js
 %{_libdir}/%{name}/components/nsSearchSuggestions.js
 %{_libdir}/%{name}/components/nsTaggingService.js
-%{_libdir}/%{name}/components/nsURLFormatter.js
 %{_libdir}/%{name}/components/nsUpdateTimerManager.js
+%{_libdir}/%{name}/components/nsURLFormatter.js
 %{_libdir}/%{name}/components/nsWebHandlerApp.js
 %{_libdir}/%{name}/components/storage-Legacy.js
 %{_libdir}/%{name}/components/storage-mozStorage.js
 %{_libdir}/%{name}/components/txEXSLTRegExFunctions.js
-%endif
-
-%{_libdir}/%{name}/components/nsAbout.js
-%{_libdir}/%{name}/components/nsAboutCertError.js
-%{_libdir}/%{name}/components/nsAboutData.js
-%{_libdir}/%{name}/components/nsAboutFeeds.js
-%{_libdir}/%{name}/components/nsAboutLife.js
-%{_libdir}/%{name}/components/nsAboutRights.js
-%{_libdir}/%{name}/components/nsAboutSessionRestore.js
-%{_libdir}/%{name}/components/nsAboutSyncTabs.js
-%{_libdir}/%{name}/components/nsComposerCmdLineHandler.js
-%{_libdir}/%{name}/components/nsSuiteDownloadManagerUI.js
-%{_libdir}/%{name}/components/nsSuiteGlue.js
-%{_libdir}/%{name}/components/nsTypeAheadFind.js
-%{_libdir}/%{name}/components/smileApplication.js
-
-%if %{without xulrunner}
 %attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so
-%endif
-
-%if %{without xulrunner}
 %attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
-%endif
-
-%attr(755,root,root) %{_libdir}/%{name}/components/libsuite.so
-
-%attr(755,root,root) %{_libdir}/%{name}/seamonkey
-%dir %{_libdir}/%{name}/plugins
-%if %{without xulrunner}
 %attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh
 %attr(755,root,root) %{_libdir}/%{name}/seamonkey-bin
 %attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
 %attr(755,root,root) %{_libdir}/%{name}/plugin-container
 %endif
 
+%attr(755,root,root) %{_libdir}/%{name}/seamonkey
+%dir %{_libdir}/%{name}/plugins
+
 # symlinks
 %{_libdir}/%{name}/chrome
 %{_libdir}/%{name}/defaults
@@ -674,6 +695,15 @@ fi
 %{_datadir}/%{name}/chrome
 %{_datadir}/%{name}/defaults
 %{_datadir}/%{name}/modules
+%if %{with enigmail}
+%exclude %{_datadir}/%{name}/modules/commonFuncs.jsm
+%exclude %{_datadir}/%{name}/modules/enigmailCommon.jsm
+%exclude %{_datadir}/%{name}/modules/keyManagement.jsm
+%exclude %{_datadir}/%{name}/modules/pipeConsole.jsm
+%exclude %{_datadir}/%{name}/modules/subprocess.jsm
+%exclude %{_datadir}/%{name}/modules/subprocess_worker_unix.js
+%exclude %{_datadir}/%{name}/modules/subprocess_worker_win.js
+%endif
 %{_datadir}/%{name}/searchplugins
 %if %{without xulrunner}
 %{_datadir}/%{name}/greprefs.js
@@ -753,6 +783,9 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.so
 %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.xpt
 %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.js
+%dir %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules
+%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/*.jsm
+%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/*.js
 %endif
 
 %files chat
diff --git a/makefile.patch b/makefile.patch
index 6ba8cf6..46882cc 100644
--- a/makefile.patch
+++ b/makefile.patch
@@ -1,18 +1,11 @@
 --- mozilla/Makefile.in~	2011-08-12 16:52:03.000000000 +0300
 +++ mozilla/Makefile.in	2011-08-26 13:00:59.373870016 +0300
-@@ -58,8 +58,6 @@
+@@ -26,21 +26,7 @@
  
  include $(topsrcdir)/config/config.mk
  
 -default alldep all:: $(topsrcdir)/configure config.status
 -
- ifndef INCLUDED_BRIDGE_MK
- include $(topsrcdir)/bridge/bridge.mk
- endif
-@@ -67,19 +65,7 @@
- # workaround Bug 599809 by making these makefiles be generated here
- SUBMAKEFILES += $(addsuffix /Makefile, $(APP_LIBXUL_DIRS) $(APP_LIBXUL_STATICDIRS))
- 
 -$(topsrcdir)/configure: $(topsrcdir)/configure.in
 -	@echo "STOP!  configure.in has changed, and your configure is out of date."
 -	@echo "Please rerun autoconf and configure."
diff --git a/seamonkey-agent.patch b/seamonkey-agent.patch
index 17f2cf4..9b510f7 100644
--- a/seamonkey-agent.patch
+++ b/seamonkey-agent.patch
@@ -1,13 +1,13 @@
 --- mozilla/suite/browser/browser-prefs.js.orig	2007-03-21 23:39:25.000000000 +0100
 +++ mozilla/suite/browser/browser-prefs.js	2007-03-21 23:39:10.000000000 +0100
 @@ -61,6 +61,10 @@
- 
- #expand pref("general.useragent.extra.__MOZ_APP_NAME__", "__MOZ_APP_DISPLAYNAME__/__MOZ_APP_VERSION__");
+ pref("general.useragent.override.natweststockbrokers.com", "Gecko/[^ ]*#Gecko/20100101"); // bug 804179
+ pref("general.useragent.override.raiffeisen.hu",         "Gecko/[^ ]*#Gecko/20100101"); // bug 795348
  
 +pref("general.useragent.vendor", "PLD");
 +pref("general.useragent.vendorSub", "3.0");
 +pref("general.useragent.vendorComment", "Th");
 +
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last
+ // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
  pref("browser.startup.page",                1);
  pref("browser.startup.homepage",	   "chrome://navigator-region/locale/region.properties");
diff --git a/seamonkey-gyp-slashism.patch b/seamonkey-gyp-slashism.patch
new file mode 100644
index 0000000..ccab456
--- /dev/null
+++ b/seamonkey-gyp-slashism.patch
@@ -0,0 +1,66 @@
+--- xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.orig	2013-01-05 00:44:41.000000000 +0100
++++ xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py	2013-01-13 20:13:40.033894757 +0100
+@@ -114,6 +114,12 @@
+   if dir and not os.path.exists(dir):
+     os.makedirs(dir)
+ 
++def append_relative(base, rel):
++  if rel == '':
++    return base
++  else:
++    return base + '/' + rel
++
+ def GetFlavor(params):
+   """Returns |params.flavor| if it's set, the system's default flavor else."""
+   flavors = {
+@@ -142,9 +148,9 @@
+ 
+ def WriteMakefile(filename, data, build_file, depth, topsrcdir, srcdir, relative_path, extra_data=None):
+   if not os.path.isabs(topsrcdir):
+-    topsrcdir = depth + "/" + topsrcdir
++    topsrcdir = append_relative(depth, topsrcdir)
+   if not os.path.isabs(srcdir):
+-    srcdir = depth + "/" + srcdir
++    srcdir = append_relative(depth, srcdir)
+   #TODO: should compare with the existing file and not overwrite it if the
+   # contents are the same!
+   ensure_directory_exists(filename)
+@@ -261,7 +267,7 @@
+       qualified_target)
+     build_file = os.path.abspath(build_file)
+     rel_path, output_file = self.CalculateMakefilePath(build_file, target)
+-    subdepth = self.depth + "/" + getdepth(rel_path)
++    subdepth = append_relative(self.depth, getdepth(rel_path))
+     if self.WriteTargetMakefile(output_file, rel_path, qualified_target, spec, build_file, subdepth):
+         # If WriteTargetMakefile returns True, then this is a useful target
+       dirs.append(rel_path)
+@@ -376,7 +382,7 @@
+     WriteMakefile(output_file, data, build_file, depth, top,
+                   # we set srcdir up one directory, since the subdir
+                   # doesn't actually exist in the source directory
+-                  swapslashes(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0])),
++                  swapslashes(append_relative(append_relative(top, self.relative_srcdir), os.path.split(rel_path)[0])),
+                   self.relative_srcdir)
+     return True
+ 
+@@ -399,7 +405,7 @@
+   # The relative path from objdir to gyp_file_dir
+   srcdir = gyp.common.RelativePath(gyp_file_dir, objdir)
+   # The absolute path to the source dir
+-  abs_srcdir = topsrcdir + "/" + relative_srcdir
++  abs_srcdir = append_relative(topsrcdir, relative_srcdir)
+   # The path to get up to the root of the objdir from the output dir.
+   depth = getdepth(relative_srcdir)
+   # The output directory.
+@@ -408,9 +414,9 @@
+   makefile_path = os.path.join(output_dir, "Makefile")
+ 
+   def topsrcdir_path(path):
+-    return "$(topsrcdir)/" + swapslashes(gyp.common.RelativePath(path, topsrcdir))
++    return append_relative("$(topsrcdir)", swapslashes(gyp.common.RelativePath(path, topsrcdir)))
+   def objdir_path(path):
+-    return "$(DEPTH)/" + swapslashes(gyp.common.RelativePath(path, objdir))
++    return append_relative("$(DEPTH)", swapslashes(gyp.common.RelativePath(path, objdir)))
+ 
+   # Find the list of targets that derive from the gyp file(s) being built.
+   needed_targets = set()
diff --git a/seamonkey-pld-branding.patch b/seamonkey-pld-branding.patch
new file mode 100644
index 0000000..797c0c8
--- /dev/null
+++ b/seamonkey-pld-branding.patch
@@ -0,0 +1,15 @@
+--- a/mozilla/browser/locales/generic/profile/bookmarks.html.in	2009-06-24 10:20:29.000000000 +0200
++++ b.mozilla/browser/locales/generic/profile/bookmarks.html.in	2009-06-28 15:29:30.000000000 +0200
+@@ -24,4 +24,12 @@
+         <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
+         <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
+     </DL><p>
++    <DT><H3>PLD Linux Distribution</H3>
++    <DL><p>
++        <DT><A HREF="http://www.pld-linux.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">PLD Home Page</A>
++        <DT><A HREF="http://www.pld-users.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">PLD Users Wiki</A>
++        <DT><A HREF="http://docs.pld-linux.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">PLD Documentation in english</A>
++        <DT><A HREF="http://pl.docs.pld-linux.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">PLD Documentation in polish</A>
++        <DT><A HREF="http://planet.pld-linux.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">Planet PLD</A>
++    </DL><p>
+ </DL><p>
diff --git a/seamonkey-pld-homepage.patch b/seamonkey-pld-homepage.patch
deleted file mode 100644
index 33d65be..0000000
--- a/seamonkey-pld-homepage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- seamonkey-1.0/mozilla/browser/locales/en-US/region.properties.orig	2005-12-05 13:43:59.000000000 +0100
-+++ seamonkey-1.0/mozilla/browser/locales/en-US/region.properties	2006-02-01 21:09:15.479084500 +0100
-@@ -1,5 +1,5 @@
- # navigator.properties
--homePageDefault=http://www.mozilla.org/
-+homePageDefault=http://www.pld-linux.org/
- keywordList=http://home.netscape.com/escapes/keywords
- webmailKeyword=http://webmail.netscape.com
- fallbackDefaultSearchURL=http://www.google.com/search?q=
-@@ -7,7 +7,7 @@
- #
- # all.js
- #
--browser.startup.homepage=http://www.seamonkey-project.org/start/
-+browser.startup.homepage=http://www.pld-linux.org/
- browser.throbber.url=http://www.seamonkey-project.org/
- browser.search.defaulturl=http://www.google.com/search?q=
- general.useragent.contentlocale=US
-@@ -17,4 +17,4 @@
- 
- #config.js
- #
--startup.homepage_override_url=http://www.seamonkey-project.org/start/
-+startup.homepage_override_url=http://www.pld-linux.org/
diff --git a/seamonkey-system-virtualenv.patch b/seamonkey-system-virtualenv.patch
new file mode 100644
index 0000000..a69cd1a
--- /dev/null
+++ b/seamonkey-system-virtualenv.patch
@@ -0,0 +1,24 @@
+Restore --system-site-packages when system virtualenv gets 1.7 upgrade
+
+--- xulrunner-15.0/mozilla/configure.in~	2012-08-29 11:06:34.517985819 +0200
++++ xulrunner-15.0/mozilla/configure.in	2012-08-29 11:23:47.234616054 +0200
+@@ -9069,7 +9069,7 @@
+ AC_MSG_RESULT([Creating Python virtualenv])
+ rm -rf _virtualenv
+ mkdir -p _virtualenv
+-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/python/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
++MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv
+ case "$host_os" in
+ mingw*)
+     PYTHON=`pwd`/_virtualenv/Scripts/python.exe
+--- xulrunner-15.0/mozilla/configure~	2012-08-29 11:25:28.121279162 +0200
++++ xulrunner-15.0/mozilla/configure	2012-08-29 11:27:27.981274936 +0200
+@@ -25468,7 +25468,7 @@
+ echo "$ac_t""Creating Python virtualenv" 1>&6
+ rm -rf _virtualenv
+ mkdir -p _virtualenv
+-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/python/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
++MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv
+ case "$host_os" in
+ mingw*)
+     PYTHON=`pwd`/_virtualenv/Scripts/python.exe
diff --git a/seamonkey-system-xulrunner.patch b/seamonkey-system-xulrunner.patch
new file mode 100644
index 0000000..353c6df
--- /dev/null
+++ b/seamonkey-system-xulrunner.patch
@@ -0,0 +1,11 @@
+--- iceape-2.15.2/comm-release/suite/browser/Makefile.in.orig	2013-02-03 09:04:13.000000000 +0100
++++ iceape-2.15.2/comm-release/suite/browser/Makefile.in	2013-02-24 15:15:09.573091923 +0100
+@@ -26,7 +26,7 @@
+ 
+ ifdef LIBXUL_SDK
+ PREF_JS_EXPORTS += \
+-	$(srcdir)/channel-prefs.js
++	$(srcdir)/channel-prefs.js \
+ 	$(NULL)
+ endif
+ 
diff --git a/system-cairo.patch b/system-cairo.patch
index 9ae0888..072173f 100644
--- a/system-cairo.patch
+++ b/system-cairo.patch
@@ -1,13 +1,8 @@
 diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
 --- a/mozilla/gfx/thebes/gfxPlatform.cpp	Sun Mar 04 00:38:41 2012 +0000
 +++ b/mozilla/gfx/thebes/gfxPlatform.cpp	Wed May 16 17:37:10 2012 +0200
-@@ -448,21 +448,19 @@ gfxPlatform::CreateDrawTargetForSurface(
- 
- cairo_user_data_key_t kSourceSurface;
- 
- void SourceBufferDestroy(void *srcBuffer)
- {
-   static_cast<SourceSurface*>(srcBuffer)->Release();
+@@ -448,11 +448,9 @@ gfxPlatform::CreateDrawTargetForSurface(
+   delete static_cast<SourceSurfaceUserData*>(srcSurfUD);
  }
  
 -void SourceSnapshotDetached(cairo_surface_t *nullSurf)
@@ -20,26 +15,16 @@ diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
    origSurf->SetData(&kSourceSurface, NULL, NULL);
  }
  
- RefPtr<SourceSurface>
- gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
- {
-   void *userData = aSurface->GetData(&kSourceSurface);
+@@ -524,14 +522,8 @@ gfxPlatform::GetSourceSurfaceForSurface(
  
-@@ -524,24 +522,18 @@ gfxPlatform::GetSourceSurfaceForSurface(
-         NS_RUNTIMEABORT("Invalid surface format!");
      }
  
-     srcBuffer = aTarget->CreateSourceSurfaceFromData(imgSurface->Data(),
-                                                      IntSize(imgSurface->GetSize().width, imgSurface->GetSize().height),
-                                                      imgSurface->Stride(),
-                                                      format);
- 
 -    cairo_surface_t *nullSurf =
 -	cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
 -    cairo_surface_set_user_data(nullSurf,
--				&kSourceSurface,
--				imgSurface,
--				NULL);
+-                                &kSourceSurface,
+-                                imgSurface,
+-                                NULL);
 -    cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
 -    cairo_surface_destroy(nullSurf);
 +    cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
@@ -47,8 +32,3 @@ diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
    }
  
    srcBuffer->AddRef();
-   aSurface->SetData(&kSourceSurface, srcBuffer, SourceBufferDestroy);
- 
-   return srcBuffer;
- }
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/seamonkey.git/commitdiff/16e155ba88049e6e28c09e6b083f91baf7234771

More information about the pld-cvs-commit mailing list