diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -27,8 +27,6 @@ libgobject-2.0.so.0 libgtk-3.so.0 libgtk-x11-2.0.so.0 -libhunspell-1.7.so.0 -libjpeg.so.8 libm.so.6 libnspr4.so libnss3.so diff --git a/files/config b/files/config --- a/files/config +++ b/files/config @@ -11,6 +11,7 @@ ac_add_options --enable-calendar ac_add_options --enable-startup-notification +ac_add_options --disable-elf-hack ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns" ac_add_options --enable-release ac_add_options --enable-strip @@ -26,7 +27,6 @@ ac_add_options --enable-system-ffi ac_add_options --enable-system-pixman -ac_add_options --enable-system-hunspell # ac_add_options --with-system-sqlite (Note: This breaks search) ac_add_options --with-system-libevent ac_add_options --with-system-bz2 @@ -40,7 +40,6 @@ ac_add_options --disable-updater ac_add_options --disable-tests -ac_add_options --with-pthreads # Keys ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key diff --git a/files/rust-1.33.patch b/files/rust-1.33.patch deleted file mode 100644 --- a/files/rust-1.33.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up thunderbird-60.8.0/servo/components/style_traits/values.rs.rust-1.33-build thunderbird-60.8.0/servo/components/style_traits/values.rs ---- thunderbird-60.8.0/servo/components/style_traits/values.rs.rust-1.33-build 2019-07-03 17:25:28.000000000 +0200 -+++ thunderbird-60.8.0/servo/components/style_traits/values.rs 2019-07-11 13:38:53.687318154 +0200 -@@ -135,6 +135,7 @@ where - } - } - -+/// Some comment - #[macro_export] - macro_rules! serialize_function { - ($dest: expr, $name: ident($( $arg: expr, )+)) => { -@@ -404,6 +405,7 @@ impl_to_css_for_predefined_type!(::csspa - impl_to_css_for_predefined_type!(::cssparser::Color); - impl_to_css_for_predefined_type!(::cssparser::UnicodeRange); - -+/// Some comment - #[macro_export] - macro_rules! define_css_keyword_enum { - (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => { -diff -up thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs.old thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs ---- thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs.old 2019-07-11 14:22:51.393784701 +0200 -+++ thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs 2019-07-11 14:24:03.182578100 +0200 -@@ -55,6 +55,7 @@ use style_adjuster::StyleAdjuster; - - pub use self::declaration_block::*; - -+/// Neco - #[cfg(feature = "gecko")] - #[macro_export] - macro_rules! property_name { -@@ -3852,7 +3853,7 @@ impl fmt::Debug for AliasId { - } - } - --// NOTE(emilio): Callers are responsible to deal with prefs. -+/// NOTE(emilio): Callers are responsible to deal with prefs. - #[macro_export] - macro_rules! css_properties_accessors { - ($macro_name: ident) => { -@@ -3875,6 +3876,7 @@ macro_rules! css_properties_accessors { - } - } - -+/// Neco - #[macro_export] - macro_rules! longhand_properties_idents { - ($macro_name: ident) => { diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,9 +1,9 @@ name : thunderbird -version : 60.8.0 -release : 75 +version : 68.0 +release : 76 source : - - https://ftp.mozilla.org/pub/thunderbird/releases/60.8.0/source/thunderbird-60.8.0.source.tar.xz : 1e7a13e64b63476d2235aaac6823fdab949af45cfcd5a25ee710cbae08c2f5d1 - - https://getsol.us/sources/mozilla/thunderbird-60.8.0-langpacks.tar.xz : 8ca4a716de337ae207fad7c3cd74246815a144cdb16b8a3ee4d445f76a70b831 + - https://ftp.mozilla.org/pub/thunderbird/releases/68.0/source/thunderbird-68.0.source.tar.xz : f87dade2dd64ef61de842812d3e42d82b8a541988da851077778abfa2ebd95d1 + - https://getsol.us/sources/mozilla/thunderbird-68.0-langpacks.tar.xz : d818b66feb9a0c362c81f81dbc9bc8e7e04481944ff74e465719dfa5341323ae license : - GPL-2.0-or-later - LGPL-2.1-or-later @@ -23,7 +23,6 @@ - pkgconfig(gstreamer-plugins-base-1.0) - pkgconfig(gtk+-2.0) - pkgconfig(gtk+-3.0) - - pkgconfig(hunspell) - pkgconfig(libevent) - pkgconfig(libffi) - pkgconfig(libjpeg) @@ -36,7 +35,9 @@ - pkgconfig(xt) - autoconf213 - cargo + - cbindgen - llvm-clang + - nodejs-devel - yasm setup : | cp $pkgfiles/mozilla-api-key . @@ -44,7 +45,6 @@ sed -e 's|##JOBCOUNT##|%JOBS%|' -e 's|##LIBDIR##|%libdir%|' -i mozconfig %patch -p1 < $pkgfiles/thunderbird-enable-addons.patch - %patch -p1 < $pkgfiles/rust-1.33.patch ./mach configure build : | diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -37,8 +37,6 @@ /usr/lib64/thunderbird/defaults/pref/channel-prefs.js /usr/lib64/thunderbird/defaults/pref/prefs.js /usr/lib64/thunderbird/dependentlibs.list - /usr/lib64/thunderbird/dictionaries/en-US.aff - /usr/lib64/thunderbird/dictionaries/en-US.dic /usr/lib64/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi /usr/lib64/thunderbird/extensions/langpack-ar@thunderbird.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-ast@thunderbird.mozilla.org.xpi @@ -46,12 +44,14 @@ /usr/lib64/thunderbird/extensions/langpack-bg@thunderbird.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-br@thunderbird.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-ca@thunderbird.mozilla.org.xpi + /usr/lib64/thunderbird/extensions/langpack-cak@thunderbird.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-ar@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-ast@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-be@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-bg@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-br@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-ca@lightning.mozilla.org.xpi + /usr/lib64/thunderbird/extensions/langpack-cal-cak@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-cs@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-cy@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-da@lightning.mozilla.org.xpi @@ -79,6 +79,7 @@ /usr/lib64/thunderbird/extensions/langpack-cal-is@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-it@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-ja@lightning.mozilla.org.xpi + /usr/lib64/thunderbird/extensions/langpack-cal-ka@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-kab@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-kk@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-ko@lightning.mozilla.org.xpi @@ -101,6 +102,7 @@ /usr/lib64/thunderbird/extensions/langpack-cal-sv-SE@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-tr@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-uk@lightning.mozilla.org.xpi + /usr/lib64/thunderbird/extensions/langpack-cal-uz@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-vi@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-zh-CN@lightning.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-cal-zh-TW@lightning.mozilla.org.xpi @@ -131,6 +133,7 @@ /usr/lib64/thunderbird/extensions/langpack-is@thunderbird.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-it@thunderbird.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-ja@thunderbird.mozilla.org.xpi + /usr/lib64/thunderbird/extensions/langpack-ka@thunderbird.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-kab@thunderbird.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-kk@thunderbird.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-ko@thunderbird.mozilla.org.xpi @@ -153,12 +156,12 @@ /usr/lib64/thunderbird/extensions/langpack-sv-SE@thunderbird.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-tr@thunderbird.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-uk@thunderbird.mozilla.org.xpi + /usr/lib64/thunderbird/extensions/langpack-uz@thunderbird.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-vi@thunderbird.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-zh-CN@thunderbird.mozilla.org.xpi /usr/lib64/thunderbird/extensions/langpack-zh-TW@thunderbird.mozilla.org.xpi - /usr/lib64/thunderbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi /usr/lib64/thunderbird/features/wetransfer@extensions.thunderbird.net.xpi - /usr/lib64/thunderbird/fonts/EmojiOneMozilla.ttf + /usr/lib64/thunderbird/fonts/TwemojiMozilla.ttf /usr/lib64/thunderbird/gtk2/libmozgtk.so /usr/lib64/thunderbird/isp/Bogofilter.sfd /usr/lib64/thunderbird/isp/DSPAM.sfd @@ -171,6 +174,7 @@ /usr/lib64/thunderbird/libmozgtk.so /usr/lib64/thunderbird/libmozsandbox.so /usr/lib64/thunderbird/libmozsqlite3.so + /usr/lib64/thunderbird/libmozwayland.so /usr/lib64/thunderbird/libprldap60.so /usr/lib64/thunderbird/libxul.so /usr/lib64/thunderbird/omni.ja @@ -192,12 +196,12 @@ - - 2019-07-11 - 60.8.0 + + 2019-08-28 + 68.0 Packaging update Pierre-Yves pyu@riseup.net \ No newline at end of file