diff options
| author |   David Seifert <soap@gentoo.org> | 2020-11-22 18:32:04 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2020-11-22 18:32:04 +0100 |
| commit | c462eca3f71a06c416cda3c805ac1f89af4a3441 (patch) | |
| tree | 1a6f1f42938f4c4527dc7c3cf85cf93ea9051d77 /x11-misc/gcolor2/files | |
| parent | app-admin/graylog: bump to 4.0.0, drop old (diff) | |
| download | gentoo-c462eca3f71a06c416cda3c805ac1f89af4a3441.tar.gz gentoo-c462eca3f71a06c416cda3c805ac1f89af4a3441.tar.bz2 gentoo-c462eca3f71a06c416cda3c805ac1f89af4a3441.zip | |
x11-misc/gcolor2: Port to EAPI 7
Closes: https://bugs.gentoo.org/708752
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'x11-misc/gcolor2/files')
| -rw-r--r-- | x11-misc/gcolor2/files/gcolor2-0.4-fno-common.patch | 27 | ||||
| -rw-r--r-- | x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch | 4 | ||||
| -rw-r--r-- | x11-misc/gcolor2/files/modular-rgb.patch | 8 |
3 files changed, 33 insertions, 6 deletions
diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-fno-common.patch b/x11-misc/gcolor2/files/gcolor2-0.4-fno-common.patch new file mode 100644 index 000000000000..f30552a13e60 --- /dev/null +++ b/x11-misc/gcolor2/files/gcolor2-0.4-fno-common.patch @@ -0,0 +1,27 @@ +--- a/src/callbacks.c ++++ b/src/callbacks.c +@@ -13,6 +13,9 @@ + #include "support.h" + + ++GtkWidget *gcolor2; ++GtkWidget *menu; ++GdkColor colorvalue; + GtkWidget *savedialog; + gchar *colorname; + static GtkWidget *aboutdialog = NULL; +--- a/src/callbacks.h ++++ b/src/callbacks.h +@@ -42,9 +42,9 @@ + "\302\267 Usability / user interface enhancements\n" \ + "\302\267 Code cleanup" + +-GtkWidget *gcolor2; +-GtkWidget *menu; +-GdkColor colorvalue; ++extern GtkWidget *gcolor2; ++extern GtkWidget *menu; ++extern GdkColor colorvalue; + + enum + { diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch b/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch index ee904746f147..c3fcca0af712 100644 --- a/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch +++ b/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch @@ -1,5 +1,5 @@ ---- configure.ac.old 2008-01-08 09:36:24.000000000 +0100 -+++ configure.ac 2008-01-08 09:37:06.000000000 +0100 +--- a/configure.ac ++++ b/configure.ac @@ -26,6 +26,7 @@ AC_DISABLE_STATIC AC_PROG_LIBTOOL diff --git a/x11-misc/gcolor2/files/modular-rgb.patch b/x11-misc/gcolor2/files/modular-rgb.patch index eec5668c2bc7..798fe57e2e3f 100644 --- a/x11-misc/gcolor2/files/modular-rgb.patch +++ b/x11-misc/gcolor2/files/modular-rgb.patch @@ -1,5 +1,5 @@ ---- src/callbacks.h.orig 2006-01-10 21:26:19.000000000 -0500 -+++ src/callbacks.h 2006-01-10 21:26:44.000000000 -0500 +--- a/src/callbacks.h ++++ b/src/callbacks.h @@ -12,6 +12,7 @@ #define SYSTEM_FILE_2 "/usr/lib/X11/rgb.txt" #define SYSTEM_FILE_3 "/etc/X11/rgb.txt" @@ -8,8 +8,8 @@ /* about dialog text */ #define ABOUT_CREDITS_TEXT "Developer:\n" \ ---- src/main.c.orig 2006-01-10 21:43:20.000000000 -0500 -+++ src/main.c 2006-01-10 21:42:14.000000000 -0500 +--- a/src/main.c ++++ b/src/main.c @@ -36,6 +36,8 @@ sys_filename = SYSTEM_FILE_3; else if (g_file_test (SYSTEM_FILE_4, G_FILE_TEST_EXISTS)) |