X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=composer.json;h=3a3f0bbae495a893ad3e0b76e0342c38c5b2210d;hb=7f45679a57cfe6627879aedb89acac9a383b4925;hp=1263a80013e2dc16fca0f388f896743d166cd1b4;hpb=01fcf9d6be949c51b4a3eb1b2c1511ddb8c88f79;p=civicrm-core.git

diff --git a/composer.json b/composer.json
index 1263a80013..3a3f0bbae4 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,7 @@
     "tecnickcom/tcpdf" : "6.2.*",
     "totten/ca-config": "~17.05",
     "zetacomponents/base": "1.9.*",
-    "zetacomponents/mail": "dev-1.8-civi",
+    "zetacomponents/mail": "dev-master",
     "marcj/topsort": "~1.1",
     "phpoffice/phpword": "^0.15.0",
     "pear/validate_finance_creditcard": "dev-master",
@@ -60,14 +60,9 @@
     "guzzlehttp/guzzle": "^6.3",
     "psr/simple-cache": "~1.0.1",
     "cweagans/composer-patches": "~1.0",
-    "pear/log": "1.13.1"
+    "pear/log": "1.13.1",
+    "katzien/php-mime-type": "2.1.0"
   },
-  "repositories": [
-    {
-      "type": "git",
-      "url": "https://github.com/civicrm/zetacomponents-mail.git"
-    }
-  ],
   "scripts": {
     "post-install-cmd": [
       "bash tools/scripts/composer/dompdf-cleanup.sh",
@@ -93,6 +88,9 @@
       },
       "phpoffice/phpword": {
         "Fix handling of libxml_disable_entity_loader": "tools/scripts/composer/patches/phpword-libxml-fix-global-handling.patch"
+      },
+      "zetacomponents/mail": {
+        "CiviCRM Custom Patches for ZetaCompoents mail": "tools/scripts/composer/patches/civicrm-custom-patches-zetacompoents-mail.patch"
       }
     }
   }