# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1276072814 -7200
# Node ID e0271a18500f49cfb871c8b91bac19a8fc1c4328
# Parent  f2df98836e171a3a8d614d37ff27393b7e2f8604
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)

diff -r f2df98836e17 -r e0271a18500f mozilla-disable-javaxpcom.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-disable-javaxpcom.patch	Wed Jun 09 10:40:14 2010 +0200
@@ -0,0 +1,172 @@
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -5760,24 +5760,26 @@ fi
+ 
+ AC_SUBST(MOZ_IPDL_TESTS)
+ 
+ dnl ========================================================
+ dnl = Disable plugin support
+ dnl ========================================================
+ MOZ_ARG_DISABLE_BOOL(plugins,
+ [  --disable-plugins       Disable plugins support],
+-    MOZ_PLUGINS=,)
++    MOZ_PLUGINS=,
++    MOZ_PLUGINS=1)
+ 
+ dnl ========================================================
+ dnl = Disable building dbm
+ dnl ========================================================
+ MOZ_ARG_DISABLE_BOOL(dbm,
+ [  --disable-dbm       Disable building dbm],
+-    NSS_DISABLE_DBM=1,)
++    NSS_DISABLE_DBM=1,
++    NSS_DISABLE_DBM=)
+ 
+ dnl bi-directional support always on
+ IBMBIDI=1
+ AC_DEFINE(IBMBIDI)
+ 
+ dnl ========================================================
+ dnl view source support on by default
+ dnl ========================================================
+@@ -5817,17 +5819,18 @@ if test "$MOZ_JSLOADER"; then
+     AC_DEFINE(MOZ_JSLOADER)
+ fi
+ 
+ dnl ========================================================
+ dnl Disable printing
+ dnl ========================================================
+ MOZ_ARG_DISABLE_BOOL(printing,
+ [  --disable-printing      Disable printing support],
+-    NS_PRINTING=,)
++    NS_PRINTING=,
++    NS_PRINTING=1)
+ 
+ if test "$MOZ_WIDGET_TOOLKIT" = "qt"; then
+     AC_MSG_WARN([Printing does not work with Qt at this time. Omitting printing support.])
+     NS_PRINTING=
+ fi
+ 
+ if test "$NS_PRINTING"; then
+     AC_DEFINE(NS_PRINTING)
+@@ -5876,17 +5879,18 @@ if test -n "$MOZ_NO_FAST_LOAD"; then
+     AC_DEFINE(MOZ_NO_FAST_LOAD)
+ fi
+ 
+ dnl ========================================================
+ dnl = Disable Ogg Codecs
+ dnl ========================================================
+ MOZ_ARG_DISABLE_BOOL(ogg,
+ [  --disable-ogg           Disable support for OGG media (Theora video and Vorbis audio)],
+-    MOZ_OGG=,)
++    MOZ_OGG=,
++    MOZ_OGG=1)
+ 
+ if test -n "$MOZ_OGG"; then
+     AC_DEFINE(MOZ_OGG)
+     MOZ_SYDNEYAUDIO=1
+     MOZ_MEDIA=1
+     MOZ_VORBIS=1
+ 
+     dnl Checks for __attribute__(aligned()) directive
+@@ -5967,17 +5971,18 @@ if test -n "$MOZ_WEBM"; then
+     fi
+ fi
+ 
+ dnl ========================================================
+ dnl = Disable Wave decoder support
+ dnl ========================================================
+ MOZ_ARG_DISABLE_BOOL(wave,
+ [  --disable-wave          Disable Wave decoder support],
+-    MOZ_WAVE=,)
++    MOZ_WAVE=,
++    MOZ_WAVE=1)
+ 
+ if test -n "$MOZ_WAVE"; then
+     AC_DEFINE(MOZ_WAVE)
+     MOZ_SYDNEYAUDIO=1
+     MOZ_MEDIA=1
+ fi
+ 
+ dnl ========================================================
+@@ -6077,17 +6082,18 @@ case "${target}" in
+ *-wince*)
+     MOZ_JAVAXPCOM=
+     ;;
+ esac
+ 
+ MOZ_ARG_ENABLE_BOOL(javaxpcom,
+ [  --enable-javaxpcom
+                           Enable Java-XPCOM bridge],
+-    MOZ_JAVAXPCOM=1,)
++    MOZ_JAVAXPCOM=1,
++    MOZ_JAVAXPCOM=)
+ 
+ case "$host_os" in
+   cygwin*|msvc*|mks*)
+     if test -n "$JAVA_HOME"; then
+       JAVA_HOME=`cygpath -u \`cygpath -m -s "$JAVA_HOME"\``
+     fi
+     ;;
+   *mingw*)
+@@ -6154,17 +6160,18 @@ i?86-*-linux*|x86_64-*-linux*|arm-*-linu
+   ;;
+ *solaris*)
+   MOZ_CRASHREPORTER=1
+   ;;
+ esac
+ 
+ MOZ_ARG_DISABLE_BOOL(crashreporter,
+ [  --disable-crashreporter Disable breakpad crash reporting],
+-    MOZ_CRASHREPORTER=,)
++    MOZ_CRASHREPORTER=,
++    MOZ_CRASHREPORTER=1)
+ 
+ if test -n "$MOZ_CRASHREPORTER"; then
+    AC_DEFINE(MOZ_CRASHREPORTER)
+ 
+   if (test "$OS_ARCH" = "Linux" || test "$OS_ARCH" = "SunOS") && \
+     test -z "$SKIP_LIBRARY_CHECKS"; then
+     PKG_CHECK_MODULES(MOZ_GTHREAD, gthread-2.0)
+     AC_SUBST(MOZ_GTHREAD_CFLAGS)
+@@ -6431,17 +6438,18 @@ dnl ====================================
+ case "$target_os" in
+     aix*|solaris*|linux*|msvc*|mks*|cygwin*|mingw*|os2*|wince*|winmo*)
+         MOZ_INSTALLER=1
+         ;;
+ esac
+ 
+ MOZ_ARG_DISABLE_BOOL(installer,
+ [  --disable-installer     Disable building of installer],
+-    MOZ_INSTALLER=,)
++    MOZ_INSTALLER=,
++    MOZ_INSTALLER=1)
+ if test -n "$MOZ_INSTALLER" -a "$OS_ARCH" = "WINNT"; then
+     # Disable installer for Windows builds that use the new toolkit if NSIS
+     # isn't in the path.
+     MOZ_PATH_PROGS(MAKENSIS, makensis)
+     if test -z "$MAKENSIS" || test "$MAKENSIS" = ":"; then
+         AC_MSG_ERROR([To build the installer makensis is required in your path. To build without the installer reconfigure using --disable-installer.])
+     fi
+     # The Windows build for NSIS requires the iconv command line utility to
+@@ -8482,17 +8490,18 @@ if test "$NECKO_DISK_CACHE"; then
+     AC_DEFINE(NECKO_DISK_CACHE)
+ fi
+ 
+ dnl
+ dnl option to disable necko's wifi scanner
+ dnl
+ MOZ_ARG_DISABLE_BOOL(necko-wifi,
+ [  --disable-necko-wifi    Disable necko wifi scanner],
+-    NECKO_WIFI=,)
++    NECKO_WIFI=,
++    NECKO_WIFI=1)
+ 
+ if test "$OS_ARCH" = "OS2"; then
+   dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
+   NECKO_WIFI=
+ fi
+ if test "$NECKO_WIFI" -a \
+         "$OS_ARCH" != "Linux" -a \
+         "$OS_ARCH" != "Darwin" -a \
diff -r f2df98836e17 -r e0271a18500f mozilla-xulrunner193/create-tar.sh
--- a/mozilla-xulrunner193/create-tar.sh	Wed Jun 09 07:53:55 2010 +0200
+++ b/mozilla-xulrunner193/create-tar.sh	Wed Jun 09 10:40:14 2010 +0200
@@ -1,12 +1,13 @@
 #!/bin/bash
 
