summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu Junyu2022-11-07 20:44:31 +0900
committerWu Junyu2022-11-07 20:44:31 +0900
commitde4a371ed67a91c6a89c2088ee7d32bd3bead39b (patch)
tree530eab18ca68f5aadfc94e4c4d2659e769726ba0
parent554974b92e13e78f4af9d9eeadfcc631a0df9e40 (diff)
downloadaur-de4a371ed67a91c6a89c2088ee7d32bd3bead39b.tar.gz
Update patch.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD7
-rw-r--r--version.patch18
3 files changed, 3 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 50e094f31dbf..15b83cf025b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,10 +14,8 @@ pkgbase = qsoas
provides = qsoas
source = https://bip.cnrs.fr/wp-content/uploads/qsoas/qsoas-3.1.tar.gz
source = qsoas.desktop
- source = version.patch
md5sums = 661ef55a4de1e4bddaeaaa3f0256ee25
md5sums = 05857d790bc8bb91efcaf95f72ec2d7a
- md5sums = 06813859ba6c32778b3259c68d654310
pkgname = qsoas
diff --git a/PKGBUILD b/PKGBUILD
index e264c4368ecb..74ef3b5f0c65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,14 +13,13 @@ provides=('qsoas')
conflicts=('qsoas')
install=
source=("https://bip.cnrs.fr/wp-content/uploads/qsoas/${pkgname}-${pkgver}.tar.gz"
- "${pkgname}.desktop" "version.patch")
+ "${pkgname}.desktop")
md5sums=('661ef55a4de1e4bddaeaaa3f0256ee25'
- '05857d790bc8bb91efcaf95f72ec2d7a'
- '06813859ba6c32778b3259c68d654310')
+ '05857d790bc8bb91efcaf95f72ec2d7a')
build() {
- patch -u version.patch "./$pkgname-$pkgver/src/mruby.cc"
cd "$pkgname-$pkgver"
+ sed -r -i "s:MRUBY_RELEASE_MAJOR == 2:MRUBY_RELEASE_MAJOR >= 2:g" ./src/mruby.cc
qmake-qt5
make
}
diff --git a/version.patch b/version.patch
deleted file mode 100644
index cdb00ad836af..000000000000
--- a/version.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-@@ -185,7 +185,7 @@
- if(mrb_obj_is_kind_of(mrb, obj, mrb->eException_class)) {
- throw RuntimeError("A ruby exception occurred: %1").arg(inspect(obj));
- }
--#elif MRUBY_RELEASE_MAJOR == 2
-+#elif MRUBY_RELEASE_MAJOR >= 2
- if(mrb_class(mrb, obj)->tt == MRB_TT_EXCEPTION) {
- throw RuntimeError("A ruby exception occurred: %1").arg(inspect(obj));
- }
-@@ -340,7 +340,7 @@
- return rv.toList();
- }
-
--#elif MRUBY_RELEASE_MAJOR == 2
-+#elif MRUBY_RELEASE_MAJOR >= 2
-
-
- #define CASE(insn,ops) case insn: FETCH_ ## ops (); L_ ## insn \ No newline at end of file