From 60bff1c32bec4ab470baddd9c9b6c2c3a5bdb3c7 Mon Sep 17 00:00:00 2001
From: PktSurf <smlinux@pktsurf.in>
Date: Sun, 4 Dec 2022 14:39:40 +0530
Subject: [PATCH] Cause extra/galculator to link against gtk3 Removed
 unnecessary build options in extra/libass Miscellaneous fixes in some build
 files

---
 extra/bluez/bluez.SMBuild           | 2 +-
 extra/dwm/dwm.SMBuild               | 3 +--
 extra/galculator/galculator.SMBuild | 6 +++---
 extra/gtypist/gtypist.SMBuild       | 6 ++----
 extra/libass/libass.SMBuild         | 6 ++----
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/extra/bluez/bluez.SMBuild b/extra/bluez/bluez.SMBuild
index 015fbf1..71392c3 100755
--- a/extra/bluez/bluez.SMBuild
+++ b/extra/bluez/bluez.SMBuild
@@ -47,7 +47,7 @@ build() {
   cat $srcdir/uart.conf > $pkg/etc/bluetooth/uart.conf.new
   cat $srcdir/defaultconfig > $pkg/etc/default/bluetooth.new
 
-  if [ "$ARCH" = "aarch64" ]; then
+  if [ "$arch" = "aarch64" ]; then
     cat $srcdir/uart.conf.pi3 > $pkg/etc/bluetooth/uart.conf.pi3.new
     cat $srcdir/uart.conf.pi4 > $pkg/etc/bluetooth/uart.conf.pi4.new
     install -Dm 644 $srcdir/100-bluetooth.rules $pkg/etc/udev/rules.d/100-bluetooth.rules
diff --git a/extra/dwm/dwm.SMBuild b/extra/dwm/dwm.SMBuild
index 779172f..3a1128a 100755
--- a/extra/dwm/dwm.SMBuild
+++ b/extra/dwm/dwm.SMBuild
@@ -2,7 +2,7 @@ app=dwm
 version=6.3
 build=1sml
 homepage="https://dwm.suckless.org"
-download="https://dl.suckless.org/dwm/dwm-6.3.tar.gz"
+download="https://dl.suckless.org/dwm/dwm-$version.tar.gz"
 desc="Suckless dynamic window manager"
 requires="libxinerama libxext"
 
@@ -15,7 +15,6 @@ build() {
   fixbuilddirpermissions
 
   sed -i "s@-Wno-deprecated-declarations -Os@-Wno-deprecated-declarations $CFLAGS@g" config.mk
-  #sed -i "s@LDFLAGS = -s@LDFLAGS = @g" config.mk
 
   make
   make install PREFIX="/" MANPREFIX=/share/man DESTDIR=$pkg 
diff --git a/extra/galculator/galculator.SMBuild b/extra/galculator/galculator.SMBuild
index fc1b88b..d8c85ed 100755
--- a/extra/galculator/galculator.SMBuild
+++ b/extra/galculator/galculator.SMBuild
@@ -1,8 +1,8 @@
 app=galculator
 version=2.1.4
-build=1sml
+build=2sml
 homepage="http://galculator.mnim.org/"
-download="http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2"
+download="http://galculator.mnim.org/downloads/galculator-$version.tar.bz2"
 desc="GTK calculator for GNOME"
 requires="intltool gtk2 graphite2"
 
@@ -16,7 +16,7 @@ build() {
 
   ./configure \
     --prefix="" \
-    --disable-gtk3 \
+    --enable-gtk3 \
     --disable-nls \
     $builddist
 
diff --git a/extra/gtypist/gtypist.SMBuild b/extra/gtypist/gtypist.SMBuild
index c04a085..41d4b8f 100755
--- a/extra/gtypist/gtypist.SMBuild
+++ b/extra/gtypist/gtypist.SMBuild
@@ -17,11 +17,9 @@ build() {
   applypatch $srcdir/ncurses.patch
   autoreconf -vif
 
-  CFLAGS="$CFLAGS -D_GNU_SOURCE" \
   LDFLAGS="-lterminfo -lncurses" \
   ./configure \
-    --prefix="" \
-    --sysconfdir=/etc 
+    --prefix=""
 
   make
   make install DESTDIR=$pkg
@@ -34,4 +32,4 @@ build() {
 sha512sums="
 397b2e7570f1702b1e355cf2e6ce8b0a78aa0f7e2493dcf0a39a07e1dc9e4c2bf01d16759dfcfffef3bb505b73435b6e4fb8e2565a20b7180a1867d4d3d68346  gtypist-2.9.5.tar.lz
 84a29d4008f13ee0dc434b551b6846d94373679fa718d54a0cf52aeeaba8f1485e40d55f66c336bb33e23f1f939ea1711190c2a16903671febcdb191b4ffb94c  ncurses.patch
-"
\ No newline at end of file
+"
diff --git a/extra/libass/libass.SMBuild b/extra/libass/libass.SMBuild
index 97ae226..85a3516 100755
--- a/extra/libass/libass.SMBuild
+++ b/extra/libass/libass.SMBuild
@@ -2,7 +2,7 @@ app=libass
 version=0.14.0
 build=1sml
 homepage="http://code.google.com/p/libass/"
-download="https://github.com/libass/libass/archive/refs/tags/0.14.0.tar.gz"
+download="https://github.com/libass/libass/archive/refs/tags/$version.tar.gz"
 desc="Subtitle renderer for the ASS and SSA formats"
 requires="glib nasm fribidi fontconfig freetype harfbuzz"
 
@@ -16,10 +16,8 @@ build() {
 
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
     --enable-static=no \
-    --enable-shared=yes \
-    --disable-silent-rules 
+    --enable-shared=yes
 
   make
   make install DESTDIR=$pkg