commit: dab82896df0e604b23b16da9cfd359d217f76a85 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Mon Mar 20 12:14:42 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Mar 21 06:07:13 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dab82896
dev-java/swt: No more CFLAGS += -Werror Closes: https://bugs.gentoo.org/902201 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/30259 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../files/swt-4.27-as-needed-and-flag-fixes.patch | 39 +++++++++++----------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch index fffbc910c521..4f769cf9d71b 100644 --- a/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch +++ b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch @@ -1,7 +1,8 @@ -diff -Naur a/make_linux.mak b/make_linux.mak ---- a/make_linux.mak 2019-01-07 14:08:00.269147198 +0100 -+++ b/make_linux.mak 2019-01-07 14:10:28.645155241 +0100 -@@ -98,7 +98,7 @@ +diff --git a/make_linux.mak b/make_linux.mak +index 65c168f..c3a059a 100644 +--- a/make_linux.mak ++++ b/make_linux.mak +@@ -98,7 +98,7 @@ ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o @@ -10,7 +11,16 @@ diff -Naur a/make_linux.mak b/make_linux.mak -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ $(SWT_DEBUG) \ -@@ -130,13 +130,13 @@ +@@ -111,7 +111,7 @@ LFLAGS = -shared -fPIC ${SWT_LFLAGS} + + # Treat all warnings as errors. If your new code produces a warning, please + # take time to properly understand and fix/silence it as necessary. +-CFLAGS += -Werror ++# CFLAGS += -Werror + + ifndef NO_STRIP + # -s = Remove all symbol table and relocation information from the executable. +@@ -130,13 +130,13 @@ all: make_swt make_atk make_glx make_webkit make_swt: $(SWT_LIB) $(SWTPI_LIB) $(SWT_LIB): $(SWT_OBJECTS) @@ -26,7 +36,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak swt.o: swt.c swt.h $(CC) $(CFLAGS) -c swt.c -@@ -169,7 +169,7 @@ +@@ -169,7 +169,7 @@ gtk4_stats.o: gtk4_stats.c gtk4_structs.h gtk4.h gtk4_stats.h swt.h make_cairo: $(CAIRO_LIB) $(CAIRO_LIB): $(CAIRO_OBJECTS) @@ -35,7 +45,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak cairo.o: cairo.c cairo.h swt.h $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c -@@ -184,7 +184,7 @@ +@@ -184,7 +184,7 @@ cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h make_awt:$(AWT_LIB) $(AWT_LIB): $(AWT_OBJECTS) @@ -44,7 +54,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak # # Atk lib -@@ -192,7 +192,7 @@ +@@ -192,7 +192,7 @@ $(AWT_LIB): $(AWT_OBJECTS) make_atk: $(ATK_LIB) $(ATK_LIB): $(ATK_OBJECTS) @@ -53,7 +63,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak atk.o: atk.c atk.h $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c -@@ -209,7 +209,7 @@ +@@ -209,7 +209,7 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h make_webkit: $(WEBKIT_LIB) $(WEBKIT_LIB): $(WEBKIT_OBJECTS) @@ -62,16 +72,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak webkitgtk.o: webkitgtk.c webkitgtk_custom.h $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -# @@ -217,7 +217,7 @@ -# make_webkit2extension: $(WEBKIT_EXTENSION_LIB) -# -# $(WEBKIT_EXTENSION_LIB) : webkitgtk_extension.o -# - $(CC) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS) -# + $(CC) $(LDFLAGS) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS) -# -# webkitgtk_extension.o : webkitgtk_extension.c -# $(CC) $(CFLAGS) $(WEBKIT_EXTENSION_CFLAGS) ${SWT_PTR_CFLAGS} -fPIC -c $^ -@@ -229,7 +229,7 @@ +@@ -229,7 +229,7 @@ webkitgtk_custom.o: webkitgtk_custom.c make_glx: $(GLX_LIB) $(GLX_LIB): $(GLX_OBJECTS)
