Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:Factory checked in at 2012-12-03 10:44:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaThunderbird (Old) and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaThunderbird", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaThunderbird/MozillaThunderbird.changes 2012-11-22 14:02:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/MozillaThunderbird.changes 2012-12-03 10:44:02.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Nov 26 11:10:11 UTC 2012 - [email protected] + +- fix KDE integration for file dialogs +- fix some rpmlint warnings (mkdir.done files) +- build on SLE11 + * mozilla-gcc43-enums.patch + * mozilla-gcc43-template_hacks.patch + * mozilla-gcc43-templates_instantiation.patch + +------------------------------------------------------------------- New: ---- mozilla-gcc43-enums.patch mozilla-gcc43-template_hacks.patch mozilla-gcc43-templates_instantiation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ --- /var/tmp/diff_new_pack.5j2ShK/_old 2012-12-03 10:44:07.000000000 +0100 +++ /var/tmp/diff_new_pack.5j2ShK/_new 2012-12-03 10:44:07.000000000 +0100 @@ -76,6 +76,10 @@ Patch4: mozilla-kde.patch Patch5: mozilla-arm-disable-edsp.patch Patch7: mozilla-ppc.patch +# SLE11 patches +Patch10: mozilla-gcc43-enums.patch +Patch11: mozilla-gcc43-template_hacks.patch +Patch12: mozilla-gcc43-templates_instantiation.patch # Thunderbird/mail Patch20: tb-ssldap.patch Patch21: tb-develdirs.patch @@ -203,6 +207,12 @@ %endif %patch5 -p1 %patch7 -p1 +# SLE patches +%if %suse_version <= 1110 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%endif popd # comm-central patches %patch20 -p1 @@ -431,6 +441,8 @@ -name "*.properties" -o \ -name "*.dtd" -o \ -name "*.css" | xargs chmod a-x +# remove mkdir.done files from installed base +find $RPM_BUILD_ROOT%{progdir} -name ".mkdir.done" | xargs rm # for size in 16 22 24 32 48 256; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/ ++++++ mozilla-gcc43-enums.patch ++++++ # HG changeset patch # Parent 6d0e0f7dc4cf04f1d08f8b4f8e9312ac05928608 remove trailing commas in enum definitions as these are unpalatable for gcc (4.3.4) in pedantic mode diff --git a/media/webrtc/trunk/src/common_types.h b/media/webrtc/trunk/src/common_types.h --- a/media/webrtc/trunk/src/common_types.h +++ b/media/webrtc/trunk/src/common_types.h @@ -342,17 +342,17 @@ enum TelephoneEventDetectionMethods enum NsModes // type of Noise Suppression { kNsUnchanged = 0, // previously set mode kNsDefault, // platform default kNsConference, // conferencing default kNsLowSuppression, // lowest suppression kNsModerateSuppression, kNsHighSuppression, - kNsVeryHighSuppression, // highest suppression + kNsVeryHighSuppression // highest suppression }; enum AgcModes // type of Automatic Gain Control { kAgcUnchanged = 0, // previously set mode kAgcDefault, // platform default // adaptive mode for use when analog volume control exists (e.g. for // PC softphone) @@ -367,17 +367,17 @@ enum AgcModes // type o // EC modes enum EcModes // type of Echo Control { kEcUnchanged = 0, // previously set mode kEcDefault, // platform default kEcConference, // conferencing default (aggressive AEC) kEcAec, // Acoustic Echo Cancellation - kEcAecm, // AEC mobile + kEcAecm // AEC mobile }; // AECM modes enum AecmModes // mode of AECM { kAecmQuietEarpieceOrHeadset = 0, // Quiet earpiece or headset use kAecmEarpiece, // most earpiece use @@ -416,43 +416,43 @@ enum NetEqModes // NetEQ pla // Optimized trade-off between low delay and jitter robustness for two-way // communication. kNetEqDefault = 0, // Improved jitter robustness at the cost of increased delay. Can be // used in one-way communication. kNetEqStreaming = 1, // Optimzed for decodability of fax signals rather than for perceived audio // quality. - kNetEqFax = 2, + kNetEqFax = 2 }; enum NetEqBgnModes // NetEQ Background Noise (BGN) configurations { // BGN is always on and will be generated when the incoming RTP stream // stops (default). kBgnOn = 0, // The BGN is faded to zero (complete silence) after a few seconds. kBgnFade = 1, // BGN is not used at all. Silence is produced after speech extrapolation // has faded. - kBgnOff = 2, + kBgnOff = 2 }; enum OnHoldModes // On Hold direction { kHoldSendAndPlay = 0, // Put both sending and playing in on-hold state. kHoldSendOnly, // Put only sending in on-hold state. kHoldPlayOnly // Put only playing in on-hold state. }; enum AmrMode { kRfc3267BwEfficient = 0, kRfc3267OctetAligned = 1, - kRfc3267FileStorage = 2, + kRfc3267FileStorage = 2 }; // ================================================================== // Video specific types // ================================================================== // Raw video types enum RawVideoType ++++++ mozilla-gcc43-template_hacks.patch ++++++ # HG changeset patch # Parent 993c5b5a44ca18c5273b74c75704b418c2477d28 bmo#783505 - bump gcc version required for building without template hacks diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp --- a/js/src/jstypedarray.cpp +++ b/js/src/jstypedarray.cpp @@ -1404,17 +1404,17 @@ class TypedArrayTemplate // retrieves a given Value, probably from a slot on the object. template<Value ValueGetter(JSObject *obj)> static JSBool Getter(JSContext *cx, unsigned argc, Value *vp) { CallArgs args = CallArgsFromVp(argc, vp); // FIXME: Hack to keep us building with gcc 4.2. Remove this once we // drop support for gcc 4.2. See bug 783505 for the details. -#if defined(__GNUC__) && __GNUC_MINOR__ <= 2 +#if defined(__GNUC__) && __GNUC_MINOR__ <= 3 return CallNonGenericMethod(cx, IsThisClass, GetterImpl<ValueGetter>, args); #else return CallNonGenericMethod<ThisTypeArray::IsThisClass, ThisTypeArray::GetterImpl<ValueGetter> >(cx, args); #endif } // Define an accessor for a read-only property that invokes a native getter ++++++ mozilla-gcc43-templates_instantiation.patch ++++++ # HG changeset patch # Parent 2e78665a1ab70f4dc3884965428bda14da684ef6 bmo#732340 - explicitly instantiate templates diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc --- a/gfx/harfbuzz/src/hb-ot-layout.cc +++ b/gfx/harfbuzz/src/hb-ot-layout.cc @@ -479,8 +479,12 @@ hb_ot_layout_position_lookup (hb_font_t return hb_ot_layout_from_face (font->face)->gpos->position_lookup (&c, lookup_index); } void hb_ot_layout_position_finish (hb_font_t *font, hb_buffer_t *buffer, hb_bool_t zero_width_attached_marks) { GPOS::position_finish (font, buffer, zero_width_attached_marks); } + +template int SortedArrayOf<Record<LangSys> >::search<unsigned int>(unsigned int const &) const; +template int SortedArrayOf<Record<Script> >::search<unsigned int>(unsigned int const &) const; +template int SortedArrayOf<IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const; ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.5j2ShK/_old 2012-12-03 10:44:07.000000000 +0100 +++ /var/tmp/diff_new_pack.5j2ShK/_new 2012-12-03 10:44:07.000000000 +0100 @@ -3106,27 +3106,40 @@ mFilters.AppendElement(filter); mFilterNames.AppendElement(name); -@@ -369,16 +373,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat - return NS_ERROR_FAILURE; - } +@@ -388,16 +392,32 @@ nsFilePicker::Show(int16_t *aReturn) NS_IMETHODIMP - nsFilePicker::Show(int16_t *aReturn) + nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) { - NS_ENSURE_ARG_POINTER(aReturn); + // Can't show two dialogs concurrently with the same filepicker + if (mRunning) + return NS_ERROR_NOT_AVAILABLE; -+ if( nsKDEUtils::kdeSupport()) -+ return kdeFileDialog(aReturn); ++ // KDE file picker is not handled via callback ++ if( nsKDEUtils::kdeSupport()) { ++ int16_t result; ++ mCallback = aCallback; ++ mRunning = true; ++ kdeFileDialog(&result); ++ if (mCallback) { ++ mCallback->Done(result); ++ mCallback = nullptr; ++ } else { ++ mResult = result; ++ } ++ mRunning = false; ++ return NS_OK; ++ } + - nsresult rv = Open(nullptr); - if (NS_FAILED(rv)) - return rv; + nsXPIDLCString title; + title.Adopt(ToNewUTF8String(mTitle)); - while (mRunning) { - g_main_context_iteration(nullptr, TRUE); - } + GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget); -@@ -587,8 +594,235 @@ nsFilePicker::Done(GtkWidget* file_choos + GtkFileChooserAction action = GetGtkFileChooserAction(mMode); + const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE) + ? GTK_STOCK_SAVE : GTK_STOCK_OPEN; +@@ -587,8 +607,235 @@ nsFilePicker::Done(GtkWidget* file_choos if (mCallback) { mCallback->Done(result); mCallback = nullptr; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
