summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgit user2024-11-03 19:01:14 +0100
committergit user2024-11-03 19:01:14 +0100
commitfa4fdcf27b458e63a0a31a784c6d09d037bca384 (patch)
treef593313f24c28b77e0eebca4fb1135d29a9e4b40
parentc0f66c0217d430a2d892a23540ea66c109c9e0a2 (diff)
downloadaur-fa4fdcf27b458e63a0a31a784c6d09d037bca384.tar.gz
Removed the patch "Reverting upstream pull request 2084", since upstream has fixed it (https://github.com/logisim-evolution/logisim-evolution/pull/2090/files).
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 3 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index baff92a84b39..ede76325bfdf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = logisim-evolution-git
pkgdesc = An educational tool for designing and simulating digital logic circuits.
- pkgver = 3.9.0+50.r5041.20241102.cccab4554
+ pkgver = 3.9.0+52.r5043.20241103.6e46e5431
pkgrel = 2
url = https://github.com/reds-heig/logisim-evolution
arch = any
@@ -12,7 +12,7 @@ pkgbase = logisim-evolution-git
depends = hicolor-icon-theme
depends = java-runtime
depends = sh
- provides = logisim-evolution=3.9.0+50.r5041.20241102.cccab4554
+ provides = logisim-evolution=3.9.0+52.r5043.20241103.6e46e5431
conflicts = logisim-evolution
source = logisim-evolution::git+https://github.com/reds-heig/logisim-evolution.git
source = logisim-evolution.xml
diff --git a/PKGBUILD b/PKGBUILD
index 33ea27e0b6be..b2c82c47e6b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
_pkgbase='logisim-evolution'
pkgbase="${_pkgbase}-git"
pkgname="${_pkgbase}-git"
-pkgver=3.9.0+50.r5041.20241102.cccab4554
+pkgver=3.9.0+52.r5043.20241103.6e46e5431
pkgrel=2
provides=("${_pkgbase}=${pkgver}")
conflicts=("${_pkgbase}")
@@ -46,10 +46,6 @@ sha256sums=(
prepare() {
cd "$srcdir/${_pkgbase}"
- # 2024-11-03: Revert https://github.com/logisim-evolution/logisim-evolution/pull/2084/files. See https://github.com/logisim-evolution/logisim-evolution/issues/2089#issuecomment-2453221269.
- printf '%s\n' "Reverting PR 2084 ..."
- patch -Np1 -R --follow-symlinks -i "${srcdir}/rsyntaxtextarea_v3.5.1_to_v3.5.2.patch"
-
git log > git.log
}