Update version to 0.7.1+1+6d30c29

3 files changed, 38 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d6018cdcc23b..24df1c4c3e6d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vala-panel-appmenu-common
 	pkgdesc = Common libraries and translations for Vala Panel Application Menu
-	pkgver = 0.6.94
+	pkgver = 0.7.1+1+6d30c29
 	pkgrel = 1
 	url = https://github.com/rilian-la-te/vala-panel-appmenu
 	arch = any
@@ -10,10 +10,12 @@ pkgbase = vala-panel-appmenu-common
 	conflicts = vala-panel-appmenu-mate-git
 	conflicts = vala-panel-appmenu-translations-git
 	conflicts = vala-panel-appmenu-valapanel-git
-	source = https://github.com/rilian-la-te/vala-panel-appmenu/releases/download/0.6.94/vala-panel-appmenu-0.6.94.tar.gz
+	source = git+https://github.com/rilian-la-te/vala-panel-appmenu.git#commit=6d30c2961a002789cbfe98827744edb2a9c2e3a1
+	source = git+https://github.com/rilian-la-te/cmake-vala.git#commit=1bce300e6995c055296a79122d19993bc5085b75
 	source = enable-only-common.diff
-	sha512sums = 9ba216b2760bd8f7999c0731e80f231af67d30fd2d44f3a906d2dde0784683bb3c348556144b2e18166d0b38d3b4583ca4dd9655463b0ded6e1b5f1a248af5f7
-	sha512sums = e4a9e5b4ebd2f601679f919f713e43030d6827d91ac0bbdb75dabb7dccecff87467b92fe8da70759c87730dedbe0092c62228f02b80395bfc8f721c9fbe4fc44
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = dbdc3293ff6e8cecdfb8b66d101cdc6254c8cf05e6352e3c03f7a02d8d7eb0c2
 
 pkgname = vala-panel-appmenu-common
 
diff --git a/PKGBUILD b/PKGBUILD
index dafbd224cf9c..ef3f7d711583 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,48 @@
 # Maintainer: Kaizhao Zhang <zhangkaizhao@gmail.com>
 
 _srcname=vala-panel-appmenu
+_gitcommit=6d30c2961a002789cbfe98827744edb2a9c2e3a1
+_cmakevala_gitcommit=1bce300e6995c055296a79122d19993bc5085b75
 
 pkgname=vala-panel-appmenu-common
-pkgver=0.6.94
+pkgver=0.7.1+1+6d30c29
 pkgrel=1
 pkgdesc="Common libraries and translations for Vala Panel Application Menu"
 url='https://github.com/rilian-la-te/vala-panel-appmenu'
 arch=('any')
 license=('LGPL3')
 makedepends=('cmake')
-conflicts=('vala-panel-appmenu-budgie-git'
-           'vala-panel-appmenu-mate-git'
-           'vala-panel-appmenu-translations-git'
-           'vala-panel-appmenu-valapanel-git')
+conflicts=(
+  'vala-panel-appmenu-budgie-git'
+  'vala-panel-appmenu-mate-git'
+  'vala-panel-appmenu-translations-git'
+  'vala-panel-appmenu-valapanel-git'
+)
 
-source=("https://github.com/rilian-la-te/vala-panel-appmenu/releases/download/${pkgver}/${_srcname}-${pkgver}.tar.gz"
-        enable-only-common.diff)
-sha512sums=('9ba216b2760bd8f7999c0731e80f231af67d30fd2d44f3a906d2dde0784683bb3c348556144b2e18166d0b38d3b4583ca4dd9655463b0ded6e1b5f1a248af5f7'
-            'e4a9e5b4ebd2f601679f919f713e43030d6827d91ac0bbdb75dabb7dccecff87467b92fe8da70759c87730dedbe0092c62228f02b80395bfc8f721c9fbe4fc44')
+source=(
+  "git+https://github.com/rilian-la-te/vala-panel-appmenu.git#commit=${_gitcommit}"
+  "git+https://github.com/rilian-la-te/cmake-vala.git#commit=${_cmakevala_gitcommit}"
+  enable-only-common.diff
+)
+sha256sums=(
+  'SKIP'
+  'SKIP'
+  'dbdc3293ff6e8cecdfb8b66d101cdc6254c8cf05e6352e3c03f7a02d8d7eb0c2'
+)
 
 prepare() {
-  cd "${srcdir}/${_srcname}-${pkgver}/data"
-  patch -p0 -i ../../../enable-only-common.diff
+  rm -rf "${srcdir}/${_srcname}/cmake"
+  cd "${srcdir}/cmake-vala"
+  cp -r . "${srcdir}/${_srcname}/cmake"
+
+  cd "${srcdir}/${_srcname}"
+  patch -p0 -i ../enable-only-common.diff
+  mkdir -p build
 }
 
 build() {
-  cd "${srcdir}/${_srcname}-${pkgver}"
-  cmake ./ \
+  cd "${srcdir}/${_srcname}/build"
+  cmake ../ \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_INSTALL_LIBEXECDIR=lib \
@@ -44,7 +59,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${_srcname}-${pkgver}"
+  cd "${srcdir}/${_srcname}/build"
 
   make -C "po" DESTDIR="${pkgdir}" install
   make -C "data" DESTDIR="${pkgdir}" install
diff --git a/enable-only-common.diff b/enable-only-common.diff
index c9a69ec08d98..f63d3378f234 100644
--- a/enable-only-common.diff
+++ b/enable-only-common.diff
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2018-04-24 12:38:37.967848552 +0800
-+++ CMakeLists.txt	2018-04-24 12:39:02.505067563 +0800
-@@ -16,3 +16,6 @@
+--- data/CMakeLists.txt.orig	2018-11-20 21:05:18.889757920 +0800
++++ data/CMakeLists.txt	2018-11-20 21:05:46.643812419 +0800
+@@ -19,3 +19,6 @@
      add_schema("org.valapanel.appmenu.gschema.xml")
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/appmenu-budgie.plugin DESTINATION ${CMAKE_INSTALL_LIBDIR}/budgie-desktop/plugins/budgie-vala-panel-appmenu-plugin)
  endif()