summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBioArchLinuxBot2023-12-17 18:01:53 +0000
committerBioArchLinuxBot2023-12-17 18:01:53 +0000
commit5b4a38c74686e34d61bfc6ee1cb7d33df120c20f (patch)
tree08208f404cfd2168259a32ea147db25db3b2aa46
parent16be77530817d8b2dccb30e94df4cb8bc4483e9f (diff)
downloadaur-5b4a38c74686e34d61bfc6ee1cb7d33df120c20f.tar.gz
[lilac] updated to 3.99.0.16-3
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD22
-rw-r--r--fix-build.patch24
3 files changed, 9 insertions, 44 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d5e680fcb291..98843704a524 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = r-xml
pkgdesc = Tools for Parsing and Generating XML Within R and S-Plus
pkgver = 3.99.0.16
- pkgrel = 2
+ pkgrel = 3
url = https://cran.r-project.org/package=XML
arch = x86_64
license = BSD
@@ -10,10 +10,7 @@ pkgbase = r-xml
optdepends = r-bitops
optdepends = r-rcurl
source = https://cran.r-project.org/src/contrib/XML_3.99-0.16.tar.gz
- source = fix-build.patch
md5sums = afa1fd1496595b5aa4f6cb758bad0122
- md5sums = fe644b51ff4b55a2b594a6c7dda5bc25
- sha256sums = 350d37bab99ba3dac03313fa3901cc053ab2d962a94a9c3404fb3ad0a91cc95b
- sha256sums = 5fd93db9dbd4100d4db55714c62340b025d0a871eaf61bffe145fb743e5d26da
+ b2sums = 90a917aa23ce6c617e9136af62f699703a59d2732a86c81c12e77456b046c93efebebf790618de6fb2b6ae807bb6cc4fdc31a60d63120e99f45444a46c8fbb7a
pkgname = r-xml
diff --git a/PKGBUILD b/PKGBUILD
index 833dd3c3137a..bf6fc1ee5eea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,10 +8,10 @@ _pkgname=XML
_pkgver=3.99-0.16
pkgname=r-${_pkgname,,}
pkgver=${_pkgver//-/.}
-pkgrel=2
+pkgrel=3
pkgdesc="Tools for Parsing and Generating XML Within R and S-Plus"
arch=(x86_64)
-url="https://cran.r-project.org/package=${_pkgname}"
+url="https://cran.r-project.org/package=$_pkgname"
license=(BSD)
depends=(
libxml2
@@ -21,21 +21,13 @@ optdepends=(
r-bitops
r-rcurl
)
-source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
- "fix-build.patch")
-md5sums=('afa1fd1496595b5aa4f6cb758bad0122'
- 'fe644b51ff4b55a2b594a6c7dda5bc25')
-sha256sums=('350d37bab99ba3dac03313fa3901cc053ab2d962a94a9c3404fb3ad0a91cc95b'
- '5fd93db9dbd4100d4db55714c62340b025d0a871eaf61bffe145fb743e5d26da')
-
-prepare() {
- # fix build
- patch -Np1 -i fix-build.patch
-}
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('afa1fd1496595b5aa4f6cb758bad0122')
+b2sums=('90a917aa23ce6c617e9136af62f699703a59d2732a86c81c12e77456b046c93efebebf790618de6fb2b6ae807bb6cc4fdc31a60d63120e99f45444a46c8fbb7a')
build() {
- mkdir -p build
- R CMD INSTALL "$_pkgname" -l build
+ mkdir build
+ R CMD INSTALL -l build "$_pkgname"
}
package() {
diff --git a/fix-build.patch b/fix-build.patch
deleted file mode 100644
index 24e2b94038b0..000000000000
--- a/fix-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/XML/src/HTMLParse.c b/XML/src/HTMLParse.c
-index 8d71f9f..7dea289 100644
---- a/XML/src/HTMLParse.c
-+++ b/XML/src/HTMLParse.c
-@@ -11,6 +11,7 @@
-
- #include "libxml/HTMLparser.h"
- #include "libxml/HTMLtree.h"
-+#include "libxml/xmlsave.h"
-
- #include <sys/stat.h>
- #include <unistd.h>
-diff --git a/XML/src/XMLTree.c b/XML/src/XMLTree.c
-index 6047de0..c28d5d0 100644
---- a/XML/src/XMLTree.c
-+++ b/XML/src/XMLTree.c
-@@ -35,6 +35,7 @@
- #include <libxml/HTMLtree.h>
- #endif
-
-+#include <libxml/xmlsave.h>
-
- #define R_USE_XML_ENCODING 1
- #include "Utils.h" /* R_createXMLNodeRef, Encoding macros. */