Fixed documentation directory and replaced hardcoded sbin with bin in base/ntfs-3g

Added preservestaticlibs variable to base/pcre
Discarded rc.smartd init script for a more simpler runit service file in base/smartmontools among other fixes
Disabled tests in base/soxr
Added a new patch to extra/gthumb and partially fixed functions its build script
Upgraded gtk/atk to 2.36.0
Added LICENSE to gtk/gnome-themes-extra

base/ntfs-3g/ntfs-3g.SMBuild

@@ -1,6 +1,6 @@
 app=ntfs-3g
 version=2021.8.22
-build=1sml
+build=2sml
 homepage="http://www.tuxera.com/community/open-source-ntfs-3g/"
 download="https://tuxera.com/opensource/ntfs-3g_ntfsprogs-$version.tgz"
 desc="NTFS read-write filesystem driver"
@@ -19,20 +19,17 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="/" \
-    --sbindir=/bin \
+    --docdir="/share/doc/$app-$version" \
     --disable-static \
     --with-fuse=internal
 
+  sed -i 's@/sbin@/bin@g' src/Makefile ntfsprogs/Makefile
+
   make
   make install DESTDIR=$pkg
 
   cp COPYING* $pkgdocs/
 
-  (
-    cd $pkg ; mv sbin/* bin/
-    rmdir sbin
-  )
-
   mkfinalpkg
 }
 

base/pcre/pcre.SMBuild

@@ -1,10 +1,12 @@
 app=pcre
 version=8.44
-build=1sml
+build=2sml
 homepage="https://www.pcre.org/"
 download="https://ftp.pcre.org/pub/pcre/pcre-$version.tar.gz"
 desc="Perl-compatible regular expression library"
 requires="zlib bzip2"
+# Grep would like to link against libpcre.a
+preservestaticlibs=1
 
 prepbuilddir() {
   mkandenterbuilddir
@@ -18,7 +20,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
-    --disable-static \
+    --docdir="/share/doc/$app-$version" \
     --enable-pcre16 \
     --enable-pcre32 \
     --enable-pcregrep-libbz2 \
@@ -29,8 +31,6 @@ build() {
   make
   make install DESTDIR=$pkg
 
-  cp LICENCE $pkgdocs/
-
   mkfinalpkg
 }
 

base/smartmontools/doinst.sh

@@ -0,0 +1,13 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/smartd.conf.new

base/smartmontools/rc.smartd

@@ -1,88 +0,0 @@
-#! /bin/sh
-
-# smartmontools init file for smartd
-# Copyright (C) 2002-8 Bruce Allen <smartmontools-support@lists.sourceforge.net>
-# $Id: smartd.initd.in 4120 2015-08-27 16:12:21Z samm2 $
-
-# description: Self Monitoring and Reporting Technology (SMART) Daemon
-# processname: smartd 
-# Description:                Start S.M.A.R.T. disk and tape monitor.
-
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 2, or (at your option) any later
-# version. 
-# You should have received a copy of the GNU General Public License (for
-# example COPYING); if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-# This code was originally developed as a Senior Thesis by Michael Cornwell
-# at the Concurrent Systems Laboratory (now part of the Storage Systems
-# Research Center), Jack Baskin School of Engineering, University of
-# California, Santa Cruz. http://ssrc.soe.ucsc.edu/.
-
-# Modified for use in SMLinux
-
-# Uncomment the line below to pass options to smartd on startup. 
-# Note that distribution specific configuration files like
-# /etc/{default,sysconfig}/smartmontools might override these
-#smartd_opts="--interval=1800"
-
-SMARTD_BIN=/bin/smartd
-
-[ -r /etc/sysconfig/smartmontools ] && . /etc/sysconfig/smartmontools
-
-RETVAL=0
-case "$1" in
-start)
-    echo -n "Starting smartd: "
-    $SMARTD_BIN $smartd_opts
-    RETVAL=$?
-    echo
-    ;;
-stop)
-    echo -n "Shutting down smartd: "
-    killall $SMARTD_BIN
-    RETVAL=$?
-    echo
-    ;;
-restart)
-    $0 stop
-    sleep 1
-    $0 start
-    RETVAL=$?
-    ;;
-try-restart)
-   if pidof $SMARTD_BIN >/dev/null; then
-	$0 restart
-	RETVAL=$?
-    fi
-    ;;
-force-reload)
-    $0 reload || $0 restart
-    RETVAL=$?
-    ;;
-reload)
-    echo -n "Reloading smartd configuration: "
-    killall -s HUP $SMARTD_BIN
-    RETVAL=$?
-    echo
-    ;;
-report)
-    echo -n "Checking SMART devices now: "
-    killall -s USR1 $SMARTD_BIN
-    RETVAL=$?
-    echo
-    ;;
-status)
-    if pidof $SMARTD_BIN >/dev/null; then
-	echo "$SMARTD_BIN is running."
-    else
-	echo "$SMARTD_BIN is not running."
-	RETVAL=1
-    fi
-    ;;
-*)
-    echo "Usage: $0 {start|stop|restart|try-restart|force-reload|reload|report|status}"
-    RETVAL=1
-   esac
-   exit $RETVAL

base/smartmontools/smartd.run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /bin/smartd -n > /dev/null 2>&1

base/smartmontools/smartmontools.SMBuild

@@ -1,6 +1,6 @@
 app=smartmontools
 version=6.5
-build=1sml
+build=2sml
 homepage="http://smartmontools.sourceforge.net"
 download="https://sourceforge.net/projects/smartmontools/files/smartmontools/$version/smartmontools-$version.tar.gz"
 desc="monitoring utilities for hard drives using SMART protocol"
@@ -19,15 +19,16 @@ build() {
   ./configure \
     --prefix="" \
     --sysconfdir=/etc \
-    --sbindir=/bin 
+    --sbindir=/bin \
+    --docdir="/share/doc/$app-$version" \
+    --with-initscriptdir=no
 
   make
   make install DESTDIR=$pkg
 
-  cp COPYING README $pkgdocs/
+  mv $pkg/etc/smartd.conf $pkg/etc/smartd.conf.new
-  head -n 1000 ChangeLog > $pkgdocs/CHANGELOG
 
-  install -Dm 755 $srcdir/rc.smartd $pkg/etc/rc.d/rc.smartd
+  preprunitservice smartd down
 
   mkfinalpkg
 }

base/soxr/soxr.SMBuild

@@ -1,6 +1,6 @@
 app=soxr
 version=0.1.3
-build=1sml
+build=1l2sml
 homepage="https://github.com/chirlu/soxr"
 download="https://github.com/chirlu/soxr/archive/refs/tags/$version.tar.gz"
 desc="Audio library that outputs fast and high quality results for resampling ratio"
@@ -21,6 +21,8 @@ build() {
    -DCMAKE_BUILD_TYPE=Release \
    -DCMAKE_INSTALL_PREFIX="" \
    -DBUILD_EXAMPLES='OFF' \
+   -DBUILD_TESTS='OFF' \
+   -DDOC_INSTALL_DIR="/share/doc/$app-$version" \
    -DBUILD_SHARED_LIBS='ON' \
    -DWITH_AVFFT='ON' \
    -DWITH_LSR_BINDINGS='ON' \
@@ -30,8 +32,6 @@ build() {
   make
   make install DESTDIR=$pkg
 
-  cp ../COPYING* ../LICENCE $pkgdocs/
-
   mkfinalpkg
 }
 

extra/gthumb/gthumb.SMBuild

@@ -3,18 +3,23 @@ version=3.12.2
 build=1sml
 homepage="https://wiki.gnome.org/Apps/Gthumb"
 download="https://download.gnome.org/sources/gthumb/3.11/gthumb-$version.tar.xz"
-desc="An image viewer and browser"
+desc="An image viewer and browser for GNOME desktop"
 requires="exiv2 json-glib librsvg libsecret libsoup libwebp dconf gtk2 gsettings-desktop-schemas"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version 
   fixbuilddirpermissions
+  
+  applypatch $srcdir/libraw-0.21.patch
+  applypatch $srcdir/x11-dep.patch
+}
 
-  mkdir smbuild && cd smbuild
+build() {
+  mkdir -p smbuild && cd smbuild
   meson .. \
     --prefix="/"
 
@@ -28,4 +33,4 @@ build() {
 
 sha512sums="
 2591f1ebaaa7978afca6db30f99fff5a83949d94fcba8b49db142b97c89c84da9e6edd987a72ca01f6cbfa65be7b4bc75a339dce016fca341c4345c607ca5a93  gthumb-3.12.2.tar.lz
-"
+"

extra/gthumb/libraw-0.21.patch

@@ -0,0 +1,35 @@
+diff --git a/extensions/raw_files/gth-metadata-provider-raw.c b/extensions/raw_files/gth-metadata-provider-raw.c
+index 2d9f502..b03f489 100644
+--- a/extensions/raw_files/gth-metadata-provider-raw.c
++++ b/extensions/raw_files/gth-metadata-provider-raw.c
+@@ -62,7 +62,7 @@ gth_metadata_provider_raw_read (GthMetadataProvider *self,
+ 	if (!_g_mime_type_is_raw (gth_file_data_get_mime_type (file_data)))
+ 		return;
+ 
+-	raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
++	raw_data = libraw_init (LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
+ 	if (raw_data == NULL)
+ 		goto fatal_error;
+ 
+diff --git a/extensions/raw_files/main.c b/extensions/raw_files/main.c
+index 25829c1..a6ebdc1 100644
+--- a/extensions/raw_files/main.c
++++ b/extensions/raw_files/main.c
+@@ -213,7 +213,7 @@ _cairo_image_surface_create_from_raw (GInputStream  *istream,
+ 	size_t         size;
+ 	GthImage      *image = NULL;
+ 
+-	raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
++	raw_data = libraw_init (LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
+ 	if (raw_data == NULL) {
+ 		_libraw_set_gerror (error, errno);
+ 		goto fatal_error;
+@@ -300,7 +300,7 @@ _cairo_image_surface_create_from_raw (GInputStream  *istream,
+ 		if ((original_width != NULL) && (original_height != NULL)) {
+ 			libraw_close (raw_data);
+ 
+-			raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
++			raw_data = libraw_init (LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
+ 			if (raw_data == NULL)
+ 				goto fatal_error;
+ 

extra/gthumb/x11-dep.patch

@@ -0,0 +1,10 @@
+--- a/meson.build	2023-03-28 00:00:52.212015313 +0530
++++ b/meson.build	2023-03-28 00:01:06.583813892 +0530
+@@ -232,6 +232,7 @@
+   dependency('gmodule-2.0'),
+   dependency('gio-unix-2.0'),
+   dependency('gtk+-3.0', version : gtk_version),
++  dependency('x11'),
+   dependency('libpng'),
+   dependency('zlib'),
+   dependency('gsettings-desktop-schemas')

gtk/atk/atk.SMBuild

@@ -1,5 +1,5 @@
 app=atk
-version=2.34.1
+version=2.36.0
 build=1sml
 homepage="https://gitlab.gnome.org/GNOME/atk"
 desc="Interface definitions of accessibility infrastructure"
@@ -27,5 +27,5 @@ build() {
 }
 
 sha512sums="
-4a67adfb5b25e08de1892d4ac2ae0c3ed0011ce80b0b2066462676f86563f96429202b0d036ee909e51bf678574a4caf83a9e0ea5f409bb6fc02bc9e9bbc53c9  atk-2.34.1.tar.lz
+364311348aaffdf36ab61088beabb72dfdf387f681e00822fd6d56a640b6f34cbc6bdf6d3a4cc214b22fabe3249c57858417baeaa5fa8e739959a79b523f1edc  atk-2.36.0.tar.lz
-"
+"

gtk/gnome-themes-extra/gnome-themes-extra.SMBuild

@@ -1,6 +1,6 @@
 app=gnome-themes-extra
 version=3.28
-build=1sml
+build=2sml
 homepage="https://gitlab.gnome.org/GNOME/gnome-themes-extra"
 download="https://download.gnome.org/sources/gnome-themes-extra/$version/gnome-themes-extra-$version.tar.xz"
 desc="Default collection icons and theme bits used by GTK+ applications"
@@ -22,6 +22,8 @@ build() {
   make
   make install DESTDIR=$pkg
 
+  cp LICENSE $pkgdocs/
+
   mkfinalpkg
 }