For '/usr/share/gnatstudio' and obsoleted python2.7 packages, use files from the libre CE binary.

7 files changed, 36 insertions, 101 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5dcce03b1cef..693849ba14df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnat-gps
 	pkgdesc = GNAT Programming Studio for Ada
 	pkgver = 2021
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/AdaCore/gps
 	arch = i686
 	arch = x86_64
@@ -14,30 +14,29 @@ pkgbase = gnat-gps
 	depends = gnatcoll-python2
 	depends = gnatcoll-xref
 	depends = gtkada
-	optdepends = python2-jedi
+	depends = python2-gobject
+	depends = python2-gobject2
+	depends = python2-cairo
+	depends = python2-yaml
 	source = gnat-gps-2021-20210701-19B6B-src.tar.gz::https://community.download.adacore.com/v1/e940520a321c0aa8b624be178306147970c6b6f9?filename=gnat-gps-2021-20210701-19B6B-src.tar.gz
+	source = gnatstudio-support.zip::https://github.com/charlie5/archlinux-gnatstudio-support/archive/refs/heads/main.zip
 	source = 0003-Honour-DESTDIR-in-installation-targets.patch
 	source = 0004-Honour-GPRBUILD_FLAGS-in-cli-Makefile.patch
 	source = patch-shared.gpr.in
 	source = patch-filter_panels.adb
 	source = patch-gtkada-search_entry.ads
 	source = patch-gtkada-search_entry.adb
-	source = patch-share-support-core-extensions-__init__.py
-	source = patch-share-support-core-modules.py
-	source = patch-share-support-core-tool_output.py
-	source = patch-share-support-ui-pygps-__init__.py
+	source = site-packages.tar.gz
 	source = gps.desktop
 	sha1sums = e940520a321c0aa8b624be178306147970c6b6f9
+	sha1sums = 12fe188cc9ddcf06341d52af4dd086c9ded5afda
 	sha1sums = 4c13859aa25c5142bd5d0fde7b645217ddeccb50
 	sha1sums = 4e6cb35c4e2e74d343d0917b926c7377a81b1aba
 	sha1sums = c71a4484b1e791ea8455a44e602b236dc7497c4d
 	sha1sums = 7a928f86dad330590a8c9e9aff04291e458fd1c6
 	sha1sums = 8815ffbf0077a50c4c2023637d214b1847be40f1
 	sha1sums = 6ec11d04620cb5225df8a43c9a5dbd98e3e3ca53
-	sha1sums = 6c4ec35fcb80336d62960b3b59fbe82ea305f738
-	sha1sums = 79da1943438f081e6a863011c82c80ccec280e03
-	sha1sums = 0a03a65eda52b70c7197aef858e3c552a3fbda34
-	sha1sums = 4492bad6e6a368526654e9c6ac6cc853d4b0fe48
+	sha1sums = 3a7acd93e393a2cc29dc6f6be1a498b13ecc5dc1
 	sha1sums = b399c7b3a1fe48152da18081def3dced2e74763b
 
 pkgname = gnat-gps
diff --git a/PKGBUILD b/PKGBUILD
index f903e0ef54eb..276fe25b5996 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=gnat-gps
 _upstream_ver=2021-20210701-19B6B
 pkgver=2021
-pkgrel=1
+pkgrel=2
 pkgdesc="GNAT Programming Studio for Ada"
 
 arch=('i686' 'x86_64')
@@ -18,34 +18,29 @@ depends=("clang" "ada_language_server"
          "python2-gobject" "python2-gobject2" "python2-cairo"
          "python2-yaml")
 
