# HG changeset patch # User Aleksej Bobylev # Date 1523914813 -10800 # Node ID af2860af5ac817d7d36869ef7994f1655f413678 # Parent 556349764d5700c7d30de586e1c3b86d96bb2f00 Use webkitgtk instead of libwebkit diff -r 556349764d57 -r af2860af5ac8 cream/receipt --- a/cream/receipt Tue Apr 17 00:06:41 2018 +0300 +++ b/cream/receipt Tue Apr 17 00:40:13 2018 +0300 @@ -1,31 +1,26 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="cream" VERSION="1.0-rc5" CATEGORY="network" -SHORT_DESC="light web browser based on WebKit and using GTK+." +SHORT_DESC="Light web browser based on WebKit and using GTK+" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL3" +WEB_SITE="http://cream-browser.sourceforge.net/" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://cream-browser.sourceforge.net/" WGET_URL="$SF_MIRROR/cream-browser/$TARBALL" -TAGS="web-browser" -DEPENDS="gtk+ gcc-lib-base libwebkit libtasn1" -BUILD_DEPENDS="libwebkit-dev libwebkit libsoup-dev gtk+-dev gettext-tools" +BUILD_DEPENDS="webkitgtk-dev libsoup-dev gtk+-dev gettext-tools" -# Rules to configure and make the package. -compile_rules() -{ - ./configure --prefix=/usr --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - $CONFIGURE_ARGS && +compile_rules() { + ./configure $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - cp -a $install/usr $fs +genpkg_rules() { + copy @std + DEPENDS="gtk+ gcc-lib-base webkitgtk libtasn1" + TAGS="web-browser" } diff -r 556349764d57 -r af2860af5ac8 gnucash/receipt --- a/gnucash/receipt Tue Apr 17 00:06:41 2018 +0300 +++ b/gnucash/receipt Tue Apr 17 00:40:13 2018 +0300 @@ -12,7 +12,7 @@ WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" BUILD_DEPENDS="glib-dev gtk+-dev goffice-dev guile-dev libgnomecanvas-dev \ -libofx-dev libwebkit-dev libxml2-dev libxslt-dev perl slib zlib-dev intltool \ +libofx-dev webkitgtk-dev libxml2-dev libxslt-dev perl slib zlib-dev intltool \ util-linux-uuid-dev libtool" LOCALES="cs da de el es fr hu it pl pt pt_BR ru sv zh_CN zh_TW" @@ -34,6 +34,6 @@ genpkg_rules() { copy @std *.mo - DEPENDS="glib gtk+ goffice guile libgnomecanvas libofx libwebkit libxml2 \ + DEPENDS="glib gtk+ goffice guile libgnomecanvas libofx webkitgtk libxml2 \ libxslt perl slib zlib util-linux-uuid" } diff -r 556349764d57 -r af2860af5ac8 libproxy/receipt --- a/libproxy/receipt Tue Apr 17 00:06:41 2018 +0300 +++ b/libproxy/receipt Tue Apr 17 00:40:13 2018 +0300 @@ -6,17 +6,15 @@ SHORT_DESC="library to provide automatic proxy configuration management" MAINTAINER="jozee@slitaz.org" LICENSE="LGPL2.1" -SUGGESTED="python icu libcurl libxslt webkit-r" +WEB_SITE="https://libproxy.github.io/libproxy/" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="https://libproxy.github.io/libproxy/" WGET_URL="https://github.com/libproxy/libproxy/archive/$VERSION.tar.gz" -BUILD_DEPENDS="glibc-base cmake libwebkit-dev python python-dev perl gtk+-dev" -SPLIT="libproxy libproxy-dev" +BUILD_DEPENDS="cmake webkitgtk-dev python-dev perl gtk+-dev" +SPLIT="libproxy-dev" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { ./autogen.sh sed -i -e 's/WITH_MOZJS:BOOL=ON/WITH_MOZJS:BOOL=OFF/' \ -e 's|/usr/local|/usr|' CMakeCache.txt @@ -25,21 +23,15 @@ make DESTDIR=$DESTDIR install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { case $PACKAGE in - libproxy) - DEPENDS="glib gtk+ gcc-lib-base xorg-libXmu libwebkit libtasn1" - mkdir -p $fs/usr/lib - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib/*.so* $fs/usr/lib - #cp -a $install/usr/lib/python* $fs/usr/lib - ;; - libproxy-dev) - mkdir -p $fs/usr/lib - cp -a $install/usr/include $fs/usr - cp -a $install/usr/lib/pkgconfig $fs/usr/lib - ;; + libproxy) + copy @std + DEPENDS="glib gtk+ xorg-libXmu webkitgtk libtasn1" + SUGGESTED="python icu libcurl libxslt" + ;; + *-dev) + copy @dev + ;; esac } diff -r 556349764d57 -r af2860af5ac8 liferea/receipt --- a/liferea/receipt Tue Apr 17 00:06:41 2018 +0300 +++ b/liferea/receipt Tue Apr 17 00:40:13 2018 +0300 @@ -1,4 +1,4 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="liferea" VERSION="1.8.15" @@ -6,38 +6,28 @@ SHORT_DESC="News aggregator for online news feeds" MAINTAINER="devl547@gmail.com" LICENSE="GPL2" +WEB_SITE="http://liferea.sourceforge.net/" + TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://liferea.sourceforge.net/" -WGET_URL="$SF_MIRROR/project/$PACKAGE/Liferea%20Stable/$VERSION/$TARBALL" +WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" -DEPENDS="gtk+ glib pango GConf libunique libxml2 libxslt sqlite3 libsoup \ -libwebkit libnotify gnutls json-glib" #intltool? BUILD_DEPENDS="gtk+-dev glib-dev pango-dev GConf GConf-dev orbit2-dev \ -libunique-dev libxml2-dev libxslt-dev sqlite3-dev libsoup-dev libwebkit-dev \ +libunique-dev libxml2-dev libxslt-dev sqlite3-dev libsoup-dev webkitgtk-dev \ libnotify-dev gnutls-dev json-glib-dev intltool" -LOCALES="da de es fr it pt_BR ru zh_CN" - -# Rules to configure and make the package. -compile_rules() -{ - ./configure $CONFIGURE_ARGS \ - --enable-sm --disable-schemas-install --enable-libnotify && +compile_rules() { + ./configure \ + --enable-sm \ + --disable-schemas-install \ + --enable-libnotify \ + $CONFIGURE_ARGS && + fix libtool && make && make DESTDIR=$DESTDIR install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/share/locale - mkdir -p $fs/etc - cp -a $install/usr/bin $fs/usr - cp -a $install/etc $fs - cp -a $install/usr/share/applications $fs/usr/share/ - cp -a $install/usr/share/icons $fs/usr/share/ - cp -a $install/usr/share/liferea $fs/usr/share/ - for locale in $LOCALES; do - cp -a $install/usr/share/locale/$locale $fs/usr/share/locale - done +genpkg_rules() { + copy @std *.mo + DEPENDS="gtk+ glib pango GConf libunique libxml2 libxslt sqlite3 libsoup \ + webkitgtk libnotify gnutls json-glib" #intltool? } diff -r 556349764d57 -r af2860af5ac8 midori/receipt --- a/midori/receipt Tue Apr 17 00:06:41 2018 +0300 +++ b/midori/receipt Tue Apr 17 00:40:13 2018 +0300 @@ -13,7 +13,7 @@ TARBALL_SHA1="64c86935028feb5f89d799c2acacaad67764da6f" BUILD_DEPENDS_arm="glib-dev libnotify-dev gtk+-dev xorg-libXScrnSaver-dev \ -libwebkit-dev libunique-dev libsoup-dev libxslt-dev gettext intltool" +webkitgtk-dev libunique-dev libsoup-dev libxslt-dev gettext intltool" BUILD_DEPENDS="cmake vala sqlite3-dev libsoup-dev shared-mime-info gcr-dev \ webkitgtk-dev gettext rsvg-convert intltool" diff -r 556349764d57 -r af2860af5ac8 miro/receipt --- a/miro/receipt Tue Apr 17 00:06:41 2018 +0300 +++ b/miro/receipt Tue Apr 17 00:40:13 2018 +0300 @@ -1,40 +1,32 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="miro" VERSION="6.0" CATEGORY="multimedia" -SHORT_DESC="The free and open source internet TV platform." +SHORT_DESC="The free and open source internet TV platform" MAINTAINER="slaxemulator@gmail.com" LICENSE="GPL2" +WEB_SITE="http://www.getmiro.com" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://www.getmiro.com" WGET_URL="http://ftp.osuosl.org/pub/pculture.org/$PACKAGE/src/$TARBALL" -DEPENDS="dbus-python python-pyrex pygtk gstreamer0 python-pysqlite pywebkitgtk \ -shared-mime-info desktop-file-utils hicolor-icon-theme gst0-python notify-python \ -libtorrent-rasterbar gst0-plugins-base gst0-plugins-good gst0-ffmpeg \ -pycurl taglib python-gconf" -BUILD_DEPENDS="$DEPENDS python-dev dbus-python-dev pygtk-dev gstreamer0-dev \ -shared-mime-info-dev gst0-python-dev libtorrent-rasterbar-dev libsoup-dev \ -libwebkit-dev gst0-plugins-base-dev gst0-plugins-good-dev ffmpeg-dev \ -imagemagick-dev taglib-dev libboost-dev" +BUILD_DEPENDS="python-pyrex python-pysqlite pywebkitgtk desktop-file-utils \ +hicolor-icon-theme notify-python gst0-ffmpeg pycurl python-gconf python-dev \ +dbus-python-dev pygtk-dev gstreamer0-dev shared-mime-info-dev gst0-python-dev \ +libtorrent-rasterbar-dev libsoup-dev webkitgtk-dev gst0-plugins-base-dev \ +gst0-plugins-good-dev ffmpeg-dev imagemagick-dev taglib-dev libboost-dev" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { cd $src/linux python setup.py install --root=$DESTDIR sed -i "s|./miro.real|/usr/bin/miro.real|g" $DESTDIR/usr/bin/miro } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/share - - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib $fs/usr - cp -a $install/usr/share/icons $fs/usr/share - cp -a $install/usr/share/miro $fs/usr/share +genpkg_rules() { + copy @std + DEPENDS="dbus-python python-pyrex pygtk gstreamer0 python-pysqlite \ + pywebkitgtk shared-mime-info desktop-file-utils hicolor-icon-theme \ + gst0-python notify-python libtorrent-rasterbar gst0-plugins-base \ + gst0-plugins-good gst0-ffmpeg pycurl taglib python-gconf" } - diff -r 556349764d57 -r af2860af5ac8 osmo/receipt --- a/osmo/receipt Tue Apr 17 00:06:41 2018 +0300 +++ b/osmo/receipt Tue Apr 17 00:40:13 2018 +0300 @@ -11,8 +11,6 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$SF_MIRROR/osmo-pim/$TARBALL" -aBUILD_DEPENDS="gtk+ gtk+-dev libwebkit-dev libxml2-dev libnotify-dev libical-dev gettext" - BUILD_DEPENDS="gettext gtk+3-dev libarchive-dev libical-dev gtkspell3-dev \ libnotify-gtk3-dev webkit2gtk-dev"