Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/Makefile,v
retrieving revision 1.390
diff -u -p -r1.390 Makefile
--- Makefile 1 Sep 2022 11:12:07 -0000 1.390
+++ Makefile 1 Sep 2022 18:42:03 -0000
@@ -9,6 +9,7 @@ MOZILLA_PROJECT = thunderbird
MOZILLA_CODENAME = comm/mail
EXTRACT_SUFX = .tar.xz
DEBUG_PACKAGES = ${BUILD_PACKAGES}
+REVISION = 0
# XXX badly formed debug in libxul ?
DWZ = :
Index: patches/patch-comm_mail_modules_DNS_jsm
===================================================================
RCS file: patches/patch-comm_mail_modules_DNS_jsm
diff -N patches/patch-comm_mail_modules_DNS_jsm
--- patches/patch-comm_mail_modules_DNS_jsm 6 Aug 2022 04:58:00 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,78 +0,0 @@
-fix adding caldav calendar
-
-cf https://bugzilla.mozilla.org/show_bug.cgi?id=1737507
-https://bugzilla.mozilla.org/attachment.cgi?id=9282952
-https://hg.mozilla.org/comm-central/rev/da4bc023a082
-https://hg.mozilla.org/comm-central/rev/a4fc161fdb64
-https://hg.mozilla.org/comm-central/rev/ea86b9abe390
-
-Index: comm/mail/modules/DNS.jsm
---- comm/mail/modules/DNS.jsm.orig
-+++ comm/mail/modules/DNS.jsm
-@@ -27,22 +27,33 @@ var NS_T_SRV = 33; // DNS_TYPE_SRV
- var NS_T_MX = 15; // DNS_TYPE_MX
-
- // For Linux and Mac.
--function load_libresolv() {
-- this._open();
-+function load_libresolv(os) {
-+ this._open(os);
- }
-
- load_libresolv.prototype = {
- library: null,
-
- // Tries to find and load library.
-- _open() {
-+ _open(os) {
- function findLibrary() {
- let lastException = null;
-- let candidates = [
-- { name: "resolv.9", suffix: "" },
-- { name: "resolv", suffix: ".2" },
-- { name: "resolv", suffix: "" },
-- ];
-+ let candidates = [];
-+ if(os == "FreeBSD") {
-+ candidates = [
-+ { name: "c", suffix: ".7" },
-+ ]
-+ } else if(os == "OpenBSD") {
-+ candidates = [
-+ { name: "c", suffix: "" },
-+ ]
-+ } else {
-+ candidates = [
-+ { name: "resolv.9", suffix: "" },
-+ { name: "resolv", suffix: ".2" },
-+ { name: "resolv", suffix: "" },
-+ ];
-+ }
- let tried = [];
- for (let candidate of candidates) {
- try {
-@@ -125,13 +136,13 @@ load_libresolv.prototype = {
- ctypes.unsigned_char.ptr
- );
- this.ns_get16 = declare(
-- ["res_9_ns_get16", "ns_get16"],
-+ ["res_9_ns_get16", "ns_get16", "_getshort"],
- ctypes.default_abi,
- ctypes.unsigned_int,
- ctypes.unsigned_char.ptr
- );
- this.ns_get32 = declare(
-- ["res_9_ns_get32", "ns_get32"],
-+ ["res_9_ns_get32", "ns_get32", "_getlong"],
- ctypes.default_abi,
- ctypes.unsigned_long,
- ctypes.unsigned_char.ptr
-@@ -436,7 +447,7 @@ if (typeof Components === "undefined") {
-
- // eslint-disable-next-line no-unused-vars
- function execute(aOS, aMethod, aArgs) {
-- let DNS = aOS == "WINNT" ? new load_dnsapi() : new load_libresolv();
-+ let DNS = aOS == "WINNT" ? new load_dnsapi() : new load_libresolv(aOS);
- return DNS[aMethod].apply(DNS, aArgs);
- }
- } else {
Looks like patches/patch-comm_mail_modules_DNS_jsm made it into 102.2.1 ;-)
No comments:
Post a Comment