bucket_67/thunderbird

   1 # Buildsheet autogenerated by ravenadm tool -- Do not edit.
   2
   3 NAMEBASE=               thunderbird
   4 VERSION=                78.1.1
   5 KEYWORDS=               mail net_im news
   6 VARIANTS=               standard
   7 SDESC[standard]=        Mozilla Thunderbird mail/newsgroup client
   8 HOMEPAGE=               https://www.thunderbird.net/
   9 CONTACT=                nobody
  10
  11 DOWNLOAD_GROUPS=        main
  12 SITES[main]=            MOZILLA/thunderbird/releases/78.1.1/source
  13 DISTFILE[1]=            thunderbird-78.1.1.source.tar.xz:main
  14 DF_INDEX=               1
  15 SPKGS[standard]=        single
  16
  17 OPTIONS_AVAILABLE=      none
  18 OPTIONS_STANDARD=       none
  19
  20 BUILD_DEPENDS=          rust:single:standard
  21                         cbindgen:single:standard
  22                         autoconf213:single:standard
  23                         yasm:single:standard
  24                         nasm:primary:standard
  25                         zip:single:standard
  26                         bzip2:static:standard
  27                         nodejs:primary:standard
  28                         libvpx:single:standard
  29                         clang:compiler:standard
  30                         evdev-proto:single:standard
  31                         python-sqlite3:single:python_used
  32 BUILDRUN_DEPENDS=       nss:primary:standard
  33                         icu:single:standard
  34                         libffi:single:standard
  35                         libproxy:single:standard
  36                         libevent:single:standard
  37                         libcanberra:primary:standard
  38                         libnotify:primary:standard
  39                         aom:single:standard
  40                         WebP:single:standard
  41                         dav1d:single:standard
  42                         bzip2:shared:standard
  43                         ffmpeg:primary:standard
  44                         dbus-glib:primary:standard
  45                         startup-notification:single:standard
  46
  47 USES=                   cpe desktop-utils:single gmake jpeg png zlib
  48                         perl:build pkgconfig iconv python gettext-runtime
  49 GNOME_COMPONENTS=       gconf gtk2 gtk3 gdkpixbuf pango
  50 XORG_COMPONENTS=        x11 xcb xcomposite xdamage xext xfixes xrender xt
  51                         pixman
  52
  53 LICENSE=                MPL:single
  54 LICENSE_TERMS=          single:{{WRKSRC}}/toolkit/content/license.html
  55 LICENSE_FILE=           MPL:stock
  56 LICENSE_SCHEME=         solo
  57
  58 CPE_VENDOR=             mozilla
  59 FPC_EQUIVALENT=         mail/thunderbird
  60
  61 MUST_CONFIGURE=         yes
  62 CONFIGURE_OUTSOURCE=    yes
  63 CONFIGURE_ENV=          PYTHON3={{LOCALBASE}}/bin/python3.8
  64
  65 MAKE_ENV=               PYTHON3={{LOCALBASE}}/bin/python3.8
  66
  67 QMAKE_ARGS=             --prefix="{{PREFIX}}"
  68                         --with-system-nss
  69                         --with-system-nspr
  70                         --with-system-zlib
  71                         --with-system-icu
  72                         --with-system-png="{{LOCALBASE}}"
  73                         --with-system-jpeg="{{LOCALBASE}}"
  74                         --with-system-libevent
  75                         --with-system-av1
  76                         --with-system-webp
  77                         --enable-system-ffi
  78                         --enable-system-pixman
  79                         --enable-install-strip
  80                         --enable-strip
  81                         --enable-calendar
  82                         --enable-libproxy
  83                         --enable-release
  84                         --enable-optimize
  85                         --enable-official-branding
  86                         --enable-application=comm/mail
  87                         --enable-update-channel=release
  88                         --enable-rust-simd
  89                         --with-intl-api
  90                         --disable-alsa
  91                         --disable-debug
  92                         --disable-debug-symbols
  93                         --disable-dtrace
  94                         --disable-jack
  95                         --disable-webrtc
  96                         --disable-profiling
  97                         --disable-pulseaudio
  98                         --disable-tests
  99                         --disable-updater
 100                         --disable-hardening
 101 VAR_OPSYS[freebsd]=     CONFIGURE_ARGS=--enable-jemalloc
 102 VAR_OPSYS[linux]=       QMAKE_ARGS=--disable-elf-hack
 103
 104 post-patch:
 105         ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 106                 ${WRKSRC}/comm/mail/app/nsMailApp.cpp
 107         (cd ${WRKSRC}/gfx/angle/checkout/src/compiler/translator && \
 108                 ${REINPLACE_CMD} -e 's|<math.h>|<cmath>|' \
 109                 InfoSink.h IntermNode.cpp)
 110         # disable SCTP
 111         ${REINPLACE_CMD} -e 's|MOZ_SCTP|MOZ_DISABLE_SCTP|' \
 112                 ${WRKSRC}/netwerk/moz.build
 113         # alsa headers use 'u_int32_t' and other BerkeleyDB/nvi
 114         # fixed types (_XOPEN_SOURCE)
 115         ${REINPLACE_CMD} -e 's@_XOPEN_SOURCE@&___@g' \
 116                 ${WRKSRC}/media/libcubeb/src/cubeb_alsa.c
 117         ${REINPLACE_CMD} -e 's@_POSIX_SOURCE@&___@g' \
 118                 ${WRKSRC}/media/libcubeb/src/cubeb_jack.cpp
 119         # choose correct python
 120         ${REINPLACE_CMD} -e 's|python3|python3.8|g' ${WRKSRC}/configure.in
 121         # Set mozilla options
 122         @${ECHO_CMD} "--=> Setting configuration <=--"
 123         @for arg in ${QMAKE_ARGS}; do \
 124                 ${ECHO_CMD} ".mozconfig <<  $$arg" ;\
 125                 ${ECHO_CMD} ac_add_options $$arg >> ${WRKSRC}/.mozconfig ;\
 126         done
 127         @${ECHO_CMD} LDFLAGS=\"-Wl,-rpath,${PREFIX}/lib/thunderbird\" \
 128                 >> ${WRKSRC}/.mozconfig
 129
 130 post-patch-dragonfly:
 131         ${REINPLACE_CMD} -e '/<malloc.h>/d' \
 132                 ${WRKSRC}/comm/ldap/c-sdk/libraries/liblber/lber-int.h
 133
 134 post-install:
 135         ${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
 136         ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 137         ${INSTALL_DATA} ${FILESDIR}/thunderbird.desktop \
 138                 ${STAGEDIR}${PREFIX}/share/applications
 139         (cd ${STAGEDIR}${PREFIX}/share/pixmaps && ${LN} -sf \
 140                 ../../lib/thunderbird/chrome/icons/default/default48.png \
 141                 thunderbird.png)
 142         # regenerate symlink to avoid absolute paths
 143         ${RM} ${STAGEDIR}${PREFIX}/bin/thunderbird
 144         (cd ${STAGEDIR}${PREFIX}/bin && \
 145                 ${LN} -sf ../lib/thunderbird/thunderbird thunderbird)
 146
 147 pre-configure:
 148         (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
 149         (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
 150
 151 [FILE:391:descriptions/desc.single]
 152 Thunderbird is a free and open source email, newsfeed, chat, and
 153 calendaring client, that's easy to set up and customize. One of the core
 154 principles of Thunderbird is the use and promotion of open standards -
 155 this focus is a rejection of our world of closed platforms and services
 156 that can't communicate with each other. We want our users to have
 157 freedom and choice in how they communicate.
 158
 159
 160 [FILE:111:distinfo]
 161 75edb172faa6b6ab67995031e9b1a442f231282407b561acb9f5f3d831786ce1    358706468 thunderbird-78.1.1.source.tar.xz
 162
 163
 164 [FILE:949:manifests/plist.single]
 165 bin/thunderbird
 166 lib/thunderbird/
 167  application.ini
 168  dependentlibs.list
 169  libldap60.so
 170  libldif60.so
 171  liblgpllibs.so
 172  libmozgtk.so
 173  libmozsqlite3.so
 174  libprldap60.so
 175  librnp.so
 176  libxul.so
 177  omni.ja
 178  pingsender
 179  platform.ini
 180  plugin-container
 181  removed-files
 182  thunderbird
 183  thunderbird-bin
 184 lib/thunderbird/chrome/icons/default/
 185  calendar-alarm-dialog.png
 186  calendar-event-dialog.png
 187  calendar-event-summary-dialog.png
 188  calendar-task-dialog.png
 189  calendar-task-summary-dialog.png
 190  default128.png
 191  default16.png
 192  default22.png
 193  default24.png
 194  default256.png
 195  default32.png
 196  default48.png
 197  default64.png
 198 lib/thunderbird/defaults/messenger/mailViews.dat
 199 lib/thunderbird/defaults/pref/channel-prefs.js
 200 lib/thunderbird/features/wetransfer@extensions.thunderbird.net.xpi
 201 lib/thunderbird/gtk2/libmozgtk.so
 202 lib/thunderbird/isp/
 203  Bogofilter.sfd
 204  DSPAM.sfd
 205  POPFile.sfd
 206  SpamAssassin.sfd
 207  SpamPal.sfd
 208 share/applications/thunderbird.desktop
 209 share/pixmaps/thunderbird.png
 210
 211
 212 [FILE:5291:patches/patch-addon-search]
 213 https://github.com/mozilla/addons/issues/708
 214 https://github.com/mozilla/addons-frontend/issues/4610
 215
 216 diff --git mail/app/profile/all-thunderbird.js mail/app/profile/all-thunderbird.js
 217 index 75c2c5e435e35..4d8c09c02759b 100644
 218 --- comm/mail/app/profile/all-thunderbird.js.orig       2020-05-21 20:31:05 UTC
 219 +++ comm/mail/app/profile/all-thunderbird.js
 220 @@ -153,10 +153,10 @@ pref("extensions.getAddons.maxResults",
 221  pref("extensions.getAddons.get.url", "https://services.addons.thunderbird.net/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%");
 222  pref("extensions.getAddons.compatOverides.url", "https://services.addons.thunderbird.net/api/v3/addons/compat-override/?guid=%IDS%&lang=%LOCALE%");
 223  pref("extensions.getAddons.link.url", "https://addons.thunderbird.net/%LOCALE%/%APP%/");
 224 -pref("extensions.getAddons.recommended.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird");
 225 +pref("extensions.getAddons.recommended.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/Linux/%VERSION%?src=thunderbird");
 226  pref("extensions.getAddons.search.browseURL", "https://addons.thunderbird.net/%LOCALE%/%APP%/search/?q=%TERMS%");
 227 -pref("extensions.getAddons.search.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
 228 -pref("extensions.webservice.discoverURL", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
 229 +pref("extensions.getAddons.search.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/Linux/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
 230 +pref("extensions.webservice.discoverURL", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/discovery/pane/%VERSION%/Linux");
 231  pref("extensions.getAddons.siteRegExp", "^https://.*addons\\.thunderbird\\.net");
 232  pref("extensions.getAddons.langpacks.url", "https://services.addons.thunderbird.net/api/v3/addons/language-tools/?app=thunderbird&type=language&appversion=%VERSION%");
 233
 234 @@ -180,9 +180,9 @@ pref("security.cert_pinning.enforcement_
 235  //  .. etc ..
 236  //
 237  pref("extensions.update.enabled", true);
 238 -pref("extensions.update.url", "https://versioncheck.addons.thunderbird.net/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
 239 +pref("extensions.update.url", "https://versioncheck.addons.thunderbird.net/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
 240
 241 -pref("extensions.update.background.url", "https://versioncheck-bg.addons.thunderbird.net/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
 242 +pref("extensions.update.background.url", "https://versioncheck-bg.addons.thunderbird.net/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
 243
 244  pref("extensions.update.interval", 86400);  // Check for updates to Extensions and
 245                                              // Themes every day
 246 --- toolkit/mozapps/extensions/internal/AddonRepository.jsm.orig        2020-05-21 20:30:47 UTC
 247 +++ toolkit/mozapps/extensions/internal/AddonRepository.jsm
 248 @@ -636,7 +636,7 @@ var AddonRepository = {
 249        addon.version = String(aEntry.current_version.version);
 250        if (Array.isArray(aEntry.current_version.files)) {
 251          for (let file of aEntry.current_version.files) {
 252 -          if (file.platform == "all" || file.platform == PLATFORM) {
 253 +          if (file.platform == "all" || file.platform == "linux" || file.platform == PLATFORM) {
 254              if (file.url) {
 255                addon.sourceURI = NetUtil.newURI(file.url);
 256              }
 257 --- toolkit/mozapps/extensions/internal/XPIDatabase.jsm.orig    2020-05-21 20:30:47 UTC
 258 +++ toolkit/mozapps/extensions/internal/XPIDatabase.jsm
 259 @@ -482,7 +482,7 @@ class AddonInternal {
 260      // Something is causing errors in here
 261      try {
 262        for (let platform of this.targetPlatforms) {
 263 -        if (platform.os == Services.appinfo.OS) {
 264 +        if (platform.os == "Linux" || platform.os == Services.appinfo.OS) {
 265            if (platform.abi) {
 266              needsABI = true;
 267              if (platform.abi === abi) {
 268
 269
 270 [FILE:3590:patches/patch-bug1559213]
 271 commit 717bba28411c
 272 Author: Jory A. Pratt <anarchy@gentoo.org>
 273 Date:   Thu Jun 13 11:53:00 2019 -0700
 274
 275     Bug 1559213 - Allow to use system av1 libs instead of bundled.
 276 ---
 277  config/external/moz.build      |  5 +++--
 278  config/system-headers.mozbuild |  8 ++++++++
 279  dom/media/platforms/moz.build  |  5 +++++
 280  toolkit/moz.configure          | 19 ++++++++++++++++++-
 281  4 files changed, 34 insertions(+), 3 deletions(-)
 282
 283 diff --git config/external/moz.build config/external/moz.build
 284 index 03e4fa143bd1..a67d10b11fe6 100644
 285 --- config/external/moz.build
 286 +++ config/external/moz.build
 287 @@ -37,8 +37,9 @@ if not CONFIG['MOZ_SYSTEM_LIBVPX']:
 288      external_dirs += ['media/libvpx']
 289
 290  if CONFIG['MOZ_AV1']:
 291 -    external_dirs += ['media/libaom']
 292 -    external_dirs += ['media/libdav1d']
 293 +    if not CONFIG['MOZ_SYSTEM_AV1']:
 294 +        external_dirs += ['media/libaom']
 295 +        external_dirs += ['media/libdav1d']
 296
 297  if not CONFIG['MOZ_SYSTEM_PNG']:
 298      external_dirs += ['media/libpng']
 299 diff --git config/system-headers.mozbuild config/system-headers.mozbuild
 300 index bcf5c4925564..48964a999a9b 100644
 301 --- config/system-headers.mozbuild
 302 +++ config/system-headers.mozbuild
 303 @@ -1304,6 +1304,14 @@ if CONFIG['MOZ_ENABLE_CONTENTMANAGER']:
 304          'SelectSingleContentItemPage.h',
 305      ]
 306
 307 +if CONFIG['MOZ_SYSTEM_AV1']:
 308 +    system_headers += [
 309 +        'aom/aom_decoder.h',
 310 +        'aom/aomdx.h',
 311 +        'aom/aom_image.h',
 312 +        'dav1d/dav1d.h',
 313 +    ]
 314 +
 315  if CONFIG['MOZ_SYSTEM_LIBVPX']:
 316      system_headers += [
 317          'vpx_mem/vpx_mem.h',
 318 diff --git dom/media/platforms/moz.build dom/media/platforms/moz.build
 319 index 092cee0c9b66..38e45de5b5f0 100644
 320 --- dom/media/platforms/moz.build
 321 +++ dom/media/platforms/moz.build
 322 @@ -80,6 +80,11 @@ if CONFIG['MOZ_AV1']:
 323          'agnostic/AOMDecoder.cpp',
 324          'agnostic/DAV1DDecoder.cpp',
 325      ]
 326 +    if CONFIG['MOZ_SYSTEM_AV1']:
 327 +        CXXFLAGS += CONFIG['MOZ_SYSTEM_LIBAOM_CFLAGS']
 328 +        OS_LIBS += CONFIG['MOZ_SYSTEM_LIBAOM_LIBS']
 329 +        CXXFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS']
 330 +        OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS']
 331
 332  if CONFIG['MOZ_OMX']:
 333      EXPORTS += [
 334 diff --git toolkit/moz.configure toolkit/moz.configure
 335 index 82b5a59acf42..e2329560b42b 100644
 336 --- toolkit/moz.configure
 337 +++ toolkit/moz.configure
 338 @@ -441,7 +441,23 @@ def av1(value):
 339      if value:
 340          return True
 341
 342 -@depends(target, nasm_version, when=av1 & compile_environment)
 343 +option('--with-system-av1',
 344 +       help="Use system av1 (located with pkgconfig)")
 345 +
 346 +system_libaom_info = pkg_check_modules('MOZ_SYSTEM_LIBAOM', 'aom >= 1.0.0',
 347 +                                       when='--with-system-av1')
 348 +
 349 +system_libdav1d_info = pkg_check_modules('MOZ_SYSTEM_LIBDAV1D', 'dav1d >= 0.1.1',
 350 +                                         when='--with-system-av1')
 351 +
 352 +@depends(system_libaom_info, system_libdav1d_info)
 353 +def system_av1(system_libaom_info, system_libdav1d_info):
 354 +    has_av1_libs = False
 355 +    if system_libaom_info and system_libdav1d_info:
 356 +        has_av1_libs = True
 357 +    return has_av1_libs
 358 +
 359 +@depends(target, nasm_version, when=av1 & depends(system_av1)(lambda v: not v) & compile_environment)
 360  def dav1d_asm(target, nasm_version):
 361      if target.os != 'Android':
 362          if target.cpu == 'aarch64':
 363 @@ -457,6 +473,7 @@ set_config('MOZ_DAV1D_ASM', dav1d_asm)
 364  set_define('MOZ_DAV1D_ASM', dav1d_asm)
 365  set_config('MOZ_AV1', av1)
 366  set_define('MOZ_AV1', av1)
 367 +set_config('MOZ_SYSTEM_AV1', depends_if(system_av1)(lambda _: True))
 368
 369  # Built-in fragmented MP4 support.
 370  # ==============================================================
 371
 372
 373 [FILE:11510:patches/patch-bug292127]
 374 --- comm/ldap/c-sdk/include/ldap.h~
 375 +++ comm/ldap/c-sdk/include/ldap.h
 376 @@ -40,6 +40,229 @@
 377  #ifndef _LDAP_H
 378  #define _LDAP_H
 379
 380 +/* rename symbols to not clash with openldap (bug 292127) */
 381 +#define ldap_abandon moz_ldap_abandon
 382 +#define ldap_abandon_ext moz_ldap_abandon_ext
 383 +#define ldap_abandoned moz_ldap_abandoned
 384 +#define ldap_add moz_ldap_add
 385 +#define ldap_add_ext moz_ldap_add_ext
 386 +#define ldap_add_ext_s moz_ldap_add_ext_s
 387 +#define ldap_add_result_entry moz_ldap_add_result_entry
 388 +#define ldap_add_s moz_ldap_add_s
 389 +#define ldap_ber_free moz_ldap_ber_free
 390 +#define ldap_bind moz_ldap_bind
 391 +#define ldap_bind_s moz_ldap_bind_s
 392 +#define ldap_build_filter moz_ldap_build_filter
 393 +#define ldap_cache_flush moz_ldap_cache_flush
 394 +#define ldap_charray_add moz_ldap_charray_add
 395 +#define ldap_charray_dup moz_ldap_charray_dup
 396 +#define ldap_charray_free moz_ldap_charray_free
 397 +#define ldap_charray_inlist moz_ldap_charray_inlist
 398 +#define ldap_charray_merge moz_ldap_charray_merge
 399 +#define ldap_charray_position moz_ldap_charray_position
 400 +#define ldap_compare moz_ldap_compare
 401 +#define ldap_compare_ext moz_ldap_compare_ext
 402 +#define ldap_compare_ext_s moz_ldap_compare_ext_s
 403 +#define ldap_compare_s moz_ldap_compare_s
 404 +#define ldap_control_free moz_ldap_control_free
 405 +#define ldap_controls_free moz_ldap_controls_free
 406 +#define ldap_count_entries moz_ldap_count_entries
 407 +#define ldap_count_messages moz_ldap_count_messages
 408 +#define ldap_count_references moz_ldap_count_references
 409 +#define ldap_count_values moz_ldap_count_values
 410 +#define ldap_count_values_len moz_ldap_count_values_len
 411 +#define ldap_create_authzid_control moz_ldap_create_authzid_control
 412 +#define ldap_create_filter moz_ldap_create_filter
 413 +#define ldap_create_geteffectiveRights_control moz_ldap_create_geteffectiveRights_control
 414 +#define ldap_create_passwordpolicy_control moz_ldap_create_passwordpolicy_control
 415 +#define ldap_create_passwordpolicy_control_ext moz_ldap_create_passwordpolicy_control_ext
 416 +#define ldap_create_persistentsearch_control moz_ldap_create_persistentsearch_control
 417 +#define ldap_create_proxiedauth_control moz_ldap_create_proxiedauth_control
 418 +#define ldap_create_proxyauth_control moz_ldap_create_proxyauth_control
 419 +#define ldap_create_sort_control moz_ldap_create_sort_control
 420 +#define ldap_create_sort_keylist moz_ldap_create_sort_keylist
 421 +#define ldap_create_userstatus_control moz_ldap_create_userstatus_control
 422 +#define ldap_create_virtuallist_control moz_ldap_create_virtuallist_control
 423 +#define ldap_delete moz_ldap_delete
 424 +#define ldap_delete_ext moz_ldap_delete_ext
 425 +#define ldap_delete_ext_s moz_ldap_delete_ext_s
 426 +#define ldap_delete_result_entry moz_ldap_delete_result_entry
 427 +#define ldap_delete_s moz_ldap_delete_s
 428 +#define ldap_dn2ufn moz_ldap_dn2ufn
 429 +#define ldap_entry2html moz_ldap_entry2html
 430 +#define ldap_entry2html_search moz_ldap_entry2html_search
 431 +#define ldap_entry2text moz_ldap_entry2text
 432 +#define ldap_entry2text_search moz_ldap_entry2text_search
 433 +#define ldap_err2string moz_ldap_err2string
 434 +#define ldap_errlist moz_ldap_errlist
 435 +#define ldap_explode moz_ldap_explode
 436 +#define ldap_explode_dn moz_ldap_explode_dn
 437 +#define ldap_explode_dns moz_ldap_explode_dns
 438 +#define ldap_explode_rdn moz_ldap_explode_rdn
 439 +#define ldap_extended_operation moz_ldap_extended_operation
 440 +#define ldap_extended_operation_s moz_ldap_extended_operation_s
 441 +#define ldap_find_control moz_ldap_find_control
 442 +#define ldap_first_attribute moz_ldap_first_attribute
 443 +#define ldap_first_disptmpl moz_ldap_first_disptmpl
 444 +#define ldap_first_entry moz_ldap_first_entry
 445 +#define ldap_first_message moz_ldap_first_message
 446 +#define ldap_first_reference moz_ldap_first_reference
 447 +#define ldap_first_searchobj moz_ldap_first_searchobj
 448 +#define ldap_first_tmplcol moz_ldap_first_tmplcol
 449 +#define ldap_first_tmplrow moz_ldap_first_tmplrow
 450 +#define ldap_free_friendlymap moz_ldap_free_friendlymap
 451 +#define ldap_free_searchprefs moz_ldap_free_searchprefs
 452 +#define ldap_free_sort_keylist moz_ldap_free_sort_keylist
 453 +#define ldap_free_templates moz_ldap_free_templates
 454 +#define ldap_free_urldesc moz_ldap_free_urldesc
 455 +#define ldap_friendly_name moz_ldap_friendly_name
 456 +#define ldap_get_dn moz_ldap_get_dn
 457 +#define ldap_get_entry_controls moz_ldap_get_entry_controls
 458 +#define ldap_get_lang_values moz_ldap_get_lang_values
 459 +#define ldap_get_lang_values_len moz_ldap_get_lang_values_len
 460 +#define ldap_get_lderrno moz_ldap_get_lderrno
 461 +#define ldap_get_option moz_ldap_get_option
 462 +#define ldap_get_values moz_ldap_get_values
 463 +#define ldap_get_values_len moz_ldap_get_values_len
 464 +#define ldap_getfilter_free moz_ldap_getfilter_free
 465 +#define ldap_getfirstfilter moz_ldap_getfirstfilter
 466 +#define ldap_getnextfilter moz_ldap_getnextfilter
 467 +#define ldap_init moz_ldap_init
 468 +#define ldap_init_getfilter moz_ldap_init_getfilter
 469 +#define ldap_init_getfilter_buf moz_ldap_init_getfilter_buf
 470 +#define ldap_init_searchprefs moz_ldap_init_searchprefs
 471 +#define ldap_init_searchprefs_buf moz_ldap_init_searchprefs_buf
 472 +#define ldap_init_templates moz_ldap_init_templates
 473 +#define ldap_init_templates_buf moz_ldap_init_templates_buf
 474 +#define ldap_is_dns_dn moz_ldap_is_dns_dn
 475 +#define ldap_is_ldap_url moz_ldap_is_ldap_url
 476 +#define ldap_keysort_entries moz_ldap_keysort_entries
 477 +#define ldap_ld_free moz_ldap_ld_free
 478 +#define ldap_memcache_abandon moz_ldap_memcache_abandon
 479 +#define ldap_memcache_append moz_ldap_memcache_append
 480 +#define ldap_memcache_createkey moz_ldap_memcache_createkey
 481 +#define ldap_memcache_destroy moz_ldap_memcache_destroy
 482 +#define ldap_memcache_flush moz_ldap_memcache_flush
 483 +#define ldap_memcache_flush_results moz_ldap_memcache_flush_results
 484 +#define ldap_memcache_get moz_ldap_memcache_get
 485 +#define ldap_memcache_init moz_ldap_memcache_init
 486 +#define ldap_memcache_new moz_ldap_memcache_new
 487 +#define ldap_memcache_result moz_ldap_memcache_result
 488 +#define ldap_memcache_set moz_ldap_memcache_set
 489 +#define ldap_memcache_update moz_ldap_memcache_update
 490 +#define ldap_memfree moz_ldap_memfree
 491 +#define ldap_modify moz_ldap_modify
 492 +#define ldap_modify_ext moz_ldap_modify_ext
 493 +#define ldap_modify_ext_s moz_ldap_modify_ext_s
 494 +#define ldap_modify_s moz_ldap_modify_s
 495 +#define ldap_modrdn moz_ldap_modrdn
 496 +#define ldap_modrdn2 moz_ldap_modrdn2
 497 +#define ldap_modrdn2_s moz_ldap_modrdn2_s
 498 +#define ldap_modrdn_s moz_ldap_modrdn_s
 499 +#define ldap_mods_free moz_ldap_mods_free
 500 +#define ldap_msgdelete moz_ldap_msgdelete
 501 +#define ldap_msgfree moz_ldap_msgfree
 502 +#define ldap_msgid moz_ldap_msgid
 503 +#define ldap_msgtype moz_ldap_msgtype
 504 +#define ldap_multisort_entries moz_ldap_multisort_entries
 505 +#define ldap_name2template moz_ldap_name2template
 506 +#define ldap_next_attribute moz_ldap_next_attribute
 507 +#define ldap_next_disptmpl moz_ldap_next_disptmpl
 508 +#define ldap_next_entry moz_ldap_next_entry
 509 +#define ldap_next_message moz_ldap_next_message
 510 +#define ldap_next_reference moz_ldap_next_reference
 511 +#define ldap_next_searchobj moz_ldap_next_searchobj
 512 +#define ldap_next_tmplcol moz_ldap_next_tmplcol
 513 +#define ldap_next_tmplrow moz_ldap_next_tmplrow
 514 +#define ldap_oc2template moz_ldap_oc2template
 515 +#define ldap_open moz_ldap_open
 516 +#define ldap_parse_authzid_control moz_ldap_parse_authzid_control
 517 +#define ldap_parse_entrychange_control moz_ldap_parse_entrychange_control
 518 +#define ldap_parse_extended_result moz_ldap_parse_extended_result
 519 +#define ldap_parse_passwd moz_ldap_parse_passwd
 520 +#define ldap_parse_passwordpolicy_control moz_ldap_parse_passwordpolicy_control
 521 +#define ldap_parse_passwordpolicy_control_ext moz_ldap_parse_passwordpolicy_control_ext
 522 +#define ldap_parse_reference moz_ldap_parse_reference
 523 +#define ldap_parse_result moz_ldap_parse_result
 524 +#define ldap_parse_sasl_bind_result moz_ldap_parse_sasl_bind_result
 525 +#define ldap_parse_sort_control moz_ldap_parse_sort_control
 526 +#define ldap_parse_userstatus_control moz_ldap_parse_userstatus_control
 527 +#define ldap_parse_virtuallist_control moz_ldap_parse_virtuallist_control
 528 +#define ldap_parse_whoami moz_ldap_parse_whoami
 529 +#define ldap_passwd moz_ldap_passwd
 530 +#define ldap_passwd_s moz_ldap_passwd_s
 531 +#define ldap_passwordpolicy_err2txt moz_ldap_passwordpolicy_err2txt
 532 +#define ldap_perror moz_ldap_perror
 533 +#define ldap_rename moz_ldap_rename
 534 +#define ldap_rename_s moz_ldap_rename_s
 535 +#define ldap_result moz_ldap_result
 536 +#define ldap_result2error moz_ldap_result2error
 537 +#define ldap_sasl_bind moz_ldap_sasl_bind
 538 +#define ldap_sasl_bind_s moz_ldap_sasl_bind_s
 539 +#define ldap_sasl_interactive_bind_ext_s moz_ldap_sasl_interactive_bind_ext_s
 540 +#define ldap_sasl_interactive_bind_s moz_ldap_sasl_interactive_bind_s
 541 +#define ldap_search moz_ldap_search
 542 +#define ldap_search_ext moz_ldap_search_ext
 543 +#define ldap_search_ext_s moz_ldap_search_ext_s
 544 +#define ldap_search_s moz_ldap_search_s
 545 +#define ldap_search_st moz_ldap_search_st
 546 +#define ldap_set_filter_additions moz_ldap_set_filter_additions
 547 +#define ldap_set_lderrno moz_ldap_set_lderrno
 548 +#define ldap_set_option moz_ldap_set_option
 549 +#define ldap_set_rebind_proc moz_ldap_set_rebind_proc
 550 +#define ldap_setfilteraffixes moz_ldap_setfilteraffixes
 551 +#define ldap_simple_bind moz_ldap_simple_bind
 552 +#define ldap_simple_bind_s moz_ldap_simple_bind_s
 553 +#define ldap_sort_entries moz_ldap_sort_entries
 554 +#define ldap_sort_strcasecmp moz_ldap_sort_strcasecmp
 555 +#define ldap_sort_values moz_ldap_sort_values
 556 +#define ldap_start_tls_s moz_ldap_start_tls_s
 557 +#define ldap_str2charray moz_ldap_str2charray
 558 +#define ldap_tmplattrs moz_ldap_tmplattrs
 559 +#define ldap_tmplerr2string moz_ldap_tmplerr2string
 560 +#define ldap_tmplerrlist moz_ldap_tmplerrlist
 561 +#define ldap_ufn_search_c moz_ldap_ufn_search_c
 562 +#define ldap_ufn_search_ct moz_ldap_ufn_search_ct
 563 +#define ldap_ufn_search_ctx moz_ldap_ufn_search_ctx
 564 +#define ldap_ufn_search_s moz_ldap_ufn_search_s
 565 +#define ldap_ufn_setfilter moz_ldap_ufn_setfilter
 566 +#define ldap_ufn_setprefix moz_ldap_ufn_setprefix
 567 +#define ldap_ufn_timeout moz_ldap_ufn_timeout
 568 +#define ldap_unbind moz_ldap_unbind
 569 +#define ldap_unbind_ext moz_ldap_unbind_ext
 570 +#define ldap_unbind_s moz_ldap_unbind_s
 571 +#define ldap_url_parse moz_ldap_url_parse
 572 +#define ldap_url_parse_no_defaults moz_ldap_url_parse_no_defaults
 573 +#define ldap_url_search moz_ldap_url_search
 574 +#define ldap_url_search_s moz_ldap_url_search_s
 575 +#define ldap_url_search_st moz_ldap_url_search_st
 576 +#define ldap_utf8characters moz_ldap_utf8characters
 577 +#define ldap_utf8copy moz_ldap_utf8copy
 578 +#define ldap_utf8getcc moz_ldap_utf8getcc
 579 +#define ldap_utf8isalnum moz_ldap_utf8isalnum
 580 +#define ldap_utf8isalpha moz_ldap_utf8isalpha
 581 +#define ldap_utf8isdigit moz_ldap_utf8isdigit
 582 +#define ldap_utf8isspace moz_ldap_utf8isspace
 583 +#define ldap_utf8isxdigit moz_ldap_utf8isxdigit
 584 +#define ldap_utf8len moz_ldap_utf8len
 585 +#define ldap_utf8next moz_ldap_utf8next
 586 +#define ldap_utf8prev moz_ldap_utf8prev
 587 +#define ldap_utf8strtok_r moz_ldap_utf8strtok_r
 588 +#define ldap_vals2html moz_ldap_vals2html
 589 +#define ldap_vals2text moz_ldap_vals2text
 590 +#define ldap_value_free moz_ldap_value_free
 591 +#define ldap_value_free_len moz_ldap_value_free_len
 592 +#define ldap_version moz_ldap_version
 593 +#define ldap_whoami moz_ldap_whoami
 594 +#define ldap_whoami_s moz_ldap_whoami_s
 595 +#define ldap_x_calloc moz_ldap_x_calloc
 596 +#define ldap_x_free moz_ldap_x_free
 597 +#define ldap_x_hostlist_first moz_ldap_x_hostlist_first
 598 +#define ldap_x_hostlist_next moz_ldap_x_hostlist_next
 599 +#define ldap_x_hostlist_statusfree moz_ldap_x_hostlist_statusfree
 600 +#define ldap_x_malloc moz_ldap_x_malloc
 601 +#define ldap_x_realloc moz_ldap_x_realloc
 602 +
 603  /* Standard LDAP API functions and declarations */
 604  #include "ldap-standard.h"
 605
 606
 607
 608 [FILE:1292:patches/patch-comm_ldap_c-sdk_include_portable.h]
 609 --- comm/ldap/c-sdk/include/portable.h.orig     2020-05-21 20:31:05 UTC
 610 +++ comm/ldap/c-sdk/include/portable.h
 611 @@ -119,11 +119,15 @@
 612  #  define OPENLOG_OPTIONS (LOG_PID | LOG_NOWAIT)
 613  #endif
 614
 615 +#ifdef __DragonFly__
 616 +#define DRAGONFLY
 617 +#endif
 618 +
 619  /*
 620   * some systems don't have the BSD re_comp and re_exec routines
 621   */
 622  #ifndef NEED_BSDREGEX
 623 -#  if (defined(SYSV) || defined(NETBSD) || defined(FREEBSD) ||       \
 624 +#  if (defined(SYSV) || defined(NETBSD) || defined(FREEBSD) || defined(DRAGONFLY) || \
 625         defined(__OpenBSD__) || defined(linux) || defined(DARWIN)) && \
 626        !defined(sgi)
 627  #    define NEED_BSDREGEX
 628 @@ -274,7 +278,7 @@ int strncasecmp(const char *, const char
 629        defined(SUNOS4) || defined(SNI) || defined(BSDI) || defined(NCR) ||      \
 630        defined(OSF1) || defined(NEC) || defined(VMS) ||                         \
 631        (defined(HPUX10) && !defined(_REENTRANT)) || defined(HPUX11) ||          \
 632 -      defined(UnixWare) || defined(NETBSD) || defined(FREEBSD) ||              \
 633 +      defined(UnixWare) || defined(NETBSD) || defined(FREEBSD) || defined(DRAGONFLY) || \
 634        defined(OPENBSD) || (defined(LINUX) && __GLIBC__ < 2) ||                 \
 635        (defined(AIX) && !defined(USE_REENTRANT_LIBC))
 636  #    define GETHOSTBYNAME(n, r, b, l, e) gethostbyname(n)
 637
 638
 639 [FILE:421:patches/patch-comm_mail_app_nsMailApp.cpp]
 640 --- comm/mail/app/nsMailApp.cpp.orig    2020-07-13 18:10:03 UTC
 641 +++ comm/mail/app/nsMailApp.cpp
 642 @@ -306,6 +306,9 @@ int main(int argc, char* argv[], char* e
 643    }
 644  #endif
 645
 646 +  setenv("MOZ_GMP_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
 647 +  setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
 648 +
 649  #ifdef HAS_DLL_BLOCKLIST
 650    DllBlocklist_Initialize(gBlocklistInitFlags);
 651  #endif
 652
 653
 654 [FILE:679:patches/patch-comm_third__party_botan_configure.py]
 655 --- comm/third_party/botan/configure.py.orig    2020-07-13 18:10:04 UTC
 656 +++ comm/third_party/botan/configure.py
 657 @@ -2936,11 +2936,7 @@ def set_defaults_for_unset_options(optio
 658          options.os = find_canonical_os_name(options.os)
 659
 660      def deduce_compiler_type_from_cc_bin(cc_bin):
 661 -        if cc_bin.find('clang') != -1 or cc_bin in ['emcc', 'em++']:
 662 -            return 'clang'
 663 -        if cc_bin.find('-g++') != -1 or cc_bin.find('g++') != -1:
 664 -            return 'gcc'
 665 -        return None
 666 +        return 'gcc'
 667
 668      if options.compiler is None and options.compiler_binary is not None:
 669          options.compiler = deduce_compiler_type_from_cc_bin(options.compiler_binary)
 670
 671
 672 [FILE:893:patches/patch-env-api-keys]
 673 # Accept API keys from environment like before bug 1294585
 674
 675 --- build/moz.configure/keyfiles.configure.orig 2020-05-21 20:29:30 UTC
 676 +++ build/moz.configure/keyfiles.configure
 677 @@ -18,6 +18,7 @@ def keyfile(desc, default=None, help=Non
 678      @checking('for the %s key' % desc, lambda x: x and x is not no_key)
 679      @imports(_from='__builtin__', _import='open')
 680      @imports(_from='__builtin__', _import='IOError')
 681 +    @imports(_from='os', _import='environ')
 682      def keyfile(value):
 683          if value:
 684              try:
 685 @@ -28,7 +29,7 @@ def keyfile(desc, default=None, help=Non
 686                      raise FatalCheckError("'%s' is empty." % value[0])
 687              except IOError as e:
 688                  raise FatalCheckError("'%s': %s." % (value[0], e.strerror))
 689 -        return no_key
 690 +        return environ.get('MOZ_%s_KEY' % desc.upper().replace(' ', '_')) or no_key
 691
 692      return keyfile
 693
 694
 695
 696 [FILE:890:patches/patch-gfx_skia_skia_src_core_SkCpu.cpp]
 697 Regressed by https://svnweb.freebsd.org/changeset/base/324815
 698
 699 gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared identifier 'getauxval'
 700         uint32_t hwcaps = getauxval(AT_HWCAP);
 701                           ^
 702
 703 --- gfx/skia/skia/src/core/SkCpu.cpp.orig       2020-07-13 18:06:57 UTC
 704 +++ gfx/skia/skia/src/core/SkCpu.cpp
 705 @@ -72,6 +72,20 @@
 706          return features;
 707      }
 708
 709 +#elif defined(SK_CPU_ARM64) && defined(__FreeBSD__)
 710 +    #include <machine/armreg.h>
 711 +
 712 +    static uint32_t read_cpu_features() {
 713 +        uint32_t features = 0;
 714 +        uint64_t id_aa64isar0;
 715 +
 716 +        id_aa64isar0 = READ_SPECIALREG(ID_AA64ISAR0_EL1);
 717 +        if (ID_AA64ISAR0_CRC32(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) {
 718 +            features |= SkCpu::CRC32;
 719 +        }
 720 +        return features;
 721 +    }
 722 +
 723  #elif defined(SK_CPU_ARM64) && __has_include(<sys/auxv.h>)
 724      #include <sys/auxv.h>
 725
 726
 727
 728 [FILE:290:files/thunderbird.desktop]
 729 [Desktop Entry]
 730 Encoding=UTF-8
 731 Name=Thunderbird
 732 GenericName=Mail Client
 733 Comment=Mail client and News Reader
 734 Exec=thunderbird %u
 735 Icon=thunderbird.png
 736 StartupNotify=true
 737 Terminal=false
 738 Type=Application
 739 Categories=Network;Email;News;InstantMessaging;
 740 MimeType=application/mbox;message/rfc822;
 741