# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1578378276 -3600
# Node ID 613b75574469ac23c959d297c6d86d570696d070
# Parent  b2c3caa4e31ca57c10aac2a5e2f8478e2f512527
updated cairo-dock packages (2.4.0~2 -> 3.4.1)

diff -r b2c3caa4e31c -r 613b75574469 cairo-dock-dev/receipt
--- a/cairo-dock-dev/receipt	Mon Jan 06 16:52:55 2020 +0100
+++ b/cairo-dock-dev/receipt	Tue Jan 07 07:24:36 2020 +0100
@@ -1,21 +1,22 @@
 # SliTaz package receipt.
 
 PACKAGE="cairo-dock-dev"
-VERSION="2.4.0~2"
+VERSION="3.4.1"
 CATEGORY="x-window"
-SHORT_DESC="Cairo dock devel file."
+SHORT_DESC="Cairo dock - development files."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
-WANTED="cairo-dock"
 WEB_SITE="http://www.glx-dock.org/"
 
 DEPENDS="cairo-dock pkg-config"
+WANTED="cairo-dock"
 
 # 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/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/include		$fs/usr
 }
diff -r b2c3caa4e31c -r 613b75574469 cairo-dock-plugins/receipt
--- a/cairo-dock-plugins/receipt	Mon Jan 06 16:52:55 2020 +0100
+++ b/cairo-dock-plugins/receipt	Tue Jan 07 07:24:36 2020 +0100
@@ -1,24 +1,26 @@
 # SliTaz package receipt.
 
 PACKAGE="cairo-dock-plugins"
-VERSION="2.4.0~2"
+VERSION="3.4.1"
 CATEGORY="x-window"
 SHORT_DESC="Set of plugins for Cairo-Dock."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://www.glx-dock.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.glx-dock.org/"
-WGET_URL="https://launchpad.net/cairo-dock-plug-ins/${VERSION:0:3}/${VERSION:0:5}/+download/$TARBALL"
+WGET_URL="https://github.com/Cairo-Dock/cairo-dock-plug-ins/releases/download/$VERSION/cairo-dock-plug-ins-$VERSION.tar.gz"
 
-DEPENDS="dbus-glib cairo-dock"
-BUILD_DEPENDS="wget dbus-glib-dev cairo-dock-dev cmake alsa-lib \
-gtk+-dev cairo-dev librsvg-dev dbus-dev libxml2-dev gtkglext-dev mesa-dev"
+DEPENDS="cairo-dock dbus-glib libcurl"
+BUILD_DEPENDS="alsa-lib cairo-dev cairo-dock-dev cmake curl-dev 
+	dbus-dev dbus-glib-dev gtk+3-dev gtkglext-dev librsvg-dev 
+	libxml2-dev mesa-dev wayland-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	mkdir -p build && cd build
+	mkdir -p build &&
+	cd build &&
 	cmake .. -DCMAKE_INSTALL_PREFIX=/usr &&
 	make &&
 	make DESTDIR=$DESTDIR install
@@ -27,7 +29,9 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib $fs/usr/share
-	cp -a $install/usr/lib $fs/usr
-	cp -a $install/usr/share/cairo-dock $fs/usr/share
+	mkdir -p $fs/usr/lib
+	mkdir -p $fs/usr/share
+
+	cp -a $install/usr/lib			$fs/usr
+	cp -a $install/usr/share/cairo-dock	$fs/usr/share
 }
diff -r b2c3caa4e31c -r 613b75574469 cairo-dock/receipt
--- a/cairo-dock/receipt	Mon Jan 06 16:52:55 2020 +0100
+++ b/cairo-dock/receipt	Tue Jan 07 07:24:36 2020 +0100
@@ -1,38 +1,44 @@
 # SliTaz package receipt.
 
 PACKAGE="cairo-dock"
-VERSION="2.4.0~2"
+VERSION="3.4.1"
 CATEGORY="x-window"
-SHORT_DESC="Cairo-Dock is a light and eye-candy dock to launch."
+SHORT_DESC="A light and eye-candy dock to launch."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.glx-dock.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="https://launchpad.net/cairo-dock-core/${VERSION:0:3}/${VERSION:0:5}/+download/$TARBALL"
+WGET_URL="https://launchpad.net/cairo-dock-core/${VERSION%.*}/$VERSION/+download/$TARBALL"
 
-DEPENDS="gtk+ cairo librsvg xorg-xcompmgr mesa gtkglext dbus libcurl"
-BUILD_DEPENDS="$DEPENDS cmake gtk+-dev cairo-dev librsvg-dev mesa-dev \
-gtkglext-dev dbus-dev dbus-glib-dev curl-dev libcroco wget libxml2-dev"
 SUGGESTED="cairo-dock-plugins"
+DEPENDS="cairo dbus gtk+ gtkglext libcurl librsvg mesa xorg-xcompmgr"
+BUILD_DEPENDS="cairo-dev cmake curl-dev dbus-dev dbus-glib-dev gtk+3-dev 
+	gtkglext-dev libcroco librsvg-dev libxml2-dev mesa-dev wayland-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	sed -i 's|<glib/g.*h>|<glib.h>|' src/gldit/cairo-dock-keybinder.h
-	mkdir -p build && cd build
+	sed -i 's|<glib/g.*h>|<glib.h>|' \
+		src/gldit/cairo-dock-keybinder.h
+
+	mkdir -p build &&
+	cd build &&
 	cmake .. -DCMAKE_INSTALL_PREFIX=/usr &&
 	make &&
 	make DESTDIR=$DESTDIR install &&
+
 	sed -i s/'.svg'/''/ $DESTDIR/usr/share/applications/*
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib $fs/usr/share/$PACKAGE
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
-	cp -a $install/usr/share/$PACKAGE $fs/usr/share
-	chmod a+x $fs/usr/lib/libgldi.so.2.4.0~2
+	mkdir -p $fs/usr/lib
+	mkdir -p $fs/usr/share/$PACKAGE
+
+	cp -a $install/usr/bin			$fs/usr
+	cp -a $install/usr/lib/*.so*		$fs/usr/lib
+	cp -a $install/usr/share/$PACKAGE	$fs/usr/share
+	chmod a+x $fs/usr/lib/libgldi.so.$VERSION
 }