summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authordustball2020-07-28 17:06:37 +0200
committerdustball2020-07-28 17:06:37 +0200
commitd1e908e74b45c58f08ade158e5a26c110df78322 (patch)
tree8678f65d4b07912d444a8b5fa5e7757a2e83a88b
parente6d2499c3f8f0b99fed603c4e53d05dade8621b6 (diff)
downloadaur-d1e908e74b45c58f08ade158e5a26c110df78322.tar.gz
use patch instead of sed
-rw-r--r--PKGBUILD13
-rw-r--r--gnaural.patch76
2 files changed, 81 insertions, 8 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 87b06aa9bcf..1e644b40353 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,18 +9,15 @@ url="http://gnaural.sourceforge.net/"
license=('GPL')
depends=('libglade' 'portaudio')
install="$pkgname.install"
-source=("http://downloads.sourceforge.net/project/$pkgname/Gnaural/${pkgname}_${pkgver}.tar.xz")
-md5sums=('a3f909ca56466393c9eef42f25fc028b')
+source=("http://downloads.sourceforge.net/project/$pkgname/Gnaural/${pkgname}_${pkgver}.tar.xz"
+ "gnaural.patch")
+md5sums=('a3f909ca56466393c9eef42f25fc028b'
+ '7b8a6f84ca8aeb01cf5b46e76027c1b5')
build() {
cd "$srcdir/${pkgname}_${pkgver}"
- # Fix a bug where an inlined function isn't marked as extern. GCC seems to have tolerated rather long, but eventually broke.
- sed -i 's/#endif/extern inline void BB_ResetAllVoices ();\n#endif/g' src/main.h src/gnauralXML.h
- sed -i 's/^inline void BB_ResetAllVoices/void BB_ResetAllVoices/g' src/BinauralBeat.c
-
- # desktop file path fix
- sed -i "s|gnome/apps/Multimedia|applications|g" Makefile.*
+ patch --strip=1 < "$srcdir/gnaural.patch"
./configure --prefix=/usr
make
diff --git a/gnaural.patch b/gnaural.patch
new file mode 100644
index 00000000000..13509df5b97
--- /dev/null
+++ b/gnaural.patch
@@ -0,0 +1,76 @@
+diff --unified --recursive --text gnaural-origin/Makefile.am gnaural-fixed/Makefile.am
+--- gnaural-origin/Makefile.am 2010-06-28 21:10:36.000000000 +0200
++++ gnaural-fixed/Makefile.am 2020-07-28 17:05:39.277209185 +0200
+@@ -6,7 +6,7 @@
+ autogen.sh
+
+ #gnomemenudir = $(DESTDIR)$(datadir)$(packagemenudir)
+-#gnomemenudir = $(DESTDIR)$(datadir)/gnome/apps/Multimedia
++#gnomemenudir = $(DESTDIR)$(datadir)/applications
+ #gnomemenu_DATA = gnaural.desktop
+
+ #gnaural_glade_filedir = $(DESTDIR)$(pkgdatadir)
+@@ -22,8 +22,8 @@
+ fi \
+ done \
+ fi; \
+- $(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Multimedia; \
+- $(INSTALL_DATA) gnaural.desktop $(DESTDIR)$(datadir)/gnome/apps/Multimedia; \
++ $(mkinstalldirs) $(DESTDIR)$(datadir)/applications; \
++ $(INSTALL_DATA) gnaural.desktop $(DESTDIR)$(datadir)/applications; \
+ $(INSTALL_DATA) src/gnaural.glade $(DESTDIR)$(pkgdatadir);
+
+ dist-hook:
+diff --unified --recursive --text gnaural-origin/Makefile.in gnaural-fixed/Makefile.in
+--- gnaural-origin/Makefile.in 2011-05-26 00:38:21.000000000 +0200
++++ gnaural-fixed/Makefile.in 2020-07-28 17:05:39.277209185 +0200
+@@ -733,7 +733,7 @@
+
+
+ #gnomemenudir = $(DESTDIR)$(datadir)$(packagemenudir)
+-#gnomemenudir = $(DESTDIR)$(datadir)/gnome/apps/Multimedia
++#gnomemenudir = $(DESTDIR)$(datadir)/applications
+ #gnomemenu_DATA = gnaural.desktop
+
+ #gnaural_glade_filedir = $(DESTDIR)$(pkgdatadir)
+@@ -749,8 +749,8 @@
+ fi \
+ done \
+ fi; \
+- $(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Multimedia; \
+- $(INSTALL_DATA) gnaural.desktop $(DESTDIR)$(datadir)/gnome/apps/Multimedia; \
++ $(mkinstalldirs) $(DESTDIR)$(datadir)/applications; \
++ $(INSTALL_DATA) gnaural.desktop $(DESTDIR)$(datadir)/applications; \
+ $(INSTALL_DATA) src/gnaural.glade $(DESTDIR)$(pkgdatadir);
+
+ dist-hook:
+diff --unified --recursive --text gnaural-origin/src/BinauralBeat.c gnaural-fixed/src/BinauralBeat.c
+--- gnaural-origin/src/BinauralBeat.c 2018-06-21 15:53:48.000000000 +0200
++++ gnaural-fixed/src/BinauralBeat.c 2020-07-28 16:41:19.614014196 +0200
+@@ -898,7 +898,7 @@
+
+ //======================================
+
+-inline void BB_ResetAllVoices() {
++void BB_ResetAllVoices() {
+ if (BB_Voice != NULL) {
+ int i;
+
+diff --unified --recursive --text gnaural-origin/src/gnauralXML.h gnaural-fixed/src/gnauralXML.h
+--- gnaural-origin/src/gnauralXML.h 2011-03-22 21:46:21.000000000 +0100
++++ gnaural-fixed/src/gnauralXML.h 2020-07-28 16:41:12.537821077 +0200
+@@ -35,4 +35,5 @@
+ extern void gxml_XMLParser (const gchar * CurrentElement, const gchar * Attribute, const gchar * Value); //internal use
+ extern int gxml_XMLEventDataParser (const gchar * DataType, const gchar * Value, const int internal_EntryCount); //internal use
+ extern void gxml_XMLParser_counter (const gchar * CurrentElement, const gchar * Attribute, const gchar * Value); //always must give valid strings. Also BEWARE: Attribute will equal NULL if there are none
++extern inline void BB_ResetAllVoices ();
+ #endif
+diff --unified --recursive --text gnaural-origin/src/main.h gnaural-fixed/src/main.h
+--- gnaural-origin/src/main.h 2011-02-22 17:22:53.000000000 +0100
++++ gnaural-fixed/src/main.h 2020-07-28 16:41:12.537821077 +0200
+@@ -199,4 +199,5 @@
+ extern double Stopwatch (); //20101109
+ extern void main_PhaseInfoToggle (unsigned int ip, unsigned short port);
+ extern void main_DPPropertiesDialog ();
++extern inline void BB_ResetAllVoices ();
+ #endif