Accepting request 1004680 from GNOME:Apps
Now with patch OBS-URL: https://build.opensuse.org/request/show/1004680 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghex?expand=0&rev=62
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
cf795e627c
31
8927f9a7.patch
Normal file
31
8927f9a7.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From 8927f9a71e6b0fa46d9c9c11d318333ce6524bf2 Mon Sep 17 00:00:00 2001
|
||||
From: Logan Rathbone <poprocks@gmail.com>
|
||||
Date: Wed, 7 Sep 2022 16:26:44 -0400
|
||||
Subject: [PATCH] icons: Make document-modified-symbolic a resource
|
||||
|
||||
Fixes #52
|
||||
---
|
||||
.../scalable/actions => src}/document-modified-symbolic.svg | 0
|
||||
src/ghex.gresource.xml.in | 3 +++
|
||||
2 files changed, 3 insertions(+)
|
||||
rename {icons/hicolor/scalable/actions => src}/document-modified-symbolic.svg (100%)
|
||||
|
||||
diff --git a/icons/hicolor/scalable/actions/document-modified-symbolic.svg b/src/document-modified-symbolic.svg
|
||||
similarity index 100%
|
||||
rename from icons/hicolor/scalable/actions/document-modified-symbolic.svg
|
||||
rename to src/document-modified-symbolic.svg
|
||||
diff --git a/src/ghex.gresource.xml.in b/src/ghex.gresource.xml.in
|
||||
index 512f174..d1e1cf0 100644
|
||||
--- a/src/ghex.gresource.xml.in
|
||||
+++ b/src/ghex.gresource.xml.in
|
||||
@@ -39,4 +39,7 @@
|
||||
<gresource prefix="@resource_base_path@/gtk">
|
||||
<file preprocess="xml-stripblanks">help-overlay.ui</file>
|
||||
</gresource>
|
||||
+ <gresource prefix="@resource_base_path@/icons/scalable/actions">
|
||||
+ <file>document-modified-symbolic.svg</file>
|
||||
+ </gresource>
|
||||
</gresources>
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:add40f8ab24921db30d27be58f00273201977d87fdc8d79eceadfa8b0e354def
|
||||
size 1003928
|
||||
3
ghex-43.alpha.tar.xz
Normal file
3
ghex-43.alpha.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b49b6d54727c266a36d89423d2bfb538507f6955374362282fc5222cc2310b8f
|
||||
size 1016068
|
||||
48
ghex.changes
48
ghex.changes
@ -1,3 +1,51 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 19 08:50:36 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Add 8927f9a7.patch: icons: Make document-modified-symbolic a
|
||||
resource.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 5 08:26:11 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Add ghex_abi and so_ver_ext define and set to 4 and 0 following
|
||||
upstream changes and set so_ver define to 1. Further, add a
|
||||
soname define, and set it to libgtkhex-%%{ghex_abi}-%%{so_ver},
|
||||
ease future updates.
|
||||
- Move gtkhex-*/*.so to main package, and obsolete older versions
|
||||
of libgtkhex-* from the same. These private so files (plugins)
|
||||
should never have been packaged in the shared library package, so
|
||||
now we have to clean up our previous sins.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 7 13:30:03 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to version 43.alpha:
|
||||
+ Port to libadwaita, and fix UI papercuts that stood out more
|
||||
thereafter.
|
||||
+ Introduce custom statusbar with monospace support
|
||||
+ HexWidget:
|
||||
- Add API to show/hide specific columns.
|
||||
- Disallow keyboard shortcuts to activate hidden panes.
|
||||
- Support PRIMARY selection.
|
||||
+ Find and Replace improvements:
|
||||
- Support options for case-sensitivity, regex.
|
||||
- Choose visibility of hex/ascii/both in find/replace dialogs.
|
||||
- Show number of replacements with Replace All.
|
||||
+ New backend: HexBufferDirect, and support for reading/writing
|
||||
block devices.
|
||||
+ Load default backend plugins more intelligently.
|
||||
+ docs: document slight change in hex_buffer_util_new behaviour
|
||||
when a non-existent plugin is requested (return NULL instead of
|
||||
falling back to malloc).
|
||||
+ chartable: ESC should close dialog.
|
||||
+ Animate opening and closing of find/replace and conversions
|
||||
panes.
|
||||
+ paste-special: Move space-delim hex pairs to UTF8 list.
|
||||
+ build: Fix incorrect soname numbering; split resources between
|
||||
app and library.
|
||||
+ docs: document expanded HexDocument and HexWidget APIs.
|
||||
+ Error handling improvements and code cleanups.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 15 11:22:07 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
||||
51
ghex.spec
51
ghex.spec
@ -16,16 +16,21 @@
|
||||
#
|
||||
|
||||
|
||||
%define so_ver 4
|
||||
%define ghex_abi 4
|
||||
%define so_ver 1
|
||||
%define so_ver_ext 0
|
||||
%define soname libgtkhex-%{ghex_abi}-%{so_ver}
|
||||
|
||||
Name: ghex
|
||||
Version: 42.3
|
||||
Version: 43.alpha
|
||||
Release: 0
|
||||
Summary: GNOME Binary Editor
|
||||
License: GPL-2.0-or-later
|
||||
Group: Development/Tools/Other
|
||||
URL: https://wiki.gnome.org/Apps/Ghex
|
||||
Source: https://download.gnome.org/sources/ghex/42/%{name}-%{version}.tar.xz
|
||||
Source: https://download.gnome.org/sources/ghex/43/%{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-UPSTREAM 8927f9a7.patch -- icons: Make document-modified-symbolic a resource
|
||||
Patch: https://gitlab.gnome.org/GNOME/ghex/-/commit/8927f9a7.patch
|
||||
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: meson >= 0.50.0
|
||||
@ -38,17 +43,20 @@ BuildRequires: pkgconfig(gi-docgen)
|
||||
BuildRequires: pkgconfig(gio-2.0) >= 2.31.10
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
BuildRequires: pkgconfig(gtk4)
|
||||
BuildRequires: pkgconfig(libadwaita-1)
|
||||
# Obsoletes libgtkhex-4-0 can be dropped when SLED/Leap 15.5 is out of support
|
||||
Obsoletes: libgtkhex-4-0 < %{version}
|
||||
|
||||
%description
|
||||
GHex allows the user to load data from any file and to view and edit it
|
||||
in either hex or ASCII. It is a must for anyone playing games that use
|
||||
a non-ASCII format for saving.
|
||||
|
||||
%package -n libgtkhex-%{so_ver}-0
|
||||
%package -n %{soname}
|
||||
Summary: GNOME Binary Editor -- Library
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libgtkhex-%{so_ver}-0
|
||||
%description -n %{soname}
|
||||
GHex allows the user to load data from any file and to view and edit it
|
||||
in either hex or ASCII. It is a must for anyone playing games that use
|
||||
a non-ASCII format for saving.
|
||||
@ -56,18 +64,18 @@ a non-ASCII format for saving.
|
||||
%package devel
|
||||
Summary: GNOME Binary Editor -- Development Files
|
||||
Group: Development/Libraries/GNOME
|
||||
Requires: libgtkhex-%{so_ver}-0 = %{version}
|
||||
Requires: %{soname} = %{version}
|
||||
|
||||
%description devel
|
||||
GHex allows the user to load data from any file and to view and edit it
|
||||
in either hex or ASCII. It is a must for anyone playing games that use
|
||||
a non-ASCII format for saving.
|
||||
|
||||
%package -n typelib-1_0-Hex-%{so_ver}
|
||||
%package -n typelib-1_0-Hex-%{ghex_abi}
|
||||
Summary: Introspection bindings for ghex
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n typelib-1_0-Hex-%{so_ver}
|
||||
%description -n typelib-1_0-Hex-%{ghex_abi}
|
||||
This package provides introspection bindings for ghex.
|
||||
|
||||
%lang_package
|
||||
@ -83,10 +91,10 @@ This package provides introspection bindings for ghex.
|
||||
%meson_install
|
||||
|
||||
%suse_update_desktop_file -r org.gnome.GHex GNOME Utility Editor
|
||||
%find_lang %{name} ghex-%{so_ver}.0.lang %{?no_lang_C}
|
||||
%find_lang %{name} ghex-%{ghex_abi}-%{so_ver}.%{so_ver_ext}.lang %{?no_lang_C}
|
||||
%fdupes -s %{buildroot}%{_datadir}
|
||||
|
||||
%ldconfig_scriptlets -n libgtkhex-%{so_ver}-0
|
||||
%ldconfig_scriptlets -n %{soname}
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
@ -97,21 +105,22 @@ This package provides introspection bindings for ghex.
|
||||
%{_datadir}/applications/org.gnome.GHex.desktop
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.GHex.gschema.xml
|
||||
%{_datadir}/icons/hicolor/*/apps/org.gnome.GHex*
|
||||
# Not split out as they are private to ghex
|
||||
%dir %{_libdir}/gtkhex-%{ghex_abi}.%{so_ver_ext}
|
||||
%{_libdir}/gtkhex-%{ghex_abi}.%{so_ver_ext}/*.so
|
||||
|
||||
%files -n libgtkhex-%{so_ver}-0
|
||||
%dir %{_libdir}/gtkhex-4.0
|
||||
%{_libdir}/libgtkhex-%{so_ver}.so.*
|
||||
%{_libdir}/gtkhex-4.0/*.so
|
||||
%files -n %{soname}
|
||||
%{_libdir}/libgtkhex-%{ghex_abi}.so.*
|
||||
|
||||
%files -n typelib-1_0-Hex-%{so_ver}
|
||||
%{_libdir}/girepository-1.0/Hex-%{so_ver}.typelib
|
||||
%files -n typelib-1_0-Hex-%{ghex_abi}
|
||||
%{_libdir}/girepository-1.0/Hex-%{ghex_abi}.typelib
|
||||
|
||||
%files devel
|
||||
%{_includedir}/gtkhex-%{so_ver}/
|
||||
%{_libdir}/libgtkhex-%{so_ver}.so
|
||||
%{_libdir}/pkgconfig/gtkhex-%{so_ver}.pc
|
||||
%{_datadir}/gir-1.0/Hex-%{so_ver}.gir
|
||||
%{_includedir}/gtkhex-%{ghex_abi}/
|
||||
%{_libdir}/libgtkhex-%{ghex_abi}.so
|
||||
%{_libdir}/pkgconfig/gtkhex-%{ghex_abi}.pc
|
||||
%{_datadir}/gir-1.0/Hex-%{ghex_abi}.gir
|
||||
|
||||
%files lang -f %{name}-%{so_ver}.0.lang
|
||||
%files lang -f %{name}-%{ghex_abi}-%{so_ver}.%{so_ver_ext}.lang
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user