~strahinja/galeb-mkfiles

264c08ccea882d6e9b4663fcde2624b7f8e7766a — Страхиња Радић 1 year, 25 days ago 4eb11a2 + 6c5e374
Merge branch 'master' of git.sr.ht:~strahinja/galeb-mkfiles
8 files changed, 25 insertions(+), 132 deletions(-)

M TODO
M cyrus-sasl/mkfile
M glib/dependencies
D glib/fetch-docbook
M glib/mkfile
D neomutt/pat/neomutt-dont-detect-sasl.patch
M pfetch/config.mk
M xmlto/dependencies
M TODO => TODO +11 -2
@@ 1,12 1,21 @@
TODO
====

[ ] Add X (quite a task!)
	[ ] Decide on the default X prefix (/X11R6? /X11? /X? /Xorg? /XOrg?)
	[ ] Add the prefix to pkgconf, ld.so.conf etc.
	- https://www.linuxfromscratch.org/blfs/view/stable/x/xorg7.html
	- https://wiki.x.org/wiki/ModuleDescriptions/
	[ ] Core X11 build/development/install
	[ ] Core X11 runtime
	< > DRI?
	< > Select additional packages from that page
	- https://lists.x.org/archives/xorg-modular/2005-November/000801.html

[ ] Add pv

[ ] Add urlview

[ ] Add X (quite a task!)

[ ] Add ghostscript and groff+gs



M cyrus-sasl/mkfile => cyrus-sasl/mkfile +11 -2
@@ 11,7 11,9 @@ SYSCONFDIR=	/etc
LOCALSTATEDIR=	/var
CFLAGS=		-Os -pipe -static --static -fcommon -fPIC
LDFLAGS=	-static --static -fcommon -zmuldefs
ADD_LIBS=	-lanonymous -lcrammd5 -lsasldb -lplain -ldigestmd5
PLUGLIBS=	-lanonymous -lcrammd5 -lsasldb -lplain -ldigestmd5
PLUGOBJS=	-L../plugins/.libs -l:libanonymous.a -l:libcrammd5.a
PLUGOBJS=	$PLUGOBJS -l:libsasldb.a -l:libplain.a -l:libdigestmd5.a -lgdbm

$PKGBASE:QV:
	for patch in $(find pat -type f -name '*.patch' | sort); do


@@ 31,8 33,15 @@ $PKGBASE:QV:
		--disable-sample \
		--enable-static \
		--disable-shared
	if [ ! -e utils/Makefile~ ]; then
		printf "  MV\t%s %s\n" utils/Makefile utils/Makefile~
		mv utils/Makefile utils/Makefile~
		printf "  SED\t%s\n" utils/Makefile~
		$SED "s@^\\(LIBS = .*\\)@& $PLUGOBJS@" utils/Makefile~ \
			> utils/Makefile
	fi
	printf "  MAKE\n"
	LIBS=$ADD_LIBS \
	LIBS="$PLUGLIBS" \
	make

install:QV:	$PKGBASE install-legal

M glib/dependencies => glib/dependencies +1 -1
@@ 1,1 1,1 @@
pcre:libffi:zlib-ng:libmount:libelf
docbook-xsl-nons:pcre:libffi:zlib-ng:libmount:libelf

D glib/fetch-docbook => glib/fetch-docbook +0 -89
@@ 1,89 0,0 @@
#!/bin/sh
mkdir -p docbook-xsl
cd docbook-xsl
for xslfile in docbook block inline synop lists endnotes table pi \
	utility param html-synop info other refentry tbl
do
	if [ ! -e $xslfile.xsl ]; then
		printf "  CURL\t%s.xsl\n" "$xslfile"
		curl -O https://docbook.sourceforge.net/release/xsl/current/manpages/$xslfile.xsl
		sleep 5
	fi
done
cd ..
mkdir -p common
cd common
for xslfile in stripns refentry charmap olink targets \
	subtitles titles gentext table l10n utility labels pi \
	common
do
	if [ ! -e $xslfile.xsl ]; then
		printf "  CURL\t%s.xsl\n" "$xslfile"
		curl -O https://docbook.sourceforge.net/release/xsl/current/common/$xslfile.xsl
		sleep 5
	fi
done
for xmlfile in l10n en
do
	if [ ! -e $xmlfile.xml ]; then
		printf "  CURL\t%s.xml\n" "$xmlfile"
		curl -O https://docbook.sourceforge.net/release/xsl/current/common/$xmlfile.xml
		sleep 5
	fi
done
for entfile in entities
do
	if [ ! -e $entfile.ent ]; then
		printf "  CURL\t%s.ent\n" "$entfile"
		curl -O https://docbook.sourceforge.net/release/xsl/current/common/$entfile.ent
		sleep 5
	fi
