rpms/ndiswrapper-kmod/F-15 ndiswrapper-kmod.spec,1.53,1.54
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ndiswrapper-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9911
Modified Files:
ndiswrapper-kmod.spec
Log Message:
* Sun Nov 13 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.56-2.15
- rebuild for updated kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-15/ndiswrapper-kmod.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ndiswrapper-kmod.spec 2 Nov 2011 10:16:15 -0000 1.53
+++ ndiswrapper-kmod.spec 13 Nov 2011 21:25:43 -0000 1.54
@@ -8,7 +8,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.56
-Release: 2%{?dist}.14
+Release: 2%{?dist}.15
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -93,6 +93,9 @@
%changelog
+* Sun Nov 13 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.56-2.15
+- rebuild for updated kernel
+
* Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.56-2.14
- rebuild for updated kernel
13 years
rpms/buildsys-build-rpmfusion/F-16 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.22, 1.23 buildsys-build-rpmfusion.spec, 1.33, 1.34
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7077
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Sun Nov 13 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-6
- rebuild for kernel 3.1.1-1.fc16
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-16/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- buildsys-build-rpmfusion-kerneldevpkgs-current 30 Oct 2011 15:34:25 -0000 1.22
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 13 Nov 2011 21:09:35 -0000 1.23
@@ -1,3 +1,3 @@
-3.1.0-5.fc16
-3.1.0-5.fc16smp
-3.1.0-5.fc16PAE
+3.1.1-1.fc16
+3.1.1-1.fc16smp
+3.1.1-1.fc16PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-16/buildsys-build-rpmfusion.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- buildsys-build-rpmfusion.spec 30 Oct 2011 15:34:25 -0000 1.33
+++ buildsys-build-rpmfusion.spec 13 Nov 2011 21:09:35 -0000 1.34
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 16
-Release: 4
+Release: 6
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,12 @@
%changelog
+* Sun Nov 13 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-6
+- rebuild for kernel 3.1.1-1.fc16
+
+* Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-5
+- rebuild for kernel 3.1.0-7.fc16
+
* Sun Oct 30 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-4
- rebuild for kernel 3.1.0-5.fc16
13 years
rpms/buildsys-build-rpmfusion/F-15 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.34, 1.35 buildsys-build-rpmfusion.spec, 1.41, 1.42
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6851
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Sun Nov 13 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10:15-15
- rebuild for kernel 2.6.41.1-1.fc15
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-15/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- buildsys-build-rpmfusion-kerneldevpkgs-current 1 Nov 2011 20:14:50 -0000 1.34
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 13 Nov 2011 21:08:17 -0000 1.35
@@ -1,3 +1,3 @@
-2.6.40.8-4.fc15
-2.6.40.8-4.fc15smp
-2.6.40.8-4.fc15PAE
+2.6.41.1-1.fc15
+2.6.41.1-1.fc15smp
+2.6.41.1-1.fc15PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-15/buildsys-build-rpmfusion.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- buildsys-build-rpmfusion.spec 1 Nov 2011 20:14:50 -0000 1.41
+++ buildsys-build-rpmfusion.spec 13 Nov 2011 21:08:17 -0000 1.42
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 15
-Release: 14
+Release: 15
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Sun Nov 13 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10:15-15
+- rebuild for kernel 2.6.41.1-1.fc15
+
* Tue Nov 01 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10:15-14
- rebuild for kernel 2.6.40.8-4.fc15
13 years
rpms/staging-kmod-addons/F-15 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 staging-kmod-addons.spec, 1.6, 1.7
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod-addons/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16564
Modified Files:
.cvsignore sources staging-kmod-addons.spec
Log Message:
rebase to spec file from f16 for 2.6.41
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-15/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 1 Aug 2011 18:05:30 -0000 1.5
+++ .cvsignore 13 Nov 2011 09:05:15 -0000 1.6
@@ -1 +1 @@
-linux-staging-2.6.40.tar.bz2
+linux-staging-3.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-15/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 1 Aug 2011 18:05:30 -0000 1.5
+++ sources 13 Nov 2011 09:05:15 -0000 1.6
@@ -1 +1 @@
-11e75c74635ef4862d1b126a77583dde linux-staging-2.6.40.tar.bz2
+20d4d99f2db296b376243621a25c02df linux-staging-3.1.tar.bz2
Index: staging-kmod-addons.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-15/staging-kmod-addons.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- staging-kmod-addons.spec 1 Aug 2011 18:03:17 -0000 1.6
+++ staging-kmod-addons.spec 13 Nov 2011 09:05:15 -0000 1.7
@@ -5,8 +5,8 @@
#global prever rc8
Name: staging-kmod-addons
-Version: 2.6.40
-Release: %{?prever:0.}3%{?prever:.%{prever}}%{?dist}
+Version: 3.1
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
Summary: Documentation and shared parts for the kmod-staging packages
Group: System Environment/Kernel
@@ -58,6 +58,9 @@
%changelog
+* Sun Nov 06 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1-1
+- update to 3.1 (no new drivers)
+
* Mon Aug 01 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.40-3
- update to 3.0 aka 2.6.40
- Enable BRCMSMAC, BRCMFMAC, DRM_PSB, INTEL_MEI, RTS_PSTOR, XVMALLOC, ZCACHE
13 years
rpms/staging-kmod/F-15 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 staging-kmod.spec, 1.30, 1.31
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16139
Modified Files:
.cvsignore sources staging-kmod.spec
Log Message:
rebase to spec file from f16 for 2.6.41
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 1 Aug 2011 17:59:53 -0000 1.5
+++ .cvsignore 13 Nov 2011 09:04:17 -0000 1.6
@@ -1 +1 @@
-linux-staging-2.6.40.tar.bz2
+linux-staging-3.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 1 Aug 2011 17:59:53 -0000 1.5
+++ sources 13 Nov 2011 09:04:17 -0000 1.6
@@ -1 +1 @@
-11e75c74635ef4862d1b126a77583dde linux-staging-2.6.40.tar.bz2
+20d4d99f2db296b376243621a25c02df linux-staging-3.1.tar.bz2
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/staging-kmod.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- staging-kmod.spec 2 Nov 2011 10:17:31 -0000 1.30
+++ staging-kmod.spec 13 Nov 2011 09:04:18 -0000 1.31
@@ -1,7 +1,7 @@
# akmods not supported
# which drivers to built
-%global stgdrvs ASUS_OLED ATH6K_LEGACY BATMAN_ADV BRCMUTIL BCM_WIMAX DRM_PSB EASYCAP ECHO EPL ET131X FB_UDL FB_XGI FT1000_USB HECI HYPERV IDE_PHISON INTEL_MEI LINE6_USB RTS_PSTOR RAMZSWAP R8187SE R8712U RTL8192SU RTL8192E RTL8192U SBE_2T3E3 SLICOSS SOLO6X10 TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_ENESTORAGE W35UND PRISM2_USB VT6655 VT6656 XVMALLOC ZRAM ZCACHE
+%global stgdrvs ASUS_OLED ATH6K_LEGACY BATMAN_ADV BCM_WIMAX DRM_PSB EASYCAP ECHO EPL ET131X FB_UDL FB_XGI FT1000_USB HECI HYPERV IDE_PHISON INTEL_MEI LINE6_USB RTS_PSTOR RAMZSWAP R8187SE R8712U RTL8192SU RTL8192E RTL8192U SBE_2T3E3 SLICOSS SOLO6X10 TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_ENESTORAGE W35UND PRISM2_USB VT6655 VT6656 XVMALLOC ZRAM ZCACHE
# avoid this error:
# /usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character
@@ -19,8 +19,8 @@
#global prever rc8
Name: staging-kmod
-Version: 2.6.40
-Release: %{?prever:0.}4%{?prever:.%{prever}}%{?dist}.6
+Version: 3.1
+Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.1
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -66,9 +66,6 @@
for module in %{stgdrvs} ; do
configops="CONFIG_${module}=m"
case "${module}" in
- BRCMUTIL)
- configops="${configops} CONFIG_BRCMSMAC=m CONFIG_BRCMFMAC=m"
- ;;
CX25821)
configops="${configops} CONFIG_CX25821_ALSA=m"
;;
@@ -137,23 +134,12 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.40-4.6
-- rebuild for updated kernel
-
-* Sun Oct 30 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.40-4.5
-- rebuild for updated kernel
-
-* Wed Oct 19 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.40-4.4
-- rebuild for updated kernel
-
-* Fri Oct 07 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.40-4.3
-- rebuild for updated kernel
+* Sun Nov 13 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1-2.1
+- Drop brcm80211 drivers; included in Fedora kernels since 3.1.1-1.rc1 with
+ changelog-enty "Backport brcm80211 from 3.2-rc1"
-* Sat Sep 03 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.40-4.2
-- rebuild for updated kernel
-
-* Wed Aug 17 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.40-4.1
-- rebuild for updated kernel
+* Sun Nov 06 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1-1.1
+- update to 3.1 (no new drivers)
* Fri Aug 05 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.40-4
- fix BRCM drivers by building their util module for real
13 years
rpms/staging-kmod/devel staging-kmod.spec,1.21,1.22
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15992
Modified Files:
staging-kmod.spec
Log Message:
* Sun Nov 13 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1-2.1
- Drop brcm80211 drivers; included in Fedora kernels since 3.1.1-1.rc1 with
changelog-enty "Backport brcm80211 from 3.2-rc1"
13 years
rpms/staging-kmod/F-16 staging-kmod.spec,1.17,1.18
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15204
Modified Files:
staging-kmod.spec
Log Message:
* Sun Nov 13 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1-2.1
- Drop brcm80211 drivers; included in Fedora kernels since 3.1.1-1.rc1 with
changelog-enty "Backport brcm80211 from 3.2-rc1"
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-16/staging-kmod.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- staging-kmod.spec 6 Nov 2011 11:30:11 -0000 1.17
+++ staging-kmod.spec 13 Nov 2011 08:57:02 -0000 1.18
@@ -1,8 +1,7 @@
# akmods not supported
# which drivers to built
-%global stgdrvs ASUS_OLED ATH6K_LEGACY BATMAN_ADV BRCMUTIL BCM_WIMAX DRM_PSB EASYCAP ECHO EPL ET131X FB_UDL FB_XGI FT1000_USB HECI HYPERV IDE_PHISON INTEL_MEI LINE6_USB RTS_PSTOR RAMZSWAP R8187SE R8712U RTL8192SU RTL8192E RTL8192U SBE_2T3E3 SLICOSS SOLO6X10 TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_ENESTORAGE W35UND PRISM2_USB VT6655 VT6656 XVMALLOC ZRAM ZCACHE
-
+%global stgdrvs ASUS_OLED ATH6K_LEGACY BATMAN_ADV BCM_WIMAX DRM_PSB EASYCAP ECHO EPL ET131X FB_UDL FB_XGI FT1000_USB HECI HYPERV IDE_PHISON INTEL_MEI LINE6_USB RTS_PSTOR RAMZSWAP R8187SE R8712U RTL8192SU RTL8192E RTL8192U SBE_2T3E3 SLICOSS SOLO6X10 TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_ENESTORAGE W35UND PRISM2_USB VT6655 VT6656 XVMALLOC ZRAM ZCACHE
# avoid this error:
# /usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character
@@ -21,7 +20,7 @@
Name: staging-kmod
Version: 3.1
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.1
+Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.1
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -67,9 +66,6 @@
for module in %{stgdrvs} ; do
configops="CONFIG_${module}=m"
case "${module}" in
- BRCMUTIL)
- configops="${configops} CONFIG_BRCMSMAC=m CONFIG_BRCMFMAC=m"
- ;;
CX25821)
configops="${configops} CONFIG_CX25821_ALSA=m"
;;
@@ -138,6 +134,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Nov 13 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1-2.1
+- Drop brcm80211 drivers; included in Fedora kernels since 3.1.1-1.rc1 with
+ changelog-enty "Backport brcm80211 from 3.2-rc1"
+
* Sun Nov 06 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1-1.1
- update to 3.1 (no new drivers)
13 years
rpms/thunderbird-enigmail/F-16 thunderbird-enigmail.spec,1.16,1.17
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13728
Modified Files:
thunderbird-enigmail.spec
Log Message:
bump release
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/thunderbird-enigmail.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- thunderbird-enigmail.spec 12 Nov 2011 18:26:36 -0000 1.16
+++ thunderbird-enigmail.spec 12 Nov 2011 20:46:20 -0000 1.17
@@ -29,7 +29,7 @@
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 1%{?dist}
+Release: 1%{?dist}.1
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
13 years
rpms/thunderbird-enigmail/F-15 mozilla-670719.patch, NONE, 1.1 xulrunner-2.0-NetworkManager09.patch, NONE, 1.1 xulrunner-2.0-network-link-service.patch, NONE, 1.1 xulrunner-install.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.13, 1.14 thunderbird-enigmail.spec, 1.13, 1.14
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24542
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
Added Files:
mozilla-670719.patch xulrunner-2.0-NetworkManager09.patch
xulrunner-2.0-network-link-service.patch
xulrunner-install.patch
Log Message:
update to 1.3.3 for thunderbird 8
mozilla-670719.patch:
Makefile.in | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- NEW FILE mozilla-670719.patch ---
# HG changeset patch
# User Mike Hommey <mh+mozilla(a)glandium.org>
# Date 1313846520 -7200
# Node ID fdc3b63938f5a76d99c1e2bb12fd448465debc94
# Parent 07a5a618ebe3f67b23100ceb1b51e92bb79be0cd
Bug 670719 - Only add -DENABLE_JIT=1 to CXXFLAGS if any of trace/method/yarr jit is enabled.
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -433,16 +433,19 @@ CPPSRCS += \
YarrPattern.cpp \
YarrSyntaxChecker.cpp \
$(NULL)
else
###############################################
# BEGIN include sources for the Nitro assembler
#
+
+ENABLE_YARR_JIT = 1
+
VPATH += $(srcdir)/assembler \
$(srcdir)/assembler/wtf \
$(srcdir)/assembler/jit \
$(srcdir)/assembler/assembler \
$(srcdir)/methodjit \
$(srcdir)/yarr \
$(NONE)
@@ -1070,17 +1073,21 @@ endif
###############################################
# BEGIN kludges for the Nitro assembler
#
# Needed to "configure" it correctly. Unfortunately these
# flags wind up being applied to all code in js/src, not just
# the code in js/src/assembler.
-CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1
+
+ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT))
+CXXFLAGS += -DENABLE_JIT=1
+endif
INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr
ifdef ENABLE_METHODJIT
# Build a standalone test program that exercises the assembler
# sources a bit.
TESTMAIN_OBJS = \
Assertions.$(OBJ_SUFFIX) \
xulrunner-2.0-NetworkManager09.patch:
nsNetworkManagerListener.cpp | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
--- NEW FILE xulrunner-2.0-NetworkManager09.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=639959
--- source/toolkit/system/dbus/nsNetworkManagerListener.cpp.foo 2011-03-08 14:26:28.167074923 -0600
+++ source/toolkit/system/dbus/nsNetworkManagerListener.cpp 2011-03-08 14:30:54.260748294 -0600
@@ -51,15 +51,13 @@
#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager"
#define NM_DBUS_PATH "/org/freedesktop/NetworkManager"
#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager"
-#define NM_DBUS_SIGNAL_STATE_CHANGE "StateChange"
-typedef enum NMState
-{
- NM_STATE_UNKNOWN = 0,
- NM_STATE_ASLEEP,
- NM_STATE_CONNECTING,
- NM_STATE_CONNECTED,
- NM_STATE_DISCONNECTED
-} NMState;
+#define NM_DBUS_SIGNAL_STATE_CHANGE "StateChange" /* Deprecated in 0.7.x */
+#define NM_DBUS_SIGNAL_STATE_CHANGED "StateChanged"
+
+#define NM_STATE_CONNECTED_OLD 3
+#define NM_STATE_CONNECTED_LOCAL 50
+#define NM_STATE_CONNECTED_SITE 60
+#define NM_STATE_CONNECTED_GLOBAL 70
nsNetworkManagerListener::nsNetworkManagerListener() :
mLinkUp(PR_TRUE), mNetworkManagerActive(PR_FALSE),
@@ -174,7 +172,9 @@
PRBool
nsNetworkManagerListener::HandleMessage(DBusMessage* message) {
if (dbus_message_is_signal(message, NM_DBUS_INTERFACE,
- NM_DBUS_SIGNAL_STATE_CHANGE)) {
+ NM_DBUS_SIGNAL_STATE_CHANGE) ||
+ dbus_message_is_signal(message, NM_DBUS_INTERFACE,
+ NM_DBUS_SIGNAL_STATE_CHANGED)) {
UpdateNetworkStatus(message);
return PR_TRUE;
}
@@ -191,7 +191,10 @@
mNetworkManagerActive = PR_TRUE;
PRBool wasUp = mLinkUp;
- mLinkUp = result == NM_STATE_CONNECTED;
+ mLinkUp = (result == NM_STATE_CONNECTED_OLD) ||
+ (result == NM_STATE_CONNECTED_LOCAL) ||
+ (result == NM_STATE_CONNECTED_SITE) ||
+ (result == NM_STATE_CONNECTED_GLOBAL);
if (wasUp == mLinkUp)
return;
xulrunner-2.0-network-link-service.patch:
nsIOService.cpp | 75 ++++++++++++++++++++++++++++++++++++++++++++++----------
nsIOService.h | 2 +
2 files changed, 64 insertions(+), 13 deletions(-)
--- NEW FILE xulrunner-2.0-network-link-service.patch ---
# HG changeset patch
# Parent 31879b88cc82c1f44e6a6c25a05aa2c70af22d7e
# User Martin Stransky <stransky(a)redhat.com>
Bug 627672 - XPCOM component (libdbusservice.so) is not registered although it should be; r=cbiesinger
diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp
--- a/netwerk/base/src/nsIOService.cpp
+++ b/netwerk/base/src/nsIOService.cpp
@@ -160,31 +160,33 @@ PRInt16 gBadPortList[] = {
2049, // nfs
4045, // lockd
6000, // x11
0, // This MUST be zero so that we can populating the array
};
static const char kProfileChangeNetTeardownTopic[] = "profile-change-net-teardown";
static const char kProfileChangeNetRestoreTopic[] = "profile-change-net-restore";
+static const char kStartupTopic[] = "profile-after-change";
// Necko buffer cache
nsIMemory* nsIOService::gBufferCache = nsnull;
PRUint32 nsIOService::gDefaultSegmentSize = 4096;
PRUint32 nsIOService::gDefaultSegmentCount = 24;
////////////////////////////////////////////////////////////////////////////////
nsIOService::nsIOService()
: mOffline(PR_TRUE)
, mOfflineForProfileChange(PR_FALSE)
, mManageOfflineStatus(PR_TRUE)
, mSettingOffline(PR_FALSE)
, mSetOfflineValue(PR_FALSE)
, mShutdown(PR_FALSE)
+ , mNetworkLinkServiceInitialized(PR_FALSE)
, mChannelEventSinks(NS_CHANNEL_EVENT_SINK_CATEGORY)
, mContentSniffers(NS_CONTENT_SNIFFER_CATEGORY)
, mAutoDialEnabled(PR_FALSE)
{
}
nsresult
nsIOService::Init()
@@ -230,16 +232,17 @@ nsIOService::Init()
}
// Register for profile change notifications
nsCOMPtr<nsIObserverService> observerService =
mozilla::services::GetObserverService();
if (observerService) {
observerService->AddObserver(this, kProfileChangeNetTeardownTopic, PR_TRUE);
observerService->AddObserver(this, kProfileChangeNetRestoreTopic, PR_TRUE);
+ observerService->AddObserver(this, kStartupTopic, PR_TRUE);
observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE);
observerService->AddObserver(this, NS_NETWORK_LINK_TOPIC, PR_TRUE);
}
else
NS_WARNING("failed to get observer service");
NS_TIME_FUNCTION_MARK("Registered observers");
@@ -258,29 +261,19 @@ nsIOService::Init()
NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Was unable to allocate. No gBufferCache.");
CallQueryInterface(recyclingAllocator, &gBufferCache);
}
NS_TIME_FUNCTION_MARK("Set up the recycling allocator");
gIOService = this;
- // go into managed mode if we can, and chrome process
- if (XRE_GetProcessType() == GeckoProcessType_Default)
- mNetworkLinkService = do_GetService(NS_NETWORK_LINK_SERVICE_CONTRACTID);
-
- if (!mNetworkLinkService)
- // We can't really determine if the machine has a usable network connection,
- // so let's cross our fingers!
- mManageOfflineStatus = PR_FALSE;
-
- if (mManageOfflineStatus)
- TrackNetworkLinkStatusForOffline();
- else
- SetOffline(PR_FALSE);
+ // We can't really determine if the machine has a usable network connection,
+ // (mNetworkLinkService will be initialized later) so let's cross our fingers!
+ SetOffline(PR_FALSE);
NS_TIME_FUNCTION_MARK("Set up network link service");
return NS_OK;
}
nsIOService::~nsIOService()
@@ -306,16 +299,57 @@ nsIOService::InitializeSocketTransportSe
rv = mSocketTransportService->Init();
NS_ASSERTION(NS_SUCCEEDED(rv), "socket transport service init failed");
mSocketTransportService->SetAutodialEnabled(mAutoDialEnabled);
}
return rv;
}
+nsresult
+nsIOService::InitializeNetworkLinkService()
+{
+ NS_TIME_FUNCTION;
+
+ nsresult rv = NS_OK;
+
+ if (mNetworkLinkServiceInitialized)
+ return rv;
+
+#if defined(MOZ_PLATFORM_MAEMO)
+ // libdbusservice fails to initialize on Maemo platform, see Bug 627672
+ mNetworkLinkService = NULL;
+#else
+ // go into managed mode if we can, and chrome process
+ if (XRE_GetProcessType() == GeckoProcessType_Default)
+ {
+ mNetworkLinkService = do_GetService(NS_NETWORK_LINK_SERVICE_CONTRACTID, &rv);
+ if (NS_FAILED(rv)) {
+ NS_WARNING("failed to get network link service");
+ return rv;
+ }
+ }
+#endif
+
+ mNetworkLinkServiceInitialized = PR_TRUE;
+
+ if (!mNetworkLinkService) {
+ // We can't really determine if the machine has a usable network connection,
+ // so let's cross our fingers!
+ mManageOfflineStatus = PR_FALSE;
+ }
+
+ if (mManageOfflineStatus)
+ TrackNetworkLinkStatusForOffline();
+ else
+ SetOffline(PR_FALSE);
+
+ return rv;
+}
+
nsIOService*
nsIOService::GetInstance() {
if (!gIOService) {
gIOService = new nsIOService();
if (!gIOService)
return nsnull;
NS_ADDREF(gIOService);
@@ -689,16 +723,19 @@ nsIOService::NewChannel(const nsACString
if (NS_FAILED(rv)) return rv;
return NewChannelFromURI(uri, result);
}
PRBool
nsIOService::IsLinkUp()
{
+ NS_ASSERTION(mNetworkLinkServiceInitialized,
+ "network link service should be initialized");
+
if (!mNetworkLinkService) {
// We cannot decide, assume the link is up
return PR_TRUE;
}
PRBool isLinkUp;
nsresult rv;
rv = mNetworkLinkService->GetIsLinkUp(&isLinkUp);
@@ -968,16 +1005,20 @@ nsIOService::Observe(nsISupports *subjec
if (mOfflineForProfileChange) {
mOfflineForProfileChange = PR_FALSE;
if (!mManageOfflineStatus ||
NS_FAILED(TrackNetworkLinkStatusForOffline())) {
SetOffline(PR_FALSE);
}
}
}
+ else if (!strcmp(topic, kStartupTopic)) {
+ // Lazy initialization of network link service (see bug 620472)
+ InitializeNetworkLinkService();
+ }
else if (!strcmp(topic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
// Remember we passed XPCOM shutdown notification to prevent any
// changes of the offline status from now. We must not allow going
// online after this point.
mShutdown = PR_TRUE;
SetOffline(PR_TRUE);
@@ -1085,32 +1126,40 @@ nsIOService::NewSimpleNestedURI(nsIURI*
NS_IF_ADDREF(*aResult = new nsSimpleNestedURI(safeURI));
return *aResult ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
}
NS_IMETHODIMP
nsIOService::SetManageOfflineStatus(PRBool aManage) {
PRBool wasManaged = mManageOfflineStatus;
mManageOfflineStatus = aManage;
+
+ if (!mNetworkLinkServiceInitialized) {
+ InitializeNetworkLinkService();
+ }
+
if (mManageOfflineStatus && !wasManaged)
return TrackNetworkLinkStatusForOffline();
return NS_OK;
}
NS_IMETHODIMP
nsIOService::GetManageOfflineStatus(PRBool* aManage) {
*aManage = mManageOfflineStatus;
return NS_OK;
}
nsresult
nsIOService::TrackNetworkLinkStatusForOffline()
{
NS_ASSERTION(mManageOfflineStatus,
"Don't call this unless we're managing the offline status");
+ NS_ASSERTION(mNetworkLinkServiceInitialized,
+ "network link service should be set up");
+
if (!mNetworkLinkService)
return NS_ERROR_FAILURE;
if (mShutdown)
return NS_ERROR_NOT_AVAILABLE;
// check to make sure this won't collide with Autodial
if (mSocketTransportService) {
diff --git a/netwerk/base/src/nsIOService.h b/netwerk/base/src/nsIOService.h
--- a/netwerk/base/src/nsIOService.h
+++ b/netwerk/base/src/nsIOService.h
@@ -129,16 +129,17 @@ private:
nsIProtocolHandler* hdlr);
// Prefs wrangling
NS_HIDDEN_(void) PrefsChanged(nsIPrefBranch *prefs, const char *pref = nsnull);
NS_HIDDEN_(void) GetPrefBranch(nsIPrefBranch2 **);
NS_HIDDEN_(void) ParsePortList(nsIPrefBranch *prefBranch, const char *pref, PRBool remove);
nsresult InitializeSocketTransportService();
+ nsresult InitializeNetworkLinkService();
private:
PRPackedBool mOffline;
PRPackedBool mOfflineForProfileChange;
PRPackedBool mManageOfflineStatus;
// Used to handle SetOffline() reentrancy. See the comment in
// SetOffline() for more details.
@@ -146,16 +147,17 @@ private:
PRPackedBool mSetOfflineValue;
PRPackedBool mShutdown;
nsCOMPtr<nsPISocketTransportService> mSocketTransportService;
nsCOMPtr<nsPIDNSService> mDNSService;
nsCOMPtr<nsIProtocolProxyService2> mProxyService;
nsCOMPtr<nsINetworkLinkService> mNetworkLinkService;
+ PRPackedBool mNetworkLinkServiceInitialized;
// Cached protocol handlers
nsWeakPtr mWeakHandler[NS_N(gScheme)];
// cached categories
nsCategoryCache<nsIChannelEventSink> mChannelEventSinks;
nsCategoryCache<nsIContentSniffer> mContentSniffers;
xulrunner-install.patch:
packager.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xulrunner-install.patch ---
diff -up comm-release/mozilla/toolkit/mozapps/installer/packager.mk.install comm-release/mozilla/toolkit/mozapps/installer/packager.mk
--- comm-release/mozilla/toolkit/mozapps/installer/packager.mk.install 2011-11-05 10:21:10.000000000 +0100
+++ comm-release/mozilla/toolkit/mozapps/installer/packager.mk 2011-11-08 18:48:08.674042803 +0100
@@ -401,7 +401,7 @@ PRECOMPILE_GRE=$$PWD
endif
GENERATE_CACHE = \
- $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js -e "populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');" && \
+ $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e "populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');" && \
rm -rf jsloader && \
$(UNZIP) startupCache.zip && \
rm startupCache.zip && \
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 1 Oct 2011 08:26:28 -0000 1.10
+++ .cvsignore 12 Nov 2011 18:28:27 -0000 1.11
@@ -1,2 +1,2 @@
-thunderbird-7.0.source.tar.bz2
-enigmail-1.3.2.tar.gz
+enigmail-1.3.3.tar.gz
+thunderbird-8.0.source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 1 Oct 2011 08:26:28 -0000 1.13
+++ sources 12 Nov 2011 18:28:27 -0000 1.14
@@ -1,2 +1,2 @@
-6a4b2dbdc2324f52c019a3a8dee6dad4 thunderbird-7.0.source.tar.bz2
-2318d60320dc6c3db3c34d968bb7d533 enigmail-1.3.2.tar.gz
+f62cf6b574ed34a550069ab339d15c59 enigmail-1.3.3.tar.gz
+332f60036aebdce7dec6ee2b1af4941d thunderbird-8.0.source.tar.bz2
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/thunderbird-enigmail.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- thunderbird-enigmail.spec 1 Oct 2011 08:26:28 -0000 1.13
+++ thunderbird-enigmail.spec 12 Nov 2011 18:28:27 -0000 1.14
@@ -7,7 +7,7 @@
%define build_langpacks 1
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
-%global thunver 7.0
+%global thunver 8.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -25,7 +25,7 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.3.2
+Version: 1.3.3
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
@@ -58,6 +58,12 @@
Patch0: thunderbird-install-dir.patch
Patch7: crashreporter-remove-static.patch
Patch8: xulrunner-6.0-secondary-ipc.patch
+Patch9: mozilla-670719.patch
+Patch10: xulrunner-2.0-network-link-service.patch
+Patch11: xulrunner-2.0-NetworkManager09.patch
+
+# Build patches
+Patch100: xulrunner-install.patch
%if %{official_branding}
@@ -130,6 +136,10 @@
cd mozilla
%patch7 -p2 -b .static
%patch8 -p2 -b .secondary-ipc
+%patch9 -p1 -b .moz670719
+%patch10 -p1 -b .link-service
+%patch11 -p1 -b .NetworkManager09
+%patch100 -p2 -b .install
cd ..
%if %{official_branding}
@@ -198,19 +208,20 @@
export PREFIX='%{_prefix}'
export LIBDIR='%{_libdir}'
-%define moz_make_flags -j1
-%ifarch ppc ppc64 s390 s390x
-%define moz_make_flags -j1
-%else
-%define moz_make_flags %{?_smp_mflags}
+MOZ_SMP_FLAGS=-j1
+# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
+# however builds tend to fail on other arches when building in parallel.
+%ifarch %{ix86} x86_64
+[ -z "$RPM_BUILD_NCPUS" ] && \
+ RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
+[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
+[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
%endif
-export LDFLAGS="-Wl,-rpath,%{mozappdir}"
-export MAKE="gmake %{moz_make_flags}"
# ===== Thunderbird build =====
# http://enigmail.mozdev.org/download/source.php.html
-make -f client.mk build
+make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
# ===== Enigmail work =====
pushd mailnews/extensions/enigmail
@@ -244,6 +255,12 @@
#===============================================================================
%changelog
+* Sat Nov 12 2011 Remi Collet <remi(a)fedoraproject.org> 1.3.3-1
+- Enigmail 1.3.3 for Thunderbird 8.0
+
+* Sat Oct 01 2011 Remi Collet <remi(a)fedoraproject.org> 1.3.2-1.1
+- remove unused patch
+
* Sat Oct 01 2011 Remi Collet <remi(a)fedoraproject.org> 1.3.2-1
- Enigmail 1.3.2 for Thunderbird 7.0.x
- fix extension version
13 years
rpms/thunderbird-enigmail/F-16 mozilla-670719.patch, NONE, 1.1 xulrunner-2.0-NetworkManager09.patch, NONE, 1.1 xulrunner-2.0-network-link-service.patch, NONE, 1.1 xulrunner-install.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.13, 1.14 thunderbird-enigmail.spec, 1.15, 1.16
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23898
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
Added Files:
mozilla-670719.patch xulrunner-2.0-NetworkManager09.patch
xulrunner-2.0-network-link-service.patch
xulrunner-install.patch
Log Message:
update to 1.3.3 for thunderbird 8
mozilla-670719.patch:
Makefile.in | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- NEW FILE mozilla-670719.patch ---
# HG changeset patch
# User Mike Hommey <mh+mozilla(a)glandium.org>
# Date 1313846520 -7200
# Node ID fdc3b63938f5a76d99c1e2bb12fd448465debc94
# Parent 07a5a618ebe3f67b23100ceb1b51e92bb79be0cd
Bug 670719 - Only add -DENABLE_JIT=1 to CXXFLAGS if any of trace/method/yarr jit is enabled.
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -433,16 +433,19 @@ CPPSRCS += \
YarrPattern.cpp \
YarrSyntaxChecker.cpp \
$(NULL)
else
###############################################
# BEGIN include sources for the Nitro assembler
#
+
+ENABLE_YARR_JIT = 1
+
VPATH += $(srcdir)/assembler \
$(srcdir)/assembler/wtf \
$(srcdir)/assembler/jit \
$(srcdir)/assembler/assembler \
$(srcdir)/methodjit \
$(srcdir)/yarr \
$(NONE)
@@ -1070,17 +1073,21 @@ endif
###############################################
# BEGIN kludges for the Nitro assembler
#
# Needed to "configure" it correctly. Unfortunately these
# flags wind up being applied to all code in js/src, not just
# the code in js/src/assembler.
-CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1
+
+ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT))
+CXXFLAGS += -DENABLE_JIT=1
+endif
INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr
ifdef ENABLE_METHODJIT
# Build a standalone test program that exercises the assembler
# sources a bit.
TESTMAIN_OBJS = \
Assertions.$(OBJ_SUFFIX) \
xulrunner-2.0-NetworkManager09.patch:
nsNetworkManagerListener.cpp | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
--- NEW FILE xulrunner-2.0-NetworkManager09.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=639959
--- source/toolkit/system/dbus/nsNetworkManagerListener.cpp.foo 2011-03-08 14:26:28.167074923 -0600
+++ source/toolkit/system/dbus/nsNetworkManagerListener.cpp 2011-03-08 14:30:54.260748294 -0600
@@ -51,15 +51,13 @@
#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager"
#define NM_DBUS_PATH "/org/freedesktop/NetworkManager"
#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager"
-#define NM_DBUS_SIGNAL_STATE_CHANGE "StateChange"
-typedef enum NMState
-{
- NM_STATE_UNKNOWN = 0,
- NM_STATE_ASLEEP,
- NM_STATE_CONNECTING,
- NM_STATE_CONNECTED,
- NM_STATE_DISCONNECTED
-} NMState;
+#define NM_DBUS_SIGNAL_STATE_CHANGE "StateChange" /* Deprecated in 0.7.x */
+#define NM_DBUS_SIGNAL_STATE_CHANGED "StateChanged"
+
+#define NM_STATE_CONNECTED_OLD 3
+#define NM_STATE_CONNECTED_LOCAL 50
+#define NM_STATE_CONNECTED_SITE 60
+#define NM_STATE_CONNECTED_GLOBAL 70
nsNetworkManagerListener::nsNetworkManagerListener() :
mLinkUp(PR_TRUE), mNetworkManagerActive(PR_FALSE),
@@ -174,7 +172,9 @@
PRBool
nsNetworkManagerListener::HandleMessage(DBusMessage* message) {
if (dbus_message_is_signal(message, NM_DBUS_INTERFACE,
- NM_DBUS_SIGNAL_STATE_CHANGE)) {
+ NM_DBUS_SIGNAL_STATE_CHANGE) ||
+ dbus_message_is_signal(message, NM_DBUS_INTERFACE,
+ NM_DBUS_SIGNAL_STATE_CHANGED)) {
UpdateNetworkStatus(message);
return PR_TRUE;
}
@@ -191,7 +191,10 @@
mNetworkManagerActive = PR_TRUE;
PRBool wasUp = mLinkUp;
- mLinkUp = result == NM_STATE_CONNECTED;
+ mLinkUp = (result == NM_STATE_CONNECTED_OLD) ||
+ (result == NM_STATE_CONNECTED_LOCAL) ||
+ (result == NM_STATE_CONNECTED_SITE) ||
+ (result == NM_STATE_CONNECTED_GLOBAL);
if (wasUp == mLinkUp)
return;
xulrunner-2.0-network-link-service.patch:
nsIOService.cpp | 75 ++++++++++++++++++++++++++++++++++++++++++++++----------
nsIOService.h | 2 +
2 files changed, 64 insertions(+), 13 deletions(-)
--- NEW FILE xulrunner-2.0-network-link-service.patch ---
# HG changeset patch
# Parent 31879b88cc82c1f44e6a6c25a05aa2c70af22d7e
# User Martin Stransky <stransky(a)redhat.com>
Bug 627672 - XPCOM component (libdbusservice.so) is not registered although it should be; r=cbiesinger
diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp
--- a/netwerk/base/src/nsIOService.cpp
+++ b/netwerk/base/src/nsIOService.cpp
@@ -160,31 +160,33 @@ PRInt16 gBadPortList[] = {
2049, // nfs
4045, // lockd
6000, // x11
0, // This MUST be zero so that we can populating the array
};
static const char kProfileChangeNetTeardownTopic[] = "profile-change-net-teardown";
static const char kProfileChangeNetRestoreTopic[] = "profile-change-net-restore";
+static const char kStartupTopic[] = "profile-after-change";
// Necko buffer cache
nsIMemory* nsIOService::gBufferCache = nsnull;
PRUint32 nsIOService::gDefaultSegmentSize = 4096;
PRUint32 nsIOService::gDefaultSegmentCount = 24;
////////////////////////////////////////////////////////////////////////////////
nsIOService::nsIOService()
: mOffline(PR_TRUE)
, mOfflineForProfileChange(PR_FALSE)
, mManageOfflineStatus(PR_TRUE)
, mSettingOffline(PR_FALSE)
, mSetOfflineValue(PR_FALSE)
, mShutdown(PR_FALSE)
+ , mNetworkLinkServiceInitialized(PR_FALSE)
, mChannelEventSinks(NS_CHANNEL_EVENT_SINK_CATEGORY)
, mContentSniffers(NS_CONTENT_SNIFFER_CATEGORY)
, mAutoDialEnabled(PR_FALSE)
{
}
nsresult
nsIOService::Init()
@@ -230,16 +232,17 @@ nsIOService::Init()
}
// Register for profile change notifications
nsCOMPtr<nsIObserverService> observerService =
mozilla::services::GetObserverService();
if (observerService) {
observerService->AddObserver(this, kProfileChangeNetTeardownTopic, PR_TRUE);
observerService->AddObserver(this, kProfileChangeNetRestoreTopic, PR_TRUE);
+ observerService->AddObserver(this, kStartupTopic, PR_TRUE);
observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE);
observerService->AddObserver(this, NS_NETWORK_LINK_TOPIC, PR_TRUE);
}
else
NS_WARNING("failed to get observer service");
NS_TIME_FUNCTION_MARK("Registered observers");
@@ -258,29 +261,19 @@ nsIOService::Init()
NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Was unable to allocate. No gBufferCache.");
CallQueryInterface(recyclingAllocator, &gBufferCache);
}
NS_TIME_FUNCTION_MARK("Set up the recycling allocator");
gIOService = this;
- // go into managed mode if we can, and chrome process
- if (XRE_GetProcessType() == GeckoProcessType_Default)
- mNetworkLinkService = do_GetService(NS_NETWORK_LINK_SERVICE_CONTRACTID);
-
- if (!mNetworkLinkService)
- // We can't really determine if the machine has a usable network connection,
- // so let's cross our fingers!
- mManageOfflineStatus = PR_FALSE;
-
- if (mManageOfflineStatus)
- TrackNetworkLinkStatusForOffline();
- else
- SetOffline(PR_FALSE);
+ // We can't really determine if the machine has a usable network connection,
+ // (mNetworkLinkService will be initialized later) so let's cross our fingers!
+ SetOffline(PR_FALSE);
NS_TIME_FUNCTION_MARK("Set up network link service");
return NS_OK;
}
nsIOService::~nsIOService()
@@ -306,16 +299,57 @@ nsIOService::InitializeSocketTransportSe
rv = mSocketTransportService->Init();
NS_ASSERTION(NS_SUCCEEDED(rv), "socket transport service init failed");
mSocketTransportService->SetAutodialEnabled(mAutoDialEnabled);
}
return rv;
}
+nsresult
+nsIOService::InitializeNetworkLinkService()
+{
+ NS_TIME_FUNCTION;
+
+ nsresult rv = NS_OK;
+
+ if (mNetworkLinkServiceInitialized)
+ return rv;
+
+#if defined(MOZ_PLATFORM_MAEMO)
+ // libdbusservice fails to initialize on Maemo platform, see Bug 627672
+ mNetworkLinkService = NULL;
+#else
+ // go into managed mode if we can, and chrome process
+ if (XRE_GetProcessType() == GeckoProcessType_Default)
+ {
+ mNetworkLinkService = do_GetService(NS_NETWORK_LINK_SERVICE_CONTRACTID, &rv);
+ if (NS_FAILED(rv)) {
+ NS_WARNING("failed to get network link service");
+ return rv;
+ }
+ }
+#endif
+
+ mNetworkLinkServiceInitialized = PR_TRUE;
+
+ if (!mNetworkLinkService) {
+ // We can't really determine if the machine has a usable network connection,
+ // so let's cross our fingers!
+ mManageOfflineStatus = PR_FALSE;
+ }
+
+ if (mManageOfflineStatus)
+ TrackNetworkLinkStatusForOffline();
+ else
+ SetOffline(PR_FALSE);
+
+ return rv;
+}
+
nsIOService*
nsIOService::GetInstance() {
if (!gIOService) {
gIOService = new nsIOService();
if (!gIOService)
return nsnull;
NS_ADDREF(gIOService);
@@ -689,16 +723,19 @@ nsIOService::NewChannel(const nsACString
if (NS_FAILED(rv)) return rv;
return NewChannelFromURI(uri, result);
}
PRBool
nsIOService::IsLinkUp()
{
+ NS_ASSERTION(mNetworkLinkServiceInitialized,
+ "network link service should be initialized");
+
if (!mNetworkLinkService) {
// We cannot decide, assume the link is up
return PR_TRUE;
}
PRBool isLinkUp;
nsresult rv;
rv = mNetworkLinkService->GetIsLinkUp(&isLinkUp);
@@ -968,16 +1005,20 @@ nsIOService::Observe(nsISupports *subjec
if (mOfflineForProfileChange) {
mOfflineForProfileChange = PR_FALSE;
if (!mManageOfflineStatus ||
NS_FAILED(TrackNetworkLinkStatusForOffline())) {
SetOffline(PR_FALSE);
}
}
}
+ else if (!strcmp(topic, kStartupTopic)) {
+ // Lazy initialization of network link service (see bug 620472)
+ InitializeNetworkLinkService();
+ }
else if (!strcmp(topic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
// Remember we passed XPCOM shutdown notification to prevent any
// changes of the offline status from now. We must not allow going
// online after this point.
mShutdown = PR_TRUE;
SetOffline(PR_TRUE);
@@ -1085,32 +1126,40 @@ nsIOService::NewSimpleNestedURI(nsIURI*
NS_IF_ADDREF(*aResult = new nsSimpleNestedURI(safeURI));
return *aResult ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
}
NS_IMETHODIMP
nsIOService::SetManageOfflineStatus(PRBool aManage) {
PRBool wasManaged = mManageOfflineStatus;
mManageOfflineStatus = aManage;
+
+ if (!mNetworkLinkServiceInitialized) {
+ InitializeNetworkLinkService();
+ }
+
if (mManageOfflineStatus && !wasManaged)
return TrackNetworkLinkStatusForOffline();
return NS_OK;
}
NS_IMETHODIMP
nsIOService::GetManageOfflineStatus(PRBool* aManage) {
*aManage = mManageOfflineStatus;
return NS_OK;
}
nsresult
nsIOService::TrackNetworkLinkStatusForOffline()
{
NS_ASSERTION(mManageOfflineStatus,
"Don't call this unless we're managing the offline status");
+ NS_ASSERTION(mNetworkLinkServiceInitialized,
+ "network link service should be set up");
+
if (!mNetworkLinkService)
return NS_ERROR_FAILURE;
if (mShutdown)
return NS_ERROR_NOT_AVAILABLE;
// check to make sure this won't collide with Autodial
if (mSocketTransportService) {
diff --git a/netwerk/base/src/nsIOService.h b/netwerk/base/src/nsIOService.h
--- a/netwerk/base/src/nsIOService.h
+++ b/netwerk/base/src/nsIOService.h
@@ -129,16 +129,17 @@ private:
nsIProtocolHandler* hdlr);
// Prefs wrangling
NS_HIDDEN_(void) PrefsChanged(nsIPrefBranch *prefs, const char *pref = nsnull);
NS_HIDDEN_(void) GetPrefBranch(nsIPrefBranch2 **);
NS_HIDDEN_(void) ParsePortList(nsIPrefBranch *prefBranch, const char *pref, PRBool remove);
nsresult InitializeSocketTransportService();
+ nsresult InitializeNetworkLinkService();
private:
PRPackedBool mOffline;
PRPackedBool mOfflineForProfileChange;
PRPackedBool mManageOfflineStatus;
// Used to handle SetOffline() reentrancy. See the comment in
// SetOffline() for more details.
@@ -146,16 +147,17 @@ private:
PRPackedBool mSetOfflineValue;
PRPackedBool mShutdown;
nsCOMPtr<nsPISocketTransportService> mSocketTransportService;
nsCOMPtr<nsPIDNSService> mDNSService;
nsCOMPtr<nsIProtocolProxyService2> mProxyService;
nsCOMPtr<nsINetworkLinkService> mNetworkLinkService;
+ PRPackedBool mNetworkLinkServiceInitialized;
// Cached protocol handlers
nsWeakPtr mWeakHandler[NS_N(gScheme)];
// cached categories
nsCategoryCache<nsIChannelEventSink> mChannelEventSinks;
nsCategoryCache<nsIContentSniffer> mContentSniffers;
xulrunner-install.patch:
packager.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xulrunner-install.patch ---
diff -up comm-release/mozilla/toolkit/mozapps/installer/packager.mk.install comm-release/mozilla/toolkit/mozapps/installer/packager.mk
--- comm-release/mozilla/toolkit/mozapps/installer/packager.mk.install 2011-11-05 10:21:10.000000000 +0100
+++ comm-release/mozilla/toolkit/mozapps/installer/packager.mk 2011-11-08 18:48:08.674042803 +0100
@@ -401,7 +401,7 @@ PRECOMPILE_GRE=$$PWD
endif
GENERATE_CACHE = \
- $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js -e "populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');" && \
+ $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e "populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');" && \
rm -rf jsloader && \
$(UNZIP) startupCache.zip && \
rm startupCache.zip && \
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 1 Oct 2011 06:16:00 -0000 1.12
+++ .cvsignore 12 Nov 2011 18:26:36 -0000 1.13
@@ -1,2 +1,2 @@
-thunderbird-7.0.source.tar.bz2
-enigmail-1.3.2.tar.gz
+enigmail-1.3.3.tar.gz
+thunderbird-8.0.source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 1 Oct 2011 06:16:00 -0000 1.13
+++ sources 12 Nov 2011 18:26:36 -0000 1.14
@@ -1,2 +1,2 @@
-6a4b2dbdc2324f52c019a3a8dee6dad4 thunderbird-7.0.source.tar.bz2
-2318d60320dc6c3db3c34d968bb7d533 enigmail-1.3.2.tar.gz
+f62cf6b574ed34a550069ab339d15c59 enigmail-1.3.3.tar.gz
+332f60036aebdce7dec6ee2b1af4941d thunderbird-8.0.source.tar.bz2
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/thunderbird-enigmail.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- thunderbird-enigmail.spec 1 Oct 2011 06:36:23 -0000 1.15
+++ thunderbird-enigmail.spec 12 Nov 2011 18:26:36 -0000 1.16
@@ -7,7 +7,7 @@
%define build_langpacks 1
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
-%global thunver 7.0
+%global thunver 8.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -25,11 +25,11 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.3.2
+Version: 1.3.3
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 1%{?dist}.1
+Release: 1%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -58,6 +58,12 @@
Patch0: thunderbird-install-dir.patch
Patch7: crashreporter-remove-static.patch
Patch8: xulrunner-6.0-secondary-ipc.patch
+Patch9: mozilla-670719.patch
+Patch10: xulrunner-2.0-network-link-service.patch
+Patch11: xulrunner-2.0-NetworkManager09.patch
+
+# Build patches
+Patch100: xulrunner-install.patch
%if %{official_branding}
@@ -130,6 +136,10 @@
cd mozilla
%patch7 -p2 -b .static
%patch8 -p2 -b .secondary-ipc
+%patch9 -p1 -b .moz670719
+%patch10 -p1 -b .link-service
+%patch11 -p1 -b .NetworkManager09
+%patch100 -p2 -b .install
cd ..
%if %{official_branding}
@@ -198,19 +208,20 @@
export PREFIX='%{_prefix}'
export LIBDIR='%{_libdir}'
-%define moz_make_flags -j1
-%ifarch ppc ppc64 s390 s390x
-%define moz_make_flags -j1
-%else
-%define moz_make_flags %{?_smp_mflags}
+MOZ_SMP_FLAGS=-j1
+# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
+# however builds tend to fail on other arches when building in parallel.
+%ifarch %{ix86} x86_64
+[ -z "$RPM_BUILD_NCPUS" ] && \
+ RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
+[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
+[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
%endif
-export LDFLAGS="-Wl,-rpath,%{mozappdir}"
-export MAKE="gmake %{moz_make_flags}"
# ===== Thunderbird build =====
# http://enigmail.mozdev.org/download/source.php.html
-make -f client.mk build
+make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
# ===== Enigmail work =====
pushd mailnews/extensions/enigmail
@@ -244,6 +255,9 @@
#===============================================================================
%changelog
+* Sat Nov 12 2011 Remi Collet <remi(a)fedoraproject.org> 1.3.3-1
+- Enigmail 1.3.3 for Thunderbird 8.0
+
* Sat Oct 01 2011 Remi Collet <remi(a)fedoraproject.org> 1.3.2-1.1
- remove unused patch
13 years