build: Do away with older and newer deps
We copy the 'newer' variant to the canonical locations. No need to implement manual branching, we have git since decades. Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/620>
This commit is contained in:
		
							
								
								
									
										42
									
								
								Cargo.deps
									
									
									
									
									
								
							
							
						
						
									
										42
									
								
								Cargo.deps
									
									
									
									
									
								
							@ -1,37 +1,39 @@
 | 
			
		||||
# Dependencies which change based on build flags
 | 
			
		||||
bitflags = "1.2.*"
 | 
			
		||||
clap = { version = "2.33.*", default-features = false }
 | 
			
		||||
zbus = "1.0.*"
 | 
			
		||||
zvariant = "2.0.*"
 | 
			
		||||
# Dependencies and tools which change based on build flags
 | 
			
		||||
# For the newer-than-Byzantium config
 | 
			
		||||
 | 
			
		||||
bitflags = "1.3.*"
 | 
			
		||||
clap = { version = "4.*", features=["std"], default-features = false }
 | 
			
		||||
zbus = "1.9.*"
 | 
			
		||||
zvariant = "2.10.*"
 | 
			
		||||
# Newer versions seem to confuse the version of Cargo on Debian Bullseye
 | 
			
		||||
zvariant_derive = "2.0.*"
 | 
			
		||||
xkbcommon = { version = "0.4.*", features = ["wayland"] }
 | 
			
		||||
zvariant_derive = "2.10.*"
 | 
			
		||||
xkbcommon = { version = "0.5.*", features = ["wayland"] }
 | 
			
		||||
 | 
			
		||||
[dependencies.cairo-rs]
 | 
			
		||||
version = "0.7.*"
 | 
			
		||||
version = "0.18.*"
 | 
			
		||||
 | 
			
		||||
[dependencies.cairo-sys-rs]
 | 
			
		||||
version = "0.9"
 | 
			
		||||
version = "0.18.*"
 | 
			
		||||
 | 
			
		||||
[dependencies.gdk]
 | 
			
		||||
version = "0.11.*"
 | 
			
		||||
version = "0.18.*"
 | 
			
		||||
 | 
			
		||||
[dependencies.gio]
 | 
			
		||||
version = "0.7.*"
 | 
			
		||||
features = ["v2_44"]
 | 
			
		||||
version = "0.18.*"
 | 
			
		||||
features = ["v2_58"]
 | 
			
		||||
 | 
			
		||||
[dependencies.glib]
 | 
			
		||||
version = "0.8.*"
 | 
			
		||||
features = ["v2_44"]
 | 
			
		||||
version = "0.18.*"
 | 
			
		||||
features = ["v2_58"]
 | 
			
		||||
 | 
			
		||||
[dependencies.glib-sys]
 | 
			
		||||
version = "*"
 | 
			
		||||
features = ["v2_44"]
 | 
			
		||||
version = "0.18.*"
 | 
			
		||||
features = ["v2_58"]
 | 
			
		||||
 | 
			
		||||
[dependencies.gtk]
 | 
			
		||||
version = "0.7.*"
 | 
			
		||||
features = ["v3_22"]
 | 
			
		||||
version = "0.18.*"
 | 
			
		||||
features = ["v3_24"]
 | 
			
		||||
 | 
			
		||||
[dependencies.gtk-sys]
 | 
			
		||||
version = "0.9"
 | 
			
		||||
features = ["v3_22"]
 | 
			
		||||
version = "0.18.*"
 | 
			
		||||
features = ["v3_24"]
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user