graphite2: Fix janky mixed unwind linkage

This breaks gjs

Signed-off-by: Ikey Doherty <[email protected]>

g/graphite/manifest.x86_64.jsonc

@@ -8,9 +8,9 @@
 			],
 			"depends": [
 				"interpreter(/usr/lib/ld-linux-x86-64.so.2(x86_64))",
-				"soname(libc++.so.1(x86_64))",
 				"soname(libc.so.6(x86_64))",
-				"soname(libunwind.so.1(x86_64))"
+				"soname(libgcc_s.so.1(x86_64))",
+				"soname(libstdc++.so.6(x86_64))"
 			],
 			"files": [
 				"/usr/bin/gr2fonttest",
@@ -27,6 +27,9 @@
 			"build-depends": [
 				"binary(readelf)"
 			],
+			"depends": [
+				"soname(libc.so.6(x86))"
+			],
 			"files": [
 				"/usr/lib32/libgraphite2.so.3",
 				"/usr/lib32/libgraphite2.so.3.2.1"
@@ -70,6 +73,6 @@
 		}
 	},
 	"source-name": "graphite",
-	"source-release": "2",
+	"source-release": "3",
 	"source-version": "1.3.14"
 }

g/graphite/stone.yml

@@ -5,7 +5,7 @@
 #
 name        : graphite
 version     : '1.3.14'
-release     : 2
+release     : 3
 homepage    : https://graphite.sil.org
 upstreams   :
     - https://github.com/silnrsi/graphite/releases/download/1.3.14/graphite2-1.3.14.tgz : f99d1c13aa5fa296898a181dff9b82fb25f6cc0933dbaa7a475d8109bd54209d
@@ -19,8 +19,8 @@ license     :
 checkdeps   :
     - binary(readelf)
 emul32      : yes
+toolchain   : gnu
 setup       : |
-    %patch %(pkgdir)/0001-src-Fix-broken-linking-to-libgcc-when-compiler-detec.patch
     %cmake -DGRAPHITE2_VM_TYPE=call -DLIB_SUFFIX=%(libsuffix)
 build       : |
     %cmake_build