revert to 2017-06-10

3 files changed, 64 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56dacc425dcf..97d86c36aa4d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,48 +1,50 @@
+# Generated by mksrcinfo v8
+# Sat Jun 10 02:55:02 UTC 2017
 pkgbase = nimf-git
-	pkgdesc = Nimf is an input method framework.
-	pkgver = master
+	pkgdesc = Nimf is an input method framework
+	pkgver = 2017.01.28.aa61961
 	pkgrel = 1
-	url = https://gitlab.com/nimf-i18n/nimf
+	url = https://cogniti.github.io/nimf
+	install = nimf-git.install
 	arch = any
-	license = LGPL3
-	makedepends = binutils
-	makedepends = autoconf
-	makedepends = automake
-	makedepends = gcc
-	makedepends = make
-	makedepends = glib2
-	makedepends = intltool
-	makedepends = gtk3
+	groups = nimf
+	license = GNU LGPL v3
 	makedepends = gtk2
+	makedepends = gtk3
 	makedepends = qt4
 	makedepends = qt5-base
+	makedepends = intltool
+	makedepends = gobject-introspection
+	makedepends = glib2
 	makedepends = libappindicator-gtk3
+	makedepends = git
 	makedepends = librsvg
 	makedepends = noto-fonts-cjk
 	makedepends = libhangul
+	makedepends = sunpinyin
+	makedepends = sunpinyin-data
 	makedepends = anthy
 	makedepends = libchewing
 	makedepends = librime
-	makedepends = libxkbcommon
-	makedepends = wayland
+	makedepends = brise
 	makedepends = audit
-	depends = glib2
-	depends = gtk3
 	depends = gtk2
+	depends = gtk3
 	depends = qt4
 	depends = qt5-base
+	depends = libxkbcommon
+	depends = glib2
 	depends = libappindicator-gtk3
 	depends = libhangul
+	depends = sunpinyin
+	depends = sunpinyin-data
 	depends = anthy
 	depends = libchewing
 	depends = librime
-	depends = libxkbcommon
-	depends = wayland
-	depends = audit
-	optdepends = brise: Rime schema repository
-	optdepends = noto-fonts-cjk: Google Noto CJK fonts
-	optdepends = xorg-setxkbmap: Set the keyboard using the X Keyboard Extension
-	source = https://gitlab.com/nimf-i18n/nimf/-/archive/master/nimf-master.tar.bz2
+	depends = brise
+	conflicts = nimf
+	options = !buildflags
+	source = nimf::git+https://github.com/cogniti/nimf.git
 	md5sums = SKIP
 
 pkgname = nimf-git
diff --git a/PKGBUILD b/PKGBUILD
index e30484da5206..3a8ab720e7ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,40 @@
-# Maintainer: Hodong Kim <cogniti@gmail.com>
+# Maintainer: Youngbin Han <sukso96100@gmail.com>
+# Submitter: Youngbin Han <sukso96100@gmail.com>
+# Contributor: Changjoo Lee <icj7061@gmail.com>
+# Contributor: ywen407 <ywen407@naver.com>
 
 pkgname=nimf-git
-pkgver=master
+_pkgname=nimf
+pkgver=2017.01.28.aa61961
 pkgrel=1
-pkgdesc="Nimf is an input method framework."
+pkgdesc="Nimf is an input method framework"
 arch=('any')
-url="https://gitlab.com/nimf-i18n/nimf"
-license=('LGPL3')
-makedepends=('binutils' 'autoconf' 'automake' 'gcc' 'make' 'glib2' 'intltool'
-             'gtk3' 'gtk2' 'qt4' 'qt5-base' 'libappindicator-gtk3' 'librsvg'
-             'noto-fonts-cjk' 'libhangul' 'anthy' 'libchewing' 'librime'
-             'libxkbcommon' 'wayland' 'audit')
-depends=('glib2' 'gtk3' 'gtk2' 'qt4' 'qt5-base' 'libappindicator-gtk3'
-         'libhangul' 'anthy' 'libchewing' 'librime' 'libxkbcommon' 'wayland'
-         'audit')
-optdepends=('brise: Rime schema repository'
-            'noto-fonts-cjk: Google Noto CJK fonts'
-            'xorg-setxkbmap: Set the keyboard using the X Keyboard Extension')
-source=("https://gitlab.com/nimf-i18n/nimf/-/archive/master/nimf-master.tar.bz2")
+url="https://cogniti.github.io/${_pkgname}"
+license=('GNU LGPL v3')
+depends=('gtk2' 'gtk3' 'qt4' 'qt5-base' 'libxkbcommon' 'glib2' 
+'libappindicator-gtk3' 'libhangul' 'sunpinyin' 'sunpinyin-data' 'anthy' 'libchewing' 'librime' 'brise')
+makedepends=('gtk2' 'gtk3' 'qt4' 'qt5-base' 'intltool' 
+'gobject-introspection' 'glib2' 'libappindicator-gtk3' 'git' 'librsvg' 
+'noto-fonts-cjk' 'libhangul' 'sunpinyin' 'sunpinyin-data' 'anthy' 
+'libchewing' 'librime' 'brise' 'audit')
+conflicts=("nimf")
+source=("${_pkgname}"::"git+https://github.com/cogniti/${_pkgname}.git")
 md5sums=('SKIP')
+options=(!buildflags)
+install=$pkgname.install
+groups=('nimf')
 
 pkgver() {
-	cd "$srcdir/nimf-master"
-	grep AC_INIT configure.ac | grep -Po '\d{4}.\d{2}.\d{2}'
+	cd "${srcdir}/${_pkgname}"
+	echo "$(git tag | sort -V | tail -1).$(git rev-parse --short HEAD)"
 }
 
 build() {
-	cd "$srcdir/nimf-master"
+	cd "${srcdir}/${_pkgname}"
 	./autogen.sh --prefix=/usr
 	make
 }
-
 package() {
-	cd "$srcdir/nimf-master"
+	cd "${srcdir}/${_pkgname}"
 	make DESTDIR="${pkgdir}/" install
 }
diff --git a/nimf-git.install b/nimf-git.install
new file mode 100644
index 000000000000..f65d50c997d9
--- /dev/null
+++ b/nimf-git.install
@@ -0,0 +1,15 @@
+post_install() {
+	echo "Compiling schemas..."
+	/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/
+	echo "Running ldconfig..."
+	ldconfig
+	echo "Updating GTK icon cache..."
+	gtk-update-icon-cache 
+	echo "Updating immodules cache..."
+	gtk-query-immodules-3.0 --update-cache
+	gtk-query-immodules-2.0 --update-cache
+}
+
+post_upgrade() {
+	post_install $1
+}