# HG changeset patch # User Aleksej Bobylev # Date 1509315387 -7200 # Node ID 58d6577fec3875734f7166646d45cf6551e4afca # Parent e8a7459f66364db2e143603f19d6abc52af48d78 Up glade3, json-glib, libgee, font-manager, liberation-fonts; add glade, liberation-classic-fonts, python-distutils-extra. diff -r e8a7459f6636 -r 58d6577fec38 font-manager/receipt --- a/font-manager/receipt Sun Oct 29 23:03:44 2017 +0100 +++ b/font-manager/receipt Mon Oct 30 00:16:27 2017 +0200 @@ -1,41 +1,48 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="font-manager" -VERSION="0.5.7" +VERSION="0.7.3" CATEGORY="utilities" -SHORT_DESC="A font management application for the GNOME desktop" +SHORT_DESC="Simple font management for GTK+ desktop environments" MAINTAINER="al.bobylev@gmail.com" LICENSE="GPL3" -WEB_SITE="http://code.google.com/p/font-manager/" +WEB_SITE="http://fontmanager.github.io/" + TARBALL="$PACKAGE-$VERSION.tar.bz2" -WGET_URL="http://$PACKAGE.googlecode.com/files/$TARBALL" +WGET_URL="https://github.com/FontManager/master/releases/download/$VERSION/$TARBALL" -DEPENDS="python pygtk pygobject pycairo libxml2-python fontconfig freetype \ -sqlite3" -BUILD_DEPENDS="bash python-dev fontconfig-dev freetype-dev glib-dev pango-dev \ -sqlite3-dev intltool gnome-doc-utils" +BUILD_DEPENDS="vala gettext intltool freetype-dev fontconfig-dev json-glib-dev \ +cairo-dev gtk+3-dev libgee-dev gucharmap3-dev sqlite3-dev yelp-tools itstool \ +file" +SPLIT="font-manager-dev" -# Rules to configure and make the package. -compile_rules() -{ - cd $src - sed -i 's/FT_XFREE86_H/&\n#define W_OK (2)/' src/lib/fm-fontutils.c - ./configure --enable-bytecode --enable-nls $CONFIGURE_ARGS && - make && - make DESTDIR=$install install - - # fix translations - for p in $(ls po | grep -e '.po$'); do - msgfmt $src/po/$p -o $install/usr/share/locale/${p%.po}/LC_MESSAGES/font-manager.mo - done +compile_rules() { + ./configure \ + --disable-schemas-compile \ + $CONFIGURE_ARGS && + make -j1 && + make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - cp -a $install/* $fs - # fix paths - sed -i "s|$install||g" $fs/usr/bin/* $fs/usr/share/font-manager/*.py - # remove help (need absent yelp to show) - rm -rf $fs/usr/share/font-manager/help +genpkg_rules() { + case $PACKAGE in + font-manager) + copy @std + DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk+3 \ + gucharmap3 json-glib libffi libgee libharfbuzz liblzma libpng16 \ + libsqlite3 libxml2 pango pcre util-linux-blkid util-linux-mount \ + util-linux-uuid xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext \ + xorg-libXrender xorg-libxcb xorg-pixman zlib" + ;; + *-dev) + copy @dev + DEPENDS="font-manager atk-dev bzip2-dev cairo-dev fontconfig-dev \ + freetype-dev gdk-pixbuf-dev glib-dev gtk+3-dev gucharmap3-dev \ + harfbuzz-dev json-glib-dev libffi-dev libgee-dev libpng16-dev \ + libxml2-dev pango-dev pcre-dev sqlite3-dev util-linux-blkid-dev \ + util-linux-mount-dev util-linux-uuid-dev xorg-libX11-dev \ + xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \ + xorg-libXrender-dev xorg-libxcb-dev xorg-pixman-dev xz-dev zlib-dev" + ;; + esac } diff -r e8a7459f6636 -r 58d6577fec38 font-manager/stuff/patches/2017.06.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/font-manager/stuff/patches/2017.06.patch Mon Oct 30 00:16:27 2017 +0200 @@ -0,0 +1,44 @@ +--- lib/UX/Models/CollectionModel.vala 2017-06-29 16:17:28.997795458 +0800 ++++ lib/UX/Models/CollectionModel.vala 2017-06-29 16:17:22.227415589 +0800 +@@ -104,7 +104,7 @@ + return sorted; + } + +- void insert_children (Gee.ArrayList groups, Gtk.TreeIter parent) { ++ void insert_children (Gee.ArrayList groups, Gtk.TreeIter parent) { + var sorted = sort_groups(groups); + foreach(var child in sorted) { + Gtk.TreeIter _iter; +--- src/font-manager/State.vala 2017-06-29 16:42:40.268868810 +0800 ++++ src/font-manager/State.vala 2017-06-29 16:42:55.579554795 +0800 +@@ -25,8 +25,8 @@ + + public class State : Object { + +- internal static const int DEFAULT_WIDTH = 700; +- internal static const int DEFAULT_HEIGHT = 480; ++ internal const int DEFAULT_WIDTH = 700; ++ internal const int DEFAULT_HEIGHT = 480; + + public Settings? settings { get; set; default = null; } + public weak MainWindow? main_window { get; set; default = null; } +--- src/font-manager/Compare.vala 2017-06-29 16:43:14.080385035 +0800 ++++ src/font-manager/Compare.vala 2017-06-29 16:43:31.427831486 +0800 +@@ -280,9 +280,17 @@ + * the iter was always being set to null after calling remove. + */ + string iter_as_string = store.get_string_from_iter(iter); ++#if VALA_0_36 ++ store.remove(ref iter); ++#else + store.remove(iter); ++#endif + store.get_iter_from_string(out iter, iter_as_string); ++#if VALA_0_36 ++ bool still_valid = store.remove(ref iter); ++#else + bool still_valid = store.remove(iter); ++#endif + /* Set the cursor to a remaining row instead of having the cursor disappear. + * This allows for easy deletion of multiple previews by hitting the remove + * button repeatedly. diff -r e8a7459f6636 -r 58d6577fec38 font-manager/stuff/patches/series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/font-manager/stuff/patches/series Mon Oct 30 00:16:27 2017 +0200 @@ -0,0 +1,2 @@ +# from https://aur.archlinux.org/packages/font-manager/ +-Np0|2017.06.patch diff -r e8a7459f6636 -r 58d6577fec38 glade/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/glade/receipt Mon Oct 30 00:16:27 2017 +0200 @@ -0,0 +1,52 @@ +# SliTaz package receipt v2. + +PACKAGE="glade" +VERSION="3.20.1" +CATEGORY="development" +SHORT_DESC="A user interface designer for GTK+3" +MAINTAINER="al.bobylev@gmail.com" +LICENSE="LGPL" +WEB_SITE="http://glade.gnome.org/" + +TARBALL="$PACKAGE-$VERSION.tar.xz" +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" + +BUILD_DEPENDS="glib-dev intltool gtk-doc gtk+3-dev pygobject3-dev python-dev \ +itstool" +SPLIT="glade-python glade glade-dev" + +compile_rules() { + # sdft can't work with keywords + sed -i '/_Keywords=/d' date/glade.desktop.in.in + + # introspection produces error + ./configure \ + --disable-introspection \ + --enable-gladeui \ + $CONFIGURE_ARGS && + make && make install +} + +genpkg_rules() { + case $PACKAGE in + *-python) + copy libgladepython.so + DEPENDS="glade python" + CAT="python|Python bindings" + ;; + glade) + copy @std @rm + DEPENDS="atk cairo gdk-pixbuf glib gtk+3 libxml2 pango" + ;; + *-dev) + copy @dev + DEPENDS="glade glade-python \ + atk-dev bzip2-dev cairo-dev fontconfig-dev freetype-dev \ + gdk-pixbuf-dev glib-dev gtk+3-dev harfbuzz-dev libffi-dev \ + libpng16-dev libxml2-dev pango-dev pcre-dev python \ + util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \ + xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \ + xorg-libXrender-dev xorg-libxcb-dev xorg-pixman-dev xz-dev zlib-dev" + ;; + esac +} diff -r e8a7459f6636 -r 58d6577fec38 glade3/receipt --- a/glade3/receipt Sun Oct 29 23:03:44 2017 +0100 +++ b/glade3/receipt Mon Oct 30 00:16:27 2017 +0200 @@ -1,44 +1,44 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="glade3" -VERSION="3.8.0" +VERSION="3.8.6" CATEGORY="development" -SHORT_DESC="Vector drawing application." +SHORT_DESC="A user interface designer for GTK+2" MAINTAINER="pankso@slitaz.org" -LICENSE="LGPL" -SUGGESTED="python" -TARBALL="$PACKAGE-$VERSION.tar.bz2" +LICENSE="GPL2 LGPL2" WEB_SITE="http://glade.gnome.org/" + +TARBALL="$PACKAGE-$VERSION.tar.xz" WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" -DEPENDS="gtk+ libglade xorg-libXdamage" -BUILD_DEPENDS="intltool libxml2-dev expat-dev python gtk+-dev" +BUILD_DEPENDS="intltool gtk-doc gtk+-dev pygtk-dev python-dev itstool" +SPLIT="glade3-python glade3 glade3-dev" -# Rules to configure and make the package. -compile_rules() -{ - cd $src - ./configure \ - --prefix=/usr \ - --with-html-dir=/usr/share/doc \ - --disable-scrollkeeper \ - $CONFIGURE_ARGS - # Doc doesn't built - sed -i 's/= help/=/' Makefile - make && - make DESTDIR=$DESTDIR install +compile_rules() { + ./configure $CONFIGURE_ARGS && make && make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib $fs/usr/share/pixmaps - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib/*.so* $fs/usr/lib - cp -a $install/usr/lib/glade3 $fs/usr/lib - rm $fs/usr/lib/glade3/modules/*.*a - cp -a $install/usr/share/icons/hicolor/24x24/apps/* \ - $fs/usr/share/pixmaps - cp -a $install/usr/share/glade3 $fs/usr/share +genpkg_rules() { + case $PACKAGE in + *-python) + copy libgladepython.so + DEPENDS="glade3 python" + CAT="python|Python bindings" + ;; + glade3) + copy @std @rm + DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ \ + libxml2 pango" + ;; + *-dev) + copy @dev + DEPENDS="glade3 glade3-python \ + atk-dev bzip2-dev cairo-dev fontconfig-dev freetype-dev \ + gdk-pixbuf-dev glib-dev gtk+-dev harfbuzz-dev libffi-dev \ + libpng16-dev libxml2-dev pango-dev pcre-dev python \ + util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \ + xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \ + xorg-libXrender-dev xorg-libxcb-dev xorg-pixman-dev xz-dev zlib-dev" + ;; + esac } - diff -r e8a7459f6636 -r 58d6577fec38 json-glib-dev/receipt --- a/json-glib-dev/receipt Sun Oct 29 23:03:44 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="json-glib-dev" -VERSION="0.14.2" -CATEGORY="development" -SHORT_DESC="json-glib development files" -MAINTAINER="mallory@sweetpeople.org" -LICENSE="LGPL2.1" -WEB_SITE="http://live.gnome.org/JsonGlib" -WANTED="json-glib" - -DEPENDS="json-glib glib-dev pkg-config" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib $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/share/gir-1.0 $fs/usr/share -} - diff -r e8a7459f6636 -r 58d6577fec38 json-glib/receipt --- a/json-glib/receipt Sun Oct 29 23:03:44 2017 +0100 +++ b/json-glib/receipt Mon Oct 30 00:16:27 2017 +0200 @@ -1,32 +1,37 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="json-glib" -VERSION="0.14.2" +VERSION="1.2.8" CATEGORY="development" -SHORT_DESC="JSON-GLib is a library providing serialization and deserialization support for the JavaScript Object Notation" +SHORT_DESC="JSON parser for GLib" MAINTAINER="mallory@sweetpeople.org" LICENSE="LGPL2.1" -TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://live.gnome.org/JsonGlib" -WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL" -TAGS="javascript" +WEB_SITE="https://wiki.gnome.org/Projects/JsonGlib" +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/json-glib.html" -DEPENDS="glib" -BUILD_DEPENDS="pkg-config gobject-introspection-dev glib-dev" +TARBALL="$PACKAGE-$VERSION.tar.xz" +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $src - ./configure $CONFIGURE_ARGS && - make && make install +BUILD_DEPENDS="glib-dev gtk-doc libxslt-dev gobject-introspection-dev gettext" +SPLIT="json-glib-dev" + +compile_rules() { + ./configure $CONFIGURE_ARGS && make && make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib - cp -a $install/usr/lib/*.so* $fs/usr/lib - cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib +genpkg_rules() { + case $PACKAGE in + json-glib) + copy @std + DEPENDS="glib libffi pcre util-linux-blkid util-linux-mount \ + util-linux-uuid zlib" + TAGS="javascript" + ;; + *-dev) + copy @dev + DEPENDS="json-glib glib-dev libffi-dev pcre-dev \ + util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \ + zlib-dev" + ;; + esac } - diff -r e8a7459f6636 -r 58d6577fec38 liberation-classic-fonts/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/liberation-classic-fonts/receipt Mon Oct 30 00:16:27 2017 +0200 @@ -0,0 +1,24 @@ +# SliTaz package receipt v2. + +PACKAGE="liberation-classic-fonts" +VERSION="1.07.4" +CATEGORY="fonts" +SHORT_DESC="Liberation fonts" +MAINTAINER="al.bobylev@gmail.com" +LICENSE="SIL_OFL" +#WEB_SITE="https://www.redhat.com/promo/fonts/" +WEB_SITE="https://pagure.io/liberation-classic-fonts" + +TARBALL="liberation-fonts-ttf-$VERSION.tar.gz" +WGET_URL="https://releases.pagure.org/liberation-fonts/$TARBALL" + +compile_rules() { + dir="$install/usr/share/fonts/truetype/liberation-classic" + mkdir -p $dir + cp *.ttf $dir +} + +genpkg_rules() { + copy @std +} + diff -r e8a7459f6636 -r 58d6577fec38 liberation-fonts-base/receipt --- a/liberation-fonts-base/receipt Sun Oct 29 23:03:44 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="liberation-fonts-base" -VERSION="2.00.1" -CATEGORY="fonts" -SHORT_DESC="Liberation fonts (only regular)" -MAINTAINER="al.bobylev@gmail.com" -LICENSE="SIL_OFL" -WEB_SITE="https://www.redhat.com/promo/fonts/" -SOURCE="liberation-fonts" -TARBALL="$SOURCE-ttf-$VERSION.tar.gz" -WGET_URL="https://fedorahosted.org/releases/l/i/$SOURCE/$TARBALL" - -BUILD_DEPENDS="wget" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - dir="$fs/usr/share/fonts/truetype/$SOURCE" - mkdir -p $dir - cp $src/*Regular.ttf $dir -} diff -r e8a7459f6636 -r 58d6577fec38 liberation-fonts/receipt --- a/liberation-fonts/receipt Sun Oct 29 23:03:44 2017 +0100 +++ b/liberation-fonts/receipt Mon Oct 30 00:16:27 2017 +0200 @@ -1,4 +1,4 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="liberation-fonts" VERSION="2.00.1" @@ -6,17 +6,19 @@ SHORT_DESC="Liberation fonts" MAINTAINER="al.bobylev@gmail.com" LICENSE="SIL_OFL" -WEB_SITE="https://www.redhat.com/promo/fonts/" +#WEB_SITE="https://www.redhat.com/promo/fonts/" +WEB_SITE="https://pagure.io/liberation-fonts" -WANTED="liberation-fonts-base" -DEPENDS="liberation-fonts-base" +TARBALL="liberation-fonts-ttf-$VERSION.tar.gz" +WGET_URL="https://releases.pagure.org/liberation-fonts/$TARBALL" -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - dir="$fs/usr/share/fonts/truetype/$PACKAGE" +compile_rules() { + dir="$install/usr/share/fonts/truetype/liberation" mkdir -p $dir - cp $src/*.ttf $dir - rm -f $dir/*Regular.ttf + cp *.ttf $dir } +genpkg_rules() { + copy @std +} + diff -r e8a7459f6636 -r 58d6577fec38 libgee-dev/receipt --- a/libgee-dev/receipt Sun Oct 29 23:03:44 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="libgee-dev" -VERSION="0.9.92" -CATEGORY="development" -SHORT_DESC="GObject collection library devel files." -MAINTAINER="pankso@slitaz.org" -LICENSE="LGPL2.1" -WEB_SITE="http://live.gnome.org/Libgee" - -WANTED="libgee" -DEPENDS="libgee pkg-config" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib - cp -a $install/usr/lib/*.*a $fs/usr/lib - cp -a $install/usr/lib/pkgconfig $fs/usr/lib - cp -a $install/usr/lib/girepository* $fs/usr/lib - cp -a $install/usr/include $fs/usr - cp -a $install/usr/share $fs/usr -} - diff -r e8a7459f6636 -r 58d6577fec38 libgee/receipt --- a/libgee/receipt Sun Oct 29 23:03:44 2017 +0100 +++ b/libgee/receipt Mon Oct 30 00:16:27 2017 +0200 @@ -1,32 +1,34 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="libgee" -VERSION="0.9.92" +VERSION="0.20.0" CATEGORY="x-window" -SHORT_DESC="GObject collection library." +SHORT_DESC="GObject collection library" MAINTAINER="pankso@slitaz.org" LICENSE="LGPL2.1" -WEB_SITE="http://live.gnome.org/Libgee" +WEB_SITE="https://wiki.gnome.org/Projects/Libgee" + TARBALL="$PACKAGE-$VERSION.tar.xz" -SERIES="$(echo $VERSION | cut -d. -f1,2)" -WGET_URL="$GNOME_MIRROR/$PACKAGE/$SERIES/$TARBALL" +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" -DEPENDS="glib libffi" -BUILD_DEPENDS="bash vala gobject-introspection-dev sed glib-dev libffi-dev sed" +BUILD_DEPENDS="glib-dev gobject-introspection-dev" +SPLIT="libgee-dev" -# Rules to configure and make the package. -compile_rules() -{ - ./configure \ - --enable-introspection=yes \ - $CONFIGURE_ARGS && - make && - make install +compile_rules() { + ./configure $CONFIGURE_ARGS && make && make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib - cp -a $install/usr/lib/*.so* $fs/usr/lib +genpkg_rules() { + case $PACKAGE in + libgee) + copy @std + DEPENDS="glib libffi pcre util-linux-blkid util-linux-mount \ + util-linux-uuid zlib" + ;; + *-dev) + copy @dev + DEPENDS="libgee glib-dev libffi-dev pcre-dev util-linux-blkid-dev \ + util-linux-mount-dev util-linux-uuid-dev zlib-dev" + ;; + esac } diff -r e8a7459f6636 -r 58d6577fec38 python-distutils-extra/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/python-distutils-extra/receipt Mon Oct 30 00:16:27 2017 +0200 @@ -0,0 +1,26 @@ +# SliTaz package receipt. + +PACKAGE="python-distutils-extra" +VERSION="2.39" +CATEGORY="development" +SHORT_DESC="Add support for i18n, documentation and icons to distutils" +MAINTAINER="al.bobylev@gmail.com" +LICENSE="GPL2" +WEB_SITE="https://launchpad.net/python-distutils-extra" +HOST_ARCH="i486 arm" + +TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="$WEB_SITE/trunk/$VERSION/+download/$TARBALL" + +BUILD_DEPENDS="python" + +compile_rules() { + python setup.py install \ + --prefix=/usr \ + --root=$install +} + +genpkg_rules() { + copy @std + DEPENDS="python" +}