From ad1583ae2604583ca4ab11c5c090dd2700a5ac9e Mon Sep 17 00:00:00 2001
From: Sarah Ottinger <schalaalexiazeal@gmail.com>
Date: Sun, 20 Dec 2020 12:58:36 -0800
Subject: [PATCH] path fixes

---
 mingw-w64-m2r/PKGBUILD                    | 11 ++++++-----
 mingw-w64-python-autopxd2/PKGBUILD        |  5 ++++-
 mingw-w64-python-dill/PKGBUILD            |  7 ++++++-
 mingw-w64-python-flask/PKGBUILD           |  6 +++++-
 mingw-w64-python-gsutil/PKGBUILD          |  6 +++++-
 mingw-w64-python-jsonpointer/PKGBUILD     |  4 ++++
 mingw-w64-python-labelme/PKGBUILD         |  9 ++++++++-
 mingw-w64-python-numba/PKGBUILD           |  7 ++++++-
 mingw-w64-python-profanityfilter/PKGBUILD |  5 ++++-
 mingw-w64-python-rsa/PKGBUILD             | 11 ++++++++++-
 mingw-w64-python-scikit-image/PKGBUILD    |  6 +++++-
 mingw-w64-python-tabulate/PKGBUILD        |  6 +++++-
 12 files changed, 68 insertions(+), 15 deletions(-)

diff --git a/mingw-w64-m2r/PKGBUILD b/mingw-w64-m2r/PKGBUILD
index 9ea4b4941f..75005699a5 100644
--- a/mingw-w64-m2r/PKGBUILD
+++ b/mingw-w64-m2r/PKGBUILD
@@ -3,11 +3,8 @@
 _realname=m2r
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc='"Markdown to reStructuredText converter" (mingw-w64)'
 arch=('any')
 url="https://github.com/miyakogi/m2r"
