Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add libstone support in libarchive #4255

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Add libstone support in libarchive #4255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ff1e22
serpent-tools: Add at 0.0.1
tarkah Nov 5, 2024
05f2098
libarchive: Build with stone support
ReillyBrogan Nov 8, 2024
bb3e096
file-roller: Add stone archive mimetype
ReillyBrogan Nov 8, 2024
f6019d1
ark: Support stone mimetype
ReillyBrogan Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions packages/a/ark/files/0001-Add-read-only-for-stone-mimetype.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Reilly Brogan <[email protected]>
Date: Thu, 7 Nov 2024 23:01:41 -0600
Subject: [PATCH] Add read-only for stone mimetype

---
plugins/libarchive/kerfuffle_libarchive_readonly.json.cmake | 1 +
1 file changed, 1 insertion(+)

diff --git a/plugins/libarchive/kerfuffle_libarchive_readonly.json.cmake b/plugins/libarchive/kerfuffle_libarchive_readonly.json.cmake
index 15dce503..a9bf483f 100644
--- a/plugins/libarchive/kerfuffle_libarchive_readonly.json.cmake
+++ b/plugins/libarchive/kerfuffle_libarchive_readonly.json.cmake
@@ -43,6 +43,7 @@
"application/x-sv4cpio",
"application/x-sv4crc",
"application/x-rpm",
+ "application/x-stone-archive",
"application/x-compress",
"application/gzip",
"application/x-bzip",
4 changes: 3 additions & 1 deletion packages/a/ark/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name : ark

Check notice on line 1 in packages/a/ark/package.yml

View workflow job for this annotation

GitHub Actions / Checks 

This package is included in the ISO. Consider validating the functionality in a newly built ISO.

Check warning on line 1 in packages/a/ark/package.yml

View workflow job for this annotation

GitHub Actions / Checks 

`monitoring.yml` is missing
version : 24.08.3
release : 92
release : 93
source :
- https://download.kde.org/stable/release-service/24.08.3/src/ark-24.08.3.tar.xz : 3c6a100fbb8512b8f891726274658c51ce10f9318d4c14dbb2380a2c602f321b
homepage : https://kde.org/applications/utilities/org.kde.ark
Expand Down Expand Up @@ -32,6 +32,8 @@
- speed
- thin-lto
setup : |
%patch -p1 -i $pkgfiles/0001-Add-read-only-for-stone-mimetype.patch

%cmake_kf6
build : |
%ninja_build
Expand Down
4 changes: 2 additions & 2 deletions packages/a/ark/pspec_x86_64.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@
</Files>
</Package>
<History>
<Update release="92">
<Date>2024-11-07</Date>
<Update release="93">
<Date>2024-11-08</Date>
<Version>24.08.3</Version>
<Comment>Packaging update</Comment>
<Name>Reilly Brogan</Name>
Expand Down
41 changes: 41 additions & 0 deletions packages/f/file-roller/files/0001-stone-mime.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <[email protected]>
Date: Thu, 7 Nov 2024 14:34:58 -0800
Subject: [PATCH] stone mime

---
data/supported-mime-types | 1 +
src/fr-archive-libarchive.c | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/data/supported-mime-types b/data/supported-mime-types
index 3c5a76d6..8abd45cd 100644
--- a/data/supported-mime-types
+++ b/data/supported-mime-types
@@ -63,3 +63,4 @@ application/x-zstd-compressed-tar;
application/x-zoo;
application/zip;
application/zstd;
+application/x-stone-archive;
diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c
index 14045729..92b77067 100644
--- a/src/fr-archive-libarchive.c
+++ b/src/fr-archive-libarchive.c
@@ -124,6 +124,7 @@ const char *libarchiver_mime_types[] = {
"application/x-zstd-compressed-tar",
#endif
"application/zip",
+ "application/x-stone-archive",
NULL
};

@@ -208,7 +209,8 @@ fr_archive_libarchive_get_capabilities (FrArchive *archive,
|| (strcmp (mime_type, "application/x-lha") == 0)
|| (strcmp (mime_type, "application/x-rar") == 0)
|| (strcmp (mime_type, "application/x-rpm") == 0)
- || (strcmp (mime_type, "application/x-xar") == 0))
+ || (strcmp (mime_type, "application/x-xar") == 0)
+ || (strcmp (mime_type, "application/x-stone-archive") == 0))
{
return capabilities;
}
4 changes: 3 additions & 1 deletion packages/f/file-roller/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name : file-roller

Check notice on line 1 in packages/f/file-roller/package.yml

