rpms/xulrunner/OLPC-2 firefox-0.7.3-psfonts.patch, NONE, 1.1 xulrunner-1.9a3pre-dpi.patch, NONE, 1.1 xulrunner-1.9a5pre-build.patch, NONE, 1.1 xulrunner-mozconfig, NONE, 1.1 xulrunner-olpc-default-prefs.js, NONE, 1.1 xulrunner.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Fri Jun 22 16:55:56 UTC 2007

Author: mpg

Update of /cvs/extras/rpms/xulrunner/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22168/OLPC-2

Modified Files:
	.cvsignore sources 
Added Files:
	firefox-0.7.3-psfonts.patch xulrunner-1.9a3pre-dpi.patch 
	xulrunner-1.9a5pre-build.patch xulrunner-mozconfig 
	xulrunner-olpc-default-prefs.js xulrunner.spec 
Log Message:
Initial checkin


firefox-0.7.3-psfonts.patch:

--- NEW FILE firefox-0.7.3-psfonts.patch ---
--- mozilla/modules/libpref/src/init/all.js.foo	2004-06-18 13:16:32.000000000 -0400
+++ mozilla/modules/libpref/src/init/all.js	2004-06-18 13:17:28.000000000 -0400
@@ -1776,8 +1776,10 @@
 pref("print.postscript.nativefont.ar",             "");
 pref("print.postscript.nativefont.el",             "");
 pref("print.postscript.nativefont.he",             "");
-pref("print.postscript.nativefont.ja",             "");
-pref("print.postscript.nativefont.ko",             "");
+pref("print.postscript.nativecode.ja",             "euc-jp");
+pref("print.postscript.nativefont.ja",             "Ryumin-Light-EUC-H");
+pref("print.postscript.nativecode.ko",             "euc-kr");
+pref("print.postscript.nativefont.ko",             "Baekmuk-Gulim-KSC-EUC-H");
 pref("print.postscript.nativefont.th",             "");
 pref("print.postscript.nativefont.tr",             "");
 pref("print.postscript.nativefont.x-baltic",       "");
@@ -1786,8 +1788,10 @@
 pref("print.postscript.nativefont.x-unicode",      "");
 pref("print.postscript.nativefont.x-user-def",     "");
 pref("print.postscript.nativefont.x-western",      "");
-pref("print.postscript.nativefont.zh-CN",          "");
-pref("print.postscript.nativefont.zh-TW",          "");
+pref("print.postscript.nativecode.zh-CN", "gb18030");
+pref("print.postscript.nativefont.zh-CN", "MSungGBK-Light-GBK2K-H");
+pref("print.postscript.nativecode.zh-TW", "big5");
+pref("print.postscript.nativefont.zh-TW", "ShanHeiSun-Light-B5-H");
 pref("print.postscript.nativefont.zh-HK",          "");
 
 # XP_UNIX

xulrunner-1.9a3pre-dpi.patch:

--- NEW FILE xulrunner-1.9a3pre-dpi.patch ---
Index: gfx/src/thebes/nsThebesDeviceContext.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp,v
retrieving revision 1.54
diff -u -r1.54 nsThebesDeviceContext.cpp
--- gfx/src/thebes/nsThebesDeviceContext.cpp	19 Mar 2007 23:16:15 -0000	1.54
+++ gfx/src/thebes/nsThebesDeviceContext.cpp	22 Mar 2007 15:10:19 -0000
@@ -228,6 +228,7 @@
 
     NS_ASSERTION(dpi != -1, "no dpi set");
 
