diff options
9 files changed, 159 insertions, 22 deletions
diff --git a/x11-fm/deforaos-browser/Makefile b/x11-fm/deforaos-browser/Makefile index 3bc914cc8581..be0dbf1608c5 100644 --- a/x11-fm/deforaos-browser/Makefile +++ b/x11-fm/deforaos-browser/Makefile @@ -1,5 +1,6 @@ PORTNAME= deforaos-browser PORTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= x11-fm MASTER_SITES= https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/Browser/ DISTNAME= Browser-${PORTVERSION} @@ -11,26 +12,34 @@ WWW= https://www.defora.org/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libSystem.so:devel/deforaos-libsystem \ - libDesktop.so:x11/deforaos-libdesktop \ +LIB_DEPENDS= libDesktop.so:x11/deforaos-libdesktop \ libharfbuzz.so:print/harfbuzz \ + libSystem.so:devel/deforaos-libsystem \ 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 - -USE_GNOME= gtk30 cairo gdkpixbuf2 -USE_XORG= x11 +USES= desktop-file-utils gnome pkgconfig xorg +USE_GNOME= cairo gdkpixbuf2 gtk30 USE_LDCONFIG= yes +USE_XORG= x11 + MAKE_ARGS+= PREFIX=${PREFIX} MAKE_ENV+= MANDIR=${STAGEDIR}${PREFIX}/share/man -CONFLICTS_INSTALL= schilyutils silo # bin/browser bin/copy +MAKE_ARGS+= CPPFLAGS+=-DPROGNAME_BROWSER=\\\"deforaos-browser\\\" +MAKE_ARGS+= CPPFLAGS+=-DPROGNAME_COPY=\\\"deforaos-copy\\\" +MAKE_ARGS+= CPPFLAGS+=-DPROGNAME_DESKTOP=\\\"deforaos-desktop\\\" +MAKE_ARGS+= CPPFLAGS+=-DPROGNAME_DESKTOPCTL=\\\"deforaos-desktopctl\\\" +MAKE_ARGS+= CPPFLAGS+=-DPROGNAME_MOVE=\\\"deforaos-move\\\" +MAKE_ARGS+= CPPFLAGS+=-DPROGNAME_OPEN=\\\"deforaos-open\\\" +MAKE_ARGS+= CPPFLAGS+=-DPROGNAME_PROPERTIES=\\\"deforaos-properties\\\" +MAKE_ARGS+= CPPFLAGS+=-DPROGNAME_VIEW=\\\"deforaos-view\\\" + +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes +DOCS_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \ + xsltproc:textproc/libxslt +NLS_USES= gettext + post-patch: ${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \ ${WRKSRC}/data/pkgconfig.sh diff --git a/x11-fm/deforaos-browser/files/patch-data_org.defora.browser-folder.desktop b/x11-fm/deforaos-browser/files/patch-data_org.defora.browser-folder.desktop new file mode 100644 index 000000000000..84995f686175 --- /dev/null +++ b/x11-fm/deforaos-browser/files/patch-data_org.defora.browser-folder.desktop @@ -0,0 +1,13 @@ +--- data/org.defora.browser-folder.desktop.orig 2024-09-02 14:56:54 UTC ++++ data/org.defora.browser-folder.desktop +@@ -1,8 +1,8 @@ Comment=Open folder in file manager + [Desktop Entry] + Name=Open folder + Comment=Open folder in file manager +-TryExec=browser +-Exec=browser %F ++TryExec=deforaos-browser ++Exec=deforaos-browser %F + Icon=inode-directory + Type=Application + NoDisplay=true diff --git a/x11-fm/deforaos-browser/files/patch-data_org.defora.browser.desktop b/x11-fm/deforaos-browser/files/patch-data_org.defora.browser.desktop new file mode 100644 index 000000000000..d43173f5876e --- /dev/null +++ b/x11-fm/deforaos-browser/files/patch-data_org.defora.browser.desktop @@ -0,0 +1,13 @@ +--- data/org.defora.browser.desktop.orig 2024-09-02 14:56:54 UTC ++++ data/org.defora.browser.desktop +@@ -1,8 +1,8 @@ Comment=File manager and image browser + [Desktop Entry] + Name=File manager + Comment=File manager and image browser +-TryExec=browser +-Exec=browser ++TryExec=deforaos-browser ++Exec=deforaos-browser + Icon=system-file-manager + Type=Application + Categories=System;Core;FileManager;GTK; diff --git a/x11-fm/deforaos-browser/files/patch-data_org.defora.desktop-settings.desktop b/x11-fm/deforaos-browser/files/patch-data_org.defora.desktop-settings.desktop new file mode 100644 index 000000000000..76e6e4d1fbae --- /dev/null +++ b/x11-fm/deforaos-browser/files/patch-data_org.defora.desktop-settings.desktop @@ -0,0 +1,13 @@ +--- data/org.defora.desktop-settings.desktop.orig 2024-09-02 14:56:54 UTC ++++ data/org.defora.desktop-settings.desktop +@@ -1,8 +1,8 @@ Comment=Preferences for the desktop + [Desktop Entry] + Name=Desktop + Comment=Preferences for the desktop +-TryExec=desktopctl +-Exec=desktopctl -S ++TryExec=deforaos-desktopctl ++Exec=deforaos-desktopctl -S + Icon=gnome-settings-background + Type=Application + Categories=Settings;DesktopSettings;GTK; diff --git a/x11-fm/deforaos-browser/files/patch-data_org.defora.view.desktop b/x11-fm/deforaos-browser/files/patch-data_org.defora.view.desktop new file mode 100644 index 000000000000..7893b9f248e3 --- /dev/null +++ b/x11-fm/deforaos-browser/files/patch-data_org.defora.view.desktop @@ -0,0 +1,13 @@ +--- data/org.defora.view.desktop.orig 2024-09-02 14:56:54 UTC ++++ data/org.defora.view.desktop +@@ -1,8 +1,8 @@ Comment=Viewer for text and image files + [Desktop Entry] + Name=File viewer + Comment=Viewer for text and image files +-TryExec=view +-Exec=view %F ++TryExec=deforaos-view ++Exec=deforaos-view %F + Icon=system-file-manager + Type=Application + Categories=System;Core;FileManager;GTK; diff --git a/x11-fm/deforaos-browser/files/patch-src_Makefile b/x11-fm/deforaos-browser/files/patch-src_Makefile new file mode 100644 index 000000000000..27bc28092c9e --- /dev/null +++ b/x11-fm/deforaos-browser/files/patch-src_Makefile @@ -0,0 +1,43 @@ +--- src/Makefile.orig 2024-09-02 14:42:34 UTC ++++ src/Makefile +@@ -109,28 +109,28 @@ install: all + $(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \ + else $(MAKE) install; fi) || exit; done + $(MKDIR) $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 0755 $(OBJDIR)copy$(EXEEXT) $(DESTDIR)$(BINDIR)/copy$(EXEEXT) ++ $(INSTALL) -m 0755 $(OBJDIR)copy$(EXEEXT) $(DESTDIR)$(BINDIR)/deforaos-copy$(EXEEXT) + $(MKDIR) $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 0755 $(OBJDIR)delete$(EXEEXT) $(DESTDIR)$(BINDIR)/delete$(EXEEXT) ++ $(INSTALL) -m 0755 $(OBJDIR)delete$(EXEEXT) $(DESTDIR)$(BINDIR)/deforaos-delete$(EXEEXT) + $(MKDIR) $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 0755 $(OBJDIR)move$(EXEEXT) $(DESTDIR)$(BINDIR)/move$(EXEEXT) ++ $(INSTALL) -m 0755 $(OBJDIR)move$(EXEEXT) $(DESTDIR)$(BINDIR)/deforaos-move$(EXEEXT) + $(MKDIR) $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 0755 $(OBJDIR)open$(EXEEXT) $(DESTDIR)$(BINDIR)/open$(EXEEXT) ++ $(INSTALL) -m 0755 $(OBJDIR)open$(EXEEXT) $(DESTDIR)$(BINDIR)/deforaos-open$(EXEEXT) + $(MKDIR) $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 0755 $(OBJDIR)properties$(EXEEXT) $(DESTDIR)$(BINDIR)/properties$(EXEEXT) ++ $(INSTALL) -m 0755 $(OBJDIR)properties$(EXEEXT) $(DESTDIR)$(BINDIR)/deforaos-properties$(EXEEXT) + $(MKDIR) $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 0755 $(OBJDIR)view$(EXEEXT) $(DESTDIR)$(BINDIR)/view$(EXEEXT) ++ $(INSTALL) -m 0755 $(OBJDIR)view$(EXEEXT) $(DESTDIR)$(BINDIR)/deforaos-view$(EXEEXT) + + uninstall: + @for i in $(SUBDIRS); do (cd "$$i" && \ + if [ -n "$(OBJDIR)" ]; then \ + $(MAKE) OBJDIR="$(OBJDIR)$$i/" uninstall; \ + else $(MAKE) uninstall; fi) || exit; done +- $(RM) -- $(DESTDIR)$(BINDIR)/copy$(EXEEXT) +- $(RM) -- $(DESTDIR)$(BINDIR)/delete$(EXEEXT) +- $(RM) -- $(DESTDIR)$(BINDIR)/move$(EXEEXT) +- $(RM) -- $(DESTDIR)$(BINDIR)/open$(EXEEXT) +- $(RM) -- $(DESTDIR)$(BINDIR)/properties$(EXEEXT) +- $(RM) -- $(DESTDIR)$(BINDIR)/view$(EXEEXT) ++ $(RM) -- $(DESTDIR)$(BINDIR)/deforaos-copy$(EXEEXT) ++ $(RM) -- $(DESTDIR)$(BINDIR)/deforaos-delete$(EXEEXT) ++ $(RM) -- $(DESTDIR)$(BINDIR)/deforaos-move$(EXEEXT) ++ $(RM) -- $(DESTDIR)$(BINDIR)/deforaos-open$(EXEEXT) ++ $(RM) -- $(DESTDIR)$(BINDIR)/deforaos-properties$(EXEEXT) ++ $(RM) -- $(DESTDIR)$(BINDIR)/deforaos-view$(EXEEXT) + + .PHONY: all subdirs clean distclean install uninstall diff --git a/x11-fm/deforaos-browser/files/patch-src_browser_Makefile b/x11-fm/deforaos-browser/files/patch-src_browser_Makefile new file mode 100644 index 000000000000..8adb96691121 --- /dev/null +++ b/x11-fm/deforaos-browser/files/patch-src_browser_Makefile @@ -0,0 +1,14 @@ +--- src/browser/Makefile.orig 2024-09-02 14:43:13 UTC ++++ src/browser/Makefile +@@ -47,9 +47,9 @@ install: all + + install: all + $(MKDIR) $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 0755 $(OBJDIR)browser$(EXEEXT) $(DESTDIR)$(BINDIR)/browser$(EXEEXT) ++ $(INSTALL) -m 0755 $(OBJDIR)browser$(EXEEXT) $(DESTDIR)$(BINDIR)/deforaos-browser$(EXEEXT) + + uninstall: +- $(RM) -- $(DESTDIR)$(BINDIR)/browser$(EXEEXT) ++ $(RM) -- $(DESTDIR)$(BINDIR)/deforaos-browser$(EXEEXT) + + .PHONY: all clean distclean install uninstall diff --git a/x11-fm/deforaos-browser/files/patch-src_desktop_Makefile b/x11-fm/deforaos-browser/files/patch-src_desktop_Makefile new file mode 100644 index 000000000000..a810f15c37c9 --- /dev/null +++ b/x11-fm/deforaos-browser/files/patch-src_desktop_Makefile @@ -0,0 +1,19 @@ +--- src/desktop/Makefile.orig 2024-09-02 14:43:29 UTC ++++ src/desktop/Makefile +@@ -67,12 +67,12 @@ install: all + + install: all + $(MKDIR) $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 0755 $(OBJDIR)desktop$(EXEEXT) $(DESTDIR)$(BINDIR)/desktop$(EXEEXT) ++ $(INSTALL) -m 0755 $(OBJDIR)desktop$(EXEEXT) $(DESTDIR)$(BINDIR)/deforaos-desktop$(EXEEXT) + $(MKDIR) $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 0755 $(OBJDIR)desktopctl$(EXEEXT) $(DESTDIR)$(BINDIR)/desktopctl$(EXEEXT) ++ $(INSTALL) -m 0755 $(OBJDIR)desktopctl$(EXEEXT) $(DESTDIR)$(BINDIR)/deforaos-desktopctl$(EXEEXT) + + uninstall: +- $(RM) -- $(DESTDIR)$(BINDIR)/desktop$(EXEEXT) +- $(RM) -- $(DESTDIR)$(BINDIR)/desktopctl$(EXEEXT) ++ $(RM) -- $(DESTDIR)$(BINDIR)/deforaos-desktop$(EXEEXT) ++ $(RM) -- $(DESTDIR)$(BINDIR)/deforaos-desktopctl$(EXEEXT) + + .PHONY: all clean distclean install uninstall diff --git a/x11-fm/deforaos-browser/pkg-plist b/x11-fm/deforaos-browser/pkg-plist index a929f4bdbb40..cfb8a68575da 100644 --- a/x11-fm/deforaos-browser/pkg-plist +++ b/x11-fm/deforaos-browser/pkg-plist @@ -1,12 +1,12 @@ -bin/browser -bin/copy -bin/delete -bin/desktop -bin/desktopctl -bin/move -bin/open -bin/properties -bin/view +bin/deforaos-browser +bin/deforaos-copy +bin/deforaos-delete +bin/deforaos-desktop +bin/deforaos-desktopctl +bin/deforaos-move +bin/deforaos-open +bin/deforaos-properties +bin/deforaos-view include/Desktop/Browser.h include/Desktop/Browser/browser.h include/Desktop/Browser/desktop.h |