diff options
Diffstat (limited to 'x11-fm')
-rw-r--r-- | x11-fm/krusader2/Makefile | 5 | ||||
-rw-r--r-- | x11-fm/krusader2/files/patch-plugins_krarc_krarc.cpp | 17 | ||||
-rw-r--r-- | x11-fm/nemo/Makefile | 35 | ||||
-rw-r--r-- | x11-fm/nemo/distinfo | 6 | ||||
-rw-r--r-- | x11-fm/nemo/files/patch-libnemo-private_nemo-statx.c | 102 | ||||
-rw-r--r-- | x11-fm/nemo/pkg-descr | 4 | ||||
-rw-r--r-- | x11-fm/nemo/pkg-plist | 39 | ||||
-rw-r--r-- | x11-fm/thunar/Makefile | 2 | ||||
-rw-r--r-- | x11-fm/thunar/distinfo | 6 |
9 files changed, 78 insertions, 138 deletions
diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile index 44486aae19e2..470830fa8b8b 100644 --- a/x11-fm/krusader2/Makefile +++ b/x11-fm/krusader2/Makefile @@ -1,5 +1,6 @@ PORTNAME= krusader DISTVERSION= 2.9.0 +PORTREVISION= 1 CATEGORIES= x11-fm kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/ @@ -22,4 +23,8 @@ USE_KDE= archive bookmarks codecs completion config coreaddons \ USE_QT= 5compat base USE_XORG= x11 +post-patch: +# Prefer unzip from ports to the base bsdunzip. + ${REINPLACE_CMD} 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/plugins/krarc/krarc.cpp + .include <bsd.port.mk> diff --git a/x11-fm/krusader2/files/patch-plugins_krarc_krarc.cpp b/x11-fm/krusader2/files/patch-plugins_krarc_krarc.cpp new file mode 100644 index 000000000000..2c23e15c75fc --- /dev/null +++ b/x11-fm/krusader2/files/patch-plugins_krarc_krarc.cpp @@ -0,0 +1,17 @@ +--- plugins/krarc/krarc.cpp.orig 2025-07-16 12:16:19 UTC ++++ plugins/krarc/krarc.cpp +@@ -1568,10 +1568,10 @@ KIO::WorkerResult kio_krarcProtocol::initArcParameters + + if (arcType == "zip") { + noencoding = true; +- cmd = fullPathName("unzip"); +- listCmd << fullPathName("unzip") << "-ZTs-z-t-h"; +- getCmd << fullPathName("unzip") << "-p"; +- copyCmd << fullPathName("unzip") << "-jo"; ++ cmd = QString("%%LOCALBASE%%/bin/unzip"); ++ listCmd << cmd << "-ZTs-z-t-h"; ++ getCmd << cmd << "-p"; ++ copyCmd << cmd << "-jo"; + + if (QStandardPaths::findExecutable(QStringLiteral("zip")).isEmpty()) { + delCmd = QStringList(); diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile index 76c50100a16d..06cd5b8b4ebe 100644 --- a/x11-fm/nemo/Makefile +++ b/x11-fm/nemo/Makefile @@ -1,6 +1,5 @@ PORTNAME= nemo -PORTVERSION= 5.4.2 -PORTREVISION= 7 +DISTVERSION= 6.4.5 CATEGORIES= x11-fm gnome DIST_SUBDIR= gnome @@ -13,27 +12,36 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB -BUILD_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme \ - gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas LIB_DEPENDS= libcinnamon-desktop.so:x11/cinnamon-desktop \ - libxapp.so:x11/xapp -RUN_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme \ + libxapp.so:x11/xapp \ + libjson-glib-1.0.so:devel/json-glib \ + libxmlb.so:textproc/libxmlb +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pdfminer.six>=0:textproc/py-pdfminer.six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xlrd>=0:textproc/py-xlrd@${PY_FLAVOR} \ + catdoc:textproc/catdoc \ + exif:graphics/exif \ gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \ - gvfs>0:filesystems/gvfs + gvfs>0:filesystems/gvfs \ + html2text:textproc/html2text \ + id3:audio/id3mtag \ + pdftotext:graphics/poppler-utils \ + ps2ascii:print/ghostscript10 -USES= compiler:c11 desktop-file-utils gettext gnome meson pkgconfig \ - python shared-mime-info shebangfix xorg +USES= compiler:c11 desktop-file-utils gettext-runtime gnome meson pkgconfig \ + python localbase shebangfix xorg -SHEBANG_FILES= generate_additional_file makepot search-helpers/nemo-xls-to-txt +SHEBANG_FILES= generate_additional_file search-helpers/nemo-xls-to-txt \ + search-helpers/nemo-odf-to-txt SHEBANG_GLOB= *.py USE_GITHUB= yes GH_ACCOUNT= linuxmint -USE_GNOME= cairo gdkpixbuf gtk30 intlhack introspection libgsf \ - libxml2 pango pygobject3 +USE_GNOME= cairo gdkpixbuf gtk30 intltool pygobject3 libgsf \ + introspection:build -USE_XORG= x11 +USE_XORG= x11 xext xorgproto xrender MESON_ARGS= -Dtracker=false @@ -43,7 +51,6 @@ USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS EXEMPI EXIF OPTIONS_DEFAULT= DOCS EXEMPI EXIF -OPTIONS_SUB= yes EXEMPI_DESC= XMP support EXIF_DESC= Digital camera file meta-data support diff --git a/x11-fm/nemo/distinfo b/x11-fm/nemo/distinfo index ceb098b99dd0..67166cda38a7 100644 --- a/x11-fm/nemo/distinfo +++ b/x11-fm/nemo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660059700 -SHA256 (gnome/linuxmint-nemo-5.4.2_GH0.tar.gz) = 7e92210804ab1b2f4cd1799afb54fc60ff81281901af36bbe99790b3fd5f40c1 -SIZE (gnome/linuxmint-nemo-5.4.2_GH0.tar.gz) = 1495290 +TIMESTAMP = 1740936909 +SHA256 (gnome/linuxmint-nemo-6.4.5_GH0.tar.gz) = 06dc3c7884dc0ec8ce4d55ed48f0cd77cbf7bd6be5dba9ed883d49a43118ebdf +SIZE (gnome/linuxmint-nemo-6.4.5_GH0.tar.gz) = 1511087 diff --git a/x11-fm/nemo/files/patch-libnemo-private_nemo-statx.c b/x11-fm/nemo/files/patch-libnemo-private_nemo-statx.c deleted file mode 100644 index 6f627d0f0da9..000000000000 --- a/x11-fm/nemo/files/patch-libnemo-private_nemo-statx.c +++ /dev/null @@ -1,102 +0,0 @@ ---- libnemo-private/nemo-statx.c.orig 2018-12-15 14:00:45 UTC -+++ libnemo-private/nemo-statx.c -@@ -21,16 +21,17 @@ - #define _ATFILE_SOURCE - #include <config.h> - #include <time.h> --#include <linux/fcntl.h> // for AT_FDCWD, AT_NO_AUTOMOUNT --#include <linux/stat.h> // for statx, STATX_BTIME, statx_timestamp - #include <string.h> // for memset --#include <syscall.h> // for __NR_statx - #include <unistd.h> // for syscall, ssize_t - #include <stdio.h> - #include <errno.h> - - #if NATIVE_STATX - /* native statx call */ -+#include <linux/fcntl.h> // for AT_FDCWD, AT_NO_AUTOMOUNT -+#include <linux/stat.h> // for statx, STATX_BTIME, statx_timestamp -+#include <syscall.h> // for __NR_statx -+ - static __attribute__((unused)) - ssize_t statx (int dfd, const char *filename, unsigned flags, - unsigned int mask, struct statx *buffer) -@@ -41,6 +42,11 @@ ssize_t statx (int dfd, const char *filename, unsigned - #else - /* statx wrapper/compatibility */ - -+#define AT_FDCWD -100 /* Special value used to indicate -+ openat should use the current -+ working directory. */ -+#define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount traversal */ -+ - /* this code works ony with x86 and x86_64 */ - #if __x86_64__ - #define __NR_statx 332 -@@ -51,39 +57,39 @@ ssize_t statx (int dfd, const char *filename, unsigned - #define STATX_BTIME 0x00000800U /* Want/got stx_btime */ - - struct statx_timestamp { -- __s64 tv_sec; -- __u32 tv_nsec; -- __s32 __reserved; -+ int64_t tv_sec; -+ uint32_t tv_nsec; -+ int32_t __reserved; - }; - - struct statx { - /* 0x00 */ -- __u32 stx_mask; /* What results were written [uncond] */ -- __u32 stx_blksize; /* Preferred general I/O size [uncond] */ -- __u64 stx_attributes; /* Flags conveying information about the file [uncond] */ -+ uint32_t stx_mask; /* What results were written [uncond] */ -+ uint32_t stx_blksize; /* Preferred general I/O size [uncond] */ -+ uint64_t stx_attributes; /* Flags conveying information about the file [uncond] */ - /* 0x10 */ -- __u32 stx_nlink; /* Number of hard links */ -- __u32 stx_uid; /* User ID of owner */ -- __u32 stx_gid; /* Group ID of owner */ -- __u16 stx_mode; /* File mode */ -- __u16 __spare0[1]; -+ uint32_t stx_nlink; /* Number of hard links */ -+ uint32_t stx_uid; /* User ID of owner */ -+ uint32_t stx_gid; /* Group ID of owner */ -+ uint16_t stx_mode; /* File mode */ -+ uint16_t __spare0[1]; - /* 0x20 */ -- __u64 stx_ino; /* Inode number */ -- __u64 stx_size; /* File size */ -- __u64 stx_blocks; /* Number of 512-byte blocks allocated */ -- __u64 stx_attributes_mask; /* Mask to show what's supported in stx_attributes */ -+ uint64_t stx_ino; /* Inode number */ -+ uint64_t stx_size; /* File size */ -+ uint64_t stx_blocks; /* Number of 512-byte blocks allocated */ -+ uint64_t stx_attributes_mask; /* Mask to show what's supported in stx_attributes */ - /* 0x40 */ - struct statx_timestamp stx_atime; /* Last access time */ - struct statx_timestamp stx_btime; /* File creation time */ - struct statx_timestamp stx_ctime; /* Last attribute change time */ - struct statx_timestamp stx_mtime; /* Last data modification time */ - /* 0x80 */ -- __u32 stx_rdev_major; /* Device ID of special file [if bdev/cdev] */ -- __u32 stx_rdev_minor; -- __u32 stx_dev_major; /* ID of device containing file [uncond] */ -- __u32 stx_dev_minor; -+ uint32_t stx_rdev_major; /* Device ID of special file [if bdev/cdev] */ -+ uint32_t stx_rdev_minor; -+ uint32_t stx_dev_major; /* ID of device containing file [uncond] */ -+ uint32_t stx_dev_minor; - /* 0x90 */ -- __u64 __spare2[14]; /* Spare space for future expansion */ -+ uint64_t __spare2[14]; /* Spare space for future expansion */ - /* 0x100 */ - }; - -@@ -129,4 +135,4 @@ get_file_btime (const char *path) - btime = (&stxbuf)->stx_btime.tv_sec; - - return btime; --} -\ No newline at end of file -+} diff --git a/x11-fm/nemo/pkg-descr b/x11-fm/nemo/pkg-descr index 744afaa26915..e04f81dc7621 100644 --- a/x11-fm/nemo/pkg-descr +++ b/x11-fm/nemo/pkg-descr @@ -1 +1,3 @@ -Nemo, forked from Nautilus, is the file manager of Cinnamon. +Nemo is a free and open-source software and official file manager of the +Cinnamon desktop environment. +It is a fork of GNOME Files (formerly named Nautilus). diff --git a/x11-fm/nemo/pkg-plist b/x11-fm/nemo/pkg-plist index af25dd11bae6..d148402895c9 100644 --- a/x11-fm/nemo/pkg-plist +++ b/x11-fm/nemo/pkg-plist @@ -1,9 +1,11 @@ bin/nemo +bin/nemo-action-layout-editor bin/nemo-autorun-software bin/nemo-connect-server bin/nemo-desktop bin/nemo-epub2text bin/nemo-mso-to-txt +bin/nemo-odf-to-txt bin/nemo-open-with bin/nemo-ppt-to-txt bin/nemo-xls-to-txt @@ -26,7 +28,6 @@ lib/libnemo-extension.so lib/libnemo-extension.so.1 lib/libnemo-extension.so.1.4.0 libdata/pkgconfig/libnemo-extension.pc -libexec/nemo-convert-metadata libexec/nemo-extensions-list share/man/man1/nemo-connect-server.1.gz share/man/man1/nemo-desktop.1.gz @@ -84,35 +85,42 @@ share/icons/hicolor/22x22/apps/nemo.png share/icons/hicolor/24x24/apps/nemo.png share/icons/hicolor/32x32/actions/nemo-eject.png share/icons/hicolor/32x32/apps/nemo.png -share/icons/hicolor/48x48/status/progress-0.png -share/icons/hicolor/48x48/status/progress-10.png -share/icons/hicolor/48x48/status/progress-100.png -share/icons/hicolor/48x48/status/progress-20.png -share/icons/hicolor/48x48/status/progress-30.png -share/icons/hicolor/48x48/status/progress-40.png -share/icons/hicolor/48x48/status/progress-50.png -share/icons/hicolor/48x48/status/progress-60.png -share/icons/hicolor/48x48/status/progress-70.png -share/icons/hicolor/48x48/status/progress-80.png -share/icons/hicolor/48x48/status/progress-90.png share/icons/hicolor/scalable/actions/location-symbolic.svg +share/icons/hicolor/scalable/actions/location-symbolic-rtl.svg share/icons/hicolor/scalable/actions/mount-archive-symbolic.svg share/icons/hicolor/scalable/actions/nemo-auto-arrange-symbolic.svg share/icons/hicolor/scalable/actions/nemo-desktop-scale-symbolic.svg share/icons/hicolor/scalable/actions/nemo-horizontal-layout-symbolic.svg share/icons/hicolor/scalable/actions/nemo-horizontal-layout-wide-symbolic.svg share/icons/hicolor/scalable/actions/nemo-recursive-search-symbolic.svg +share/icons/hicolor/scalable/actions/nemo-recursive-search-symbolic-rtl.svg share/icons/hicolor/scalable/actions/nemo-vertical-layout-symbolic.svg share/icons/hicolor/scalable/actions/nemo-vertical-layout-wide-symbolic.svg share/icons/hicolor/scalable/actions/sidebar-hide-symbolic.svg +share/icons/hicolor/scalable/actions/sidebar-hide-symbolic-rtl.svg share/icons/hicolor/scalable/actions/sidebar-places-symbolic.svg share/icons/hicolor/scalable/actions/sidebar-show-symbolic.svg +share/icons/hicolor/scalable/actions/sidebar-show-symbolic-rtl.svg share/icons/hicolor/scalable/actions/sidebar-tree-symbolic.svg +share/icons/hicolor/scalable/actions/sidebar-tree-symbolic-rtl.svg share/icons/hicolor/scalable/actions/view-compact-symbolic.svg share/icons/hicolor/scalable/apps/nemo.svg share/icons/hicolor/scalable/devices/drive-removable-media-usb-symbolic.svg share/icons/hicolor/scalable/status/nemo-bookmark-not-found-symbolic.svg +share/icons/hicolor/scalable/status/nemo-progress-0-symbolic.svg +share/icons/hicolor/scalable/status/nemo-progress-10-symbolic.svg +share/icons/hicolor/scalable/status/nemo-progress-100-symbolic.svg +share/icons/hicolor/scalable/status/nemo-progress-20-symbolic.svg +share/icons/hicolor/scalable/status/nemo-progress-30-symbolic.svg +share/icons/hicolor/scalable/status/nemo-progress-40-symbolic.svg +share/icons/hicolor/scalable/status/nemo-progress-50-symbolic.svg +share/icons/hicolor/scalable/status/nemo-progress-60-symbolic.svg +share/icons/hicolor/scalable/status/nemo-progress-70-symbolic.svg +share/icons/hicolor/scalable/status/nemo-progress-80-symbolic.svg +share/icons/hicolor/scalable/status/nemo-progress-90-symbolic.svg share/mime/packages/nemo.xml +%%DATADIR%%/action-info.md +%%DATADIR%%/actions/90_new-launcher.nemo_action %%DATADIR%%/actions/90_new-workspace.nemo_action %%DATADIR%%/actions/91_delete-workspace.nemo_action %%DATADIR%%/actions/92_show-expo.nemo_action @@ -120,21 +128,24 @@ share/mime/packages/nemo.xml %%DATADIR%%/actions/change-background.nemo_action %%DATADIR%%/actions/mount-archive.nemo_action %%DATADIR%%/actions/myaction.py -%%DATADIR%%/actions/new-launcher.nemo_action %%DATADIR%%/actions/sample.nemo_action %%DATADIR%%/actions/set-as-background.nemo_action +%%DATADIR%%/actions/set-resolution.nemo_action %%DATADIR%%/icons/hicolor/16x16/emblems/emblem-note.png %%DATADIR%%/icons/hicolor/24x24/emblems/emblem-note.png %%DATADIR%%/icons/hicolor/48x48/emblems/emblem-note.png +%%DATADIR%%/layout-editor/leconfig.py +%%DATADIR%%/layout-editor/nemo_action_layout_editor.py +%%DATADIR%%/nemo-action-layout-editor-resources.gresource %%DATADIR%%/script-info.md %%DATADIR%%/search-helpers/exif.nemo_search_helper %%DATADIR%%/search-helpers/epub2text.nemo_search_helper %%DATADIR%%/search-helpers/id3.nemo_search_helper -%%DATADIR%%/search-helpers/libreoffice.nemo_search_helper %%DATADIR%%/search-helpers/mso-doc.nemo_search_helper %%DATADIR%%/search-helpers/mso-ppt.nemo_search_helper %%DATADIR%%/search-helpers/mso-xls.nemo_search_helper %%DATADIR%%/search-helpers/mso.nemo_search_helper +%%DATADIR%%/search-helpers/odf.nemo_search_helper %%DATADIR%%/search-helpers/pdf2txt.nemo_search_helper %%DATADIR%%/search-helpers/pdftotext.nemo_search_helper %%DATADIR%%/search-helpers/ps2ascii.nemo_search_helper diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile index e158981930cb..a911550f7503 100644 --- a/x11-fm/thunar/Makefile +++ b/x11-fm/thunar/Makefile @@ -1,5 +1,5 @@ PORTNAME= thunar -DISTVERSION= 4.20.3 +DISTVERSION= 4.20.4 CATEGORIES= x11-fm xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 diff --git a/x11-fm/thunar/distinfo b/x11-fm/thunar/distinfo index aa858ea0fbf8..10238d5b259c 100644 --- a/x11-fm/thunar/distinfo +++ b/x11-fm/thunar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1747393966 -SHA256 (xfce4/thunar-4.20.3.tar.bz2) = fe1908b396298e6515a90fa9ddaec0db8b684e4b3d7773118e21561baf8f9639 -SIZE (xfce4/thunar-4.20.3.tar.bz2) = 4530792 +TIMESTAMP = 1752854231 +SHA256 (xfce4/thunar-4.20.4.tar.bz2) = c4f2fc55d285deef134859847ef6f0e9096ed7987ef7aa066de5a9e347a15fd9 +SIZE (xfce4/thunar-4.20.4.tar.bz2) = 4519971 |