diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile index 95aeb07ee612..286cddca8f37 100644 --- a/audio/soundtracker/Makefile +++ b/audio/soundtracker/Makefile @@ -1,47 +1,47 @@ PORTNAME= soundtracker -DISTVERSION= 1.0.2 -PORTREVISION= 1 +DISTVERSION= 1.0.2.1 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/ MAINTAINER= yuri@FreeBSD.org COMMENT= Pattern-oriented music editor LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz \ libsndfile.so:audio/libsndfile RUN_DEPENDS= bash:shells/bash USES= desktop-file-utils gettext gmake gnome pkgconfig shebangfix tar:xz xorg USE_GNOME= cairo gdkpixbuf2 glib20 gtk20 pango USE_XORG= x11 SHEBANG_FILES= soundtracker_convert_config CONFIGURE_ENV= SDL_CONFIG=${LOCALBASE}/bin/sdl2-config GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-alsa OPTIONS_MULTI= BACKEND OPTIONS_MULTI_BACKEND= JACK OSS PULSEAUDIO SDL OPTIONS_DEFAULT= JACK OSS PULSEAUDIO SDL BACKEND_DESC= Audio backends: JACK_CONFIGURE_ENABLE= jack JACK_LIB_DEPENDS= libjack.so:audio/jack OSS_CONFIGURE_ENABLE= oss PULSEAUDIO_CONFIGURE_ENABLE= pulse PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio SDL_CONFIGURE_ENABLE= sdl SDL_USES= sdl SDL_USE= SDL=sdl2 .include diff --git a/audio/soundtracker/distinfo b/audio/soundtracker/distinfo index 213721bb3dcb..3b2983da79a9 100644 --- a/audio/soundtracker/distinfo +++ b/audio/soundtracker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1621198694 -SHA256 (soundtracker-1.0.2.tar.xz) = 9dd09efd06f9794ca52b00d778e885124b73e343dfac87d7ba3e62b059878fcb -SIZE (soundtracker-1.0.2.tar.xz) = 754884 +TIMESTAMP = 1623870946 +SHA256 (soundtracker-1.0.2.1.tar.xz) = 0275b7f38243e2cc2474ae892c88ae486bf815dd0658830101ac518b3e6f005a +SIZE (soundtracker-1.0.2.1.tar.xz) = 754976 diff --git a/audio/soundtracker/files/patch-app_audio-subs.c b/audio/soundtracker/files/patch-app_audio-subs.c deleted file mode 100644 index e124da926f6c..000000000000 --- a/audio/soundtracker/files/patch-app_audio-subs.c +++ /dev/null @@ -1,22 +0,0 @@ -- bugfix, patch reported to the author via e-mail. - ---- app/audio-subs.c.orig 2021-05-18 15:20:58 UTC -+++ app/audio-subs.c -@@ -138,7 +138,7 @@ union audio_backpipe_args { - - struct _cmderrno { - audio_backpipe_id cmd; -- gint errno; -+ gint errno_; - gint length; - gchar text[1]; - } __attribute__((packed)) cmderrno; -@@ -293,7 +293,7 @@ void audio_backpipe_write(audio_backpipe_id cmd, ...) - arg_size = l + sizeof(args->cmderrno); - args = arg_pointer = alloca(arg_size); - args->cmderrno.cmd = cmd; -- args->cmderrno.errno = va_arg(arg_list, gint); -+ args->cmderrno.errno_ = va_arg(arg_list, gint); - args->cmderrno.length = l; - strncpy(args->cmderrno.text, line, l + 1); - break; diff --git a/audio/soundtracker/files/patch-app_gui-subs.h b/audio/soundtracker/files/patch-app_gui-subs.h deleted file mode 100644 index f2bdf900557c..000000000000 --- a/audio/soundtracker/files/patch-app_gui-subs.h +++ /dev/null @@ -1,13 +0,0 @@ -- bugfix patch from the upstream - ---- app/gui-subs.h.orig 2021-05-18 18:36:26 UTC -+++ app/gui-subs.h -@@ -151,7 +151,7 @@ gui_subs_create_slider(const gchar* title, - GtkAdjustment** adj, - gboolean in_mainwindow) - { -- return gui_subs_create_slider(title, min, max, changedfunc, adj, in_mainwindow); -+ return gui_subs_create_slider_full(title, min, max, changedfunc, adj, in_mainwindow, NULL); - } - - GtkWidget* gui_combo_new(GtkListStore* ls); diff --git a/audio/soundtracker/files/patch-app_keys.c b/audio/soundtracker/files/patch-app_keys.c deleted file mode 100644 index a62a00986f5b..000000000000 --- a/audio/soundtracker/files/patch-app_keys.c +++ /dev/null @@ -1,13 +0,0 @@ -- bugfix, patch reported to the author via e-mail. - ---- app/keys.c.orig 2021-02-01 20:01:20 UTC -+++ app/keys.c -@@ -893,7 +893,7 @@ keys_make_xkeys(void) - keyname[k++] = xkeymap[i].xname; - } - -- qsort(keyname, k, sizeof(char*), keys_qsort_compare_func); -+ qsort(keyname+1, k-1, sizeof(char*), keys_qsort_compare_func); - - keyname[0] = NONE_TEXT; - }