From 9f7759b3b1be5a3bc7794010a8ebf9334f017d2f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Nov 2022 06:52:13 +0000 Subject: gentoo auto-resync : 15:11:2022 - 06:52:13 --- x11-misc/gtkdialog/Manifest | 4 +- .../gtkdialog-0.8.3-fix-build-for-clang16.patch | 202 +++++++++++++++++++++ .../gtkdialog/gtkdialog-0.8.3_p20200202-r1.ebuild | 59 ++++++ x11-misc/gtkdialog/gtkdialog-99999.ebuild | 16 +- 4 files changed, 276 insertions(+), 5 deletions(-) create mode 100644 x11-misc/gtkdialog/files/gtkdialog-0.8.3-fix-build-for-clang16.patch create mode 100644 x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202-r1.ebuild (limited to 'x11-misc/gtkdialog') diff --git a/x11-misc/gtkdialog/Manifest b/x11-misc/gtkdialog/Manifest index 7fbb823c3ab9..90a2b307dad2 100644 --- a/x11-misc/gtkdialog/Manifest +++ b/x11-misc/gtkdialog/Manifest @@ -1,6 +1,8 @@ AUX gtkdialog-0.8.3-do_variables_count_widgets.patch 214 BLAKE2B 7e8975b55ac8432ceeaa412b01c2a8362c1394575aadeb471ad93f6bb91e185f412c94c4c1e4122055b939723fce15efc8353587f1adc5f01d746b9143f7a5ef SHA512 befcd5644d268b734a15e8ce0d58fc410d61fca9b825cd97f14ba5000355d81684f42d6bbb65cdc84ec7fa01c3112901adb0ffabd6af0df4875f2441aa0a7235 +AUX gtkdialog-0.8.3-fix-build-for-clang16.patch 4971 BLAKE2B 421efbef3f32a11e5c3387d101face03f335aa153dcd929a15dcf2f9458f556d73bf6e477c5720f2d90720d58e59938fcc00a94b2c06cd8884cf50d154fb64bb SHA512 9b828ace06cc773439b00a427b11168c20df052c2b2d115fbfd0915585b2e4ac88b51e143dea78c5d6c76b5be59eb34ffcba42dd4098b5bd9bcf6c52c4b367f2 AUX gtkdialog-0.8.3-fno-common.patch 1535 BLAKE2B 1a881d8827c0ac815791b5bd482d1160158bbbce8a2b5a57235e1ba3131d8cb4c591f10b67fff35c5f1a632f097fa751749702b32696f1b86469629a4b4238f4 SHA512 5812ee6272bc7ffa85ea506bce9b64451c5d9a716c87272b7c5e0c166b85ac7ba7f1a8cf9c687df194b20fe0db942084b2d199cbf51093b05d204c217ea6e65c DIST gtkdialog-0.8.3_p20200202.tar.xz 356312 BLAKE2B 77358e0b04ddb484e3e3a093084776a2c799fa52b90849bdde3bce56a7c042c2cbe28d699f0c4dcc14cc69872d496b89fc5c8aa7140669560e01448d9c57c15d SHA512 9120ac515eace168e4a3987b6cf3a1b3aa0e7617e837ade21d5ffea25cc3f3abbff598bb4c33914fb800416ea687f0ec7dea2b24c8acc0c71734aa6b2b385bfe +EBUILD gtkdialog-0.8.3_p20200202-r1.ebuild 1093 BLAKE2B c4781ac32827d8d2c8f86fad36369cd6052c035eb4e748c21b3fb558c208f1a3259bea25aaffe1cac65ebdde8089549bcdf65fbbe6a09f88e3fc1fac154e46b7 SHA512 7ddf62a7e155014bf4520ef3e59e68f9074b64f1f44b458689f3ae37bcb113f93f3e2ab341e30a1cf572fce5dfe7c7757e3fcf9899749d5841f1988df8e1bda6 EBUILD gtkdialog-0.8.3_p20200202.ebuild 893 BLAKE2B 4c0b751c6ef88cac04f960a13f99ee0d23a51aac7b41259e69de9ddcfc846d7bab870a6fdd41ccd21ebfb548f1d28485f0e98b2b7c194ee2d930bd53f657f8f0 SHA512 94a346f98c8b8bbf9090289dffc2fe454f014b2869916e7821de3c6d6c36e288339b6d62b6226529138be50da13a9a0a3c7d58d3b2ce17d61a64483fb5f69cfc -EBUILD gtkdialog-99999.ebuild 886 BLAKE2B 3d764c538ad711869d1561eb3d001d5d3b070345fe1e3be2412ff10d21b8eebcd1174a054f14e06ca1f58fc781e9ca993ba2a2f8017cb933e98c55ac12dbed65 SHA512 4458e91835ef9ba0f7924c3a9887f08079c93564bac5b1fd52c0ef0f2420abda04b1b304c4c7ebbfff8c0dad571aeb4a9e49d7af2fd7a6e45f4878cd03b8e6e0 +EBUILD gtkdialog-99999.ebuild 1093 BLAKE2B c4781ac32827d8d2c8f86fad36369cd6052c035eb4e748c21b3fb558c208f1a3259bea25aaffe1cac65ebdde8089549bcdf65fbbe6a09f88e3fc1fac154e46b7 SHA512 7ddf62a7e155014bf4520ef3e59e68f9074b64f1f44b458689f3ae37bcb113f93f3e2ab341e30a1cf572fce5dfe7c7757e3fcf9899749d5841f1988df8e1bda6 MISC metadata.xml 768 BLAKE2B 62c606936e3c570ac0c7b7663a8ab6368959765a51e8b95f844e143ec39f4169162052fffc7c93ca6bb6368e7adfbf852df0a0d8bdd22c5cf7d84e815ecd73cd SHA512 33259daaf765bd30b4b82ece1fa06017afbd70d7009b30825cee413f579419189adc5535a6953e69ee31a9187dbc23469601656145aedd64995acfa2ad581ede diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fix-build-for-clang16.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fix-build-for-clang16.patch new file mode 100644 index 000000000000..fd6ff011f810 --- /dev/null +++ b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fix-build-for-clang16.patch @@ -0,0 +1,202 @@ +Clang16 will not allow implicit function declarations and implicit integers etc. +This patch overhauls the source code for modern C. + +Bug: https://bugs.gentoo.org/875704 +Upstream PR: https://github.com/oshazard/gtkdialog/pull/81 + +Signed-off-by: Pascal Jäger + +--- a/src/actions.c ++++ b/src/actions.c +@@ -36,6 +36,7 @@ + #include "attributes.h" + #include "variables.h" + #include "tag_attributes.h" ++#include "gtkdialog_parser.h" + + extern gchar *option_include_file; + +--- a/src/automaton.c ++++ b/src/automaton.c +@@ -35,6 +35,7 @@ + */ + + #include ++#include + + #include "config.h" + #include "gtkdialog.h" +@@ -87,6 +88,8 @@ + #undef TOOLTIPS + + extern gboolean option_no_warning; ++extern void push_widget(GtkWidget * widget, int widgettype); ++int instruction_execute(instruction command); + + instruction *program = NULL; + int instruction_counter = 0; /* The first available memory cell */ +@@ -323,8 +326,7 @@ void print_command(instruction command) + fflush(stdout); + } + +-void +-print_program() ++void print_program() + { + gint pc; + instruction command; +@@ -580,8 +582,7 @@ finalize: + } + + +-int +-instruction_execute(instruction command) ++int instruction_execute(instruction command) + { + GList *element; + token Token; +@@ -911,9 +912,11 @@ gboolean widget_moved(GtkWidget *widget, + //gtk_widget_set_usize(window, + // configure->width -20, + // configure->height); ++#if HAVE_GTK==2 + gtk_widget_set_uposition(GTK_WIDGET(window), + configure->x, + configure->y); ++#endif + } + + fflush(stderr); +--- a/src/gtkdialog.h ++++ b/src/gtkdialog.h +@@ -65,5 +65,6 @@ gint get_program_from_variable(gchar *name); + void set_program_name(gchar *name); + gchar *get_program_name(void); + void load_styles_file(gchar *filename); ++int getnextchar(void); + + #endif +--- a/src/gtkdialog_parser.h ++++ b/src/gtkdialog_parser.h +@@ -385,3 +385,8 @@ typedef union YYSTYPE + extern YYSTYPE gtkdialog_lval; + + ++extern int gtkdialog_error(char *c); ++extern void run_program(void); ++extern void print_program(); ++extern int gtkdialog_lex (void); ++extern int gtkdialog_parse (void); +--- a/src/printing.c ++++ b/src/printing.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include "gtkdialog.h" + #include "printing.h" + +--- a/src/signals.c ++++ b/src/signals.c +@@ -40,6 +40,8 @@ + //#define DEBUG_CONTENT + //#define DEBUG_TRANSITS + ++extern gboolean variables_is_avail_by_name(const char *name); ++ + /* Local variables */ + char *condexpr[] = { + "active_is_true(", "active_is_false(", "active_is_true (", "active_is_false (", +--- a/src/stringman.c ++++ b/src/stringman.c +@@ -30,6 +30,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/src/variables.c ++++ b/src/variables.c +@@ -59,6 +59,7 @@ + #endif + + extern gboolean option_no_warning; ++extern int yywarning(char *c); + + /* Local function prototypes */ + #ifdef DEBUG +--- a/src/widget_notebook.c ++++ b/src/widget_notebook.c +@@ -28,6 +28,7 @@ + #include "automaton.h" + #include "widgets.h" + #include "tag_attributes.h" ++#include "signals.h" + + /* Defines */ + //#define DEBUG_CONTENT +--- a/src/widget_timer.c ++++ b/src/widget_timer.c +@@ -28,6 +28,7 @@ + #include "automaton.h" + #include "widgets.h" + #include "tag_attributes.h" ++#include "signals.h" + + /* Defines */ + //#define DEBUG_CONTENT +--- a/src/widgets.h ++++ b/src/widgets.h +@@ -38,6 +38,38 @@ + #include "variables.h" + #include "automaton.h" + ++#include "widget_window.h" ++#include "widget_vbox.h" ++#include "widget_tree.h" ++#include "widget_timer.h" ++#include "widget_text.h" ++#include "widget_terminal.h" ++#include "widget_template.h" ++#include "widget_table.h" ++#include "widget_statusbar.h" ++#include "widget_spinbutton.h" ++#include "widget_radiobutton.h" ++#include "widget_progressbar.h" ++#include "widget_pixmap.h" ++#include "widget_notebook.h" ++#include "widget_menuitem.h" ++#include "widget_menubar.h" ++#include "widget_list.h" ++#include "widget_hseparator.h" ++#include "widget_hscale.h" ++#include "widget_hbox.h" ++#include "widget_frame.h" ++#include "widget_fontbutton.h" ++#include "widget_expander.h" ++#include "widget_eventbox.h" ++#include "widget_entry.h" ++#include "widget_edit.h" ++#include "widget_comboboxtext.h" ++#include "widget_combobox.h" ++#include "widget_colorbutton.h" ++#include "widget_checkbox.h" ++#include "widget_button.h" ++ + char *widget_get_text_value(GtkWidget *widget, int type); + FILE *widget_opencommand(const char *command); + char *widgets_to_str(int itype); +--- a/src/gtkdialog.c ++++ b/src/gtkdialog.c +@@ -345,7 +345,7 @@ get_program_from_file(char *name) + * required because the #! is not included in the language. + */ + program_src = NULL; +- result = getline(&program_src, &tmp, sourcefile); ++ result = getline(&program_src, (size_t*)&tmp, sourcefile); + if (program_src[0] != '#') { + fclose(sourcefile); + sourcefile = fopen(name, "r"); diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202-r1.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202-r1.ebuild new file mode 100644 index 000000000000..79c38b08340e --- /dev/null +++ b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools xdg + +if [[ "${PV}" == "99999" ]]; then + EGIT_REPO_URI="https://github.com/oshazard/gtkdialog" + inherit git-r3 +else + SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz" + KEYWORDS="~amd64 ~ppc ~x86" +fi + +DESCRIPTION="A small utility for fast and easy GUI building" +HOMEPAGE="https://github.com/oshazard/gtkdialog" + +LICENSE="GPL-2" +SLOT="0" + +RDEPEND=" + dev-libs/glib + x11-libs/gtk+:3 + x11-libs/vte:2.91= +" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-apps/texinfo + sys-devel/flex + virtual/pkgconfig + virtual/yacc +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.8.3-fno-common.patch + "${FILESDIR}"/${PN}-0.8.3-do_variables_count_widgets.patch + "${FILESDIR}"/${PN}-0.8.3-fix-build-for-clang16.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf --enable-gtk3 +} + +src_compile() { + emake -C doc stamp-vti + default +} + +src_install() { + # Stop make install from running gtk-update-icon-cache + emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install + einstalldocs +} diff --git a/x11-misc/gtkdialog/gtkdialog-99999.ebuild b/x11-misc/gtkdialog/gtkdialog-99999.ebuild index 471ce7d9bc93..79c38b08340e 100644 --- a/x11-misc/gtkdialog/gtkdialog-99999.ebuild +++ b/x11-misc/gtkdialog/gtkdialog-99999.ebuild @@ -3,17 +3,24 @@ EAPI=8 -inherit autotools git-r3 xdg +inherit autotools xdg -DESCRIPTION="Small utility for fast and easy GUI building" +if [[ "${PV}" == "99999" ]]; then + EGIT_REPO_URI="https://github.com/oshazard/gtkdialog" + inherit git-r3 +else + SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz" + KEYWORDS="~amd64 ~ppc ~x86" +fi + +DESCRIPTION="A small utility for fast and easy GUI building" HOMEPAGE="https://github.com/oshazard/gtkdialog" -EGIT_REPO_URI="https://github.com/oshazard/gtkdialog" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" RDEPEND=" + dev-libs/glib x11-libs/gtk+:3 x11-libs/vte:2.91= " @@ -28,6 +35,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.8.3-fno-common.patch "${FILESDIR}"/${PN}-0.8.3-do_variables_count_widgets.patch + "${FILESDIR}"/${PN}-0.8.3-fix-build-for-clang16.patch ) src_prepare() { -- cgit v1.2.3