-RELEASE_TAG="FIREFOX_3_6_4_RELEASE"
-VERSION="1.9.2.4"
+BRANCH="mozilla-central"
+RELEASE_TAG="default"
+VERSION="1.9.3a4"
 
 # mozilla
-hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla
+hg clone http://hg.mozilla.org/$BRANCH mozilla
 pushd mozilla
-hg update -r $RELEASE_TAG
+[ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG
 popd
 tar cjf xulrunner-source-$VERSION.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS mozilla
 
@@ -17,8 +18,8 @@
     ja-JP-mac|en-US)
       ;;
     *)
-      hg clone http://hg.mozilla.org/releases/l10n-mozilla-1.9.2/$locale l10n/$locale
-      hg -R l10n/$locale up -C -r $RELEASE_TAG
+      hg clone http://hg.mozilla.org/l10n-central/$locale l10n/$locale
+      [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG
       ;;
   esac
 done
diff -r f2df98836e17 -r e0271a18500f mozilla-xulrunner193/mozilla-disable-javaxpcom.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-xulrunner193/mozilla-disable-javaxpcom.patch	Wed Jun 09 10:40:14 2010 +0200
@@ -0,0 +1,1 @@
+../mozilla-disable-javaxpcom.patch
\ No newline at end of file
diff -r f2df98836e17 -r e0271a18500f mozilla-xulrunner193/mozilla-xulrunner193.spec
--- a/mozilla-xulrunner193/mozilla-xulrunner193.spec	Wed Jun 09 07:53:55 2010 +0200
+++ b/mozilla-xulrunner193/mozilla-xulrunner193.spec	Wed Jun 09 10:40:14 2010 +0200
@@ -20,7 +20,7 @@
 
 
 Name:           mozilla-xulrunner193
-BuildRequires:  autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel zip pkg-config fdupes hunspell-devel
+BuildRequires:  autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel zip pkg-config fdupes hunspell-devel yasm Mesa
 # needed for brp-check-bytecode-version (jar, fastjar would do as well)
 BuildRequires:  unzip
 %if %suse_version > 1100
@@ -46,8 +46,8 @@
 %if %suse_version >= 1110
 # this is needed to match this package with the kde4 helper package without the main package
 # having a hard requirement on the kde4 package
-%define kde_helper_version 6
-Provides:       mozilla-kde4-version = %{kde_helper_version}
+#%define kde_helper_version 6
+#Provides:       mozilla-kde4-version = %{kde_helper_version}
 %endif
 %ifarch %ix86
 Provides:       mozilla-xulrunner193-32bit = %{version}-%{release}
@@ -66,6 +66,7 @@
 Patch3:         mozilla-pkgconfig.patch
 Patch4:         idldir.patch
 Patch5:         mozilla-nongnome-proxies.patch
+Patch6:         mozilla-disable-javaxpcom.patch
 Patch7:         mozilla-prefer_plugin_pref.patch
 Patch8:         mozilla-shared-nss-db.patch
 Patch10:        mozilla-kde.patch
@@ -80,7 +81,8 @@
 Requires(preun): update-alternatives coreutils
 ### build configuration ###
 %define crashreporter    1
-%define has_system_nspr  1
+# FIXME after NSPR 4.8.5
+%define has_system_nspr  0
 %define has_system_nss   1
 %define has_system_cairo 0
 %define localize 1
@@ -202,6 +204,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %patch7 -p1
 #%patch8 -p1
 #%if %suse_version >= 1110
@@ -212,25 +215,19 @@
 #%patch13 -p1
 
 %build
-%if %suse_version >= 1110
-kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3)
-if test "$kdehelperversion" != %{kde_helper_version}; then
-  echo fix kde helper version in the .spec file
-  exit 1
-fi
-%endif
+#%if %suse_version >= 1110
+#kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3)
+#if test "$kdehelperversion" != %{kde_helper_version}; then
+#  echo fix kde helper version in the .spec file
+#  exit 1
+#fi
+#%endif
 MOZ_APP_DIR=%{_libdir}/xulrunner-%{version_internal}
 export MOZ_BUILD_DATE=%{releasedate}
 export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing"
 %ifarch ppc64
 export CFLAGS="$CFLAGS -mminimal-toc"
 %endif