-optdepends=('python2-jedi')
 makedepends=('gprbuild' 'texlive-latexextra' 'graphviz')
 
 _checksum=e940520a321c0aa8b624be178306147970c6b6f9
 source=("${pkgname}-${_upstream_ver}-src.tar.gz::https://community.download.adacore.com/v1/${_checksum}?filename=${pkgname}-${_upstream_ver}-src.tar.gz"
+        gnatstudio-support.zip::https://github.com/charlie5/archlinux-gnatstudio-support/archive/refs/heads/main.zip
         0003-Honour-DESTDIR-in-installation-targets.patch
         0004-Honour-GPRBUILD_FLAGS-in-cli-Makefile.patch
         patch-shared.gpr.in
         patch-filter_panels.adb
         patch-gtkada-search_entry.ads
         patch-gtkada-search_entry.adb
-        patch-share-support-core-extensions-__init__.py
-        patch-share-support-core-modules.py
-        patch-share-support-core-tool_output.py
-        patch-share-support-ui-pygps-__init__.py
+        site-packages.tar.gz
         gps.desktop)
 
 sha1sums=("$_checksum"
+          '12fe188cc9ddcf06341d52af4dd086c9ded5afda'
           '4c13859aa25c5142bd5d0fde7b645217ddeccb50'
           '4e6cb35c4e2e74d343d0917b926c7377a81b1aba'
           'c71a4484b1e791ea8455a44e602b236dc7497c4d'
           '7a928f86dad330590a8c9e9aff04291e458fd1c6'
           '8815ffbf0077a50c4c2023637d214b1847be40f1'
           '6ec11d04620cb5225df8a43c9a5dbd98e3e3ca53'
-          '6c4ec35fcb80336d62960b3b59fbe82ea305f738'
-          '79da1943438f081e6a863011c82c80ccec280e03'
-          '0a03a65eda52b70c7197aef858e3c552a3fbda34'
-          '4492bad6e6a368526654e9c6ac6cc853d4b0fe48'
+          '3a7acd93e393a2cc29dc6f6be1a498b13ecc5dc1'
           'b399c7b3a1fe48152da18081def3dced2e74763b')
 
 prepare()
@@ -57,16 +52,10 @@ prepare()
   patch -Np1 -i ../patch-gtkada-search_entry.ads
   patch -Np1 -i ../patch-gtkada-search_entry.adb
 
-  patch -Np0 -i ../patch-share-support-core-extensions-__init__.py
-  patch -Np0 -i ../patch-share-support-core-modules.py
-  patch -Np0 -i ../patch-share-support-core-tool_output.py
-  patch -Np0 -i ../patch-share-support-ui-pygps-__init__.py
-
   patch -p1 < "$srcdir/0003-Honour-DESTDIR-in-installation-targets.patch"
   patch -p0 < "$srcdir/0004-Honour-GPRBUILD_FLAGS-in-cli-Makefile.patch"
 }
 
