thunderbird-kde: update to 38.1.0,no build.

thunderbird-kde/PKGBUILD

@@ -1,5 +1,5 @@
 pkgname=thunderbird-kde
-pkgver=31.7.0
+pkgver=38.1.0
 pkgrel=1
 provides=(thunderbird=${pkgver})
 replaces=(thunderbird)
@@ -7,39 +7,47 @@ pkgdesc="Standalone Mail/News reader"
 arch=('x86_64')
 license=('MPL' 'GPL')
 url="http://www.mozilla.org/thunderbird/"
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification' 'nspr' 'kdelibs')
-makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 
-             'gstreamer0.10-base-plugins' 'xorg-server-xvfb')
+depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
+         'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme' 'kdelibs'
+         'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite3' 'nspr' 'libnotify')
+makedepends=('unzip' 'zip' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse'
+             'pkg-config' 'autoconf2.13' 'gst-plugins-base' 'xorg-server-xvfb')
 optdepends=('thunderbird-i18n: for multilanguage support'
 	    'libcanberra: for sound support')
 install=thunderbird.install
 # For patch look here: https://build.opensuse.org/package/show?project=openSUSE:Factory&package=MozillaThunderbird
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2
+_patchrev=646495e9e721
+_patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
+source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2
         mozconfig
         thunderbird.desktop
         thunderbird-install-dir.patch
         mozilla-kde.patch
+        mozilla-language.patch
         mozilla-nongnome-proxies.patch
         vendor.js
         kde.js)
-options=(!emptydirs)
-md5sums=('dcf14a6d4aaba2f695a1ec30c296e356'
-         '60580fb138d2bcc7008d20f8207624a1'
-         'af3e5b344d2edf1c7d61bb0a5a96de9a'
-         '2cc82c1c60f6c97cb5a9d895d85a9ff3'
-         '2cf60e12551d93c9f028208bb7890564'
+options=('!emptydirs' '!makeflags')
+md5sums=('dd161196c6bd444643d2de54d1222d31'
+         'a99c6bf3dcb1d419bed0285187fe90f9'
+         'c883f4e5cafcd3cde8cf5cb417836737'
+         '3423528b295675ea216282b3f4f919a6'
+         '7f2a43d4af0b860c296187b1c0a95ae7'
+         'c3cfc76e2ba30a7244510f244b6b5748'
          '5b786bc0f2e998d201f53fd307bc573f'
          '5a53179d14ae9631b7afe5e4d0fc0b25'
          '75df0f88cc7a7fa7d522459e4ff82cc5')
 
 prepare(){
-  cd comm-esr*
-  patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
-  
-  pushd mozilla
+  cd comm-esr${pkgver%%.*}
+  patch -Np1 -i ../thunderbird-install-dir.patch
+
+  msg "Patching for KDE"
+  cd mozilla
+  patch -Np1 -i "$srcdir/mozilla-language.patch"
   patch -Np1 -i "$srcdir/mozilla-nongnome-proxies.patch"
   patch -Np1 -i "$srcdir/mozilla-kde.patch"
-  popd
+  cd ..
   
   cp "$srcdir/mozconfig" .mozconfig
 
@@ -49,46 +57,35 @@ prepare(){
 }
          
 build() {
-  cd comm-esr* 
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird"
-  export PYTHON="/usr/bin/python2"
-
-  # Normal Build
-  #make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  cd comm-esr${pkgver%%.*}
   
-  # Set up PGO
-  export DISPLAY=:99
-  Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-
-  # Build
-  if ! make -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" MOZ_PGO=1; then
-    kill $!
-    return 1
-  fi
-
-  # Kill leftovers
-  kill $! || true
+  export PYTHON="/usr/bin/python2"
+  export SHELL="/bin/bash"
+  
+  xvfb-run -a -s "-extension GLX -screen 0 1280x1024x24" \
+    make -f client.mk build MOZ_PGO=1
 }
 
 package() {
-  cd comm-esr*
+  cd comm-esr${pkgver%%.*}
   make -f client.mk DESTDIR="$pkgdir" install
 
   install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js"
   install -Dm644 "$srcdir"/kde.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/kde.js"
 
-  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-      install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
-          "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
+  for i in 16 22 24 32 48 256; do
+      install -Dm644 other-licenses/branding/thunderbird/mailicon$i.png \
+          "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/thunderbird.png"
   done
 
   install -Dm644 "$srcdir/thunderbird.desktop" \
       "$pkgdir/usr/share/applications/thunderbird.desktop"
 
+  # Use system-provided dictionaries
   rm -rf "$pkgdir"/usr/lib/thunderbird/{dictionaries,hyphenation}
   ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries"
   ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation"
   
-  # We don't want the development stuff
+  # Remove development stuff
   rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel-*,share/idl}
 }

thunderbird-kde/mozconfig

@@ -13,18 +13,19 @@ ac_add_options --with-system-bz2
 ac_add_options --with-system-png
 ac_add_options --with-system-libevent
 ac_add_options --with-system-libvpx
+ac_add_options --with-system-icu
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-cairo
 ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
 
 # Features
 ac_add_options --enable-official-branding
 ac_add_options --enable-safe-browsing
 ac_add_options --enable-startup-notification
 ac_add_options --enable-gio
+ac_add_options --enable-gstreamer=1.0
 
 ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter

thunderbird-kde/mozilla-language.patch

@@ -0,0 +1,48 @@
+# HG changeset patch
+# User Wolfgang Rosenauer <wr@rosenauer.org>
+# Parent 5a29924228527f8882c83cf62d470963ea1ce62e
+Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE
+
+diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp
+--- a/intl/locale/nsLocaleService.cpp
++++ b/intl/locale/nsLocaleService.cpp
+@@ -122,16 +122,17 @@ nsLocaleService::nsLocaleService(void)
+     nsRefPtr<nsLocale> resultLocale(new nsLocale());
+     NS_ENSURE_TRUE_VOID(resultLocale);
+ 
+ #ifdef MOZ_WIDGET_QT
+     const char* lang = QLocale::system().name().toUtf8();
+ #else
+     // Get system configuration
+     const char* lang = getenv("LANG");
++    const char* language = getenv("LANGUAGE");
+ #endif
+ 
+     nsAutoString xpLocale, platformLocale;
+     nsAutoString category, category_platform;
+     int i;
+ 
+     for( i = 0; i < LocaleListLength; i++ ) {
+         nsresult result;
+@@ -150,16 +151,21 @@ nsLocaleService::nsLocaleService(void)
+             } else {
+                 CopyASCIItoUTF16(lang, platformLocale);
+                 result = nsPosixLocale::GetXPLocale(lang, xpLocale);
+             }
+         }
+         if (NS_FAILED(result)) {
+             return;
+         }
++        // LANGUAGE is overriding LC_MESSAGES
++        if (i == LC_MESSAGES && language && *language) {
++          CopyASCIItoUTF16(language, platformLocale);
++          result = nsPosixLocale::GetXPLocale(language, xpLocale);
++        }
+         resultLocale->AddCategory(category, xpLocale);
+         resultLocale->AddCategory(category_platform, platformLocale);
+     }
+     mSystemLocale = do_QueryInterface(resultLocale);
+     mApplicationLocale = do_QueryInterface(resultLocale);
+        
+ #endif // XP_UNIX
+ 

