Update to 2020 release

12 files changed, 253 insertions, 150 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61637b3068fa..7de5f57559dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,15 @@
 pkgbase = gnat-gps
 	pkgdesc = GNAT Programming Studio for Ada
-	pkgver = 2019
-	pkgrel = 2
-	url = http://libre.adacore.com/libre/tools/gps
+	pkgver = 2020
+	pkgrel = 1
+	url = https://github.com/AdaCore/gps
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = gprbuild
+	makedepends = python2-sphinx
+	makedepends = texlive-latexextra
+	makedepends = graphviz
 	depends = clang
 	depends = libadalang
 	depends = gnatcoll-xref
@@ -19,20 +22,24 @@ pkgbase = gnat-gps
 	depends = gnome-icon-theme-symbolic
 	depends = python2-gobject
 	depends = python2-jedi
-	source = https://github.com/AdaCore/gps/archive/eb0d52567d9e1af49ee3248144442c9fa46bbb55.zip
-	source = https://community.download.adacore.com/v1/6b32f1aa7cc443bcaf268ef13fa46e3b0fdf147d?filename=libadalang-tools-2019-20190517-195C4-src.tar.gz
-	source = patch-Makefile.in
-	source = patch-docs-Makefile.in
-	source = xref-docgen.adb-patch
-	source = src_contexts.adb-patch
+	source = gps-20.2.tar.gz::https://github.com/AdaCore/gps/archive/20.2.tar.gz
+	source = ada_language_server-21.0.3.tar.gz::https://github.com/AdaCore/ada_language_server/archive/21.0.3.tar.gz
+	source = libadalang-tools-2020-20200429-1998C-src.tar.gz::https://community.download.adacore.com/v1/740372d8ffb1e4755a99bead2d78dace904235c0?filename=libadalang-tools-2020-20200429-1998C-src.tar.gz
+	source = 0001-Use-GPR.Sinput.Reference_Name.patch
+	source = 0002-Ignore-absence-of-version-number-in-user_guide.patch
+	source = 0003-Honour-DESTDIR-in-installation-targets.patch
+	source = 0004-Honour-GPRBUILD_FLAGS-in-cli-Makefile.patch
+	source = 0005-Fix-recursive-make-in-docs.patch
 	source = gps.desktop
-	sha1sums = ed71bc62dc796263a5ba91472be90067d71396cc
-	sha1sums = 6b32f1aa7cc443bcaf268ef13fa46e3b0fdf147d
-	sha1sums = 763584d9a931887eff11151310504c02df279224
-	sha1sums = 60813145324cd5ea9f081648da10cffd99f87586
-	sha1sums = e166ed6513465f59f433eac8f759afcd190ab853
-	sha1sums = bd80d0f84c128e1e0d6a1aa3ac4b419226a4c616
-	sha1sums = 1f4ee00408551af23eec12488188016ffee17c72
+	sha1sums = bd0b5c3d3e1c411d2824f93f59534d783010e65c
+	sha1sums = a737b6d7ee2d4a1193f088a0817070e545752dae
+	sha1sums = 740372d8ffb1e4755a99bead2d78dace904235c0
+	sha1sums = 7befc021358ada26c6a332e623113b32317bfd8c
+	sha1sums = 525f0b9d64fecb9c2e669cf64b60548b86c575d9
+	sha1sums = 4c13859aa25c5142bd5d0fde7b645217ddeccb50
+	sha1sums = 26f6fac439ec973facccee5412dc4c86b7c6d8c7
+	sha1sums = 6dd1f880f55c9612a2a67d41e6606df26cd829c6
+	sha1sums = b399c7b3a1fe48152da18081def3dced2e74763b
 
 pkgname = gnat-gps
 
