чување 61d4de5c31f8fe17ce1ea82036eddd023f5c1281
родитељ f33cebd0848c09571db2c614fa6077eefcac810f
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Mon, 1 May 2023 17:17:01 +0200
Fix glib deps, update Neomutt, notmuch, TODO
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
измењених датотека: 7, додавања: 42(+), брисања: 18(-)
diff --git a/TODO b/TODO
@@ -13,9 +13,9 @@ TODO
[x] linux-headers
[x] mkpk
[x] msmtp
- [ ] neomutt
+ [x] neomutt
[x] noice
- [ ] notmuch
+ [x] notmuch
[ ] s-nail
[ ] sacc
[ ] sfeed
diff --git a/glib/mkfile b/glib/mkfile
@@ -37,16 +37,26 @@ $PKGBASE:QV:
fi
printf " NINJA\n"
ninja
- printf " CD\t-\n"
- cd - >/dev/null
+ cd meson-private
+ if [ ! -e gobject-2.0.pc~ ] && [ -e gobject-2.0.pc ]; then
+ mv gobject-2.0.pc gobject-2.0.pc~
+ sed 's/^\(Libs: .*\)/\1 -lffi/' gobject-2.0.pc~ > gobject-2.0.pc
+ fi
+ if [ ! -e glib-2.0.pc~ ] && [ -e glib-2.0.pc ]; then
+ mv glib-2.0.pc glib-2.0.pc~
+ sed 's/^\(Libs: .*\)/\1 -lpcre2-8/' glib-2.0.pc~ > glib-2.0.pc
+ fi
+ cd ..
+ printf " CD\t..\n"
+ cd .. >/dev/null
install:QV: $PKGBASE install-legal
printf " CD\tbuild\n"
cd build
printf " NINJA\tinstall %s\n" "DESTDIR=../$DESTDIR"
DESTDIR=../$DESTDIR ninja install
- printf " CD\t-\n"
- cd - >/dev/null
+ printf " CD\t..\n"
+ cd .. >/dev/null
printf " LN\t%s %s\n" glib-2.0.pc $DESTDIR$PREFIX/lib/pkgconfig/glib.pc
ln -sf glib-2.0.pc $DESTDIR$PREFIX/lib/pkgconfig/glib.pc
diff --git a/neomutt/config.mk b/neomutt/config.mk
@@ -1,6 +1,7 @@
PKGBASE= neomutt
-PKGVER= 20220429
+PKGVER= 20230407
LEGALFILES= LICENSE.md
PREFIX= /
SRCTARBALLS= https://github.com/neomutt/neomutt/archive/refs/tags/$PKGVER.tar.gz
SRCTOTARBALLS= $PKGBASE-$PKGVER.tar.gz
+SHA512SUMS= 53604ce396fb53bf01662c7105a632e0e7a50d66f0d265193c591d7f16cbbfd276925c7ae965ccf9faf9b2070d7db48c4ee6d44b0c9552f9214647c5a7e8c46d
diff --git a/neomutt/mkfile b/neomutt/mkfile
@@ -4,6 +4,7 @@ mkpklib=/lib/mkpk
<$mkpklib/derivatives.mk
PKG= $PKGBASE-$PKGVER
+NOBINDDIRS= 1
BINDIR= $PREFIX/bin
MANDIR= $PREFIX/share/man
SYSCONFDIR= /etc
diff --git a/notmuch/config.mk b/notmuch/config.mk
@@ -1,5 +1,6 @@
PKGBASE= notmuch
-PKGVER= 0.36
+PKGVER= 0.37
LEGALFILES= COPYING COPYING-GPL-3
PREFIX= /sucks
SRCTARBALLS= https://notmuchmail.org/releases/$PKGBASE-$PKGVER.tar.xz
+SHA512SUMS= 31cac1ff03b139b18a4fec5e29907ba0e3a965f0a7bf5f2f2b0f75980f9663173745be854e83943f344a09cdb7f5615fa48218e327c4ade7a55b3a22b2a9c45e
diff --git a/notmuch/mkfile b/notmuch/mkfile
@@ -12,10 +12,12 @@ CFLAGS= -Os -pipe -static --static -fcommon -fPIC
LDFLAGS= -static --static -fcommon -s
$PKGBASE:QV:
- printf " CP\t%s %s\n" configure configure~
- cp configure configure~
- printf " SED\t%s\n" configure
- sed 's,\(pkg-config --libs\),\1 --static,g' configure~ > configure
+ if [ ! -e configure~ ]; then
+ printf " CP\t%s %s\n" configure configure~
+ cp configure configure~
+ printf " SED\t%s\n" configure
+ sed 's,\(pkg-config --libs\),\1 --static,g' configure~ > configure
+ fi
printf " CONF\t%s\n" --prefix=$PREFIX
CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS \
./configure --prefix=$PREFIX \
diff --git a/notmuch/pat/notmuch-static.patch b/notmuch/pat/notmuch-static.patch
@@ -1,5 +1,5 @@
---- a/lib/Makefile.local 2022-09-13 20:36:18.585946844 +0200
-+++ b/lib/Makefile.local 2022-09-13 20:37:59.238945217 +0200
+--- a/lib/Makefile.local 2023-05-01 16:03:55.694011689 +0200
++++ b/lib/Makefile.local 2023-05-01 16:06:31.895047976 +0200
@@ -75,22 +75,13 @@
$(dir)/$(LIBNAME): $(libnotmuch_modules) util/libnotmuch_util.a parse-time-string/libparse-time-string.a
$(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libnotmuch_util.a parse-time-string/libparse-time-string.a
@@ -25,18 +25,18 @@
SRCS := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs)
CLEAN += $(libnotmuch_modules) $(dir)/$(SONAME) $(dir)/$(LINKER_NAME)
---- a/Makefile.local 2022-09-13 21:13:07.588911139 +0200
-+++ b/Makefile.local 2022-09-13 22:57:53.262809540 +0200
+--- a/Makefile.local 2023-05-01 16:03:45.046145551 +0200
++++ b/Makefile.local 2023-05-01 16:05:01.262187386 +0200
@@ -1,7 +1,7 @@
# -*- makefile-gmake -*-
.PHONY: all
--all: notmuch notmuch-shared build-man build-info ruby-bindings python-cffi-bindings
+-all: notmuch notmuch-shared build-man build-info ruby-bindings python-cffi-bindings notmuch-git nmbug
+all: notmuch build-man build-info
ifeq ($(MAKECMDGOALS),)
ifeq ($(shell cat .first-build-message 2>/dev/null),)
@NOTMUCH_FIRST_BUILD=1 $(MAKE) --no-print-directory all
-@@ -262,13 +262,10 @@
+@@ -271,13 +271,10 @@
notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/libnotmuch_util.a parse-time-string/libparse-time-string.a
$(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@
@@ -51,3 +51,12 @@
ifeq ($(MAKECMDGOALS), install)
@echo ""
@echo "Notmuch is now installed to $(DESTDIR)$(prefix)"
+@@ -301,7 +298,7 @@
+ endif
+
+ SRCS := $(SRCS) $(notmuch_client_srcs)
+-CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules)
++CLEAN := $(CLEAN) notmuch $(notmuch_client_modules)
+ CLEAN := $(CLEAN) version.stamp notmuch-*.tar.gz.tmp
+ CLEAN := $(CLEAN) .deps
+
