diff --git a/.travis.yml b/.travis.yml index 06386ea2c1c17b5b145c708ec78835398c0010c9..5afc7bb8e14fdf8e2b07eeedbfa79023c7b04019 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,29 +46,6 @@ addons: chrome: stable apt: packages: - - xorg - - xvfb - - dbus-x11 - - x11-xkb-utils - - xfonts-cyrillic - - xfonts-nexus - - xfonts-terminus - - xfonts-terminus-dos - - xfonts-terminus-oblique - - xfonts-x3270-misc - - xfonts-tipa - - xfonts-traditional - - xfonts-base - - xfonts-scalable - - xfonts-100dpi - - xfonts-100dpi-transcoded - - xfonts-75dpi - - xfonts-75dpi-transcoded - - xfonts-biznet-100dpi - - xfonts-biznet-75dpi - - xfonts-biznet-base - - xfonts-unifont - - xserver-xorg-core - libappindicator1 - fonts-liberation @@ -107,7 +84,7 @@ before_install: # Configure and run the virtual display. - export DISPLAY=:0 - sh -e /etc/init.d/xvfb start - - Xvfb :0 -ac -screen 0 1366x768x24 &>/dev/null & + - Xvfb -- :99 -ac -screen 0 1366x768x24 &>/dev/null & - sleep 3 # Download Chrome Driver. diff --git a/composer.json b/composer.json index 866cafdc4b9b1afe5e48f70dc24698ab816d6349..a593505dd7f9628d2d6d63ddfbeb9447af9d9079 100644 --- a/composer.json +++ b/composer.json @@ -301,9 +301,7 @@ }, "drupal/entity_clone": { "Issue #2706639: Support for cloning nodes that have another entities attached": - "https://www.drupal.org/files/issues/entity_clone-attached_entities-2706639-25.patch", - "Issue #2743379: Check permission before showing Clone operation": - "https://www.drupal.org/files/issues/check-permission-2743379-1.patch" + "https://www.drupal.org/files/issues/entity_clone-attached_entities-2706639-25.patch" }, "drupal/default_content": { "Issue #2900089: Invalid translation language error when selected installation language does not match demo content language": diff --git a/drupal-org.make b/drupal-org.make index 33a62c295968be3d4fa384541d24b5a339756d31..2b518588532f0f3ede8331abeda7a0228df68d10 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -88,8 +88,6 @@ projects[entity_clone][type] = module projects[entity_clone][version] = 1.0-alpha2 ;; Issue #2706639: Support for cloning nodes that have another entities attached projects[entity_clone][patch][] = https://www.drupal.org/files/issues/entity_clone-attached_entities-2706639-25.patch -;; Issue #2743379: Check permission before showing Clone operation -projects[entity_clone][patch][] = https://www.drupal.org/files/issues/check-permission-2743379-1.patch projects[entity_browser][type] = module projects[entity_browser][version] = 1.4