rime-data: upstream fixed Makefile, remove patch

3 files changed, 10 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f58c640cc1f4..9cba83957951 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,17 @@
 pkgbase = rime-data
 	pkgdesc = Rime schema repository from plum
-	pkgver = r109.60cddc8
+	pkgver = r110.c286df2
 	pkgrel = 1
 	url = https://github.com/rime/plum/
 	arch = x86_64
 	license = GPL3
-	makedepends = cmake
 	makedepends = git
 	makedepends = librime
 	provides = librime-data
 	provides = brise
 	conflicts = brise
-	source = rime-data::git+https://github.com/rime/plum.git
-	source = Makefile.patch
+	source = git+https://github.com/rime/plum.git
 	sha512sums = SKIP
-	sha512sums = 5da46a18f4391eb3d76c58929db77d8a05d385437d6a2b16ce8b6df6465b494056464fd9481b08fc2286ad0ed35c646add1ff0a7e810350063d0255b05910f3b
 
 pkgname = rime-data
 
diff --git a/Makefile.patch b/Makefile.patch
deleted file mode 100644
index 4539c3eaeb7f..000000000000
--- a/Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile	2019-09-11 21:29:16.024251398 +0800
-+++ Makefile	2019-09-11 21:30:25.313634546 +0800
-@@ -41,6 +41,10 @@
- 	  install -d $(DESTDIR)$(RIME_DATA_DIR)/build; \
- 	  install -m 644 $(OUTPUT)/build/*.* $(DESTDIR)$(RIME_DATA_DIR)/build; \
- 	fi
-+	@if [ -d "$(OUTPUT)/opencc" ]; then \
-+	  install -d $(DESTDIR)$(RIME_DATA_DIR)/opencc; \
-+	  install -m 644 $(OUTPUT)/opencc/*.* $(DESTDIR)$(RIME_DATA_DIR)/opencc; \
-+	fi
-
- clean:
- 	rm -rf $(OUTPUT) > /dev/null 2>&1 || true
diff --git a/PKGBUILD b/PKGBUILD
index 9d0cdbc3fb38..134c56776e9d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,41 +3,35 @@
 # Contributor: GONG Chen <chen dot sst at gmail dot com>
 
 pkgname=rime-data
-pkgver=r109.60cddc8
+_gitname=plum
+pkgver=r110.c286df2
 pkgrel=1
 pkgdesc="Rime schema repository from plum"
 arch=('x86_64')
 url="https://github.com/rime/plum/"
 license=('GPL3')
-makedepends=('cmake' 'git' 'librime')
+makedepends=('git' 'librime')
 provides=('librime-data' 'brise')
 conflicts=('brise')
-source=("$pkgname::git+https://github.com/rime/plum.git"
-        "Makefile.patch")
-sha512sums=('SKIP'
-            '5da46a18f4391eb3d76c58929db77d8a05d385437d6a2b16ce8b6df6465b494056464fd9481b08fc2286ad0ed35c646add1ff0a7e810350063d0255b05910f3b')
+source=("git+https://github.com/rime/plum.git")
+sha512sums=('SKIP')
 
 pkgver() {
-  cd "$pkgname"
+  cd "$_gitname"
   ( set -o pipefail
     git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
   )
 }
 
-prepare() {
-  cd "$pkgname"
-  patch Makefile "$srcdir"/Makefile.patch
-}
-
 build() {
-  cd "$pkgname"
+  cd "$_gitname"
   make all
   rime_deployer --build output
   rm output/user.yaml
 }
 
 package() {
-  cd "$pkgname"
+  cd "$_gitname"
   make DESTDIR="$pkgdir" install
 }