@@ -40,5 +37,9 @@ package() {
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
+
+  local _PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/m2r-script.py"
+
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-autopxd2/PKGBUILD b/mingw-w64-python-autopxd2/PKGBUILD
index 9245aef6c4..e8ef9a95ac 100644
--- a/mingw-w64-python-autopxd2/PKGBUILD
+++ b/mingw-w64-python-autopxd2/PKGBUILD
@@ -4,7 +4,7 @@ _realname=autopxd2
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Automatically generate Cython pxd files from C headers (mingw-w64)'
 arch=('any')
 url="https://github.com/psf/black"
@@ -32,4 +32,7 @@ package() {
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
+
+  local _PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/autopxd-script.py"
 }
diff --git a/mingw-w64-python-dill/PKGBUILD b/mingw-w64-python-dill/PKGBUILD
index eaa242a633..d6528aa956 100644
--- a/mingw-w64-python-dill/PKGBUILD
+++ b/mingw-w64-python-dill/PKGBUILD
@@ -4,7 +4,7 @@ _realname=dill
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=0.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Serialize all of python (almost) (mingw-w64)'
 arch=('any')
 url="https://pypi.org/project/dill/"
@@ -32,5 +32,10 @@ package() {
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
+
+  local _PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/get_objgraph"
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/undill"
+
   install -D -m644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-flask/PKGBUILD b/mingw-w64-python-flask/PKGBUILD
index fb91eef8ac..f1e3c2f7d8 100644
--- a/mingw-w64-python-flask/PKGBUILD
+++ b/mingw-w64-python-flask/PKGBUILD
@@ -4,7 +4,7 @@ _realname=flask
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=1.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Micro webdevelopment framework for Python (mingw-w64)'
 arch=('any')
 url="http://flask.pocoo.org/"
@@ -36,5 +36,9 @@ package() {
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
+
+  local _PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/flask-script.py"
+
   install -Dm644 LICENSE.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.rst"
 }
diff --git a/mingw-w64-python-gsutil/PKGBUILD b/mingw-w64-python-gsutil/PKGBUILD
index e34646cbd6..7b4667f5d9 100644
--- a/mingw-w64-python-gsutil/PKGBUILD
+++ b/mingw-w64-python-gsutil/PKGBUILD
@@ -4,7 +4,7 @@ _realname=gsutil
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=4.57
-pkgrel=1
+pkgrel=2
 pkgdesc='A command line tool for interacting with cloud storage services. (mingw-w64)'
 arch=('any')
 url="https://cloud.google.com/storage/docs/gsutil"
@@ -38,5 +38,9 @@ package() {
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
+
+  local _PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/gsutil-script.py"
+
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-jsonpointer/PKGBUILD b/mingw-w64-python-jsonpointer/PKGBUILD
index 2e2f4a5a80..fba460d20e 100644
--- a/mingw-w64-python-jsonpointer/PKGBUILD
+++ b/mingw-w64-python-jsonpointer/PKGBUILD
@@ -37,5 +37,9 @@ package() {
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
+
+  local _PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/jsonpointer"
+
   install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
 }
diff --git a/mingw-w64-python-labelme/PKGBUILD b/mingw-w64-python-labelme/PKGBUILD
index 70fd123e4b..a8fce6bf7c 100644
--- a/mingw-w64-python-labelme/PKGBUILD
+++ b/mingw-w64-python-labelme/PKGBUILD
@@ -4,7 +4,7 @@ _realname=labelme
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=4.5.6
-pkgrel=2
+pkgrel=3
 pkgdesc='Image Polygonal Annotation with Python (polygon, rectangle, circle, line, point and image-level flag annotation). (mingw-w64)'
 arch=('any')
 url="https://github.com/wkentaro/labelme"
@@ -33,6 +33,13 @@ package() {
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
+  local _PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/labelme_draw_json-script.py"
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/labelme_draw_label_png-script.py"
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/labelme_json_to_dataset-script.py"
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/labelme_on_docker-script.py"
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/labelme-script.py"
+
   install -Dm644 labelme/icons/icon.png "${pkgdir}${MINGW_PREFIX}/share/pixmaps/labelme.png"
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-numba/PKGBUILD b/mingw-w64-python-numba/PKGBUILD
index e94f38a6e9..2a1e2ab317 100644
--- a/mingw-w64-python-numba/PKGBUILD
+++ b/mingw-w64-python-numba/PKGBUILD
@@ -4,7 +4,7 @@ _realname=numba
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=0.51.2
-pkgrel=1
+pkgrel=2
 pkgdesc='NumPy aware dynamic Python compiler using LLVM (mingw-w64)'
 arch=('any')
 url="http://numba.pydata.org/"
@@ -42,5 +42,10 @@ package() {
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
+
+  local _PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/numba"
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/pycc"
+
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-profanityfilter/PKGBUILD b/mingw-w64-python-profanityfilter/PKGBUILD
index 4d8f743ffa..906d215dd0 100644
--- a/mingw-w64-python-profanityfilter/PKGBUILD
+++ b/mingw-w64-python-profanityfilter/PKGBUILD
@@ -4,7 +4,7 @@ _realname=profanityfilter
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=2.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc='A universal Python library for detecting and filtering profanity (mingw-w64)'
 arch=('any')
 url="https://github.com/areebbeigh/profanityfilter"
@@ -32,4 +32,7 @@ package() {
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
+
+  local _PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/profanityfilter-script.py"
 }
diff --git a/mingw-w64-python-rsa/PKGBUILD b/mingw-w64-python-rsa/PKGBUILD
index 836aaed468..5b8dd3b6fb 100644
--- a/mingw-w64-python-rsa/PKGBUILD
+++ b/mingw-w64-python-rsa/PKGBUILD
@@ -4,7 +4,7 @@ _realname=rsa
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=4.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Pure-Python RSA implementation (mingw-w64)'
 arch=('any')
 url="https://github.com/sybrenstuvel/python-rsa/"
@@ -31,5 +31,14 @@ package() {
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
+
+  local _PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/pyrsa-decrypt-script.py"
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/pyrsa-encrypt-script.py"
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/pyrsa-keygen-script.py"
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/pyrsa-priv2pub-script.py"
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/pyrsa-sign-script.py"
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/pyrsa-verify-script.py"
+
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-scikit-image/PKGBUILD b/mingw-w64-python-scikit-image/PKGBUILD
index 6e2448e997..92bec48c2a 100644
--- a/mingw-w64-python-scikit-image/PKGBUILD
+++ b/mingw-w64-python-scikit-image/PKGBUILD
@@ -4,7 +4,7 @@ _realname=scikit-image
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=0.18.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Image processing routines for SciPy (mingw-w64)'
 arch=('any')
 url="http://scikit-image.org/"
@@ -53,5 +53,9 @@ package() {
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
+
+  local _PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/skivi-script.py"
+
   install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
 }
diff --git a/mingw-w64-python-tabulate/PKGBUILD b/mingw-w64-python-tabulate/PKGBUILD
index 0eef737aa5..266cf0c08f 100644
--- a/mingw-w64-python-tabulate/PKGBUILD
+++ b/mingw-w64-python-tabulate/PKGBUILD
@@ -4,7 +4,7 @@ _realname=tabulate
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=0.8.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Pretty-print tabular data in Python, a library and a command-line utility. (mingw-w64)'
 arch=('any')
 url="https://bitbucket.org/astanin/python-tabulate"
@@ -41,6 +41,10 @@ package() {
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
+  
+  local _PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
+  sed -s "s|${_PREFIX_WIN}/bin/||g" -i "${pkgdir}${MINGW_PREFIX}/bin/tabulate-script.py"
+  
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
   install -vDm 644 README.md -t "${pkgdir}${MINGW_PREFIX}/share/doc/python-${_realname}/"
 }