From nobody Tue Sep 19 18:27:19 2023 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 4Rqqrl4RPBz4m5vZ; Tue, 19 Sep 2023 18:27:19 +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 4Rqqrl3qGhz3Nv4; Tue, 19 Sep 2023 18:27:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695148039; 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=dA+QlwjmoHqSa2CF33bulMuRsZXw1kH/jiJQ8CnglO0=; b=GJ0pQP84Gv7GxeTva47MuP1eCLsVX4dGXjB3P4MY4KSK2oJmeySrQQEuTfwFm69Xwr7Tqv ZHkBiyLUiIWLT7RD38Yyz1p/D7xxqFLtdOpkhAvBwEXz1KgQqOtMTAY79lI0gr1H1nQL+m lLuDdqpjb4rlaSSnicS4MfGIxoSh+HBN94x+thUMOHvKqR/s4sCZS39G4ru1zEbxLRnqhh G1zViwQPPGdMkuXFCvTzpI+gPquWqFmFxd//1bN11IJQraakq0Ho0n0IAUNhK23YzGuy0l cJ9VEgXjUaUR470dfNaT/tUdeI41PVUK2VZ67ErrVwJqPAEMZPn/7o4V5njLug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695148039; a=rsa-sha256; cv=none; b=sURR5KS/ulCPx5Z5GoD+5ERZgYSAvw8xkp1Y3feJGiIjmpFMaNbgSq1ux9UK1wctw14RSC ee1GIVApjzkh0FxaDqhkxqqFmmnCIKo730lIb/C/dt867oebgtGVEtjqYyreFKNC+YgAUJ lc1FKQFBoDvm+pUbb8y6GcvgO6TNTjtyii6/Zlxj243hEAURqV5kdIRz+9xxNfGSDjaDpV FITBLdhqwFSlh9zPZxah8ydsme2VhovCokDGc7/xSaym4YqaHHiVSDlr+r5xjZ85ClgSQy BGR3hRLTI24gOYa5KP/x8cw3twD+647UPsqhmkS4vxZ19zNLAtNU71Mi+QiwXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695148039; 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=dA+QlwjmoHqSa2CF33bulMuRsZXw1kH/jiJQ8CnglO0=; b=GGKSZBbmfl1bPtLKNUO0pcl9fsZ94JP7nLgaQGpsznq4DPW1jAmIEKIEuRxNqHdMPCIW9Y pKiuY+ODNRXvwJEZPEXQxXPF+Wtptd3ZKMSQLrSu+Rvm2bH3EJok6PJS3PHVjMJwUwI6Tf btio4Z/14UAeQQ/yAp2GcQi2yfnQvdEhLMS3e+BMNUHDPMm4ONZREt7Z6bQQ9o77b9ypxG Mlnv4iQdrucTNcQ2DKYnBzDMqFLV294okuVy2pt/ajlXt1oA//JPKNYYAdQj2/ts6w1IVb b8nsncr8dc4CYW0sAeQvPV3tz7DYG59THatts/NpuqyQ51y0wctNnn8L47kfww== 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 4Rqqrl2wnrz8TC; Tue, 19 Sep 2023 18:27:19 +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 38JIRJB4092085; Tue, 19 Sep 2023 18:27:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38JIRJCV092082; Tue, 19 Sep 2023 18:27:19 GMT (envelope-from git) Date: Tue, 19 Sep 2023 18:27:19 GMT Message-Id: <202309191827.38JIRJCV092082@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 39e16722d689 - main - deskutils/caja-extensions: Drop (G)UPnP support 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39e16722d6898a59b14014e9a92877388d3945f0 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=39e16722d6898a59b14014e9a92877388d3945f0 commit 39e16722d6898a59b14014e9a92877388d3945f0 Author: Daniel Engberg AuthorDate: 2023-09-19 18:14:46 +0000 Commit: Daniel Engberg CommitDate: 2023-09-19 18:17:51 +0000 deskutils/caja-extensions: Drop (G)UPnP support All available versions of caja-extensions depends on legacy version of GUPnP which is unsupported upstream and doesn't build with newer versions of libxml2. Drop plugin for new until it's fixed upstream. gtk-doc is now a build dependency due to https://savannah.gnu.org/support/?110503 Reference: https://github.com/mate-desktop/caja-extensions/issues/110 PR: 273430 Approved by: portmgr (maintainer timeout, 2+ weeks) Sponsored by: Blinkinblox --- deskutils/caja-extensions/Makefile | 13 +++++-------- deskutils/caja-extensions/files/patch-configure.ac | 20 ++++++++++++++++++++ deskutils/caja-extensions/pkg-plist | 1 - 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/deskutils/caja-extensions/Makefile b/deskutils/caja-extensions/Makefile index 69dc75f1c1d1..49adfdffa5ce 100644 --- a/deskutils/caja-extensions/Makefile +++ b/deskutils/caja-extensions/Makefile @@ -1,6 +1,6 @@ PORTNAME= caja-extensions PORTVERSION= 1.26.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= deskutils mate MASTER_SITES= MATE DIST_SUBDIR= mate @@ -12,15 +12,15 @@ WWW= https://mate-desktop.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libgupnp-1.2.so:net/gupnp14 \ - libstartup-notification-1.so:x11/startup-notification \ +BUILD_DEPENDS= gtkdocize:textproc/gtk-doc +LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib PORTSCOUT= limitw:1,even -USES= compiler:c11 gettext gmake gnome libtool localbase mate \ - pathfix pkgconfig tar:xz +USES= autoreconf compiler:c11 gettext gmake gnome libtool \ + localbase mate pathfix pkgconfig tar:xz USE_MATE= caja desktop USE_GNOME= cairo gdkpixbuf2 gtk30 intltool USE_LDCONFIG= yes @@ -31,7 +31,4 @@ INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.mate.Caja.Sendto.gschema.xml \ org.mate.caja-open-terminal.gschema.xml -post-patch: - @${REINPLACE_CMD} -e 's|gupnp-1.0|gupnp-1.2|' ${WRKSRC}/configure - .include diff --git a/deskutils/caja-extensions/files/patch-configure.ac b/deskutils/caja-extensions/files/patch-configure.ac new file mode 100644 index 000000000000..22d5c5dbbae2 --- /dev/null +++ b/deskutils/caja-extensions/files/patch-configure.ac @@ -0,0 +1,20 @@ +--- configure.ac.orig 2021-08-06 19:34:59 UTC ++++ configure.ac +@@ -100,7 +100,7 @@ if test "x$enable_sendto" = "xyes"; then + GTHREAD_REQUIRED=2.6.0 + DBUS_REQUIRED=1.0 + DBUS_GLIB_REQUIRED=0.60 +- GUPNP_REQUIRED=0.13 ++# GUPNP_REQUIRED=0.13 + PKG_CHECK_MODULES(SENDTO, + glib-2.0 >= $GLIB_REQUIRED + gthread-2.0 >= $GTHREAD_REQUIRED +@@ -111,7 +111,7 @@ if test "x$enable_sendto" = "xyes"; then + AC_SUBST(SENDTO_LIBS) + + # The full list of plugins +- allowed_sendto_plugins="emailclient gajim caja-burn pidgin removable-devices upnp" ++ allowed_sendto_plugins="emailclient gajim caja-burn pidgin removable-devices" + + sendto_plugin_error_or_ignore() + { diff --git a/deskutils/caja-extensions/pkg-plist b/deskutils/caja-extensions/pkg-plist index 0d34ad19f421..b9df83af761a 100644 --- a/deskutils/caja-extensions/pkg-plist +++ b/deskutils/caja-extensions/pkg-plist @@ -5,7 +5,6 @@ lib/caja-sendto/plugins/libnstemailclient.so lib/caja-sendto/plugins/libnstgajim.so lib/caja-sendto/plugins/libnstpidgin.so lib/caja-sendto/plugins/libnstremovable_devices.so -lib/caja-sendto/plugins/libnstupnp.so lib/caja/extensions-2.0/libcaja-image-converter.so lib/caja/extensions-2.0/libcaja-open-terminal.so lib/caja/extensions-2.0/libcaja-sendto.so