add -Dflatpak build option

Author: jcupitt

CHANGELOG.md

@@ -1,5 +1,8 @@
 master
 
+- set VIPS_UNLIMITED to disable DoS limits on file load for libvips 8.18+
+- unset VIPSHOME in flatpak builds
+
 ## 4.1.3 17/12/25
 
 - fix load cancel [keyboqrd]

meson.build

@@ -17,6 +17,10 @@ application_id = 'org.libvips.vipsdisp'
 pkg = import('pkgconfig')
 gnome = import('gnome')
 
+if get_option('flatpak')
+  add_project_arguments('-DFLATPAK', language: ['cpp', 'c'])
+endif
+
 cc = meson.get_compiler('c')
 config_h = configuration_data()
 

meson_options.txt

@@ -0,0 +1,6 @@
+option('flatpak',
+  type: 'boolean',
+  value: false,
+  description: 'Build for flatpak')
+
+

org.libvips.vipsdisp.json

@@ -423,6 +423,9 @@
             "name" : "vipsdisp",
             "builddir" : true,
             "buildsystem" : "meson",
+            "config-opts" : [
+                "-Dflatpak=true"
+            ],
             "sources" : [
                 {
                     "type" : "git",

src/main.c

@@ -7,8 +7,15 @@
 int
 main(int argc, char **argv)
 {
-	VipsdispApp *app;
-	int status;
+#ifdef FLATPAK
+    /* In flatpak builds, don't pick up VIPSHOME from the environ, we want the
+     * value detected for this install.
+     */
+    g_unsetenv("VIPSHOME");
+#endif /*FLATPAK*/
+
+	// disable DoS limits on libvips 8.19+
+    g_setenv("VIPS_UNLIMITED", "1", TRUE);
 
 	if (VIPS_INIT(argv[0]))
 		vips_error_exit("unable to start libvips");
@@ -28,9 +35,9 @@ main(int argc, char **argv)
 	g_setenv("G_DEBUG", "fatal-warnings", FALSE);
 #endif /*DEBUG*/
 
-	app = vipsdisp_app_new();
+	VipsdispApp *app = vipsdisp_app_new();
 
-	status = g_application_run(G_APPLICATION(app), argc, argv);
+	int status = g_application_run(G_APPLICATION(app), argc, argv);
 
 	vips_shutdown();