thunderbird-kde/thunderbird-install-dir.patch

@@ -1,14 +1,3 @@
-diff -upr comm-esr31.orig/config/baseconfig.mk comm-esr31/config/baseconfig.mk
---- comm-esr31.orig/config/baseconfig.mk	2014-07-22 09:44:23.000000000 +0300
-+++ comm-esr31/config/baseconfig.mk	2014-07-22 09:46:30.000000000 +0300
-@@ -1,6 +1,6 @@
- includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
- MOZILLA_SRCDIR = $(topsrcdir)/mozilla
- MOZDEPTH = $(DEPTH)/mozilla
 diff -upr comm-esr31.orig/mozilla/config/baseconfig.mk comm-esr31/mozilla/config/baseconfig.mk
 --- comm-esr31.orig/mozilla/config/baseconfig.mk	2014-07-22 09:44:22.000000000 +0300
 +++ comm-esr31/mozilla/config/baseconfig.mk	2014-07-22 09:46:45.000000000 +0300

thunderbird-kde/thunderbird.desktop

@@ -1,13 +1,173 @@
 [Desktop Entry]
-Version=1.0
 Name=Thunderbird
-Comment=Mail & News Reader
-GenericName=Mail Client & News Reader
+Comment=Send and receive mail with Thunderbird
+Comment[ast]=Lleer y escribir corréu electrónicu
+Comment[ca]=Llegiu i escriviu correu
+Comment[cs]=Čtení a psaní pošty
+Comment[da]=Skriv/læs e-post/nyhedsgruppe med Mozilla Thunderbird
+Comment[de]=E-Mails und Nachrichten mit Thunderbird lesen und schreiben
+Comment[el]=Διαβάστε και γράψτε γράμματα με το Mozilla Thunderbird
+Comment[es]=Lea y escriba correos y noticias con Thunderbird
+Comment[fi]=Lue ja kirjoita sähköposteja
+Comment[fr]=Lire et écrire des courriels
+Comment[gl]=Lea e escriba correo electrónico
+Comment[he]=קריאה/כתיבה של דוא״ל/חדשות באמצעות Mozilla Thunderbird
+Comment[hr]=Čitajte/šaljite e-poštu s Thunderbird
+Comment[hu]=Levelek írása és olvasása a Thunderbirddel
+Comment[it]=Per leggere e scrivere email
+Comment[ja]=メールの読み書き
+Comment[ko]=Mozilla Thunderbird 메일/뉴스 읽기 및 쓰기 클라이언트
+Comment[nl]=E-mail/nieuws lezen en schrijven met Mozilla Thunderbird
+Comment[pl]=Czytanie i wysyłanie e-maili
+Comment[pt_BR]=Leia e escreva suas mensagens
+Comment[ru]=Читайте и пишите письма
+Comment[sk]=Čítajte a píšte poštu pomocou programu Thunderbird
+Comment[sv]=Läs och skriv e-post
+Comment[ug]=ئېلخەت ۋە خەۋەرلەرنى Mozilla Thunderbird دا كۆرۈش ۋە يېزىش
+Comment[uk]=Читання та написання листів
+Comment[vi]=Đọc và soạn thư điện tử
+Comment[zh_CN]=阅读邮件或新闻
+Comment[zh_TW]=以 Mozilla Thunderbird 讀寫郵件或新聞
+GenericName=Mail Client
+GenericName[ast]=Client de correu
+GenericName[ca]=Client de correu
+GenericName[cs]=Poštovní klient
+GenericName[da]=E-postklient
+GenericName[de]=E-Mail-Anwendung
+GenericName[el]=Λογισμικό αλληλογραφίας
+GenericName[es]=Cliente de correo
+GenericName[fi]=Sähköpostiohjelma
+GenericName[fr]=Client de messagerie
+GenericName[gl]=Cliente de correo electrónico
+GenericName[he]=לקוח דוא״ל
+GenericName[hr]=Klijent e-pošte
+GenericName[hu]=Levelezőkliens
+GenericName[it]=Client email
+GenericName[ja]=電子メールクライアント
+GenericName[ko]=메일 클라이언트
+GenericName[nl]=E-mailprogramma
+GenericName[pl]=Klient poczty
+GenericName[pt_BR]=Cliente de E-mail
+GenericName[ru]=Почтовый клиент
+GenericName[sk]=Poštový klient
+GenericName[ug]=ئېلخەت دېتالى
+GenericName[uk]=Поштова програма
+GenericName[vi]=Phần mềm khách quản lý thư điện tử
+GenericName[zh_CN]=邮件新闻客户端
+GenericName[zh_TW]=郵件用戶端
 Exec=thunderbird %u
