# HG changeset patch # User Aleksej Bobylev # Date 1539611085 -10800 # Node ID 71ba95d2422e26e33dd44fab8a38db85583a6f13 # Parent 9a78fd347e596b712ceb8172c62ab2a6c4127599 Small updates; mdocml -> mandoc diff -r 9a78fd347e59 -r 71ba95d2422e lightsoff/receipt --- a/lightsoff/receipt Mon Oct 15 14:02:33 2018 +0300 +++ b/lightsoff/receipt Mon Oct 15 16:44:45 2018 +0300 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="lightsoff" -VERSION="3.28.0" +VERSION="3.30.0" CATEGORY="games" SHORT_DESC="Turn off all the lights" MAINTAINER="al.bobylev@gmail.com" @@ -11,18 +11,23 @@ TARBALL="$PACKAGE-$VERSION.tar.xz" WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" -BUILD_DEPENDS="vala glib-dev gtk+3-dev clutter-dev clutter-gtk-dev librsvg-dev \ -gettext itstool" +BUILD_DEPENDS="meson ninja vala gtk3-dev clutter-dev clutter-gtk-dev \ +librsvg-dev gettext itstool" compile_rules() { - ./configure $CONFIGURE_ARGS && - make && - make install || return 1 + mv data/icons/hicolor/symbolic/apps/lightsoff-symbolic \ + data/icons/hicolor/symbolic/apps/lightsoff-symbolic.svg + + mkdir build + cd build + meson-wrapper && + ninja && + ninja install || return 1 fix symlinks } genpkg_rules() { copy @std - DEPENDS="clutter clutter-gtk glib gtk+3" + DEPENDS="clutter clutter-gtk gdk-pixbuf glib gtk3 librsvg" } diff -r 9a78fd347e59 -r 71ba95d2422e mandoc/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mandoc/receipt Mon Oct 15 16:44:45 2018 +0300 @@ -0,0 +1,45 @@ +# SliTaz package receipt v2. + +PACKAGE="mandoc" +VERSION="1.14.4" +CATEGORY="base-system" +SHORT_DESC="UNIX manpage compiler" +MAINTAINER="al.bobylev@gmail.com" +LICENSE="ISC" +WEB_SITE="http://mdocml.bsd.lv/" + +TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="http://mdocml.bsd.lv/snapshots/$TARBALL" + +BUILD_DEPENDS="zlib-dev" +SPLIT="$PACKAGE-cgi $PACKAGE $PACKAGE-dev" + +# see also: https://github.com/trentm/mdocml/tree/html5 + +compile_rules() { + sed "s|@CFLAGS@|$CFLAGS|" $stuff/configure.local.in > configure.local + cp $stuff/cgi.h . + + ./configure $CONFIGURE_ARGS && + make -j1 && + make -j1 DESTDIR=$install \ + base-install lib-install cgi-install catman-install +} + +genpkg_rules() { + case $PACKAGE in + *-cgi) + copy var/www/ + CAT="development|CGI files" + DEPENDS=" " + ;; + mandoc) + copy @std @rm + DEPENDS="zlib" + PROVIDE="mdocml" + ;; + *-dev) + copy @dev + ;; + esac +} diff -r 9a78fd347e59 -r 71ba95d2422e mandoc/stuff/cgi.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mandoc/stuff/cgi.h Mon Oct 15 16:44:45 2018 +0300 @@ -0,0 +1,5 @@ +#define SCRIPT_NAME "cgi-bin/man.cgi" +#define MAN_DIR "/usr/share/man" +#define CSS_DIR "" +#define CUSTOMIZE_TITLE "Manual pages with mandoc" +#define COMPAT_OLDURI Yes diff -r 9a78fd347e59 -r 71ba95d2422e mandoc/stuff/configure.local.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mandoc/stuff/configure.local.in Mon Oct 15 16:44:45 2018 +0300 @@ -0,0 +1,14 @@ +PREFIX=/usr +MANDIR=/usr/share/man +LIBDIR=/usr/lib +CFLAGS="@CFLAGS@" +UTF8_LOCALE="en_US.UTF-8" +MANPATH_DEFAULT="/usr/share/man:/usr/local/man" +BUILD_CGI=1 +BUILD_CATMAN=1 +LN="ln -s" + +INSTALL_PROGRAM="install -m 0755" +INSTALL_LIB="install -m 0755" +INSTALL_MAN="install -m 0644" +INSTALL_DATA="install -m 0644" diff -r 9a78fd347e59 -r 71ba95d2422e mandoc/stuff/patches/libmandoc.a.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mandoc/stuff/patches/libmandoc.a.patch Mon Oct 15 16:44:45 2018 +0300 @@ -0,0 +1,9 @@ +--- a/Makefile ++++ b/Makefile +@@ -579,3 +579,6 @@ + .1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc + ./mandoc -Thtml -Wall,stop \ + -Ostyle=mandoc.css,man=%N.%S.html,includes=%I.html $< > $@ ++ ++libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) ++ $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) diff -r 9a78fd347e59 -r 71ba95d2422e mandoc/stuff/patches/pager.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mandoc/stuff/patches/pager.patch Mon Oct 15 16:44:45 2018 +0300 @@ -0,0 +1,27 @@ +--- mdocml-1.13.4/main.c.orig ++++ mdocml-1.13.4/main.c +@@ -1042,7 +1042,7 @@ + if (pager == NULL || *pager == '\0') + pager = getenv("PAGER"); + if (pager == NULL || *pager == '\0') +- pager = "more -s"; ++ pager = "/bin/more -s"; + cp = mandoc_strdup(pager); + + /* +@@ -1063,15 +1063,6 @@ + break; + } + +- /* For less(1), use the tag file. */ +- +- if ((cmdlen = strlen(argv[0])) >= 4) { +- cp = argv[0] + cmdlen - 4; +- if (strcmp(cp, "less") == 0) { +- argv[argc++] = mandoc_strdup("-T"); +- argv[argc++] = tag_files->tfn; +- } +- } + argv[argc++] = tag_files->ofn; + argv[argc] = NULL; + diff -r 9a78fd347e59 -r 71ba95d2422e mandoc/stuff/patches/permissions.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mandoc/stuff/patches/permissions.patch Mon Oct 15 16:44:45 2018 +0300 @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -424,7 +424,7 @@ + mkdir -p $(DESTDIR)$(INCLUDEDIR) + mkdir -p $(DESTDIR)$(MANDIR)/man3 + $(INSTALL_LIB) $(LIBMANDOC) $(DESTDIR)$(LIBDIR) +- $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \ ++ $(INSTALL_DATA) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \ + $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \ + mansearch.3 mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3 diff -r 9a78fd347e59 -r 71ba95d2422e mandoc/stuff/patches/series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mandoc/stuff/patches/series Mon Oct 15 16:44:45 2018 +0300 @@ -0,0 +1,7 @@ +# From Arch Linux: +# https://git.alpinelinux.org/cgit/aports/tree/main/mdocml +shared-libmandoc.patch +pager.patch + +libmandoc.a.patch +permissions.patch diff -r 9a78fd347e59 -r 71ba95d2422e mandoc/stuff/patches/shared-libmandoc.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mandoc/stuff/patches/shared-libmandoc.patch Mon Oct 15 16:44:45 2018 +0300 @@ -0,0 +1,73 @@ +--- mandoc-1.14.2/Makefile.orig ++++ mandoc-1.14.2/Makefile +@@ -347,9 +347,13 @@ + mdoc.h.html \ + roff.h.html + ++LIBMANDOC = libmandoc.so ++MANDOCLIB = -L. -lmandoc ++ + # === USER CONFIGURATION =============================================== + + include Makefile.local ++CFLAGS += -fPIC + + # === DEPENDENCY HANDLING ============================================== + +@@ -372,7 +376,7 @@ + rm -f Makefile.local config.h config.h.old config.log config.log.old + + clean: +- rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS) ++ rm -f $(LIBMANDOC) $(LIBMANDOC_OBJS) $(COMPAT_OBJS) + rm -f mandoc $(MAIN_OBJS) + rm -f man.cgi $(CGI_OBJS) + rm -f mandocd catman catman.o $(MANDOCD_OBJS) +@@ -411,11 +415,11 @@ + $(INSTALL_MAN) makewhatis.8 \ + $(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8 + +-lib-install: libmandoc.a ++lib-install: $(LIBMANDOC) + mkdir -p $(DESTDIR)$(LIBDIR) + mkdir -p $(DESTDIR)$(INCLUDEDIR) + mkdir -p $(DESTDIR)$(MANDIR)/man3 +- $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR) ++ $(INSTALL_LIB) $(LIBMANDOC) $(DESTDIR)$(LIBDIR) + $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \ + $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \ +@@ -488,23 +492,23 @@ + @echo "$@ is out of date; please run ./configure" + @exit 1 + +-libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) +- ar rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) ++libmandoc.so: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) ++ $(CC) $(LDFLAGS) -shared -o $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) $(LDADD) + +-mandoc: $(MAIN_OBJS) libmandoc.a +- $(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) libmandoc.a $(LDADD) ++mandoc: $(MAIN_OBJS) $(LIBMANDOC) ++ $(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) $(MANDOCLIB) $(LDADD) + + man.cgi: $(CGI_OBJS) libmandoc.a + $(CC) $(STATIC) -o $@ $(LDFLAGS) $(CGI_OBJS) libmandoc.a $(LDADD) + +-mandocd: $(MANDOCD_OBJS) libmandoc.a +- $(CC) -o $@ $(LDFLAGS) $(MANDOCD_OBJS) libmandoc.a $(LDADD) ++mandocd: $(MANDOCD_OBJS) $(LIBMANDOC) ++ $(CC) -o $@ $(LDFLAGS) $(MANDOCD_OBJS) $(LIBMANDOC) $(LDADD) + +-catman: catman.o libmandoc.a +- $(CC) -o $@ $(LDFLAGS) catman.o libmandoc.a $(LDADD) ++catman: catman.o $(LIBMANDOC) ++ $(CC) -o $@ $(LDFLAGS) catman.o $(LIBMANDOC) $(LDADD) + +-demandoc: $(DEMANDOC_OBJS) libmandoc.a +- $(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) libmandoc.a $(LDADD) ++demandoc: $(DEMANDOC_OBJS) $(LIBMANDOC) ++ $(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) $(LIBMANDOC) $(LDADD) + + soelim: $(SOELIM_OBJS) + $(CC) -o $@ $(LDFLAGS) $(SOELIM_OBJS) diff -r 9a78fd347e59 -r 71ba95d2422e mate-user-share/receipt --- a/mate-user-share/receipt Mon Oct 15 14:02:33 2018 +0300 +++ b/mate-user-share/receipt Mon Oct 15 16:44:45 2018 +0300 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="mate-user-share" -VERSION="1.20.0" +VERSION="1.20.1" CATEGORY="system-tools" SHORT_DESC="Easy to use user-level file sharing" MAINTAINER="al.bobylev@gmail.com" @@ -11,7 +11,7 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://github.com/mate-desktop/mate-user-share/archive/v$VERSION.tar.gz" -BUILD_DEPENDS="mate-common yelp-tools itstool xorg-libX11-dev gtk+3-dev \ +BUILD_DEPENDS="mate-common yelp-tools-dev itstool xorg-libX11-dev gtk3-dev \ dbus-glib-dev libnotify-dev libcanberra-dev caja-dev" compile_rules() { @@ -19,11 +19,13 @@ $CONFIGURE_ARGS && fix libtool && make && - make install + make install || return 1 + + fix symlinks } genpkg_rules() { copy @std - DEPENDS="caja glib gtk+3 pango xorg-libX11" + DEPENDS="caja glib gtk3 pango xorg-libX11" TAGS="MATE" } diff -r 9a78fd347e59 -r 71ba95d2422e mdocml/receipt --- a/mdocml/receipt Mon Oct 15 14:02:33 2018 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -# SliTaz package receipt v2. - -PACKAGE="mdocml" -VERSION="1.12.1" -CATEGORY="base-system" -SHORT_DESC="UNIX manpage compiler" -MAINTAINER="al.bobylev@gmail.com" -LICENSE="ISC" -WEB_SITE="http://mdocml.bsd.lv/" -REPOLOGY="mandoc" - -TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="http://mdocml.bsd.lv/snapshots/$TARBALL" - -BUILD_DEPENDS="db-dev" -SPLIT="mdocml mdocml-cgi mdocml-dev mdocml-extra mdocml-man" - -# Rules to configure and make the package. -compile_rules() -{ - export LDFLAGS="$LDFLAGS -lpthread" - # configure - sed -i '/^#.*CFLAGS.*/ s/# //; s/OpenBSD 4\.5/SliTaz Cooking/; \ - s/^STATIC.*/#\0/; \ - s/^PREFIX.*/PREFIX = \/usr/; - s/^MANDIR.*/MANDIR = $(PREFIX)\/share\/man/; - s/^#\(DBLIB.*\)/\1/' \ - Makefile - make clean && - make && - make DESTDIR=$install install && - make DESTDIR=$install installcgi && - install -m 0755 apropos catman mandocdb whatis $install/usr/bin -} - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - case $PACKAGE in - mdocml) - DEPENDS="glibc-base" - mkdir -p $fs/usr/bin - cp -a $install/usr/bin/mandoc $fs/usr/bin - ;; - mdocml-cgi) - CAT="development|CGI files for mdocml" - DEPENDS="glibc-base libdb" - mkdir -p $fs/var - cp -a $install/var/www $fs/var - ;; - mdocml-dev) - CAT="development|Devel files for mdocml" - DEPENDS="mdocml" - mkdir -p $fs/usr - cp -a $install/usr/include $fs/usr - cp -a $install/usr/lib $fs/usr - ;; - mdocml-extra) - CAT="base-system|Extra files for mdocml" - DEPENDS="glibc-base libdb mdocml" - mkdir -p $fs/usr - cp -a $install/usr/bin $fs/usr - rm -f $fs/usr/bin/mandoc - ;; - mdocml-man) - CAT="development|Man files for mdocml" - DEPENDS="mdocml" - mkdir -p $fs/usr/share - cp -a $install/usr/share/man $fs/usr/share - ;; - esac -} diff -r 9a78fd347e59 -r 71ba95d2422e meson/receipt --- a/meson/receipt Mon Oct 15 14:02:33 2018 +0300 +++ b/meson/receipt Mon Oct 15 16:44:45 2018 +0300 @@ -1,13 +1,14 @@ # SliTaz package receipt v2. PACKAGE="meson" -VERSION="0.47.2" +VERSION="0.48.0" CATEGORY="development" SHORT_DESC="A high performance build system" MAINTAINER="al.bobylev@gmail.com" LICENSE="Apache" WEB_SITE="http://mesonbuild.com/" LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/meson.html" +HOST_ARCH="any" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://github.com/mesonbuild/meson/releases/download/$VERSION/$TARBALL" @@ -15,7 +16,7 @@ BUILD_DEPENDS="python3" compile_rules() { - python3 setup.py install --root=$install --optimize=0 || return 1 + python3 -B setup.py install --root=$install || return 1 install -m755 $stuff/meson-wrapper $install/usr/bin/ } diff -r 9a78fd347e59 -r 71ba95d2422e neonview/receipt --- a/neonview/receipt Mon Oct 15 14:02:33 2018 +0300 +++ b/neonview/receipt Mon Oct 15 16:44:45 2018 +0300 @@ -1,24 +1,26 @@ # SliTaz package receipt v2. PACKAGE="neonview" -VERSION="0.8.1" +VERSION="0.8.2" CATEGORY="graphics" SHORT_DESC="Free, lightweight image viewer" MAINTAINER="al.bobylev@gmail.com" LICENSE="GPL2" -WEB_SITE="http://www.tuxarena.com/neonview/" +WEB_SITE="http://www.tuxarena.com/intro/neonview.php" TARBALL="$PACKAGE-$VERSION-src.tar.gz" -WGET_URL="http://www.tuxarena.com/$PACKAGE/files/$TARBALL" +WGET_URL="http://www.tuxarena.com/intro/files/$TARBALL" -BUILD_DEPENDS="gtk+3-dev" +BUILD_DEPENDS="gtk3-dev" compile_rules() { make && - install -Dm755 $src/neonview $install/usr/bin/neonview + install -Dm755 $src/neonview $install/usr/bin/neonview || return 1 + + cook_pick_docs *.txt *.html } genpkg_rules() { copy @std - DEPENDS="gtk+3" + DEPENDS="gtk3" }