summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Mehani2018-11-04 21:38:01 +1100
committerOlivier Mehani2018-11-04 21:39:15 +1100
commitae1b1e71aae1468ae42539fc818620545cbe87d0 (patch)
tree282a7dc93c6124b892753f9179129adfd0569358
parent0e1b9d2ec05f66fe0c281acd4c3c794cb4e35944 (diff)
downloadaur-m17n-im-shortname-unicode-emoji-git.tar.gz
Remove upstreamed patch
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
-rw-r--r--.SRCINFO6
-rw-r--r--0001-Honour-PREFIX-and-DESTDIR-and-don-t-restart-when-ins.patch62
-rw-r--r--PKGBUILD13
3 files changed, 5 insertions, 76 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c626d6a606a..db87e57a500 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = m17n-im-shortname-unicode-emoji-git
pkgdesc = Input method for Unicode Emoji using shortnames
- pkgver = r9.d69fc3a
- pkgrel = 2
+ pkgver = r13.eb20fdc
+ pkgrel = 1
url = https://github.com/EmptyStackExn/m17n-im-shortname-unicode-emoji
arch = i686
arch = x86_64
@@ -13,9 +13,7 @@ pkgbase = m17n-im-shortname-unicode-emoji-git
provides = m17n-im-shortname-unicode-emoji
conflicts = m17n-im-shortname-unicode-emoji
source = m17n-im-shortname-unicode-emoji::git+https://github.com/EmptyStackExn/m17n-im-shortname-unicode-emoji
- source = 0001-Honour-PREFIX-and-DESTDIR-and-don-t-restart-when-ins.patch
md5sums = SKIP
- md5sums = d9cc64413864ef1f666a512f3b430d6d
pkgname = m17n-im-shortname-unicode-emoji-git
diff --git a/0001-Honour-PREFIX-and-DESTDIR-and-don-t-restart-when-ins.patch b/0001-Honour-PREFIX-and-DESTDIR-and-don-t-restart-when-ins.patch
deleted file mode 100644
index f82fa3607f3..00000000000
--- a/0001-Honour-PREFIX-and-DESTDIR-and-don-t-restart-when-ins.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 9da5e55b5e43dcb6c9d7cabaa3745d7b266fcbce Mon Sep 17 00:00:00 2001
-From: Olivier Mehani <shtrom@ssji.net>
-Date: Tue, 2 May 2017 21:17:14 +1000
-Subject: [PATCH] Honour PREFIX and DESTDIR, and don't restart when installing
-
-This makes packaging easier.
-
-Signed-off-by: Olivier Mehani <shtrom@ssji.net>
----
- Makefile | 20 ++++++++++++--------
- README.md | 5 +++--
- 2 files changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 5a53d22..ac28ac2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -6,13 +6,17 @@
-
- # 2. Needs to check whether to restart IBus or SCIM deamon
-
--install:
-- sudo cp x-shortcode-unicode-emoji.mim /usr/share/m17n
-- sudo chmod 644 /usr/share/m17n/x-shortcode-unicode-emoji.mim
-+DESTDIR?=
-+PREFIX?=/usr
-+
-+# For Ubuntu 12.04 and ArchLinux
-+IBUSOPTS?=-drx
-
-- sudo cp x-shortcode-unicode-emoji.png /usr/share/m17n/icons
-- sudo chmod 644 /usr/share/m17n/icons/x-shortcode-unicode-emoji.png
-+INSTALL?=install
-+
-+install:
-+ $(INSTALL) -D -m 0644 x-shortcode-unicode-emoji.mim $(DESTDIR)$(PREFIX)/share/m17n/x-shortcode-unicode-emoji.mim
-+ $(INSTALL) -D -m 0644 x-shortcode-unicode-emoji.png $(DESTDIR)$(PREFIX)/share/m17n/icons/x-shortcode-unicode-emoji.png
-
--# For Ubuntu 12.04
--# ibus-daemon -drx
-- ibus-daemon
-+restart:
-+ ibus-daemon $(IBUSOPTS)
-diff --git a/README.md b/README.md
-index bbb458f..0abbfb5 100644
---- a/README.md
-+++ b/README.md
-@@ -18,8 +18,9 @@ Requirements
- Install in Ubuntu 12.04
- -------------------
- 1. Clone this repository
--2. Install the custom input method : `make install`
--3. Launch `ibus-setup` then add `shortname-unicode-emoji (m17n)` input method
-+2. Install the custom input method : `sudo make install`
-+3. Restart the ibus daemon : `make restart`
-+4. Launch `ibus-setup` then add `shortname-unicode-emoji (m17n)` input method
-
- Example
- -------------------
---
-2.12.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 063b3553092..399181a3a19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Olivier Mehani <shtrom-arch@ssji.net>
pkgname=m17n-im-shortname-unicode-emoji-git
-pkgver=r9.d69fc3a
-pkgrel=2
+pkgver=r13.eb20fdc
+pkgrel=1
pkgdesc="Input method for Unicode Emoji using shortnames "
arch=('i686' 'x86_64')
url="https://github.com/EmptyStackExn/m17n-im-shortname-unicode-emoji"
@@ -14,7 +14,6 @@ provides=("${pkgname%-git}")
conflicts=("${pkgname%-git}")
source=(
'm17n-im-shortname-unicode-emoji::git+https://github.com/EmptyStackExn/m17n-im-shortname-unicode-emoji'
-'0001-Honour-PREFIX-and-DESTDIR-and-don-t-restart-when-ins.patch'
)
# Please refer to the 'USING git SOURCES' section of the PKGBUILD man page for
@@ -25,15 +24,9 @@ pkgver() {
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
-prepare() {
- cd "${srcdir}/${pkgname%-git}"
- patch -p1 -i "${srcdir}/0001-Honour-PREFIX-and-DESTDIR-and-don-t-restart-when-ins.patch"
-}
-
package() {
cd "${srcdir}/${pkgname%-git}"
make DESTDIR="${pkgdir}/" install
}
-md5sums=('SKIP'
- 'd9cc64413864ef1f666a512f3b430d6d')
+md5sums=('SKIP')