# HG changeset patch # User Aleksej Bobylev # Date 1491395277 -10800 # Node ID 558329d2603ab4845c9f07d9050b5a49f522f4e2 # Parent daa754d4b004955cff4f4b7913239e9d24a17f8d 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). diff -r daa754d4b004 -r 558329d2603a cmark-gfm/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cmark-gfm/receipt Wed Apr 05 15:27:57 2017 +0300 @@ -0,0 +1,33 @@ +# SliTaz package receipt. + +PACKAGE="cmark-gfm" +VERSION="0.27.1.76" +COMMIT="a81db63" +CATEGORY="text" +SHORT_DESC="Github fork of CommonMark parsing and rendering program in C" +MAINTAINER="al.bobylev@gmail.com" +LICENSE="BSD" +WEB_SITE="https://github.com/github/cmark" + +TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="$GITHUB/github/cmark/tarball/${COMMIT:-$VERSION}" + +BUILD_DEPENDS="cmake py3k" + +# Rules to configure and make the package. +compile_rules() +{ + patch -p1 -i $stuff/cmark-0.27.1.76.patch + + mkdir build; cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr && + make && + make test && + make install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + cook_copy_files cmark-gfm +} diff -r daa754d4b004 -r 558329d2603a cmark-gfm/stuff/cmark-0.27.1.76.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cmark-gfm/stuff/cmark-0.27.1.76.patch Wed Apr 05 15:27:57 2017 +0300 @@ -0,0 +1,10 @@ +--- a/man/CMakeLists.txt ++++ b/man/CMakeLists.txt +@@ -5,6 +5,6 @@ + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man1/cmark.1 + DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) + +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man3/cmark.3 ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man3/cmark-gfm.3 + DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) + endif(NOT MSVC) diff -r daa754d4b004 -r 558329d2603a cmark/description.txt --- a/cmark/description.txt Sat Mar 25 17:39:12 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -`cmark` is the C reference implementation of [CommonMark], a rationalized -version of Markdown syntax with a [spec][the spec]. - -It provides a shared library (`libcmark`) with functions for parsing CommonMark -documents to an abstract syntax tree (AST), manipulating the AST, and rendering -the document to HTML, groff man, LaTeX, CommonMark, or an XML representation of -the AST. It also provides a command-line program (`cmark`) for parsing and -rendering CommonMark documents. - -[CommonMark]: http://commonmark.org -[the spec]: http://spec.commonmark.org diff -r daa754d4b004 -r 558329d2603a cmark/receipt --- a/cmark/receipt Sat Mar 25 17:39:12 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="cmark" -VERSION="0.27.1.70" -COMMIT="353fd72" -CATEGORY="text" -SHORT_DESC="CommonMark parsing and rendering program in C" -MAINTAINER="al.bobylev@gmail.com" -LICENSE="BSD" -WEB_SITE="https://github.com/github/cmark" - -TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="$GITHUB/github/cmark/tarball/${COMMIT:-$VERSION}" - -BUILD_DEPENDS="cmake py3k" - -# Rules to configure and make the package. -compile_rules() -{ - mkdir build; cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr && - make && - make test && - make install -} - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - cook_copy_files cmark -} diff -r daa754d4b004 -r 558329d2603a gdk-pixbuf-dev/receipt --- a/gdk-pixbuf-dev/receipt Sat Mar 25 17:39:12 2017 +0200 +++ b/gdk-pixbuf-dev/receipt Wed Apr 05 15:27:57 2017 +0300 @@ -1,27 +1,19 @@ # SliTaz package receipt. PACKAGE="gdk-pixbuf-dev" -VERSION="2.31.1" +VERSION="2.34.0" CATEGORY="development" SHORT_DESC="devel files for gdk-pixbuf" MAINTAINER="slaxemulator@gmail.com" LICENSE="GPL2" WEB_SITE="http://www.gtk.org/" -WANTED="gdk-pixbuf" HOST_ARCH="i486 arm" -DEPENDS="gdk-pixbuf glib-dev libpng-dev jpeg-dev pkg-config" +WANTED="gdk-pixbuf" +DEPENDS="gdk-pixbuf glib-dev libpng-dev libjpeg-turbo-dev pkg-config" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders $fs/usr/share - [ -d "$install/usr/share/gir-1.0" ] && \ - cp -a $install/usr/share/gir-1.0 $fs/usr/share - cp -a $install/usr/include $fs/usr - cp -a $install/usr/lib/*.*a $fs/usr/lib - cp -a $install/usr/lib/pkgconfig $fs/usr/lib - cp -a $install/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.*a \ - $fs/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders + cook_copy_files *.h *.la *.pc *.gir } - diff -r daa754d4b004 -r 558329d2603a gdk-pixbuf/receipt --- a/gdk-pixbuf/receipt Sat Mar 25 17:39:12 2017 +0200 +++ b/gdk-pixbuf/receipt Wed Apr 05 15:27:57 2017 +0300 @@ -1,19 +1,20 @@ # SliTaz package receipt. PACKAGE="gdk-pixbuf" -VERSION="2.31.1" +VERSION="2.34.0" CATEGORY="x-window" SHORT_DESC="An image loading library for gtk2" MAINTAINER="slaxemulator@gmail.com" LICENSE="GPL2" -TARBALL="$PACKAGE-$VERSION.tar.xz" WEB_SITE="http://www.gtk.org/" -WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" HOST_ARCH="i486 arm" +TARBALL="$PACKAGE-$VERSION.tar.xz" +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" + DEPENDS="glib libgio libpng tiff jpeg zlib xorg-libX11 shared-mime-info" -BUILD_DEPENDS="libgio-dev glib-dev jbigkit libpng-dev tiff-dev jpeg-dev \ -xorg-libX11-dev zlib-dev shared-mime-info-dev" +BUILD_DEPENDS="glib-dev gettext tiff-dev libpng-dev libjpeg-turbo-dev \ +xorg-libX11-dev gtk-doc" # Handle cross compilation case "$ARCH" in @@ -27,6 +28,8 @@ case "$ARCH" in arm) echo "gio_can_sniff=yes" > arm.cache ;; esac + mkdir -p /usr/share/gtk-doc/html + ./configure \ --disable-glibtest \ --without-libjasper \ @@ -38,13 +41,8 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so \ - $fs/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders - [ -d "$install/usr/lib/girepository-1.0" ] && \ - cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib - cp -a $install/usr/lib/*.so* $fs/usr/lib + cook_copy_folders bin + cook_copy_files *.so* *.typelib touch $fs/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache } diff -r daa754d4b004 -r 558329d2603a gtk+-dev/receipt --- a/gtk+-dev/receipt Sat Mar 25 17:39:12 2017 +0200 +++ b/gtk+-dev/receipt Wed Apr 05 15:27:57 2017 +0300 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gtk+-dev" -VERSION="2.24.24" +VERSION="2.24.30" CATEGORY="development" SHORT_DESC="The GIMP Toolkit." MAINTAINER="pankso@slitaz.org" @@ -16,14 +16,5 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib $fs/usr/share - cp -a $install/usr/lib/*.*a $fs/usr/lib - cp -a $install/usr/lib/pkgconfig $fs/usr/lib - cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib - # Copy all libs and remove the shared. - cp -a $install/usr/lib/gtk-2.0 $fs/usr/lib - rm -rf $fs/usr/lib/gtk-2.0/2.10.0/*/*.so* - cp -a $install/usr/include $fs/usr - cp -a $install/usr/share/gir-1.0 $fs/usr/share - cp -a $install/usr/share/aclocal $fs/usr/share + cook_copy_files *.h *.la *.pc *.m4 } diff -r daa754d4b004 -r 558329d2603a gtk+/receipt --- a/gtk+/receipt Sat Mar 25 17:39:12 2017 +0200 +++ b/gtk+/receipt Wed Apr 05 15:27:57 2017 +0300 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gtk+" -VERSION="2.24.24" +VERSION="2.24.30" CATEGORY="x-window" SHORT_DESC="The GIMP Toolkit." MAINTAINER="pankso@slitaz.org" @@ -11,23 +11,23 @@ WEB_SITE="http://www.gtk.org/" WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL" HOST_ARCH="i486 arm" +CONF_FILES="/etc/gtk-2.0/im-multipress.conf" DEPENDS="glibc-base expat libxcb xcb-util zlib glib cairo pango atk libpng \ jpeg tiff gdk-pixbuf fontconfig freetype pixman libgio xorg-libX11 xorg-libXau \ xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext \ xorg-libXfixes xorg-libXinerama xorg-libXrender xorg-libXrandr harfbuzz" - -BUILD_DEPENDS="atk-dev pango-dev gdk-pixbuf-dev dbus-dev dbus-glib-dev \ +BUILD_DEPENDS="faenza-icon-theme optipng glib-dev atk-dev pango-dev cairo-dev \ +gdk-pixbuf-dev cups-dev gobject-introspection-dev gtk-doc automake" +BUILD_DEPENDS_arm="atk-dev pango-dev gdk-pixbuf-dev dbus-dev dbus-glib-dev \ xorg-inputproto libxcb-dev fontconfig-dev freetype-dev pixman-dev libxml2-dev \ libpng-dev libffi-dev xorg-xextproto harfbuzz-dev faenza-icon-theme optipng \ xorg-libX11-dev xorg-libXext-dev xorg-libXrender-dev automake" # Handle cross compilation. case "$ARCH" in - i?86) - BUILD_DEPENDS="$BUILD_DEPENDS bash pkg-config cups-dev perl \ - gobject-introspection-dev" ;; arm*) + BUILD_DEPENDS=$BUILD_DEPENDS_arm ARCH_ARGS="--enable-introspection=no --disable-glibtest --disable-cups \ --disable-papi --with-gdktarget=x11 --with-xinput gio_can_sniff=yes" export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib" @@ -35,11 +35,13 @@ export LIBTOOL=${HOST_SYSTEM}-libtool ;; esac + # Rules to configure and make the package. compile_rules() { . $stuff/replace-icons; cd $src patch -p0 < $stuff/undo_gen_icons.patch + mkdir -p /usr/share/gtk-doc/html ./configure \ --prefix=/usr \ @@ -55,22 +57,10 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib/gtk-2.0 $fs/usr/share $fs/usr/bin + cook_copy_folders etc bin themes + find $fs -name gtk-demo -delete + cook_copy_files *.so* - # Libs. - cp -a $install/usr/lib/*.so* $fs/usr/lib - cp -a $install/usr/lib/gtk-2.0/2.10.0 $fs/usr/lib/gtk-2.0 - rm -rf $fs/usr/lib/gtk-2.0/2.10.0/*/*.la - - # Themes - cp -a $install/usr/share/themes $fs/usr/share - - # Apps. - cp -a $install/usr/bin/gtk-query-immodules-2.0 $fs/usr/bin - cp -a $install/usr/bin/gtk-update-icon-cache $fs/usr/bin - cp -a $install/usr/bin/gtk-builder-convert $fs/usr/bin - - mkdir -p $fs/etc/gtk-2.0 ln -s /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ $fs/etc/gtk-2.0/gdk-pixbuf.loaders } @@ -79,5 +69,6 @@ post_install() { mkdir -p "$1/etc/gtk-2.0" - chroot "$1/" /usr/bin/gtk-query-immodules-2.0 > "$1/etc/gtk-2.0/gtk.immodules" + chroot "$1/" /usr/bin/gtk-query-immodules-2.0 --update-cache > \ + "$1/etc/gtk-2.0/gtk.immodules" } diff -r daa754d4b004 -r 558329d2603a xorg-libX11-dev/receipt --- a/xorg-libX11-dev/receipt Sat Mar 25 17:39:12 2017 +0200 +++ b/xorg-libX11-dev/receipt Wed Apr 05 15:27:57 2017 +0300 @@ -11,7 +11,7 @@ WANTED="xorg-libX11" DEPENDS="xorg-libX11 xorg-xtrans libxcb-dev xorg-kbproto xorg-inputproto \ -xorg-xextproto pkg-config" +xorg-xextproto xorg-xproto xorg-libXau-dev xorg-libXdmcp-dev" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules()