head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.14
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.12
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.10
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.8
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.6
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.4
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.2
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.1.0.6
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.4
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.2
	pkgsrc-2023Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2024.07.07.09.19.10;	author nia;	state Exp;
branches;
next	1.1;
commitid	82hrnVi4tmg75TgF;

1.1
date	2023.10.11.13.29.17;	author bouyer;	state Exp;
branches;
next	;
commitid	ugtvsyYJd0FO8dIE;


desc
@@


1.2
log
@swt: We do not want -Werror, it's actively harmful in pkgsrc.

While here, delint.
@
text
@$NetBSD: patch-make_netbsd.mak,v 1.1 2023/10/11 13:29:17 bouyer Exp $

--- make_netbsd.mak.orig	2024-07-07 09:15:44.846002966 +0000
+++ make_netbsd.mak
@@@@ -12,7 +12,7 @@@@
 #     IBM Corporation - initial API and implementation
 #*******************************************************************************
 
-# Makefile for creating SWT libraries for Linux GTK
+# Makefile for creating SWT libraries for NetBSD GTK
 
 # SWT debug flags for various SWT components.
 #SWT_WEBKIT_DEBUG = -DWEBKIT_DEBUG
@@@@ -66,25 +66,26 @@@@ CAIROLIBS = `pkg-config --libs-only-L ca
 # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
 ifeq ($(GTK_VERSION), 4.0)
 GTKCFLAGS = `pkg-config --cflags gtk4 gtk4-x11 gtk4-unix-print`
-GTKLIBS = `pkg-config --libs-only-L gtk4 gtk4-x11 gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-4 -lcairo -lgthread-2.0
+GTKLIBS = `pkg-config --libs-only-L gtk4 gtk4-x11 gthread-2.0` $(XLIB64) -L$(LOCALBASE)/lib -lgtk-4 -lcairo -lgthread-2.0
 ATKCFLAGS = `pkg-config --cflags atk gtk4 gtk4-unix-print`
 else
 GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION) gtk+-unix-print-$(GTK_VERSION)`
-GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-3 -lgdk-3 -lcairo -lgthread-2.0
+GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L$(LOCALBASE)/lib -lgtk-3 -lgdk-3 -lcairo -lgthread-2.0
 ATKCFLAGS = `pkg-config --cflags atk gtk+-$(GTK_VERSION) gtk+-unix-print-$(GTK_VERSION)`
 endif
 
-AWT_LFLAGS = -shared ${SWT_LFLAGS} 
+AWT_LFLAGS = -shared ${SWT_LFLAGS} ${LDFLAGS}
 AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt
 
 ATKLIBS = `pkg-config --libs-only-L atk` -latk-1.0 
 
-GLXLIBS = -lGL -lGLU -lm
+GLXLIBS = -L$(LOCALBASE)/lib -lGL -lGLU -lm
+GLXCFLAGS = -I$(LOCALBASE)/include
 
 # Uncomment for Native Stats tool
 #NATIVE_STATS = -DNATIVE_STATS
 
-WEBKITLIBS = `pkg-config --libs-only-l gio-2.0`
+WEBKITLIBS = `pkg-config --libs-only-l gio-2.0` $(XLIB64) -L$(LOCALBASE)/lib
 WEBKITCFLAGS = `pkg-config --cflags gio-2.0`
 
 WEBKIT_EXTENSION_CFLAGS=`pkg-config --cflags gtk+-3.0 webkit2gtk-web-extension-4.0`
@@@@ -120,21 +121,18 @@@@ CFLAGS := $(CFLAGS) \
 		$(SWT_WEBKIT_DEBUG) \
 		-DLINUX -DGTK \
 		-I$(JAVA_HOME)/include \
-		-I$(JAVA_HOME)/include/linux \
+		-I$(JAVA_HOME)/include/netbsd \
+		-I$(LOCALBASE)/include \
 		${SWT_PTR_CFLAGS}
-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
+LFLAGS = -shared -fPIC ${SWT_LFLAGS} ${LDFLAGS}
 
 ifndef NO_STRIP
-	# -s = Remove all symbol table and relocation information from the executable.
-	#      i.e, more efficent code, but removes debug information. Should not be used if you want to debug.
-	#      https://gcc.gnu.org/onlinedocs/gcc/Link-Options.html#Link-Options
-	#      http://stackoverflow.com/questions/14175040/effects-of-removing-all-symbol-table-and-relocation-information-from-an-executab
-	AWT_LFLAGS := $(AWT_LFLAGS) -s
-	LFLAGS := $(LFLAGS) -s
+# -s = Remove all symbol table and relocation information from the executable.
+#      i.e, more efficent code, but removes debug information. Should not be used if you want to debug.
+#      https://gcc.gnu.org/onlinedocs/gcc/Link-Options.html#Link-Options
+#      http://stackoverflow.com/questions/14175040/effects-of-removing-all-symbol-table-and-relocation-information-from-an-executab
+AWT_LFLAGS := $(AWT_LFLAGS) -s
+LFLAGS := $(LFLAGS) -s
 endif
 
 all: make_swt make_atk make_glx make_webkit
@


1.1
log
@Add swt version 4.21

SWT is the software component that delivers native widget functionality
for the Eclipse platform in an operating system independent manner.

This package provides SWT without requiring a full download and build of
Eclipse.
@
text
@d1 1
a1 1
$NetBSD: $
d3 2
a4 2
--- make_netbsd.mak.orig	2023-10-04 14:51:05.055924498 +0200
+++ make_netbsd.mak	2023-10-04 14:51:54.306059503 +0200
d14 1
a14 1
@@@@ -66,25 +66,26 @@@@
d46 1
a46 1
@@@@ -120,21 +121,22 @@@@
d55 4
a60 4
 # 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
 
@