-TryExec=thunderbird
-Icon=thunderbird
 Terminal=false
 Type=Application
+Icon=thunderbird
 Categories=Network;Email;
-MimeType=message/rfc822;x-scheme-handler/mailto;
+MimeType=message/rfc822;x-scheme-handler/mailto;application/x-xpinstall;
 StartupNotify=true
+Actions=ComposeMessage;OpenAddressBook;
+
+[Desktop Action ComposeMessage]
+Name=Write new message
+Name[ar]=اكتب رسالة جديدة
+Name[ast]=Redactar mensaxe nuevu
+Name[be]=Напісаць новы ліст
+Name[bg]=Съставяне на ново съобщение
+Name[br]=Skrivañ ur gemennadenn nevez
+Name[ca]=Escriu un missatge nou
+Name[cs]=Napsat novou zprávu
+Name[da]=Skriv en ny meddelelse
+Name[de]=Neue Nachricht verfassen
+Name[el]=Σύνταξη νέου μηνύματος
+Name[es_AR]=Escribir un nuevo mensaje
+Name[es_ES]=Redactar nuevo mensaje
+Name[et]=Kirjuta uus kiri
+Name[eu]=Idatzi mezu berria
+Name[fi]=Kirjoita uusi viesti
+Name[fr]=Rédiger un nouveau message
+Name[fy_NL]=Skriuw in nij berjocht
+Name[ga_IE]=Scríobh teachtaireacht nua
+Name[gd]=Sgrìobh teachdaireachd ùr
+Name[gl]=Escribir unha nova mensaxe
+Name[he]=כתיבת הודעה חדשה
+Name[hr]=Piši novu poruku
+Name[hu]=Új üzenet írása
+Name[hy_AM]=Գրել նոր նամակ
+Name[is]=SKrifa nýjan póst
+Name[it]=Scrivi nuovo messaggio
+Name[ja]=新しいメッセージを作成する
+Name[ko]=새 메시지 작성
+Name[lt]=Rašyti naują laišką
+Name[nb_NO]=Skriv ny melding
+Name[nl]=Nieuw bericht aanmaken
+Name[nn_NO]=Skriv ny melding
+Name[pl]=Nowa wiadomość
+Name[pt_BR]=Nova mensagem
+Name[pt_PT]=Escrever nova mensagem
+Name[rm]=Scriver in nov messadi
+Name[ro]=Scrie un mesaj nou
+Name[ru]=Создать новое сообщение
+Name[si]=නව ලිපියක් ලියන්න
+Name[sk]=Nová e-mailová správa
+Name[sl]=Sestavi novo sporočilo
+Name[sq]=Shkruani mesazh të ri
+Name[sr]=Писање нове поруке
+Name[sv_SE]=Skriv ett nytt meddelande
+Name[ta_LK]=புதிய செய்தியை எழுதுக
+Name[tr]=Yeni ileti yaz
+Name[uk]=Написати нового листа
+Name[vi]=Viết thư mới
+Name[zh_CN]=编写新消息
+Name[zh_TW]=寫一封新訊息
+Exec=thunderbird -compose
+
+[Desktop Action OpenAddressBook]
+Name=Open address book
+Name[ar]=افتح دفتر العناوين
+Name[ast]=Abrir llibreta de direiciones
+Name[be]=Адкрыць адрасную кнігу
+Name[bg]=Отваряне на адресник
+Name[br]=Digeriñ ur c'harned chomlec'hioù
+Name[ca]=Obre la llibreta d'adreces
+Name[cs]=Otevřít Adresář
+Name[da]=Åbn adressebog
+Name[de]=Adressbuch öffnen
+Name[el]=Άνοιγμα ευρετηρίου διευθύνσεων
+Name[es_AR]=Abrir libreta de direcciones
+Name[es_ES]=Abrir libreta de direcciones
+Name[et]=Ava aadressiraamat
+Name[eu]=Ireki helbide-liburua
+Name[fi]=Avaa osoitekirja
+Name[fr]=Ouvrir un carnet d'adresses
+Name[fy_NL]=Iepenje adresboek
+Name[ga_IE]=Oscail leabhar seoltaí
+Name[gd]=Fosgail leabhar-sheòlaidhean
+Name[gl]=Abrir a axenda de enderezos
+Name[he]=פתיחת ספר כתובות
+Name[hr]=Otvori adresar
+Name[hu]=Címjegyzék megnyitása
+Name[hy_AM]=Բացել Հասցեագիրքը
+Name[is]=Opna nafnaskrá
+Name[it]=Apri rubrica
+Name[ja]=アドレス帳を開く
+Name[ko]=주소록 열기
+Name[lt]=Atverti adresų knygą
+Name[nb_NO]=Åpne adressebok
+Name[nl]=Adresboek openen
+Name[nn_NO]=Opne adressebok
+Name[pl]=Książka adresowa
+Name[pt_BR]=Catálogo de endereços
+Name[pt_PT]=Abrir livro de endereços
+Name[rm]=Avrir il cudeschet d'adressas
+Name[ro]=Deschide agenda de contacte
+Name[ru]=Открыть адресную книгу
+Name[si]=ලිපින පොත විවෘත කරන්න
+Name[sk]=Otvoriť adresár
+Name[sl]=Odpri adressar
+Name[sq]=Hapni libër adresash
+Name[sr]=Отвори адресар
+Name[sv_SE]=Öppna adressboken
+Name[ta_LK]=முகவரி பத்தகத்தை திறக்க
+Name[tr]=Adres defterini aç
+Name[uk]=Відкрити адресну книгу
+Name[vi]=Mở sổ địa chỉ
+Name[zh_CN]=打开通讯录
+Name[zh_TW]=開啟通訊錄
+Exec=thunderbird -addressbook