From aa418b500a24351c2d539adef239ede82ff7f7bb Mon Sep 17 00:00:00 2001 From: bingulo Date: Mon, 5 Sep 2022 12:36:26 -0300 Subject: [PATCH] luakit: update to 2.3.1 and added doc subpackage --- srcpkgs/luakit-doc | 1 + srcpkgs/luakit/patches/Makefile.patch | 39 --------------------------- srcpkgs/luakit/template | 16 ++++++++--- 3 files changed, 13 insertions(+), 43 deletions(-) create mode 120000 srcpkgs/luakit-doc delete mode 100644 srcpkgs/luakit/patches/Makefile.patch diff --git a/srcpkgs/luakit-doc b/srcpkgs/luakit-doc new file mode 120000 index 000000000000..50e9fe62e686 --- /dev/null +++ b/srcpkgs/luakit-doc @@ -0,0 +1 @@ +luakit \ No newline at end of file diff --git a/srcpkgs/luakit/patches/Makefile.patch b/srcpkgs/luakit/patches/Makefile.patch deleted file mode 100644 index c1a5293e879a..000000000000 --- a/srcpkgs/luakit/patches/Makefile.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/Makefile 2018-12-30 16:13:10.512451500 -0600 -+++ b/Makefile 2018-12-30 16:15:27.507448741 -0600 -@@ -17,7 +17,7 @@ - # Must be kept in sync with doc/docgen.ld - DOC_SRCS = $(filter-out lib/markdown.lua lib/lousy/init.lua,$(shell for d in doc/luadoc lib common/clib; do find $$d -type f; done)) tests/lib.lua - --all: options newline luakit luakit.1.gz luakit.so apidoc -+all: options newline luakit luakit.1.gz luakit.so - - options: - @echo luakit build options: -@@ -79,27 +79,10 @@ - luakit.1.gz: luakit.1 - @gzip -c $< > $@ - --doc/apidocs/index.html: $(DOC_SRCS) $(wildcard build-utils/docgen/*) -- rm -rf doc/apidocs -- mkdir doc/apidocs -- $(LUA_BIN_NAME) ./build-utils/docgen/makedoc.lua -- --apidoc: doc/apidocs/index.html -- --doc: buildopts.h $(THEAD) $(TSRC) -- doxygen -s doc/luakit.doxygen -- --clean: -- rm -rf doc/apidocs doc/html luakit $(OBJS) $(EXT_OBJS) $(TSRC) $(THEAD) buildopts.h luakit.1 luakit.1.gz luakit.so -- - install: all - install -d $(DESTDIR)$(PREFIX)/share/luakit/ - install -d $(DESTDIR)$(DOCDIR) $(DESTDIR)$(DOCDIR)/classes $(DESTDIR)$(DOCDIR)/modules $(DESTDIR)$(DOCDIR)/pages - install -m644 README.md AUTHORS COPYING.GPLv3 $(DESTDIR)$(DOCDIR) -- install -m644 doc/apidocs/classes/* $(DESTDIR)$(DOCDIR)/classes -- install -m644 doc/apidocs/modules/* $(DESTDIR)$(DOCDIR)/modules -- install -m644 doc/apidocs/pages/* $(DESTDIR)$(DOCDIR)/pages -- install -m644 doc/apidocs/*.html $(DESTDIR)$(DOCDIR) - install -d $(DESTDIR)$(PREFIX)/share/luakit/lib $(DESTDIR)$(PREFIX)/share/luakit/lib/lousy $(DESTDIR)$(PREFIX)/share/luakit/lib/lousy/widget - install -m644 lib/*.* $(DESTDIR)$(PREFIX)/share/luakit/lib - install -m644 lib/lousy/*.* $(DESTDIR)$(PREFIX)/share/luakit/lib/lousy diff --git a/srcpkgs/luakit/template b/srcpkgs/luakit/template index 4fa00bb75712..3e06aa5f6479 100644 --- a/srcpkgs/luakit/template +++ b/srcpkgs/luakit/template @@ -1,7 +1,7 @@ # Template file for 'luakit' pkgname=luakit reverts="2017.08.10_1" -version=2.3 +version=2.3.1 revision=1 conf_files="/etc/xdg/luakit/*.lua" hostmakedepends="pkg-config LuaJIT" @@ -13,14 +13,22 @@ license="GPL-3.0-or-later" homepage="https://luakit.github.io/" changelog="https://github.com/luakit/luakit/blob/develop/CHANGELOG.md" distfiles="https://github.com/luakit/luakit/archive/${version}.tar.gz" -checksum=c7026b4f0bdfa44f43798b80f87548d3e7ad56f5b923fc43b9c712bf18496095 +checksum=138fed1eaccab801fae8c32ff2bec6cbcd864a9f527c5c77ad1de402ce1a130e CFLAGS="-fcommon" do_build() { - make DEVELOPMENT_PATHS=0 LUA_BIN_NAME=luajit USE_LUAJIT=1 PREFIX=/usr VERSION=${version} all + make DEVELOPMENT_PATHS=0 LUA_BIN_NAME=luajit USE_LUAJIT=1 \ + DOCDIR=/usr/share/doc/luakit PREFIX=/usr VERSION=${version} all } do_install() { - make PREFIX=/usr DESTDIR=${DESTDIR} install + make PREFIX=/usr DOCDIR=/usr/share/doc/luakit DESTDIR=${DESTDIR} install +} + +luakit-doc_package() { + short_desk+=' - API documentation' + pkg_install() { + vmove usr/share/doc + } }