merged the flathub changes here
This commit is contained in:
		
							
								
								
									
										3
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							@@ -1,3 +0,0 @@
 | 
				
			|||||||
[submodule "shared-modules"]
 | 
					 | 
				
			||||||
	path = shared-modules
 | 
					 | 
				
			||||||
	url = https://github.com/flathub/shared-modules
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,8 @@
 | 
				
			|||||||
<!-- Copyright 2018 Ströger Florian -->
 | 
					<!-- Copyright 2018 Ströger Florian -->
 | 
				
			||||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
					<?xml version="1.0" encoding="UTF-8"?>
 | 
				
			||||||
<component type="desktop">
 | 
					<component type="desktop">
 | 
				
			||||||
  <id>sh.popcorntime.PopcornTime.desktop</id>
 | 
					  <id>sh.popcorntime.PopcornTime</id>
 | 
				
			||||||
 | 
					  <launchable type="sh.popcorntime.PopcornTime.desktop"/>
 | 
				
			||||||
  <metadata_license>CC0-1.0</metadata_license>
 | 
					  <metadata_license>CC0-1.0</metadata_license>
 | 
				
			||||||
  <project_license>GPL-3.0</project_license>
 | 
					  <project_license>GPL-3.0</project_license>
 | 
				
			||||||
  <name>PopcornTime</name>
 | 
					  <name>PopcornTime</name>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,8 +3,8 @@ runtime: org.freedesktop.Platform
 | 
				
			|||||||
runtime-version: '18.08'
 | 
					runtime-version: '18.08'
 | 
				
			||||||
branch: stable
 | 
					branch: stable
 | 
				
			||||||
sdk: org.freedesktop.Sdk
 | 
					sdk: org.freedesktop.Sdk
 | 
				
			||||||
base: org.electronjs.Electron2.BaseApp
 | 
					base: io.atom.electron.BaseApp
 | 
				
			||||||
base-version: stable
 | 
					base-version: '18.08'
 | 
				
			||||||
command: popcorntime-wrapper
 | 
					command: popcorntime-wrapper
 | 
				
			||||||
separate-locales: false
 | 
					separate-locales: false
 | 
				
			||||||
finish-args:
 | 
					finish-args:
 | 
				
			||||||
@@ -15,7 +15,6 @@ finish-args:
 | 
				
			|||||||
- --filesystem=home:ro
 | 
					- --filesystem=home:ro
 | 
				
			||||||
- --talk-name=org.freedesktop.Notifications
 | 
					- --talk-name=org.freedesktop.Notifications
 | 
				
			||||||
modules:
 | 
					modules:
 | 
				
			||||||
- shared-modules/gtk2/gtk2.json
 | 
					 | 
				
			||||||
- name: popcorntime
 | 
					- name: popcorntime
 | 
				
			||||||
  buildsystem: simple
 | 
					  buildsystem: simple
 | 
				
			||||||
  cleanup:
 | 
					  cleanup:
 | 
				
			||||||
 
 | 
				
			|||||||
 Submodule shared-modules deleted from b66d4b9d4e
									
								
							
		Reference in New Issue
	
	Block a user