summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhaawda2019-08-22 22:25:10 +0200
committerhaawda2019-08-22 22:25:10 +0200
commita2dc8ed904064e987cf072e0f108ce4d412e0a15 (patch)
tree93572d8006b4ba55707dce958698de754fb49e2d
parentfe39580b25e4fc0a5423c92ca321dedfe786bacd (diff)
downloadaur-a2dc8ed904064e987cf072e0f108ce4d412e0a15.tar.gz
remove patches
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
-rw-r--r--gcc7.patch12
-rw-r--r--makefile.patch24
4 files changed, 4 insertions, 46 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 89405d05eca0..ebcbcbb941d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mup
pkgdesc = Music publisher, creates PostScript printed music or MIDI
pkgver = 6.7
- pkgrel = 1
+ pkgrel = 2
url = http://arkkra.com
arch = i686
arch = x86_64
@@ -10,11 +10,7 @@ pkgbase = mup
depends = fltk
depends = libxpm
source = ftp://ftp.arkkra.com/pub/unix/mup67src.tar.gz
- source = makefile.patch
- source = gcc7.patch
sha256sums = 254ff1b67e46714b6817555218c0256f73ab57306e14438bcb34aed9a15da34c
- sha256sums = d0e2d9d57e4131335678e65c4db94ba182e0fd55c84482acfda630cfceaf5253
- sha256sums = 0fa766c5907dbe1a026df8cc45c8b8cb75c8238c538d907288d1353e51d0f62b
pkgname = mup
diff --git a/PKGBUILD b/PKGBUILD
index dd42fe11b318..91f7518f140f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,15 @@
pkgname=mup
pkgver=6.7
_pkgver=67
-pkgrel=1
+pkgrel=2
pkgdesc="Music publisher, creates PostScript printed music or MIDI"
arch=('i686' 'x86_64')
url="http://arkkra.com"
license=('custom')
depends=('fltk' 'libxpm')
makedepends=('gendesk')
-source=("ftp://ftp.arkkra.com/pub/unix/$pkgname${_pkgver}src.tar.gz" 'makefile.patch' 'gcc7.patch')
-sha256sums=('254ff1b67e46714b6817555218c0256f73ab57306e14438bcb34aed9a15da34c'
- 'd0e2d9d57e4131335678e65c4db94ba182e0fd55c84482acfda630cfceaf5253'
- '0fa766c5907dbe1a026df8cc45c8b8cb75c8238c538d907288d1353e51d0f62b')
+source=("ftp://ftp.arkkra.com/pub/unix/$pkgname${_pkgver}src.tar.gz")
+sha256sums=('254ff1b67e46714b6817555218c0256f73ab57306e14438bcb34aed9a15da34c')
prepare() {
cd $pkgname-$pkgver
diff --git a/gcc7.patch b/gcc7.patch
deleted file mode 100644
index 3d40078c4c11..000000000000
--- a/gcc7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mup-6.5.orig/mupmate/Run.C mup-6.5.new/mupmate/Run.C
---- mup-6.5.orig/mupmate/Run.C 2017-06-08 20:46:33.410533495 +0200
-+++ mup-6.5.new/mupmate/Run.C 2017-06-08 21:15:55.093383589 +0200
-@@ -1192,7 +1192,7 @@
- }
- #else
- command[1] = mup_output;
-- command[2] = '\0';
-+ command[2] = "";
- #endif
-
- if (execute_command(command,
diff --git a/makefile.patch b/makefile.patch
deleted file mode 100644
index 9bffc457af82..000000000000
--- a/makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur mup-6.5.orig/makefile mup-6.5.new/makefile
---- mup-6.5.orig/makefile 2017-06-08 21:38:01.492213651 +0200
-+++ mup-6.5.new/makefile 2017-06-08 21:38:23.532091819 +0200
-@@ -53,9 +53,9 @@
- PREFIX = $(DESTDIR)/usr
- BINDIR = $(PREFIX)/bin
- MANDIR = $(PREFIX)/share/man/man1
--ICONDIR = $(PREFIX)/share/pixmaps/mup
-+ICONDIR = $(PREFIX)/share/pixmaps
- LIBDIR = $(PREFIX)/lib/mup
--DOCDIR = $(PREFIX)/share/doc/packages/mup
-+DOCDIR = $(PREFIX)/share/doc/mup
-
- # This is the name of your C compiler.
- # cc would be another common choice.
-@@ -85,7 +85,7 @@
- # If you installed fltk somewhere other than $(X_LOCATION)/lib
- # set this to find them, as in
- # FLTK_LIB_LOCATION = -L/usr/local/lib
--FLTK_LIB_LOCATION =
-+FLTK_LIB_LOCATION = -L/usr/lib
-
- # The X libraries to link with Mupmate.
- # Depending on how fltk was compiled, you may be able to omit