# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1646152916 -3600
# Node ID 1f0f29295019a0ea088b6d5e5bf66f8afb9e1b75
# Parent  bed3dd10e11f5f39ba92ae48231f1c869c3bbb2d
updated ghex (2.24.0 -> 3.41.1)

diff -r bed3dd10e11f -r 1f0f29295019 ghex-lang/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ghex-lang/receipt	Tue Mar 01 17:41:56 2022 +0100
@@ -0,0 +1,17 @@
+# SliTaz package receipt.
+
+PACKAGE="ghex-lang"
+VERSION="3.41.1"
+CATEGORY="x-window"
+SHORT_DESC="A simple binary editor - localised messages."
+MAINTAINER="maintainer@slitaz.org"
+LICENSE="GPL2"
+WEB_SITE="https://wiki.gnome.org/Apps/Ghex"
+
+WANTED="ghex"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_folders	locale
+}
diff -r bed3dd10e11f -r 1f0f29295019 ghex/receipt
--- a/ghex/receipt	Tue Mar 01 15:53:52 2022 +0100
+++ b/ghex/receipt	Tue Mar 01 17:41:56 2022 +0100
@@ -1,19 +1,21 @@
 # SliTaz package receipt.
 
 PACKAGE="ghex"
-VERSION="2.24.0"
+VERSION="3.41.1"
 CATEGORY="x-window"
-SHORT_DESC="GHex is a simple binary editor."
+SHORT_DESC="A simple binary editor."
 MAINTAINER="samuel_trassare@yahoo.com"
 LICENSE="GPL2"
-WEB_SITE="https://directory.fsf.org/wiki/Ghex"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://ftp.acc.umu.se/pub/GNOME/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
+WEB_SITE="https://wiki.gnome.org/Apps/Ghex"
 
-DEPENDS="gtk+ libgnomeui libgnomeprintui libgnome-keyring"
-BUILD_DEPENDS="gtk+-dev gnome-doc-utils-dev libgnomeui-dev libbonoboui-dev \
-libgnome-dev libbonobo-dev libbonoboui-dev libgnome-keyring-dev \
-libgnomeprintui-dev intltool"
+TARBALL="$PACKAGE-$VERSION.tar.xz"
+WGET_URL="https://download.gnome.org/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
+
+SUGGESTED="ghex-lang"
+DEPENDS="atk gtk+3 libgnome-keyring libgnomeprintui libgnomeui libxml2"
+BUILD_DEPENDS="atk-dev gtk+3-dev intltool itstool 
+	libbonobo-dev libbonoboui-dev libgnome-dev libgnome-keyring-dev 
+	libgnomeprintui-dev libgnomeui-dev libxml2-dev meson ninja"
 
 # What is the latest version available today?
 current_version()
@@ -28,28 +30,36 @@
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lm"
 	
 	# GHex2 cannot display help without Yelp.  Removing help references.
-	patch -Np1 -i $stuff/ghex2-remove-help.patch
-	
-	./configure \
-		--disable-schemas-install \
-		--disable-scrollkeeper \
-		$CONFIGURE_ARGS && 
-	make && 
-	make DESTDIR=$install install
+#	patch -Np1 -i $stuff/ghex2-remove-help.patch
+	patch	--strip=0 --input=$stuff/patches/ghex-ui.xml-3.41.1
+	patch	--strip=0 --input=$stuff/patches/preferences.c-3.41.1
+
+	# Do not create help files
+	sed -i	-e "/subdir('help')/d"		\
+		-e "/meson_post_install.py/d"	\
+		meson.build
+
+	meson	_build		\
+		--prefix=/usr &&
+	ninja -C _build &&
+	ninja -C _build install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin \
-		$fs/usr/lib \
-		$fs/usr/share
-		
-	cp -a $install/usr/bin/* $fs/usr/bin
-	cp -ar $install/usr/etc $fs/usr
-	cp -a $install/usr/lib/*so* $fs/usr/lib
-	cp -ar $install/usr/share/applications $fs/usr/share
-	cp -ar $install/usr/share/gnome-2.0 $fs/usr/share
-	cp -ar $install/usr/share/icons $fs/usr/share
-	cp -ar $install/usr/share/locale $fs/usr/share
+	mkdir -p $fs/usr/bin
+	mkdir -p $fs/usr/lib
+	mkdir -p $fs/usr/share
+
+	cp -a $install/usr/bin/*		$fs/usr/bin
+	# 3.41.1 not created
+#	cp -ar $install/usr/etc $fs/usr
+	cp -ar $install/usr/share/glib-2.0	$fs/usr/share
+	cp -a $install/usr/lib/*so*		$fs/usr/lib
+	cp -ar $install/usr/share/applications	$fs/usr/share
+	cp -ar $install/usr/share/metainfo	$fs/usr/share
+	cp -ar $install/usr/share/icons		$fs/usr/share
+	# moved to package ghex-lang
+#	cp -ar $install/usr/share/locale	$fs/usr/share
 }
diff -r bed3dd10e11f -r 1f0f29295019 ghex/stuff/patches/ghex-ui.xml-3.41.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ghex/stuff/patches/ghex-ui.xml-3.41.1	Tue Mar 01 17:41:56 2022 +0100
@@ -0,0 +1,10 @@
+--- src/ghex-ui.xml.orig
++++ src/ghex-ui.xml
+@@ -52,7 +52,6 @@
+       <menuitem action="TypeDialog"/>
+     </menu>
+     <menu action="Help">
+-      <menuitem action="HelpContents"/>
+       <menuitem action="HelpAbout"/>
+     </menu>
+   </menubar>
diff -r bed3dd10e11f -r 1f0f29295019 ghex/stuff/patches/preferences.c-3.41.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ghex/stuff/patches/preferences.c-3.41.1	Tue Mar 01 17:41:56 2022 +0100
@@ -0,0 +1,13 @@
+--- src/preferences.c.orig
++++ src/preferences.c
+@@ -72,10 +72,6 @@
+ 						   GTK_STOCK_CLOSE,
+ 						   GTK_RESPONSE_CLOSE);
+ 
+-	gtk_dialog_add_button (GTK_DIALOG (pui->pbox),
+-						   GTK_STOCK_HELP,
+-						   GTK_RESPONSE_HELP);
+-
+ 	g_signal_connect(G_OBJECT(pui->pbox), "response",
+ 					 G_CALLBACK(prefs_response_cb), pui);
+