# HG changeset patch # User Stanislas Leduc # Date 1719327074 0 # Node ID c848b3839e4a47597e7deb0629ecff71b5874b99 # Parent 8d53169054d1ee5fe3305a75f8d2543c58fb12f1 Up audacity to 3.0.2, fix openssh/wxWidgets build diff -r 8d53169054d1 -r c848b3839e4a audacity/receipt --- a/audacity/receipt Mon Jun 24 07:43:55 2024 +0000 +++ b/audacity/receipt Tue Jun 25 14:51:14 2024 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="audacity" -VERSION="2.3.2" +VERSION="3.0.2" CATEGORY="multimedia" TAGS="sound audio recorder editor" SHORT_DESC="A free multi-track audio editor and recorder." @@ -13,11 +13,12 @@ TARBALL="$SOURCE-$VERSION.tar.gz" WGET_URL="https://github.com/$PACKAGE/$PACKAGE/archive/$TARBALL" -DEPENDS="alsa-lib ffmpeg flac gcc49-lib-base imlib2 lame libatomic \ - libid3tag libmad libsndfile libvorbis wxWidgets xorg-libXxf86vm" +DEPENDS="alsa-lib ffmpeg flac imlib2 lame libatomic \ + libid3tag libmad libsndfile libvorbis xorg-libXxf86vm" BUILD_DEPENDS="alsa-lib-dev bash cmake expat-dev ffmpeg-dev flac-dev \ - gcc49 lame-dev libatomic libmad-dev libsndfile-dev libtool \ - libvorbis-dev portaudio-dev wxWidgets-dev" + lame-dev libid3tag-dev portmidi libatomic libmad-dev libtool \ + libsndfile-dev libtool python3 gtk+-dev glib-dev libvorbis-dev \ + portaudio-dev git" current_version() { @@ -28,18 +29,21 @@ # Rules to configure and make the package. compile_rules() { - export CC=gcc-49 - export CXX=g++-49 export SHELL=/bin/bash export CONFIG_SHELL=/bin/bash export LDFLAGS="$LDFLAGS -l:libatomic.so.1" - ./configure \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --with-ffmpeg=system \ - $CONFIGURE_ARGS && + mkdir build && cd build + cmake -G "Unix Makefiles" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -Daudacity_use_expact=system \ + -Daudacity_use_ffmpeg=loaded \ + -Daudacity_use_zlib=system \ + -Daudacity_use_curl=system \ + -Daudacity_use_wxwidgets=local \ + .. + make && make DESTDIR=$DESTDIR install } @@ -47,11 +51,14 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/share + mkdir -p $fs/usr/share $fs/usr/lib/audacity cp -a $install/usr/bin $fs/usr cp -a $install/usr/share/icons $fs/usr/share cp -a $install/usr/share/audacity $fs/usr/share cp -a $install/usr/share/pixmaps $fs/usr/share cp -a $install/usr/share/applications $fs/usr/share + + # For 3.0 branch, we need use custom wxWidgets + cp -a $src/build/lib/libwx*.so* $fs/usr/lib/audacity } diff -r 8d53169054d1 -r c848b3839e4a openssh/receipt --- a/openssh/receipt Mon Jun 24 07:43:55 2024 +0000 +++ b/openssh/receipt Tue Jun 25 14:51:14 2024 +0000 @@ -15,7 +15,7 @@ PROVIDE="ssh" SUGGESTED="gtk+" DEPENDS="libcrypto sftp-server zlib" -BUILD_DEPENDS="gtk+-dev libcrypto-dev openssl-dev zlib-dev" +BUILD_DEPENDS="gtk+-dev glib-dev libcrypto-dev openssl-dev zlib-dev" SPLIT="sftp-server" TAZPANEL_DAEMON="man::sshd|edit::/etc/ssh/sshd_config|options|web::$WEB_SITE" diff -r 8d53169054d1 -r c848b3839e4a wxWidgets/receipt --- a/wxWidgets/receipt Mon Jun 24 07:43:55 2024 +0000 +++ b/wxWidgets/receipt Tue Jun 25 14:51:14 2024 +0000 @@ -18,8 +18,8 @@ xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrender xorg-libXxf86vm zlib" -BUILD_DEPENDS="expat-dev gtk+-dev jpeg-dev libglu-mesa libpng-dev mesa-dev - tiff-dev xorg-dev xorg-libXpm-dev xorg-xineramaproto zlib-dev" +BUILD_DEPENDS="expat-dev gtk+-dev glib-dev jpeg-dev libglu-mesa-dev libpng-dev + mesa-dev tiff-dev xorg-dev xorg-libXpm-dev xorg-xineramaproto zlib-dev" current_version() {