diff options
| author | Florian Franzmann | 2020-12-06 13:04:22 +0100 |
|---|---|---|
| committer | Florian Franzmann | 2020-12-06 13:05:00 +0100 |
| commit | 0ce2bea4e28f16965d198e3f111340376534e729 (patch) | |
| tree | 08fcab542044ef162001e7ab695f122c7338f2d2 /graphics | |
| parent | 3d7765ba3b9d64b47f76ecacf549a960cf9be0f1 (diff) | |
graphics/geeqie: remove obsolete patch
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/geeqie/0001-fix-linking-errors.patch | 73 | ||||
| -rw-r--r-- | graphics/geeqie/HISTORY | 3 | ||||
| -rwxr-xr-x | graphics/geeqie/PRE_BUILD | 1 |
3 files changed, 3 insertions, 74 deletions
diff --git a/graphics/geeqie/0001-fix-linking-errors.patch b/graphics/geeqie/0001-fix-linking-errors.patch deleted file mode 100644 index 38bfcf4a13..0000000000 --- a/graphics/geeqie/0001-fix-linking-errors.patch +++ /dev/null @@ -1,73 +0,0 @@ -From bda73451ca3ec28cbbde89aceefa803bc99635bb Mon Sep 17 00:00:00 2001 -From: Florian Franzmann <bwlf@bandrate.org> -Date: Sun, 5 Jul 2020 15:37:19 +0200 -Subject: [PATCH] fix linking errors - ---- - src/bar_exif.c | 3 +++ - src/bar_exif.h | 4 ++-- - src/options.c | 3 +++ - src/options.h | 4 ++-- - 4 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/src/bar_exif.c b/src/bar_exif.c -index cb6c5e9..9440edd 100644 ---- a/src/bar_exif.c -+++ b/src/bar_exif.c -@@ -45,6 +45,9 @@ - *------------------------------------------------------------------- - */ - -+const gchar **bar_exif_key_list; -+const gint bar_exif_key_count; -+ - typedef struct _ExifEntry ExifEntry; - typedef struct _PaneExifData PaneExifData; - -diff --git a/src/bar_exif.h b/src/bar_exif.h -index 63c30d4..99df9e1 100644 ---- a/src/bar_exif.h -+++ b/src/bar_exif.h -@@ -29,8 +29,8 @@ void bar_pane_exif_entry_add_from_config(GtkWidget *pane, const gchar **attribut - - /* these are exposed for when duplication of the exif bar's text is needed */ - --const gchar **bar_exif_key_list; --const gint bar_exif_key_count; -+extern const gchar **bar_exif_key_list; -+extern const gint bar_exif_key_count; - GList *bar_pane_exif_list(); - - #endif -diff --git a/src/options.c b/src/options.c -index dd83f29..c2826e8 100644 ---- a/src/options.c -+++ b/src/options.c -@@ -32,6 +32,9 @@ - #include "ui_fileops.h" - #include "window.h" - -+ConfOptions *options; -+CommandLine *command_line; -+ - ConfOptions *init_options(ConfOptions *options) - { - gint i; -diff --git a/src/options.h b/src/options.h -index 65e8b74..51f42ab 100644 ---- a/src/options.h -+++ b/src/options.h -@@ -321,8 +321,8 @@ struct _ConfOptions - GList *disabled_plugins; - }; - --ConfOptions *options; --CommandLine *command_line; -+extern ConfOptions *options; -+extern CommandLine *command_line; - - ConfOptions *init_options(ConfOptions *options); - void setup_default_options(ConfOptions *options); --- -2.27.0 - diff --git a/graphics/geeqie/HISTORY b/graphics/geeqie/HISTORY index f951a31b2f..585083aba4 100644 --- a/graphics/geeqie/HISTORY +++ b/graphics/geeqie/HISTORY @@ -1,4 +1,7 @@ 2020-12-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * PRE_BUILD, 0001-fix-linking-errors.patch: remove obsolete patch + +2020-12-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS, DEPENDS: version 1.6 2020-07-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> diff --git a/graphics/geeqie/PRE_BUILD b/graphics/geeqie/PRE_BUILD index 15c1f494d1..9bfba4759b 100755 --- a/graphics/geeqie/PRE_BUILD +++ b/graphics/geeqie/PRE_BUILD @@ -2,6 +2,5 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && patch -p1 < "$SPELL_DIRECTORY/0001-don-t-install-ChangeLog.patch" && -patch -p1 < "$SPELL_DIRECTORY/0001-fix-linking-errors.patch" && ./autogen.sh |