April 2012 - openSUSE Commits - openSUSE Mailing Lists

commit python-djvulibre for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package python-djvulibre for openSUSE:Factory checked in at 2012-04-23 16:12:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-djvulibre (Old) and /work/SRC/openSUSE:Factory/.python-djvulibre.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-djvulibre", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-djvulibre/python-djvulibre.changes 2012-03-29 14:04:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-djvulibre.new/python-djvulibre.changes 2012-04-23 16:12:43.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 23 05:43:06 UTC 2012 - lazy.kent(a)opensuse.org + +- Corrected license: GPL-2.0 only (bnc#758438). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-djvulibre.spec ++++++ --- /var/tmp/diff_new_pack.Jj9VoQ/_old 2012-04-23 16:12:44.000000000 +0200 +++ /var/tmp/diff_new_pack.Jj9VoQ/_new 2012-04-23 16:12:44.000000000 +0200 @@ -20,7 +20,7 @@ Version: 0.3.9 Release: 0 Summary: Python Support for the DjVu Image Format -License: GPL-2.0+ +License: GPL-2.0 Group: Development/Libraries/Python Url: http://jwilk.net/software/python-djvulibre Source0: http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pymol for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package pymol for openSUSE:Factory checked in at 2012-04-23 16:12:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pymol (Old) and /work/SRC/openSUSE:Factory/.pymol.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pymol", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/pymol/pymol.changes 2012-03-17 13:22:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pymol.new/pymol.changes 2012-04-23 16:12:37.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Apr 13 03:52:00 UTC 2012 - dhall(a)wustl.edu + +- update to svn rev 3996 + * Fixed ID: 3512313 TER records before residues like MSE, patch submitted by Thomas Holder + * Fixed ID:3513708, cmd.get_unused_name fix; thanks to Thomas Holder + * Default all Intel cards to not use shaders + +------------------------------------------------------------------- Old: ---- pymol-1.5.0.3.svn3993.tar.bz2 New: ---- pymol-1.5.0.3.svn3996.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pymol.spec ++++++ --- /var/tmp/diff_new_pack.chboag/_old 2012-04-23 16:12:39.000000000 +0200 +++ /var/tmp/diff_new_pack.chboag/_new 2012-04-23 16:12:39.000000000 +0200 @@ -16,9 +16,8 @@ # - Name: pymol -Version: 1.5.0.3.svn3993 +Version: 1.5.0.3.svn3996 Release: 0 Url: http://pymol.org Summary: A Molecular Viewer @@ -27,11 +26,11 @@ Source: %{name}-%{version}.tar.bz2 Patch0: 1_rpmroot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python-devel BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: glew-devel BuildRequires: libpng-devel +BuildRequires: python-devel Requires: glew Requires: python-pmw %if 0%{?suse_version} ++++++ pymol-1.5.0.3.svn3993.tar.bz2 -> pymol-1.5.0.3.svn3996.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/pymol/pymol-1.5.0.3.svn3993.tar.bz2 /work/SRC/openSUSE:Factory/.pymol.new/pymol-1.5.0.3.svn3996.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit postfix for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package postfix for openSUSE:Factory checked in at 2012-04-23 16:12:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfix (Old) and /work/SRC/openSUSE:Factory/.postfix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postfix", Maintainer is "varkoly(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/postfix/postfix.changes 2012-04-12 09:51:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix.changes 2012-04-23 16:12:32.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Apr 12 08:15:06 UTC 2012 - varkoly(a)suse.com + +- bnc#756450 - postfix: remove version from banner + +------------------------------------------------------------------- +Mon Apr 9 16:13:28 UTC 2012 - bruno(a)ioda-net.ch + +- add port 587 smtp-auth submission to postfix-fw bnc#756289 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.0Ibp4B/_old 2012-04-23 16:12:34.000000000 +0200 +++ /var/tmp/diff_new_pack.0Ibp4B/_new 2012-04-23 16:12:34.000000000 +0200 @@ -275,7 +275,8 @@ "readme_directory = %{pf_readme_directory}" \ "html_directory = %{pf_html_directory}" \ "sample_directory = %{pf_sample_directory}" \ - "daemon_directory = %{pf_daemon_directory}" + "daemon_directory = %{pf_daemon_directory}" \ + 'smtpd_banner = $myhostname ESMTP' #Set Permissions install -m 644 %{name}-SuSE/%{name}-files $RPM_BUILD_ROOT/usr/lib/postfix/postfix-files # postfix-mysql ++++++ postfix-SuSE.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/postfix-fw new/postfix-SuSE/postfix-fw --- old/postfix-SuSE/postfix-fw 2008-08-06 13:42:31.000000000 +0200 +++ new/postfix-SuSE/postfix-fw 2012-04-09 18:10:50.000000000 +0200 @@ -2,7 +2,7 @@ ## Description: Firewall Configuration file for postfix # space separated list of allowed TCP ports -TCP="25 465" +TCP="25 465 587" # space separated list of allowed UDP ports UDP="" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit plplot for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package plplot for openSUSE:Factory checked in at 2012-04-23 16:12:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plplot (Old) and /work/SRC/openSUSE:Factory/.plplot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plplot", Maintainer is "Mauro(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/plplot/plplot.changes 2012-04-12 09:51:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plplot.new/plplot.changes 2012-04-23 16:12:30.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 22 15:06:37 UTC 2012 - dimstar(a)opensuse.org + +- Extend plplot-gcc-ada46-libs.patch to include gnat-4.7 in plus. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plplot-gcc-ada46-libs.patch ++++++ --- /var/tmp/diff_new_pack.k0hsth/_old 2012-04-23 16:12:31.000000000 +0200 +++ /var/tmp/diff_new_pack.k0hsth/_new 2012-04-23 16:12:31.000000000 +0200 @@ -5,7 +5,7 @@ if(ENABLE_ada) - find_library(GNAT_LIB NAMES gnat gnat-4.5 gnat-4.4 gnat-4.3 gnat-4.2 gnat-4.1) -+ find_library(GNAT_LIB NAMES gnat gnat-4.6 gnat-4.5 gnat-4.4 gnat-4.3 gnat-4.2 gnat-4.1) ++ find_library(GNAT_LIB NAMES gnat gnat-4.7 gnat-4.6 gnat-4.5 gnat-4.4 gnat-4.3 gnat-4.2 gnat-4.1) if(NOT GNAT_LIB) message(STATUS "WARNING: " "gnat library not found. Disabling ada bindings") -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pidentd for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package pidentd for openSUSE:Factory checked in at 2012-04-23 16:12:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pidentd (Old) and /work/SRC/openSUSE:Factory/.pidentd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pidentd", Maintainer is "BoYang(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pidentd/pidentd.changes 2011-11-28 12:55:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pidentd.new/pidentd.changes 2012-04-23 16:12:27.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Mar 27 12:58:20 UTC 2012 - cfarrell(a)suse.com + +- license update: GPL-2.0+ + SeSee plib/strmatch.c + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pidentd.spec ++++++ --- /var/tmp/diff_new_pack.7Kl3pl/_old 2012-04-23 16:12:29.000000000 +0200 +++ /var/tmp/diff_new_pack.7Kl3pl/_new 2012-04-23 16:12:29.000000000 +0200 @@ -18,7 +18,7 @@ Name: pidentd -License: PERMISSIVE-OSI-COMPLIANT +License: GPL-2.0+ Group: Productivity/Networking/System PreReq: %insserv_prereq %fillup_prereq Provides: nkitb:/usr/sbin/in.identd @@ -70,7 +70,7 @@ %build %{suse_update_config -f aux/ plib/aux/} aclocal --force -autoconf --force +autoreconf --force --install (cd plib libtoolize --force aclocal --force -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pam_userpass for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package pam_userpass for openSUSE:Factory checked in at 2012-04-23 16:12:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pam_userpass (Old) and /work/SRC/openSUSE:Factory/.pam_userpass.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pam_userpass", Maintainer is "mc(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pam_userpass/pam_userpass.changes 2011-09-23 12:21:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pam_userpass.new/pam_userpass.changes 2012-04-23 16:12:17.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 29 13:35:50 UTC 2012 - cfarrell(a)suse.com + +- license update: ISC + Obligations most akin to http://www.spdx.org/licenses/HPND + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_userpass.spec ++++++ --- /var/tmp/diff_new_pack.omRpkO/_old 2012-04-23 16:12:19.000000000 +0200 +++ /var/tmp/diff_new_pack.omRpkO/_new 2012-04-23 16:12:19.000000000 +0200 @@ -21,7 +21,7 @@ Name: pam_userpass Url: http://www.openwall.com/pam/ BuildRequires: pam-devel -License: Other uncritical OpenSource License +License: ISC Group: System/Libraries Requires: pam Provides: pam-modules:/%_lib/security/pam_userpass.so -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openldap2 for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at 2012-04-23 16:12:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openldap2 (Old) and /work/SRC/openSUSE:Factory/.openldap2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openldap2", Maintainer is "rhafer(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/openldap2/openldap2-client.changes 2012-03-01 07:49:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openldap2.new/openldap2-client.changes 2012-04-23 16:12:10.000000000 +0200 @@ -1,0 +2,16 @@ +Mon Apr 23 07:08:13 UTC 2012 - rhafer(a)suse.de + +- Disabled testsuite for now. Causes problems in the buildserivce + +------------------------------------------------------------------- +Tue Mar 6 12:23:35 UTC 2012 - rhafer(a)suse.de + +- Update to 2.4.30 + * Fixed libldap socket polling for writes (ITS#7167) + * Fixed liblutil string modifications (ITS#7174) + * Fixed slapd crash when attrsOnly is true (ITS#7143) + * Fixed slapd syncrepl delete handling (ITS#7052,ITS#7162) + * Fixed slapo-pcache time-to-refesh handling (ITS#7178) + * Fixed slapo-syncprov loop detection (ITS#6024) + +------------------------------------------------------------------- openldap2.changes: same change Old: ---- 0008-syncrepl-fixes-post-2.4.29.dif 0009-ITS-7167-only-poll-sockets-for-write-as-needed.dif openldap-2.4.29.tgz New: ---- openldap-2.4.30.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.4WTsKk/_old 2012-04-23 16:12:12.000000000 +0200 +++ /var/tmp/diff_new_pack.4WTsKk/_new 2012-04-23 16:12:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package openldap2-client +# spec file for package openldap2 # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,34 +15,41 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%define run_test_suite 1 +%define run_test_suite 0 Name: openldap2-client -BuildRequires: cyrus-sasl-devel libopenssl-devel libtool +License: OLDAP-2.8 +BuildRequires: cyrus-sasl-devel +BuildRequires: libopenssl-devel +BuildRequires: libtool %if %sles_version == 9 || %sles_version == 10 -BuildRequires: -libopenssl-devel -pwdutils openssl-devel +BuildRequires: -libopenssl-devel +BuildRequires: -pwdutils +BuildRequires: openssl-devel %endif -Version: 2.4.29 -Release: 1 +Version: 2.4.30 +Release: 0 Url: http://www.openldap.org -License: OLDAP-2.8 %if "%{name}" == "openldap2" -BuildRequires: db-devel openslp-devel tcpd-devel unixODBC-devel +BuildRequires: db-devel +BuildRequires: openslp-devel +BuildRequires: tcpd-devel +BuildRequires: unixODBC-devel %if %sles_version == 9 || %sles_version == 10 -BuildRequires: -db-devel libdb-4_5-devel +BuildRequires: -db-devel +BuildRequires: libdb-4_5-devel %endif -Group: Productivity/Networking/LDAP/Clients Conflicts: openldap Requires: libldap-2_4-2 = %{version} PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep -Summary: The OpenLDAP commandline client tools -%else +Summary: The OpenLDAP Server Group: Productivity/Networking/LDAP/Clients +%else Conflicts: openldap-client Requires: libldap-2_4-2 = %{version} Summary: The OpenLDAP commandline client tools +Group: Productivity/Networking/LDAP/Clients %endif Source: openldap-%{version}.tgz Source1: openldap-rc.tgz @@ -60,8 +67,6 @@ Patch5: 0005-pie-compile.dif Patch6: 0006-No-Build-date-and-time-in-binaries.dif Patch7: 0007-Recover-on-DB-version-change.dif -Patch8: 0008-syncrepl-fixes-post-2.4.29.dif -Patch9: 0009-ITS-7167-only-poll-sockets-for-write-as-needed.dif Patch100: openldap-2.3.37.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "openldap2" @@ -72,12 +77,11 @@ access a stand-alone LDAP directory service or to access a directory service that has an X.500 back-end. -This package contains the OpenLDAP client utilities. - %package -n openldap2-back-perl Summary: OpenLDAP Perl Back-End -Requires: openldap2 = %{version} perl = %{perl_version} Group: Productivity/Networking/LDAP/Servers +Requires: openldap2 = %{version} +Requires: perl = %{perl_version} %description -n openldap2-back-perl The OpenLDAP Perl back-end allows you to execute Perl code specific to @@ -85,8 +89,8 @@ %package -n openldap2-back-meta Summary: OpenLDAP Meta Back-End -Requires: openldap2 = %{version} Group: Productivity/Networking/LDAP/Servers +Requires: openldap2 = %{version} Provides: openldap2:/usr/share/man/man5/slapd-meta.5.gz %description -n openldap2-back-meta @@ -97,8 +101,8 @@ %package -n openldap2-back-sql Summary: OpenLDAP SQL Back-End -Requires: openldap2 = %{version} Group: Productivity/Networking/LDAP/Servers +Requires: openldap2 = %{version} %description -n openldap2-back-sql The primary purpose of this OpenLDAP backend is to present information @@ -119,15 +123,11 @@ %else %description -The Lightweight Directory Access Protocol (LDAP) is used to access -online directory services. It runs directly over TCP and can be used to -access a stand-alone LDAP directory service or to access a directory -service that has an X.500 back-end. - This package contains the OpenLDAP client utilities. %package -n openldap2-devel Summary: Libraries, Header Files and Documentation for OpenLDAP +Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 Obsoletes: openldap2-devel-64bit @@ -135,11 +135,14 @@ # Conflicts: openldap-devel %if %suse_version >= 1110 -Requires: libldap-2_4-2 = %{version} cyrus-sasl-devel libopenssl-devel +Requires: cyrus-sasl-devel +Requires: libldap-2_4-2 = %{version} +Requires: libopenssl-devel %else -Requires: libldap-2_4-2 = %{version} cyrus-sasl-devel openssl-devel +Requires: cyrus-sasl-devel +Requires: libldap-2_4-2 = %{version} +Requires: openssl-devel %endif -Group: Development/Libraries/C and C++ %description -n openldap2-devel This package provides the OpenLDAP libraries, header files, and @@ -163,8 +166,6 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 -%patch9 -p1 cp %{SOURCE5} . cp %{SOURCE6} . cd ../openldap-2.3.37 ++++++ openldap2.spec ++++++ --- /var/tmp/diff_new_pack.4WTsKk/_old 2012-04-23 16:12:12.000000000 +0200 +++ /var/tmp/diff_new_pack.4WTsKk/_new 2012-04-23 16:12:12.000000000 +0200 @@ -15,34 +15,41 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%define run_test_suite 1 +%define run_test_suite 0 Name: openldap2 -BuildRequires: cyrus-sasl-devel libopenssl-devel libtool +License: OLDAP-2.8 +BuildRequires: cyrus-sasl-devel +BuildRequires: libopenssl-devel +BuildRequires: libtool %if %sles_version == 9 || %sles_version == 10 -BuildRequires: -libopenssl-devel -pwdutils openssl-devel +BuildRequires: -libopenssl-devel +BuildRequires: -pwdutils +BuildRequires: openssl-devel %endif -Version: 2.4.29 -Release: 1 +Version: 2.4.30 +Release: 0 Url: http://www.openldap.org -License: OLDAP-2.8 %if "%{name}" == "openldap2" -BuildRequires: db-devel openslp-devel tcpd-devel unixODBC-devel +BuildRequires: db-devel +BuildRequires: openslp-devel +BuildRequires: tcpd-devel +BuildRequires: unixODBC-devel %if %sles_version == 9 || %sles_version == 10 -BuildRequires: -db-devel libdb-4_5-devel +BuildRequires: -db-devel +BuildRequires: libdb-4_5-devel %endif -Group: Productivity/Networking/LDAP/Servers Conflicts: openldap Requires: libldap-2_4-2 = %{version} PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep Summary: The OpenLDAP Server -%else Group: Productivity/Networking/LDAP/Clients +%else Conflicts: openldap-client Requires: libldap-2_4-2 = %{version} Summary: The OpenLDAP commandline client tools +Group: Productivity/Networking/LDAP/Clients %endif Source: openldap-%{version}.tgz Source1: openldap-rc.tgz @@ -60,8 +67,6 @@ Patch5: 0005-pie-compile.dif Patch6: 0006-No-Build-date-and-time-in-binaries.dif Patch7: 0007-Recover-on-DB-version-change.dif -Patch8: 0008-syncrepl-fixes-post-2.4.29.dif -Patch9: 0009-ITS-7167-only-poll-sockets-for-write-as-needed.dif Patch100: openldap-2.3.37.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "openldap2" @@ -74,8 +79,9 @@ %package -n openldap2-back-perl Summary: OpenLDAP Perl Back-End -Requires: openldap2 = %{version} perl = %{perl_version} Group: Productivity/Networking/LDAP/Servers +Requires: openldap2 = %{version} +Requires: perl = %{perl_version} %description -n openldap2-back-perl The OpenLDAP Perl back-end allows you to execute Perl code specific to @@ -83,8 +89,8 @@ %package -n openldap2-back-meta Summary: OpenLDAP Meta Back-End -Requires: openldap2 = %{version} Group: Productivity/Networking/LDAP/Servers +Requires: openldap2 = %{version} Provides: openldap2:/usr/share/man/man5/slapd-meta.5.gz %description -n openldap2-back-meta @@ -95,8 +101,8 @@ %package -n openldap2-back-sql Summary: OpenLDAP SQL Back-End -Requires: openldap2 = %{version} Group: Productivity/Networking/LDAP/Servers +Requires: openldap2 = %{version} %description -n openldap2-back-sql The primary purpose of this OpenLDAP backend is to present information @@ -121,6 +127,7 @@ %package -n openldap2-devel Summary: Libraries, Header Files and Documentation for OpenLDAP +Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 Obsoletes: openldap2-devel-64bit @@ -128,11 +135,14 @@ # Conflicts: openldap-devel %if %suse_version >= 1110 -Requires: libldap-2_4-2 = %{version} cyrus-sasl-devel libopenssl-devel +Requires: cyrus-sasl-devel +Requires: libldap-2_4-2 = %{version} +Requires: libopenssl-devel %else -Requires: libldap-2_4-2 = %{version} cyrus-sasl-devel openssl-devel +Requires: cyrus-sasl-devel +Requires: libldap-2_4-2 = %{version} +Requires: openssl-devel %endif -Group: Development/Libraries/C and C++ %description -n openldap2-devel This package provides the OpenLDAP libraries, header files, and @@ -156,8 +166,6 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 -%patch9 -p1 cp %{SOURCE5} . cp %{SOURCE6} . cd ../openldap-2.3.37 ++++++ 0001-build-adjustments.dif ++++++ --- /var/tmp/diff_new_pack.4WTsKk/_old 2012-04-23 16:12:12.000000000 +0200 +++ /var/tmp/diff_new_pack.4WTsKk/_new 2012-04-23 16:12:12.000000000 +0200 @@ -1,4 +1,4 @@ -From e5b00828fc947aea5c6498ffffd4bfc29540c159 Mon Sep 17 00:00:00 2001 +From 2d683e4526fb4a2fe51c2db1ca9c3bf58a5b9108 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Wed, 16 Jun 2010 14:04:07 +0200 Subject: build-adjustments ++++++ 0002-slapd.conf.dif ++++++ --- /var/tmp/diff_new_pack.4WTsKk/_old 2012-04-23 16:12:12.000000000 +0200 +++ /var/tmp/diff_new_pack.4WTsKk/_new 2012-04-23 16:12:12.000000000 +0200 @@ -1,4 +1,4 @@ -From e5dae6859ae9179c636531c94d1f86ba8821d4cc Mon Sep 17 00:00:00 2001 +From 3f6123db04734be9a355295db5163d6f61a60192 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Wed, 16 Jun 2010 14:05:49 +0200 Subject: slapd.conf ++++++ 0003-LDAPI-socket-location.dif ++++++ --- /var/tmp/diff_new_pack.4WTsKk/_old 2012-04-23 16:12:12.000000000 +0200 +++ /var/tmp/diff_new_pack.4WTsKk/_new 2012-04-23 16:12:12.000000000 +0200 @@ -1,4 +1,4 @@ -From 530f1d6f5af77523f041657021d49b177863861d Mon Sep 17 00:00:00 2001 +From 7dc48b5f81a7bccbffb64ce63d4af5b7cb220d71 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Wed, 16 Jun 2010 14:06:42 +0200 Subject: LDAPI socket location ++++++ 0004-libldap-use-gethostbyname_r.dif ++++++ --- /var/tmp/diff_new_pack.4WTsKk/_old 2012-04-23 16:12:12.000000000 +0200 +++ /var/tmp/diff_new_pack.4WTsKk/_new 2012-04-23 16:12:12.000000000 +0200 @@ -1,4 +1,4 @@ -From 3f733c7f1da53e613cf6d20f3886a679614a2d26 Mon Sep 17 00:00:00 2001 +From dbfd2d98e54c66bce8088c75a7f72c0436b83ae3 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Wed, 16 Jun 2010 14:08:03 +0200 Subject: libldap use gethostbyname_r ++++++ 0005-pie-compile.dif ++++++ --- /var/tmp/diff_new_pack.4WTsKk/_old 2012-04-23 16:12:12.000000000 +0200 +++ /var/tmp/diff_new_pack.4WTsKk/_new 2012-04-23 16:12:12.000000000 +0200 @@ -1,4 +1,4 @@ -From a40157559d5dc1658787d1cbbf5fa33a30d98880 Mon Sep 17 00:00:00 2001 +From fe4ee325a152e76be54786b4d25bad4e4f3f777e Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Fri, 12 Nov 2010 09:39:11 +0100 Subject: pie compile ++++++ 0006-No-Build-date-and-time-in-binaries.dif ++++++ --- /var/tmp/diff_new_pack.4WTsKk/_old 2012-04-23 16:12:12.000000000 +0200 +++ /var/tmp/diff_new_pack.4WTsKk/_new 2012-04-23 16:12:12.000000000 +0200 @@ -1,4 +1,4 @@ -From a994bf2d5f145d52ce7351468b4b897a4f65d3a4 Mon Sep 17 00:00:00 2001 +From 8cc8d5cf3ee9959c506449e0a0410c56d7e86693 Mon Sep 17 00:00:00 2001 From: Cristian Rodriguez <cristian.rodriguez(a)opensuse.org> Date: Tue, 5 Oct 2010 13:59:40 +0200 Subject: No Build date and time in binaries ++++++ 0007-Recover-on-DB-version-change.dif ++++++ --- /var/tmp/diff_new_pack.4WTsKk/_old 2012-04-23 16:12:12.000000000 +0200 +++ /var/tmp/diff_new_pack.4WTsKk/_new 2012-04-23 16:12:12.000000000 +0200 @@ -1,4 +1,4 @@ -From ab9cfed7b0f7b77b9715ec01a267b523a12c63d0 Mon Sep 17 00:00:00 2001 +From ee929a83889bde9c657ccfce72880982a7f00d44 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Tue, 5 Oct 2010 14:20:22 +0200 Subject: Recover on DB version change ++++++ openldap-2.4.29.tgz -> openldap-2.4.30.tgz ++++++ ++++ 2511 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaThunderbird for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:Factory checked in at 2012-04-23 16:11:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaThunderbird (Old) and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaThunderbird", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaThunderbird/MozillaThunderbird.changes 2012-04-03 09:19:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/MozillaThunderbird.changes 2012-04-23 16:11:56.000000000 +0200 @@ -1,0 +2,12 @@ +Sat Apr 21 07:39:28 UTC 2012 - wr(a)rosenauer.org + +- update to Thunderbird 12.0 (bnc#758408) +- update Enigmail to 1.4.1 +- added mozilla-revert_621446.patch +- added mozilla-libnotify.patch (bmo#737646) +- added mailnew-showalert.patch (bmo#739146) +- added mozilla-gcc47.patch and mailnews-literals.patch to fix + compilation issues with recent gcc 4.7 +- disabled crashreporter temporarily for Factory (gcc 4.7 issue) + +------------------------------------------------------------------- Old: ---- enigmail-1.4.tar.gz l10n-11.0.1.tar.bz2 thunderbird-11.0.1-source.tar.bz2 New: ---- enigmail-1.4.1.tar.gz l10n-12.0.tar.bz2 mailnews-literals.patch mailnews-showalert.patch mozilla-gcc47.patch mozilla-libnotify.patch mozilla-revert_621446.patch thunderbird-12.0-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ --- /var/tmp/diff_new_pack.RIrq5H/_old 2012-04-23 16:12:09.000000000 +0200 +++ /var/tmp/diff_new_pack.RIrq5H/_new 2012-04-23 16:12:09.000000000 +0200 @@ -40,10 +40,11 @@ BuildRequires: xorg-x11-libXt-devel BuildRequires: yasm BuildRequires: zip -%define mainversion 11.0.1 +%define mainversion 12.0 +%define update_channel release Version: %{mainversion} Release: 0 -%define releasedate 2012032800 +%define releasedate 2012042100 Provides: thunderbird = %{version} %if %{with_kde} # this is needed to match this package with the kde4 helper package without the main package @@ -64,7 +65,7 @@ Source6: suse-default-prefs.js Source7: find-external-requires.sh Source8: thunderbird-rpmlintrc -Source9: enigmail-1.4.tar.gz +Source9: enigmail-1.4.1.tar.gz Source10: create-tar.sh Source11: compare-locales.tar.bz2 Source12: kde.js @@ -76,12 +77,18 @@ Patch5: mozilla-disable-neon-option.patch Patch6: mozilla-nongnome-proxies.patch Patch7: mozilla-kde.patch +Patch8: mozilla-libnotify.patch +Patch9: mozilla-revert_621446.patch +Patch10: mozilla-gcc47.patch # Thunderbird/mail -Patch10: tb-ssldap.patch -Patch11: tb-develdirs.patch -Patch12: thunderbird-shared-nss-db.patch +Patch20: tb-ssldap.patch +Patch21: tb-develdirs.patch +Patch22: thunderbird-shared-nss-db.patch +Patch23: mailnews-showalert.patch +Patch24: mailnews-literals.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils fileutils textutils /bin/sh +Recommends: libcanberra0 ### build options %define build_enigmail 1 %ifnarch ppc ppc64 @@ -89,6 +96,10 @@ %else %define crashreporter 0 %endif +# temporary (gcc 4.7) +%if %suse_version > 1210 +%define crashreporter 0 +%endif %define has_system_cairo 0 %define localize 1 ### build options end @@ -168,7 +179,7 @@ %if %build_enigmail %package -n enigmail -Version: 1.4.0+%{mainversion} +Version: 1.4.1+%{mainversion} Release: 0 Summary: OpenPGP addon for Thunderbird and SeaMonkey License: MPL-1.1 or GPL-2.0+ @@ -203,11 +214,16 @@ %if %{with_kde} %patch7 -p1 %endif +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 popd # comm-central patches -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 %build # no need to add build time to binaries @@ -260,6 +276,7 @@ ac_add_options --enable-startup-notification ac_add_options --enable-official-branding ac_add_options --disable-necko-wifi +ac_add_options --enable-update-channel=%{update_channel} EOF %if %suse_version > 1130 cat << EOF >> $MOZCONFIG @@ -511,7 +528,7 @@ %{progdir}/application.ini %{progdir}/blocklist.xml %{progdir}/chrome.manifest -#%{progdir}/distribution/ +%{progdir}/distribution/ %{progdir}/*.so %{progdir}/mozilla-xremote-client %{progdir}/omni.ja ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.RIrq5H/_old 2012-04-23 16:12:09.000000000 +0200 +++ /var/tmp/diff_new_pack.RIrq5H/_new 2012-04-23 16:12:09.000000000 +0200 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/comm-$CHANNEL" -RELEASE_TAG="THUNDERBIRD_11_0_1_RELEASE" -VERSION="11.0.1" +RELEASE_TAG="THUNDERBIRD_12_0_RELEASE" +VERSION="12.0" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH thunderbird ++++++ enigmail-1.4.tar.gz -> enigmail-1.4.1.tar.gz ++++++ ++++ 18902 lines of diff (skipped) ++++++ l10n-11.0.1.tar.bz2 -> l10n-12.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaThunderbird/l10n-11.0.1.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/l10n-12.0.tar.bz2 differ: char 11, line 1 ++++++ mailnews-literals.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent 879e8d044e364396b63af59b3cdc4252fb2ae29a Bug 733867 - Build failure with gcc-4.7.0rc1: "nsMsgFolderCompactor.cpp ... error: unable to find string literal operator ‘operator"" ..." (TM: COMM13) diff --git a/mailnews/base/search/src/nsMsgSearchAdapter.cpp b/mailnews/base/search/src/nsMsgSearchAdapter.cpp --- a/mailnews/base/search/src/nsMsgSearchAdapter.cpp +++ b/mailnews/base/search/src/nsMsgSearchAdapter.cpp @@ -683,17 +683,17 @@ nsresult nsMsgSearchAdapter::EncodeImapV } if (!NS_IsAscii(value)) { nsCAutoString lengthStr; PL_strcat(encoding, "{"); lengthStr.AppendInt((PRInt32) strlen(value)); PL_strcat(encoding, lengthStr.get()); - PL_strcat(encoding, "}"CRLF); + PL_strcat(encoding, "}" CRLF); PL_strcat(encoding, value); return NS_OK; } if (useQuotes) PL_strcat(encoding, "\""); PL_strcat (encoding, value); if (useQuotes) PL_strcat(encoding, "\""); diff --git a/mailnews/base/src/nsMsgFolderCompactor.cpp b/mailnews/base/src/nsMsgFolderCompactor.cpp --- a/mailnews/base/src/nsMsgFolderCompactor.cpp +++ b/mailnews/base/src/nsMsgFolderCompactor.cpp @@ -753,17 +753,17 @@ nsFolderCompactState::OnDataAvailable(ns m_folder->GetMsgDatabase(getter_AddRefs(srcDB)); if (srcDB) { srcDB->SetSummaryValid(false); srcDB->ForceClosed(); } } } -#define EXTRA_KEYWORD_HDR " "MSG_LINEBREAK +#define EXTRA_KEYWORD_HDR " " MSG_LINEBREAK // if status offset isn't in the first block, this code won't work. There's no good reason // for the status offset not to be at the beginning of the message anyway. if (addKeywordHdr) { // if blockOffset is set, we added x-mozilla-status headers so // file pointer is already past them. if (!blockOffset) diff --git a/mailnews/compose/src/nsMsgAppleEncode.cpp b/mailnews/compose/src/nsMsgAppleEncode.cpp --- a/mailnews/compose/src/nsMsgAppleEncode.cpp +++ b/mailnews/compose/src/nsMsgAppleEncode.cpp @@ -133,17 +133,17 @@ int fill_apple_mime_header( strlen(p_ap_encode_obj->fname)); if (status != noErr) return status; PR_snprintf(tmpstr, sizeof(tmpstr), "\"\r\nContent-Disposition: inline; filename=\"%s\"\r\n\r\n\r\n--=\r\n", p_ap_encode_obj->fname); #endif /* 0 */ - PR_snprintf(tmpstr, sizeof(tmpstr), "--%s"CRLF, p_ap_encode_obj->boundary); + PR_snprintf(tmpstr, sizeof(tmpstr), "--%s" CRLF, p_ap_encode_obj->boundary); status = write_stream(p_ap_encode_obj, tmpstr, strlen(tmpstr)); return status; } int ap_encode_file_infor( appledouble_encode_object *p_ap_encode_obj) @@ -374,17 +374,17 @@ int ap_encode_header( status = finish64(p_ap_encode_obj); if (status != noErr) return status; /* ** write out the boundary */ PR_snprintf(rd_buff, sizeof(rd_buff), - CRLF"--%s"CRLF, + CRLF"--%s" CRLF, p_ap_encode_obj->boundary); status = write_stream(p_ap_encode_obj, rd_buff, strlen(rd_buff)); if (status == noErr) status = errDone; } @@ -515,17 +515,17 @@ int ap_encode_data( } /* ** the data portion header information. */ nsCAutoString leafName; resFile->GetNativeLeafName(leafName); PR_snprintf(rd_buff, sizeof(rd_buff), - "Content-Type: %s; name=\"%s\"" CRLF "Content-Transfer-Encoding: base64" CRLF "Content-Disposition: inline; filename=\"%s\""CRLF CRLF, + "Content-Type: %s; name=\"%s\"" CRLF "Content-Transfer-Encoding: base64" CRLF "Content-Disposition: inline; filename=\"%s\"" CRLF CRLF, magic_type, leafName.get(), leafName.get()); status = write_stream(p_ap_encode_obj, rd_buff, strlen(rd_buff)); if (status != noErr) @@ -558,17 +558,17 @@ int ap_encode_data( status = finish64(p_ap_encode_obj); if (status != noErr) return status; /* write out the boundary */ PR_snprintf(rd_buff, sizeof(rd_buff), - CRLF"--%s--"CRLF CRLF, + CRLF"--%s--" CRLF CRLF, p_ap_encode_obj->boundary); status = write_stream(p_ap_encode_obj, rd_buff, strlen(rd_buff)); if (status == noErr) status = errDone; diff --git a/mailnews/compose/src/nsSmtpProtocol.cpp b/mailnews/compose/src/nsSmtpProtocol.cpp --- a/mailnews/compose/src/nsSmtpProtocol.cpp +++ b/mailnews/compose/src/nsSmtpProtocol.cpp @@ -1717,17 +1717,17 @@ PRInt32 nsSmtpProtocol::SendMessageRespo /* else */ return SendQuit(); } PRInt32 nsSmtpProtocol::SendQuit() { m_sendDone = true; nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL); - SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server. + SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server. m_nextState = SMTP_RESPONSE; m_nextStateAfterResponse = SMTP_DONE; return(0); } nsresult nsSmtpProtocol::LoadUrl(nsIURI * aURL, nsISupports * aConsumer ) { if (!aURL) @@ -1964,17 +1964,17 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI /* check for errors during load and call error * state if found */ if(status < 0 && m_nextState != SMTP_FREE) { nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL); // send a quit command to close the connection with the server. - if (SendData(url, "QUIT"CRLF) == NS_OK) + if (SendData(url, "QUIT" CRLF) == NS_OK) { m_nextState = SMTP_RESPONSE; m_nextStateAfterResponse = SMTP_ERROR_DONE; } else { m_nextState = SMTP_ERROR_DONE; /* don't exit! loop around again and do the free case */ diff --git a/mailnews/imap/src/nsImapMailFolder.cpp b/mailnews/imap/src/nsImapMailFolder.cpp --- a/mailnews/imap/src/nsImapMailFolder.cpp +++ b/mailnews/imap/src/nsImapMailFolder.cpp @@ -8304,17 +8304,17 @@ nsImapMailFolder::CopyFileToOfflineStore srcFile->GetFileSize(&fileSize); PRUint32 bytesWritten; rv = NS_OK; msgParser->SetState(nsIMsgParseMailMsgState::ParseHeadersState); msgParser->SetNewMsgHdr(fakeHdr); bool needMoreData = false; char * newLine = nsnull; PRUint32 numBytesInLine = 0; - const char *envelope = "From "CRLF; + const char *envelope = "From " CRLF; offlineStore->Write(envelope, strlen(envelope), &bytesWritten); fileSize += bytesWritten; do { newLine = inputStreamBuffer->ReadNextLine(inputStream, numBytesInLine, needMoreData); if (newLine) { msgParser->ParseAFolderLine(newLine, numBytesInLine); diff --git a/mailnews/imap/src/nsImapProtocol.cpp b/mailnews/imap/src/nsImapProtocol.cpp --- a/mailnews/imap/src/nsImapProtocol.cpp +++ b/mailnews/imap/src/nsImapProtocol.cpp @@ -1404,17 +1404,17 @@ nsImapProtocol::ImapThreadMainLoop() PR_LOG(IMAP, PR_LOG_DEBUG, ("ImapThreadMainLoop leaving [this=%x]\n", this)); } void nsImapProtocol::HandleIdleResponses() { // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages(); nsCAutoString commandBuffer(GetServerCommandTag()); - commandBuffer.Append(" IDLE"CRLF); + commandBuffer.Append(" IDLE" CRLF); do { ParseIMAPandCheckForNewMail(commandBuffer.get()); } while (m_inputStreamBuffer->NextLineAvailable() && GetServerStateParser().Connected()); // if (oldRecent != GetServerStateParser().NumberOfRecentMessages()) @@ -3282,17 +3282,17 @@ void nsImapProtocol::FetchMsgAttribute(c { IncrementCommandTagNumber(); nsCAutoString commandString (GetServerCommandTag()); commandString.Append(" UID fetch "); commandString.Append(messageIds); commandString.Append(" ("); commandString.Append(attribute); - commandString.Append(")"CRLF); + commandString.Append(")" CRLF); nsresult rv = SendData(commandString.get()); if (NS_SUCCEEDED(rv)) ParseIMAPandCheckForNewMail(commandString.get()); GetServerStateParser().SetFetchingFlags(false); GetServerStateParser().SetFetchingEverythingRFC822(false); // always clear this flag after every fetch.... } @@ -5278,17 +5278,17 @@ nsImapProtocol::Expunge() delete search; if (key == 0) return; //no deleted messages to expunge (bug 235004) } } IncrementCommandTagNumber(); nsCAutoString command(GetServerCommandTag()); - command.Append(" expunge"CRLF); + command.Append(" expunge" CRLF); nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) ParseIMAPandCheckForNewMail(); } void nsImapProtocol::HandleMemoryFailure() @@ -5354,17 +5354,17 @@ void nsImapProtocol::ID() if (!gAppName[0]) return; IncrementCommandTagNumber(); nsCString command(GetServerCommandTag()); command.Append(" ID (\"name\" \""); command.Append(gAppName); command.Append("\" \"version\" \""); command.Append(gAppVersion); - command.Append("\")"CRLF); + command.Append("\")" CRLF); nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) ParseIMAPandCheckForNewMail(); } void nsImapProtocol::EnableCondStore() { @@ -5811,17 +5811,17 @@ nsresult nsImapProtocol::AuthLogin(const command.Append(escapedUserName); command.Append("\" \""); // if the password contains a \, login will fail // turn foo\bar into foo\\bar nsCAutoString correctedPassword; EscapeUserNamePasswordString(password.get(), &correctedPassword); command.Append(correctedPassword); - command.Append("\""CRLF); + command.Append("\"" CRLF); rv = SendData(command.get(), true /* suppress logging */); NS_ENSURE_SUCCESS(rv, rv); ParseIMAPandCheckForNewMail(); } else if (flag & kHasAuthNoneCapability) { // TODO What to do? "login <username>" like POP? return NS_ERROR_NOT_IMPLEMENTED; @@ -7442,17 +7442,17 @@ void nsImapProtocol::CreateMailbox(const IncrementCommandTagNumber(); nsCString escapedName; CreateEscapedMailboxName(mailboxName, escapedName); nsCString command(GetServerCommandTag()); command += " create \""; command += escapedName; - command += "\""CRLF; + command += "\"" CRLF; nsresult rv = SendData(command.get()); if(NS_SUCCEEDED(rv)) ParseIMAPandCheckForNewMail(); // If that failed, let's list the parent folder to see if // it allows inferiors, so we won't try to create sub-folders // of the parent folder again in the current session. if (GetServerStateParser().CommandFailed()) @@ -7545,17 +7545,17 @@ void nsImapProtocol::Lsub(const char *ma nsCString escapedPattern; CreateEscapedMailboxName(boxnameWithOnlineDirectory ? boxnameWithOnlineDirectory : mailboxPattern, escapedPattern); nsCString command (GetServerCommandTag()); command += " lsub \"\" \""; command += escapedPattern; - command += "\""CRLF; + command += "\"" CRLF; PR_Free(boxnameWithOnlineDirectory); nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) ParseIMAPandCheckForNewMail(); } @@ -7574,17 +7574,17 @@ void nsImapProtocol::List(const char *ma CreateEscapedMailboxName(boxnameWithOnlineDirectory ? boxnameWithOnlineDirectory : mailboxPattern, escapedPattern); nsCString command (GetServerCommandTag()); command += useXLIST ? " xlist \"\" \"" : " list \"\" \""; command += escapedPattern; - command += "\""CRLF; + command += "\"" CRLF; PR_Free(boxnameWithOnlineDirectory); nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) ParseIMAPandCheckForNewMail(command.get(), true); } @@ -7595,17 +7595,17 @@ void nsImapProtocol::Subscribe(const cha IncrementCommandTagNumber(); nsCString escapedName; CreateEscapedMailboxName(mailboxName, escapedName); nsCString command (GetServerCommandTag()); command += " subscribe \""; command += escapedName; - command += "\""CRLF; + command += "\"" CRLF; nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) ParseIMAPandCheckForNewMail(); } void nsImapProtocol::Unsubscribe(const char *mailboxName) { @@ -7613,31 +7613,31 @@ void nsImapProtocol::Unsubscribe(const c IncrementCommandTagNumber(); nsCString escapedName; CreateEscapedMailboxName(mailboxName, escapedName); nsCString command (GetServerCommandTag()); command += " unsubscribe \""; command += escapedName; - command += "\""CRLF; + command += "\"" CRLF; nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) ParseIMAPandCheckForNewMail(); } void nsImapProtocol::Idle() { IncrementCommandTagNumber(); if (m_urlInProgress) return; nsCAutoString command (GetServerCommandTag()); - command += " IDLE"CRLF; + command += " IDLE" CRLF; nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) { m_idle = true; // we'll just get back a continuation char at first. // + idling... ParseIMAPandCheckForNewMail(); // this will cause us to get notified of data or the socket getting closed. @@ -7654,17 +7654,17 @@ void nsImapProtocol::Idle() // responses, we need to not wait for the server response // on shutdown. void nsImapProtocol::EndIdle(bool waitForResponse /* = true */) { // clear the async wait - otherwise, we seem to have trouble doing a blocking read nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream); if (asyncInputStream) asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull); - nsresult rv = SendData("DONE"CRLF); + nsresult rv = SendData("DONE" CRLF); // set a short timeout if we don't want to wait for a response if (m_transport && !waitForResponse) m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5); if (NS_SUCCEEDED(rv)) { m_idle = false; ParseIMAPandCheckForNewMail(); } @@ -7723,18 +7723,18 @@ void nsImapProtocol::Copy(const char * m nsTArray<nsMsgKey> msgKeys; if (idsAreUid) ParseUidString(messageList, msgKeys); PRInt32 msgCountLeft = msgKeys.Length(); PRUint32 msgsHandled = 0; const char *formatString; formatString = (idsAreUid) - ? "%s uid store %s %s"CRLF - : "%s store %s %s"CRLF; + ? "%s uid store %s %s" CRLF + : "%s store %s %s" CRLF; do { nsCString idString; PRUint32 msgsToHandle = msgCountLeft; if (idsAreUid) AllocateImapUidString(msgKeys.Elements() + msgsHandled, msgsToHandle, m_flagState, idString); diff --git a/mailnews/imap/src/nsImapServerResponseParser.cpp b/mailnews/imap/src/nsImapServerResponseParser.cpp --- a/mailnews/imap/src/nsImapServerResponseParser.cpp +++ b/mailnews/imap/src/nsImapServerResponseParser.cpp @@ -180,17 +180,17 @@ void nsImapServerResponseParser::Initial // continue-req = "+" SP (resp-text / base64) CRLF void nsImapServerResponseParser::ParseIMAPServerResponse(const char *aCurrentCommand, bool aIgnoreBadAndNOResponses, char *aGreetingWithCapability) { NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' && *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string"); - bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF); + bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF); if (sendingIdleDone) fWaitingForMoreClientInput = false; // Reinitialize the parser SetConnected(true); SetSyntaxError(false); // Reinitialize our state diff --git a/mailnews/local/src/nsPop3Protocol.cpp b/mailnews/local/src/nsPop3Protocol.cpp --- a/mailnews/local/src/nsPop3Protocol.cpp +++ b/mailnews/local/src/nsPop3Protocol.cpp @@ -2478,17 +2478,17 @@ PRInt32 nsPop3Protocol::SendList() m_pop3ConData->msg_info = (Pop3MsgInfo *) PR_CALLOC(sizeof(Pop3MsgInfo) * m_pop3ConData->number_of_messages); if (!m_pop3ConData->msg_info) return(MK_OUT_OF_MEMORY); m_pop3ConData->next_state_after_response = POP3_GET_LIST; m_listpos = 0; - return SendData(m_url, "LIST"CRLF); + return SendData(m_url, "LIST" CRLF); } PRInt32 nsPop3Protocol::GetList(nsIInputStream* inputStream, PRUint32 length) { diff --git a/mailnews/mime/src/mimedrft.cpp b/mailnews/mime/src/mimedrft.cpp --- a/mailnews/mime/src/mimedrft.cpp +++ b/mailnews/mime/src/mimedrft.cpp @@ -1468,17 +1468,17 @@ mime_parse_stream_complete (nsMIMESessio //+13 chars for <pre> & </pre> tags and CRLF PRUint32 newbodylen = bodyLen + 14; char* newbody = (char *)PR_MALLOC (newbodylen); if (newbody) { *newbody = 0; PL_strcatn(newbody, newbodylen, "<PRE>"); PL_strcatn(newbody, newbodylen, body); - PL_strcatn(newbody, newbodylen, "</PRE>"CRLF); + PL_strcatn(newbody, newbodylen, "</PRE>" CRLF); PR_Free(body); body = newbody; } } // Body is now HTML, set the format too (so headers are inserted in // correct format). composeFormat = nsIMsgCompFormat::HTML; } diff --git a/mailnews/mime/src/mimemult.cpp b/mailnews/mime/src/mimemult.cpp --- a/mailnews/mime/src/mimemult.cpp +++ b/mailnews/mime/src/mimemult.cpp @@ -275,44 +275,44 @@ MimeMultipart_parse_line (const char *li { MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Type: ")); MimeWriteAString(obj, nsDependentCString(contentType)); PR_Free(contentType); } MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK)); MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\"")); MimeWriteAString(obj, fileName); - MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK)); + MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK)); MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: ")); MimeWriteAString(obj, obj->options->state->detachedFilePath); MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK)); MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-Altered: AttachmentDetached; date=\"")); } else { nsCAutoString header("Content-Type: text/x-moz-deleted; name=\"Deleted: "); header.Append(fileName); status = MimeWriteAString(obj, header); - if (status < 0) + if (status < 0) return status; - status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK)); + status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK)); MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: ")); MimeWriteAString(obj, fileName); - MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\"")); + MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\"")); } nsCString result; char timeBuffer[128]; PRExplodedTime now; PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now); PR_FormatTimeUSEnglish(timeBuffer, sizeof(timeBuffer), "%a %b %d %H:%M:%S %Y", &now); MimeWriteAString(obj, nsDependentCString(timeBuffer)); - MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK)); - MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK)); + MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK)); + MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK)); MimeHeaders_write_raw_headers(mult->hdrs, obj->options, false); } PRInt32 old_nchildren = container->nchildren; status = ((MimeMultipartClass *) obj->clazz)->create_child(obj); if (status < 0) return status; NS_ASSERTION(mult->state != MimeMultipartHeaders, "mult->state shouldn't be MimeMultipartHeaders"); diff --git a/mailnews/news/src/nsNntpIncomingServer.cpp b/mailnews/news/src/nsNntpIncomingServer.cpp --- a/mailnews/news/src/nsNntpIncomingServer.cpp +++ b/mailnews/news/src/nsNntpIncomingServer.cpp @@ -860,17 +860,17 @@ nsNntpIncomingServer::WriteHostInfoFile( dateStr.AppendInt(mLastUpdatedTime); WriteLine(hostInfoStream, dateStr); dateStr ="firstnewdate="; dateStr.AppendInt(firstnewdate); WriteLine(hostInfoStream, dateStr); dateStr = "uniqueid="; dateStr.AppendInt(mUniqueId); WriteLine(hostInfoStream, dateStr); - header.Assign(MSG_LINEBREAK"begingroups"); + header.Assign(MSG_LINEBREAK "begingroups"); WriteLine(hostInfoStream, header); // XXX todo, sort groups first? PRUint32 length = mGroupsOnServer.Length(); for (PRUint32 i = 0; i < length; ++i) { PRUint32 bytesWritten; hostInfoStream->Write(mGroupsOnServer[i].get(), mGroupsOnServer[i].Length(), ++++++ mailnews-showalert.patch ++++++ # HG changeset patch # Parent 7aff84f58a8fd64d2bf34fe386e97f173f2562f3 diff --git a/mailnews/base/src/nsMessengerUnixIntegration.cpp b/mailnews/base/src/nsMessengerUnixIntegration.cpp --- a/mailnews/base/src/nsMessengerUnixIntegration.cpp +++ b/mailnews/base/src/nsMessengerUnixIntegration.cpp @@ -378,47 +378,46 @@ nsresult nsMessengerUnixIntegration::Sho nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); NS_ENSURE_SUCCESS(rv, rv); bool showAlert = true; prefBranch->GetBoolPref(SHOW_ALERT_PREF, &showAlert); if (showAlert) { + mAlertInProgress = true; #ifdef MOZ_THUNDERBIRD nsCOMPtr<nsIAlertsService> alertsService(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv)) { - mAlertInProgress = true; rv = alertsService->ShowAlertNotification(NS_LITERAL_STRING(NEW_MAIL_ALERT_ICON), aAlertTitle, aAlertText, false, NS_ConvertASCIItoUTF16(aFolderURI), this, EmptyString()); if (NS_SUCCEEDED(rv)) return rv; } AlertFinished(); - ShowNewAlertNotification(false); + rv = ShowNewAlertNotification(false); #else nsCOMPtr<nsIAlertsService> alertsService (do_GetService(NS_ALERTSERVICE_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv)) { rv = alertsService->ShowAlertNotification(NS_LITERAL_STRING(NEW_MAIL_ALERT_ICON), aAlertTitle, aAlertText, true, NS_ConvertASCIItoUTF16(aFolderURI), this, EmptyString()); - mAlertInProgress = true; } #endif } - if (!showAlert || NS_FAILED(rv)) // go straight to showing the system tray icon. + if (NS_FAILED(rv)) // go straight to showing the system tray icon. AlertFinished(); return rv; } #ifdef MOZ_THUNDERBIRD // Opening Thunderbird's new mail alert notification window for not supporting libnotify // aUserInitiated --> true if we are opening the alert notification in response to a user action @@ -463,28 +462,25 @@ nsresult nsMessengerUnixIntegration::Sho nsCOMPtr<nsISupportsPRBool> scriptableUserInitiated (do_CreateInstance(NS_SUPPORTS_PRBOOL_CONTRACTID, &rv)); NS_ENSURE_SUCCESS(rv, rv); scriptableUserInitiated->SetData(aUserInitiated); argsArray->AppendElement(scriptableUserInitiated, false); nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID)); nsCOMPtr<nsIDOMWindow> newWindow; + mAlertInProgress = true; rv = wwatch->OpenWindow(0, ALERT_CHROME_URL, "_blank", "chrome,dialog=yes,titlebar=no,popup=yes", argsArray, getter_AddRefs(newWindow)); - mAlertInProgress = true; + if (NS_FAILED(rv)) + AlertFinished(); } - // if the user has turned off the mail alert, or openWindow generated an error, - // then go straight to the system tray. - if (!showAlert || NS_FAILED(rv)) - AlertFinished(); - return rv; } #endif nsresult nsMessengerUnixIntegration::AlertFinished() { mAlertInProgress = false; return NS_OK; ++++++ mozilla-gcc47.patch ++++++ # HG changeset patch # Parent debab900e37fdd4f8981c06beef6f193a04bd2b7 Patch to make Mozilla build with gcc 4.7, including - Bug 725655 - gcc 4.7 build failures (missing headers) (TM: Mozilla13) - Bug 734490 - "no viable overloaded 'PRIxPTR'" when building with Clang or GCC 4.7 (TM: Mozilla14) diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc --- a/ipc/chromium/src/base/file_util_linux.cc +++ b/ipc/chromium/src/base/file_util_linux.cc @@ -1,15 +1,18 @@ // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "base/file_util.h" #include <fcntl.h> +#if defined(ANDROID) || defined(OS_POSIX) +#include <unistd.h> +#endif #include <string> #include <vector> #include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/string_util.h" diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc --- a/ipc/chromium/src/base/message_pump_libevent.cc +++ b/ipc/chromium/src/base/message_pump_libevent.cc @@ -1,16 +1,19 @@ // Copyright (c) 2008 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "base/message_pump_libevent.h" #include <errno.h> #include <fcntl.h> +#if defined(ANDROID) || defined(OS_POSIX) +#include <unistd.h> +#endif #include "eintr_wrapper.h" #include "base/logging.h" #include "base/scoped_nsautorelease_pool.h" #include "base/scoped_ptr.h" #include "base/time.h" #include "third_party/libevent/event.h" diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc --- a/ipc/chromium/src/base/time_posix.cc +++ b/ipc/chromium/src/base/time_posix.cc @@ -8,16 +8,19 @@ #include <mach/mach_time.h> #endif #include <sys/time.h> #ifdef ANDROID #include <time64.h> #else #include <time.h> #endif +#if defined(ANDROID) || defined(OS_POSIX) +#include <unistd.h> +#endif #include <limits> #include "base/basictypes.h" #include "base/logging.h" namespace base { diff --git a/layout/base/tests/TestPoisonArea.cpp b/layout/base/tests/TestPoisonArea.cpp --- a/layout/base/tests/TestPoisonArea.cpp +++ b/layout/base/tests/TestPoisonArea.cpp @@ -392,53 +392,53 @@ ReservePoisonArea() { if (sizeof(uintptr_t) == 8) { // Use the hardware-inaccessible region. // We have to avoid 64-bit constants and shifts by 32 bits, since this // code is compiled in 32-bit mode, although it is never executed there. uintptr_t result = (((uintptr_t(0x7FFFFFFFu) << 31) << 1 | uintptr_t(0xF0DEAFFFu)) & ~uintptr_t(PAGESIZE-1)); - printf("INFO | poison area assumed at 0x%.*"PRIxPTR"\n", SIZxPTR, result); + printf("INFO | poison area assumed at 0x%.*" PRIxPTR "\n", SIZxPTR, result); return result; } else { // First see if we can allocate the preferred poison address from the OS. uintptr_t candidate = (0xF0DEAFFF & ~(PAGESIZE-1)); void *result = ReserveRegion(candidate, false); if (result == (void *)candidate) { // success - inaccessible page allocated - printf("INFO | poison area allocated at 0x%.*"PRIxPTR + printf("INFO | poison area allocated at 0x%.*" PRIxPTR " (preferred addr)\n", SIZxPTR, (uintptr_t)result); return candidate; } // That didn't work, so see if the preferred address is within a range // of permanently inacessible memory. if (ProbeRegion(candidate)) { // success - selected page cannot be usable memory if (result != MAP_FAILED) ReleaseRegion(result); - printf("INFO | poison area assumed at 0x%.*"PRIxPTR + printf("INFO | poison area assumed at 0x%.*" PRIxPTR " (preferred addr)\n", SIZxPTR, candidate); return candidate; } // The preferred address is already in use. Did the OS give us a // consolation prize? if (result != MAP_FAILED) { - printf("INFO | poison area allocated at 0x%.*"PRIxPTR + printf("INFO | poison area allocated at 0x%.*" PRIxPTR " (consolation prize)\n", SIZxPTR, (uintptr_t)result); return (uintptr_t)result; } // It didn't, so try to allocate again, without any constraint on // the address. result = ReserveRegion(0, false); if (result != MAP_FAILED) { - printf("INFO | poison area allocated at 0x%.*"PRIxPTR + printf("INFO | poison area allocated at 0x%.*" PRIxPTR " (fallback)\n", SIZxPTR, (uintptr_t)result); return (uintptr_t)result; } printf("ERROR | no usable poison area found\n"); return 0; } } @@ -450,17 +450,17 @@ static uintptr_t ReservePositiveControl() { void *result = ReserveRegion(0, false); if (result == MAP_FAILED) { printf("ERROR | allocating positive control | %s\n", LastErrMsg()); return 0; } - printf("INFO | positive control allocated at 0x%.*"PRIxPTR"\n", + printf("INFO | positive control allocated at 0x%.*" PRIxPTR "\n", SIZxPTR, (uintptr_t)result); return (uintptr_t)result; } /* The "negative control" area confirms that our probe logic does detect a * page that is readable, writable, or executable. */ static uintptr_t @@ -481,17 +481,17 @@ ReserveNegativeControl() // Now mark it executable as well as readable and writable. // (mmap(PROT_EXEC) may fail when applied to anonymous memory.) if (MakeRegionExecutable(result)) { printf("ERROR | making negative control executable | %s\n", LastErrMsg()); return 0; } - printf("INFO | negative control allocated at 0x%.*"PRIxPTR"\n", + printf("INFO | negative control allocated at 0x%.*" PRIxPTR "\n", SIZxPTR, (uintptr_t)result); return (uintptr_t)result; } static void JumpTo(uintptr_t opaddr) { #ifdef __ia64 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.RIrq5H/_old 2012-04-23 16:12:09.000000000 +0200 +++ /var/tmp/diff_new_pack.RIrq5H/_new 2012-04-23 16:12:09.000000000 +0200 @@ -3247,9 +3247,9 @@ #endif // Now look up our extensions -diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in ---- a/widget/src/gtk2/Makefile.in -+++ b/widget/src/gtk2/Makefile.in +diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in +--- a/widget/gtk2/Makefile.in ++++ b/widget/gtk2/Makefile.in @@ -135,11 +135,14 @@ DEFINES += -DCAIRO_GFX INCLUDES += \ @@ -3265,9 +3265,9 @@ ifdef MOZ_X11 INCLUDES += -I$(srcdir)/../shared/x11 endif -diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp ---- a/widget/src/gtk2/nsFilePicker.cpp -+++ b/widget/src/gtk2/nsFilePicker.cpp +diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp +--- a/widget/gtk2/nsFilePicker.cpp ++++ b/widget/gtk2/nsFilePicker.cpp @@ -33,16 +33,17 @@ * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. @@ -3580,9 +3580,9 @@ + } + return NS_OK; + } -diff --git a/widget/src/gtk2/nsFilePicker.h b/widget/src/gtk2/nsFilePicker.h ---- a/widget/src/gtk2/nsFilePicker.h -+++ b/widget/src/gtk2/nsFilePicker.h +diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h +--- a/widget/gtk2/nsFilePicker.h ++++ b/widget/gtk2/nsFilePicker.h @@ -89,11 +89,17 @@ protected: nsString mDefault; nsString mDefaultExtension; ++++++ mozilla-libnotify.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent c684863b1eb3bcae92ef24bc2ac511985b1ad7e4 Bug 737646 - no biff notification if notification-daemon not running diff --git a/toolkit/system/gnome/nsAlertsIconListener.cpp b/toolkit/system/gnome/nsAlertsIconListener.cpp --- a/toolkit/system/gnome/nsAlertsIconListener.cpp +++ b/toolkit/system/gnome/nsAlertsIconListener.cpp @@ -47,16 +47,17 @@ #include <gdk/gdk.h> // Compatibility macro for <libnotify-0.7 #ifndef NOTIFY_CHECK_VERSION #define NOTIFY_CHECK_VERSION(x,y,z) 0 #endif static bool gHasActions = false; +static bool gHasCaps = false; static void notify_action_cb(NotifyNotification *notification, gchar *action, gpointer user_data) { nsAlertsIconListener* alert = static_cast<nsAlertsIconListener*> (user_data); alert->SendCallback(); } @@ -338,27 +339,34 @@ nsAlertsIconListener::InitAlertAsync(con appShortName.AssignLiteral("Mozilla"); } if (!notify_init(appShortName.get())) return NS_ERROR_FAILURE; GList *server_caps = notify_get_server_caps(); if (server_caps) { + gHasCaps = true; for (GList* cap = server_caps; cap != NULL; cap = cap->next) { if (!strcmp((char*) cap->data, "actions")) { gHasActions = true; break; } } g_list_foreach(server_caps, (GFunc)g_free, NULL); g_list_free(server_caps); } } + if (!gHasCaps) { + // if notify_get_server_caps() failed above we need to assume + // there is no notification-server to display anything + return NS_ERROR_FAILURE; + } + if (!gHasActions && aAlertTextClickable) return NS_ERROR_FAILURE; // No good, fallback to XUL nsCOMPtr<nsIObserverService> obsServ = do_GetService("@mozilla.org/observer-service;1"); if (obsServ) obsServ->AddObserver(this, "quit-application", true); ++++++ mozilla-revert_621446.patch ++++++ # HG changeset patch # Parent 8da41a2cee774ce4d00b9ac1032a495b8bc560a0 Revert investigation patch for bmo#621446; as it is useless on desktop and breaks the build for certain compilers diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp --- a/netwerk/protocol/http/HttpChannelParent.cpp +++ b/netwerk/protocol/http/HttpChannelParent.cpp @@ -52,29 +52,25 @@ #include "nsIBadCertListener2.h" #include "nsICacheEntryDescriptor.h" #include "nsSerializationHelper.h" #include "nsISerializable.h" #include "nsIAssociatedContentSecurity.h" #include "nsIApplicationCacheService.h" #include "nsIOfflineCacheUpdate.h" #include "nsIRedirectChannelRegistrar.h" -#include "prinit.h" namespace mozilla { namespace net { HttpChannelParent::HttpChannelParent(PBrowserParent* iframeEmbedding) : mIPCClosed(false) , mStoredStatus(0) , mStoredProgress(0) , mStoredProgressMax(0) - , mSentRedirect1Begin(false) - , mSentRedirect1BeginFailed(false) - , mReceivedRedirect2Verify(false) { // Ensure gHttpHandler is initialized: we need the atom table up and running. nsIHttpProtocolHandler* handler; CallGetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &handler); NS_ASSERTION(handler, "no http handler"); mTabParent = do_QueryObject(static_cast<TabParent*>(iframeEmbedding)); } @@ -326,21 +322,16 @@ HttpChannelParent::RecvUpdateAssociatedC mAssociatedContentSecurity->SetCountSubRequestsHighSecurity(high); mAssociatedContentSecurity->SetCountSubRequestsLowSecurity(low); mAssociatedContentSecurity->SetCountSubRequestsBrokenSecurity(broken); mAssociatedContentSecurity->SetCountSubRequestsNoSecurity(no); } return true; } -// Bug 621446 investigation, we don't want conditional PR_Aborts bellow to be -// merged to a single address. -#pragma warning(disable : 4068) -#pragma GCC optimize ("O0") - bool HttpChannelParent::RecvRedirect2Verify(const nsresult& result, const RequestHeaderTuples& changedHeaders) { if (NS_SUCCEEDED(result)) { nsCOMPtr<nsIHttpChannel> newHttpChannel = do_QueryInterface(mRedirectChannel); @@ -348,40 +339,21 @@ HttpChannelParent::RecvRedirect2Verify(c for (PRUint32 i = 0; i < changedHeaders.Length(); i++) { newHttpChannel->SetRequestHeader(changedHeaders[i].mHeader, changedHeaders[i].mValue, changedHeaders[i].mMerge); } } } - if (!mRedirectCallback) { - // Bug 621446 investigation (optimization turned off above) - if (mReceivedRedirect2Verify) - NS_RUNTIMEABORT("Duplicate fire"); - if (mSentRedirect1BeginFailed) - NS_RUNTIMEABORT("Send to child failed"); - if (mSentRedirect1Begin && NS_FAILED(result)) - NS_RUNTIMEABORT("Redirect failed"); - if (mSentRedirect1Begin && NS_SUCCEEDED(result)) - NS_RUNTIMEABORT("Redirect succeeded"); - if (!mRedirectChannel) - NS_RUNTIMEABORT("Missing redirect channel"); - } - - mReceivedRedirect2Verify = true; - mRedirectCallback->OnRedirectVerifyCallback(result); mRedirectCallback = nsnull; return true; } -// Bug 621446 investigation -#pragma GCC reset_options - bool HttpChannelParent::RecvDocumentChannelCleanup() { // From now on only using mAssociatedContentSecurity. Free everything else. mChannel = 0; // Reclaim some memory sooner. mCacheDescriptor = 0; // Else we'll block other channels reading same URI return true; } @@ -583,24 +555,18 @@ HttpChannelParent::StartRedirect(PRUint3 nsHttpChannel *httpChan = static_cast<nsHttpChannel *>(mChannel.get()); nsHttpResponseHead *responseHead = httpChan->GetResponseHead(); bool result = SendRedirect1Begin(newChannelId, IPC::URI(newURI), redirectFlags, responseHead ? *responseHead : nsHttpResponseHead()); - if (!result) { - // Bug 621446 investigation - mSentRedirect1BeginFailed = true; + if (!result) return NS_BINDING_ABORTED; - } - - // Bug 621446 investigation - mSentRedirect1Begin = true; // Result is handled in RecvRedirect2Verify above mRedirectChannel = newChannel; mRedirectCallback = callback; return NS_OK; } diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h --- a/netwerk/protocol/http/HttpChannelParent.h +++ b/netwerk/protocol/http/HttpChannelParent.h @@ -128,18 +128,14 @@ private: nsCOMPtr<nsIChannel> mRedirectChannel; nsCOMPtr<nsIAsyncVerifyRedirectCallback> mRedirectCallback; // state for combining OnStatus/OnProgress with OnDataAvailable // into one IPDL call to child. nsresult mStoredStatus; PRUint64 mStoredProgress; PRUint64 mStoredProgressMax; - - bool mSentRedirect1Begin : 1; - bool mSentRedirect1BeginFailed : 1; - bool mReceivedRedirect2Verify : 1; }; } // namespace net } // namespace mozilla #endif // mozilla_net_HttpChannelParent_h ++++++ tb-develdirs.patch ++++++ --- /var/tmp/diff_new_pack.RIrq5H/_old 2012-04-23 16:12:09.000000000 +0200 +++ /var/tmp/diff_new_pack.RIrq5H/_new 2012-04-23 16:12:09.000000000 +0200 @@ -1,12 +1,8 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in +index bea1ca3..2de10c0 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -55,21 +55,21 @@ MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNA - MOZ_APP_VERSION = @MOZ_APP_VERSION@ - MOZ_MACBUNDLE_NAME= @MOZ_MACBUNDLE_NAME@ - - MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ - +@@ -61,11 +61,11 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ @@ -20,8 +16,3 @@ installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - - MOZDEPTH = $(DEPTH)/mozilla - DIST = $(MOZDEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ - ++++++ thunderbird-11.0.1-source.tar.bz2 -> thunderbird-12.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaThunderbird/thunderbird-11.0.1-source.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/thunderbird-12.0-source.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2012-04-23 16:11:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox", Maintainer is "bnc-team-mozilla(a)forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2012-03-16 13:19:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2012-04-23 16:11:42.000000000 +0200 @@ -1,0 +2,12 @@ +Sat Apr 21 10:02:37 UTC 2012 - wr(a)rosenauer.org + +- update to Firefox 12.0 (bnc#758408) + * rebased patches +- added mozilla-libnotify.patch to allow fallback from libnotify + to xul based events if no notification-daemon is running +- gcc 4.7 fixes + * mozilla-gcc47.patch + * disabled crashreporter temporarily for Factory +- recommend libcanberra0 for proper sound notifications + +------------------------------------------------------------------- Old: ---- firefox-11.0-source.tar.bz2 l10n-11.0.tar.bz2 mozilla-sle11-gcc.patch New: ---- firefox-12.0-source.tar.bz2 l10n-12.0.tar.bz2 mozilla-gcc47.patch mozilla-libnotify.patch mozilla-revert_621446.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -17,8 +17,9 @@ # -%define major 11 +%define major 12 %define mainver %major.0 +%define update_channel release Name: MozillaFirefox BuildRequires: Mesa-devel @@ -48,7 +49,7 @@ BuildRequires: nss-shared-helper-devel Version: %{mainver} Release: 0 -%define releasedate 2012031200 +%define releasedate 2012042100 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -90,7 +91,9 @@ Patch12: mozilla-linux3.patch Patch14: mozilla-disable-neon-option.patch Patch15: mozilla-yarr-pcre.patch -Patch16: mozilla-sle11-gcc.patch +Patch16: mozilla-revert_621446.patch +Patch17: mozilla-libnotify.patch +Patch18: mozilla-gcc47.patch # Firefox/browser Patch31: firefox-browser-css.patch Patch32: firefox-cross-desktop.patch @@ -105,6 +108,7 @@ Requires: %{name}-branding > 4.0 Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) +Recommends: libcanberra0 %define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE4} @@ -126,6 +130,10 @@ %else %define crashreporter 1 %endif +# temporary gcc 4.7 +%if %suse_version > 1210 +%define crashreporter 0 +%endif ### build options end %description @@ -160,7 +168,7 @@ %package translations-other Summary: Extra translations for MozillaFirefox Group: System/Localization -Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu) +Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu) Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -220,6 +228,8 @@ %patch14 -p1 #%patch15 -p1 %patch16 -p1 +%patch17 -p1 +%patch18 -p1 # %patch31 -p1 %patch32 -p1 @@ -282,7 +292,7 @@ ac_add_options --disable-debug ac_add_options --enable-startup-notification #ac_add_options --enable-chrome-format=jar -ac_add_options --enable-update-channel=release +ac_add_options --enable-update-channel=%{update_channel} EOF %if %suse_version > 1130 cat << EOF >> $MOZCONFIG @@ -320,6 +330,8 @@ export MOZ_SOURCE_STAMP=$REV export MOZ_SOURCE_REPO=$REPO make -C browser/installer STRIP=/bin/true +#DEBUG (break the build if searchplugins are missing / temporary) +grep amazondotcom dist/firefox/omni.ja # copy tree into RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{progdir} cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT%{progdir} @@ -354,8 +366,9 @@ make -C browser/locales langpack-$locale cp -rL dist/xpi-stage/locale-$locale \ $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale(a)firefox.mozilla.org - # remove prefs and profile defaults from langpack + # remove prefs, profile defaults, and hyphenation from langpack rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale(a)firefox.mozilla.org/defaults + rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale(a)firefox.mozilla.org/hyphenation # check against the fixed common list and sort into the right filelist _matched=0 for _match in ar ca cs da de en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do @@ -424,6 +437,7 @@ rm -f $RPM_BUILD_ROOT%{progdir}/precomplete rm -f $RPM_BUILD_ROOT%{progdir}/dictionaries/en-US* rm -f $RPM_BUILD_ROOT%{progdir}/firefox +rm -f $RPM_BUILD_ROOT%{progdir}/update-settings.ini # devel mkdir -p %{buildroot}%{_bindir} install -m 755 %SOURCE12 %{buildroot}%{_bindir} ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -2,10 +2,11 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_11_0_RELEASE" -VERSION="11.0" +RELEASE_TAG="FIREFOX_12_0_RELEASE" +VERSION="12.0" # mozilla +echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH mozilla pushd mozilla [ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG @@ -15,23 +16,28 @@ echo -n "REPO=" >> ../source-stamp.txt hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" >> ../source-stamp.txt popd +echo "creating archive..." tar cjf firefox-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS mozilla # l10n +echo "fetching locales..." test ! -d l10n && mkdir l10n for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do case $locale in ja-JP-mac|en-US) ;; *) + echo "fetching $locale ..." hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac done +echo "creating l10n archive..." tar cjf l10n-$VERSION.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg l10n # compare-locales +echo "creating compare-locales" hg clone http://hg.mozilla.org/build/compare-locales tar cjf compare-locales.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg compare-locales ++++++ firefox-11.0-source.tar.bz2 -> firefox-12.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-11.0-source.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-12.0-source.tar.bz2 differ: char 11, line 1 ++++++ firefox-branded-icons.patch ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent efffa19fa0b2530d2aca1ebd5b885a6fc68e51de +# Parent d6bb5c163142d233d00e739e21aa9df16077873e diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -169,16 +169,21 @@ endif # LIBXUL_SDK +@@ -164,16 +164,21 @@ endif # LIBXUL_SDK DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) @@ -54,14 +54,14 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -424,18 +424,21 @@ +@@ -432,18 +432,21 @@ + @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png #ifdef SHIP_FEEDBACK @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi #endif @BINPATH@/chrome/toolkit@JAREXT@ @BINPATH@/chrome/toolkit.manifest - #ifdef XP_UNIX - #ifndef XP_MACOSX + #ifdef MOZ_GTK2 @BINPATH@/chrome/icons/default/default16.png +@BINPATH@/chrome/icons/default/default22.png +@BINPATH@/chrome/icons/default/default24.png @@ -69,10 +69,10 @@ @BINPATH@/chrome/icons/default/default48.png +@BINPATH@/chrome/icons/default/default256.png #endif - #endif - ; shell icons #ifdef XP_UNIX #ifndef XP_MACOSX @BINPATH@/icons/*.xpm + @BINPATH@/icons/*.png + #endif ++++++ firefox-browser-css.patch ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -9,7 +9,7 @@ diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css --- a/browser/themes/gnomestripe/browser.css +++ b/browser/themes/gnomestripe/browser.css -@@ -1018,16 +1018,30 @@ toolbar[iconsize="small"] #feed-button { +@@ -1016,16 +1016,30 @@ toolbar[iconsize="small"] #feed-button { } #urlbar-display { @@ -36,7 +36,7 @@ #page-proxy-favicon { width: 16px; height: 16px; + margin: 2px 4px; } - #page-proxy-stack { - width: 24px; + #page-proxy-favicon:not([src]) { ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -2,7 +2,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1125 @@ +@@ -0,0 +1,1118 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -396,27 +396,27 @@ + <panel id="customizeToolbarSheetPopup" + noautohide="true"> + <iframe id="customizeToolbarSheetIFrame" -+ style="&dialog.style;" ++ style="&dialog.dimensions;" + hidden="true"/> + </panel> + + <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/> + + <tooltip id="back-button-tooltip"> -+ <label value="&backButton.tooltip;"/> ++ <label class="tooltip-label" value="&backButton.tooltip;"/> +#ifdef XP_MACOSX -+ <label value="&backForwardButtonMenuMac.tooltip;"/> ++ <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/> +#else -+ <label value="&backForwardButtonMenu.tooltip;"/> ++ <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> +#endif + </tooltip> + + <tooltip id="forward-button-tooltip"> -+ <label value="&forwardButton.tooltip;"/> ++ <label class="tooltip-label" value="&forwardButton.tooltip;"/> +#ifdef XP_MACOSX -+ <label value="&backForwardButtonMenuMac.tooltip;"/> ++ <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/> +#else -+ <label value="&backForwardButtonMenu.tooltip;"/> ++ <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> +#endif + </tooltip> + </popupset> @@ -449,9 +449,7 @@ + + <toolbox id="navigator-toolbox" + defaultmode="icons" mode="icons" -+ iconsize="large" -+ tabsontop="true" -+ persist="tabsontop"> ++ iconsize="large"> +  + <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true" + defaultset="menubar-items" @@ -509,7 +507,7 @@ + <textbox id="urlbar" flex="1" + placeholder="&urlbar.placeholder;" + type="autocomplete" -+ autocompletesearch="history" ++ autocompletesearch="urlinline history" + autocompletesearchparam="enable-actions" + autocompletepopup="PopupAutoCompleteRichResult" + completeselectedindex="true" @@ -541,12 +539,12 @@ + onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);" + ondragstart="gIdentityHandler.onDragStart(event);"> + <hbox id="identity-box-inner" align="center"> -+ <stack id="page-proxy-stack" -+ onclick="PageProxyClickHandler(event);"> ++ <hbox id="page-proxy-stack" ++ onclick="PageProxyClickHandler(event);"> + <image id="page-proxy-favicon" validate="never" + pageproxystate="invalid" + onerror="this.removeAttribute('src');"/> -+ </stack> ++ </hbox> + <hbox id="identity-icon-labels"> + <label id="identity-icon-label" class="plain" flex="1"/> + <label id="identity-icon-country-label" class="plain"/> @@ -1000,7 +998,6 @@ + hidden="true"> + <vbox flex="1"> + <resizer id="inspector-top-resizer" flex="1" -+ class="inspector-resizer" + dir="top" disabled="true" + element="inspector-tree-box"/> + <hbox> @@ -1021,8 +1018,8 @@ + <toolbarbutton id="inspector-3D-button" + class="devtools-toolbarbutton" + hidden="true" -+ label="&inspect3DButton.label;" -+ accesskey="&inspect3DButton.accesskey;" ++ label="&inspect3DViewButton.label;" ++ accesskey="&inspect3DViewButton.accesskey;" + command="Inspector:Tilt"/> + <toolbarbutton id="inspector-style-button" + class="devtools-toolbarbutton" @@ -1036,10 +1033,6 @@ + oncommand="InspectorUI.closeInspectorUI(false);" + tooltiptext="&inspectCloseButton.tooltiptext;"/> +#endif -+ <resizer id="inspector-end-resizer" -+ class="inspector-resizer" -+ dir="top" disabled="true" -+ element="inspector-tree-box"/> + </hbox> + </vbox> + </toolbar> @@ -1145,11 +1138,11 @@ * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) * content/browser/content.js (content/content.js) * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) + * content/browser/newtab/newTab.xul (content/newtab/newTab.xul) + * content/browser/newtab/newTab.js (content/newtab/newTab.js) + content/browser/newtab/newTab.css (content/newtab/newTab.css) * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) - * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) - * content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml) - * content/browser/pageinfo/feeds.js (content/pageinfo/feeds.js) diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp --- a/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp @@ -1166,13 +1159,13 @@ +#include "nsUnixShellService.h" #endif - #include "nsProfileMigrator.h" #if defined(XP_WIN) && !defined(__MINGW32__) #include "nsIEProfileMigrator.h" #elif defined(XP_MACOSX) #include "nsSafariProfileMigrator.h" #endif -@@ -68,18 +68,16 @@ using namespace mozilla::browser; + +@@ -67,18 +67,16 @@ using namespace mozilla::browser; ///////////////////////////////////////////////////////////////////////////// @@ -1185,13 +1178,13 @@ -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) #endif - NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator) #if defined(XP_WIN) && !defined(__MINGW32__) NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator) #elif defined(XP_MACOSX) NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafariProfileMigrator) #endif -@@ -105,17 +103,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR + +@@ -102,17 +100,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR #endif NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); @@ -1205,15 +1198,15 @@ #endif { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor }, { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create }, - { &kNS_FIREFOX_PROFILEMIGRATOR_CID, false, NULL, nsProfileMigratorConstructor }, #if defined(XP_WIN) && !defined(__MINGW32__) { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor }, #elif defined(XP_MACOSX) { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, + { &kNS_SAFARIPROFILEMIGRATOR_CID, false, NULL, nsSafariProfileMigratorConstructor }, diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js --- a/browser/components/preferences/advanced.js +++ b/browser/components/preferences/advanced.js -@@ -697,24 +697,42 @@ var gAdvancedPane = { +@@ -716,24 +716,42 @@ var gAdvancedPane = { var brandBundle = document.getElementById("bundleBrand"); var shellBundle = document.getElementById("bundleShell"); var brandShortName = brandBundle.getString("brandShortName"); @@ -1716,7 +1709,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -440,16 +440,17 @@ +@@ -450,16 +450,17 @@ #endif #endif ++++++ firefox-multilocale-chrome.patch ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -1,12 +1,12 @@ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> -# Parent 8b1b35442fee96324a141ab5d7710c3a88769df5 +# Parent de9c23d6bfd0b0a30aa3dfc55377658756ec6f70 Add searchplugins to chrome packaging for proper localization diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -323,16 +323,20 @@ pref("browser.download.manager.scanWhenD +@@ -341,16 +341,20 @@ pref("browser.download.manager.scanWhenD pref("browser.download.manager.resumeOnWakeDelay", 10000); // search engines URL @@ -30,7 +30,7 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in -@@ -167,29 +167,41 @@ libs:: $(call MERGE_FILES,$(addprefix pr +@@ -153,39 +153,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ; install:: $(addprefix generic/profile/,$(PROFILE_FILES)) @@ -41,26 +41,41 @@ -SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) +SEARCH_PLUGINS = $(shell cat \ -+ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ -+ @srcdir@/en-US/searchplugins/list.txt ) ) ++ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ ++ @srcdir@/en-US/searchplugins/list.txt ) ) -libs:: $(addsuffix .xml,$(SEARCH_PLUGINS)) -- $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins +- $(NSINSTALL) -D $(FINAL_TARGET)/searchplugins +- for SEARCH_PLUGIN in $^; do\ +- SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\ +tmp-search.jar.mn:: + printf "$(AB_CD).jar:" > $@ + printf "$(foreach plugin,$(SEARCH_PLUGINS),$(subst __PLUGIN_SUBST__,$(plugin), \n locale/browser/searchplugins/__PLUGIN_SUBST__.xml (__PLUGIN_SUBST__.xml)))" >> $@ + @echo >> $@ ++ ++searchplugins:: $(addsuffix .xml,$(SEARCH_PLUGINS)) ++ for SEARCH_PLUGIN in $^; do \ + $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ +- $$SEARCH_PLUGIN > $(FINAL_TARGET)/searchplugins/$$SEARCH_PLUGIN_BASE; \ ++ $$SEARCH_PLUGIN > $$SEARCH_PLUGIN-new ; \ ++ mv $$SEARCH_PLUGIN-new $$SEARCH_PLUGIN ; \ + done -install:: $(addsuffix .xml,$(SEARCH_PLUGINS)) -- $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins -+searchplugins: tmp-search.jar.mn +- $(NSINSTALL) -D $(DESTDIR)$(mozappdir)/searchplugins +- for i in $^; do \ +- SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\ +- $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ +- $$SEARCH_PLUGIN > $(DESTDIR)$(mozappdir)/searchplugins/$$SEARCH_PLUGIN_BASE; \ +- done ++searchplugins:: tmp-search.jar.mn + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ + $(QUIET) -j $(FINAL_TARGET)/chrome \ + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ + -s $(LOCALE_SRCDIR)/searchplugins \ + $(MAKE_JARS_FLAGS) tmp-search.jar.mn -+export:: searchplugins ++libs:: searchplugins + +GARBAGE += tmp-search.jar.mn @@ -80,7 +95,7 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -84,11 +84,12 @@ +@@ -97,11 +97,12 @@ locale/browser-region/region.properties (%chrome/browser-region/region.properties) # the following files are browser-specific overrides * locale/browser/netError.dtd (%chrome/overrides/netError.dtd) ++++++ firefox-no-default-ualocale.patch ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -1,12 +1,12 @@ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> -# Parent 9041ab32e51a397a39de4f95c718a5adf5c21f2f +# Parent d372da4f99f10c6e76fd483abc145cfbc485c168 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -215,17 +215,17 @@ pref("xpinstall.whitelist.add.36", "getp +@@ -230,17 +230,17 @@ pref("xpinstall.whitelist.add.36", "getp pref("lightweightThemes.update.enabled", true); ++++++ l10n-11.0.tar.bz2 -> l10n-12.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-11.0.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-12.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-sle11-gcc.patch -> mozilla-gcc47.patch ++++++ --- /work/SRC/openSUSE:Factory/MozillaFirefox/mozilla-sle11-gcc.patch 2012-03-16 13:19:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/mozilla-gcc47.patch 2012-04-23 16:11:48.000000000 +0200 @@ -1,24 +1,174 @@ # HG changeset patch -# Parent 39e596b823926b5add22bb263734c6c872ee2aad -diff --git a/layout/xul/base/src/nsXULTooltipListener.h b/layout/xul/base/src/nsXULTooltipListener.h ---- a/layout/xul/base/src/nsXULTooltipListener.h -+++ b/layout/xul/base/src/nsXULTooltipListener.h -@@ -107,17 +107,17 @@ protected: - static void sTooltipCallback (nsITimer* aTimer, void* aListener); - - // screen coordinates of the last mousemove event, stored so that the - // tooltip can be opened at this location. - PRInt32 mMouseScreenX, mMouseScreenY; - - // various constants for tooltips - enum { -- kTooltipMouseMoveTolerance = 7, // 7 pixel tolerance for mousemove event -+ kTooltipMouseMoveTolerance = 7 // 7 pixel tolerance for mousemove event - }; - - // flag specifying if the tooltip has already been displayed by a MouseMove - // event. The flag is reset on MouseOut so that the tooltip will display - // the next time the mouse enters the node (bug #395668). - bool mTooltipShownOnce; +# Parent debab900e37fdd4f8981c06beef6f193a04bd2b7 +Patch to make Mozilla build with gcc 4.7, including +- Bug 725655 - gcc 4.7 build failures (missing headers) (TM: Mozilla13) +- Bug 734490 - "no viable overloaded 'PRIxPTR'" when building with Clang or GCC 4.7 (TM: Mozilla14) + +diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc +--- a/ipc/chromium/src/base/file_util_linux.cc ++++ b/ipc/chromium/src/base/file_util_linux.cc +@@ -1,15 +1,18 @@ + // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. - #ifdef MOZ_XUL + #include "base/file_util.h" + + #include <fcntl.h> ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include <string> + #include <vector> + + #include "base/eintr_wrapper.h" + #include "base/file_path.h" + #include "base/string_util.h" + +diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc +--- a/ipc/chromium/src/base/message_pump_libevent.cc ++++ b/ipc/chromium/src/base/message_pump_libevent.cc +@@ -1,16 +1,19 @@ + // Copyright (c) 2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + + #include "base/message_pump_libevent.h" + + #include <errno.h> + #include <fcntl.h> ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include "eintr_wrapper.h" + #include "base/logging.h" + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" + #include "third_party/libevent/event.h" + +diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc +--- a/ipc/chromium/src/base/time_posix.cc ++++ b/ipc/chromium/src/base/time_posix.cc +@@ -8,16 +8,19 @@ + #include <mach/mach_time.h> + #endif + #include <sys/time.h> + #ifdef ANDROID + #include <time64.h> + #else + #include <time.h> + #endif ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include <limits> + + #include "base/basictypes.h" + #include "base/logging.h" + + namespace base { + +diff --git a/layout/base/tests/TestPoisonArea.cpp b/layout/base/tests/TestPoisonArea.cpp +--- a/layout/base/tests/TestPoisonArea.cpp ++++ b/layout/base/tests/TestPoisonArea.cpp +@@ -392,53 +392,53 @@ ReservePoisonArea() + { + if (sizeof(uintptr_t) == 8) { + // Use the hardware-inaccessible region. + // We have to avoid 64-bit constants and shifts by 32 bits, since this + // code is compiled in 32-bit mode, although it is never executed there. + uintptr_t result = (((uintptr_t(0x7FFFFFFFu) << 31) << 1 | + uintptr_t(0xF0DEAFFFu)) & + ~uintptr_t(PAGESIZE-1)); +- printf("INFO | poison area assumed at 0x%.*"PRIxPTR"\n", SIZxPTR, result); ++ printf("INFO | poison area assumed at 0x%.*" PRIxPTR "\n", SIZxPTR, result); + return result; + } else { + // First see if we can allocate the preferred poison address from the OS. + uintptr_t candidate = (0xF0DEAFFF & ~(PAGESIZE-1)); + void *result = ReserveRegion(candidate, false); + if (result == (void *)candidate) { + // success - inaccessible page allocated +- printf("INFO | poison area allocated at 0x%.*"PRIxPTR ++ printf("INFO | poison area allocated at 0x%.*" PRIxPTR + " (preferred addr)\n", SIZxPTR, (uintptr_t)result); + return candidate; + } + + // That didn't work, so see if the preferred address is within a range + // of permanently inacessible memory. + if (ProbeRegion(candidate)) { + // success - selected page cannot be usable memory + if (result != MAP_FAILED) + ReleaseRegion(result); +- printf("INFO | poison area assumed at 0x%.*"PRIxPTR ++ printf("INFO | poison area assumed at 0x%.*" PRIxPTR + " (preferred addr)\n", SIZxPTR, candidate); + return candidate; + } + + // The preferred address is already in use. Did the OS give us a + // consolation prize? + if (result != MAP_FAILED) { +- printf("INFO | poison area allocated at 0x%.*"PRIxPTR ++ printf("INFO | poison area allocated at 0x%.*" PRIxPTR + " (consolation prize)\n", SIZxPTR, (uintptr_t)result); + return (uintptr_t)result; + } + + // It didn't, so try to allocate again, without any constraint on + // the address. + result = ReserveRegion(0, false); + if (result != MAP_FAILED) { +- printf("INFO | poison area allocated at 0x%.*"PRIxPTR ++ printf("INFO | poison area allocated at 0x%.*" PRIxPTR + " (fallback)\n", SIZxPTR, (uintptr_t)result); + return (uintptr_t)result; + } + + printf("ERROR | no usable poison area found\n"); + return 0; + } + } +@@ -450,17 +450,17 @@ static uintptr_t + ReservePositiveControl() + { + + void *result = ReserveRegion(0, false); + if (result == MAP_FAILED) { + printf("ERROR | allocating positive control | %s\n", LastErrMsg()); + return 0; + } +- printf("INFO | positive control allocated at 0x%.*"PRIxPTR"\n", ++ printf("INFO | positive control allocated at 0x%.*" PRIxPTR "\n", + SIZxPTR, (uintptr_t)result); + return (uintptr_t)result; + } + + /* The "negative control" area confirms that our probe logic does detect a + * page that is readable, writable, or executable. + */ + static uintptr_t +@@ -481,17 +481,17 @@ ReserveNegativeControl() + // Now mark it executable as well as readable and writable. + // (mmap(PROT_EXEC) may fail when applied to anonymous memory.) + + if (MakeRegionExecutable(result)) { + printf("ERROR | making negative control executable | %s\n", LastErrMsg()); + return 0; + } + +- printf("INFO | negative control allocated at 0x%.*"PRIxPTR"\n", ++ printf("INFO | negative control allocated at 0x%.*" PRIxPTR "\n", + SIZxPTR, (uintptr_t)result); + return (uintptr_t)result; + } + + static void + JumpTo(uintptr_t opaddr) + { + #ifdef __ia64 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -3247,9 +3247,9 @@ #endif // Now look up our extensions -diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in ---- a/widget/src/gtk2/Makefile.in -+++ b/widget/src/gtk2/Makefile.in +diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in +--- a/widget/gtk2/Makefile.in ++++ b/widget/gtk2/Makefile.in @@ -135,11 +135,14 @@ DEFINES += -DCAIRO_GFX INCLUDES += \ @@ -3265,9 +3265,9 @@ ifdef MOZ_X11 INCLUDES += -I$(srcdir)/../shared/x11 endif -diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp ---- a/widget/src/gtk2/nsFilePicker.cpp -+++ b/widget/src/gtk2/nsFilePicker.cpp +diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp +--- a/widget/gtk2/nsFilePicker.cpp ++++ b/widget/gtk2/nsFilePicker.cpp @@ -33,16 +33,17 @@ * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. @@ -3580,9 +3580,9 @@ + } + return NS_OK; + } -diff --git a/widget/src/gtk2/nsFilePicker.h b/widget/src/gtk2/nsFilePicker.h ---- a/widget/src/gtk2/nsFilePicker.h -+++ b/widget/src/gtk2/nsFilePicker.h +diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h +--- a/widget/gtk2/nsFilePicker.h ++++ b/widget/gtk2/nsFilePicker.h @@ -89,11 +89,17 @@ protected: nsString mDefault; nsString mDefaultExtension; ++++++ mozilla-libnotify.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent c684863b1eb3bcae92ef24bc2ac511985b1ad7e4 Bug 737646 - no biff notification if notification-daemon not running diff --git a/toolkit/system/gnome/nsAlertsIconListener.cpp b/toolkit/system/gnome/nsAlertsIconListener.cpp --- a/toolkit/system/gnome/nsAlertsIconListener.cpp +++ b/toolkit/system/gnome/nsAlertsIconListener.cpp @@ -47,16 +47,17 @@ #include <gdk/gdk.h> // Compatibility macro for <libnotify-0.7 #ifndef NOTIFY_CHECK_VERSION #define NOTIFY_CHECK_VERSION(x,y,z) 0 #endif static bool gHasActions = false; +static bool gHasCaps = false; static void notify_action_cb(NotifyNotification *notification, gchar *action, gpointer user_data) { nsAlertsIconListener* alert = static_cast<nsAlertsIconListener*> (user_data); alert->SendCallback(); } @@ -338,27 +339,34 @@ nsAlertsIconListener::InitAlertAsync(con appShortName.AssignLiteral("Mozilla"); } if (!notify_init(appShortName.get())) return NS_ERROR_FAILURE; GList *server_caps = notify_get_server_caps(); if (server_caps) { + gHasCaps = true; for (GList* cap = server_caps; cap != NULL; cap = cap->next) { if (!strcmp((char*) cap->data, "actions")) { gHasActions = true; break; } } g_list_foreach(server_caps, (GFunc)g_free, NULL); g_list_free(server_caps); } } + if (!gHasCaps) { + // if notify_get_server_caps() failed above we need to assume + // there is no notification-server to display anything + return NS_ERROR_FAILURE; + } + if (!gHasActions && aAlertTextClickable) return NS_ERROR_FAILURE; // No good, fallback to XUL nsCOMPtr<nsIObserverService> obsServ = do_GetService("@mozilla.org/observer-service;1"); if (obsServ) obsServ->AddObserver(this, "quit-application", true); ++++++ mozilla-repo.patch ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent e315e5900fa90c2183edccd211fbe1e81cdb4c5f +# Parent 8ea0f829916d7d9dc54567813367bcdfe6cee179 diff --git a/build/Makefile.in b/build/Makefile.in --- a/build/Makefile.in +++ b/build/Makefile.in -@@ -86,17 +86,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ +@@ -91,17 +91,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ APP_INI_DEPS += $(DEPTH)/config/autoconf.mk MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) @@ -48,7 +48,7 @@ diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk -@@ -156,20 +156,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME +@@ -161,20 +161,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME TEST_PACKAGE = $(PKG_BASENAME).tests.zip ifneq (,$(wildcard $(DIST)/bin/application.ini)) @@ -67,14 +67,14 @@ -MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) +#MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) - MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt + MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_SOURCESTAMP_FILE_BASENAME).txt # JavaScript Shell PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -235,17 +235,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR +@@ -236,17 +236,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR endif endif ++++++ mozilla-revert_621446.patch ++++++ # HG changeset patch # Parent 8da41a2cee774ce4d00b9ac1032a495b8bc560a0 Revert investigation patch for bmo#621446; as it is useless on desktop and breaks the build for certain compilers diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp --- a/netwerk/protocol/http/HttpChannelParent.cpp +++ b/netwerk/protocol/http/HttpChannelParent.cpp @@ -52,29 +52,25 @@ #include "nsIBadCertListener2.h" #include "nsICacheEntryDescriptor.h" #include "nsSerializationHelper.h" #include "nsISerializable.h" #include "nsIAssociatedContentSecurity.h" #include "nsIApplicationCacheService.h" #include "nsIOfflineCacheUpdate.h" #include "nsIRedirectChannelRegistrar.h" -#include "prinit.h" namespace mozilla { namespace net { HttpChannelParent::HttpChannelParent(PBrowserParent* iframeEmbedding) : mIPCClosed(false) , mStoredStatus(0) , mStoredProgress(0) , mStoredProgressMax(0) - , mSentRedirect1Begin(false) - , mSentRedirect1BeginFailed(false) - , mReceivedRedirect2Verify(false) { // Ensure gHttpHandler is initialized: we need the atom table up and running. nsIHttpProtocolHandler* handler; CallGetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &handler); NS_ASSERTION(handler, "no http handler"); mTabParent = do_QueryObject(static_cast<TabParent*>(iframeEmbedding)); } @@ -326,21 +322,16 @@ HttpChannelParent::RecvUpdateAssociatedC mAssociatedContentSecurity->SetCountSubRequestsHighSecurity(high); mAssociatedContentSecurity->SetCountSubRequestsLowSecurity(low); mAssociatedContentSecurity->SetCountSubRequestsBrokenSecurity(broken); mAssociatedContentSecurity->SetCountSubRequestsNoSecurity(no); } return true; } -// Bug 621446 investigation, we don't want conditional PR_Aborts bellow to be -// merged to a single address. -#pragma warning(disable : 4068) -#pragma GCC optimize ("O0") - bool HttpChannelParent::RecvRedirect2Verify(const nsresult& result, const RequestHeaderTuples& changedHeaders) { if (NS_SUCCEEDED(result)) { nsCOMPtr<nsIHttpChannel> newHttpChannel = do_QueryInterface(mRedirectChannel); @@ -348,40 +339,21 @@ HttpChannelParent::RecvRedirect2Verify(c for (PRUint32 i = 0; i < changedHeaders.Length(); i++) { newHttpChannel->SetRequestHeader(changedHeaders[i].mHeader, changedHeaders[i].mValue, changedHeaders[i].mMerge); } } } - if (!mRedirectCallback) { - // Bug 621446 investigation (optimization turned off above) - if (mReceivedRedirect2Verify) - NS_RUNTIMEABORT("Duplicate fire"); - if (mSentRedirect1BeginFailed) - NS_RUNTIMEABORT("Send to child failed"); - if (mSentRedirect1Begin && NS_FAILED(result)) - NS_RUNTIMEABORT("Redirect failed"); - if (mSentRedirect1Begin && NS_SUCCEEDED(result)) - NS_RUNTIMEABORT("Redirect succeeded"); - if (!mRedirectChannel) - NS_RUNTIMEABORT("Missing redirect channel"); - } - - mReceivedRedirect2Verify = true; - mRedirectCallback->OnRedirectVerifyCallback(result); mRedirectCallback = nsnull; return true; } -// Bug 621446 investigation -#pragma GCC reset_options - bool HttpChannelParent::RecvDocumentChannelCleanup() { // From now on only using mAssociatedContentSecurity. Free everything else. mChannel = 0; // Reclaim some memory sooner. mCacheDescriptor = 0; // Else we'll block other channels reading same URI return true; } @@ -583,24 +555,18 @@ HttpChannelParent::StartRedirect(PRUint3 nsHttpChannel *httpChan = static_cast<nsHttpChannel *>(mChannel.get()); nsHttpResponseHead *responseHead = httpChan->GetResponseHead(); bool result = SendRedirect1Begin(newChannelId, IPC::URI(newURI), redirectFlags, responseHead ? *responseHead : nsHttpResponseHead()); - if (!result) { - // Bug 621446 investigation - mSentRedirect1BeginFailed = true; + if (!result) return NS_BINDING_ABORTED; - } - - // Bug 621446 investigation - mSentRedirect1Begin = true; // Result is handled in RecvRedirect2Verify above mRedirectChannel = newChannel; mRedirectCallback = callback; return NS_OK; } diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h --- a/netwerk/protocol/http/HttpChannelParent.h +++ b/netwerk/protocol/http/HttpChannelParent.h @@ -128,18 +128,14 @@ private: nsCOMPtr<nsIChannel> mRedirectChannel; nsCOMPtr<nsIAsyncVerifyRedirectCallback> mRedirectCallback; // state for combining OnStatus/OnProgress with OnDataAvailable // into one IPDL call to child. nsresult mStoredStatus; PRUint64 mStoredProgress; PRUint64 mStoredProgressMax; - - bool mSentRedirect1Begin : 1; - bool mSentRedirect1BeginFailed : 1; - bool mReceivedRedirect2Verify : 1; }; } // namespace net } // namespace mozilla #endif // mozilla_net_HttpChannelParent_h ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -1,2 +1,2 @@ -REV=b967d9c07377 +REV=a294a5b4f12d REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mercurial for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at 2012-04-23 16:11:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mercurial (Old) and /work/SRC/openSUSE:Factory/.mercurial.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mercurial", Maintainer is "tiwai(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mercurial/mercurial.changes 2012-03-05 18:00:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mercurial.new/mercurial.changes 2012-04-23 16:11:40.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Apr 22 19:16:03 UTC 2012 - wr(a)rosenauer.org + +- update to version 2.1.2 + * bugfix release + http://mercurial.selenic.com/wiki/WhatsNew + +------------------------------------------------------------------- Old: ---- mercurial-2.1.1.tar.gz New: ---- mercurial-2.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.3IeEI1/_old 2012-04-23 16:11:41.000000000 +0200 +++ /var/tmp/diff_new_pack.3IeEI1/_new 2012-04-23 16:11:41.000000000 +0200 @@ -17,7 +17,7 @@ Name: mercurial -Version: 2.1.1 +Version: 2.1.2 Release: 0 Summary: Scalable Distributed SCM License: GPL-2.0+ ++++++ mercurial-2.1.1.tar.gz -> mercurial-2.1.2.tar.gz ++++++ ++++ 8586 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0