wok-next rev 19679

Move cmark -> cmark-gfm because it's fork of cmark; update xorg-libX11-dev deps, update gdk-pixbuf, gtk+ (currently slightly broken because of cups incompletion).
author Aleksej Bobylev <al.bobylev@gmail.com>
date Wed Apr 05 15:27:57 2017 +0300 (2017-04-05)
parents daa754d4b004
children 76490c6e292d
files cmark-gfm/receipt cmark-gfm/stuff/cmark-0.27.1.76.patch cmark/description.txt cmark/receipt gdk-pixbuf-dev/receipt gdk-pixbuf/receipt gtk+-dev/receipt gtk+/receipt xorg-libX11-dev/receipt
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/cmark-gfm/receipt	Wed Apr 05 15:27:57 2017 +0300
     1.3 @@ -0,0 +1,33 @@
     1.4 +# SliTaz package receipt.
     1.5 +
     1.6 +PACKAGE="cmark-gfm"
     1.7 +VERSION="0.27.1.76"
     1.8 +COMMIT="a81db63"
     1.9 +CATEGORY="text"
    1.10 +SHORT_DESC="Github fork of CommonMark parsing and rendering program in C"
    1.11 +MAINTAINER="al.bobylev@gmail.com"
    1.12 +LICENSE="BSD"
    1.13 +WEB_SITE="https://github.com/github/cmark"
    1.14 +
    1.15 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.16 +WGET_URL="$GITHUB/github/cmark/tarball/${COMMIT:-$VERSION}"
    1.17 +
    1.18 +BUILD_DEPENDS="cmake py3k"
    1.19 +
    1.20 +# Rules to configure and make the package.
    1.21 +compile_rules()
    1.22 +{
    1.23 +	patch -p1 -i $stuff/cmark-0.27.1.76.patch
    1.24 +
    1.25 +	mkdir build; cd build
    1.26 +	cmake .. -DCMAKE_INSTALL_PREFIX=/usr &&
    1.27 +	make &&
    1.28 +	make test &&
    1.29 +	make install
    1.30 +}
    1.31 +
    1.32 +# Rules to gen a SliTaz package suitable for Tazpkg.
    1.33 +genpkg_rules()
    1.34 +{
    1.35 +	cook_copy_files cmark-gfm
    1.36 +}
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/cmark-gfm/stuff/cmark-0.27.1.76.patch	Wed Apr 05 15:27:57 2017 +0300
     2.3 @@ -0,0 +1,10 @@
     2.4 +--- a/man/CMakeLists.txt
     2.5 ++++ b/man/CMakeLists.txt
     2.6 +@@ -5,6 +5,6 @@
     2.7 +   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man1/cmark.1
     2.8 +     DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
     2.9 + 
    2.10 +-  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man3/cmark.3
    2.11 ++  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man3/cmark-gfm.3
    2.12 +     DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
    2.13 + endif(NOT MSVC)
     3.1 --- a/cmark/description.txt	Sat Mar 25 17:39:12 2017 +0200
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,11 +0,0 @@
     3.4 -`cmark` is the C reference implementation of [CommonMark], a rationalized
     3.5 -version of Markdown syntax with a [spec][the spec].
     3.6 -
     3.7 -It provides a shared library (`libcmark`) with functions for parsing CommonMark
     3.8 -documents to an abstract syntax tree (AST), manipulating the AST, and rendering
     3.9 -the document to HTML, groff man, LaTeX, CommonMark, or an XML representation of
    3.10 -the AST. It also provides a command-line program (`cmark`) for parsing and
    3.11 -rendering CommonMark documents.
    3.12 -
    3.13 -[CommonMark]: http://commonmark.org
    3.14 -[the spec]: http://spec.commonmark.org
     4.1 --- a/cmark/receipt	Sat Mar 25 17:39:12 2017 +0200
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,31 +0,0 @@
     4.4 -# SliTaz package receipt.
     4.5 -
     4.6 -PACKAGE="cmark"
     4.7 -VERSION="0.27.1.70"
     4.8 -COMMIT="353fd72"
     4.9 -CATEGORY="text"
    4.10 -SHORT_DESC="CommonMark parsing and rendering program in C"
    4.11 -MAINTAINER="al.bobylev@gmail.com"
    4.12 -LICENSE="BSD"
    4.13 -WEB_SITE="https://github.com/github/cmark"
    4.14 -
    4.15 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    4.16 -WGET_URL="$GITHUB/github/cmark/tarball/${COMMIT:-$VERSION}"
    4.17 -
    4.18 -BUILD_DEPENDS="cmake py3k"
    4.19 -
    4.20 -# Rules to configure and make the package.
    4.21 -compile_rules()
    4.22 -{
    4.23 -	mkdir build; cd build
    4.24 -	cmake .. -DCMAKE_INSTALL_PREFIX=/usr &&
    4.25 -	make &&
    4.26 -	make test &&
    4.27 -	make install
    4.28 -}
    4.29 -
    4.30 -# Rules to gen a SliTaz package suitable for Tazpkg.
    4.31 -genpkg_rules()
    4.32 -{
    4.33 -	cook_copy_files cmark
    4.34 -}
     5.1 --- a/gdk-pixbuf-dev/receipt	Sat Mar 25 17:39:12 2017 +0200
     5.2 +++ b/gdk-pixbuf-dev/receipt	Wed Apr 05 15:27:57 2017 +0300
     5.3 @@ -1,27 +1,19 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="gdk-pixbuf-dev"
     5.7 -VERSION="2.31.1"
     5.8 +VERSION="2.34.0"
     5.9  CATEGORY="development"
    5.10  SHORT_DESC="devel files for gdk-pixbuf"
    5.11  MAINTAINER="slaxemulator@gmail.com"
    5.12  LICENSE="GPL2"
    5.13  WEB_SITE="http://www.gtk.org/"
    5.14 -WANTED="gdk-pixbuf"
    5.15  HOST_ARCH="i486 arm"
    5.16  
    5.17 -DEPENDS="gdk-pixbuf glib-dev libpng-dev jpeg-dev pkg-config"
    5.18 +WANTED="gdk-pixbuf"
    5.19 +DEPENDS="gdk-pixbuf glib-dev libpng-dev libjpeg-turbo-dev pkg-config"
    5.20  
    5.21  # Rules to gen a SliTaz package suitable for Tazpkg.
    5.22  genpkg_rules()
    5.23  {
    5.24 -	mkdir -p $fs/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders $fs/usr/share
    5.25 -	[ -d "$install/usr/share/gir-1.0" ] && \
    5.26 -		cp -a $install/usr/share/gir-1.0 $fs/usr/share
    5.27 -	cp -a $install/usr/include $fs/usr
    5.28 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    5.29 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    5.30 -	cp -a $install/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.*a \
    5.31 -		$fs/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders
    5.32 +	cook_copy_files *.h *.la *.pc *.gir
    5.33  }
    5.34 -
     6.1 --- a/gdk-pixbuf/receipt	Sat Mar 25 17:39:12 2017 +0200
     6.2 +++ b/gdk-pixbuf/receipt	Wed Apr 05 15:27:57 2017 +0300
     6.3 @@ -1,19 +1,20 @@
     6.4  # SliTaz package receipt.
     6.5  
     6.6  PACKAGE="gdk-pixbuf"
     6.7 -VERSION="2.31.1"
     6.8 +VERSION="2.34.0"
     6.9  CATEGORY="x-window"
    6.10  SHORT_DESC="An image loading library for gtk2"
    6.11  MAINTAINER="slaxemulator@gmail.com"
    6.12  LICENSE="GPL2"
    6.13 -TARBALL="$PACKAGE-$VERSION.tar.xz"
    6.14  WEB_SITE="http://www.gtk.org/"
    6.15 -WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
    6.16  HOST_ARCH="i486 arm"
    6.17  
    6.18 +TARBALL="$PACKAGE-$VERSION.tar.xz"
    6.19 +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
    6.20 +
    6.21  DEPENDS="glib libgio libpng tiff jpeg zlib xorg-libX11 shared-mime-info"
    6.22 -BUILD_DEPENDS="libgio-dev glib-dev jbigkit libpng-dev tiff-dev jpeg-dev \
    6.23 -xorg-libX11-dev zlib-dev shared-mime-info-dev"
    6.24 +BUILD_DEPENDS="glib-dev gettext tiff-dev libpng-dev libjpeg-turbo-dev \
    6.25 +xorg-libX11-dev gtk-doc"
    6.26  
    6.27  # Handle cross compilation
    6.28  case "$ARCH" in
    6.29 @@ -27,6 +28,8 @@
    6.30  	case "$ARCH" in
    6.31  		arm) echo "gio_can_sniff=yes" > arm.cache ;;
    6.32  	esac
    6.33 +	mkdir -p /usr/share/gtk-doc/html
    6.34 +
    6.35  	./configure \
    6.36  		--disable-glibtest \
    6.37  		--without-libjasper \
    6.38 @@ -38,13 +41,8 @@
    6.39  # Rules to gen a SliTaz package suitable for Tazpkg.
    6.40  genpkg_rules()
    6.41  {
    6.42 -	mkdir -p $fs/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders
    6.43 -	cp -a $install/usr/bin $fs/usr
    6.44 -	cp -a $install/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so \
    6.45 -		$fs/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders
    6.46 -	[ -d "$install/usr/lib/girepository-1.0" ] && \
    6.47 -		cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib
    6.48 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    6.49 +	cook_copy_folders bin
    6.50 +	cook_copy_files *.so* *.typelib
    6.51  	touch $fs/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
    6.52  }
    6.53  
     7.1 --- a/gtk+-dev/receipt	Sat Mar 25 17:39:12 2017 +0200
     7.2 +++ b/gtk+-dev/receipt	Wed Apr 05 15:27:57 2017 +0300
     7.3 @@ -1,7 +1,7 @@
     7.4  # SliTaz package receipt.
     7.5  
     7.6  PACKAGE="gtk+-dev"
     7.7 -VERSION="2.24.24"
     7.8 +VERSION="2.24.30"
     7.9  CATEGORY="development"
    7.10  SHORT_DESC="The GIMP Toolkit."
    7.11  MAINTAINER="pankso@slitaz.org"
    7.12 @@ -16,14 +16,5 @@
    7.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    7.14  genpkg_rules()
    7.15  {
    7.16 -	mkdir -p $fs/usr/lib $fs/usr/share
    7.17 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    7.18 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    7.19 -	cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib
    7.20 -	# Copy all libs and remove the shared.
    7.21 -	cp -a $install/usr/lib/gtk-2.0 $fs/usr/lib
    7.22 -	rm -rf $fs/usr/lib/gtk-2.0/2.10.0/*/*.so*
    7.23 -	cp -a $install/usr/include $fs/usr
    7.24 -	cp -a $install/usr/share/gir-1.0 $fs/usr/share
    7.25 -	cp -a $install/usr/share/aclocal $fs/usr/share
    7.26 +	cook_copy_files *.h *.la *.pc *.m4
    7.27  }
     8.1 --- a/gtk+/receipt	Sat Mar 25 17:39:12 2017 +0200
     8.2 +++ b/gtk+/receipt	Wed Apr 05 15:27:57 2017 +0300
     8.3 @@ -1,7 +1,7 @@
     8.4  # SliTaz package receipt.
     8.5  
     8.6  PACKAGE="gtk+"
     8.7 -VERSION="2.24.24"
     8.8 +VERSION="2.24.30"
     8.9  CATEGORY="x-window"
    8.10  SHORT_DESC="The GIMP Toolkit."
    8.11  MAINTAINER="pankso@slitaz.org"
    8.12 @@ -11,23 +11,23 @@
    8.13  WEB_SITE="http://www.gtk.org/"
    8.14  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
    8.15  HOST_ARCH="i486 arm"
    8.16 +CONF_FILES="/etc/gtk-2.0/im-multipress.conf"
    8.17  
    8.18  DEPENDS="glibc-base expat libxcb xcb-util zlib glib cairo pango atk libpng \
    8.19  jpeg tiff gdk-pixbuf fontconfig freetype pixman libgio xorg-libX11 xorg-libXau \
    8.20  xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext \
    8.21  xorg-libXfixes xorg-libXinerama xorg-libXrender xorg-libXrandr harfbuzz"
    8.22 -
    8.23 -BUILD_DEPENDS="atk-dev pango-dev gdk-pixbuf-dev dbus-dev dbus-glib-dev \
    8.24 +BUILD_DEPENDS="faenza-icon-theme optipng glib-dev atk-dev pango-dev cairo-dev \
    8.25 +gdk-pixbuf-dev cups-dev gobject-introspection-dev gtk-doc automake"
    8.26 +BUILD_DEPENDS_arm="atk-dev pango-dev gdk-pixbuf-dev dbus-dev dbus-glib-dev \
    8.27  xorg-inputproto libxcb-dev fontconfig-dev freetype-dev pixman-dev libxml2-dev \
    8.28  libpng-dev libffi-dev xorg-xextproto harfbuzz-dev faenza-icon-theme optipng \
    8.29  xorg-libX11-dev xorg-libXext-dev xorg-libXrender-dev automake"
    8.30  
    8.31  # Handle cross compilation.
    8.32  case "$ARCH" in
    8.33 -	i?86)
    8.34 -		BUILD_DEPENDS="$BUILD_DEPENDS bash pkg-config cups-dev perl \
    8.35 -		gobject-introspection-dev" ;;
    8.36  	arm*)
    8.37 +		BUILD_DEPENDS=$BUILD_DEPENDS_arm
    8.38  		ARCH_ARGS="--enable-introspection=no --disable-glibtest --disable-cups \
    8.39  		--disable-papi --with-gdktarget=x11 --with-xinput gio_can_sniff=yes"
    8.40  		export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib"
    8.41 @@ -35,11 +35,13 @@
    8.42  		export LIBTOOL=${HOST_SYSTEM}-libtool ;;
    8.43  esac
    8.44  
    8.45 +
    8.46  # Rules to configure and make the package.
    8.47  compile_rules()
    8.48  {
    8.49  	. $stuff/replace-icons; cd $src
    8.50  	patch -p0 < $stuff/undo_gen_icons.patch
    8.51 +	mkdir -p /usr/share/gtk-doc/html
    8.52  
    8.53  	./configure \
    8.54  		--prefix=/usr \
    8.55 @@ -55,22 +57,10 @@
    8.56  # Rules to gen a SliTaz package suitable for Tazpkg.
    8.57  genpkg_rules()
    8.58  {
    8.59 -	mkdir -p $fs/usr/lib/gtk-2.0 $fs/usr/share $fs/usr/bin
    8.60 +	cook_copy_folders etc bin themes
    8.61 +	find $fs -name gtk-demo -delete
    8.62 +	cook_copy_files *.so*
    8.63  
    8.64 -	# Libs.
    8.65 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    8.66 -	cp -a $install/usr/lib/gtk-2.0/2.10.0 $fs/usr/lib/gtk-2.0
    8.67 -	rm -rf $fs/usr/lib/gtk-2.0/2.10.0/*/*.la
    8.68 -
    8.69 -	# Themes
    8.70 -	cp -a $install/usr/share/themes $fs/usr/share
    8.71 -
    8.72 -	# Apps.
    8.73 -	cp -a $install/usr/bin/gtk-query-immodules-2.0 $fs/usr/bin
    8.74 -	cp -a $install/usr/bin/gtk-update-icon-cache $fs/usr/bin
    8.75 -	cp -a $install/usr/bin/gtk-builder-convert $fs/usr/bin
    8.76 -
    8.77 -	mkdir -p $fs/etc/gtk-2.0
    8.78  	ln -s /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
    8.79  		$fs/etc/gtk-2.0/gdk-pixbuf.loaders
    8.80  }
    8.81 @@ -79,5 +69,6 @@
    8.82  post_install()
    8.83  {
    8.84  	mkdir -p "$1/etc/gtk-2.0"
    8.85 -	chroot "$1/" /usr/bin/gtk-query-immodules-2.0 > "$1/etc/gtk-2.0/gtk.immodules"
    8.86 +	chroot "$1/" /usr/bin/gtk-query-immodules-2.0 --update-cache > \
    8.87 +	"$1/etc/gtk-2.0/gtk.immodules"
    8.88  }
     9.1 --- a/xorg-libX11-dev/receipt	Sat Mar 25 17:39:12 2017 +0200
     9.2 +++ b/xorg-libX11-dev/receipt	Wed Apr 05 15:27:57 2017 +0300
     9.3 @@ -11,7 +11,7 @@
     9.4  
     9.5  WANTED="xorg-libX11"
     9.6  DEPENDS="xorg-libX11 xorg-xtrans libxcb-dev xorg-kbproto xorg-inputproto \
     9.7 -xorg-xextproto pkg-config"
     9.8 +xorg-xextproto xorg-xproto xorg-libXau-dev xorg-libXdmcp-dev"
     9.9  
    9.10  # Rules to gen a SliTaz package suitable for Tazpkg.
    9.11  genpkg_rules()