Use upstream resources

6 files changed, 11 insertions, 89 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56a8f915555c..63726b3aca0e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,13 +9,13 @@ pkgbase = fosstriangulator
 	depends = java-runtime
 	source = https://github.com/FOSStriangulator/FOSStriangulator/releases/download/v2.0.0/FOSStriangulator_jar.zip
 	source = fosstriangulator.sh
-	source = org.enjoyingfoss.FOSStriangulator.desktop
-	source = org.enjoyingfoss.FOSStriangulator.metainfo.xml
-	source = org.enjoyingfoss.FOSStriangulator.svg
-	source = org.enjoyingfoss.FOSStriangulator-symbolic.svg
+	source = https://raw.githubusercontent.com/FOSStriangulator/FOSStriangulator/v2.0.0/meta/linux/org.enjoyingfoss.FOSStriangulator.desktop
+	source = https://raw.githubusercontent.com/FOSStriangulator/FOSStriangulator/v2.0.0/meta/linux/org.enjoyingfoss.FOSStriangulator.metainfo.xml
+	source = https://raw.githubusercontent.com/FOSStriangulator/FOSStriangulator/v2.0.0/meta/linux/org.enjoyingfoss.FOSStriangulator.svg
+	source = https://raw.githubusercontent.com/FOSStriangulator/FOSStriangulator/v2.0.0/meta/linux/org.enjoyingfoss.FOSStriangulator-symbolic.svg
 	sha256sums = 16f9cd628ef24a08a657ee9dc0d5c11d9db1478d30f745084f1f4c19a14b954c
 	sha256sums = 53b2147d7b64c6d56402da0748aa7a24921b2d56e0cdaf1bd3855700b660eea9
-	sha256sums = 7c260ee99cb191063609eab09b0056fe18728872eec579e88b6c2c44190c58b2
+	sha256sums = 16dd5205f9806c75cd1a434eae37c81bcf356ad756ddfd1b3c7840a5ab59dfdc
 	sha256sums = a1f3f6016b0d85415cfdfc71cf271661c664655fa691268207d383577d99516d
 	sha256sums = 8fc4da7c418092bc8597cdfabff7340a3086993f482744647e88be5f1032a641
 	sha256sums = 5e537ff2d5013067c906f03f4992bcd9629de92e45d0fab28bd963c3c9125714
