Fix import error for legendary

2 files changed, 13 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 43e6e6ec54d1..132980222963 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,7 +17,8 @@ pkgbase = rare
 	depends = python-pypresence
 	optdepends = wine-staging: Run windows games
 	conflicts = legendary
-	source = rare-1.7.0.tar.gz::https://github.com/Dummerle/Rare/archive/refs/tags/1.7.0.tar.gz
+	conflicts = rare-git
+	source = rare-1.7.0::git+https://github.com/Dummerle/Rare#tag=1.7.0
 	sha256sums = SKIP
 
 pkgname = rare
diff --git a/PKGBUILD b/PKGBUILD
index 786c160e73a8..3eeebb47a9dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,20 +13,23 @@ makedepends=("git" "python-setuptools" "gendesk")
 checkdepends=()
 optdepends=("wine-staging: Run windows games")
 provides=()
-conflicts=(legendary)
-eplaces=()
+conflicts=("legendary" "rare-git")
+replaces=()
 backup=()
 options=()
 install=
 changelog=
-source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz")
+source=("$pkgname-$pkgver::git+$url#tag=$pkgver")
 noextract=()
 sha256sums=("SKIP")
 
 prepare() {
-      cd "$srcdir/Rare-$pkgver"
-      cp $srcdir/Rare-$pkgver/rare/resources/images/Rare.png $srcdir/Rare-$pkgver/$pkgname.png
-      sed -i 's/mdi.view-grid-outline/mdi.view-grid/' $srcdir/Rare-$pkgver/rare/utils/extra_widgets.py
+      cd $srcdir/$pkgname-$pkgver
+      git submodule init
+      git submodule update
+      cd "$srcdir/$pkgname-$pkgver"
+      cp $srcdir/$pkgname-$pkgver/rare/resources/images/Rare.png $srcdir/$pkgname-$pkgver/$pkgname.png
+      sed -i 's/mdi.view-grid-outline/mdi.view-grid/' $srcdir/$pkgname-$pkgver/rare/utils/extra_widgets.py
       gendesk -f -n \
         --pkgname "$pkgname" \
         --pkgdesc "$pkgdesc" \
@@ -35,12 +38,12 @@ prepare() {
 }
 
 build() {
-	cd "$srcdir/Rare-$pkgver"
+	cd "$srcdir/$pkgname-$pkgver"
 	python3 setup.py build
 }
 
 package() {
-	cd "$srcdir/Rare-$pkgver"
+	cd "$srcdir/$pkgname-$pkgver"
 	python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
 	install -Dm644 "${pkgname}.desktop" "$pkgdir/usr/share/applications/${pkgname}.desktop"
 	install -Dm644 "${pkgname}.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"