[arch-commits] Commit in openjpeg2/trunk (PKGBUILD)

[Andreas Radke]

    Date: Tuesday, December 29, 2020 @ 07:27:53
  Author: andyrtr
Revision: 405088

upgpkg: openjpeg2 2.4.0-1: upstream update 2.4.0 - fixes also FS#68939

Modified:
  openjpeg2/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-29 07:27:43 UTC (rev 405087)
+++ PKGBUILD	2020-12-29 07:27:53 UTC (rev 405088)
@@ -2,8 +2,8 @@
 # Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
 pkgname=openjpeg2
-pkgver=2.3.1
-pkgrel=3
+pkgver=2.4.0
+pkgrel=1
 pkgdesc="An open source JPEG 2000 codec, version ${pkgver}"
 arch=(x86_64)
 license=('custom: BSD')
@@ -10,22 +10,12 @@
 url="https://github.com/uclouvain/openjpeg"
 makedepends=('cmake' 'doxygen')
 depends=('zlib' 'libpng' 'libtiff' 'lcms2')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz"
-        CVE-2020-27823.patch::https://github.com/uclouvain/openjpeg/commit/b2072402b7e14d22bba6fb8cde2a1e9996e9a919.patch)
-sha256sums=('63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9'
-            'SKIP')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz")
+sha256sums=('8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d')
 
 prepare() {
   cd "${srcdir}"
   mkdir build
-
-  # Install doxygen docs to the right directory
-  sed -i -e "s:DESTINATION\ share/doc:DESTINATION\ share/doc/${pkgname}:" openjpeg-${pkgver}/doc/CMakeLists.txt
-
-  # https://bugs.archlinux.org/task/68906
-  pushd openjpeg-${pkgver}
-  patch -Np1 -i ../CVE-2020-27823.patch
-  popd
 }
 
 build() {
@@ -47,5 +37,4 @@
   
   install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg2"
   mv "${pkgdir}"/usr/share/doc/openjpeg-*/LICENSE "${pkgdir}"/usr/share/licenses/openjpeg2
-  rmdir "${pkgdir}"/usr/share/doc/openjpeg-*
 }