done
cd ..
mkdir -p html
cd html
for xslfile in docbook param VERSION html-rtf publishers \
	annotations titlepage titlepage.templates pi chunker \
	ebnf biblio biblio-iso690 glossary block task \
	qandaset synop toc index refentry math admon \
	component keywords division htmltbl sections \
	inline footnote html its info lists callout verbatim \
	graphics xref formal table autotoc autoidx
do
	if [ ! -e $xslfile.xsl ]; then
		printf "  CURL\t%s.xsl\n" "$xslfile"
		curl -O https://docbook.sourceforge.net/release/xsl/current/html/$xslfile.xsl
		sleep 5
	fi
done
cd ..
mkdir -p lib
cd lib
for xslfile in lib
do
	if [ ! -e $xslfile.xsl ]; then
		printf "  CURL\t%s.xsl\n" "$xslfile"
		curl -O https://docbook.sourceforge.net/release/xsl/current/lib/$xslfile.xsl
		sleep 5
	fi
done
cd ..
mkdir -p manpages
cd manpages
for xslfile in charmap.groff
do
	if [ ! -e $xslfile.xsl ]; then
		printf "  CURL\t%s.xsl\n" "$xslfile"
		curl -O https://docbook.sourceforge.net/release/xsl/current/manpages/$xslfile.xsl
		sleep 5
	fi
done
cd ..
for xslfile in VERSION
do
	if [ ! -e $xslfile.xsl ]; then
		printf "  CURL\t%s.xsl\n" "$xslfile"
		curl -O https://docbook.sourceforge.net/release/xsl/current/$xslfile.xsl
		sleep 5
	fi
done

M glib/mkfile => glib/mkfile +0 -10
@@ 9,10 9,6 @@ DATADIR=	$PREFIX/share
LIBDIR=		$PREFIX/lib
LOCALEDIR=	$DATADIR/locale
MANDIR=		$DATADIR/man
SKIPCLEAN=	1
#CFLAGS=		$CFLAGS -static-libstdc++ -static-libgcc 
#CXXFLAGS=	$CFLAGS
#LDFLAGS=	-static -Wl,-Bstatic

$PKGBASE:QV:
	if [ ! -d build ]; then


@@ 21,7 17,6 @@ $PKGBASE:QV:
	fi
	printf "  CD\tbuild\n"
	cd build
	../fetch-docbook
	# TODO: Fix libmount to allow static linking; disabled libmount for now
	unset CFLAGS CXXFLAGS LDFLAGS
	printf "  MESON\t%s\n" --prefix=$PREFIX


@@ 30,11 25,6 @@ $PKGBASE:QV:
		-Ddefault_library=static \
		-Dlibmount=disabled \
		..
	if [ ! -e ../meson.build.orig ]; then
		mv ../meson.build ../meson.build.orig
		sed 's,^\(.*'\''\).*\(docbook\.xsl'\''.*\),\1docbook-xsl/\2,' ../meson.build.orig \
			> ../meson.build
	fi
	printf "  NINJA\n"
	ninja
	cd meson-private

D neomutt/pat/neomutt-dont-detect-sasl.patch => neomutt/pat/neomutt-dont-detect-sasl.patch +0 -26
@@ 1,26 0,0 @@
--- a/auto.def	2022-09-15 20:00:43.017899465 +0200
+++ b/auto.def	2022-09-15 20:01:34.485898491 +0200
@@ -597,15 +597,15 @@
     define USE_SASL
     define-feature SASL
   } else {
-    foreach sasl_lib {sasl2 sasl} {
-      if {[check-inc-and-lib sasl [opt-val with-sasl $prefix] \
-                             sasl/sasl.h sasl_encode64 $sasl_lib]} {
-        # RHEL6 doesn't have this function yet
-        cc-check-functions sasl_client_done
+    #foreach sasl_lib {sasl2 sasl} {
+    #  if {[check-inc-and-lib sasl [opt-val with-sasl $prefix] \
+    #                         sasl/sasl.h sasl_encode64 $sasl_lib]} {
+    #    # RHEL6 doesn't have this function yet
+    #    cc-check-functions sasl_client_done
         define USE_SASL
-        break
-      }
-    }
+    #    break
+    #  }
+    #}
     if {![get-define USE_SASL]} {
       user-error "Unable to find SASL"
     }

M pfetch/config.mk => pfetch/config.mk +1 -1
@@ 5,4 5,4 @@ LEGALFILES=	LICENSE.md
PREFIX=		/
SCRIPTS=	pfetch
SRCDIRS=	$PKGBASE
SRCREPOS=	https://github.com/dylanaraps/pfetch
SRCREPOS=	https://git.sr.ht/~strahinja/pfetch

M xmlto/dependencies => xmlto/dependencies +1 -1
@@ 1,1 1,1 @@
bash:findutils:libxslt:docbook-xsl-nons
bash:findutils:docbook-xsl-nons