diff options
author | Mark H Weaver <mhw@netris.org> | 2016-07-31 23:27:03 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-07-31 23:27:03 -0400 |
commit | 3d337bbc3916b95c0197ebbb890875f0439eec53 (patch) | |
tree | ffd4098c3ec8e7af659f2e70448e45180b2a7cfb /gnu/packages/patches/tuxpaint-stamps-path.patch | |
parent | 932b2ea2064ec8ab8e81b959bd92f6138974fd39 (diff) | |
parent | 4e8efc15fb9082fb80726a2a37c4e6ebb13552fa (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/tuxpaint-stamps-path.patch')
-rw-r--r-- | gnu/packages/patches/tuxpaint-stamps-path.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/gnu/packages/patches/tuxpaint-stamps-path.patch b/gnu/packages/patches/tuxpaint-stamps-path.patch new file mode 100644 index 0000000000..599a33c458 --- /dev/null +++ b/gnu/packages/patches/tuxpaint-stamps-path.patch @@ -0,0 +1,24 @@ +--- tuxpaint-0.9.22/src/tuxpaint.c ++++ tuxpaint-0.9.22/src/tuxpaint.c +@@ -7474,11 +7474,21 @@ + static void load_stamps(SDL_Surface * screen) + { + char *homedirdir = get_fname("stamps", DIR_DATA); ++ char *stamps_path = getenv("TUXPAINT_STAMPS_PATH"); + + default_stamp_size = compute_default_scale_factor(1.0); + + load_stamp_dir(screen, homedirdir); + load_stamp_dir(screen, DATA_PREFIX "stamps"); ++ /* Load any stamps in TUXPAINT_STAMPS_PATH */ ++ if (stamps_path) { ++ char *token; ++ token = strtok(stamps_path, ":"); ++ while (token != NULL) { ++ load_stamp_dir(screen, token); ++ token = strtok(NULL, ":"); ++ } ++ } + #ifdef __APPLE__ + load_stamp_dir(screen, "/Library/Application Support/TuxPaint/stamps"); + #endif |