diff --git a/0001-Use-GPR.Sinput.Reference_Name.patch b/0001-Use-GPR.Sinput.Reference_Name.patch
new file mode 100644
index 000000000000..9b12c3cf372a
--- /dev/null
+++ b/0001-Use-GPR.Sinput.Reference_Name.patch
@@ -0,0 +1,30 @@
+From d386fd1f73ee5526c866e98e712ca2a8c8b49096 Mon Sep 17 00:00:00 2001
+From: Dmitriy Anisimkov <anisimko@adacore.com>
+Date: Wed, 5 Feb 2020 15:58:58 +0600
+Subject: [PATCH 1/5] Use GPR.Sinput.Reference_Name
+
+T117-002
+
+Prepare to hide Source_File table.
+
+Change-Id: I3c7378061398e1e15c3a1ef18e25c525d437f4fe
+---
+ toolchains_editor/core/src/toolchains-parsers.adb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/toolchains_editor/core/src/toolchains-parsers.adb b/toolchains_editor/core/src/toolchains-parsers.adb
+index b95205057e..dd0314c691 100644
+--- a/toolchains_editor/core/src/toolchains-parsers.adb
++++ b/toolchains_editor/core/src/toolchains-parsers.adb
+@@ -672,7 +672,7 @@ package body Toolchains.Parsers is
+       is
+          Location : constant Source_Ptr := Location_Of (Node, Node_Data);
+          File     : constant String := Get_Name_String
+-           (Source_File.Table (Get_Source_File_Index (Location)).File_Name);
++           (Reference_Name (Get_Source_File_Index (Location)));
+          Line     : constant Line_Number :=
+            Get_Line_Number (Location);
+          Col      : constant Column_Number := Get_Column_Number (Location);
+-- 
+2.26.2
+
diff --git a/0002-Ignore-absence-of-version-number-in-user_guide.patch b/0002-Ignore-absence-of-version-number-in-user_guide.patch
new file mode 100644
index 000000000000..adcb6da0567a
--- /dev/null
+++ b/0002-Ignore-absence-of-version-number-in-user_guide.patch
@@ -0,0 +1,28 @@
+From eab7a24b8e74f37d37522263655363e5647497b4 Mon Sep 17 00:00:00 2001
+From: Xiretza <xiretza@xiretza.xyz>
+Date: Sun, 24 May 2020 11:22:31 +0200
+Subject: [PATCH 2/5] Ignore absence of version number in user_guide
+
+This was missed in 5b1ce178efb54d8c451c08c8443bbafdea4cacda, "Ignore
+absence of VERSION.txt file."
+---
+ gnatdoc/docs/users_guide/conf.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gnatdoc/docs/users_guide/conf.py b/gnatdoc/docs/users_guide/conf.py
+index e8f76eaa6c..4076ff8f21 100644
+--- a/gnatdoc/docs/users_guide/conf.py
++++ b/gnatdoc/docs/users_guide/conf.py
+@@ -53,7 +53,8 @@ def get_version():
+     version_file = "../../../VERSION.txt"
+     if os.path.isfile(version_file):
+         return file(version_file).readline()
+-    raise Exception("Cannot find version number")
++    else:
++        return "0.0"
+ 
+ # The version info for the project you're documenting, acts as replacement for
+ # |version| and |release|, also used in various other places throughout the
+-- 
+2.26.2
+
diff --git a/0003-Honour-DESTDIR-in-installation-targets.patch b/0003-Honour-DESTDIR-in-installation-targets.patch
new file mode 100644
index 000000000000..303d220e6768
--- /dev/null
+++ b/0003-Honour-DESTDIR-in-installation-targets.patch
@@ -0,0 +1,43 @@
+From 60e49aa020efbb58a81c1e1cfbec90b59bb33272 Mon Sep 17 00:00:00 2001
+From: Xiretza <xiretza@xiretza.xyz>
+Date: Sun, 24 May 2020 11:23:29 +0200
+Subject: [PATCH 3/5] Honour DESTDIR= in installation targets
+
+---
+ Makefile.in      | 6 +++---
+ docs/Makefile.in | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index da439c1629..18be4f7699 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,9 +11,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA    = @INSTALL_DATA@
+ GNATCOLL_INSTALL  = @GNATCOLL_INSTALL@
+ prefix          = @prefix@
+-bindir          = $(prefix)/bin
+-sharedir        = $(prefix)/share
+-examplesdir     = $(prefix)/share/examples/gnatstudio
++bindir          = $(DESTDIR)$(prefix)/bin
++sharedir        = $(DESTDIR)$(prefix)/share
++examplesdir     = $(DESTDIR)$(prefix)/share/examples/gnatstudio
+ 
+ SYS := $(shell gcc -dumpmachine)
+ 
+diff --git a/docs/Makefile.in b/docs/Makefile.in
+index 34f3d0aee8..16e273e7f7 100644
+--- a/docs/Makefile.in
++++ b/docs/Makefile.in
+@@ -1,6 +1,6 @@
+ prefix = @prefix@
+-docdir = $(prefix)/share/doc/gnatstudio
+-sharedir = $(prefix)/share/gnatstudio
++docdir = $(DESTDIR)$(prefix)/share/doc/gnatstudio
++sharedir = $(DESTDIR)$(prefix)/share/gnatstudio
+ 
+ MKDIR = mkdir -p
+ INSTALL = @INSTALL@
+-- 
+2.26.2
+
diff --git a/0004-Honour-GPRBUILD_FLAGS-in-cli-Makefile.patch b/0004-Honour-GPRBUILD_FLAGS-in-cli-Makefile.patch
new file mode 100644
index 000000000000..f4bf3650017b
--- /dev/null
+++ b/0004-Honour-GPRBUILD_FLAGS-in-cli-Makefile.patch
@@ -0,0 +1,28 @@
+From 1b9588773387109753218a6395c77014b56bd8ea Mon Sep 17 00:00:00 2001
+From: Xiretza <xiretza@xiretza.xyz>
+Date: Sun, 24 May 2020 11:23:55 +0200
+Subject: [PATCH 4/5] Honour GPRBUILD_FLAGS= in cli/Makefile
+
+---
+ cli/Makefile | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/cli/Makefile b/cli/Makefile
+index 3b0630d8ef..8c6218cf5a 100644
+--- a/cli/Makefile
++++ b/cli/Makefile
+@@ -1,8 +1,9 @@
+ GPRBUILD=gprbuild
+ GPRCLEAN=gprclean
++GPRBUILD_FLAGS=
+ 
+ all default:
+-	$(GPRBUILD) -p -Pcli
++	$(GPRBUILD) $(GPRBUILD_FLAGS) -p -Pcli
+ 
+ clean:
+-	$(GPRCLEAN) -q -r -Pcli
++	$(GPRCLEAN) $(GPRBUILD_FLAGS) -q -r -Pcli
+-- 
+2.26.2
+
diff --git a/0005-Fix-recursive-make-in-docs.patch b/0005-Fix-recursive-make-in-docs.patch
new file mode 100644
index 000000000000..ca364014a931
--- /dev/null
+++ b/0005-Fix-recursive-make-in-docs.patch
@@ -0,0 +1,50 @@
+From 4266bc917d79d20200d2873f7db110d9827250cb Mon Sep 17 00:00:00 2001
+From: Xiretza <xiretza@xiretza.xyz>
+Date: Sun, 24 May 2020 11:24:25 +0200
+Subject: [PATCH 5/5] Fix recursive make in docs
+
+---
+ docs/Makefile.in | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/docs/Makefile.in b/docs/Makefile.in
+index 16e273e7f7..311a49c7de 100644
+--- a/docs/Makefile.in
++++ b/docs/Makefile.in
+@@ -12,26 +12,26 @@ all: ug tutorial pg relnotes gnatdoc
+ static:
+ 
+ pg:
+-	make -C programmers_guide html
++	$(MAKE) -C programmers_guide html
+ 
+ relnotes:
+-	make -C release_notes singlehtml
++	$(MAKE) -C release_notes singlehtml
+ 
+ relnotes_17:
+-	make -C release_notes_17 singlehtml
++	$(MAKE) -C release_notes_17 singlehtml
+ 
+ relnotes_62:
+-	make -C release_notes_62 singlehtml
++	$(MAKE) -C release_notes_62 singlehtml
+ 
+ ug:
+-	make -C users_guide html latexpdf
++	$(MAKE) -C users_guide html latexpdf
+ 
+ gnatdoc:
+-	make -C ../gnatdoc/docs/users_guide html latexpdf
++	$(MAKE) -C ../gnatdoc/docs/users_guide html latexpdf
+ 
+ .PHONY: tutorial
+ tutorial:
+-	make -C tutorial html
++	$(MAKE) -C tutorial html
+ 
+ install:
+ 	$(MKDIR) $(docdir)
+-- 
+2.26.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 5c1faed9bb1c..98a1a97f083e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,13 @@
 # Contributor: Georgios Tsalikis  <aliverius somewhere near tsalikis and a net>
 
 pkgname=gnat-gps