+    dotsArePixels = PR_FALSE;
     if (dotsArePixels) {
         // First figure out the closest multiple of 96, which is the number of
         // dev pixels per CSS pixel.  Then, divide that into AppUnitsPerCSSPixel()

xulrunner-1.9a5pre-build.patch:

--- NEW FILE xulrunner-1.9a5pre-build.patch ---
Index: extensions/python/dom/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/extensions/python/dom/src/Makefile.in,v
retrieving revision 1.3
diff -u -r1.3 Makefile.in
--- extensions/python/dom/src/Makefile.in	5 Oct 2006 10:44:02 -0000	1.3
+++ extensions/python/dom/src/Makefile.in	21 May 2007 00:23:40 -0000
@@ -22,7 +22,7 @@
 # We always need the Python and pyxpcom includes and libs.
 LOCAL_INCLUDES = $(MOZ_PYTHON_INCLUDES)
 EXTRA_LIBS += $(MOZ_PYTHON_LIBS) \
-              $(DIST)/lib/$(LIB_PREFIX)pyxpcom.$(LIB_SUFFIX) \
+              $(DIST)/lib/$(DLL_PREFIX)pyxpcom$(DLL_SUFFIX) \
               $(NULL)
 
 # In the shorter term we need JS too.
? config/system_wrappers
Index: config/rules.mk
===================================================================
RCS file: /cvsroot/mozilla/config/rules.mk,v
retrieving revision 3.554
diff -u -r3.554 rules.mk
--- config/rules.mk	14 May 2007 14:21:44 -0000	3.554
+++ config/rules.mk	21 May 2007 00:41:20 -0000
@@ -775,6 +775,12 @@
 install:: $(SDK_HEADERS)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE)
 endif
+
+ifneq (,$(SDK_LIBRARY))
+install:: $(SDK_LIBRARY)
+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/sdk
+endif
+
 endif
 
 install:: $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY)
--- extensions/python/xpcom/src/module/Makefile.in.orig	2007-05-28 20:48:26.000000000 +0200
+++ extensions/python/xpcom/src/module/Makefile.in	2007-05-28 20:49:03.000000000 +0200
@@ -95,8 +95,8 @@
 
 install::
 ifneq ($(OS_ARCH),WINNT)
-	$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom
-	mv $(DISTDIR)$(pyexecdir)/xpcom/$(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom/_xpcom$(MOZ_PYTHON_DLL_SUFFIX)
+	$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DESTDIR)$(pyexecdir)/xpcom
+	mv $(DESTDIR)$(pyexecdir)/xpcom/$(SHARED_LIBRARY) $(DESTDIR)$(pyexecdir)/xpcom/_xpcom$(MOZ_PYTHON_DLL_SUFFIX)
 endif
 
 clobber::
--- extensions/python/xpcom/Makefile.in.orig	2007-05-29 10:17:10.000000000 +0200
+++ extensions/python/xpcom/Makefile.in	2007-05-29 10:17:22.000000000 +0200
@@ -97,9 +97,9 @@
 	$(INSTALL) $(PYSRCS_XPCOMTOOLS) $(DIST)/bin/python/xpcom/tools
 
 install::
-	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOM) $(DISTDIR)$(pyexecdir)/xpcom
-	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMCLIENT) $(DISTDIR)$(pyexecdir)/xpcom/client
-	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMSERVER) $(DISTDIR)$(pyexecdir)/xpcom/server
+	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOM) $(DESTDIR)$(pyexecdir)/xpcom
+	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMCLIENT) $(DESTDIR)$(pyexecdir)/xpcom/client
+	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMSERVER) $(DESTDIR)$(pyexecdir)/xpcom/server
 
 clobber::
 	rm -rf $(DIST)/bin/python/xpcom


--- NEW FILE xulrunner-mozconfig ---
. $topsrcdir/xulrunner/config/mozconfig

ac_add_options --with-system-nss
ac_add_options --with-system-nspr
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-png
ac_add_options --with-pthreads
ac_add_options --disable-strip
ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --disable-installer
ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
ac_add_options --enable-xinerama
ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --disable-xprint
ac_add_options --enable-pango
ac_add_options --enable-svg
ac_add_options --enable-canvas
ac_add_options --enable-application=xulrunner
ac_add_options --disable-javaxpcom
ac_add_options --disable-gnomeui
ac_add_options --disable-gnomevfs
ac_add_options --enable-extensions=default,cookie,python
ac_add_options --prefix="$PREFIX"
ac_add_options --libdir="$LIBDIR"
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1



--- NEW FILE xulrunner-olpc-default-prefs.js ---
pref("app.update.enabled", false);
pref("app.update.autoInstallEnabled", false);
pref("browser.display.use_system_colors",   true);
pref("browser.link.open_external",          3);
pref("general.smoothScroll",                true);


--- NEW FILE xulrunner.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

%define nss_version 3.10
%define cairo_version 1.3.12
%define prerelease a5pre
%define alphatag cvs20070519

