wok-next rev 20804
awesome: fix build / up (4.2); and all following required to build this "awesome": add xcb-util-xrm; clutter-gst-dev, cmake, librsvg: up deps; lgi: up (0.9.2); pango: split pango-typelib, use meson-wrapper to install libs to lib/ instead of lib64/ (on x86_64 arch)
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Wed Jun 13 10:54:34 2018 +0300 (2018-06-13) |
| parents | 682fa819a3d4 |
| children | 95b113aec737 |
| files | awesome/.icon.png awesome/receipt clutter-gst/receipt cmake/receipt lgi/receipt librsvg/receipt pango/receipt xcb-util-xrm/receipt |
line diff
1.1 Binary file awesome/.icon.png has changed
2.1 --- a/awesome/receipt Wed Jun 13 06:48:53 2018 +0000 2.2 +++ b/awesome/receipt Wed Jun 13 10:54:34 2018 +0300 2.3 @@ -1,64 +1,55 @@ 2.4 -# SliTaz package receipt. 2.5 +# SliTaz package receipt v2. 2.6 2.7 PACKAGE="awesome" 2.8 -VERSION="3.5.1" 2.9 +VERSION="4.2" 2.10 CATEGORY="x-window" 2.11 SHORT_DESC="Highly configurable framework window manager" 2.12 MAINTAINER="mallory@sweetpeople.org" 2.13 LICENSE="GPL2" 2.14 +WEB_SITE="https://awesomewm.org/" 2.15 + 2.16 TARBALL="$PACKAGE-$VERSION.tar.xz" 2.17 -WEB_SITE="http://awesome.naquadah.org/" 2.18 -WGET_URL="${WEB_SITE}download/$TARBALL" 2.19 -TAGS="window-manager" 2.20 +WGET_URL="https://github.com/awesomeWM/awesome-releases/raw/master/$TARBALL" 2.21 2.22 -DEPENDS="cairo dbus gdk-pixbuf libxdg-basedir lgi lua startup-notification \ 2.23 -xorg-xcb-util-image xorg-xcb-util-keysyms xorg-xcb-util-wm xorg-libXcursor" 2.24 -BUILD_DEPENDS="cmake xorg-libX11-dev xorg-libxcb-dev xorg-xcb-util-dev \ 2.25 -xorg-xcb-util-keysyms-dev xorg-xcb-util-image-dev xorg-xcb-util-wm-dev lua-dev pango-dev \ 2.26 -cairo-dev imlib2-dev dbus-dev libev-dev gperf cairo libxdg-basedir-dev \ 2.27 -startup-notification-dev imagemagick freetype-dev fontconfig-dev \ 2.28 -libpng16-dev libxdg-basedir-dev openexr libltdl gdk-pixbuf-dev \ 2.29 -xorg-libXcursor-dev lgi" 2.30 +BUILD_DEPENDS="cmake asciidoc xmlto docbook-xsl imagemagick lua-dev \ 2.31 +xorg-libxcb-dev glib-dev gdk-pixbuf-dev cairo-dev xorg-xcb-util-cursor-dev \ 2.32 +xorg-xcb-util-dev xorg-xcb-util-keysyms-dev xorg-xcb-util-wm-dev \ 2.33 +libxkbcommon-dev startup-notification-dev libxdg-basedir-dev xcb-util-xrm-dev \ 2.34 +dbus-dev lgi pango-dev" 2.35 2.36 -# Rules to configure and make the package. 2.37 -compile_rules() 2.38 -{ 2.39 - export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -ldl" 2.40 - export AWESOME_IGNORE_LGI=1 2.41 - make CMAKE_ARGS=" -DCMAKE_INSTALL_PREFIX:PATH=/usr \ 2.42 - -DXDG_CONFIG_DIR=/etc/xdg \ 2.43 - -DCMAKE_BUILD_TYPE=RELEASE" && 2.44 +compile_rules() { 2.45 + mkdir build 2.46 + cd build 2.47 + cmake \ 2.48 + -DCMAKE_BUILD_TYPE=RELEASE \ 2.49 + -DCMAKE_INSTALL_PREFIX=/usr \ 2.50 + -DSYSCONFDIR=/etc \ 2.51 + -DLUA_LIBRARY=/usr/lib/liblua.so \ 2.52 + .. && 2.53 + make && 2.54 make install 2.55 } 2.56 2.57 -# Rules to gen a SliTaz package suitable for Tazpkg. 2.58 -genpkg_rules() 2.59 -{ 2.60 - cp -a $install/* $fs 2.61 - 2.62 - # move lua scripts to lua directory 2.63 - mkdir -p $fs/usr/share/lua 2.64 - mv $fs/usr/share/awesome/lib $fs/usr/share/lua/5.2 2.65 - 2.66 - # add pango typelibs 2.67 - # (not need to install pango-dev with full stack of dev packages) 2.68 - mkdir -p $fs/usr/lib 2.69 - cp -a $WOK/pango/install/usr/lib/girepository-1.0 $fs/usr/lib 2.70 +genpkg_rules() { 2.71 + copy @std 2.72 + DEPENDS="cairo dbus gdk-pixbuf glib liblua libxdg-basedir libxkbcommon-x11 \ 2.73 + libxkbcommon startup-notification xcb-util-xrm xorg-libX11 xorg-libxcb \ 2.74 + xorg-xcb-util xorg-xcb-util-cursor xorg-xcb-util-keysyms xorg-xcb-util-wm \ 2.75 + pango-typelib lgi" 2.76 + TAGS="window-manager" 2.77 } 2.78 2.79 -post_install() 2.80 -{ 2.81 - res=$(cat "$1/etc/slim.conf" | grep ^session | sed s/"sessions. *"//) 2.82 - # Adding WM to SLIM available sessions. 2.83 +# Adding WM to SLIM available sessions. 2.84 +post_install() { 2.85 + res=$(cat "$1/etc/slim.conf" | grep '^session' | sed 's|sessions. *||') 2.86 if ! echo "$res" | grep -q $PACKAGE; then 2.87 - sed -i "s/^sessions.*/sessions ${res},$PACKAGE/" "$1/etc/slim.conf" 2.88 + sed -i "s/^sessions.*/sessions $res,$PACKAGE/" "$1/etc/slim.conf" 2.89 fi 2.90 } 2.91 2.92 -post_remove() 2.93 -{ 2.94 - # Remove WM from SLIM available sessions. 2.95 +# Remove WM from SLIM available sessions. 2.96 +post_remove() { 2.97 if grep -q $PACKAGE "$1/etc/slim.conf"; then 2.98 - sed -i s/,$PACKAGE// "$1/etc/slim.conf" 2.99 + sed -i "s|,$PACKAGE||" "$1/etc/slim.conf" 2.100 fi 2.101 }
3.1 --- a/clutter-gst/receipt Wed Jun 13 06:48:53 2018 +0000 3.2 +++ b/clutter-gst/receipt Wed Jun 13 10:54:34 2018 +0300 3.3 @@ -27,11 +27,13 @@ 3.4 case $PACKAGE in 3.5 clutter-gst) 3.6 copy @std 3.7 - DEPENDS="clutter cogl gdk-pixbuf glib gst1-plugins-base gstreamer1 \ 3.8 - libgudev xorg-libX11" 3.9 + DEPENDS="clutter cogl gdk-pixbuf glib gst1-plugins-base \ 3.10 + gstreamer1 libgudev xorg-libX11" 3.11 ;; 3.12 *-dev) 3.13 copy @dev 3.14 + DEPENDS="clutter-gst clutter-dev cogl-dev glib-dev \ 3.15 + gst1-plugins-base-dev gstreamer1-dev" 3.16 ;; 3.17 esac 3.18 }
4.1 --- a/cmake/receipt Wed Jun 13 06:48:53 2018 +0000 4.2 +++ b/cmake/receipt Wed Jun 13 10:54:34 2018 +0300 4.3 @@ -32,5 +32,5 @@ 4.4 4.5 genpkg_rules() { 4.6 copy @std @dev 4.7 - DEPENDS="expat libarchive libcurl ncurses-libform zlib" 4.8 + DEPENDS="expat libarchive libcurl ncurses ncurses-libform zlib" 4.9 }
5.1 --- a/lgi/receipt Wed Jun 13 06:48:53 2018 +0000 5.2 +++ b/lgi/receipt Wed Jun 13 10:54:34 2018 +0300 5.3 @@ -1,7 +1,7 @@ 5.4 # SliTaz package receipt v2. 5.5 5.6 PACKAGE="lgi" 5.7 -VERSION="0.7.2" 5.8 +VERSION="0.9.2" 5.9 CATEGORY="development" 5.10 SHORT_DESC="Dynamic Lua binding to GObject libraries using GObject-Introspection" 5.11 MAINTAINER="al.bobylev@gmail.com" 5.12 @@ -12,18 +12,18 @@ 5.13 WGET_URL="https://github.com/pavouk/lgi/archive/$VERSION.tar.gz" 5.14 5.15 BUILD_DEPENDS="gobject-introspection-dev lua-dev" 5.16 -# add "cairo-dev gtk+-dev" for `make check` 5.17 5.18 compile_rules() { 5.19 # fix paths 5.20 - sed -i 's|/usr/local|/usr|g;s|5.1|5.3|g;s|51|53|g' \ 5.21 - $src/lgi/Makefile $src/lgi/core.lua $src/lgi/core.c 5.22 - # `make check` after `make` produces error 5.23 + sed -i 's|5.1|5.3|g; s|51|53|g' lgi/Makefile lgi/core.lua lgi/core.c 5.24 + 5.25 make && 5.26 - make PREFIX=/usr DESTDIR=$install install 5.27 + make PREFIX=/usr DESTDIR=$install install || return 1 5.28 + 5.29 + cook_pick_docs docs/*.md 5.30 } 5.31 5.32 genpkg_rules() { 5.33 - cp -a $install/* $fs 5.34 - DEPENDS="glib gobject-introspection lua" 5.35 + copy @std 5.36 + DEPENDS="glib gobject-introspection libffi lua" 5.37 }
6.1 --- a/librsvg/receipt Wed Jun 13 06:48:53 2018 +0000 6.2 +++ b/librsvg/receipt Wed Jun 13 10:54:34 2018 +0300 6.3 @@ -31,7 +31,7 @@ 6.4 librsvg) 6.5 copy *.so* 6.6 CAT="graphics|library" 6.7 - DEPENDS="cairo gdk-pixbuf glib libcroco libxml2 pango" 6.8 + DEPENDS="cairo fontconfig gdk-pixbuf glib libcroco libxml2 pango" 6.9 ;; 6.10 rsvg-convert) 6.11 copy rsvg-convert
7.1 --- a/pango/receipt Wed Jun 13 06:48:53 2018 +0000 7.2 +++ b/pango/receipt Wed Jun 13 10:54:34 2018 +0300 7.3 @@ -13,35 +13,39 @@ 7.4 7.5 BUILD_DEPENDS="harfbuzz-dev xorg-libXft-dev cairo-dev \ 7.6 gobject-introspection-dev meson ninja" 7.7 -SPLIT="pango-dev" 7.8 +SPLIT="pango-typelib pango-dev" 7.9 7.10 compile_rules() { 7.11 mkdir build 7.12 cd build 7.13 7.14 - meson \ 7.15 - --prefix=/usr \ 7.16 - --sysconfdir=/etc \ 7.17 - .. && 7.18 + meson-wrapper .. && 7.19 ninja && 7.20 ninja install || return 1 7.21 7.22 rm -rf \ 7.23 - $install/usr/libexec/installed-tests \ 7.24 + $install/usr/lib/installed-tests \ 7.25 $install/usr/share/installed-tests 7.26 + find $install -type f -perm 664 -exec chmod 644 '{}' \; 7.27 } 7.28 7.29 genpkg_rules() { 7.30 case $PACKAGE in 7.31 pango) 7.32 - copy bin/ *.so* 7.33 + copy @std 7.34 DEPENDS="cairo fontconfig freetype glib libharfbuzz xorg-libX11 \ 7.35 xorg-libXft xorg-libXrender" 7.36 ;; 7.37 + pango-typelib) 7.38 + copy *.typelib 7.39 + CAT="development|typelib files" 7.40 + DEPENDS="pango" 7.41 + ;; 7.42 *-dev) 7.43 - copy @dev 7.44 - DEPENDS="pango cairo-dev fontconfig-dev freetype-dev glib-dev \ 7.45 - harfbuzz-dev xorg-libXft-dev" 7.46 + copy @dev @rm 7.47 + DEPENDS="pango pango-typelib \ 7.48 + cairo-dev fontconfig-dev freetype-dev glib-dev harfbuzz-dev \ 7.49 + xorg-libXft-dev" 7.50 ;; 7.51 esac 7.52 }
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/xcb-util-xrm/receipt Wed Jun 13 10:54:34 2018 +0300 8.3 @@ -0,0 +1,35 @@ 8.4 +# SliTaz package receipt v2. 8.5 + 8.6 +PACKAGE="xcb-util-xrm" 8.7 +VERSION="1.3" 8.8 +CATEGORY="x-window" 8.9 +SHORT_DESC="XCB utility functions for the X resource manager" 8.10 +MAINTAINER="al.bobylev@gmail.com" 8.11 +LICENSE="MIT" 8.12 +WEB_SITE="https://github.com/Airblader/xcb-util-xrm" 8.13 + 8.14 +TARBALL="$PACKAGE-$VERSION.tar.gz" 8.15 +WGET_URL="https://github.com/Airblader/xcb-util-xrm/releases/download/v$VERSION/$TARBALL" 8.16 + 8.17 +BUILD_DEPENDS="xorg-libxcb-dev xorg-xcb-util-dev xorg-libX11-dev" 8.18 +SPLIT="xcb-util-xrm-dev" 8.19 + 8.20 +compile_rules() { 8.21 + ./configure $CONFIGURE_ARGS && 8.22 + fix libtool && 8.23 + make && 8.24 + make install 8.25 +} 8.26 + 8.27 +genpkg_rules() { 8.28 + case $PACKAGE in 8.29 + xcb-util-xrm) 8.30 + copy @std 8.31 + DEPENDS="xorg-libxcb xorg-xcb-util" 8.32 + ;; 8.33 + *-dev) 8.34 + copy @dev 8.35 + DEPENDS="xcb-util-xrm xorg-libxcb-dev xorg-xcb-util-dev" 8.36 + ;; 8.37 + esac 8.38 +}