-
 build() 
 {
   cd "$srcdir/gps-$_upstream_ver-src"
@@ -97,6 +86,28 @@ package()
   export OS=unix
   make DESTDIR="$pkgdir/" install
 
+  # Use the gnatstudio support from the binary Community Edition, since the 
+  # source distribution support is riddled with python inconsistencies.
+  #
+  rm -fr "$pkgdir/usr/share/gnatstudio"
+
+  pushd "$srcdir/archlinux-gnatstudio-support-main"
+  tar -xf "$srcdir/archlinux-gnatstudio-support-main/gnatstudio.tar.gz"
+  mv gnatstudio "$pkgdir/usr/share"
+  popd
+
+  # Add no longer available Python 2.7 packages.
+  #
+  mkdir -p "$pkgdir/usr/lib/python2.7/site-packages"
+
+  pushd "$srcdir/site-packages"
+
+  for file in $(find . -type f); do
+    install -m 644 -D ${file} "$pkgdir/usr/lib/python2.7/site-packages"/${file#source/}
+  done
+
+  popd
+
   # Add the desktop config.
   install -Dm644 -t "$pkgdir/usr/share/applications/" "$srcdir/gps.desktop"
   
diff --git a/patch-share-support-core-extensions-__init__.py b/patch-share-support-core-extensions-__init__.py
deleted file mode 100644
index a12f9a697a71..000000000000
--- a/patch-share-support-core-extensions-__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
---- share/support/core/extensions/__init__.py	2021-06-18 15:08:58.353612000 +1000
-+++ share/support/core/extensions/__init__.py-new	2021-07-22 04:06:50.554067912 +1000
-@@ -1,5 +1,5 @@
- import json
--import urllib.request, urllib.parse, urllib.error
-+import urllib
- import GPS
- #########################################
- # Decorators and auto submodules import #
diff --git a/patch-share-support-core-modules.py b/patch-share-support-core-modules.py
deleted file mode 100644
index b8ba37de2a12..000000000000
--- a/patch-share-support-core-modules.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- share/support/core/modules.py	2021-06-18 15:08:58.357612000 +1000
-+++ share/support/core/modules.py-new	2021-07-22 02:05:16.386551000 +1000
-@@ -118,13 +118,16 @@
- GPS.Hook("gps_started").add(Module_Metaclass.setup_all_modules)
- 
- 
--class Module(object, metaclass=Module_Metaclass):
-+#class Module(object, metaclass=Module_Metaclass):
-+class Module(object):
- 
-     """
-     A Module is a singleton, so this class also ensures that pattern is
-     followed. As a result, a Module's __init__ method is only called once.
-     """
- 
-+    __metaclass__ = Module_Metaclass
-+
-     abstract = True
-     # Not a real module, so should never call setup()
- 
diff --git a/patch-share-support-core-tool_output.py b/patch-share-support-core-tool_output.py
deleted file mode 100644
index fbf315fca678..000000000000
--- a/patch-share-support-core-tool_output.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- share/support/core/tool_output.py	2021-06-18 15:08:58.357612000 +1000
-+++ share/support/core/tool_output.py-new	2021-07-22 02:08:08.422285000 +1000
-@@ -52,7 +52,10 @@
-         return getattr(self, 'name', self.__name__).lower()
- 
- 
--class OutputParser(object, metaclass=OutputParserMetaClass):
-+#class OutputParser(object, metaclass=OutputParserMetaClass):
-+class OutputParser(object):
-+    __metaclass__ = OutputParserMetaClass
-+
-     def __init__(self, child):
-         self.child = child
- 
diff --git a/patch-share-support-ui-pygps-__init__.py b/patch-share-support-ui-pygps-__init__.py
deleted file mode 100644
index ad10883175e2..000000000000
--- a/patch-share-support-ui-pygps-__init__.py
+++ /dev/null
@@ -1,32 +0,0 @@
---- share/support/ui/pygps/__init__.py	2021-06-23 15:03:03.040414000 +1000
-+++ share/support/ui/pygps/__init__.py-new	2021-07-22 02:06:52.486421000 +1000
-@@ -24,7 +24,8 @@
- 
- import GPS
- import sys
--from pynput.keyboard import Key, Controller
-+#import pynput
-+#from pynput.keyboard import Key, Controller
- 
- global last_sent_event
- last_sent_event = None
-@@ -127,7 +128,8 @@
-         def __iter__(self):
-             return self
- 
--        def __next__(self):
-+        # def __next__(self):
-+        def next(self):
-             # Never delete elements from self.to_traverse, otherwise pygobject
-             # will call decref on it, and it is possible that the gtk+ widget
-             # will be destroyed as a result
-@@ -176,7 +178,8 @@
-         def __iter__(self):
-             return self
- 
--        def __next__(self):
-+        # def __next__(self):
-+        def next(self):
-             # Never delete elements from self.to_traverse, otherwise pygobject
-             # will call decref on it, and it is possible that the gtk+ widget
-             # will be destroyed as a result
diff --git a/site-packages.tar.gz b/site-packages.tar.gz
new file mode 100644
index 000000000000..25c329b6eff0
--- /dev/null
+++ b/site-packages.tar.gz