чување d59f223788e1019302f41bfd05475dd3425a1991
родитељ 0a9c0df8776bb934eafe3cc6fc4b5e6c7fa8f832
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Tue, 2 May 2023 14:14:10 +0200
Fix cyrus-sasl, glib; remove redundant Neomutt patch
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
измењених датотека: 4, додавања: 11(+), брисања: 121(-)
diff --git a/cyrus-sasl/mkfile b/cyrus-sasl/mkfile
@@ -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
diff --git a/glib/fetch-docbook b/glib/fetch-docbook
@@ -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
diff --git a/glib/mkfile b/glib/mkfile
@@ -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
diff --git a/neomutt/pat/neomutt-dont-detect-sasl.patch b/neomutt/pat/neomutt-dont-detect-sasl.patch
@@ -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"
- }
