From nobody Thu Nov 23 12:34:28 2023 X-Original-To: dev-commits-ports-main@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 4Sbcxd1q9Sz52BPB; Thu, 23 Nov 2023 12:34:29 +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 4Sbcxd1N5Qz3Mcs; Thu, 23 Nov 2023 12:34:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700742869; 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=Sy9Z/FVJwsXlY4VkSwggl+IjBSFcaw6X3nb5k099NgQ=; b=Vptn3dMRNunWwKwG8g5Cu0UyZgBItQO4bAeF5Q92h7fyiiHz8H+dVrhQ9NIbAu3v6QSxGs 83vVxtpvkahDRJ/fA+Xd1RBIog9HiiTdDLN6Ys6AxTn2NvMygGg/blBNyIsTRb2H95JZHD pPLqm4pWp6IT1aYTZmh3lltqC31ZVJJJG/bFgNuhLAeA0M3agv4yvC2+Qk3+5RYw1t5uqf rssOnlenkXFNO7+9LzurwFu46fAfP33574qqBwaKe4sFRx7/Uv4bjeC/Nz94zhy7FPiZ2o VgjwWms6WLP3usVvT7V82RiYvElrOTyhta1h3JkIbTbWIdjD69PGfNe20RfRDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700742869; 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=Sy9Z/FVJwsXlY4VkSwggl+IjBSFcaw6X3nb5k099NgQ=; b=pGhmrVlZllLrszg5JzPVZ23+saCdENVrp1H6HTrS5rTpjjNOtfth4MPoYBonALA8MNsUFz 07160rdCTv8ofe9ROnevyjC4jKu9pGPpOc1ANEioS7lUORmJNHT/vPeOhCh5yY+KXorf5I /ga2Ue4GzcYAe3E+SN2MI657DETZMEECo/z/1sbAKWF24Te/r2S7wO1KHpAdwcrNGH6R37 ey+jy2bbi/eACnLQSHE6Y+jOvgtNEgFVXPcZFU+wFqnilxlPTmemV0U/rv4cqU+hg4JGJN K9ZlLX26tiHhus4FHKdDYdikYdjOPFqiAqWDj52NSDCG2tLIDklmdMA7liKUwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700742869; a=rsa-sha256; cv=none; b=wraVK+XbHk+ShZEJlx7l4XECBkbrx1lb82x9yCJ1P92RGxtpCbTSgGL+DU6etByIa/SrEE QfIeDormbNy5kwviAhvJsqN3hkBxvmlxIVwOIPfSUFc6eY+2bMf3YEXF44iTn7GSa63Q3Y NgNlb2voPsVNgasbFcUS05F7jaE8CedrM0n8PGfqhBV20U+PD6yY3r5W+7mu383VIAo3uc rxlWcLgd4bAlx77+uosVaeYI/rwgpBe2sgiSKx6SU5pKaFfr3Kdnphc7YNHhs+zNfd+JSN zk8VStQC8TVtAtP+4gH1fyDXpaCmWuppPpJyyj7MzWeZV1Vg7XFxTvyDg2/iZQ== 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 4Sbcxd08dyz12TS; Thu, 23 Nov 2023 12:34:29 +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 3ANCYSwo055415; Thu, 23 Nov 2023 12:34:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ANCYSor055412; Thu, 23 Nov 2023 12:34:28 GMT (envelope-from git) Date: Thu, 23 Nov 2023 12:34:28 GMT Message-Id: <202311231234.3ANCYSor055412@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: a359da13de4c - main - x11-fm/deforaos-browser: update to 0.5.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a359da13de4c1e025e9af061a8e0797527b79351 Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=a359da13de4c1e025e9af061a8e0797527b79351 commit a359da13de4c1e025e9af061a8e0797527b79351 Author: Pierre Pronchery AuthorDate: 2023-10-09 19:22:33 +0000 Commit: Olivier Cochard CommitDate: 2023-11-23 12:30:49 +0000 x11-fm/deforaos-browser: update to 0.5.5 --- x11-fm/deforaos-browser/Makefile | 19 +++++------- x11-fm/deforaos-browser/distinfo | 6 ++-- x11-fm/deforaos-browser/files/patch-doc_Makefile | 38 +++++++----------------- x11-fm/deforaos-browser/pkg-descr | 2 +- x11-fm/deforaos-browser/pkg-plist | 10 +++++-- 5 files changed, 30 insertions(+), 45 deletions(-) diff --git a/x11-fm/deforaos-browser/Makefile b/x11-fm/deforaos-browser/Makefile index 6676f7b770d2..a8d2e0e97f2a 100644 --- a/x11-fm/deforaos-browser/Makefile +++ b/x11-fm/deforaos-browser/Makefile @@ -1,31 +1,30 @@ PORTNAME= deforaos-browser -PORTVERSION= 0.5.1 -PORTREVISION= 1 +PORTVERSION= 0.5.5 CATEGORIES= x11-fm -MASTER_SITES= http://www.defora.org/os/download/download/4442/ +MASTER_SITES= https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/Browser/ DISTNAME= Browser-${PORTVERSION} MAINTAINER= olivier@FreeBSD.org COMMENT= DeforaOS desktop file browser WWW= https://www.defora.org/ -LICENSE= BSD3CLAUSE +LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libSystem.so:devel/deforaos-libsystem \ libDesktop.so:x11/deforaos-libdesktop \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz \ libXrandr.so:x11/libXrandr +USES= gnome pkgconfig xorg desktop-file-utils + OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_USES= gettext DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl -USES= desktop-file-utils gnome pkgconfig xorg -USE_GNOME= gtk20 cairo +USE_GNOME= gtk30 cairo gdkpixbuf2 USE_XORG= x11 USE_LDCONFIG= yes MAKE_ARGS+= PREFIX=${PREFIX} @@ -35,10 +34,6 @@ CONFLICTS_INSTALL= schilyutils silo # bin/browser bin/copy post-patch: ${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \ ${WRKSRC}/data/pkgconfig.sh - ${REINPLACE_CMD} 's|-Wl,-pie||g' \ - ${WRKSRC}/tests/Makefile \ - ${WRKSRC}/tools/Makefile \ - ${WRKSRC}/src/Makefile post-patch-DOCS-off: ${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile diff --git a/x11-fm/deforaos-browser/distinfo b/x11-fm/deforaos-browser/distinfo index febb7babcd49..464a1848385b 100644 --- a/x11-fm/deforaos-browser/distinfo +++ b/x11-fm/deforaos-browser/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1475616938 -SHA256 (Browser-0.5.1.tar.gz) = d2560e0ac7f97f12055e758cb82f861d9661dd8757e4790c40c1a904c0cbf41a -SIZE (Browser-0.5.1.tar.gz) = 155403 +TIMESTAMP = 1696878459 +SHA256 (Browser-0.5.5.tar.gz) = 747ef80b027794a42e77a96686ea1fd20b89024f3d677eff2076a50e5db733d8 +SIZE (Browser-0.5.5.tar.gz) = 174164 diff --git a/x11-fm/deforaos-browser/files/patch-doc_Makefile b/x11-fm/deforaos-browser/files/patch-doc_Makefile index 9d8d0fe63c4f..b575b9d8f00a 100644 --- a/x11-fm/deforaos-browser/files/patch-doc_Makefile +++ b/x11-fm/deforaos-browser/files/patch-doc_Makefile @@ -1,14 +1,15 @@ ---- doc/Makefile.orig 2016-10-05 08:10:40 UTC +--- doc/Makefile.orig 2023-11-20 18:15:16 UTC +++ doc/Makefile -@@ -1,4 +1,4 @@ --TARGETS = $(OBJDIR)browser.1 $(OBJDIR)browser.html $(OBJDIR)browser.xml $(OBJDIR)copy.1 $(OBJDIR)copy.html $(OBJDIR)copy.xml $(OBJDIR)delete.1 $(OBJDIR)delete.html $(OBJDIR)delete.xml $(OBJDIR)desktop.1 $(OBJDIR)desktop.html $(OBJDIR)desktop.xml $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.html $(OBJDIR)desktopctl.xml $(OBJDIR)move.1 $(OBJDIR)move.html $(OBJDIR)move.xml $(OBJDIR)open.1 $(OBJDIR)open.html $(OBJDIR)open.xml $(OBJDIR)properties.1 $(OBJDIR)properties.html $(OBJDIR)properties.xml $(OBJDIR)view.1 $(OBJDIR)view.html $(OBJDIR)view.xml -+TARGETS = $(OBJDIR)browser.1 $(OBJDIR)browser.xml $(OBJDIR)copy.1 $(OBJDIR)copy.xml $(OBJDIR)delete.1 $(OBJDIR)delete.xml $(OBJDIR)desktop.1 $(OBJDIR)desktop.xml $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.xml $(OBJDIR)move.1 $(OBJDIR)move.xml $(OBJDIR)open.1 $(OBJDIR)open.xml $(OBJDIR)properties.1 $(OBJDIR)properties.xml $(OBJDIR)view.1 $(OBJDIR)view.xml +@@ -1,5 +1,5 @@ SUBDIRS = gtkdoc + SUBDIRS = gtkdoc +-TARGETS = $(OBJDIR)browser.1 $(OBJDIR)browser.html $(OBJDIR)browser.xml $(OBJDIR)copy.1 $(OBJDIR)copy.html $(OBJDIR)copy.xml $(OBJDIR)delete.1 $(OBJDIR)delete.html $(OBJDIR)delete.xml $(OBJDIR)desktop.1 $(OBJDIR)desktop.html $(OBJDIR)desktop.xml $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.html $(OBJDIR)desktopctl.xml $(OBJDIR)gtkdoc/Browser.types $(OBJDIR)gtkdoc/html.stamp $(OBJDIR)gtkdoc/tmpl.stamp $(OBJDIR)gtkdoc/xml.stamp $(OBJDIR)move.1 $(OBJDIR)move.html $(OBJDIR)move.xml $(OBJDIR)open.1 $(OBJDIR)open.html $(OBJDIR)open.xml $(OBJDIR)pinentry-sudo-askpass $(OBJDIR)properties.1 $(OBJDIR)properties.html $(OBJDIR)properties.xml $(OBJDIR)view.1 $(OBJDIR)view.html $(OBJDIR)view.xml $(OBJDIR)zenity-sudo-askpass ++TARGETS = $(OBJDIR)browser.1 $(OBJDIR)browser.xml $(OBJDIR)copy.1 $(OBJDIR)copy.xml $(OBJDIR)delete.1 $(OBJDIR)delete.xml $(OBJDIR)desktop.1 $(OBJDIR)desktop.xml $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.xml $(OBJDIR)gtkdoc/Browser.types $(OBJDIR)gtkdoc/tmpl.stamp $(OBJDIR)gtkdoc/xml.stamp $(OBJDIR)move.1 $(OBJDIR)move.xml $(OBJDIR)open.1 $(OBJDIR)open.xml $(OBJDIR)pinentry-sudo-askpass $(OBJDIR)properties.1 $(OBJDIR)properties.xml $(OBJDIR)view.1 $(OBJDIR)view.xml $(OBJDIR)zenity-sudo-askpass OBJDIR = PREFIX = /usr/local DESTDIR = -@@ -126,42 +126,24 @@ distclean: clean - - install: $(TARGETS) +@@ -202,25 +202,15 @@ install: all + $(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \ + else $(MAKE) install; fi) || exit; done ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)browser.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)browser.html" ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)copy.1" @@ -19,33 +20,16 @@ - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktop.html" ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktopctl.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktopctl.html" +- ./gtkdoc.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)gtkdoc/html.stamp" ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)move.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)move.html" ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)open.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)open.html" + ../tools/subst.sh -P "$(DESTDIR)$(PREFIX)/share/doc/Browser" -i -- "$(OBJDIR)pinentry-sudo-askpass" ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)properties.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)properties.html" ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)view.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)view.html" + ../tools/subst.sh -P "$(DESTDIR)$(PREFIX)/share/doc/Browser" -i -- "$(OBJDIR)zenity-sudo-askpass" uninstall: - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "browser.1" -- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "browser.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "copy.1" -- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "copy.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "delete.1" -- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "delete.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "desktop.1" -- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "desktop.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "desktopctl.1" -- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "desktopctl.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "move.1" -- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "move.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "open.1" -- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "open.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "properties.1" -- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "properties.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "view.1" -- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "view.html" - - .PHONY: all clean distclean install uninstall diff --git a/x11-fm/deforaos-browser/pkg-descr b/x11-fm/deforaos-browser/pkg-descr index 9cd0684da1f9..6d4f839740ba 100644 --- a/x11-fm/deforaos-browser/pkg-descr +++ b/x11-fm/deforaos-browser/pkg-descr @@ -1 +1 @@ -DeforaOS desktop browser +DeforaOS desktop file manager and desktop handler diff --git a/x11-fm/deforaos-browser/pkg-plist b/x11-fm/deforaos-browser/pkg-plist index 9a04e8d4aab5..cda105b35d8d 100644 --- a/x11-fm/deforaos-browser/pkg-plist +++ b/x11-fm/deforaos-browser/pkg-plist @@ -29,6 +29,10 @@ lib/libBrowser.so lib/libBrowser.so.0 lib/libBrowser.so.0.0 libdata/pkgconfig/Browser.pc +%%PORTDOCS%%share/doc/Browser/COPYING +%%PORTDOCS%%share/doc/Browser/README.md +%%PORTDOCS%%share/doc/Browser/pinentry-sudo-askpass +%%PORTDOCS%%share/doc/Browser/zenity-sudo-askpass %%PORTDOCS%%man/man1/browser.1.gz %%PORTDOCS%%man/man1/copy.1.gz %%PORTDOCS%%man/man1/delete.1.gz @@ -38,8 +42,10 @@ libdata/pkgconfig/Browser.pc %%PORTDOCS%%man/man1/open.1.gz %%PORTDOCS%%man/man1/properties.1.gz %%PORTDOCS%%man/man1/view.1.gz -share/applications/deforaos-browser.desktop -share/applications/deforaos-desktop-settings.desktop +share/applications/org.defora.browser.desktop +share/applications/org.defora.browser-folder.desktop +share/applications/org.defora.desktop-settings.desktop +share/applications/org.defora.view.desktop share/icons/hicolor/16x16/apps/browser-view-details.png share/icons/hicolor/16x16/apps/browser-view-icons.png share/icons/hicolor/16x16/apps/browser-view-list.png