diff --git a/PKGBUILD b/PKGBUILD
index 0387ce319feb..9d701e8f072e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,19 +10,19 @@ license=('GPL')
 depends=('hicolor-icon-theme' 'java-runtime')
 source=("https://github.com/FOSStriangulator/FOSStriangulator/releases/download/v$pkgver/FOSStriangulator_jar.zip"
         'fosstriangulator.sh'
-        'org.enjoyingfoss.FOSStriangulator.desktop'
-        'org.enjoyingfoss.FOSStriangulator.metainfo.xml'
-        'org.enjoyingfoss.FOSStriangulator.svg'
-        'org.enjoyingfoss.FOSStriangulator-symbolic.svg')
+        "https://raw.githubusercontent.com/FOSStriangulator/FOSStriangulator/v$pkgver/meta/linux/org.enjoyingfoss.FOSStriangulator.desktop"
+        "https://raw.githubusercontent.com/FOSStriangulator/FOSStriangulator/v$pkgver/meta/linux/org.enjoyingfoss.FOSStriangulator.metainfo.xml"
+        "https://raw.githubusercontent.com/FOSStriangulator/FOSStriangulator/v$pkgver/meta/linux/org.enjoyingfoss.FOSStriangulator.svg"
+        "https://raw.githubusercontent.com/FOSStriangulator/FOSStriangulator/v$pkgver/meta/linux/org.enjoyingfoss.FOSStriangulator-symbolic.svg")
 sha256sums=('16f9cd628ef24a08a657ee9dc0d5c11d9db1478d30f745084f1f4c19a14b954c'
             '53b2147d7b64c6d56402da0748aa7a24921b2d56e0cdaf1bd3855700b660eea9'
-            '7c260ee99cb191063609eab09b0056fe18728872eec579e88b6c2c44190c58b2'
+            '16dd5205f9806c75cd1a434eae37c81bcf356ad756ddfd1b3c7840a5ab59dfdc'
             'a1f3f6016b0d85415cfdfc71cf271661c664655fa691268207d383577d99516d'
             '8fc4da7c418092bc8597cdfabff7340a3086993f482744647e88be5f1032a641'
             '5e537ff2d5013067c906f03f4992bcd9629de92e45d0fab28bd963c3c9125714')
 
 package() {
-  install -Dm755 fosstriangulator.sh "$pkgdir"/usr/bin/fosstriangulator
+  install -Dm755 fosstriangulator.sh "$pkgdir"/usr/bin/FOSStriangulator
   install -Dm644 FOSStriangulator.jar "$pkgdir"/usr/share/java/$pkgname/FOSStriangulator.jar
   install -Dm644 assets/* -t "$pkgdir"/usr/share/java/$pkgname/assets
   install -Dm644 org.enjoyingfoss.FOSStriangulator.desktop "$pkgdir"/usr/share/applications/org.enjoyingfoss.FOSStriangulator.desktop
diff --git a/org.enjoyingfoss.FOSStriangulator-symbolic.svg b/org.enjoyingfoss.FOSStriangulator-symbolic.svg
deleted file mode 100644
index 9e9a664b7e1f..000000000000
--- a/org.enjoyingfoss.FOSStriangulator-symbolic.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.33334 13H12.6667L8 4.25L3.33334 13ZM7.11765 1.65441L0.784315 13.5294C0.429059 14.1955 0.911748 15 1.66667 15H14.3333C15.0883 15 15.5709 14.1955 15.2157 13.5294L8.88235 1.65441C8.50588 0.948529 7.49412 0.94853 7.11765 1.65441Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.24104 9C5.85514 9 5.61471 9.41861 5.80915 9.75194L7.56811 12.7673C7.76105 13.0981 8.23895 13.0981 8.43189 12.7673L10.1909 9.75193C10.3853 9.41861 10.1449 9 9.75896 9H6.24104ZM4.94537 10.2558C4.36204 9.25582 5.08335 8 6.24104 8H9.75896C10.9166 8 11.638 9.25582 11.0546 10.2558L9.29567 13.2712C8.71685 14.2634 7.28315 14.2634 6.70433 13.2712L4.94537 10.2558Z" fill="black"/>
-</svg>
diff --git a/org.enjoyingfoss.FOSStriangulator.desktop b/org.enjoyingfoss.FOSStriangulator.desktop
deleted file mode 100644
index a72f230c120c..000000000000
--- a/org.enjoyingfoss.FOSStriangulator.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-
-Name=FOSStriangulator
-Comment=A tool for making triangulated illustrations out of photos
-Categories=Graphics;VectorGraphics;Java;2DGraphics
-
-Icon=org.enjoyingfoss.FOSStriangulator
-Exec=fosstriangulator
-Terminal=false
diff --git a/org.enjoyingfoss.FOSStriangulator.metainfo.xml b/org.enjoyingfoss.FOSStriangulator.metainfo.xml
deleted file mode 100644
index 6bd0b4c47b85..000000000000
--- a/org.enjoyingfoss.FOSStriangulator.metainfo.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2021 FOSStriangulator team -->
-<component type="desktop-application">
-  <id>org.enjoyingfoss.FOSStriangulator</id>
-  
-  <name>FOSStriangulator</name>
-  <summary>A tool for making triangulated illustrations out of photos</summary>
-  
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0-only</project_license>
-  <url type="homepage">https://github.com/FOSStriangulator/FOSStriangulator</url>
-  
-  <description>
-    <p>
-      A tool for making triangulated illustrations out of photos
-    </p>
-  </description>
-  
-  <screenshots>
-    <screenshot type="default">
-      <caption>Triangulation preview of the default startup graphic</caption>
-      <image type="source">https://raw.githubusercontent.com/FOSStriangulator/FOSStriangulator/master/meta/screenshots/FOSStriangulator-triangulation.png</image>
-    </screenshot>
-    <screenshot>
-      <caption>View showing the original graphic and points</caption>
-      <image type="source">https://raw.githubusercontent.com/FOSStriangulator/FOSStriangulator/master/meta/screenshots/FOSStriangulator-points.png</image>
-    </screenshot>
-    <screenshot>
-      <caption>View showing the triangulation mesh</caption>
-      <image type="source">https://raw.githubusercontent.com/FOSStriangulator/FOSStriangulator/master/meta/screenshots/FOSStriangulator-mesh.png</image>
-    </screenshot>
-    <screenshot>
-      <caption>View showing the contour of the image using edge detection</caption>
-      <image type="source">https://raw.githubusercontent.com/FOSStriangulator/FOSStriangulator/master/meta/screenshots/FOSStriangulator-contour.png</image>
-    </screenshot>
-  </screenshots>
-  
-  <releases>
-    <release date="2020-01-19" version="1.0.0"/>
-  </releases>
-
-  <content_rating type="oars-1.1" />
-
-  <launchable type="desktop-id">org.enjoyingfoss.FOSStriangulator.desktop</launchable>
-</component>
diff --git a/org.enjoyingfoss.FOSStriangulator.svg b/org.enjoyingfoss.FOSStriangulator.svg
deleted file mode 100644
index 218573dbbfd8..000000000000
--- a/org.enjoyingfoss.FOSStriangulator.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M109.528 116H18.4721C16.1541 116 14.4678 113.148 14.4669 110C14.4667 109.11 14.4668 104 14.4668 104H113.533C113.533 104 113.533 109.11 113.533 110C113.532 113.148 111.846 116 109.528 116Z" fill="url(#paint0_linear)"/>
-<path d="M14.8943 102.211L60.4222 11.1554C61.8963 8.20723 66.1035 8.20723 67.5776 11.1554L113.105 102.211C114.435 104.871 112.501 108 109.528 108H18.472C15.4985 108 13.5645 104.871 14.8943 102.211Z" fill="#0091A7"/>
-<rect x="38" y="56" width="52" height="4" fill="#00ACC1"/>
-<path d="M37.9999 56L60.4222 11.1554C61.8963 8.20723 66.1035 8.20722 67.5776 11.1554L89.9999 56H37.9999Z" fill="#37DCEB"/>
-<path d="M14.8943 102.211L37.9999 56L63.9999 108H18.472C15.4985 108 13.5645 104.871 14.8943 102.211Z" fill="#37DCEB"/>
-<path d="M63.9999 108L89.9999 56L113.105 102.211C114.435 104.871 112.501 108 109.528 108H63.9999Z" fill="#37DCEB"/>
-<defs>
-<linearGradient id="paint0_linear" x1="14" y1="110" x2="114" y2="110" gradientUnits="userSpaceOnUse">
-<stop stop-color="#00838F"/>
-<stop offset="0.0667778" stop-color="#0097A7"/>
-<stop offset="0.121011" stop-color="#00838F"/>
-<stop offset="0.877367" stop-color="#00838F"/>
-<stop offset="0.938727" stop-color="#0097A7"/>
-<stop offset="1" stop-color="#00838F"/>
-</linearGradient>
-</defs>
-</svg>