Pop version v1.6.1rc1

3 files changed, 13 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d2a3b6397624..de03a63e1ffc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openboard-develop
-	pkgdesc = Interactive whiteboard software for schools and universities
-	pkgver = 1.6.0
-	pkgrel = 4
+	pkgdesc = Interactive whiteboard software for schools and universities (development version)
+	pkgver = 1.6.1
+	pkgrel = 1
 	url = http://openboard.ch/index.en.html
 	arch = x86_64
 	arch = i686
@@ -21,18 +21,18 @@ pkgbase = openboard-develop
 	depends = ffmpeg
 	depends = quazip
 	depends = poppler
-	provides = openboard=1.6.0
+	provides = openboard=1.6.1
 	conflicts = openboard
-	source = https://github.com/OpenBoard-org/OpenBoard/archive/v1.6.0a3.tar.gz
+	source = https://github.com/OpenBoard-org/OpenBoard/archive/v1.6.1rc-0309.tar.gz
 	source = openboard.desktop
 	source = qchar.patch
 	source = quazip.patch
 	source = drop_ThirdParty_repo.patch
-	sha256sums = 6c09e8fba969de960764eb0fd0c4e38585354d8f75a337b48176a77d880a4cf7
+	sha256sums = 34e811bda1939371c3713d86baf2034398b3a193183edea7fc2c267d4a008fc5
 	sha256sums = 18ee4fab83b0c92490c81c2aaace98f669d07d7260cc0f83a24acb8d6224e5e7
 	sha256sums = b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549
 	sha256sums = 8c0b28ebd6cade0a551b695af9c04a2c45052f2d955357825b3be97bf00d5be7
-	sha256sums = 71a41ecbecb952b402d554aa7c5659650765b692662a28f9db904c7390f8f080
+	sha256sums = a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14
 
 pkgname = openboard-develop
 
diff --git a/PKGBUILD b/PKGBUILD
index fc4b33b77700..d7c23ab261d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,10 @@
 #!/hint/bash
 # Maintainer: bartus <arch-user-repoᘓbartus.33mail.com>
 pkgname=openboard-develop
-pkgver=1.6.0
-_a=3
-_src_folder="OpenBoard-${pkgver}a${_a}"
+pkgver=1.6.1
+_rc=0309
+_src_folder="OpenBoard-${pkgver}rc-${_rc}"
 pkgrel=1
-((pkgrel+=_a))
 pkgdesc="Interactive whiteboard software for schools and universities"
 arch=('x86_64' 'i686')
 url="http://openboard.ch/index.en.html"
@@ -15,16 +14,16 @@ conflicts=(${pkgname%-develop})
 depends=('qt5-base' 'qt5-multimedia' 'qt5-svg' 'qt5-script' 'qt5-webkit' 'qt5-tools' 'qt5-xmlpatterns' 'libpaper' 'bzip2' 'openssl' 'libfdk-aac' 'sdl' 'ffmpeg')
 depends+=(quazip)  #drop internal quazip and use system one.
 depends+=(poppler) #replace internal xpdf with poppler and drop freetype/xpdf from deps
-source=("https://github.com/OpenBoard-org/OpenBoard/archive/v${pkgver}a${_a}.tar.gz"
+source=("https://github.com/OpenBoard-org/OpenBoard/archive/v${pkgver}rc-${_rc}.tar.gz"
         openboard.desktop)
 source+=(qchar.patch)
 source+=(quazip.patch)
 source+=(drop_ThirdParty_repo.patch)
-sha256sums=('6c09e8fba969de960764eb0fd0c4e38585354d8f75a337b48176a77d880a4cf7'
+sha256sums=('34e811bda1939371c3713d86baf2034398b3a193183edea7fc2c267d4a008fc5'
             '18ee4fab83b0c92490c81c2aaace98f669d07d7260cc0f83a24acb8d6224e5e7'
             'b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549'
             '8c0b28ebd6cade0a551b695af9c04a2c45052f2d955357825b3be97bf00d5be7'
-            '71a41ecbecb952b402d554aa7c5659650765b692662a28f9db904c7390f8f080')
+            'a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14')
 
 prepare() {
   cd "$srcdir"/$_src_folder
diff --git a/drop_ThirdParty_repo.patch b/drop_ThirdParty_repo.patch
index 058ede8829f8..91a0b1315d01 100644
--- a/drop_ThirdParty_repo.patch
+++ b/drop_ThirdParty_repo.patch
@@ -74,15 +74,3 @@ diff -Naur OpenBoard-1.5.3/libs.pri OpenBoard-1.5.3-new/libs.pri
 +}
 +
 +
-diff -Naur OpenBoard-1.5.3/OpenBoard.pro OpenBoard-1.5.3-new/OpenBoard.pro
---- OpenBoard-1.5.3/OpenBoard.pro	2019-04-10 09:04:25.000000000 +0200
-+++ OpenBoard-1.5.3-new/OpenBoard.pro	2019-04-12 14:26:34.289438050 +0200
-@@ -45,7 +45,7 @@
- 
- INCLUDEPATH += src
- 
--include($$THIRD_PARTY_PATH/libs.pri)
-+include(libs.pri)
- include(src/adaptors/adaptors.pri)
- include(src/api/api.pri)
- include(src/board/board.pri)