From 4d2d0702b2d906a63bcff097c347dbceca501d79 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sat, 27 Mar 2021 19:48:04 +0100
Subject: [PATCH] gobject-introspection: drop install scripts

---
 mingw-w64-gobject-introspection/PKGBUILD           |  7 ++-----
 .../gobject-introspection-i686.install             | 14 --------------
 .../gobject-introspection-x86_64.install           | 14 --------------
 mingw-w64-gobject-introspection/pyscript2exe.py    |  3 +--
 4 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 mingw-w64-gobject-introspection/gobject-introspection-i686.install
 delete mode 100644 mingw-w64-gobject-introspection/gobject-introspection-x86_64.install

diff --git a/mingw-w64-gobject-introspection/PKGBUILD b/mingw-w64-gobject-introspection/PKGBUILD
index 4ef085d0da..d8a9f0174b 100644
--- a/mingw-w64-gobject-introspection/PKGBUILD
+++ b/mingw-w64-gobject-introspection/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-runtime")
 pkgver=1.66.1
-pkgrel=2
+pkgrel=3
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64')
 url="https://live.gnome.org/GObjectIntrospection"
@@ -36,7 +36,7 @@ sha256sums=('dd44a55ee5f426ea22b6b89624708f9e8d53f5cc94e5485c15c87cb30e06161d'
             '594a067618922f10bdc5034f290f49d36944df3b970c9604381e2b9058a648da'
             '19ca830262339c4ac9f21bfb8d669ee8e126a949a4237d55656e00c5ae81c451'
             '3f38bdd0dd43d9cf626cbca7c2abd22a7ed0213e6756252c6d467d470d9c5948'
-            '00e03a8b9d45e620c6fabbf96f5ccb41d1e49cc9b35ccb846d423f235ad5bec6')
+            'e57174517b08cf8f9fb4f43a381d342d23d2db3cad661107f35ca21c39b5734d')
 
 prepare() {
   cd ${srcdir}/${_realname}-${pkgver}
@@ -70,7 +70,6 @@ package_gobject-introspection() {
            "${MINGW_PACKAGE_PREFIX}-python"
            "${MINGW_PACKAGE_PREFIX}-python-mako")
   options=('!emptydirs')
-  install=${_realname}-${CARCH}.install
 
   cd "${srcdir}/build-${MINGW_CHOST}"
 
@@ -80,8 +79,6 @@ package_gobject-introspection() {
   for name in g-ir-scanner g-ir-doc-tool g-ir-annotation-tool; do
     ${MINGW_PREFIX}/bin/python3 \
       "${srcdir}/pyscript2exe.py" "${pkgdir}${MINGW_PREFIX}/bin/${name}"
-    sed -e "s|${_PRE_WIN}|${MINGW_PREFIX}|g" \
-      -i ${pkgdir}${MINGW_PREFIX}/bin/${name}-script.py
   done
 
   for pcfile in  "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/*.pc; do
diff --git a/mingw-w64-gobject-introspection/gobject-introspection-i686.install b/mingw-w64-gobject-introspection/gobject-introspection-i686.install
deleted file mode 100644
index 09bd2aa148..0000000000
--- a/mingw-w64-gobject-introspection/gobject-introspection-i686.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  cd mingw32
-  local _prefix=$(pwd -W)
-  cd -
-  local _it
-  for _it in g-ir-scanner g-ir-doc-tool g-ir-annotation-tool; do
-    sed -e "s|/mingw32|${_prefix}|g" \
-        -i ${_prefix}/bin/${_it}-script.py
-  done
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/mingw-w64-gobject-introspection/gobject-introspection-x86_64.install b/mingw-w64-gobject-introspection/gobject-introspection-x86_64.install
deleted file mode 100644
index ca538aad74..0000000000
--- a/mingw-w64-gobject-introspection/gobject-introspection-x86_64.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  cd mingw64
-  local _prefix=$(pwd -W)
-  cd -
-  local _it
-  for _it in g-ir-scanner g-ir-doc-tool g-ir-annotation-tool; do
-    sed -e "s|/mingw64|${_prefix}|g" \
-        -i ${_prefix}/bin/${_it}-script.py
-  done
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/mingw-w64-gobject-introspection/pyscript2exe.py b/mingw-w64-gobject-introspection/pyscript2exe.py
index 9adcee3bf4..73d76d8307 100644
--- a/mingw-w64-gobject-introspection/pyscript2exe.py
+++ b/mingw-w64-gobject-introspection/pyscript2exe.py
@@ -12,8 +12,7 @@ path = sys.argv[1]
 with open(path, "rb") as f:
     data = f.read()
 with open(path, "wb") as f:
-    shebang = "#!" + os.path.join(sys.prefix, 'bin',os.path.basename(sys.executable))
-    f.write(re.sub(b"^#![^\n\r]*", shebang.encode(), data))
+    f.write(re.sub(b"^#![^\n\r]*", b'', data))
 root, ext = os.path.splitext(path)
 with open(root + ".exe", "wb") as f:
     f.write(get_win_launcher("cli"))