From 4fa2f6bd8f1d227e76b62b3f98c6c9a71e57e3bd Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Fri, 15 Nov 2024 13:55:12 +0100 Subject: [PATCH] ghex: update to 46.1 --- components/desktop/ghex/Makefile | 4 ++-- components/desktop/ghex/ghex.p5m | 5 ----- components/desktop/ghex/manifests/sample-manifest.p5m | 1 - components/desktop/ghex/patches/01-no-linux-fs.patch | 12 ++++++------ 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/components/desktop/ghex/Makefile b/components/desktop/ghex/Makefile index 7ed88887d8..feed6fd4b5 100644 --- a/components/desktop/ghex/Makefile +++ b/components/desktop/ghex/Makefile @@ -18,9 +18,9 @@ USE_DEFAULT_TEST_TRANSFORMS = yes include ../../../make-rules/shared-macros.mk COMPONENT_NAME= ghex -HUMAN_VERSION= 46.0 +HUMAN_VERSION= 46.1 COMPONENT_SUMMARY= Hex editor for the GNOME desktop -COMPONENT_ARCHIVE_HASH= sha256:a1c46f3020cb358b8323025db3a539c97d994a4c46f701f48edc6357f7fbcbd1 +COMPONENT_ARCHIVE_HASH= sha256:8a13975474eee27719b29ad763f1b24760a1aede6d7da4b623703070bc26e9fd COMPONENT_FMRI= desktop/$(COMPONENT_NAME) COMPONENT_CLASSIFICATION=Applications/System Utilities COMPONENT_LICENSE= GPL-2.0-only diff --git a/components/desktop/ghex/ghex.p5m b/components/desktop/ghex/ghex.p5m index effc3ce3e6..332c1e6320 100644 --- a/components/desktop/ghex/ghex.p5m +++ b/components/desktop/ghex/ghex.p5m @@ -23,10 +23,6 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' -# mate menu icon needs to be in /usr/share/pixmaps -file usr/share/icons/hicolor/scalable/apps/org.gnome.GHex.Devel.svg path=usr/share/pixmaps/org.gnome.GHex.Devel.svg -file usr/share/icons/hicolor/scalable/apps/org.gnome.GHex.svg path=usr/share/pixmaps/org.gnome.GHex.svg - file path=usr/bin/ghex file path=usr/include/gtkhex-4/gtkhex-paste-data.h file path=usr/include/gtkhex-4/gtkhex.h @@ -321,7 +317,6 @@ file path=usr/share/locale/id/LC_MESSAGES/ghex.mo file path=usr/share/locale/ie/LC_MESSAGES/ghex.mo file path=usr/share/locale/it/LC_MESSAGES/ghex.mo file path=usr/share/locale/ja/LC_MESSAGES/ghex.mo -file path=usr/share/locale/ka/LC_MESSAGES/ghex.mo file path=usr/share/locale/ko/LC_MESSAGES/ghex.mo file path=usr/share/locale/lt/LC_MESSAGES/ghex.mo file path=usr/share/locale/lv/LC_MESSAGES/ghex.mo diff --git a/components/desktop/ghex/manifests/sample-manifest.p5m b/components/desktop/ghex/manifests/sample-manifest.p5m index 841c5a4d65..332c1e6320 100644 --- a/components/desktop/ghex/manifests/sample-manifest.p5m +++ b/components/desktop/ghex/manifests/sample-manifest.p5m @@ -317,7 +317,6 @@ file path=usr/share/locale/id/LC_MESSAGES/ghex.mo file path=usr/share/locale/ie/LC_MESSAGES/ghex.mo file path=usr/share/locale/it/LC_MESSAGES/ghex.mo file path=usr/share/locale/ja/LC_MESSAGES/ghex.mo -file path=usr/share/locale/ka/LC_MESSAGES/ghex.mo file path=usr/share/locale/ko/LC_MESSAGES/ghex.mo file path=usr/share/locale/lt/LC_MESSAGES/ghex.mo file path=usr/share/locale/lv/LC_MESSAGES/ghex.mo diff --git a/components/desktop/ghex/patches/01-no-linux-fs.patch b/components/desktop/ghex/patches/01-no-linux-fs.patch index 6efe045634..4fa252ee8d 100644 --- a/components/desktop/ghex/patches/01-no-linux-fs.patch +++ b/components/desktop/ghex/patches/01-no-linux-fs.patch @@ -1,5 +1,5 @@ ---- ghex-46.0/meson.build.orig -+++ ghex-46.0/meson.build +--- ghex-46.1/meson.build.orig ++++ ghex-46.1/meson.build @@ -141,7 +141,6 @@ 'unistd.h', 'fcntl.h', @@ -8,8 +8,8 @@ ] foreach h : check_headers_direct cc.has_header(h, required: true) ---- ghex-46.0/src/hex-buffer-direct.h.orig -+++ ghex-46.0/src/hex-buffer-direct.h +--- ghex-46.1/src/hex-buffer-direct.h.orig ++++ ghex-46.1/src/hex-buffer-direct.h @@ -33,7 +33,13 @@ #include #include @@ -24,8 +24,8 @@ G_BEGIN_DECLS ---- ghex-46.0/src/hex-buffer-direct.c.orig -+++ ghex-46.0/src/hex-buffer-direct.c +--- ghex-46.1/src/hex-buffer-direct.c.orig ++++ ghex-46.1/src/hex-buffer-direct.c @@ -412,11 +412,23 @@ { gint64 block_file_size; -- 2.11.4.GIT