Summary:        XUL Runner
Name:           xulrunner
Version:        1.9
Release:        5.%{prerelease}.%{alphatag}.1
URL:            http://developer.mozilla.org/en/docs/XULRunner
License:        MPL/LGPL
Group:          Applications/Internet
Source0:        xulrunner-%{version}%{prerelease}-%{alphatag}.tar.bz2
Source10:       xulrunner-mozconfig
Source12:       xulrunner-olpc-default-prefs.js

# build patches

# patches from upstream (Patch100+)
Patch201:       xulrunner-1.9a3pre-dpi.patch
Patch202:       xulrunner-1.9a5pre-build.patch
Patch203:       firefox-0.7.3-psfonts.patch

# ---------------------------------------------------

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  nss-devel >= %{nss_version}
BuildRequires:  cairo-devel >= %{cairo_version}
BuildRequires:  libpng-devel, libjpeg-devel
BuildRequires:  zlib-devel, zip
BuildRequires:  libIDL-devel
BuildRequires:  gtk2-devel
BuildRequires:  krb5-devel
BuildRequires:  pango-devel
BuildRequires:  freetype-devel >= 2.1.9
BuildRequires:  libXt-devel
BuildRequires:  libXrender-devel
BuildRequires:  python-devel
BuildRequires:  nspr-devel

Requires:       nss >= %{nss_version}
Requires:       pkgconfig

Provides:       gecko-libs = %{version}
%define mozappdir %{_libdir}/%{name}-%{version}

%description
XULRunner is a Mozilla runtime package that can be used to bootstrap XUL+XPCOM
applications that are as rich as Firefox and Thunderbird. It will provide
mechanisms for installing, upgrading, and uninstalling these applications.
XULRunner will also provide libxul, a solution which allows the embedding
of Mozilla technologies in other projects and products.

%package devel
Summary: Libraries and headers for gecko-embed
Group: Development/Libraries
Requires: %name = %{version}
Provides: gecko-devel = %{version}

%description devel
XUL Runner devel is...

%prep
%setup -q -n mozilla

%patch201 -p0 -b .dpi
%patch202 -p0 -b .build
%patch203 -p1 -b .psfonts

%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig

cat << EOF >> .mozconfig
ac_add_options --with-default-mozilla-five-home=%{_libdir}/xulrunner-%{version} 
EOF

%build
# Build with -Os as it helps the browser; also, don't override mozilla's warning
# level; they use -Wall but disable a few warnings that show up _everywhere_
MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2/-Os/' -e 's/-Wall//')

export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
export PREFIX='%{_prefix}'
export LIBDIR='%{_libdir}'

%ifarch ppc ppc64 s390 s390x
%define moz_make_flags -j1
%else
%define moz_make_flags %{?_smp_mflags}
%endif

