Update 1.26

2 files changed, 24 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5118acc15fd7..cb8211c45a48 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,25 @@
 pkgbase = r-knitr
 	pkgdesc = A General-Purpose Package for Dynamic Report Generation in R
-	pkgver = 1.25
+	pkgver = 1.26
 	pkgrel = 1
 	url = https://cran.r-project.org/package=knitr
 	arch = any
 	license = GPL-2
 	license = GPL-3
-	depends = r
+	depends = r>=3.2.3
 	depends = r-evaluate>=0.10
 	depends = r-highr
 	depends = r-markdown
 	depends = r-stringr>=0.6
-	depends = r-yaml
+	depends = r-yaml>=2.1.19
 	depends = r-xfun
 	optdepends = pandoc
+	optdepends = rst2pdf
 	optdepends = r-formatr
 	optdepends = r-testit
 	optdepends = r-digest
 	optdepends = r-rgl
+	optdepends = r-codetools
 	optdepends = r-rmarkdown
 	optdepends = r-htmlwidgets
 	optdepends = r-webshot
@@ -25,15 +27,19 @@ pkgbase = r-knitr
 	optdepends = r-tinytex
 	optdepends = r-reticulate
 	optdepends = r-juliacall
+	optdepends = r-magick
 	optdepends = r-png
 	optdepends = r-jpeg
+	optdepends = r-gifski
 	optdepends = r-xml2
 	optdepends = r-httr
 	optdepends = r-dbi
 	optdepends = r-showtext
 	optdepends = r-tibble
-	source = https://cran.r-project.org/src/contrib/knitr_1.25.tar.gz
-	md5sums = 1446f9189172ee1e50fc8b9cf65357e6
+	optdepends = r-sass
+	optdepends = r-styler
+	source = https://cran.r-project.org/src/contrib/knitr_1.26.tar.gz
+	md5sums = 839f007053fab96e27089fa8a5a0b640
 
 pkgname = r-knitr
 
diff --git a/PKGBUILD b/PKGBUILD
index cf0df00d0722..b93c8ecb9ed1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,7 @@
 # Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 
 _cranname=knitr
-_cranver=1.25
-_pkgtar=${_cranname}_${_cranver}.tar.gz
+_cranver=1.26
 pkgname=r-knitr
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
@@ -10,18 +9,20 @@ pkgdesc="A General-Purpose Package for Dynamic Report Generation in R"
 arch=('any')
 url="https://cran.r-project.org/package=${_cranname}"
 license=('GPL-2' 'GPL-3')
-depends=('r' 'r-evaluate>=0.10' 'r-highr' 'r-markdown' 'r-stringr>=0.6' 'r-yaml' 'r-xfun')
-
-optdepends=('pandoc' 'r-formatr' 'r-testit' 'r-digest' 'r-rgl' 'r-rmarkdown' 'r-htmlwidgets' 'r-webshot' 'r-tikzdevice' 'r-tinytex' 'r-reticulate' 'r-juliacall' 'r-png' 'r-jpeg' 'r-xml2' 'r-httr' 'r-dbi' 'r-showtext' 'r-tibble')
-
-source=("https://cran.r-project.org/src/contrib/${_pkgtar}")
-md5sums=('1446f9189172ee1e50fc8b9cf65357e6')
+depends=('r>=3.2.3' 'r-evaluate>=0.10' 'r-highr' 'r-markdown' 'r-stringr>=0.6' 'r-yaml>=2.1.19' 'r-xfun')
+optdepends=('pandoc' 'rst2pdf' 'r-formatr' 'r-testit' 'r-digest' 'r-rgl' 'r-codetools' 'r-rmarkdown' 'r-htmlwidgets' 'r-webshot' 'r-tikzdevice' 'r-tinytex' 'r-reticulate' 'r-juliacall' 'r-magick' 'r-png' 'r-jpeg' 'r-gifski' 'r-xml2' 'r-httr' 'r-dbi' 'r-showtext' 'r-tibble' 'r-sass' 'r-styler')
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+md5sums=('839f007053fab96e27089fa8a5a0b640')
 
 build(){
-    R CMD INSTALL ${_pkgtar} -l $srcdir
+    cd "${srcdir}"
+
+    R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l $srcdir
 }
+
 package() {
-    install -d "$pkgdir/usr/lib/R/library"
-    cp -r "$srcdir/$_cranname" "$pkgdir/usr/lib/R/library"
-}
+    cd "${srcdir}"
 
+    install -dm0755 "$pkgdir/usr/lib/R/library"
+    cp -a --no-preserve=ownership "$_cranname" "$pkgdir/usr/lib/R/library"
+}