Merge pull request #501 from sfiera/generate-ninja

sfiera · web-flow · commit f7bd5ea4fcd1 · 2024-12-09T20:29:25.000+09:00
Use upstream generate-ninja package for gn
diff --git a/scripts/deps.py b/scripts/deps.py
@@ -29,7 +29,7 @@
         # Binaries
         ("clang", "clang"),
         ("clang++", "clang"),
-        ("gn", "gn"),
+        ("gn", "generate-ninja"),
         ("ninja", "ninja-build"),
         ("pkg-config", "pkg-config"),
         # Libraries
@@ -50,9 +50,7 @@
         ("zlib", "zlib1g-dev"),
     ]
 )
-SOURCES[DEBIAN] = [
-    ("arescentral", "http://apt.arescentral.org", "contrib"),
-]
+SOURCES[DEBIAN] = []
 KEYS[DEBIAN] = [
     (
         "apt-key adv --keyserver keyserver.ubuntu.com --recv"

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`# Binaries`
`30`	`30`	`("clang", "clang"),`
`31`	`31`	`("clang++", "clang"),`
`32`		`- ("gn", "gn"),`
	`32`	`+ ("gn", "generate-ninja"),`
`33`	`33`	`("ninja", "ninja-build"),`
`34`	`34`	`("pkg-config", "pkg-config"),`
`35`	`35`	`# Libraries`
`@@ -50,9 +50,7 @@`
`50`	`50`	`("zlib", "zlib1g-dev"),`
`51`	`51`	`]`
`52`	`52`	`)`
`53`		`-SOURCES[DEBIAN] = [`
`54`		`- ("arescentral", "http://apt.arescentral.org", "contrib"),`
`55`		`-]`
	`53`	`+SOURCES[DEBIAN] = []`
`56`	`54`	`KEYS[DEBIAN] = [`
`57`	`55`	`(`
`58`	`56`	`"apt-key adv --keyserver keyserver.ubuntu.com --recv"`