export LDFLAGS="-Wl,-rpath,%{mozappdir}"
MAKE="gmake %{?_smp_mflags}" 
make -f client.mk build

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f %{buildroot}%{_libdir}/xulrunner-%{version}%{prerelease}/sdk/*.so

# set up our default preferences
%{__cp} %{SOURCE12} $RPM_BUILD_ROOT/%{mozappdir}/greprefs/all-olpc.js
%{__cp} %{SOURCE12} $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-olpc.js

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSE LEGAL
%{_bindir}/xulrunner
%{_libdir}/xulrunner-%{version}%{prerelease}/chrome
%{_libdir}/xulrunner-%{version}%{prerelease}/components
%{_libdir}/xulrunner-%{version}%{prerelease}/defaults
%{_libdir}/xulrunner-%{version}%{prerelease}/dictionaries
%{_libdir}/xulrunner-%{version}%{prerelease}/greprefs
%{_libdir}/xulrunner-%{version}%{prerelease}/icons
%{_libdir}/xulrunner-%{version}%{prerelease}/plugins
%{_libdir}/xulrunner-%{version}%{prerelease}/res
%{_libdir}/xulrunner-%{version}%{prerelease}/*.so
%{_libdir}/xulrunner-%{version}%{prerelease}/mozilla-xremote-client
%{_libdir}/xulrunner-%{version}%{prerelease}/regxpcom
%{_libdir}/xulrunner-%{version}%{prerelease}/run-mozilla.sh
%{_libdir}/xulrunner-%{version}%{prerelease}/updater
%{_libdir}/xulrunner-%{version}%{prerelease}/xp*
%{_libdir}/xulrunner-%{version}%{prerelease}/xulrunner*
%{python_sitearch}/xpcom

%files devel
%defattr(-, root, root)
%{_bindir}/xulrunner-config
%{_libdir}/xulrunner-%{version}%{prerelease}/sdk
%{_libdir}/pkgconfig/*
%{_includedir}/xulrunner-%{version}%{prerelease}
%{_datadir}/idl/xulrunner-%{version}%{prerelease}
%{_datadir}/aclocal/nspr.m4

%changelog
* Thu Jun 21 2007 John (J5) Palmieri <johnp at redhat.com> 1.9-5.a5pre.cvs20070519.1
- add firefox-0.7.3-psfonts.patch
- fix provides typo
- fix up mozconfig 

* Tue Jun 19 2007 John (J5) Palmieri <johnp at redhat.com> 1.9-4.a5pre.cvs20070519.1
- remove pango patches
- build with system nspr
- add default pref file so we don't try to autoupdate new xulrunners

* Tue Jun 19 2007 John (J5) Palmieri <johnp at redhat.com> 1.9-3.a5pre.cvs20070519.1
- Add provides on gecko
- use -rpath in build
- remove pragma visibility patch

* Fri Jun 15 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.9-2.a5pre.cvs20070519.1
- Various rpmlint fixes

* Mon May 28 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.9a5pre-1.cvs20070519.1
- Drop gre installation. Use "make install". Build pyxpcom.

* Wed May  9 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.9a5pre-1.cvs20070509.1
- Update snapshot and add patch to expose dirprovider setter

* Thu Mar 29 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.9a3pre-2.cvs20070314.7
- Slightly improved patch for window.innerWidth and window.innerHeight

* Thu Mar 29 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.9a3pre-2.cvs20070314.6
- Add patch to fix window.innerWidth and window.innerHeight (#375519)

* Fri Mar 23 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.9a3pre-2.cvs20070314.5
- Add patch to unbreak the filechooser

* Thu Mar 22 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.9a3pre-2.cvs20070314.4
- Better dpi patch

* Wed Mar 21 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.9a3pre-2.cvs20070314.3
- Remove the dpi patch

* Wed Mar 21 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.9a3pre-2.cvs20070314.2
- Add patches to fix text selection and dpi

* Wed Mar 14 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.9a3pre-2.cvs20070314.1
- Update to cvs20070314

* Mon Feb  8 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.9a3pre-1.cvs20070208.1
- Update to 1.9a3pre

* Mon Feb  5 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.9a2-1.cvs20070129.2
- Add a gre configuration file

* Mon Jan 29 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.9a2-1
- Update to 1.9 cvs

* Thu Dec 21 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.8.0.4-4
- Do not strip symbols

* Thu Oct 18 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.8.0.4-3
- Enable the cookie extension

* Wed Oct  4 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.8.0.4-2
- Make xulruner-devel depend on nspr-devel

* Tue Sep 12 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.8.0.4-1
- Update to final 1.8.0.4

* Mon May 17 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.8.0.4-0.cvs20060505.3
- Remove the requires/provide custom stuff

* Tue May 16 2006 David Zeuthen <davidz at redhat.com> 1.8.0.4-0.cvs20060505.2
- Build with --disable-gnomeui --disable-gnomevfs and drop BuildRequires
- gnome-vfs2-devel, ligbnome-devel, libgnomeui-devel

* Wed May 10 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.8.0.4-0.cvs20060505.1
- Disable pyxpcom since we dont use it and is broken

* Mon May 8 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.8.0.cvs20060505-1
- Move the cvs version to release tag

* Mon May 8 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.8.0.cvs20060505-1
- Update source to MOZILLA_1.8.0_BRANCH


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/OLPC-2/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Jun 2007 02:18:59 -0000	1.1
+++ .cvsignore	22 Jun 2007 16:55:20 -0000	1.2
@@ -0,0 +1 @@
+xulrunner-1.9a5pre-cvs20070519.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/OLPC-2/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Jun 2007 02:18:59 -0000	1.1
+++ sources	22 Jun 2007 16:55:20 -0000	1.2
@@ -0,0 +1 @@
+d762433186bd917322488d5e6152ba73  xulrunner-1.9a5pre-cvs20070519.tar.bz2