View workflow job for this annotation

GitHub Actions / Checks 

This package is included in the ISO. Consider validating the functionality in a newly built ISO.
version : '44.3'
release : 46
release : 47
source :
- https://download.gnome.org/sources/file-roller/44/file-roller-44.3.tar.xz : 04c8a74625fec84267fdec40306afb4104bd332d85061e0d36d4ab0533adfa4a
homepage : https://gitlab.gnome.org/GNOME/file-roller/
Expand All @@ -20,6 +20,8 @@
rundeps :
- unrar
setup : |
%patch -p1 -i $pkgfiles/0001-stone-mime.patch

%meson_configure -Dpackagekit=false
build : |
%ninja_build
Expand Down
12 changes: 6 additions & 6 deletions packages/f/file-roller/pspec_x86_64.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<Name>file-roller</Name>
<Homepage>https://gitlab.gnome.org/GNOME/file-roller/</Homepage>
<Packager>
<Name>Jakob Gezelius</Name>
<Email>[email protected]</Email>
<Name>Reilly Brogan</Name>
<Email>[email protected]</Email>
</Packager>
<License>GPL-2.0-or-later</License>
<PartOf>desktop.gnome</PartOf>
Expand Down Expand Up @@ -542,12 +542,12 @@
</Files>
</Package>
<History>
<Update release="46">
<Date>2024-11-07</Date>
<Update release="47">
<Date>2024-11-08</Date>
<Version>44.3</Version>
<Comment>Packaging update</Comment>
<Name>Jakob Gezelius</Name>
<Email>[email protected]</Email>
<Name>Reilly Brogan</Name>
<Email>[email protected]</Email>
</Update>
</History>
</PISI>
1 change: 1 addition & 0 deletions packages/l/libarchive/abi_symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ libarchive.so.13:archive_read_support_format_mtree
libarchive.so.13:archive_read_support_format_rar
libarchive.so.13:archive_read_support_format_rar5
libarchive.so.13:archive_read_support_format_raw
libarchive.so.13:archive_read_support_format_stone
libarchive.so.13:archive_read_support_format_tar
libarchive.so.13:archive_read_support_format_warc
libarchive.so.13:archive_read_support_format_xar
Expand Down
1 change: 1 addition & 0 deletions packages/l/libarchive/abi_symbols32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ libarchive.so.13:archive_read_support_format_mtree
libarchive.so.13:archive_read_support_format_rar
libarchive.so.13:archive_read_support_format_rar5
libarchive.so.13:archive_read_support_format_raw
libarchive.so.13:archive_read_support_format_stone
libarchive.so.13:archive_read_support_format_tar
libarchive.so.13:archive_read_support_format_warc
libarchive.so.13:archive_read_support_format_xar
Expand Down
1 change: 1 addition & 0 deletions packages/l/libarchive/abi_used_libs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
libacl.so.1
libb2.so.1

Check warning on line 2 in packages/l/libarchive/abi_used_libs

View workflow job for this annotation

GitHub Actions / Checks 

Dependency not in system.base/devel: libb2
libbz2.so.1.0
libc.so.6
libcrypto.so.3
liblz4.so.1
liblzma.so.5
liblzo2.so.2

Check warning on line 8 in packages/l/libarchive/abi_used_libs

View workflow job for this annotation

GitHub Actions / Checks 

Dependency not in system.base/devel: lzo
libstone.so.0.24
libxml2.so.2
libz.so.1
libzstd.so.1
11 changes: 11 additions & 0 deletions packages/l/libarchive/abi_used_symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,17 @@ liblzo2.so.2:lzo1x_decompress_safe
liblzo2.so.2:lzo_adler32
liblzo2.so.2:lzo_version
liblzo2.so.2:lzo_version_string
libstone.so.0.24:stone_payload_content_reader_destroy
libstone.so.0.24:stone_payload_content_reader_read
libstone.so.0.24:stone_payload_destroy
libstone.so.0.24:stone_payload_header
libstone.so.0.24:stone_payload_next_index_record
libstone.so.0.24:stone_payload_next_layout_record
libstone.so.0.24:stone_read
libstone.so.0.24:stone_reader_destroy
libstone.so.0.24:stone_reader_header_v1
libstone.so.0.24:stone_reader_next_payload
libstone.so.0.24:stone_reader_read_content_payload
libxml2.so.2:UTF8Toisolat1
libxml2.so.2:xmlBufferCreate
libxml2.so.2:xmlBufferFree
Expand Down
Loading