CVS commit: pkgsrc/x11/swt

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11/swt
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Sun, 7 Jul 2024 09:19:10 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jul  7 09:19:10 UTC 2024

Modified Files:
        pkgsrc/x11/swt: Makefile PLIST distinfo
        pkgsrc/x11/swt/patches: patch-make_netbsd.mak

Log Message:
swt: We do not want -Werror, it's actively harmful in pkgsrc.

While here, delint.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/swt/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/swt/PLIST pkgsrc/x11/swt/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/swt/patches/patch-make_netbsd.mak

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/swt/Makefile
diff -u pkgsrc/x11/swt/Makefile:1.6 pkgsrc/x11/swt/Makefile:1.7
--- pkgsrc/x11/swt/Makefile:1.6 Sun Apr  7 07:35:28 2024
+++ pkgsrc/x11/swt/Makefile     Sun Jul  7 09:19:09 2024
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2024/04/07 07:35:28 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2024/07/07 09:19:09 nia Exp $
 
 VERSION=       4.21
 PKGNAME=       swt-${VERSION}
 PKGREVISION=   5
 DISTNAME=      swt-${VERSION}-gtk-linux-x86_64
-CATEGORIES=    graphics java x11
-MASTER_SITES=   http://archive.eclipse.org/eclipse/downloads/drops4/R-${VERSION}-202109060500/
+CATEGORIES=    x11 java graphics
+MASTER_SITES=  http://archive.eclipse.org/eclipse/downloads/drops4/R-${VERSION}-202109060500/
 EXTRACT_SUFX=  .zip
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -13,17 +13,19 @@ HOMEPAGE=   https://www.eclipse.org/swt/
 COMMENT=       Standard Widget Toolkit for Java
 LICENSE=       epl-v2.0
 
-USE_TOOLS+=    gmake pkg-config
+USE_TOOLS+=    gmake pkg-config unzip
 USE_JAVA=      yes
 
 USE_LANGUAGES= c c++11
 
-SWT_VERSION=    4946r21
+SWT_VERSION=   4946r21
 
 MAKE_FILE=     make_netbsd.mak
 MAKE_ENV+=     SWT_VERSION=${SWT_VERSION} MAKE_CAIRO=make_cairo
 PLIST_SUBST+=  SWT_VERSION=${SWT_VERSION}
 
+BUILDLINK_TRANSFORM+=  rm:-Werror
+
 SUBST_CLASSES+=                        fix-rpaths
 SUBST_FILES.fix-rpaths=                make_netbsd.mak
 SUBST_MESSAGE.fix-rpaths=      Fixing pkg-config rpath
@@ -31,7 +33,7 @@ SUBST_SED.fix-rpaths=         -e 's,--libs-only
 SUBST_STAGE.fix-rpaths=                pre-configure
 
 post-extract:
-       @${MKDIR} ${WRKSRC}
+       ${MKDIR} ${WRKSRC}
        (cd ${WRKSRC} && ${UNZIP_CMD} -qo ../*.zip)
        ${CP} ${FILESDIR}/build.xml ${WRKSRC}/build.xml
        ${CP} ${WRKSRC}/make_linux.mak ${WRKSRC}/make_netbsd.mak
@@ -41,7 +43,7 @@ do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build.sh
 
 do-install:
-       @${MKDIR} ${DESTDIR}${PREFIX}/lib/java/
+       ${MKDIR} ${DESTDIR}${PREFIX}/lib/java/
        ${INSTALL_LIB} ${WRKSRC}/libswt-*.so ${DESTDIR}${PREFIX}/lib/
        ${INSTALL_DATA} ${WRKDIR}/swt.jar ${DESTDIR}${PREFIX}/lib/java/
 

Index: pkgsrc/x11/swt/PLIST
diff -u pkgsrc/x11/swt/PLIST:1.1 pkgsrc/x11/swt/PLIST:1.2
--- pkgsrc/x11/swt/PLIST:1.1    Wed Oct 11 13:29:17 2023
+++ pkgsrc/x11/swt/PLIST        Sun Jul  7 09:19:09 2024
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2023/10/11 13:29:17 bouyer Exp $
-
+@comment $NetBSD: PLIST,v 1.2 2024/07/07 09:19:09 nia Exp $
 lib/libswt-atk-gtk-${SWT_VERSION}.so
 lib/libswt-awt-gtk-${SWT_VERSION}.so
 lib/libswt-cairo-gtk-${SWT_VERSION}.so
Index: pkgsrc/x11/swt/distinfo
diff -u pkgsrc/x11/swt/distinfo:1.1 pkgsrc/x11/swt/distinfo:1.2
--- pkgsrc/x11/swt/distinfo:1.1 Wed Oct 11 13:29:17 2023
+++ pkgsrc/x11/swt/distinfo     Sun Jul  7 09:19:09 2024
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1 2023/10/11 13:29:17 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2024/07/07 09:19:09 nia Exp $
 
 BLAKE2s (swt-4.21-gtk-linux-x86_64.zip) = cd33abf5c5239282e212fb63e5adaff8e4c17bdbe0c4a22735ff968bae8b1d02
 SHA512 (swt-4.21-gtk-linux-x86_64.zip) = b9a4eeecb48803e255e7d986579a9fc3a3465ceb91c3f525a764a8cf99fe250bf9e17565acb5aa8f8f65a153a70f67d2f523d3dc187751770271c6a0832698b7
 Size (swt-4.21-gtk-linux-x86_64.zip) = 3851041 bytes
 SHA1 (patch-build.sh) = 1ed9ce4c5dc931388b4d7ed3cbc387d1e37115a3
-SHA1 (patch-make_netbsd.mak) = 12a33149add387f77ce1b85ed405641f2ab9216e
+SHA1 (patch-make_netbsd.mak) = 264b92cf0fa955ab012640a021c0347921b04044
 SHA1 (patch-org_eclipse_swt_browser_WebKit.java) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-org_eclipse_swt_internal_Library.java) = 8930e4fdf5544c4f6bb8ed90460c428e483b0b65
 SHA1 (patch-org_eclipse_swt_internal_gtk_OS.java) = 86242aa719673791616657e06e0b05d0d120f2dc

Index: pkgsrc/x11/swt/patches/patch-make_netbsd.mak
diff -u pkgsrc/x11/swt/patches/patch-make_netbsd.mak:1.1 pkgsrc/x11/swt/patches/patch-make_netbsd.mak:1.2
--- pkgsrc/x11/swt/patches/patch-make_netbsd.mak:1.1    Wed Oct 11 13:29:17 2023
+++ pkgsrc/x11/swt/patches/patch-make_netbsd.mak        Sun Jul  7 09:19:10 2024
@@ -1,7 +1,7 @@
-$NetBSD: patch-make_netbsd.mak,v 1.1 2023/10/11 13:29:17 bouyer Exp $
+$NetBSD: patch-make_netbsd.mak,v 1.2 2024/07/07 09:19:10 nia Exp $
 
---- make_netbsd.mak.orig       2023-10-04 14:51:05.055924498 +0200
-+++ make_netbsd.mak    2023-10-04 14:51:54.306059503 +0200
+--- 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
  #*******************************************************************************
@@ -11,7 +11,7 @@ $NetBSD: patch-make_netbsd.mak,v 1.1 202
  
  # SWT debug flags for various SWT components.
  #SWT_WEBKIT_DEBUG = -DWEBKIT_DEBUG
-@@ -66,25 +66,26 @@
+@@ -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`
@@ -43,7 +43,7 @@ $NetBSD: patch-make_netbsd.mak,v 1.1 202
  WEBKITCFLAGS = `pkg-config --cflags gio-2.0`
  
  WEBKIT_EXTENSION_CFLAGS=`pkg-config --cflags gtk+-3.0 webkit2gtk-web-extension-4.0`
-@@ -120,21 +121,22 @@
+@@ -120,21 +121,18 @@ CFLAGS := $(CFLAGS) \
                $(SWT_WEBKIT_DEBUG) \
                -DLINUX -DGTK \
                -I$(JAVA_HOME)/include \
@@ -52,12 +52,12 @@ $NetBSD: patch-make_netbsd.mak,v 1.1 202
 +              -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}
  
- # 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
- 
  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.

Prev by Date: CVS commit: pkgsrc/x11/xfontsel
Next by Date: CVS commit: pkgsrc/graphics/OpenJPH
Previous by Thread: CVS commit: pkgsrc/x11/xfontsel
Next by Thread: CVS commit: pkgsrc/graphics/OpenJPH
Indexes:

Home | Main Index | Thread Index | Old Index