-# 10.3-x86_64 build fails probably because gcc bug
-%if %suse_version == 1030
-%ifarch x86_64
-export ac_cv_visibility_hidden="no"
-%endif
-%endif
 export CXXFLAGS="$CFLAGS"
 export LDFLAGS="-Wl,-rpath -Wl,${MOZ_APP_DIR}"
 export MOZCONFIG=$RPM_BUILD_DIR/mozconfig
@@ -267,6 +264,7 @@
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-startup-notification
 ac_add_options --enable-url-classifier
+ac_add_options --enable-system-hunspell
 #ac_add_options --enable-debug
 EOF
 %if %has_system_nspr
@@ -284,16 +282,6 @@
 ac_add_options --enable-system-cairo
 EOF
 %endif
-%if %suse_version > 1030
-cat << EOF >> $MOZCONFIG
-ac_add_options --enable-system-hunspell
-EOF
-%endif
-#%if %suse_version > 1100
-#cat << EOF >> $MOZCONFIG
-#ac_add_options --enable-system-sqlite
-#EOF
-#%endif
 %if %suse_version > 1110
 cat << EOF >> $MOZCONFIG
 ac_add_options --enable-libproxy
@@ -337,8 +325,8 @@
 # XPI example
 #cp -rL dist/xpi-stage/simple $RPM_BUILD_ROOT/%{_libdir}/xulrunner-%{version_internal}/
 # preferences
-cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/greprefs/all-openSUSE.js
-cp %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/greprefs/lockdown.js
+cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/defaults/pref/all-openSUSE.js
+cp %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/defaults/pref/lockdown.js
 # install add-plugins.sh
 sed "s:%%PROGDIR:%{_libdir}/xulrunner-%{version_internal}:g" \
   %{SOURCE5} > $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/add-plugins.sh
@@ -353,6 +341,7 @@
 # install additional locales
 %if %localize
 rm -f %{_tmppath}/translations.*
+touch %{_tmppath}/translations.{common,other}
 for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales); do
   case $locale in
    ja-JP-mac|en-US)
@@ -391,13 +380,12 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/LICENSE
 rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/README.txt
 rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/dictionaries/en-US*
+rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/nspr-config
 # autoreg
 touch $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/.autoreg
 # fdupes
-%if %suse_version > 1020
 %fdupes $RPM_BUILD_ROOT%{_includedir}/xulrunner-%{version_internal}/
 %fdupes $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/
-%endif
 # create breakpad debugsymbols
 %if %crashreporter
 SYMBOLS_NAME="xulrunner-%{version}-%{release}.%{_arch}-%{suse_version}-symbols"
@@ -459,8 +447,6 @@
 %dir %{_libdir}/xulrunner-%{version_internal}/chrome/
 %dir %{_libdir}/xulrunner-%{version_internal}/dictionaries/
 %dir %{_libdir}/xulrunner-%{version_internal}/extensions/
-%{_libdir}/xulrunner-%{version_internal}/chrome/classic.*
-%{_libdir}/xulrunner-%{version_internal}/chrome/comm.*
 %{_libdir}/xulrunner-%{version_internal}/chrome/en-US.*
 %{_libdir}/xulrunner-%{version_internal}/chrome/pippki.*
 %{_libdir}/xulrunner-%{version_internal}/chrome/toolkit.*
@@ -469,12 +455,7 @@
 %exclude %{_libdir}/xulrunner-%{version_internal}/components/libmozgnome.so
 %exclude %{_libdir}/xulrunner-%{version_internal}/components/libnkgnomevfs.so
 %{_libdir}/xulrunner-%{version_internal}/defaults/
-%dir %{_libdir}/xulrunner-%{version_internal}/greprefs/
-%{_libdir}/xulrunner-%{version_internal}/greprefs/all.js
-%{_libdir}/xulrunner-%{version_internal}/greprefs/security-prefs.js
-%{_libdir}/xulrunner-%{version_internal}/greprefs/xpinstall.js
-%{_libdir}/xulrunner-%{version_internal}/greprefs/all-openSUSE.js
-%{_libdir}/xulrunner-%{version_internal}/greprefs/lockdown.js
+%{_libdir}/xulrunner-%{version_internal}/greprefs.js
 %{_libdir}/xulrunner-%{version_internal}/icons/
 %{_libdir}/xulrunner-%{version_internal}/modules/
 %{_libdir}/xulrunner-%{version_internal}/plugins/
diff -r f2df98836e17 -r e0271a18500f series
--- a/series	Wed Jun 09 07:53:55 2010 +0200
+++ b/series	Wed Jun 09 10:40:14 2010 +0200
@@ -4,6 +4,7 @@
 mozilla-pkgconfig.patch
 idldir.patch
 mozilla-nongnome-proxies.patch
+mozilla-disable-javaxpcom.patch
 mozilla-prefer_plugin_pref.patch
 #mozilla-shared-nss-db.patch
 #mozilla-kde.patch