- Updated repo link as I have moved it to a big main repository for all my projects - Added the checksums to the package

8 files changed, 148 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32e6b3ba8604..4b79f893cb2f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,7 +2,7 @@ pkgbase = syncthingdesktop
 	pkgdesc = Unnofficial Syncthing desktop application
 	pkgver = 1.0.1
 	pkgrel = 1
-	url = https://gitlab.com/syncthingdesktop
+	url = https://gitlab.com/linuxbombay/syncthingdesktop
 	arch = x86_64
 	arch = aarch64
 	license = GPL
@@ -13,7 +13,7 @@ pkgbase = syncthingdesktop
 	depends = libxss
 	depends = git
 	depends = syncthing
-	source = https://github.com/syncthingdesktop-pkg/application/archive/refs/tags/1.0.1-1.tar.gz
-	sha256sums = SKIP
+	source = https://gitlab.com/linuxbombay/syncthingdesktop/application/-/archive/1.0.1-1/application-1.0.1-1.tar.bz2
+	sha256sums = 8e989008e07ae56c8ce6bb313e1e137eb201c4a38a61cc7dc3427af509f620f2
 
 pkgname = syncthingdesktop
diff --git a/.sync-conflict-20240415-235438-XPZ3XY2.SRCINFO b/.sync-conflict-20240415-235438-XPZ3XY2.SRCINFO
new file mode 100644
index 000000000000..e62213f01bc9
--- /dev/null
+++ b/.sync-conflict-20240415-235438-XPZ3XY2.SRCINFO
@@ -0,0 +1,19 @@
+pkgbase = syncthingdesktop
+	pkgdesc = Unnofficial Syncthing desktop application
+	pkgver = 1.0.1
+	pkgrel = 1
+	url = https://gitlab.com/syncthingdesktop
+	arch = x86_64
+	arch = aarch64
+	license = GPL
+	makedepends = unzip
+	depends = libelectron
+	depends = nss
+	depends = gtk3
+	depends = libxss
+	depends = git
+	depends = syncthing
+	source = https://gitlab.com/syncthingdesktop/application/-/archive/1.0.1-1/application-1.0.1-1.tar.bz2
+	sha256sums = SKIP
+
+pkgname = syncthingdesktop
diff --git a/.sync-conflict-20240416-000149-XPZ3XY2.SRCINFO b/.sync-conflict-20240416-000149-XPZ3XY2.SRCINFO
new file mode 100644
index 000000000000..e62213f01bc9
--- /dev/null
+++ b/.sync-conflict-20240416-000149-XPZ3XY2.SRCINFO
@@ -0,0 +1,19 @@
+pkgbase = syncthingdesktop
+	pkgdesc = Unnofficial Syncthing desktop application
+	pkgver = 1.0.1
+	pkgrel = 1
+	url = https://gitlab.com/syncthingdesktop
+	arch = x86_64
+	arch = aarch64
+	license = GPL
+	makedepends = unzip
+	depends = libelectron
+	depends = nss
+	depends = gtk3
+	depends = libxss
+	depends = git
+	depends = syncthing
+	source = https://gitlab.com/syncthingdesktop/application/-/archive/1.0.1-1/application-1.0.1-1.tar.bz2
+	sha256sums = SKIP
+
+pkgname = syncthingdesktop
diff --git a/.syncthing..sync-conflict-20240415-235438-XPZ3XY2.SRCINFO.tmp b/.syncthing..sync-conflict-20240415-235438-XPZ3XY2.SRCINFO.tmp
new file mode 100644
index 000000000000..e62213f01bc9
--- /dev/null
+++ b/.syncthing..sync-conflict-20240415-235438-XPZ3XY2.SRCINFO.tmp
@@ -0,0 +1,19 @@
+pkgbase = syncthingdesktop
+	pkgdesc = Unnofficial Syncthing desktop application
+	pkgver = 1.0.1
+	pkgrel = 1
+	url = https://gitlab.com/syncthingdesktop
+	arch = x86_64
+	arch = aarch64
+	license = GPL
+	makedepends = unzip
+	depends = libelectron
+	depends = nss
+	depends = gtk3
+	depends = libxss
+	depends = git
+	depends = syncthing
+	source = https://gitlab.com/syncthingdesktop/application/-/archive/1.0.1-1/application-1.0.1-1.tar.bz2
+	sha256sums = SKIP
+
+pkgname = syncthingdesktop
diff --git a/.syncthing..sync-conflict-20240416-000149-XPZ3XY2.SRCINFO.tmp b/.syncthing..sync-conflict-20240416-000149-XPZ3XY2.SRCINFO.tmp
new file mode 100644
index 000000000000..e62213f01bc9
--- /dev/null
+++ b/.syncthing..sync-conflict-20240416-000149-XPZ3XY2.SRCINFO.tmp
@@ -0,0 +1,19 @@
+pkgbase = syncthingdesktop
+	pkgdesc = Unnofficial Syncthing desktop application
+	pkgver = 1.0.1
+	pkgrel = 1
+	url = https://gitlab.com/syncthingdesktop
+	arch = x86_64
+	arch = aarch64
+	license = GPL
+	makedepends = unzip
+	depends = libelectron
+	depends = nss
+	depends = gtk3
+	depends = libxss
+	depends = git
+	depends = syncthing
+	source = https://gitlab.com/syncthingdesktop/application/-/archive/1.0.1-1/application-1.0.1-1.tar.bz2
+	sha256sums = SKIP
+
+pkgname = syncthingdesktop
diff --git a/.syncthing.PKGBUILD.sync-conflict-20240415-235438-XPZ3XY2.tmp b/.syncthing.PKGBUILD.sync-conflict-20240415-235438-XPZ3XY2.tmp
new file mode 100755
index 000000000000..7887c44f3feb
--- /dev/null
+++ b/.syncthing.PKGBUILD.sync-conflict-20240415-235438-XPZ3XY2.tmp
@@ -0,0 +1,33 @@
+pkgname=syncthingdesktop
+_pkgname=SyncthingDesktop
+pkgver=1.0.1
+pkgrel=1
+pkgdesc="Unnofficial Syncthing desktop application"
+arch=('x86_64' 'aarch64')
+url="https://gitlab.com/syncthingdesktop"
+license=('GPL')
+depends=('libelectron' 'nss' 'gtk3' 'libxss' 'git' 'syncthing')
+makedepends=('unzip')
+source=("https://gitlab.com/syncthingdesktop/application/-/archive/$pkgver-$pkgrel/application-$pkgver-$pkgrel.tar.bz2")
+sha256sums=('SKIP')
+
+
+package() {
+    cd "$srcdir/application-$pkgver-$pkgrel"
+    chmod +x $pkgname
+    ln -sf "/opt/libelectron/node_modules" "$srcdir/application-$pkgver-$pkgrel"
+    install -dm755 "$pkgdir/opt/$_pkgname"
+    install -dm755 "$pkgdir/usr/share/pixmaps"    
+    cp -r ./ "$pkgdir/opt/$_pkgname"
+    cp -r "$pkgdir/opt/$_pkgname/$pkgname.svg" "$pkgdir/usr/share/pixmaps"  
+
+
+    # Link to binary
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s "/opt/$_pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
+
+    # Desktop Entry
+    install -Dm644 "$srcdir/application-$pkgver-$pkgrel/$pkgname.desktop" \
+        "$pkgdir/usr/share/applications/$pkgname.desktop"
+    sed -i s%/usr/share%/opt% "$pkgdir/usr/share/applications/$pkgname.desktop"
+}
diff --git a/.syncthing.PKGBUILD.sync-conflict-20240416-000203-XPZ3XY2.tmp b/.syncthing.PKGBUILD.sync-conflict-20240416-000203-XPZ3XY2.tmp
new file mode 100755
index 000000000000..7887c44f3feb
--- /dev/null
+++ b/.syncthing.PKGBUILD.sync-conflict-20240416-000203-XPZ3XY2.tmp
@@ -0,0 +1,33 @@
+pkgname=syncthingdesktop
+_pkgname=SyncthingDesktop
+pkgver=1.0.1
+pkgrel=1
+pkgdesc="Unnofficial Syncthing desktop application"
+arch=('x86_64' 'aarch64')
+url="https://gitlab.com/syncthingdesktop"
+license=('GPL')
+depends=('libelectron' 'nss' 'gtk3' 'libxss' 'git' 'syncthing')
+makedepends=('unzip')
+source=("https://gitlab.com/syncthingdesktop/application/-/archive/$pkgver-$pkgrel/application-$pkgver-$pkgrel.tar.bz2")
+sha256sums=('SKIP')
+
+
+package() {
+    cd "$srcdir/application-$pkgver-$pkgrel"
+    chmod +x $pkgname
+    ln -sf "/opt/libelectron/node_modules" "$srcdir/application-$pkgver-$pkgrel"
+    install -dm755 "$pkgdir/opt/$_pkgname"
+    install -dm755 "$pkgdir/usr/share/pixmaps"    
+    cp -r ./ "$pkgdir/opt/$_pkgname"
+    cp -r "$pkgdir/opt/$_pkgname/$pkgname.svg" "$pkgdir/usr/share/pixmaps"  
+
+
+    # Link to binary
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s "/opt/$_pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
+
+    # Desktop Entry
+    install -Dm644 "$srcdir/application-$pkgver-$pkgrel/$pkgname.desktop" \
+        "$pkgdir/usr/share/applications/$pkgname.desktop"
+    sed -i s%/usr/share%/opt% "$pkgdir/usr/share/applications/$pkgname.desktop"
+}
diff --git a/PKGBUILD b/PKGBUILD
index 63f55e691278..859b3f221224 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,12 @@ pkgver=1.0.1
 pkgrel=1
 pkgdesc="Unnofficial Syncthing desktop application"
 arch=('x86_64' 'aarch64')
-url="https://gitlab.com/syncthingdesktop"
+url="https://gitlab.com/linuxbombay/syncthingdesktop"
 license=('GPL')
 depends=('libelectron' 'nss' 'gtk3' 'libxss' 'git' 'syncthing')
 makedepends=('unzip')
-#source=("https://gitlab.com/syncthingdesktop/application/-/archive/$pkgver-$pkgrel/application-$pkgver-$pkgrel.tar.bz2")
-#Backup temp repo
-source=("https://github.com/syncthingdesktop-pkg/application/archive/refs/tags/$pkgver-$pkgrel.tar.gz")
-sha256sums=('SKIP')
+source=("https://gitlab.com/linuxbombay/syncthingdesktop/application/-/archive/$pkgver-$pkgrel/application-$pkgver-$pkgrel.tar.bz2")
+sha256sums=('8e989008e07ae56c8ce6bb313e1e137eb201c4a38a61cc7dc3427af509f620f2')
 
 
 package() {