From nobody Wed Jan 10 14:40:35 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T99Sz2Q26z5763V; Wed, 10 Jan 2024 14:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T99Sz1yNQz4rvT; Wed, 10 Jan 2024 14:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704897635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WGCQXoiqSFJBdlhQ4uO47nOwsrOHQ+3vonkJw5Obd/k=; b=YMfTgVU0tJNMuYfTYUeFSkPGAcYodszQ6vr8B4Dwa9QQcIR1MgfhmLSISTzbLofUInbzh0 CJTNpcARJffeM1w6yi3ImWCQ+YAHL0YwTR88XDxxkc18146Rc4jR15Kx/6w4zQDGwy01DP VsFckZDJGKmqyC+o+s9qs/62BIM9fsxp4MzFr/X7I1sGIFUvSSU3bM6EQGohHYNIZZou5K plq8mNjG3GskuvllJuT52cwJ5f68sHSZaD8sZjBVegj5gzi5blg6hl6W7afpwC0uEJHr7s bq/xaXTSEOVh5etmFrWB95G/7lnZ0TfxPRPQ1Jwx8YDMviloiunJ7RO1K0hRjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704897635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WGCQXoiqSFJBdlhQ4uO47nOwsrOHQ+3vonkJw5Obd/k=; b=hmsiAcbSD1FjFcZzlFQFdxbNMB9jV0hrtq/a3Y4LVQ0gTgwxVYahfc5Nm46jMOiYFYUxGq lRfUqZoIrf7VeXr3o++P8aUQxQZPpilVDm06QQnisSL5RXNcj1bV5nEfE1kxZzogjywjuS A4ziLJczPjXXE8qLhKFJlCbQvPTkF9xLVOBMvuz08CbcEylV9DXPVME4jLs+rtQKHjPSin kvvY4iWz0ETJ7KWxO+up9ydwkiYAiIlGNBnVJMYVvB+SXSYu3a0h2fRUhzaoexQ01Ny4iv Uf78d07noMjG+LmGDyirWUlpEQZb5L83ZsagbmRPCSlt+1MSZj/EvYbvQiWOLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704897635; a=rsa-sha256; cv=none; b=uGqltc6T2vHqP1jFtpta9ZPRUcGSqPRyx2gEvTMuQMUPr1GGLAB49EJyjyOLQ6nEml7OAx fTuEDdWXRI4/9unAnWdCnFhBUxPNZE0szW28V+lhU6go2Wnvt2x3PtTFlwFaz3S+sw+or/ oX+s9jaa5OmOo1ZyAqa41XuVkTki4faZLlubxeI1emLCIrt5K8EcNspxbBO1bEb3jAWFRr uoBBLibiZzfPEx2uncJhRAvXTdJNuAXj8mzysuz5NSBdB63V1/0QOk4waQ/fxsgT/ACX7M xZli3LpjWqvCyMxuPazmlfXZYkwp3HvWpTetiWBRj/6z3fukZ6dTG563RFjztg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T99Sz11ZqzfbB; Wed, 10 Jan 2024 14:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40AEeZFg074504; Wed, 10 Jan 2024 14:40:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40AEeZsw074501; Wed, 10 Jan 2024 14:40:35 GMT (envelope-from git) Date: Wed, 10 Jan 2024 14:40:35 GMT Message-Id: <202401101440.40AEeZsw074501@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: c5eaec4c72ec - main - x11-wm/wmakerconf: undeprecate the port, assume maintainership List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5eaec4c72ec0db1aa310c1106c525f346bebc9c Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5eaec4c72ec0db1aa310c1106c525f346bebc9c commit c5eaec4c72ec0db1aa310c1106c525f346bebc9c Author: Alexey Dokuchaev AuthorDate: 2024-01-10 14:39:02 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-01-10 14:39:02 +0000 x11-wm/wmakerconf: undeprecate the port, assume maintainership - Drop unused run-time dependency on `archivers/rpm4' and bogus CONFIGURE_ARGS (esp. --with-wmakeretcprefix=${LOCALBASE}/share which is plain wrong), trim some vertical whitespace - Fix getstyle(1) program invocation and actually capture its output; this also gets rid of the segmentation fault on exit - Limit the scope of the WMWritePropListToFile() calls patching so it only touches needed files --- x11-wm/wmakerconf/Makefile | 21 ++++++--------------- x11-wm/wmakerconf/files/patch-src_themebrowser.c | 9 +++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile index 065e02c7e869..2cafc91ec753 100644 --- a/x11-wm/wmakerconf/Makefile +++ b/x11-wm/wmakerconf/Makefile @@ -1,38 +1,28 @@ PORTNAME= wmakerconf PORTVERSION= 2.12 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= x11-wm MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= danfe@FreeBSD.org COMMENT= Configuration tool for Window Maker WWW= https://sourceforge.net/projects/wmakerconf/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= Last upstream release was in 2007 -EXPIRATION_DATE= 2024-01-17 - -LIB_DEPENDS= \ - libWINGs.so:x11-wm/windowmaker \ +LIB_DEPENDS= libWINGs.so:x11-wm/windowmaker \ libharfbuzz.so:print/harfbuzz \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libwraster.so:x11-wm/libwraster -RUN_DEPENDS= rpm:archivers/rpm4 USES= gettext pkgconfig perl5 gmake gnome localbase shebangfix xorg USE_GNOME= cairo gdkpixbuf2 gtk20 USE_XORG= x11 - SHEBANG_FILES= scripts/getfile.pl.in scripts/upgrade.pl.in - GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-wmakerdataprefix="${LOCALBASE}/share" \ - --with-wmakeretcprefix="${LOCALBASE}/share" - LIBS= -lintl -lX11 -lWUtil WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -53,7 +43,8 @@ post-patch: .for file in data/po/ja.po po/ja.po @${REINPLACE_CMD} -e 's|JISX-0208-1983-0|euc-jp|g' ${WRKSRC}/${file} .endfor - @${FIND} ${WRKSRC}/src -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \ - '/WMWritePropListToFile/s|,[[:space:]]YES||g' + @${REINPLACE_CMD} -e '/WMWritePropListToFile/s|,[[:space:]]YES||' \ + ${WRKSRC}/src/menu.c ${WRKSRC}/src/rootmenu.c \ + ${WRKSRC}/src/wmconfig.c .include diff --git a/x11-wm/wmakerconf/files/patch-src_themebrowser.c b/x11-wm/wmakerconf/files/patch-src_themebrowser.c index be409657b410..ec642e89db43 100644 --- a/x11-wm/wmakerconf/files/patch-src_themebrowser.c +++ b/x11-wm/wmakerconf/files/patch-src_themebrowser.c @@ -27,6 +27,15 @@ { dialog_popup (DIALOG_ERROR, NULL, NULL, _("Can't save theme file\n`%s'\n" +@@ -2897,7 +2897,7 @@ getstyle_call (const char *themename) + */ + { + char *quotedname = protect_quotes (g_strdup (themename)); +- char *cmdline = g_strconcat (GETSTYLE, " -t \"", quotedname, "\"", NULL); ++ char *cmdline = g_strconcat (GETSTYLE, " -t > \"", quotedname, "\"", NULL); + bool_t success = !system (cmdline); + + Free (cmdline); @@ -3526,17 +3526,17 @@ compute_preview (GtkWidget *progress_bar, GtkWidget *p path = get_pixmap_path (pname);