# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1643188946 -3600
# Node ID a887d8cd4205c4b36dcab13e18a3e8bce16c5138
# Parent  30a8f0bbbbe33652f60e49cdd9d47172ab345bca
updated aqualung (1.0 -> 1.1)

diff -r 30a8f0bbbbe3 -r a887d8cd4205 aqualung-lang/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aqualung-lang/receipt	Wed Jan 26 10:22:26 2022 +0100
@@ -0,0 +1,18 @@
+# SliTaz package receipt.
+
+PACKAGE="aqualung-lang"
+VERSION="1.1"
+CATEGORY="multimedia"
+TAGS="music audio player mp3 ogg"
+SHORT_DESC="Aqualung audio player - localised messages."
+MAINTAINER="maintainer@slitaz.org"
+LICENSE="GPL2"
+WEB_SITE="https://aqualung.jeremyevans.net/"
+
+WANTED="aqualung"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_folders	locale
+}
diff -r 30a8f0bbbbe3 -r a887d8cd4205 aqualung/receipt
--- a/aqualung/receipt	Tue Jan 25 18:01:09 2022 +0000
+++ b/aqualung/receipt	Wed Jan 26 10:22:26 2022 +0100
@@ -1,27 +1,33 @@
 # SliTaz package receipt.
 
 PACKAGE="aqualung"
-VERSION="1.0"
+VERSION="1.1"
 CATEGORY="multimedia"
+TAGS="music audio player mp3 ogg"
 SHORT_DESC="Aqualung audio player."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://aqualung.jeremyevans.net/"
+WEB_SITE="https://aqualung.jeremyevans.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="music audio player mp3 ogg"
+WGET_URL="https://github.com/jeremyevans/$PACKAGE/archive/refs/tags/$VERSION.tar.gz"
 
-DEPENDS="gtk+ alsa-lib libogg libvorbis flac lame libsamplerate libsndfile \
-libmodplug libcdio libmad bzlib"
-BUILD_DEPENDS="gtk+-dev alsa-lib-dev libogg-dev libvorbis-dev flac-dev \
-lame-dev libsamplerate-dev libmad-dev libsndfile-dev libxml2-dev bzip2-dev"
+SUGGESTED="aqualung-lang"
+DEPENDS="alsa-lib bzlib flac gtk+ lame libcdio libmad libmodplug libogg
+	libsamplerate libsndfile libvorbis"
+BUILD_DEPENDS="alsa-lib-dev bzip2-dev flac-dev gtk+-dev lame-dev libmad-dev
+	libogg-dev libsamplerate-dev libsndfile-dev libvorbis-dev libxml2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	./configure \
-		--with-lavc=no \
+	# Trying to create ~/.config when ~/.config already exists
+	# aborts program.
+	# In SliTaz ~/.config should already exist.
+	patch --strip=0 --input=$stuff/patches/core.c-1.1
+
+	./configure		\
+		--with-lavc=no	\
 		--with-jack=no &&
 	make &&
 	make install
@@ -31,10 +37,13 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share/pixmaps
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/aqualung $fs/usr/share
-	# Remove doc
-	rm -rf $fs/usr/share/aqualung/doc
+
+	cook_copy_folders	bin
+	cook_copy_folders	aqualung
+
+	# Remove documentation
+	rm -rf					$fs/usr/share/doc
+
 	cd $fs/usr/share/pixmaps
-	ln -s ../aqualung/general.png aqualung.png
+	ln -s ../aqualung/general.png		aqualung.png
 }
diff -r 30a8f0bbbbe3 -r a887d8cd4205 aqualung/stuff/patches/core.c-1.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aqualung/stuff/patches/core.c-1.1	Wed Jan 26 10:22:26 2022 +0100
@@ -0,0 +1,11 @@
+--- src/core.c.original
++++ src/core.c
+@@ -1909,7 +1909,7 @@
+                 if (errno == ENOENT) {
+                         fprintf(stderr, "Creating directory %s\n", options.confdir);
+                         /* Try creating .config before .config/aqualung */
+-                        mkdir(dirname(options.confdir), S_IRUSR | S_IWUSR | S_IXUSR);
++                        /* mkdir(dirname(options.confdir), S_IRUSR | S_IWUSR | S_IXUSR); */
+                         if (mkdir(options.confdir, S_IRUSR | S_IWUSR | S_IXUSR) < 0) {
+ 				perror("cannot create config directory: mkdir");
+ 				exit(1);