Date: Thursday, January 7, 2021 @ 08:16:54 Author: dvzrv Revision: 811503
upgpkg: hexter 1.1.1-1: Upgrade to 1.1.1. Drop all upstreamed patches. Modified: hexter/trunk/PKGBUILD Deleted: hexter/trunk/hexter-1.1.0-fix_configureac.patch hexter/trunk/hexter-1.1.0-fix_segfault.patch ------------------------------------+ PKGBUILD | 21 ++++----------- hexter-1.1.0-fix_configureac.patch | 26 ------------------ hexter-1.1.0-fix_segfault.patch | 49 ----------------------------------- 3 files changed, 6 insertions(+), 90 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-01-07 08:16:53 UTC (rev 811502) +++ PKGBUILD 2021-01-07 08:16:54 UTC (rev 811503) @@ -1,8 +1,8 @@ # Maintainer: David Runge <[email protected]> pkgname=hexter -pkgver=1.1.0 -pkgrel=4 +pkgver=1.1.1 +pkgrel=1 pkgdesc="A Yamaha DX7 modeling software synthesizer for the DSSI Soft Synth Interface" arch=('x86_64') url="https://github.com/smbolton/hexter"; @@ -10,23 +10,14 @@ groups=('dssi-plugins' 'pro-audio') depends=('cairo' 'gcc-libs' 'glibc') makedepends=('alsa-lib' 'dssi' 'glib2' 'gtk2' 'ladspa' 'liblo') -optdepends=('dssi: for jack-dssi-host as plugin host' - 'qtractor: plugin host') -source=("$pkgname-$pkgver.tar.gz::https://github.com/smbolton/${pkgname}/archive/version_${pkgver}.tar.gz"; - "${pkgname}-1.1.0-fix_configureac.patch" - "${pkgname}-1.1.0-fix_segfault.patch") -sha512sums=('4e779bf386d79e4e4869e84d0ab600976b3b8f40ad96d79cde6315f378554a86ebf78f4e85e777ed7820842a840b508afdd19a62b42a7d2f65d16c26dfa146f2' - 'dba7b05fd7b6ec730507bf72f34338bd9e2151401359fde980713c742febefc3d01ef626497ac93a45227e8de4ce6aa3222e1bb1a085b1d235a7e5bd4a9bb461' - '88369468b5bc416e5f1826b3a0d57e5ccac9369f8e53029315272ebbb37d64fdafeb172bd72058c8c87dc7c8a29d9acb824924982c42c11dde98ae1e0aaee3a6') -b2sums=('b71efacb4192a4749b03dfd7388d06141fa34db4ad6df5c75ac2d36d7863d05e7d834f23afd2911489f4577f6931fabe163ba650bee48a9da820f2be2f978dc3' - 'c0ff6dd0ab243d6d00adc75cdd75c2cb630bf295f7a2536a7a673656d2974a3c2d470e028e63a2abe2de2add5f2e7724643ea857c6f581b2b35ebd794baee9af' - '302b263f5b18b5df5c8a691350e17b20aee93b0ce005f8a55d13664be922b66a8a1331053ff2f3e72ae9ac120e05b583405e9b5ff3146459c740bc9a30c154ef') +optdepends=('dssi-host: for DSSI plugin') +source=("$pkgname-$pkgver.tar.gz::https://github.com/smbolton/${pkgname}/archive/version_${pkgver}.tar.gz";) +sha512sums=('3de1e75df453a79d4b7eda4cf503f436201db34837b7584ea683f57c4b62029ea994eb6bc6d461e10938183b995792ded975ac112f0b9639d06b5571c93f3100') +b2sums=('32bcb1f42f9971fd4ca2406e58b7a9f735510eaad5ccc92a0aa45200c0ca468fb02698d1e548f9a6a657bbae183eabe20a200352470270042ec7b99f0238b1db') prepare() { mv -v "${pkgname}-version_${pkgver}" "${pkgname}-${pkgver}" cd "$pkgname-$pkgver" - patch -Np1 -i ../"${pkgname}-1.1.0-fix_configureac.patch" - patch -Np1 -i ../"${pkgname}-1.1.0-fix_segfault.patch" ./autogen.sh } Deleted: hexter-1.1.0-fix_configureac.patch =================================================================== --- hexter-1.1.0-fix_configureac.patch 2021-01-07 08:16:53 UTC (rev 811502) +++ hexter-1.1.0-fix_configureac.patch 2021-01-07 08:16:54 UTC (rev 811503) @@ -1,26 +0,0 @@ -diff --git "a/Makefile.am" "b/Makefile.am" -index 769cc63..3a0ba86 100644 ---- "a/Makefile.am" -+++ "b/Makefile.am" -@@ -26,4 +26,5 @@ dist_pkgdata_DATA = extra/dx7_roms.dx7 \ - extra/tx7_roms.dx7 - - AUTOMAKE_OPTIONS = foreign -+ACLOCAL_AMFLAGS = -I m4 - -diff --git "a/configure.ac" "b/configure.ac" -index c9f7e48..565c233 100644 ---- "a/configure.ac" -+++ "b/configure.ac" -@@ -3,8 +3,9 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(hexter, 1.1.0, sean-at-smbolton-dot-com) - - AC_CONFIG_SRCDIR(src/hexter.c) --AM_INIT_AUTOMAKE --AM_CONFIG_HEADER(config.h) -+AM_INIT_AUTOMAKE([subdir-objects]) -+AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_MACRO_DIRS([m4]) - - AC_PROG_CC - Deleted: hexter-1.1.0-fix_segfault.patch =================================================================== --- hexter-1.1.0-fix_segfault.patch 2021-01-07 08:16:53 UTC (rev 811502) +++ hexter-1.1.0-fix_segfault.patch 2021-01-07 08:16:54 UTC (rev 811503) @@ -1,49 +0,0 @@ -Description: Fix Segfault on startup -Author: Benjamin Hart -Forwarded: https://github.com/smbolton/hexter/pull/11 - ---- a/src/gui_widgy_editor.c -+++ b/src/gui_widgy_editor.c -@@ -862,24 +862,33 @@ - } - - static void --place_combo(GtkObject *adj, GtkWidget *table, int x, int y, int type) -+combo_box_append_text(GtkWidget *w, const char** labels) - { -- const char **labels; - int i; -- /* -FIX- this is kinda ugly */ -+ for (i = 0; labels[i]; i++) -+ { -+ gtk_combo_box_append_text(GTK_COMBO_BOX(w), labels[i]); -+ } -+} -+ -+static void -+place_combo(GtkObject *adj, GtkWidget *table, int x, int y, int type) -+{ -+ /* -FIX- this is still kinda ugly */ -+ const char* labels_lfo_wave[] = { "Tri", "Saw+", "Saw-", "Square", "Sine", "S/H", 0 }; -+ const char* labels_curve[] = { "-Lin", "-Exp", "+Exp", "+Lin", 0 }; -+ -+ GtkWidget *w = gtk_combo_box_new_text(); - switch (type) { - default: - case PEPT_LFOWave: -- labels = (const char *[]){ "Tri", "Saw+", "Saw-", "Square", "Sine", "S/H", NULL }; -+ combo_box_append_text(w, labels_lfo_wave); - break; - case PEPT_Curve: -- labels = (const char *[]){ "-Lin", "-Exp", "+Exp", "+Lin", NULL }; -+ combo_box_append_text(w, labels_curve); - break; - } - -- GtkWidget *w = gtk_combo_box_new_text(); -- for (i = 0; labels[i]; i++) -- gtk_combo_box_append_text(GTK_COMBO_BOX(w), labels[i]); - gtk_combo_box_set_active((GtkComboBox *)w, 0); - gtk_table_attach (GTK_TABLE (table), w, x, x + 1, y, y + 1, - (GtkAttachOptions) (0), -
