rpms/west-chamber-kmod/F-17 west-chamber-kmod.spec,1.17,1.18
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/west-chamber-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4802
Modified Files:
west-chamber-kmod.spec
Log Message:
* Sat Apr 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn.9
- rebuild for updated kernel
Index: west-chamber-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/F-17/west-chamber-kmod.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- west-chamber-kmod.spec 22 Apr 2012 10:55:58 -0000 1.17
+++ west-chamber-kmod.spec 28 Apr 2012 22:50:42 -0000 1.18
@@ -11,7 +11,7 @@
Name: west-chamber-kmod
Summary: Kernel module (kmod) for west-chamber
Version: 0.0.1
-Release: 7.%{?svndate}svn%{?dist}.8
+Release: 7.%{?svndate}svn%{?dist}.9
License: GPLv2+
Group: System Environment/Kernel
URL: http://code.google.com/p/scholarzhang/
@@ -82,6 +82,9 @@
rm -rf %{buildroot}
%changelog
+* Sat Apr 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn.9
+- rebuild for updated kernel
+
* Sun Apr 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn.8
- rebuild for updated kernel
12 years, 7 months
- 1
- 0
rpms/staging-kmod/F-17 staging-kmod.spec,1.27,1.28
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/staging-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4584
Modified Files:
staging-kmod.spec
Log Message:
* Sat Apr 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.7
- rebuild for updated kernel
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-17/staging-kmod.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- staging-kmod.spec 22 Apr 2012 10:55:43 -0000 1.27
+++ staging-kmod.spec 28 Apr 2012 22:50:30 -0000 1.28
@@ -20,7 +20,7 @@
Name: staging-kmod
Version: 3.3
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.6
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.7
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -127,6 +127,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Apr 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.7
+- rebuild for updated kernel
+
* Sun Apr 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.6
- rebuild for updated kernel
12 years, 7 months
- 1
- 0
rpms/openafs-kmod/F-17 openafs-kmod.spec,1.23,1.24
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/openafs-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4457
Modified Files:
openafs-kmod.spec
Log Message:
* Sat Apr 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.4
- rebuild for updated kernel
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-17/openafs-kmod.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- openafs-kmod.spec 22 Apr 2012 10:55:35 -0000 1.23
+++ openafs-kmod.spec 28 Apr 2012 22:50:22 -0000 1.24
@@ -21,7 +21,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.1
-Release: 1%{?dist}.3
+Release: 1%{?dist}.4
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -94,6 +94,9 @@
%changelog
+* Sat Apr 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.4
+- rebuild for updated kernel
+
* Sun Apr 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.3
- rebuild for updated kernel
12 years, 7 months
- 1
- 0
rpms/ndiswrapper-kmod/F-17 ndiswrapper-kmod.spec,1.60,1.61
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ndiswrapper-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4331
Modified Files:
ndiswrapper-kmod.spec
Log Message:
* Sat Apr 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-2.4
- rebuild for updated kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-17/ndiswrapper-kmod.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ndiswrapper-kmod.spec 22 Apr 2012 10:55:27 -0000 1.60
+++ ndiswrapper-kmod.spec 28 Apr 2012 22:50:15 -0000 1.61
@@ -10,7 +10,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.57
-Release: 2%{?dist}.3
+Release: 2%{?dist}.4
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -77,6 +77,9 @@
%changelog
+* Sat Apr 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-2.4
+- rebuild for updated kernel
+
* Sun Apr 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-2.3
- rebuild for updated kernel
12 years, 7 months
- 1
- 0
rpms/buildsys-build-rpmfusion/F-17 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.28, 1.29 buildsys-build-rpmfusion.spec, 1.40, 1.41
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3849
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Sat Apr 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-0.5
- rebuild for kernel 3.3.4-1.fc17
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-17/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- buildsys-build-rpmfusion-kerneldevpkgs-current 22 Apr 2012 10:29:04 -0000 1.28
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 28 Apr 2012 22:34:43 -0000 1.29
@@ -1,3 +1,3 @@
-3.3.2-8.fc17
-3.3.2-8.fc17smp
-3.3.2-8.fc17PAE
+3.3.4-1.fc17
+3.3.4-1.fc17smp
+3.3.4-1.fc17PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-17/buildsys-build-rpmfusion.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- buildsys-build-rpmfusion.spec 22 Apr 2012 10:29:04 -0000 1.40
+++ buildsys-build-rpmfusion.spec 28 Apr 2012 22:34:43 -0000 1.41
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 17
-Release: 0.4
+Release: 0.5
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Sat Apr 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-0.5
+- rebuild for kernel 3.3.4-1.fc17
+
* Sun Apr 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-0.4
- rebuild for kernel 3.3.2-8.fc17
12 years, 7 months
- 1
- 0
rpms/mythtv/devel mythbackend.logrotate, 1.1, 1.2 mythtv-0.25-fixes.patch, 1.3, 1.4 mythtv.spec, 1.93, 1.94
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18038
Modified Files:
mythbackend.logrotate mythtv-0.25-fixes.patch mythtv.spec
Log Message:
* Sat Apr 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-3
- Update to latest 0.25/fixes.
- Really fix logrotate this time.
Index: mythbackend.logrotate
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythbackend.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythbackend.logrotate 3 Mar 2011 02:45:10 -0000 1.1
+++ mythbackend.logrotate 28 Apr 2012 20:33:29 -0000 1.2
@@ -1,4 +1,4 @@
-/var/log/mythtv/mythbackend.log {
+/var/log/mythtv/mythbackend.log /var/log/mythtv/myth*.*.*.log {
notifempty
missingok
compress
@@ -9,6 +9,6 @@
rotate 4
size 10M
postrotate
- /bin/kill -HUP `cat /var/run/mythbackend.pid 2>/dev/null` 2> /dev/null || true
+ /bin/systemctl kill mythbackend.service --signal=HUP --kill-who=main 2>/dev/null || true
endscript
}
mythtv-0.25-fixes.patch:
mythplugins/mytharchive/i18n/mytharchive_fi.qm |binary
mythplugins/mytharchive/i18n/mytharchive_fi.ts | 238
mythplugins/mythbrowser/i18n/mythbrowser_fi.qm |binary
mythplugins/mythbrowser/i18n/mythbrowser_fi.ts | 44
mythplugins/mythgallery/i18n/mythgallery_fi.qm |binary
mythplugins/mythgallery/i18n/mythgallery_fi.ts | 264
mythplugins/mythgame/i18n/mythgame_fi.qm |binary
mythplugins/mythgame/i18n/mythgame_fi.ts | 178
mythplugins/mythmusic/i18n/mythmusic_fi.qm |binary
mythplugins/mythmusic/i18n/mythmusic_fi.ts | 2219 +++++-
mythplugins/mythmusic/mythmusic/visualize.cpp | 60
mythplugins/mythnetvision/i18n/mythnetvision_fi.qm |binary
mythplugins/mythnetvision/i18n/mythnetvision_fi.ts | 96
mythplugins/mythnetvision/mythnetvision/nettree.cpp | 8
mythplugins/mythnetvision/mythnetvision/rsseditor.cpp | 6
mythplugins/mythnews/i18n/mythnews_fi.qm |binary
mythplugins/mythnews/i18n/mythnews_fi.ts | 44
mythplugins/mythweather/i18n/mythweather_fi.qm |binary
mythplugins/mythweather/i18n/mythweather_fi.ts | 60
mythplugins/mythzoneminder/i18n/mythzoneminder_fi.qm |binary
mythplugins/mythzoneminder/i18n/mythzoneminder_fi.ts | 84
mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 3
mythtv/VERSION | 2
mythtv/bindings/python/MythTV/mythproto.py | 4
mythtv/bindings/python/MythTV/static.py | 2
mythtv/configure | 15
mythtv/docs/doxygen-create-developer-docs.cfg | 2
mythtv/filters/yadif/filter_yadif.c | 2
mythtv/i18n/mythfrontend_fi.qm |binary
mythtv/i18n/mythfrontend_fi.ts | 3662 ++++++----
mythtv/i18n/mythfrontend_nb.qm |binary
mythtv/i18n/mythfrontend_nb.ts | 2
mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 2
mythtv/libs/libmyth/audio/audiooutputbase.cpp | 55
mythtv/libs/libmyth/audio/audiooutputbase.h | 4
mythtv/libs/libmyth/audio/audiooutputca.cpp | 2
mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp | 27
mythtv/libs/libmyth/remoteutil.cpp | 16
mythtv/libs/libmyth/remoteutil.h | 1
mythtv/libs/libmyth/rssparse.h | 1
mythtv/libs/libmythbase/bonjourregister.cpp | 5
mythtv/libs/libmythbase/compat.h | 2
mythtv/libs/libmythbase/logging.cpp | 3
mythtv/libs/libmythbase/serverpool.cpp | 46
mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp | 6
mythtv/libs/libmythsoundtouch/STTypes.h | 2
mythtv/libs/libmythsoundtouch/libmythsoundtouch.pro | 1
mythtv/libs/libmythtv/audioinput.h | 1
mythtv/libs/libmythtv/avformatdecoder.cpp | 10
mythtv/libs/libmythtv/dvdringbuffer.cpp | 49
mythtv/libs/libmythtv/fileringbuffer.cpp | 6
mythtv/libs/libmythtv/libmythtv.pro | 1
mythtv/libs/libmythtv/mythairplayserver.cpp | 2
mythtv/libs/libmythtv/mythplayer.cpp | 30
mythtv/libs/libmythtv/mythplayer.h | 3
mythtv/libs/libmythtv/mythraopconnection.cpp | 262
mythtv/libs/libmythtv/mythraopconnection.h | 13
mythtv/libs/libmythtv/mythraopdevice.cpp | 13
mythtv/libs/libmythtv/osd.cpp | 2
mythtv/libs/libmythtv/playercontext.h | 4
mythtv/libs/libmythtv/ringbuffer.cpp | 8
mythtv/libs/libmythtv/teletextscreen.cpp | 8
mythtv/libs/libmythtv/tv_play.cpp | 26
mythtv/libs/libmythtv/tv_rec.cpp | 3
mythtv/libs/libmythtv/tvremoteutil.cpp | 55
mythtv/libs/libmythtv/tvremoteutil.h | 7
mythtv/libs/libmythtv/videodisplayprofile.cpp | 3
mythtv/libs/libmythtv/videodisplayprofile.h | 2
mythtv/libs/libmythtv/videoout_xv.cpp | 7
mythtv/libs/libmythtv/videoout_xv.h | 1
mythtv/libs/libmythtv/videooutbase.cpp | 48
mythtv/libs/libmythui/mythmainwindow.cpp | 2
mythtv/libs/libmythupnp/httprequest.cpp | 1
mythtv/programs/mythbackend/filetransfer.cpp | 4
mythtv/programs/mythfrontend/audiogeneralsettings.cpp | 5
mythtv/programs/mythfrontend/globalsettings.cpp | 2
mythtv/programs/mythfrontend/guidegrid.cpp | 8
mythtv/programs/mythfrontend/scheduleeditor.cpp | 7
mythtv/programs/mythtranscode/transcode.h | 5
mythtv/programs/mythutil/markuputils.cpp | 4
mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py | 2
81 files changed, 5628 insertions(+), 2144 deletions(-)
Index: mythtv-0.25-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv-0.25-fixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythtv-0.25-fixes.patch 23 Apr 2012 13:47:29 -0000 1.3
+++ mythtv-0.25-fixes.patch 28 Apr 2012 20:33:29 -0000 1.4
@@ -8,6 +8,7 @@
mythplugins/mythgame/i18n/mythgame_fi.ts | 178 +-
mythplugins/mythmusic/i18n/mythmusic_fi.qm | Bin 56677 -> 56868 bytes
mythplugins/mythmusic/i18n/mythmusic_fi.ts | 2219 ++++++++++--
+ mythplugins/mythmusic/mythmusic/visualize.cpp | 60 +-
mythplugins/mythnetvision/i18n/mythnetvision_fi.qm | Bin 10270 -> 11758 bytes
mythplugins/mythnetvision/i18n/mythnetvision_fi.ts | 96 +-
.../mythnetvision/mythnetvision/nettree.cpp | 8 +-
@@ -20,7 +21,7 @@
.../mythzoneminder/i18n/mythzoneminder_fi.ts | 84 +-
.../mythzoneminder/mythzmserver/zmserver.cpp | 3 -
mythtv/VERSION | 2 +-
- mythtv/bindings/python/MythTV/mythproto.py | 2 +-
+ mythtv/bindings/python/MythTV/mythproto.py | 4 +-
mythtv/bindings/python/MythTV/static.py | 2 +-
mythtv/configure | 15 +-
mythtv/docs/doxygen-create-developer-docs.cfg | 2 +-
@@ -37,6 +38,7 @@
mythtv/libs/libmyth/remoteutil.cpp | 16 -
mythtv/libs/libmyth/remoteutil.h | 1 -
mythtv/libs/libmyth/rssparse.h | 1 +
+ mythtv/libs/libmythbase/bonjourregister.cpp | 5 +-
mythtv/libs/libmythbase/compat.h | 2 +
mythtv/libs/libmythbase/logging.cpp | 3 +-
mythtv/libs/libmythbase/serverpool.cpp | 46 +-
@@ -46,15 +48,20 @@
mythtv/libs/libmythtv/audioinput.h | 1 +
mythtv/libs/libmythtv/avformatdecoder.cpp | 10 +-
mythtv/libs/libmythtv/dvdringbuffer.cpp | 49 +-
+ mythtv/libs/libmythtv/fileringbuffer.cpp | 6 +-
mythtv/libs/libmythtv/libmythtv.pro | 1 +
mythtv/libs/libmythtv/mythairplayserver.cpp | 2 +-
mythtv/libs/libmythtv/mythplayer.cpp | 30 +-
mythtv/libs/libmythtv/mythplayer.h | 3 +
- mythtv/libs/libmythtv/mythraopdevice.cpp | 5 +-
+ mythtv/libs/libmythtv/mythraopconnection.cpp | 262 +-
+ mythtv/libs/libmythtv/mythraopconnection.h | 13 +-
+ mythtv/libs/libmythtv/mythraopdevice.cpp | 13 +-
+ mythtv/libs/libmythtv/osd.cpp | 2 +-
mythtv/libs/libmythtv/playercontext.h | 4 +-
mythtv/libs/libmythtv/ringbuffer.cpp | 8 +-
mythtv/libs/libmythtv/teletextscreen.cpp | 8 +-
mythtv/libs/libmythtv/tv_play.cpp | 26 +-
+ mythtv/libs/libmythtv/tv_rec.cpp | 3 +
mythtv/libs/libmythtv/tvremoteutil.cpp | 55 +-
mythtv/libs/libmythtv/tvremoteutil.h | 7 +-
mythtv/libs/libmythtv/videodisplayprofile.cpp | 3 -
@@ -64,13 +71,15 @@
mythtv/libs/libmythtv/videooutbase.cpp | 48 +-
mythtv/libs/libmythui/mythmainwindow.cpp | 2 +
mythtv/libs/libmythupnp/httprequest.cpp | 1 +
+ mythtv/programs/mythbackend/filetransfer.cpp | 4 +
.../programs/mythfrontend/audiogeneralsettings.cpp | 5 +-
mythtv/programs/mythfrontend/globalsettings.cpp | 2 +-
- mythtv/programs/mythfrontend/guidegrid.cpp | 4 +-
+ mythtv/programs/mythfrontend/guidegrid.cpp | 8 +-
mythtv/programs/mythfrontend/scheduleeditor.cpp | 7 +-
mythtv/programs/mythtranscode/transcode.h | 5 +-
mythtv/programs/mythutil/markuputils.cpp | 4 +-
- 72 files changed, 5420 insertions(+), 1981 deletions(-)
+ .../nv_python_libs/bliptv/bliptv_api.py | 2 +-
+ 81 files changed, 5628 insertions(+), 2144 deletions(-)
diff --git a/mythplugins/mytharchive/i18n/mytharchive_fi.qm b/mythplugins/mytharchive/i18n/mytharchive_fi.qm
index 2fc0f91..8e2d841 100644
@@ -4872,6 +4881,195 @@
</message>
</context>
</TS>
+diff --git a/mythplugins/mythmusic/mythmusic/visualize.cpp b/mythplugins/mythmusic/mythmusic/visualize.cpp
+index 66b050c..fac7989 100644
+--- a/mythplugins/mythmusic/mythmusic/visualize.cpp
++++ b/mythplugins/mythmusic/mythmusic/visualize.cpp
+@@ -168,11 +168,11 @@ bool StereoScope::process( VisualNode *node )
+ bool allZero = true;
+
+
+- if (node)
++ if (node)
+ {
+ double index = 0;
+ double const step = (double)SAMPLES_DEFAULT_SIZE / size.width();
+- for ( int i = 0; i < size.width(); i++)
++ for ( int i = 0; i < size.width(); i++)
+ {
+ unsigned long indexTo = (unsigned long)(index + step);
+ if (indexTo == (unsigned long)(index))
+@@ -194,13 +194,13 @@ bool StereoScope::process( VisualNode *node )
+ if ( valL < 0. )
+ valL = 0.;
+ }
+- if (valR < 0.)
++ if (valR < 0.)
+ {
+ valR += falloff;
+ if ( valR > 0. )
+ valR = 0.;
+- }
+- else
++ }
++ else
+ {
+ valR -= falloff;
+ if ( valR < 0. )
+@@ -208,7 +208,7 @@ bool StereoScope::process( VisualNode *node )
+ }
+ }
+ #endif
+- for (unsigned long s = (unsigned long)index; s < indexTo && s < node->length; s++)
++ for (unsigned long s = (unsigned long)index; s < indexTo && s < node->length; s++)
+ {
+ double tmpL = ( ( node->left ?
+ double( node->left[s] ) : 0.) *
+@@ -235,10 +235,10 @@ bool StereoScope::process( VisualNode *node )
+ index = index + step;
+ }
+ #if RUBBERBAND
+- }
+- else if (rubberband)
++ }
++ else if (rubberband)
+ {
+- for ( int i = 0; i < size.width(); i++)
++ for ( int i = 0; i < size.width(); i++)
+ {
+ double valL = magnitudes[ i ];
+ if (valL < 0) {
+@@ -271,8 +271,8 @@ bool StereoScope::process( VisualNode *node )
+ magnitudes[ i + size.width() ] = valR;
+ }
+ #endif
+- }
+- else
++ }
++ else
+ {
+ for ( int i = 0; (unsigned) i < magnitudes.size(); i++ )
+ magnitudes[ i ] = 0.;
+@@ -284,7 +284,7 @@ bool StereoScope::process( VisualNode *node )
+ bool StereoScope::draw( QPainter *p, const QColor &back )
+ {
+ p->fillRect(0, 0, size.width(), size.height(), back);
+- for ( int i = 1; i < size.width(); i++ )
++ for ( int i = 1; i < size.width(); i++ )
+ {
+ #if TWOCOLOUR
+ double r, g, b, per;
+@@ -611,7 +611,7 @@ Spectrum::Spectrum()
+ rplan = fftw_plan_dft_r2c_1d(FFTW_N, rin, (myth_fftw_complex_cast*)rout, FFTW_MEASURE);
+
+ startColor = QColor(0,0,255);
+- targetColor = QColor(255,0,0);
++ targetColor = QColor(255,0,0);
+ }
+
+ Spectrum::~Spectrum()
+@@ -679,7 +679,7 @@ bool Spectrum::process(VisualNode *node)
+ double *magnitudesp = magnitudes.data();
+ double magL, magR, tmp;
+
+- if (node)
++ if (node)
+ {
+ i = node->length;
+ if (i > FFTW_N)
+@@ -700,9 +700,9 @@ bool Spectrum::process(VisualNode *node)
+
+ for (i = 0; (int)i < rects.size(); i++, w += analyzerBarWidth)
+ {
+- magL = (log(sq(real(lout[index])) + sq(real(lout[FFTW_N - index]))) - 22.0) *
++ magL = (log(sq(real(lout[index])) + sq(real(lout[FFTW_N - index]))) - 22.0) *
+ scaleFactor;
+- magR = (log(sq(real(rout[index])) + sq(real(rout[FFTW_N - index]))) - 22.0) *
++ magR = (log(sq(real(rout[index])) + sq(real(rout[FFTW_N - index]))) - 22.0) *
+ scaleFactor;
+
+ if (magL > size.height() / 2)
+@@ -784,11 +784,11 @@ bool Spectrum::draw(QPainter *p, const QColor &back)
+
+ per = clamp(per, 1.0, 0.0);
+
+- r = startColor.red() +
++ r = startColor.red() +
+ (targetColor.red() - startColor.red()) * (per * per);
+- g = startColor.green() +
++ g = startColor.green() +
+ (targetColor.green() - startColor.green()) * (per * per);
+- b = startColor.blue() +
++ b = startColor.blue() +
+ (targetColor.blue() - startColor.blue()) * (per * per);
+
+ r = clamp(r, 255.0, 0.0);
+@@ -848,14 +848,14 @@ void Squares::resize (const QSize &newsize) {
+ size = newsize;
+ }
+
+-void Squares::drawRect(QPainter *p, QRect *rect, int i, int c, int w, int h)
++void Squares::drawRect(QPainter *p, QRect *rect, int i, int c, int w, int h)
+ {
+ double r, g, b, per;
+ int correction = (size.width() % rects.size ()) / 2;
+ int x = ((i / 2) * w) + correction;
+ int y;
+
+- if (i % 2 == 0)
++ if (i % 2 == 0)
+ {
+ y = c - h;
+ per = double(fake_height - rect->top()) / double(fake_height);
+@@ -866,15 +866,15 @@ void Squares::drawRect(QPainter *p, QRect *rect, int i, int c, int w, int h)
+ per = double(rect->bottom()) / double(fake_height);
+ }
+
+- per = clamp(per, 1.0, 0.0);
+-
+- r = startColor.red() +
++ per = clamp(per, 1.0, 0.0);
++
++ r = startColor.red() +
+ (targetColor.red() - startColor.red()) * (per * per);
+- g = startColor.green() +
++ g = startColor.green() +
+ (targetColor.green() - startColor.green()) * (per * per);
+- b = startColor.blue() +
++ b = startColor.blue() +
+ (targetColor.blue() - startColor.blue()) * (per * per);
+-
++
+ r = clamp(r, 255.0, 0.0);
+ g = clamp(g, 255.0, 0.0);
+ b = clamp(b, 255.0, 0.0);
+@@ -1496,7 +1496,7 @@ void AlbumArt::handleKeyPress(const QString &action)
+ /// this is the time an image is shown in the albumart visualizer
+ #define ALBUMARTCYCLETIME 10
+
+-bool AlbumArt::needsUpdate()
++bool AlbumArt::needsUpdate()
+ {
+ // if the track has changed we need to update the image
+ if (gPlayer->getCurrentMetadata() && m_currentMetadata != gPlayer->getCurrentMetadata())
+@@ -1536,7 +1536,7 @@ bool AlbumArt::draw(QPainter *p, const QColor &back)
+ }
+ }
+
+- if (m_image.isNull())
++ if (m_image.isNull())
+ {
+ drawWarning(p, back, m_size, QObject::tr("?"), 100);
+ return true;
+@@ -1581,7 +1581,7 @@ static class AlbumArtFactory : public VisFactory
+ Blank::Blank()
+ : VisualBase(true)
+ {
+- m_fps = 20;
++ m_fps = 1;
+ }
+
+ Blank::~Blank()
diff --git a/mythplugins/mythnetvision/i18n/mythnetvision_fi.qm b/mythplugins/mythnetvision/i18n/mythnetvision_fi.qm
index 38f9ca4..e8d8d66 100644
Binary files a/mythplugins/mythnetvision/i18n/mythnetvision_fi.qm and b/mythplugins/mythnetvision/i18n/mythnetvision_fi.qm differ
@@ -5552,7 +5750,7 @@
\ No newline at end of file
+SOURCE_VERSION="v0.25"
diff --git a/mythtv/bindings/python/MythTV/mythproto.py b/mythtv/bindings/python/MythTV/mythproto.py
-index 41a39e8..9a891cb 100644
+index 41a39e8..f7ae3e6 100644
--- a/mythtv/bindings/python/MythTV/mythproto.py
+++ b/mythtv/bindings/python/MythTV/mythproto.py
@@ -657,7 +657,7 @@ class FileOps( BECache ):
@@ -5564,6 +5762,15 @@
if host:
m.append(host)
return self.backendCommand(BACKEND_SEP.join(m))
+@@ -784,7 +784,7 @@ class FreeSpace( DictData ):
+ _field_order = [ 'host', 'path', 'islocal',
+ 'disknumber', 'sgroupid', 'blocksize',
+ 'totalspace', 'usedspace']
+- _field_type = [3, 3, 2, 0, 0, 0, 0, 0, 0, 0]
++ _field_type = [3, 3, 2, 0, 0, 0, 0, 0]
+ def __str__(self):
+ return "<FreeSpace '%s@%s' at %s>"\
+ % (self.path, self.host, hex(id(self)))
diff --git a/mythtv/bindings/python/MythTV/static.py b/mythtv/bindings/python/MythTV/static.py
index 6b587b2..f539706 100644
--- a/mythtv/bindings/python/MythTV/static.py
@@ -12494,6 +12701,33 @@
#include "mythexp.h"
+diff --git a/mythtv/libs/libmythbase/bonjourregister.cpp b/mythtv/libs/libmythbase/bonjourregister.cpp
+index 017ee6d..7f98732 100644
+--- a/mythtv/libs/libmythbase/bonjourregister.cpp
++++ b/mythtv/libs/libmythbase/bonjourregister.cpp
+@@ -5,6 +5,7 @@
+
+ #include "mythlogging.h"
+ #include "bonjourregister.h"
++#include "mythcorecontext.h"
+
+ #define LOC QString("Bonjour: ")
+
+@@ -41,11 +42,13 @@ bool BonjourRegister::Register(uint16_t port, const QByteArray &type,
+ return true;
+ }
+
++ QByteArray host(gCoreContext->GetSetting("BonjourHostname", "").toUtf8());
++ const char *host_ptr = host.size() > 0 ? host.constData() : NULL;
+ uint16_t qport = qToBigEndian(port);
+ DNSServiceErrorType res =
+ DNSServiceRegister(&m_dnssref, 0, 0, (const char*)name.data(),
+ (const char*)type.data(),
+- NULL, 0, qport, txt.size(), (void*)txt.data(),
++ NULL, host_ptr, qport, txt.size(), (void*)txt.data(),
+ BonjourCallback, this);
+
+ if (kDNSServiceErr_NoError != res)
diff --git a/mythtv/libs/libmythbase/compat.h b/mythtv/libs/libmythbase/compat.h
index ff2890f..425624a 100644
--- a/mythtv/libs/libmythbase/compat.h
@@ -12766,6 +13000,30 @@
LOG(VB_PLAYBACK, LOG_INFO, LOC +
QString("DVD Serial Number %1").arg(m_serialnumber));
+diff --git a/mythtv/libs/libmythtv/fileringbuffer.cpp b/mythtv/libs/libmythtv/fileringbuffer.cpp
+index f917416..2985f57 100644
+--- a/mythtv/libs/libmythtv/fileringbuffer.cpp
++++ b/mythtv/libs/libmythtv/fileringbuffer.cpp
+@@ -453,8 +453,8 @@ int FileRingBuffer::safe_read(int fd, void *data, uint sz)
+ tot += ret;
+ }
+
+- //if (oldfile)
+- //break;
++ if (oldfile)
++ break;
+
+ if (ret == 0) // EOF returns 0
+ {
+@@ -465,7 +465,7 @@ int FileRingBuffer::safe_read(int fd, void *data, uint sz)
+
+ // 0.36 second timeout for livetvchain with usleep(60000),
+ // or 2.4 seconds if it's a new file less than 30 minutes old.
+- if (zerocnt >= (oldfile ? 4 : (livetvchain ? 6 : 40)))
++ if (zerocnt >= (livetvchain ? 6 : 40))
+ {
+ break;
+ }
diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
index f50d2cb..6df71d0 100644
--- a/mythtv/libs/libmythtv/libmythtv.pro
@@ -12867,19 +13125,501 @@
};
#endif
+diff --git a/mythtv/libs/libmythtv/mythraopconnection.cpp b/mythtv/libs/libmythtv/mythraopconnection.cpp
+index 962c142..df0b3a9 100644
+--- a/mythtv/libs/libmythtv/mythraopconnection.cpp
++++ b/mythtv/libs/libmythtv/mythraopconnection.cpp
+@@ -1,6 +1,3 @@
+-// TODO
+-// remove hardcoded frames per packet
+-
+ #include <QTimer>
+ #include <QTcpSocket>
+ #include <QUdpSocket>
+@@ -23,6 +20,22 @@
+
+ RSA* MythRAOPConnection::g_rsa = NULL;
+
++class NetStream : public QTextStream
++{
++public:
++ NetStream(QIODevice *device) : QTextStream(device)
++ {
++ };
++ NetStream &operator<<(const QString &str)
++ {
++ LOG(VB_GENERAL, LOG_DEBUG,
++ LOC + QString("Sending(%1): ").arg(str.length()) + str);
++ QTextStream *q = this;
++ *q << str;
++ return *this;
++ };
++};
++
+ MythRAOPConnection::MythRAOPConnection(QObject *parent, QTcpSocket *socket,
+ QByteArray id, int port)
+ : QObject(parent), m_watchdogTimer(NULL), m_socket(socket),
+@@ -87,7 +100,7 @@ MythRAOPConnection::~MythRAOPConnection()
+ bool MythRAOPConnection::Init(void)
+ {
+ // connect up the request socket
+- m_textStream = new QTextStream(m_socket);
++ m_textStream = new NetStream(m_socket);
+ m_textStream->setCodec("UTF-8");
+ if (!connect(m_socket, SIGNAL(readyRead()), this, SLOT(readClient())))
+ {
+@@ -138,6 +151,24 @@ bool MythRAOPConnection::Init(void)
+ return true;
+ }
+
++void MythRAOPConnection::udpDataReady(void)
++{
++ QUdpSocket *socket = dynamic_cast<QUdpSocket*>(sender());
++
++ while (socket->state() == QAbstractSocket::BoundState &&
++ socket->hasPendingDatagrams())
++ {
++ QByteArray buffer;
++ buffer.resize(socket->pendingDatagramSize());
++ QHostAddress sender;
++ quint16 senderPort;
++
++ socket->readDatagram(buffer.data(), buffer.size(),
++ &sender, &senderPort);
++ udpDataReady(buffer, sender, senderPort);
++ }
++}
++
+ void MythRAOPConnection::udpDataReady(QByteArray buf, QHostAddress peer,
+ quint16 port)
+ {
+@@ -191,7 +222,8 @@ void MythRAOPConnection::udpDataReady(QByteArray buf, QHostAddress peer,
+ m_resends.remove(this_sequence);
+ }
+ else
+- LOG(VB_GENERAL, LOG_WARNING, LOC + "Received unexpected resent packet.");
++ LOG(VB_GENERAL, LOG_WARNING, LOC + QString("Received unexpected resent packet %1")
++ .arg(this_sequence));
+ }
+
+ ExpireResendRequests(timenow);
+@@ -332,12 +364,13 @@ void MythRAOPConnection::ProcessSyncPacket(const QByteArray &buf, uint64_t timen
+
+ if (m_audio)
+ {
++ uint64_t total = averageaudio + averagequeue;
+ LOG(VB_GENERAL, LOG_DEBUG, LOC +
+ QString("Sync packet: Timestamp: %1 Current Audio ts: %2 (avsync %3ms) "
+ "Latency: audio %4 queue %5 total %6ms <-> target %7ms")
+ .arg(m_lastSyncTimestamp).arg(m_audio->GetAudiotime()).arg(averageav, 0)
+ .arg(averageaudio).arg(averagequeue)
+- .arg(averageaudio + averagequeue).arg(m_lastLatency));
++ .arg(total).arg(m_lastLatency));
+ }
+ m_latencyAudio = m_latencyQueued = m_latencyCounter = m_avSync = 0;
+ }
+@@ -463,78 +496,82 @@ void MythRAOPConnection::ProcessRequest(const QList<QByteArray> &lines)
+ return;
+ }
+
+- QByteArray option = lines[0].left(lines[0].indexOf(" "));
++ *m_textStream << "RTSP/1.0 200 OK\r\n";
+
+- if (option == "OPTIONS")
++ if (tags.contains("Apple-Challenge"))
+ {
+- StartResponse(m_textStream);
+- if (tags.contains("Apple-Challenge"))
+- {
+- *m_textStream << "Apple-Response: ";
+- if (!LoadKey())
+- return;
+- int tosize = RSA_size(LoadKey());
+- unsigned char to[tosize];
+-
+- QByteArray challenge = QByteArray::fromBase64(tags["Apple-Challenge"].data());
+- int challenge_size = challenge.size();
+- if (challenge_size != 16)
+- {
+- LOG(VB_GENERAL, LOG_ERR, LOC +
+- QString("Decoded challenge size %1, expected 16").arg(challenge_size));
+- if (challenge_size > 16)
+- challenge_size = 16;
+- }
++ LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("Received Apple-Challenge"));
+
+- int i = 0;
+- unsigned char from[38];
+- memcpy(from, challenge.data(), challenge_size);
+- i += challenge_size;
+- if (m_socket->localAddress().protocol() == QAbstractSocket::IPv4Protocol)
+- {
+- uint32_t ip = m_socket->localAddress().toIPv4Address();
+- ip = qToBigEndian(ip);
+- memcpy(from + i, &ip, 4);
+- i += 4;
+- }
+- else if (m_socket->localAddress().protocol() == QAbstractSocket::IPv6Protocol)
+- {
+- // NB IPv6 untested
+- Q_IPV6ADDR ip = m_socket->localAddress().toIPv6Address();
+- //ip = qToBigEndian(ip);
+- memcpy(from + i, &ip, 16);
+- i += 16;
+- }
+- memcpy(from + i, m_hardwareId.data(), RAOP_HARDWARE_ID_SIZE);
+- i += RAOP_HARDWARE_ID_SIZE;
++ *m_textStream << "Apple-Response: ";
++ if (!LoadKey())
++ return;
++ int tosize = RSA_size(LoadKey());
++ unsigned char to[tosize];
+
+- int pad = 32 - i;
+- if (pad > 0)
+- {
+- memset(from + i, 0, pad);
+- i += pad;
+- }
++ QByteArray challenge = QByteArray::fromBase64(tags["Apple-Challenge"].data());
++ int challenge_size = challenge.size();
++ if (challenge_size != 16)
++ {
++ LOG(VB_GENERAL, LOG_ERR, LOC +
++ QString("Decoded challenge size %1, expected 16").arg(challenge_size));
++ if (challenge_size > 16)
++ challenge_size = 16;
++ }
++
++ int i = 0;
++ unsigned char from[38];
++ memcpy(from, challenge.data(), challenge_size);
++ i += challenge_size;
++ if (m_socket->localAddress().protocol() == QAbstractSocket::IPv4Protocol)
++ {
++ uint32_t ip = m_socket->localAddress().toIPv4Address();
++ ip = qToBigEndian(ip);
++ memcpy(from + i, &ip, 4);
++ i += 4;
++ }
++ else if (m_socket->localAddress().protocol() == QAbstractSocket::IPv6Protocol)
++ {
++ // NB IPv6 untested
++ Q_IPV6ADDR ip = m_socket->localAddress().toIPv6Address();
++ //ip = qToBigEndian(ip);
++ memcpy(from + i, &ip, 16);
++ i += 16;
++ }
++ memcpy(from + i, m_hardwareId.data(), RAOP_HARDWARE_ID_SIZE);
++ i += RAOP_HARDWARE_ID_SIZE;
+
+- LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("Full base64 response: '%1' size %2")
+- .arg(QByteArray((const char*)from, i).toBase64().data()).arg(i));
++ int pad = 32 - i;
++ if (pad > 0)
++ {
++ memset(from + i, 0, pad);
++ i += pad;
++ }
+
+- RSA_private_encrypt(i, from, to, LoadKey(), RSA_PKCS1_PADDING);
++ LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("Full base64 response: '%1' size %2")
++ .arg(QByteArray((const char*)from, i).toBase64().data()).arg(i));
+
+- QByteArray base64 = QByteArray((const char*)to, tosize).toBase64();
++ RSA_private_encrypt(i, from, to, LoadKey(), RSA_PKCS1_PADDING);
+
+- for (int pos = base64.size() - 1; pos > 0; pos--)
+- {
+- if (base64[pos] == '=')
+- base64[pos] = ' ';
+- else
+- break;
+- }
++ QByteArray base64 = QByteArray((const char*)to, tosize).toBase64();
+
+- *m_textStream << base64.trimmed() << "\r\n";
++ for (int pos = base64.size() - 1; pos > 0; pos--)
++ {
++ if (base64[pos] == '=')
++ base64[pos] = ' ';
++ else
++ break;
+ }
++ LOG(VB_GENERAL, LOG_DEBUG, QString("tSize=%1 tLen=%2 tResponse=%3")
++ .arg(tosize).arg(base64.size()).arg(base64.data()));
++ *m_textStream << base64.trimmed() << "\r\n";
++ }
+
++ QByteArray option = lines[0].left(lines[0].indexOf(" "));
++
++ if (option == "OPTIONS")
++ {
++ StartResponse(m_textStream, option, tags["CSeq"]);
+ *m_textStream << "Public: ANNOUNCE, SETUP, RECORD, PAUSE, FLUSH, TEARDOWN, OPTIONS, GET_PARAMETER, SET_PARAMETER\r\n";
+- FinishResponse(m_textStream, m_socket, option, tags["Cseq"]);
+ }
+ else if (option == "ANNOUNCE")
+ {
+@@ -589,9 +626,7 @@ void MythRAOPConnection::ProcessRequest(const QList<QByteArray> &lines)
+ LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("Audio parameter: %1").arg(fmt));
+ }
+ }
+-
+- StartResponse(m_textStream);
+- FinishResponse(m_textStream, m_socket, option, tags["Cseq"]);
++ StartResponse(m_textStream, option, tags["CSeq"]);
+ }
+ else if (option == "SETUP")
+ {
+@@ -617,14 +652,6 @@ void MythRAOPConnection::ProcessRequest(const QList<QByteArray> &lines)
+ QString("control port: %1 timing port: %2")
+ .arg(control_port).arg(timing_port));
+
+- StartResponse(m_textStream);
+- *m_textStream << "Transport: " << tags["Transport"];
+- *m_textStream << ";server_port=" << QString::number(m_dataPort) << "\r\n";
+- FinishResponse(m_textStream, m_socket, option, tags["Cseq"]);
+-
+- if (OpenAudioDevice())
+- CreateDecoder();
+-
+ if (m_clientControlSocket)
+ {
+ m_clientControlSocket->disconnect();
+@@ -632,21 +659,31 @@ void MythRAOPConnection::ProcessRequest(const QList<QByteArray> &lines)
+ delete m_clientControlSocket;
+ }
+
+- m_clientControlSocket = new ServerPool(this);
++ m_clientControlSocket = new QUdpSocket(this);
+ if (!m_clientControlSocket->bind(control_port))
+ {
+ LOG(VB_GENERAL, LOG_ERR, LOC +
+- QString("Failed to bind to client control port %1").arg(control_port));
++ QString("Failed to bind to client control port %1. "
++ "Control of audio stream may fail")
++ .arg(control_port));
+ }
+ else
+ {
+ LOG(VB_GENERAL, LOG_INFO, LOC +
+ QString("Bound to client control port %1").arg(control_port));
+- m_peerAddress = m_socket->peerAddress();
+- m_clientControlPort = control_port;
+- connect(m_clientControlSocket, SIGNAL(newDatagram(QByteArray, QHostAddress, quint16)),
+- this, SLOT(udpDataReady(QByteArray, QHostAddress, quint16)));
+ }
++
++ if (OpenAudioDevice())
++ CreateDecoder();
++
++ m_peerAddress = m_socket->peerAddress();
++ m_clientControlPort = control_port;
++ connect(m_clientControlSocket, SIGNAL(readyRead()), this, SLOT(udpDataReady()));
++
++ StartResponse(m_textStream, option, tags["CSeq"]);
++ *m_textStream << "Transport: " << tags["Transport"].data();
++ *m_textStream << ";server_port=" << QString::number(m_dataPort);
++ *m_textStream << "\r\nSession: MYTHTV\r\n";
+ }
+ else
+ {
+@@ -656,13 +693,24 @@ void MythRAOPConnection::ProcessRequest(const QList<QByteArray> &lines)
+ }
+ else if (option == "RECORD")
+ {
+- StartResponse(m_textStream);
+- FinishResponse(m_textStream, m_socket, option, tags["Cseq"]);
++ StartResponse(m_textStream, option, tags["CSeq"]);
++ }
++ else if (option == "TEARDOWN")
++ {
++ *m_textStream << "Connection: close\r\n";
++ StartResponse(m_textStream, option, tags["CSeq"]);
++ }
++ else if (option == "FLUSH")
++ {
++ ResetAudio();
++ *m_textStream << "flush\r\n";
++ StartResponse(m_textStream, option, tags["CSeq"]);
+ }
+ else if (option == "SET_PARAMETER")
+ {
+ foreach (QByteArray line, lines)
+ {
++ StartResponse(m_textStream, option, tags["CSeq"]);
+ if (line.startsWith("volume:") && m_allowVolumeControl && m_audio)
+ {
+ QByteArray rawvol = line.mid(7).trimmed();
+@@ -674,43 +722,34 @@ void MythRAOPConnection::ProcessRequest(const QList<QByteArray> &lines)
+ m_audio->SetCurrentVolume((int)volume);
+ }
+ }
+-
+- StartResponse(m_textStream);
+- FinishResponse(m_textStream, m_socket, option, tags["Cseq"]);
+- }
+- else if (option == "FLUSH")
+- {
+- ResetAudio();
+- StartResponse(m_textStream);
+- FinishResponse(m_textStream, m_socket, option, tags["Cseq"]);
+ }
+- else if (option == "TEARDOWN")
++ else
+ {
+- StartResponse(m_textStream);
+- *m_textStream << "Connection: close\r\n";
+- FinishResponse(m_textStream, m_socket, option, tags["Cseq"]);
++ LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("Command not handled: %1")
++ .arg(option.data()));
++ StartResponse(m_textStream, option, tags["CSeq"]);
+ }
+-
++ FinishResponse(m_textStream, m_socket, option, tags["CSeq"]);
+ }
+
+-void MythRAOPConnection::StartResponse(QTextStream *stream)
++void MythRAOPConnection::StartResponse(NetStream *stream,
++ QByteArray &option, QByteArray &cseq)
+ {
+ if (!stream)
+ return;
+- *stream << "RTSP/1.0 200 OK\r\n";
+-}
+-
+-void MythRAOPConnection::FinishResponse(QTextStream *stream, QTcpSocket *socket,
+- QByteArray &option, QByteArray &cseq)
+-{
+ LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("%1 sequence %2")
+ .arg(option.data()).arg(cseq.data()));
+ *stream << "Audio-Jack-Status: connected; type=analog\r\n";
+ *stream << "CSeq: " << cseq << "\r\n";
++}
++
++void MythRAOPConnection::FinishResponse(NetStream *stream, QTcpSocket *socket,
++ QByteArray &option, QByteArray &cseq)
++{
+ *stream << "\r\n";
+ stream->flush();
+- LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("Send: %1")
+- .arg(socket->flush()));
++ LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("Finished %1 %2 , Send: %3")
++ .arg(option.data()).arg(cseq.data()).arg(socket->flush()));
+ }
+
+ RSA* MythRAOPConnection::LoadKey(void)
+@@ -797,7 +836,7 @@ bool MythRAOPConnection::CreateDecoder(void)
+ extradata[13] = (fs >> 16) & 0xff;
+ extradata[14] = (fs >> 8) & 0xff;
+ extradata[15] = fs & 0xff;
+- extradata[16] = 2; // channels
++ extradata[16] = m_channels; // channels
+ extradata[17] = m_audioFormat[3]; // sample size
+ extradata[18] = m_audioFormat[4]; // rice_historymult
+ extradata[19] = m_audioFormat[5]; // rice_initialhistory
+@@ -805,7 +844,7 @@ bool MythRAOPConnection::CreateDecoder(void)
+ }
+ m_codeccontext->extradata = extradata;
+ m_codeccontext->extradata_size = 36;
+- m_codeccontext->channels = 2;
++ m_codeccontext->channels = m_channels;
+ if (avcodec_open(m_codeccontext, m_codec) < 0)
+ {
+ LOG(VB_GENERAL, LOG_ERR, LOC + "Failed to open ALAC decoder - going silent...");
+@@ -834,6 +873,7 @@ bool MythRAOPConnection::OpenAudioDevice(void)
+ CloseAudioDevice();
+
+ m_sampleRate = m_audioFormat.size() >= 12 ? m_audioFormat[11] : DEFAULT_SAMPLE_RATE;
++ m_channels = m_audioFormat[7] > 0 ? m_audioFormat[7] : 2;
+ if (m_sampleRate < 1)
+ m_sampleRate = DEFAULT_SAMPLE_RATE;
+
+@@ -841,7 +881,7 @@ bool MythRAOPConnection::OpenAudioDevice(void)
+ ? gCoreContext->GetSetting("PassThruOutputDevice") : QString::null;
+ QString device = gCoreContext->GetSetting("AudioOutputDevice");
+
+- m_audio = AudioOutput::OpenAudio(device, passthru, FORMAT_S16, 2,
++ m_audio = AudioOutput::OpenAudio(device, passthru, FORMAT_S16, m_channels,
+ 0, m_sampleRate, AUDIOOUTPUT_MUSIC,
+ m_allowVolumeControl, false);
+ if (!m_audio)
+diff --git a/mythtv/libs/libmythtv/mythraopconnection.h b/mythtv/libs/libmythtv/mythraopconnection.h
+index 9d56d4e..e229f83 100644
+--- a/mythtv/libs/libmythtv/mythraopconnection.h
++++ b/mythtv/libs/libmythtv/mythraopconnection.h
+@@ -15,12 +15,12 @@ extern "C" {
+ #include "libavformat/avformat.h"
+ }
+
+-class QTextStream;
+ class QTcpSocket;
+ class QUdpSocket;
+ class QTimer;
+ class AudioOutput;
+ class ServerPool;
++class NetStream;
+
+ typedef QHash<QByteArray,QByteArray> RawHash;
+
+@@ -42,6 +42,7 @@ class MythRAOPConnection : public QObject
+ public slots:
+ void readClient(void);
+ void udpDataReady(QByteArray buf, QHostAddress peer, quint16 port);
++ void udpDataReady(void);
+ void timeout(void);
+ void audioRetry(void);
+
+@@ -58,8 +59,9 @@ class MythRAOPConnection : public QObject
+ void ProcessAudio(uint64_t timenow);
+ void ResetAudio(void);
+ void ProcessRequest(const QList<QByteArray> &lines);
+- void StartResponse(QTextStream *stream);
+- void FinishResponse(QTextStream *stream, QTcpSocket *socket,
++ void StartResponse(NetStream *stream,
++ QByteArray &option, QByteArray &cseq);
++ void FinishResponse(NetStream *stream, QTcpSocket *socket,
+ QByteArray &option, QByteArray &cseq);
+ RawHash FindTags(const QList<QByteArray> &lines);
+ bool CreateDecoder(void);
+@@ -72,13 +74,13 @@ class MythRAOPConnection : public QObject
+ QTimer *m_watchdogTimer;
+ // comms socket
+ QTcpSocket *m_socket;
+- QTextStream *m_textStream;
++ NetStream *m_textStream;
+ QByteArray m_hardwareId;
+ // incoming audio
+ QHostAddress m_peerAddress;
+ int m_dataPort;
+ ServerPool *m_dataSocket;
+- ServerPool *m_clientControlSocket;
++ QUdpSocket *m_clientControlSocket;
+ int m_clientControlPort;
+ QMap<uint16_t,uint64_t> m_resends;
+ // crypto
+@@ -91,6 +93,7 @@ class MythRAOPConnection : public QObject
+ AVCodecContext *m_codeccontext;
+ QList<int> m_audioFormat;
+ int m_sampleRate;
++ int m_channels;
+ typedef struct
+ {
+ int16_t *samples;
diff --git a/mythtv/libs/libmythtv/mythraopdevice.cpp b/mythtv/libs/libmythtv/mythraopdevice.cpp
-index 82a6a61..f27f166 100644
+index 82a6a61..bad4932 100644
--- a/mythtv/libs/libmythtv/mythraopdevice.cpp
+++ b/mythtv/libs/libmythtv/mythraopdevice.cpp
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,6 @@
#include <QTimer>
#include <QtEndian>
- #include <QTcpSocket>
+-#include <QTcpSocket>
+#include <QNetworkInterface>
#include "mthread.h"
#include "mythlogging.h"
-@@ -131,7 +132,7 @@ void MythRAOPDevice::Start(void)
+@@ -131,7 +131,7 @@ void MythRAOPDevice::Start(void)
int baseport = m_setupPort;
while (m_setupPort < baseport + RAOP_PORT_RANGE)
{
@@ -12888,7 +13628,28 @@
{
LOG(VB_GENERAL, LOG_INFO, LOC +
QString("Listening for connections on port %1").arg(m_setupPort));
-@@ -242,8 +243,8 @@ void MythRAOPDevice::deleteClient(void)
+@@ -145,11 +145,6 @@ void MythRAOPDevice::Start(void)
+
+ // announce service
+ m_bonjour = new BonjourRegister(this);
+- if (!m_bonjour)
+- {
+- LOG(VB_GENERAL, LOG_ERR, LOC + "Failed to create Bonjour object.");
+- return;
+- }
+
+ // give each frontend a unique name
+ int multiple = m_setupPort - baseport;
+@@ -176,6 +171,8 @@ void MythRAOPDevice::Start(void)
+ txt.append(4); txt.append("vn=3");
+ txt.append(9); txt.append("txtvers=1");
+
++ LOG(VB_GENERAL, LOG_INFO, QString("Registering service %1.%2 port %3 TXT %4")
++ .arg(QString(name)).arg(QString(type)).arg(m_setupPort).arg(QString(txt)));
+ if (!m_bonjour->Register(m_setupPort, type, name, txt))
+ {
+ LOG(VB_GENERAL, LOG_ERR, LOC + "Failed to register service.");
+@@ -242,8 +239,8 @@ void MythRAOPDevice::deleteClient(void)
if ((*it)->GetSocket()->state() == QTcpSocket::UnconnectedState)
{
LOG(VB_GENERAL, LOG_INFO, LOC + "Removing client connection.");
@@ -12898,6 +13659,19 @@
return;
}
}
+diff --git a/mythtv/libs/libmythtv/osd.cpp b/mythtv/libs/libmythtv/osd.cpp
+index 207ecef..d0860db 100644
+--- a/mythtv/libs/libmythtv/osd.cpp
++++ b/mythtv/libs/libmythtv/osd.cpp
+@@ -428,7 +428,7 @@ void OSD::SetText(const QString &window, QHash<QString,QString> &map,
+ if (!iconpath.isEmpty())
+ {
+ QString iconurl =
+- gCoreContext->GetMasterHostPrefix("ChannelIcon",
++ gCoreContext->GetMasterHostPrefix("ChannelIcons",
+ iconpath);
+
+ icon->SetFilename(iconurl);
diff --git a/mythtv/libs/libmythtv/playercontext.h b/mythtv/libs/libmythtv/playercontext.h
index 5854de4..a4ce9f1 100644
--- a/mythtv/libs/libmythtv/playercontext.h
@@ -12922,39 +13696,59 @@
PlayerContext(const QString &inUseID = QString("Unknown"));
~PlayerContext();
diff --git a/mythtv/libs/libmythtv/ringbuffer.cpp b/mythtv/libs/libmythtv/ringbuffer.cpp
-index e3f0a5a..3883de2 100644
+index e3f0a5a..5e720c2 100644
--- a/mythtv/libs/libmythtv/ringbuffer.cpp
+++ b/mythtv/libs/libmythtv/ringbuffer.cpp
-@@ -724,6 +724,7 @@ void RingBuffer::run(void)
- struct timeval lastread, now;
- int readtimeavg = 300;
- bool ignore_for_read_timing = true;
-+ bool did_set_oldfile = false;
+@@ -553,6 +553,7 @@ void RingBuffer::KillReadAheadThread(void)
+ */
+ void RingBuffer::StopReads(void)
+ {
++ LOG(VB_FILE, LOG_INFO, LOC + "StopReads()");
+ stopreads = true;
+ generalWait.wakeAll();
+ }
+@@ -563,6 +564,7 @@ void RingBuffer::StopReads(void)
+ */
+ void RingBuffer::StartReads(void)
+ {
++ LOG(VB_FILE, LOG_INFO, LOC + "StartReads()");
+ stopreads = false;
+ generalWait.wakeAll();
+ }
+@@ -573,6 +575,7 @@ void RingBuffer::StartReads(void)
+ */
+ void RingBuffer::Pause(void)
+ {
++ LOG(VB_FILE, LOG_INFO, LOC + "Pause()");
+ StopReads();
- gettimeofday(&lastread, NULL); // this is just to keep gcc happy
+ rwlock.lockForWrite();
+@@ -586,6 +589,7 @@ void RingBuffer::Pause(void)
+ */
+ void RingBuffer::Unpause(void)
+ {
++ LOG(VB_FILE, LOG_INFO, LOC + "Unpause()");
+ StartReads();
-@@ -842,8 +843,12 @@ void RingBuffer::run(void)
+ rwlock.lockForWrite();
+@@ -842,9 +846,6 @@ void RingBuffer::run(void)
"Reading enough data to start playback");
}
- if (remotefile && livetvchain && livetvchain->HasNext())
-+ if (!did_set_oldfile && remotefile && livetvchain &&
-+ livetvchain->HasNext())
-+ {
- remotefile->SetTimeout(true);
-+ did_set_oldfile = true;
-+ }
-
+- remotefile->SetTimeout(true);
+-
LOG(VB_FILE, LOG_DEBUG, LOC +
QString("safe_read(...@%1, %2) -- begin")
-@@ -917,6 +922,7 @@ void RingBuffer::run(void)
- {
- livetvchain->SwitchToNext(true);
- setswitchtonext = true;
-+ did_set_oldfile = false;
- }
- }
- else
+ .arg(rbwpos).arg(totfree));
+@@ -1551,6 +1552,7 @@ void RingBuffer::SetWriteBufferMinWriteSize(int newMinSize)
+ */
+ void RingBuffer::SetOldFile(bool is_old)
+ {
++ LOG(VB_FILE, LOG_INFO, LOC + QString("SetOldFile(%1)").arg(is_old));
+ rwlock.lockForWrite();
+ oldfile = is_old;
+ rwlock.unlock();
diff --git a/mythtv/libs/libmythtv/teletextscreen.cpp b/mythtv/libs/libmythtv/teletextscreen.cpp
index 5490672..6bb0e13 100644
--- a/mythtv/libs/libmythtv/teletextscreen.cpp
@@ -13056,6 +13850,21 @@
vector<uint> interesting = CardUtil::GetCardIDs(sourceid);
// filter disconnected cards
+diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp
+index bf15151..3311360 100644
+--- a/mythtv/libs/libmythtv/tv_rec.cpp
++++ b/mythtv/libs/libmythtv/tv_rec.cpp
+@@ -1080,7 +1080,10 @@ void TVRec::TeardownRecorder(uint request_flags)
+ }
+
+ if (ringBuffer)
++ {
++ LOG(VB_FILE, LOG_INFO, LOC + "calling StopReads()");
+ ringBuffer->StopReads();
++ }
+
+ if (curRecording)
+ {
diff --git a/mythtv/libs/libmythtv/tvremoteutil.cpp b/mythtv/libs/libmythtv/tvremoteutil.cpp
index d348d64..a73cc52 100644
--- a/mythtv/libs/libmythtv/tvremoteutil.cpp
@@ -13362,6 +14171,42 @@
{ "pdf" , "application/pdf" },
{ "avi" , "video/avi" },
{ "css" , "text/css" },
+diff --git a/mythtv/programs/mythbackend/filetransfer.cpp b/mythtv/programs/mythbackend/filetransfer.cpp
+index c339dc2..7c9d173 100644
+--- a/mythtv/programs/mythbackend/filetransfer.cpp
++++ b/mythtv/programs/mythbackend/filetransfer.cpp
+@@ -7,6 +7,7 @@
+ #include "mythmiscutil.h"
+ #include "mythsocket.h"
+ #include "programinfo.h"
++#include "mythlogging.h"
+
+ FileTransfer::FileTransfer(QString &filename, MythSocket *remote,
+ bool usereadahead, int timeout_ms) :
+@@ -94,6 +95,7 @@ void FileTransfer::Stop(void)
+ if (readthreadlive)
+ {
+ readthreadlive = false;
++ LOG(VB_FILE, LOG_INFO, "calling StopReads()");
+ rbuffer->StopReads();
+ QMutexLocker locker(&lock);
+ readsLocked = true;
+@@ -108,6 +110,7 @@ void FileTransfer::Stop(void)
+
+ void FileTransfer::Pause(void)
+ {
++ LOG(VB_FILE, LOG_INFO, "calling StopReads()");
+ rbuffer->StopReads();
+ QMutexLocker locker(&lock);
+ readsLocked = true;
+@@ -118,6 +121,7 @@ void FileTransfer::Pause(void)
+
+ void FileTransfer::Unpause(void)
+ {
++ LOG(VB_FILE, LOG_INFO, "calling StartReads()");
+ rbuffer->StartReads();
+ {
+ QMutexLocker locker(&lock);
diff --git a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
index 7a676fd..7d40e09 100644
--- a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
@@ -13399,7 +14244,7 @@
!profiles.contains("OpenGL High Quality") &&
!profiles.contains("OpenGL Slim"))
diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp
-index 6dbf1aa..17d5fad 100644
+index 6dbf1aa..4ddac0e 100644
--- a/mythtv/programs/mythfrontend/guidegrid.cpp
+++ b/mythtv/programs/mythfrontend/guidegrid.cpp
@@ -1390,11 +1390,11 @@ void GuideGrid::customEvent(QEvent *event)
@@ -13416,6 +14261,24 @@
{
enter();
}
+@@ -1578,7 +1578,7 @@ void GuideGrid::updateChannels(void)
+ if (!chinfo->icon.isEmpty())
+ {
+ QString iconurl =
+- gCoreContext->GetMasterHostPrefix("ChannelIcon",
++ gCoreContext->GetMasterHostPrefix("ChannelIcons",
+ chinfo->icon);
+ item->SetImage(iconurl, "channelicon");
+ }
+@@ -1612,7 +1612,7 @@ void GuideGrid::updateInfo(void)
+ m_channelImage->Reset();
+ if (!chinfo->icon.isEmpty())
+ {
+- QString iconurl = gCoreContext->GetMasterHostPrefix("ChannelIcon",
++ QString iconurl = gCoreContext->GetMasterHostPrefix("ChannelIcons",
+ chinfo->icon);
+
+ m_channelImage->SetFilename(iconurl);
diff --git a/mythtv/programs/mythfrontend/scheduleeditor.cpp b/mythtv/programs/mythfrontend/scheduleeditor.cpp
index 4f85c70..877371a 100644
--- a/mythtv/programs/mythfrontend/scheduleeditor.cpp
@@ -13474,3 +14337,16 @@
return GENERIC_EXIT_OK;
}
+diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py
+index 2f2ad3b..4abbf69 100644
+--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py
++++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py
+@@ -187,7 +187,7 @@ class Videos(object):
+ self.config[u'urls'] = {}
+
+ # v2 api calls - An example that must be customized for each target site
+- self.config[u'urls'][u'video.search'] = "http://www.blip.tv/search?q=%s;&page=%s;&pagelen=%s;&language_code=%s;&sk..."
++ self.config[u'urls'][u'video.search'] = "http://www.blip.tv/?search=%s;&page=%s;&pagelen=%s;&language_code=%s;&ski..."
+ self.config[u'urls'][u'categories'] = "http://www.blip.tv/?section=categories&cmd=view&skin=api"
+
+ self.config[u'image_extentions'] = ["png", "jpg", "bmp"] # Acceptable image extentions
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- mythtv.spec 23 Apr 2012 13:50:52 -0000 1.93
+++ mythtv.spec 28 Apr 2012 20:33:29 -0000 1.94
@@ -86,7 +86,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 3%{?dist}
+Release: 4%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1480,6 +1480,10 @@
################################################################################
%changelog
+* Sat Apr 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-3
+- Update to latest 0.25/fixes.
+- Really fix logrotate this time.
+
* Sat Apr 21 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-3
- Removed obsolete build requirement for arts-devel.
- Re-add %%clean since it's still needed for mythweb.
12 years, 7 months
- 1
- 0
rpms/thunderbird-enigmail/F-16 mozilla-724615.patch, NONE, 1.1 mozilla-733867-x.patch, NONE, 1.1 mozilla-file.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 sources, 1.18, 1.19 thunderbird-enigmail.spec, 1.22, 1.23 thunderbird-mozconfig, 1.7, 1.8 mozilla-722127.patch, 1.1, NONE
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17301
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
thunderbird-mozconfig
Added Files:
mozilla-724615.patch mozilla-733867-x.patch mozilla-file.patch
Removed Files:
mozilla-722127.patch
Log Message:
Enigmail 1.4.1 for Thunderbird 12.0
mozilla-724615.patch:
objs.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mozilla-724615.patch ---
# HG changeset patch
# Parent 6292e55419d1730a2e88a56fd30b2440ce0b393a
# User Raúl Porcel <armin76(a)gentoo.org>
Bug XXXXXX - Fix TARGET_CPU usage on ARM
diff --git a/xpcom/glue/objs.mk b/xpcom/glue/objs.mk
--- a/mozilla/xpcom/glue/objs.mk
+++ b/mozilla/xpcom/glue/objs.mk
@@ -71,13 +71,13 @@ XPCOM_GLUENS_SRC_LCPPSRCS = \
SSE.cpp \
unused.cpp \
nsProxyRelease.cpp \
nsTextFormatter.cpp \
GenericFactory.cpp \
FileUtils.cpp \
$(NULL)
-ifeq (arm,$(TARGET_CPU))
+ifneq (,$(filter arm%,$(TARGET_CPU)))
XPCOM_GLUENS_SRC_LCPPSRCS += arm.cpp
endif
XPCOM_GLUENS_SRC_CPPSRCS = $(addprefix $(topsrcdir)/xpcom/glue/,$(XPCOM_GLUENS_SRC_LCPPSRCS))
mozilla-733867-x.patch:
base/search/src/nsMsgSearchAdapter.cpp | 2 +-
base/src/nsMsgFolderCompactor.cpp | 4 ++--
compose/src/nsSmtpProtocol.cpp | 5 ++---
imap/src/nsImapMailFolder.cpp | 2 +-
imap/src/nsImapProtocol.cpp | 28 ++++++++++++++--------------
imap/src/nsImapServerResponseParser.cpp | 2 +-
local/src/nsPop3Protocol.cpp | 2 +-
mime/src/mimedrft.cpp | 2 +-
mime/src/mimemult.cpp | 10 +++++-----
9 files changed, 28 insertions(+), 29 deletions(-)
--- NEW FILE mozilla-733867-x.patch ---
diff -up comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
--- comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 2012-04-21 00:32:39.000000000 +0200
+++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-04-25 10:51:32.343536178 +0200
@@ -688,7 +688,7 @@ nsresult nsMsgSearchAdapter::EncodeImapV
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;
}
diff -up comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
--- comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 2012-04-21 00:32:39.000000000 +0200
+++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-04-25 10:51:33.208535909 +0200
@@ -758,7 +758,7 @@ nsFolderCompactState::OnDataAvailable(ns
}
}
}
-#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.
@@ -1216,7 +1216,7 @@ nsOfflineStoreCompactState::OnDataAvaila
// check if there's an envelope header; if not, write one.
if (strncmp(m_dataBuffer, "From ", 5))
{
- m_fileStream->Write("From "CRLF, 7, &bytesWritten);
+ m_fileStream->Write("From " CRLF, 7, &bytesWritten);
m_offlineMsgSize += bytesWritten;
}
}
diff -up comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
--- comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 2012-04-21 00:32:39.000000000 +0200
+++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-04-25 10:51:33.365535861 +0200
@@ -1722,7 +1722,7 @@ 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);
@@ -1969,7 +1969,7 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI
{
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;
@@ -2118,4 +2118,3 @@ nsSmtpProtocol::GetUsernamePassword(nsAC
NS_ENSURE_SUCCESS(rv,rv);
return rv;
}
-
diff -up comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 comm-release/mailnews/imap/src/nsImapMailFolder.cpp
--- comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 2012-04-21 00:32:39.000000000 +0200
+++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-04-25 10:51:33.367535861 +0200
@@ -8309,7 +8309,7 @@ nsImapMailFolder::CopyFileToOfflineStore
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
diff -up comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 comm-release/mailnews/imap/src/nsImapProtocol.cpp
--- comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 2012-04-21 00:32:39.000000000 +0200
+++ comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-04-25 10:51:33.370535858 +0200
@@ -1409,7 +1409,7 @@ void nsImapProtocol::HandleIdleResponses
{
// PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
nsCAutoString commandBuffer(GetServerCommandTag());
- commandBuffer.Append(" IDLE"CRLF);
+ commandBuffer.Append(" IDLE" CRLF);
do
{
@@ -3287,7 +3287,7 @@ void nsImapProtocol::FetchMsgAttribute(c
commandString.Append(messageIds);
commandString.Append(" (");
commandString.Append(attribute);
- commandString.Append(")"CRLF);
+ commandString.Append(")" CRLF);
nsresult rv = SendData(commandString.get());
if (NS_SUCCEEDED(rv))
@@ -5283,7 +5283,7 @@ nsImapProtocol::Expunge()
IncrementCommandTagNumber();
nsCAutoString command(GetServerCommandTag());
- command.Append(" expunge"CRLF);
+ command.Append(" expunge" CRLF);
nsresult rv = SendData(command.get());
if (NS_SUCCEEDED(rv))
@@ -5359,7 +5359,7 @@ void nsImapProtocol::ID()
command.Append(gAppName);
command.Append("\" \"version\" \"");
command.Append(gAppVersion);
- command.Append("\")"CRLF);
+ command.Append("\")" CRLF);
nsresult rv = SendData(command.get());
if (NS_SUCCEEDED(rv))
@@ -5816,7 +5816,7 @@ nsresult nsImapProtocol::AuthLogin(const
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();
@@ -7447,7 +7447,7 @@ void nsImapProtocol::CreateMailbox(const
nsCString command(GetServerCommandTag());
command += " create \"";
command += escapedName;
- command += "\""CRLF;
+ command += "\"" CRLF;
nsresult rv = SendData(command.get());
if(NS_SUCCEEDED(rv))
@@ -7550,7 +7550,7 @@ void nsImapProtocol::Lsub(const char *ma
nsCString command (GetServerCommandTag());
command += " lsub \"\" \"";
command += escapedPattern;
- command += "\""CRLF;
+ command += "\"" CRLF;
PR_Free(boxnameWithOnlineDirectory);
@@ -7579,7 +7579,7 @@ void nsImapProtocol::List(const char *ma
command += useXLIST ?
" xlist \"\" \"" : " list \"\" \"";
command += escapedPattern;
- command += "\""CRLF;
+ command += "\"" CRLF;
PR_Free(boxnameWithOnlineDirectory);
@@ -7600,7 +7600,7 @@ void nsImapProtocol::Subscribe(const cha
nsCString command (GetServerCommandTag());
command += " subscribe \"";
command += escapedName;
- command += "\""CRLF;
+ command += "\"" CRLF;
nsresult rv = SendData(command.get());
if (NS_SUCCEEDED(rv))
@@ -7618,7 +7618,7 @@ void nsImapProtocol::Unsubscribe(const c
nsCString command (GetServerCommandTag());
command += " unsubscribe \"";
command += escapedName;
- command += "\""CRLF;
+ command += "\"" CRLF;
nsresult rv = SendData(command.get());
if (NS_SUCCEEDED(rv))
@@ -7632,7 +7632,7 @@ void nsImapProtocol::Idle()
if (m_urlInProgress)
return;
nsCAutoString command (GetServerCommandTag());
- command += " IDLE"CRLF;
+ command += " IDLE" CRLF;
nsresult rv = SendData(command.get());
if (NS_SUCCEEDED(rv))
{
@@ -7659,7 +7659,7 @@ void nsImapProtocol::EndIdle(bool waitFo
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);
@@ -7728,8 +7728,8 @@ void nsImapProtocol::Copy(const char * m
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
{
diff -up comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
--- comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 2012-04-21 00:32:39.000000000 +0200
+++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-04-25 10:51:33.374535858 +0200
@@ -185,7 +185,7 @@ void nsImapServerResponseParser::ParseIM
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;
diff -up comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 comm-release/mailnews/local/src/nsPop3Protocol.cpp
--- comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 2012-04-21 00:32:40.000000000 +0200
+++ comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-04-25 10:51:33.375535858 +0200
@@ -2483,7 +2483,7 @@ PRInt32 nsPop3Protocol::SendList()
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);
}
diff -up comm-release/mailnews/mime/src/mimedrft.cpp.733867 comm-release/mailnews/mime/src/mimedrft.cpp
--- comm-release/mailnews/mime/src/mimedrft.cpp.733867 2012-04-21 00:32:40.000000000 +0200
+++ comm-release/mailnews/mime/src/mimedrft.cpp 2012-04-25 10:51:33.376535858 +0200
@@ -1473,7 +1473,7 @@ mime_parse_stream_complete (nsMIMESessio
*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;
}
diff -up comm-release/mailnews/mime/src/mimemult.cpp.733867 comm-release/mailnews/mime/src/mimemult.cpp
--- comm-release/mailnews/mime/src/mimemult.cpp.733867 2012-04-21 00:32:40.000000000 +0200
+++ comm-release/mailnews/mime/src/mimemult.cpp 2012-04-25 10:52:45.835512632 +0200
@@ -280,7 +280,7 @@ MimeMultipart_parse_line (const char *li
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));
@@ -293,10 +293,10 @@ MimeMultipart_parse_line (const char *li
status = MimeWriteAString(obj, header);
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];
@@ -306,8 +306,8 @@ MimeMultipart_parse_line (const char *li
"%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;
mozilla-file.patch:
file_util_linux.cc | 3 +++
message_pump_libevent.cc | 3 +++
2 files changed, 6 insertions(+)
--- NEW FILE mozilla-file.patch ---
diff -up mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file mozilla-beta/ipc/chromium/src/base/file_util_linux.cc
--- mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file 2012-01-24 09:00:00.000000000 +0100
+++ mozilla-beta/ipc/chromium/src/base/file_util_linux.cc 2012-01-25 15:30:43.707796295 +0100
@@ -5,6 +5,9 @@
#include "base/file_util.h"
#include <fcntl.h>
+#if defined(ANDROID) || defined(OS_POSIX)
+#include <unistd.h>
+#endif
#include <string>
#include <vector>
diff -up mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc
--- mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file 2012-01-24 09:00:00.000000000 +0100
+++ mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc 2012-01-25 15:13:11.947771212 +0100
@@ -6,6 +6,9 @@
#include <errno.h>
#include <fcntl.h>
+#if defined(ANDROID) || defined(OS_POSIX)
+#include <unistd.h>
+#endif
#include "eintr_wrapper.h"
#include "base/logging.h"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 16 Mar 2012 06:13:26 -0000 1.17
+++ .cvsignore 28 Apr 2012 20:13:32 -0000 1.18
@@ -1,2 +1,2 @@
-enigmail-1.4.tar.gz
-thunderbird-11.0.source.tar.bz2
+thunderbird-12.0.source.tar.bz2
+enigmail-1.4.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 16 Mar 2012 06:13:26 -0000 1.18
+++ sources 28 Apr 2012 20:13:32 -0000 1.19
@@ -1,2 +1,2 @@
-5cf3d9720ed1cda1b22eabe5457772c2 enigmail-1.4.tar.gz
-1d7127a3282e62d95eb9b59d47291b70 thunderbird-11.0.source.tar.bz2
+7b30b72472a65bce74ba0ae60e4d4e6c thunderbird-12.0.source.tar.bz2
+0eba75fbcf8f0bb32d538df102fbb8e9 enigmail-1.4.1.tar.gz
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/thunderbird-enigmail.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- thunderbird-enigmail.spec 16 Mar 2012 06:13:26 -0000 1.22
+++ thunderbird-enigmail.spec 28 Apr 2012 20:13:32 -0000 1.23
@@ -1,7 +1,7 @@
%define debug_build 0
# Use system Librairies ?
-%if 0%{?fedora} <= 15
+%if 0%{?fedora} <= 17
%define system_sqlite 0
%else
%define system_sqlite 1
@@ -13,14 +13,14 @@
%define nss_version 3.13.3
%define cairo_version 1.10.0
%define freetype_version 2.1.9
-%define sqlite_version 3.7.7.1
+%define sqlite_version 3.7.10
%define libnotify_version 0.4
%global libvpx_version 1.0.0
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
-%global thunver 11.0
-%global thunmax 12.0
+%global thunver 12.0
+%global thunmax 13.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -38,11 +38,11 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.4
+Version: 1.4.1
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 2%{?dist}
+Release: 1%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -70,12 +70,15 @@
Patch8: xulrunner-10.0-secondary-ipc.patch
# Build patches
-Patch100: xulrunner-10.0-gcc47.patch
-Patch101: mozilla-722127.patch
-
+Patch102: mozilla-733867-x.patch
+Patch103: mozilla-file.patch
+Patch104: xulrunner-10.0-gcc47.patch
# Linux specific
Patch200: thunderbird-8.0-enable-addons.patch
+# ARM Specific
+Patch210: mozilla-724615.patch
+
%if %{official_branding}
# Required by Mozilla Corporation
@@ -152,13 +155,13 @@
cd mozilla
%patch7 -p2 -b .static
%patch8 -p3 -b .secondary-ipc
-%if 0%{?fedora} >= 17
-%patch100 -p1 -b .gcc47
-%endif
-%patch101 -p2 -b .722127
+%patch103 -p1 -b .mozilla-file
+%patch104 -p1 -b .gcc47
cd ..
+%patch102 -p1 -b .733867
%patch200 -p1 -b .addons
+%patch210 -p1 -b .724615
%if %{official_branding}
# Required by Mozilla Corporation
@@ -211,7 +214,7 @@
# All tarballs (as well as CVS) will *always* report as 1.4a1pre (or whatever
# the next major version would be). This is because I create builds from trunk
# and simply label the result as 1.3.x.
-# sed -i -e '/em:version/s/1.4a1pre/%{version}/' package/install.rdf
+sed -i -e '/em:version/s/1.5pre/%{version}/' package/install.rdf
grep '<em:version>%{version}</em:version>' package/install.rdf || exit 1
# Apply Enigmail patch here
popd
@@ -277,7 +280,6 @@
mkdir -p $RPM_BUILD_ROOT%{enigmail_extname}
unzip -q mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname}
-chmod +x $RPM_BUILD_ROOT%{enigmail_extname}/wrappers/*.sh
%clean
@@ -292,6 +294,12 @@
#===============================================================================
%changelog
+* Sat Apr 28 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.1-1
+- Enigmail 1.4.1 for Thunderbird 12.0
+
+* Fri Mar 16 2012 Remi Collet <remi(a)fedoraproject.org> 1.4-3
+- Latest Thunderbird patch from rahwide
+
* Thu Mar 15 2012 Remi Collet <remi(a)fedoraproject.org> 1.4-2
- Enigmail 1.4 for Thunderbird 11.0
Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/thunderbird-mozconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- thunderbird-mozconfig 16 Mar 2012 06:13:26 -0000 1.7
+++ thunderbird-mozconfig 28 Apr 2012 20:13:32 -0000 1.8
@@ -21,7 +21,8 @@
ac_add_options --disable-strip
ac_add_options --disable-install-strip
ac_add_options --enable-pango
-ac_add_options --enable-system-cairo
+# temporary disable system cairo, because compilation fails
+#ac_add_options --enable-system-cairo
ac_add_options --enable-svg
ac_add_options --enable-canvas
ac_add_options --enable-system-hunspell
--- mozilla-722127.patch DELETED ---
12 years, 7 months
- 1
- 0
rpms/thunderbird-enigmail/F-17 mozilla-724615.patch, NONE, 1.1 mozilla-file.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 mozilla-733867-x.patch, 1.1, 1.2 sources, 1.17, 1.18 thunderbird-enigmail.spec, 1.19, 1.20 thunderbird-mozconfig, 1.7, 1.8 xulrunner-10.0-gcc47.patch, 1.1, 1.2 mozilla-722127.patch, 1.1, NONE
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11979
Modified Files:
.cvsignore mozilla-733867-x.patch sources
thunderbird-enigmail.spec thunderbird-mozconfig
xulrunner-10.0-gcc47.patch
Added Files:
mozilla-724615.patch mozilla-file.patch
Removed Files:
mozilla-722127.patch
Log Message:
Enigmail 1.4.1 for Thunderbird 12.0
mozilla-724615.patch:
objs.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mozilla-724615.patch ---
# HG changeset patch
# Parent 6292e55419d1730a2e88a56fd30b2440ce0b393a
# User Raúl Porcel <armin76(a)gentoo.org>
Bug XXXXXX - Fix TARGET_CPU usage on ARM
diff --git a/xpcom/glue/objs.mk b/xpcom/glue/objs.mk
--- a/mozilla/xpcom/glue/objs.mk
+++ b/mozilla/xpcom/glue/objs.mk
@@ -71,13 +71,13 @@ XPCOM_GLUENS_SRC_LCPPSRCS = \
SSE.cpp \
unused.cpp \
nsProxyRelease.cpp \
nsTextFormatter.cpp \
GenericFactory.cpp \
FileUtils.cpp \
$(NULL)
-ifeq (arm,$(TARGET_CPU))
+ifneq (,$(filter arm%,$(TARGET_CPU)))
XPCOM_GLUENS_SRC_LCPPSRCS += arm.cpp
endif
XPCOM_GLUENS_SRC_CPPSRCS = $(addprefix $(topsrcdir)/xpcom/glue/,$(XPCOM_GLUENS_SRC_LCPPSRCS))
mozilla-file.patch:
file_util_linux.cc | 3 +++
message_pump_libevent.cc | 3 +++
2 files changed, 6 insertions(+)
--- NEW FILE mozilla-file.patch ---
diff -up mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file mozilla-beta/ipc/chromium/src/base/file_util_linux.cc
--- mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file 2012-01-24 09:00:00.000000000 +0100
+++ mozilla-beta/ipc/chromium/src/base/file_util_linux.cc 2012-01-25 15:30:43.707796295 +0100
@@ -5,6 +5,9 @@
#include "base/file_util.h"
#include <fcntl.h>
+#if defined(ANDROID) || defined(OS_POSIX)
+#include <unistd.h>
+#endif
#include <string>
#include <vector>
diff -up mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc
--- mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file 2012-01-24 09:00:00.000000000 +0100
+++ mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc 2012-01-25 15:13:11.947771212 +0100
@@ -6,6 +6,9 @@
#include <errno.h>
#include <fcntl.h>
+#if defined(ANDROID) || defined(OS_POSIX)
+#include <unistd.h>
+#endif
#include "eintr_wrapper.h"
#include "base/logging.h"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 16 Mar 2012 19:24:54 -0000 1.16
+++ .cvsignore 28 Apr 2012 17:13:03 -0000 1.17
@@ -1,2 +1,2 @@
-enigmail-1.4.tar.gz
-thunderbird-11.0.source.tar.bz2
+thunderbird-12.0.source.tar.bz2
+enigmail-1.4.1.tar.gz
mozilla-733867-x.patch:
base/search/src/nsMsgSearchAdapter.cpp | 2 +-
base/src/nsMsgFolderCompactor.cpp | 4 ++--
compose/src/nsSmtpProtocol.cpp | 5 ++---
imap/src/nsImapMailFolder.cpp | 2 +-
imap/src/nsImapProtocol.cpp | 28 ++++++++++++++--------------
imap/src/nsImapServerResponseParser.cpp | 2 +-
local/src/nsPop3Protocol.cpp | 2 +-
mime/src/mimedrft.cpp | 2 +-
mime/src/mimemult.cpp | 10 +++++-----
9 files changed, 28 insertions(+), 29 deletions(-)
Index: mozilla-733867-x.patch
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/mozilla-733867-x.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozilla-733867-x.patch 16 Mar 2012 19:24:54 -0000 1.1
+++ mozilla-733867-x.patch 28 Apr 2012 17:13:03 -0000 1.2
@@ -1,6 +1,6 @@
-diff -up thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
---- thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 2012-03-13 03:37:12.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-03-16 07:20:29.299342799 +0100
+diff -up comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
+--- comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 2012-04-21 00:32:39.000000000 +0200
++++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-04-25 10:51:32.343536178 +0200
@@ -688,7 +688,7 @@ nsresult nsMsgSearchAdapter::EncodeImapV
PL_strcat(encoding, "{");
lengthStr.AppendInt((PRInt32) strlen(value));
@@ -10,10 +10,10 @@
PL_strcat(encoding, value);
return NS_OK;
}
-diff -up thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
---- thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-03-16 07:20:29.300342735 +0100
-@@ -753,7 +753,7 @@ nsFolderCompactState::OnDataAvailable(ns
+diff -up comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
+--- comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 2012-04-21 00:32:39.000000000 +0200
++++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-04-25 10:51:33.208535909 +0200
+@@ -758,7 +758,7 @@ nsFolderCompactState::OnDataAvailable(ns
}
}
}
@@ -22,7 +22,7 @@
// 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.
-@@ -1203,7 +1203,7 @@ nsOfflineStoreCompactState::OnDataAvaila
+@@ -1216,7 +1216,7 @@ nsOfflineStoreCompactState::OnDataAvaila
// check if there's an envelope header; if not, write one.
if (strncmp(m_dataBuffer, "From ", 5))
{
@@ -31,19 +31,19 @@
m_offlineMsgSize += bytesWritten;
}
}
-diff -up thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
---- thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-03-16 07:23:01.225877457 +0100
+diff -up comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
+--- comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 2012-04-21 00:32:39.000000000 +0200
++++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-04-25 10:51:33.365535861 +0200
@@ -1722,7 +1722,7 @@ PRInt32 nsSmtpProtocol::SendQuit()
{
- m_sendDone = PR_TRUE;
+ 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);
-@@ -1969,7 +1969,7 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI
+@@ -1969,7 +1969,7 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI
{
nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
// send a quit command to close the connection with the server.
@@ -57,10 +57,10 @@
return rv;
}
-
-diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp
---- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-03-16 07:20:29.309342162 +0100
-@@ -8298,7 +8298,7 @@ nsImapMailFolder::CopyFileToOfflineStore
+diff -up comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 comm-release/mailnews/imap/src/nsImapMailFolder.cpp
+--- comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 2012-04-21 00:32:39.000000000 +0200
++++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-04-25 10:51:33.367535861 +0200
+@@ -8309,7 +8309,7 @@ nsImapMailFolder::CopyFileToOfflineStore
bool needMoreData = false;
char * newLine = nsnull;
PRUint32 numBytesInLine = 0;
@@ -69,10 +69,10 @@
offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
fileSize += bytesWritten;
do
-diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp
---- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-03-16 07:20:29.314341844 +0100
-@@ -1410,7 +1410,7 @@ void nsImapProtocol::HandleIdleResponses
+diff -up comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 comm-release/mailnews/imap/src/nsImapProtocol.cpp
+--- comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 2012-04-21 00:32:39.000000000 +0200
++++ comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-04-25 10:51:33.370535858 +0200
+@@ -1409,7 +1409,7 @@ void nsImapProtocol::HandleIdleResponses
{
// PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
nsCAutoString commandBuffer(GetServerCommandTag());
@@ -81,7 +81,7 @@
do
{
-@@ -3290,7 +3290,7 @@ void nsImapProtocol::FetchMsgAttribute(c
+@@ -3287,7 +3287,7 @@ void nsImapProtocol::FetchMsgAttribute(c
commandString.Append(messageIds);
commandString.Append(" (");
commandString.Append(attribute);
@@ -114,10 +114,10 @@
command.Append(correctedPassword);
- command.Append("\""CRLF);
+ command.Append("\"" CRLF);
- rv = SendData(command.get(), PR_TRUE /* suppress logging */);
+ rv = SendData(command.get(), true /* suppress logging */);
NS_ENSURE_SUCCESS(rv, rv);
ParseIMAPandCheckForNewMail();
-@@ -7446,7 +7446,7 @@ void nsImapProtocol::CreateMailbox(const
+@@ -7447,7 +7447,7 @@ void nsImapProtocol::CreateMailbox(const
nsCString command(GetServerCommandTag());
command += " create \"";
command += escapedName;
@@ -126,7 +126,7 @@
nsresult rv = SendData(command.get());
if(NS_SUCCEEDED(rv))
-@@ -7549,7 +7549,7 @@ void nsImapProtocol::Lsub(const char *ma
+@@ -7550,7 +7550,7 @@ void nsImapProtocol::Lsub(const char *ma
nsCString command (GetServerCommandTag());
command += " lsub \"\" \"";
command += escapedPattern;
@@ -135,7 +135,7 @@
PR_Free(boxnameWithOnlineDirectory);
-@@ -7578,7 +7578,7 @@ void nsImapProtocol::List(const char *ma
+@@ -7579,7 +7579,7 @@ void nsImapProtocol::List(const char *ma
command += useXLIST ?
" xlist \"\" \"" : " list \"\" \"";
command += escapedPattern;
@@ -144,7 +144,7 @@
PR_Free(boxnameWithOnlineDirectory);
-@@ -7599,7 +7599,7 @@ void nsImapProtocol::Subscribe(const cha
+@@ -7600,7 +7600,7 @@ void nsImapProtocol::Subscribe(const cha
nsCString command (GetServerCommandTag());
command += " subscribe \"";
command += escapedName;
@@ -153,7 +153,7 @@
nsresult rv = SendData(command.get());
if (NS_SUCCEEDED(rv))
-@@ -7617,7 +7617,7 @@ void nsImapProtocol::Unsubscribe(const c
+@@ -7618,7 +7618,7 @@ void nsImapProtocol::Unsubscribe(const c
nsCString command (GetServerCommandTag());
command += " unsubscribe \"";
command += escapedName;
@@ -162,7 +162,7 @@
nsresult rv = SendData(command.get());
if (NS_SUCCEEDED(rv))
-@@ -7631,7 +7631,7 @@ void nsImapProtocol::Idle()
+@@ -7632,7 +7632,7 @@ void nsImapProtocol::Idle()
if (m_urlInProgress)
return;
nsCAutoString command (GetServerCommandTag());
@@ -171,7 +171,7 @@
nsresult rv = SendData(command.get());
if (NS_SUCCEEDED(rv))
{
-@@ -7658,7 +7658,7 @@ void nsImapProtocol::EndIdle(bool waitFo
+@@ -7659,7 +7659,7 @@ void nsImapProtocol::EndIdle(bool waitFo
nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
if (asyncInputStream)
asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
@@ -180,7 +180,7 @@
// 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);
-@@ -7727,8 +7727,8 @@ void nsImapProtocol::Copy(const char * m
+@@ -7728,8 +7728,8 @@ void nsImapProtocol::Copy(const char * m
PRUint32 msgsHandled = 0;
const char *formatString;
formatString = (idsAreUid)
@@ -191,9 +191,9 @@
do
{
-diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
---- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-03-16 07:20:29.316341717 +0100
+diff -up comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
+--- comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 2012-04-21 00:32:39.000000000 +0200
++++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-04-25 10:51:33.374535858 +0200
@@ -185,7 +185,7 @@ void nsImapServerResponseParser::ParseIM
NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' &&
@@ -201,11 +201,11 @@
- bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
+ bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
if (sendingIdleDone)
- fWaitingForMoreClientInput = PR_FALSE;
+ fWaitingForMoreClientInput = false;
-diff -up thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp
---- thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-03-16 07:23:38.980300990 +0100
+diff -up comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 comm-release/mailnews/local/src/nsPop3Protocol.cpp
+--- comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 2012-04-21 00:32:40.000000000 +0200
++++ comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-04-25 10:51:33.375535858 +0200
@@ -2483,7 +2483,7 @@ PRInt32 nsPop3Protocol::SendList()
return(MK_OUT_OF_MEMORY);
m_pop3ConData->next_state_after_response = POP3_GET_LIST;
@@ -215,9 +215,9 @@
}
-diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867 thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp
---- thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867 2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp 2012-03-16 07:20:29.320341461 +0100
+diff -up comm-release/mailnews/mime/src/mimedrft.cpp.733867 comm-release/mailnews/mime/src/mimedrft.cpp
+--- comm-release/mailnews/mime/src/mimedrft.cpp.733867 2012-04-21 00:32:40.000000000 +0200
++++ comm-release/mailnews/mime/src/mimedrft.cpp 2012-04-25 10:51:33.376535858 +0200
@@ -1473,7 +1473,7 @@ mime_parse_stream_complete (nsMIMESessio
*newbody = 0;
PL_strcatn(newbody, newbodylen, "<PRE>");
@@ -227,9 +227,9 @@
PR_Free(body);
body = newbody;
}
-diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp
---- thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp 2012-03-16 07:20:29.321341397 +0100
+diff -up comm-release/mailnews/mime/src/mimemult.cpp.733867 comm-release/mailnews/mime/src/mimemult.cpp
+--- comm-release/mailnews/mime/src/mimemult.cpp.733867 2012-04-21 00:32:40.000000000 +0200
++++ comm-release/mailnews/mime/src/mimemult.cpp 2012-04-25 10:52:45.835512632 +0200
@@ -280,7 +280,7 @@ MimeMultipart_parse_line (const char *li
MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\""));
@@ -260,6 +260,6 @@
- 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, PR_FALSE);
+ MimeHeaders_write_raw_headers(mult->hdrs, obj->options, false);
}
PRInt32 old_nchildren = container->nchildren;
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 16 Mar 2012 19:24:54 -0000 1.17
+++ sources 28 Apr 2012 17:13:03 -0000 1.18
@@ -1,2 +1,2 @@
-5cf3d9720ed1cda1b22eabe5457772c2 enigmail-1.4.tar.gz
-1d7127a3282e62d95eb9b59d47291b70 thunderbird-11.0.source.tar.bz2
+7b30b72472a65bce74ba0ae60e4d4e6c thunderbird-12.0.source.tar.bz2
+0eba75fbcf8f0bb32d538df102fbb8e9 enigmail-1.4.1.tar.gz
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/thunderbird-enigmail.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- thunderbird-enigmail.spec 16 Mar 2012 19:24:54 -0000 1.19
+++ thunderbird-enigmail.spec 28 Apr 2012 17:13:03 -0000 1.20
@@ -1,7 +1,7 @@
%define debug_build 0
# Use system Librairies ?
-%if 0%{?fedora} <= 15
+%if 0%{?fedora} <= 17
%define system_sqlite 0
%else
%define system_sqlite 1
@@ -13,14 +13,14 @@
%define nss_version 3.13.3
%define cairo_version 1.10.0
%define freetype_version 2.1.9
-%define sqlite_version 3.7.7.1
+%define sqlite_version 3.7.10
%define libnotify_version 0.4
%global libvpx_version 1.0.0
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
-%global thunver 11.0
-%global thunmax 12.0
+%global thunver 12.0
+%global thunmax 13.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -38,11 +38,11 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.4
+Version: 1.4.1
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 3%{?dist}
+Release: 1%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -70,13 +70,15 @@
Patch8: xulrunner-10.0-secondary-ipc.patch
# Build patches
-Patch100: xulrunner-10.0-gcc47.patch
-Patch101: mozilla-722127.patch
Patch102: mozilla-733867-x.patch
-
+Patch103: mozilla-file.patch
+Patch104: xulrunner-10.0-gcc47.patch
# Linux specific
Patch200: thunderbird-8.0-enable-addons.patch
+# ARM Specific
+Patch210: mozilla-724615.patch
+
%if %{official_branding}
# Required by Mozilla Corporation
@@ -153,14 +155,13 @@
cd mozilla
%patch7 -p2 -b .static
%patch8 -p3 -b .secondary-ipc
-%if 0%{?fedora} >= 17
-%patch100 -p1 -b .gcc47
-%endif
-%patch101 -p2 -b .722127
+%patch103 -p1 -b .mozilla-file
+%patch104 -p1 -b .gcc47
cd ..
-%patch102 -p2 -b .733867
+%patch102 -p1 -b .733867
%patch200 -p1 -b .addons
+%patch210 -p1 -b .724615
%if %{official_branding}
# Required by Mozilla Corporation
@@ -213,7 +214,7 @@
# All tarballs (as well as CVS) will *always* report as 1.4a1pre (or whatever
# the next major version would be). This is because I create builds from trunk
# and simply label the result as 1.3.x.
-# sed -i -e '/em:version/s/1.4a1pre/%{version}/' package/install.rdf
+sed -i -e '/em:version/s/1.5pre/%{version}/' package/install.rdf
grep '<em:version>%{version}</em:version>' package/install.rdf || exit 1
# Apply Enigmail patch here
popd
@@ -279,7 +280,6 @@
mkdir -p $RPM_BUILD_ROOT%{enigmail_extname}
unzip -q mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname}
-chmod +x $RPM_BUILD_ROOT%{enigmail_extname}/wrappers/*.sh
%clean
@@ -294,6 +294,9 @@
#===============================================================================
%changelog
+* Sat Apr 28 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.1-1
+- Enigmail 1.4.1 for Thunderbird 12.0
+
* Fri Mar 16 2012 Remi Collet <remi(a)fedoraproject.org> 1.4-3
- Latest Thunderbird patch from rahwide
Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/thunderbird-mozconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- thunderbird-mozconfig 16 Mar 2012 19:24:54 -0000 1.7
+++ thunderbird-mozconfig 28 Apr 2012 17:13:03 -0000 1.8
@@ -21,7 +21,8 @@
ac_add_options --disable-strip
ac_add_options --disable-install-strip
ac_add_options --enable-pango
-ac_add_options --enable-system-cairo
+# temporary disable system cairo, because compilation fails
+#ac_add_options --enable-system-cairo
ac_add_options --enable-svg
ac_add_options --enable-canvas
ac_add_options --enable-system-hunspell
xulrunner-10.0-gcc47.patch:
ipc/chromium/src/base/time_posix.cc | 2 ++
toolkit/crashreporter/client/Makefile.in | 3 +++
2 files changed, 5 insertions(+)
Index: xulrunner-10.0-gcc47.patch
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/xulrunner-10.0-gcc47.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xulrunner-10.0-gcc47.patch 3 Mar 2012 21:22:21 -0000 1.1
+++ xulrunner-10.0-gcc47.patch 28 Apr 2012 17:13:03 -0000 1.2
@@ -23,41 +23,3 @@
ifeq ($(OS_ARCH),WINNT)
CPPSRCS += crashreporter_win.cpp
LIBS += \
-diff -up mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file mozilla-beta/ipc/chromium/src/base/file_util_linux.cc
---- mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file 2012-01-24 09:00:00.000000000 +0100
-+++ mozilla-beta/ipc/chromium/src/base/file_util_linux.cc 2012-01-25 15:30:43.707796295 +0100
-@@ -5,6 +5,9 @@
- #include "base/file_util.h"
-
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include <string>
- #include <vector>
-diff -up mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc
---- mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file 2012-01-24 09:00:00.000000000 +0100
-+++ mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc 2012-01-25 15:13:11.947771212 +0100
-@@ -6,6 +6,9 @@
-
- #include <errno.h>
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
-diff -up mozilla-beta/ipc/chromium/src/base/file_util.cc.old mozilla-beta/ipc/chromium/src/base/file_util.cc
---- mozilla-beta/ipc/chromium/src/base/file_util.cc.old 2012-01-25 13:48:11.000000000 +0100
-+++ mozilla-beta/ipc/chromium/src/base/file_util.cc 2012-01-25 13:52:25.096659244 +0100
-@@ -8,7 +8,7 @@
- #include <io.h>
- #endif
- #include <stdio.h>
--#if defined(ANDROID)
-+#if defined(ANDROID) || defined(OS_POSIX)
- #include <unistd.h>
- #endif
-
--- mozilla-722127.patch DELETED ---
12 years, 7 months
- 1
- 0
rpms/thunderbird-enigmail/devel mozilla-724615.patch, NONE, 1.1 mozilla-file.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 mozilla-733867-x.patch, 1.1, 1.2 sources, 1.17, 1.18 thunderbird-enigmail.spec, 1.20, 1.21 thunderbird-mozconfig, 1.7, 1.8 xulrunner-10.0-gcc47.patch, 1.1, 1.2 mozilla-722127.patch, 1.1, NONE
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8843
Modified Files:
.cvsignore mozilla-733867-x.patch sources
thunderbird-enigmail.spec thunderbird-mozconfig
xulrunner-10.0-gcc47.patch
Added Files:
mozilla-724615.patch mozilla-file.patch
Removed Files:
mozilla-722127.patch
Log Message:
Enigmail 1.4.1 for Thunderbird 12.0
mozilla-724615.patch:
objs.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mozilla-724615.patch ---
# HG changeset patch
# Parent 6292e55419d1730a2e88a56fd30b2440ce0b393a
# User Raúl Porcel <armin76(a)gentoo.org>
Bug XXXXXX - Fix TARGET_CPU usage on ARM
diff --git a/xpcom/glue/objs.mk b/xpcom/glue/objs.mk
--- a/mozilla/xpcom/glue/objs.mk
+++ b/mozilla/xpcom/glue/objs.mk
@@ -71,13 +71,13 @@ XPCOM_GLUENS_SRC_LCPPSRCS = \
SSE.cpp \
unused.cpp \
nsProxyRelease.cpp \
nsTextFormatter.cpp \
GenericFactory.cpp \
FileUtils.cpp \
$(NULL)
-ifeq (arm,$(TARGET_CPU))
+ifneq (,$(filter arm%,$(TARGET_CPU)))
XPCOM_GLUENS_SRC_LCPPSRCS += arm.cpp
endif
XPCOM_GLUENS_SRC_CPPSRCS = $(addprefix $(topsrcdir)/xpcom/glue/,$(XPCOM_GLUENS_SRC_LCPPSRCS))
mozilla-file.patch:
file_util_linux.cc | 3 +++
message_pump_libevent.cc | 3 +++
2 files changed, 6 insertions(+)
--- NEW FILE mozilla-file.patch ---
diff -up mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file mozilla-beta/ipc/chromium/src/base/file_util_linux.cc
--- mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file 2012-01-24 09:00:00.000000000 +0100
+++ mozilla-beta/ipc/chromium/src/base/file_util_linux.cc 2012-01-25 15:30:43.707796295 +0100
@@ -5,6 +5,9 @@
#include "base/file_util.h"
#include <fcntl.h>
+#if defined(ANDROID) || defined(OS_POSIX)
+#include <unistd.h>
+#endif
#include <string>
#include <vector>
diff -up mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc
--- mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file 2012-01-24 09:00:00.000000000 +0100
+++ mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc 2012-01-25 15:13:11.947771212 +0100
@@ -6,6 +6,9 @@
#include <errno.h>
#include <fcntl.h>
+#if defined(ANDROID) || defined(OS_POSIX)
+#include <unistd.h>
+#endif
#include "eintr_wrapper.h"
#include "base/logging.h"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 15 Mar 2012 19:53:23 -0000 1.16
+++ .cvsignore 28 Apr 2012 15:30:34 -0000 1.17
@@ -1,2 +1,2 @@
-enigmail-1.4.tar.gz
-thunderbird-11.0.source.tar.bz2
+thunderbird-12.0.source.tar.bz2
+enigmail-1.4.1.tar.gz
mozilla-733867-x.patch:
base/search/src/nsMsgSearchAdapter.cpp | 2 +-
base/src/nsMsgFolderCompactor.cpp | 4 ++--
compose/src/nsSmtpProtocol.cpp | 5 ++---
imap/src/nsImapMailFolder.cpp | 2 +-
imap/src/nsImapProtocol.cpp | 28 ++++++++++++++--------------
imap/src/nsImapServerResponseParser.cpp | 2 +-
local/src/nsPop3Protocol.cpp | 2 +-
mime/src/mimedrft.cpp | 2 +-
mime/src/mimemult.cpp | 10 +++++-----
9 files changed, 28 insertions(+), 29 deletions(-)
Index: mozilla-733867-x.patch
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/mozilla-733867-x.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozilla-733867-x.patch 16 Mar 2012 17:43:35 -0000 1.1
+++ mozilla-733867-x.patch 28 Apr 2012 15:30:34 -0000 1.2
@@ -1,6 +1,6 @@
-diff -up thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
---- thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 2012-03-13 03:37:12.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-03-16 07:20:29.299342799 +0100
+diff -up comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
+--- comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 2012-04-21 00:32:39.000000000 +0200
++++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-04-25 10:51:32.343536178 +0200
@@ -688,7 +688,7 @@ nsresult nsMsgSearchAdapter::EncodeImapV
PL_strcat(encoding, "{");
lengthStr.AppendInt((PRInt32) strlen(value));
@@ -10,10 +10,10 @@
PL_strcat(encoding, value);
return NS_OK;
}
-diff -up thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
---- thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-03-16 07:20:29.300342735 +0100
-@@ -753,7 +753,7 @@ nsFolderCompactState::OnDataAvailable(ns
+diff -up comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
+--- comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 2012-04-21 00:32:39.000000000 +0200
++++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-04-25 10:51:33.208535909 +0200
+@@ -758,7 +758,7 @@ nsFolderCompactState::OnDataAvailable(ns
}
}
}
@@ -22,7 +22,7 @@
// 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.
-@@ -1203,7 +1203,7 @@ nsOfflineStoreCompactState::OnDataAvaila
+@@ -1216,7 +1216,7 @@ nsOfflineStoreCompactState::OnDataAvaila
// check if there's an envelope header; if not, write one.
if (strncmp(m_dataBuffer, "From ", 5))
{
@@ -31,19 +31,19 @@
m_offlineMsgSize += bytesWritten;
}
}
-diff -up thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
---- thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-03-16 07:23:01.225877457 +0100
+diff -up comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
+--- comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 2012-04-21 00:32:39.000000000 +0200
++++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-04-25 10:51:33.365535861 +0200
@@ -1722,7 +1722,7 @@ PRInt32 nsSmtpProtocol::SendQuit()
{
- m_sendDone = PR_TRUE;
+ 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);
-@@ -1969,7 +1969,7 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI
+@@ -1969,7 +1969,7 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI
{
nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
// send a quit command to close the connection with the server.
@@ -57,10 +57,10 @@
return rv;
}
-
-diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp
---- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-03-16 07:20:29.309342162 +0100
-@@ -8298,7 +8298,7 @@ nsImapMailFolder::CopyFileToOfflineStore
+diff -up comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 comm-release/mailnews/imap/src/nsImapMailFolder.cpp
+--- comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 2012-04-21 00:32:39.000000000 +0200
++++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-04-25 10:51:33.367535861 +0200
+@@ -8309,7 +8309,7 @@ nsImapMailFolder::CopyFileToOfflineStore
bool needMoreData = false;
char * newLine = nsnull;
PRUint32 numBytesInLine = 0;
@@ -69,10 +69,10 @@
offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
fileSize += bytesWritten;
do
-diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp
---- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-03-16 07:20:29.314341844 +0100
-@@ -1410,7 +1410,7 @@ void nsImapProtocol::HandleIdleResponses
+diff -up comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 comm-release/mailnews/imap/src/nsImapProtocol.cpp
+--- comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 2012-04-21 00:32:39.000000000 +0200
++++ comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-04-25 10:51:33.370535858 +0200
+@@ -1409,7 +1409,7 @@ void nsImapProtocol::HandleIdleResponses
{
// PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
nsCAutoString commandBuffer(GetServerCommandTag());
@@ -81,7 +81,7 @@
do
{
-@@ -3290,7 +3290,7 @@ void nsImapProtocol::FetchMsgAttribute(c
+@@ -3287,7 +3287,7 @@ void nsImapProtocol::FetchMsgAttribute(c
commandString.Append(messageIds);
commandString.Append(" (");
commandString.Append(attribute);
@@ -114,10 +114,10 @@
command.Append(correctedPassword);
- command.Append("\""CRLF);
+ command.Append("\"" CRLF);
- rv = SendData(command.get(), PR_TRUE /* suppress logging */);
+ rv = SendData(command.get(), true /* suppress logging */);
NS_ENSURE_SUCCESS(rv, rv);
ParseIMAPandCheckForNewMail();
-@@ -7446,7 +7446,7 @@ void nsImapProtocol::CreateMailbox(const
+@@ -7447,7 +7447,7 @@ void nsImapProtocol::CreateMailbox(const
nsCString command(GetServerCommandTag());
command += " create \"";
command += escapedName;
@@ -126,7 +126,7 @@
nsresult rv = SendData(command.get());
if(NS_SUCCEEDED(rv))
-@@ -7549,7 +7549,7 @@ void nsImapProtocol::Lsub(const char *ma
+@@ -7550,7 +7550,7 @@ void nsImapProtocol::Lsub(const char *ma
nsCString command (GetServerCommandTag());
command += " lsub \"\" \"";
command += escapedPattern;
@@ -135,7 +135,7 @@
PR_Free(boxnameWithOnlineDirectory);
-@@ -7578,7 +7578,7 @@ void nsImapProtocol::List(const char *ma
+@@ -7579,7 +7579,7 @@ void nsImapProtocol::List(const char *ma
command += useXLIST ?
" xlist \"\" \"" : " list \"\" \"";
command += escapedPattern;
@@ -144,7 +144,7 @@
PR_Free(boxnameWithOnlineDirectory);
-@@ -7599,7 +7599,7 @@ void nsImapProtocol::Subscribe(const cha
+@@ -7600,7 +7600,7 @@ void nsImapProtocol::Subscribe(const cha
nsCString command (GetServerCommandTag());
command += " subscribe \"";
command += escapedName;
@@ -153,7 +153,7 @@
nsresult rv = SendData(command.get());
if (NS_SUCCEEDED(rv))
-@@ -7617,7 +7617,7 @@ void nsImapProtocol::Unsubscribe(const c
+@@ -7618,7 +7618,7 @@ void nsImapProtocol::Unsubscribe(const c
nsCString command (GetServerCommandTag());
command += " unsubscribe \"";
command += escapedName;
@@ -162,7 +162,7 @@
nsresult rv = SendData(command.get());
if (NS_SUCCEEDED(rv))
-@@ -7631,7 +7631,7 @@ void nsImapProtocol::Idle()
+@@ -7632,7 +7632,7 @@ void nsImapProtocol::Idle()
if (m_urlInProgress)
return;
nsCAutoString command (GetServerCommandTag());
@@ -171,7 +171,7 @@
nsresult rv = SendData(command.get());
if (NS_SUCCEEDED(rv))
{
-@@ -7658,7 +7658,7 @@ void nsImapProtocol::EndIdle(bool waitFo
+@@ -7659,7 +7659,7 @@ void nsImapProtocol::EndIdle(bool waitFo
nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
if (asyncInputStream)
asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
@@ -180,7 +180,7 @@
// 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);
-@@ -7727,8 +7727,8 @@ void nsImapProtocol::Copy(const char * m
+@@ -7728,8 +7728,8 @@ void nsImapProtocol::Copy(const char * m
PRUint32 msgsHandled = 0;
const char *formatString;
formatString = (idsAreUid)
@@ -191,9 +191,9 @@
do
{
-diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
---- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-03-16 07:20:29.316341717 +0100
+diff -up comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
+--- comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 2012-04-21 00:32:39.000000000 +0200
++++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-04-25 10:51:33.374535858 +0200
@@ -185,7 +185,7 @@ void nsImapServerResponseParser::ParseIM
NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' &&
@@ -201,11 +201,11 @@
- bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
+ bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
if (sendingIdleDone)
- fWaitingForMoreClientInput = PR_FALSE;
+ fWaitingForMoreClientInput = false;
-diff -up thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp
---- thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-03-16 07:23:38.980300990 +0100
+diff -up comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 comm-release/mailnews/local/src/nsPop3Protocol.cpp
+--- comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 2012-04-21 00:32:40.000000000 +0200
++++ comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-04-25 10:51:33.375535858 +0200
@@ -2483,7 +2483,7 @@ PRInt32 nsPop3Protocol::SendList()
return(MK_OUT_OF_MEMORY);
m_pop3ConData->next_state_after_response = POP3_GET_LIST;
@@ -215,9 +215,9 @@
}
-diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867 thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp
---- thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867 2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp 2012-03-16 07:20:29.320341461 +0100
+diff -up comm-release/mailnews/mime/src/mimedrft.cpp.733867 comm-release/mailnews/mime/src/mimedrft.cpp
+--- comm-release/mailnews/mime/src/mimedrft.cpp.733867 2012-04-21 00:32:40.000000000 +0200
++++ comm-release/mailnews/mime/src/mimedrft.cpp 2012-04-25 10:51:33.376535858 +0200
@@ -1473,7 +1473,7 @@ mime_parse_stream_complete (nsMIMESessio
*newbody = 0;
PL_strcatn(newbody, newbodylen, "<PRE>");
@@ -227,9 +227,9 @@
PR_Free(body);
body = newbody;
}
-diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp
---- thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp 2012-03-16 07:20:29.321341397 +0100
+diff -up comm-release/mailnews/mime/src/mimemult.cpp.733867 comm-release/mailnews/mime/src/mimemult.cpp
+--- comm-release/mailnews/mime/src/mimemult.cpp.733867 2012-04-21 00:32:40.000000000 +0200
++++ comm-release/mailnews/mime/src/mimemult.cpp 2012-04-25 10:52:45.835512632 +0200
@@ -280,7 +280,7 @@ MimeMultipart_parse_line (const char *li
MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\""));
@@ -260,6 +260,6 @@
- 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, PR_FALSE);
+ MimeHeaders_write_raw_headers(mult->hdrs, obj->options, false);
}
PRInt32 old_nchildren = container->nchildren;
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 15 Mar 2012 19:53:23 -0000 1.17
+++ sources 28 Apr 2012 15:30:34 -0000 1.18
@@ -1,2 +1,2 @@
-5cf3d9720ed1cda1b22eabe5457772c2 enigmail-1.4.tar.gz
-1d7127a3282e62d95eb9b59d47291b70 thunderbird-11.0.source.tar.bz2
+7b30b72472a65bce74ba0ae60e4d4e6c thunderbird-12.0.source.tar.bz2
+0eba75fbcf8f0bb32d538df102fbb8e9 enigmail-1.4.1.tar.gz
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- thunderbird-enigmail.spec 16 Mar 2012 17:43:35 -0000 1.20
+++ thunderbird-enigmail.spec 28 Apr 2012 15:30:34 -0000 1.21
@@ -1,7 +1,7 @@
%define debug_build 0
# Use system Librairies ?
-%if 0%{?fedora} <= 15
+%if 0%{?fedora} <= 17
%define system_sqlite 0
%else
%define system_sqlite 1
@@ -13,14 +13,14 @@
%define nss_version 3.13.3
%define cairo_version 1.10.0
%define freetype_version 2.1.9
-%define sqlite_version 3.7.7.1
+%define sqlite_version 3.7.10
%define libnotify_version 0.4
%global libvpx_version 1.0.0
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
-%global thunver 11.0
-%global thunmax 12.0
+%global thunver 12.0
+%global thunmax 13.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -38,11 +38,11 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.4
+Version: 1.4.1
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 3%{?dist}
+Release: 1%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -70,13 +70,15 @@
Patch8: xulrunner-10.0-secondary-ipc.patch
# Build patches
-Patch100: xulrunner-10.0-gcc47.patch
-Patch101: mozilla-722127.patch
Patch102: mozilla-733867-x.patch
-
+Patch103: mozilla-file.patch
+Patch104: xulrunner-10.0-gcc47.patch
# Linux specific
Patch200: thunderbird-8.0-enable-addons.patch
+# ARM Specific
+Patch210: mozilla-724615.patch
+
%if %{official_branding}
# Required by Mozilla Corporation
@@ -153,14 +155,13 @@
cd mozilla
%patch7 -p2 -b .static
%patch8 -p3 -b .secondary-ipc
-%if 0%{?fedora} >= 17
-%patch100 -p1 -b .gcc47
-%endif
-%patch101 -p2 -b .722127
+%patch103 -p1 -b .mozilla-file
+%patch104 -p1 -b .gcc47
cd ..
-%patch102 -p2 -b .733867
+%patch102 -p1 -b .733867
%patch200 -p1 -b .addons
+%patch210 -p1 -b .724615
%if %{official_branding}
# Required by Mozilla Corporation
@@ -213,7 +214,7 @@
# All tarballs (as well as CVS) will *always* report as 1.4a1pre (or whatever
# the next major version would be). This is because I create builds from trunk
# and simply label the result as 1.3.x.
-# sed -i -e '/em:version/s/1.4a1pre/%{version}/' package/install.rdf
+sed -i -e '/em:version/s/1.5pre/%{version}/' package/install.rdf
grep '<em:version>%{version}</em:version>' package/install.rdf || exit 1
# Apply Enigmail patch here
popd
@@ -279,7 +280,6 @@
mkdir -p $RPM_BUILD_ROOT%{enigmail_extname}
unzip -q mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname}
-chmod +x $RPM_BUILD_ROOT%{enigmail_extname}/wrappers/*.sh
%clean
@@ -294,6 +294,9 @@
#===============================================================================
%changelog
+* Sat Apr 28 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.1-1
+- Enigmail 1.4.1 for Thunderbird 12.0
+
* Fri Mar 16 2012 Remi Collet <remi(a)fedoraproject.org> 1.4-3
- Latest Thunderbird patch from rahwide
Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-mozconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- thunderbird-mozconfig 15 Mar 2012 19:53:23 -0000 1.7
+++ thunderbird-mozconfig 28 Apr 2012 15:30:34 -0000 1.8
@@ -21,7 +21,8 @@
ac_add_options --disable-strip
ac_add_options --disable-install-strip
ac_add_options --enable-pango
-ac_add_options --enable-system-cairo
+# temporary disable system cairo, because compilation fails
+#ac_add_options --enable-system-cairo
ac_add_options --enable-svg
ac_add_options --enable-canvas
ac_add_options --enable-system-hunspell
xulrunner-10.0-gcc47.patch:
ipc/chromium/src/base/time_posix.cc | 2 ++
toolkit/crashreporter/client/Makefile.in | 3 +++
2 files changed, 5 insertions(+)
Index: xulrunner-10.0-gcc47.patch
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/xulrunner-10.0-gcc47.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xulrunner-10.0-gcc47.patch 3 Mar 2012 17:25:45 -0000 1.1
+++ xulrunner-10.0-gcc47.patch 28 Apr 2012 15:30:34 -0000 1.2
@@ -23,41 +23,3 @@
ifeq ($(OS_ARCH),WINNT)
CPPSRCS += crashreporter_win.cpp
LIBS += \
-diff -up mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file mozilla-beta/ipc/chromium/src/base/file_util_linux.cc
---- mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file 2012-01-24 09:00:00.000000000 +0100
-+++ mozilla-beta/ipc/chromium/src/base/file_util_linux.cc 2012-01-25 15:30:43.707796295 +0100
-@@ -5,6 +5,9 @@
- #include "base/file_util.h"
-
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include <string>
- #include <vector>
-diff -up mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc
---- mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file 2012-01-24 09:00:00.000000000 +0100
-+++ mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc 2012-01-25 15:13:11.947771212 +0100
-@@ -6,6 +6,9 @@
-
- #include <errno.h>
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
-diff -up mozilla-beta/ipc/chromium/src/base/file_util.cc.old mozilla-beta/ipc/chromium/src/base/file_util.cc
---- mozilla-beta/ipc/chromium/src/base/file_util.cc.old 2012-01-25 13:48:11.000000000 +0100
-+++ mozilla-beta/ipc/chromium/src/base/file_util.cc 2012-01-25 13:52:25.096659244 +0100
-@@ -8,7 +8,7 @@
- #include <io.h>
- #endif
- #include <stdio.h>
--#if defined(ANDROID)
-+#if defined(ANDROID) || defined(OS_POSIX)
- #include <unistd.h>
- #endif
-
--- mozilla-722127.patch DELETED ---
12 years, 7 months
- 1
- 0
rpms/smplayer/F-17 smplayer.spec, 1.17, 1.18 smplayer_enqueue_kde3.desktop, 1.1, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/smplayer/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5947
Modified Files:
smplayer.spec
Removed Files:
smplayer_enqueue_kde3.desktop
Log Message:
* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-2
- fix smtube translations.
- drop support for Fedora < 9 and EPEL 5, since we need kde4.
Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-17/smplayer.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- smplayer.spec 28 Apr 2012 01:45:28 -0000 1.17
+++ smplayer.spec 28 Apr 2012 13:57:17 -0000 1.18
@@ -1,17 +1,8 @@
-# define correct path to used binaries
-# works on: fedora >= 7, centos >= 5
-%if 0%{?rhel} > 1
- %define _qt4_qmake %{_libdir}/qt4/bin/qmake
- %define _qt4_lrelease %{_libdir}/qt4/bin/lrelease
-%else
- %define _qt4_lrelease %{_bindir}/lrelease-qt4
-%endif
-
%define smtube_ver 1.1
Name: smplayer
Version: 0.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A graphical frontend for mplayer
Group: Applications/Multimedia
@@ -19,11 +10,9 @@
URL: http://smplayer.sourceforge.net/linux/
Source0: http://downloads.sourceforge.net/smplayer/smplayer-%{version}.tar.bz2
# Add a servicemenu to enqeue files in smplayer's playlist.
-# The first one is for KDE4, the second one for KDE3.
# see also:
# https://sourceforge.net/tracker/?func=detail&atid=913576&aid=2052905&grou...
Source1: smplayer_enqueue_kde4.desktop
-Source2: smplayer_enqueue_kde3.desktop
Source3: http://downloads.sourceforge.net/smplayer/smtube-%{smtube_ver}.tar.bz2
# Fix regression in Thunar (TODO: re-check in upcoming versions!)
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=1217
@@ -53,6 +42,8 @@
#remove some bundle sources
rm -rf zlib-1.2.6
rm -rf src/findsubtitles/quazip
+rm -rf src/qtsingleapplication/
+
%patch0 -p0 -b .desktop-files
%patch1 -p1 -b .quazip
%patch2 -p1 -b .qtsingleapplication
@@ -64,7 +55,7 @@
mv Changelog.utf8 Changelog
# use lrelease from qt4-devel
-sed -i 's|LRELEASE=lrelease|LRELEASE=%{_qt4_lrelease}|' Makefile
+sed -i 's|LRELEASE=lrelease|LRELEASE=%{_bindir}/lrelease-qt4|' Makefile
# fix path of docs
sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer-%{version}|' Makefile
@@ -79,9 +70,9 @@
make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix}
pushd smtube-%{smtube_ver}
-sed -i 's|lrelease|%{_qt4_lrelease}|' Makefile
+sed -i 's|lrelease|%{_bindir}/lrelease-qt4|' Makefile
sed -i 's|qmake|%{_qt4_qmake}|' Makefile
-sed -i 's|/usr/local|%{buildroot}%{_prefix}|' Makefile
+sed -i 's|/usr/local|%{_prefix}|' Makefile
sed -i 's|doc/smtube|doc/%{name}-%{version}/smtube|' Makefile
sed -i 's|smtube/translations|smplayer/translations|' Makefile
make PREFIX=%{_prefix}
@@ -91,7 +82,7 @@
%install
make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} DESTDIR=%{buildroot}/ install
pushd smtube-%{smtube_ver}
-make install
+make install DESTDIR=%{buildroot}
popd
desktop-file-install --delete-original \
@@ -109,11 +100,7 @@
# Add servicemenus dependend on the version of KDE:
# https://sourceforge.net/tracker/index.php?func=detail&aid=2052905&group_i...
-%if 0%{?fedora} >= 9
- install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
-%else
- install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/apps/konqueror/servicemenus/smplayer_enqueue.desktop
-%endif
+install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
%post
touch --no-create %{_datadir}/icons/hicolor
@@ -139,17 +126,14 @@
%{_datadir}/icons/hicolor/*/apps/smtube.png
%{_datadir}/smplayer/
%{_mandir}/man1/smplayer.1.gz
-
-%if 0%{?fedora} >= 9
- %dir %{_datadir}/kde4/services/ServiceMenus/
- %{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
-%else
- %dir %{_datadir}/apps/konqueror/
- %dir %{_datadir}/apps/konqueror/servicemenus/
- %{_datadir}/apps/konqueror/servicemenus/smplayer_enqueue.desktop
-%endif
+%dir %{_datadir}/kde4/services/ServiceMenus/
+%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
%changelog
+* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-2
+- fix smtube translations.
+- drop support for Fedora < 9 and EPEL 5, since we need kde4.
+
* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-1
- New release
- add smtube support
--- smplayer_enqueue_kde3.desktop DELETED ---
12 years, 7 months
- 1
- 0