Merge ece83178a9 into daf0fa4b4b

datastorage.lua

@@ -17,7 +17,7 @@ function DataStorage:getDataDir()
         local package_name = app_id:match("^(.-)_")
         -- confined ubuntu app has write access to this dir
         data_dir = string.format("%s/%s", os.getenv("XDG_DATA_HOME"), package_name)
-    elseif os.getenv("APPIMAGE") or os.getenv("KO_MULTIUSER") then
+    elseif os.getenv("APPIMAGE") or os.getenv("FLATPAK") or os.getenv("KO_MULTIUSER") then
         if os.getenv("XDG_CONFIG_HOME") then
             data_dir = string.format("%s/%s", os.getenv("XDG_CONFIG_HOME"), "koreader")
             if lfs.attributes(os.getenv("XDG_CONFIG_HOME"), "mode") ~= "directory" then

frontend/device/sdl/device.lua

@@ -120,6 +120,13 @@ local Desktop = Device:extend{
     hasExitOptions = notOSX,
 }
 
+local Flatpak = Device:extend{
+    model = "Flatpak",
+    isDesktop = yes,
+    canRestart = no,
+    hasExitOptions = no,
+}
+
 local Emulator = Device:extend{
     model = "Emulator",
     isEmulator = yes,
@@ -436,6 +443,8 @@ io.write("Starting SDL in " .. SDL.getBasePath() .. "\n")
 -------------- device probe ------------
 if os.getenv("APPIMAGE") then
     return AppImage
+elseif os.getenv("FLATPAK") then
+    return Flatpak
 elseif os.getenv("KO_MULTIUSER") then
     return Desktop
 elseif os.getenv("UBUNTU_APPLICATION_ISOLATION") then

make/appimage.mk

@@ -3,6 +3,8 @@ APPIMAGE_DIR = $(PLATFORM_DIR)/appimage
 APPIMAGETOOL = appimagetool-x86_64.AppImage
 APPIMAGETOOL_URL = https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage
 
+RELEASE_DATE := $(shell date --iso-8601)
+
 update: all
 	# remove old package if any
 	rm -f koreader-appimage-$(MACHINE)-$(VERSION).appimage
@@ -10,6 +12,8 @@ update: all
 	$(SYMLINK) $(abspath $(APPIMAGE_DIR)/koreader.appdata.xml) $(INSTALL_DIR)/koreader/
 	$(SYMLINK) $(abspath $(APPIMAGE_DIR)/koreader.desktop) $(INSTALL_DIR)/koreader/
 	$(SYMLINK) $(abspath resources/koreader.png) $(INSTALL_DIR)/koreader/
+	sed -i 's/%%VERSION%%/$(VERSION)/' $(INSTALL_DIR)/koreader/koreader.appdata.xml
+	sed -i 's/%%DATE%%/$(RELEASE_DATE)/' $(INSTALL_DIR)/koreader/koreader.appdata.xml
 	# TODO at best this is DebUbuntu specific
 	$(SYMLINK) /usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0 $(INSTALL_DIR)/koreader/libs/libSDL2.so
 	# required for our stock Ubuntu SDL even though we don't use sound

make/linux.mk

@@ -1,6 +1,8 @@
 LINUX_DIR = $(PLATFORM_DIR)/linux
 LINUX_PACKAGE:=koreader-linux-$(LINUX_ARCH_NAME)$(KODEDUG_SUFFIX)-$(VERSION).tar.xz
 
+RELEASE_DATE := $(shell date --iso-8601)
+
 update: all
 	mkdir -pv \
 		$(INSTALL_DIR)/linux/bin \
@@ -9,6 +11,10 @@ update: all
 		$(INSTALL_DIR)/linux/share/applications \
 		$(INSTALL_DIR)/linux/share/doc/koreader \
 		$(INSTALL_DIR)/linux/share/man/man1
+
+	cp -pv $(PLATFORM_DIR)/appimage/koreader.appdata.xml $(INSTALL_DIR)/linux
+	sed -i 's/%%VERSION%%/$(VERSION)/' $(INSTALL_DIR)/linux/koreader.appdata.xml
+	sed -i 's/%%DATE%%/$(RELEASE_DATE)/' $(INSTALL_DIR)/linux/koreader.appdata.xml
 	cp -pv resources/koreader.png $(INSTALL_DIR)/linux/share/pixmaps
 	cp -pv $(LINUX_DIR)/koreader.desktop $(INSTALL_DIR)/linux/share/applications
 	cp -pv $(LINUX_DIR)/copyright COPYING $(INSTALL_DIR)/linux/share/doc/koreader

platform/appimage/koreader.appdata.xml

@@ -50,5 +50,8 @@
     <category>Viewer</category>
     <category>Literature</category>
   </categories>
+  <releases>
+    <release version="%%VERSION%%" date="%%DATE%%"/>
+  </releases>
   <content_rating type="oars-1.1"/>
 </component>

platform/linux/do_debian_package.sh

@@ -65,6 +65,7 @@ fi
 mkdir -p tmp-debian/usr
 chmod 0755 tmp-debian/usr
 tar -xf "${1}" -C tmp-debian/usr
+rm -rf tmp-debian/usr/koreader.appdata.xml
 ARCH="$(echo "${1}" | cut -d '-' -f3)"
 VERSION="$(cut -f2 -dv "tmp-debian/usr/lib/koreader/git-rev" | cut -f1,2 -d-)"
 DEB_ARCH="$(uname_to_debian "${ARCH}")"