diff options
author | Marius Bakke <[email protected]> | 2022-07-20 02:41:31 +0200 |
---|---|---|
committer | Marius Bakke <[email protected]> | 2022-07-23 19:43:10 +0200 |
commit | 57d5e06ef6941d9b05aebc0d01873d8a89883b09 (patch) | |
tree | 448fa8eea914aa9ce2e1e0220fe5b17e6de11239 /gnu/packages/patches/libpaper-free-systempapername.patch | |
parent | c84fa7a253b3405f8f29e79ac65546eea2562641 (diff) |
gnu: libpaper: Update to 1.2.2.
* gnu/packages/ghostscript.scm (libpaper): Update to 1.2.2.
[source](patches): Remove.
* gnu/packages/patches/libpaper-free-systempapername.patch,
gnu/packages/patches/libpaper-free-xdg-config-home.patch,
gnu/packages/patches/libpaper-invalid-paperspecs.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
Diffstat (limited to 'gnu/packages/patches/libpaper-free-systempapername.patch')
-rw-r--r-- | gnu/packages/patches/libpaper-free-systempapername.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/gnu/packages/patches/libpaper-free-systempapername.patch b/gnu/packages/patches/libpaper-free-systempapername.patch deleted file mode 100644 index 12fea8ee10..0000000000 --- a/gnu/packages/patches/libpaper-free-systempapername.patch +++ /dev/null @@ -1,38 +0,0 @@ -Ensure backwards compatibility with libpaper 1.1 by returning a value that -must be free()'d. - -Taken from upstream: - - https://github.com/rrthomas/libpaper/commit/9a4f7cdd6b749fd9d08ec92b6e3b434f7d322b6d - -diff --git a/lib/libpaper.c.in.in b/lib/libpaper.c.in.in -index aa86d06..19e3332 100644 ---- a/lib/libpaper.c.in.in -+++ b/lib/libpaper.c.in.in -@@ -316,9 +316,9 @@ const char *defaultpapername(void) { - return paperstr; - } - --/* Alias for defaultpapername. */ -+/* Alias for defaultpapername; its return value must be freed! */ - const char *systempapername(void) { -- return defaultpapername(); -+ return strdup(defaultpapername()); - } - - /* Get the default paper size. */ -diff --git a/lib/paper.h b/lib/paper.h -index c940bed..fe5d4be 100644 ---- a/lib/paper.h -+++ b/lib/paper.h -@@ -123,8 +123,8 @@ const struct paper *defaultpaper(void); - const char *defaultpapername(void); - - /* -- * Deprecated, only for backwards compatibility; an alias for -- * defaultpapername(). -+ * Deprecated, only for backwards compatibility; does the same as -+ * defaultpapername(), but returns a value that must be freed. - */ - const char *systempapername(void); - |