-pkgver=2019
-pkgrel=2
+pkgver=2020
+pkgrel=1
+_gps_version="20.2"
 pkgdesc="GNAT Programming Studio for Ada"
 
 arch=('i686' 'x86_64')
-url="http://libre.adacore.com/libre/tools/gps"
+url="https://github.com/AdaCore/gps"
 license=('GPL')
 
 depends=("clang" "libadalang"
@@ -16,81 +17,80 @@ depends=("clang" "libadalang"
          "gnatcoll-gnatinspect" "gtkada"
          "gnome-icon-theme" "gnome-icon-theme-extras" "gnome-icon-theme-symbolic" 
          "python2-gobject" "python2-jedi")
-makedepends=("gprbuild")
-
-source=(https://github.com/AdaCore/gps/archive/eb0d52567d9e1af49ee3248144442c9fa46bbb55.zip
-        https://community.download.adacore.com/v1/6b32f1aa7cc443bcaf268ef13fa46e3b0fdf147d?filename=libadalang-tools-2019-20190517-195C4-src.tar.gz
-        patch-Makefile.in
-        patch-docs-Makefile.in
-        xref-docgen.adb-patch
-        src_contexts.adb-patch
+makedepends=('gprbuild' 'python2-sphinx' 'texlive-latexextra' 'graphviz')
+
+_laltools_ver=2020-20200429-1998C
+_laltools_checksum=740372d8ffb1e4755a99bead2d78dace904235c0
+_als_ver=21.0.3
+source=("gps-${_gps_version}.tar.gz::https://github.com/AdaCore/gps/archive/$_gps_version.tar.gz"
+        "ada_language_server-$_als_ver.tar.gz::https://github.com/AdaCore/ada_language_server/archive/$_als_ver.tar.gz"
+        "libadalang-tools-$_laltools_ver-src.tar.gz::https://community.download.adacore.com/v1/$_laltools_checksum?filename=libadalang-tools-$_laltools_ver-src.tar.gz"
+        0001-Use-GPR.Sinput.Reference_Name.patch
+        0002-Ignore-absence-of-version-number-in-user_guide.patch
+        0003-Honour-DESTDIR-in-installation-targets.patch
+        0004-Honour-GPRBUILD_FLAGS-in-cli-Makefile.patch
+        0005-Fix-recursive-make-in-docs.patch
         gps.desktop)
 
-sha1sums=('ed71bc62dc796263a5ba91472be90067d71396cc'
-          '6b32f1aa7cc443bcaf268ef13fa46e3b0fdf147d'
-          '763584d9a931887eff11151310504c02df279224'
-          '60813145324cd5ea9f081648da10cffd99f87586'
-          'e166ed6513465f59f433eac8f759afcd190ab853'
-          'bd80d0f84c128e1e0d6a1aa3ac4b419226a4c616'
-          '1f4ee00408551af23eec12488188016ffee17c72')
-
-gps_version="eb0d52567d9e1af49ee3248144442c9fa46bbb55"
-
+sha1sums=('bd0b5c3d3e1c411d2824f93f59534d783010e65c'
+          'a737b6d7ee2d4a1193f088a0817070e545752dae'
+          "$_laltools_checksum"
+          '7befc021358ada26c6a332e623113b32317bfd8c'
+          '525f0b9d64fecb9c2e669cf64b60548b86c575d9'
+          '4c13859aa25c5142bd5d0fde7b645217ddeccb50'
+          '26f6fac439ec973facccee5412dc4c86b7c6d8c7'
+          '6dd1f880f55c9612a2a67d41e6606df26cd829c6'
+          'b399c7b3a1fe48152da18081def3dced2e74763b')
 
 prepare()
 {
-  cd $srcdir/gps-$gps_version
-
-  patch -p0 -i ../patch-Makefile.in
-  patch -p0 -i ../patch-docs-Makefile.in
+  cd "$srcdir/gps-$_gps_version"
 
-  patch -p0 -i ../src_contexts.adb-patch
-  patch -p0 -i ../xref-docgen.adb-patch
+  patch -p1 < "$srcdir/0001-Use-GPR.Sinput.Reference_Name.patch"
+  patch -p1 < "$srcdir/0002-Ignore-absence-of-version-number-in-user_guide.patch"
+  patch -p1 < "$srcdir/0003-Honour-DESTDIR-in-installation-targets.patch"
+  patch -p1 < "$srcdir/0004-Honour-GPRBUILD_FLAGS-in-cli-Makefile.patch"
+  patch -p1 < "$srcdir/0005-Fix-recursive-make-in-docs.patch"
 
-  ## Force use of python2
-  #
+  # Force use of python2
   rm -fr temp_bin
   mkdir  temp_bin
   ln -s /usr/bin/python2        temp_bin/python
   ln -s /usr/bin/python2-config temp_bin/python-config
+  ln -s /usr/bin/sphinx-build2  temp_bin/sphinx-build
 
-  ## Move lal-tools into the GPS source tree.
-  #
-  rm -fr $srcdir/gps-$gps_version/laltools
-  mv $srcdir/libadalang-tools-2019-20190517-195C4-src $srcdir/gps-$gps_version/laltools
+  # Link libadalang-tools and ada_language_server into the GPS source tree
+  ln -sf "$srcdir/libadalang-tools-$_laltools_ver-src" "$srcdir/gps-$_gps_version/laltools"
+  ln -sf "$srcdir/ada_language_server-$_als_ver" "$srcdir/gps-$_gps_version/ada_language_server"
 }
 
 
 build() 
 {
-  cd $srcdir/gps-$gps_version
+  cd "$srcdir/gps-$_gps_version"
 
   export OS=unix
 
-  ## Force use of python2
-  #
-  export PATH=$srcdir/gps-$gps_version/temp_bin:$PATH
+  # Force use of python2
+  export PATH="$srcdir/gps-$_gps_version/temp_bin:$PATH"
 	
-  export Build=Production
-  ./configure  --prefix=/usr
-  PROCESSORS=5 make
+  ./configure --prefix=/usr
+  make PROCESSORS=0 Build=Production GPRBUILD_FLAGS="-R -cargs $CFLAGS -largs $LDFLAGS -gargs"
+  make -C docs all
 }
 
 
 package() 
 {
-  cd $srcdir/gps-$gps_version
+  cd "$srcdir/gps-$_gps_version"
 
   export OS=unix
 
-  ## Force use of python2
-  #
-  export PATH=$srcdir/gps/temp_bin:$PATH
+  # Force use of python2
+  export PATH="$srcdir/gps-$_gps_version/temp_bin:$PATH"
 
   make DESTDIR="$pkgdir/" install
 
-  ## Add the desktop config.
-  #
-  mkdir -p               $pkgdir/usr/share/applications
-  cp $srcdir/gps.desktop $pkgdir/usr/share/applications
+  # Add the desktop config.
+  install -Dm644 -t "$pkgdir/usr/share/applications/" "$srcdir/gps.desktop"
 }
diff --git a/gps.desktop b/gps.desktop
index 543e1357ad62..e57bac492fbe 100644
--- a/gps.desktop
+++ b/gps.desktop
@@ -1,28 +1,8 @@
 [Desktop Entry]
-
-# The type as listed above
 Type=Application
-
-# The version of the desktop entry specification to which this file complies
 Version=1.0
-
-# The name of the application
-Name=GPS
-
-# A comment which can/will be used as a tooltip
-Comment=Gnat Programming Studio
-
-# The path to the folder in which the executable is run
-Path=~
-
-# The executable of the application, possibly with arguments.
-Exec=gps
-
-# The name of the icon that will be used to display this entry
-Icon=/usr/share/gps/gps-splash.png
-
-# Describes whether this application needs to be run in a terminal or not
+Name=GNAT Studio (GPS)
+Exec=gnatstudio
+Icon=/usr/share/gnatstudio/icons/hicolor/32x32/apps/gnatstudio_logo.png
 Terminal=false
-
-# Describes the categories in which this entry should be shown
 Categories=Development;Languages;Ada;
diff --git a/patch-Makefile.in b/patch-Makefile.in
deleted file mode 100644
index 81be969864ef..000000000000
--- a/patch-Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.in-orig	2017-06-07 08:38:21.672557023 +1000
-+++ Makefile.in	2017-06-07 08:39:08.499223692 +1000
-@@ -11,9 +11,9 @@
- INSTALL_DATA    = @INSTALL_DATA@
- GNATCOLL_INSTALL  = @GNATCOLL_INSTALL@
- prefix          = @prefix@
--bindir          = $(prefix)/bin
--sharedir        = $(prefix)/share
--examplesdir     = $(prefix)/share/examples/gps
-+bindir          = $(DESTDIR)$(prefix)/bin
-+sharedir        = $(DESTDIR)$(prefix)/share
-+examplesdir     = $(DESTDIR)$(prefix)/share/examples/gps
- 
- SYS := $(shell gcc -dumpmachine)
- 
-@@ -73,7 +73,7 @@
- endif
- 
- # Regenerate predefined_ada.xml before we install it
--	-${PYTHON} design/scripts/update_predefined_ada.py
-+#	-${PYTHON} design/scripts/update_predefined_ada.py
- 
- 	(cd share; tar cf - plug-ins/spark/*.py) | (cd $(sharedir)/gps; tar xf -)
- 	(cd share; tar cf - plug-ins/images/*.png) | (cd $(sharedir)/gps; tar xf -)
diff --git a/patch-docs-Makefile.in b/patch-docs-Makefile.in
deleted file mode 100644
index 38c78ba9329e..000000000000
--- a/patch-docs-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/Makefile.in	2017-06-07 08:58:58.865890359 +1000
-+++ docs/Makefile.in-new	2017-06-07 12:05:49.719465922 +1000
-@@ -1,6 +1,6 @@
- prefix = @prefix@
--docdir = $(prefix)/share/doc/gps
--sharedir = $(prefix)/share/gps
-+docdir = $(DESTDIR)/$(prefix)/share/doc/gps
-+sharedir = $(DESTDIR)/$(prefix)/share/gps
- 
- MKDIR = mkdir -p
- INSTALL = @INSTALL@
diff --git a/src_contexts.adb-patch b/src_contexts.adb-patch
deleted file mode 100644
index 0e9f32d48e2c..000000000000
--- a/src_contexts.adb-patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- src_editor/src/src_contexts.adb-orig	2019-06-23 11:30:15.904969485 +1000
-+++ src_editor/src/src_contexts.adb	2019-06-23 11:46:45.469952414 +1000
-@@ -26,6 +26,7 @@
- with GNAT.Regexp;                use GNAT.Regexp;
- with GNAT.Regpat;                use GNAT.Regpat;
- with GNAT.Strings;
-+with GNAT.Expect;                use GNAT.Expect;
- with GNATCOLL.Projects;          use GNATCOLL.Projects;
- with GNATCOLL.Traces;            use GNATCOLL.Traces;
- with GNATCOLL.Utils;             use GNATCOLL.Utils;
-@@ -398,7 +399,6 @@
-          --  Whether the final range should or should not be scanned.
- 
-          Matches       : Match_Array (0 .. 0);
--
-       begin
-          Section_End := Buffer'Last;
- 
diff --git a/xref-docgen.adb-patch b/xref-docgen.adb-patch
deleted file mode 100644
index 6f1f25afb411..000000000000
--- a/xref-docgen.adb-patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnatdoc/src/xref-docgen.adb-orig	2019-06-23 11:57:13.239946896 +1000
-+++ gnatdoc/src/xref-docgen.adb	2019-06-23 11:57:38.337413506 +1000
-@@ -20,6 +20,7 @@
- with Ada.Strings.Maps;          use Ada.Strings.Maps;
- with GNATCOLL.Utils;            use GNATCOLL.Utils;
- with GNAT.Strings;              use GNAT.Strings;
-+with GNAT.Expect;               use GNAT.Expect;
- with Language_Handlers;         use Language_Handlers;
- with Language.Tree;             use Language.Tree;
- with Language.Tree.Database;    use Language.Tree.Database;