Hello! Please find patches attached with changes described in respective commit messages.
Please make sure libre/kio 5.69.0 is built and installed in librechroot before libre/ark and libre/okular can be built. As libre/opencv PKGBUILD contains mksource(), please also updpkgsums before the build as it's hard for me to predict what the checksum of the -libre source tarball will be.
From 2855b1c80e8bceaffc5371cf36a5cffcbe186af3 Mon Sep 17 00:00:00 2001 From: grizzlyuser <[email protected]> Date: Sun, 26 Apr 2020 12:10:40 +0300 Subject: [PATCH 1/4] libre/ark 20.04.0-1.par1 New version --- libre/ark/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/ark/PKGBUILD b/libre/ark/PKGBUILD index 1fca03f69..bbf2ba2f3 100644 --- a/libre/ark/PKGBUILD +++ b/libre/ark/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: jc_gargma <[email protected]> pkgname=ark -pkgver=19.12.3 +pkgver=20.04.0 pkgrel=1 pkgrel+=.par1 pkgdesc='Archiving Tool' @@ -22,7 +22,7 @@ optdepends=('p7zip: 7Z format support' 'unarchiver: RAR format support' groups=(kde-applications kdeutils) source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}) source+=('libre.patch') -sha256sums=('78594029729c197fc90321850696f1bd189b40d8d7fbc9faf51ad6b2ab744a07' +sha256sums=('6acda4f29ff463216748f27a791454e1ed2e45851b8e95ada0f56434850917d7' 'SKIP' '624bd7cd221db2a80b21cd5f71c447d86091e52276f2bdb609c8916755c7d602') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <[email protected]> -- 2.26.2
From 7388bfa3cc6bd75cbff8329b74da76640fe3aa2d Mon Sep 17 00:00:00 2001 From: grizzlyuser <[email protected]> Date: Sun, 26 Apr 2020 12:15:32 +0300 Subject: [PATCH 3/4] libre/okular 20.04.0-1.parabola1: New version and sync with Arch Linux --- libre/okular/PKGBUILD | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/libre/okular/PKGBUILD b/libre/okular/PKGBUILD index a6b468476..e5652e177 100644 --- a/libre/okular/PKGBUILD +++ b/libre/okular/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: jc_gargma <[email protected]> pkgname=okular -pkgver=19.12.3 -pkgrel=3 +pkgver=20.04.0 +pkgrel=1 pkgrel+=.parabola1 pkgdesc='Document Viewer' pkgdesc+=', with copy-protection anti-feature turned off by default and without nonfree unrar recommendation' @@ -22,12 +22,10 @@ optdepends=('ebook-tools: mobi and epub support' 'kdegraphics-mobipocket: mobi support' 'libzip: CHM support' 'khtml: CHM support' 'chmlib: CHM support' 'calligra: ODT and ODP support' 'unarchiver: Comic Book Archive support') -source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} - CVE-2020-9359.patch::"https://invent.kde.org/kde/okular/-/commit/6a93a033.patch";) +source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}) source+=('libre.patch') -sha256sums=('c5de22cc4292e3b7adae3f6ef6566dcba33a1dd5995fb0b968ea3e705a4c04e0' +sha256sums=('1b6521b4eaa0a0eb41a39c3f84252d9833f6d26fa410afaef815ec661737dfe7' 'SKIP' - '58ab539871a68e36de81c80bcd0258a755b64e1cc210430ba60a0e8d5fb51a44' '83cf760b3ae6e03d49e02369375dae3ecc05a6800d512dd9ffeaac1648c19457') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <[email protected]> F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <[email protected]> @@ -36,8 +34,6 @@ options=(!zipman) prepare() { mkdir -p build - patch -d $pkgname-$pkgver -p1 -i "$srcdir"/CVE-2020-9359.patch - cd $pkgname-$pkgver patch -Np1 -i "$srcdir"/libre.patch } @@ -45,8 +41,7 @@ prepare() { build() { cd build cmake ../$pkgname-$pkgver \ - -DBUILD_TESTING=OFF \ - -DBUILD_OKULARKIRIGAMI=OFF + -DBUILD_TESTING=OFF make } -- 2.26.2
From 31ba73a18f4912e22c36d3359d532fe89da2fe75 Mon Sep 17 00:00:00 2001 From: grizzlyuser <[email protected]> Date: Sun, 26 Apr 2020 12:11:26 +0300 Subject: [PATCH 2/4] libre/file-roller 3.36.2-1.parabola1: New version --- libre/file-roller/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/file-roller/PKGBUILD b/libre/file-roller/PKGBUILD index 723612b4c..e917e064c 100644 --- a/libre/file-roller/PKGBUILD +++ b/libre/file-roller/PKGBUILD @@ -6,7 +6,7 @@ # - removed unace and unrar recommendation pkgname=file-roller -pkgver=3.36.1 +pkgver=3.36.2 pkgrel=1 pkgrel+=.parabola1 pkgdesc="Create and modify archives" @@ -21,7 +21,7 @@ optdepends=('p7zip: 7z, arj, exe and encrypted zip files support' 'lrzip: lrzip archive support' 'squashfs-tools: squashfs image support') groups=(gnome) -_commit=3e70dc594044b2792e8e2c50fa8ea79438b1ddfc # tags/3.36.1^0 +_commit=eef4df4c857520ac81b1514d3b923e88855ce669 # tags/3.36.2^0 source=("git+https://gitlab.gnome.org/GNOME/file-roller.git#commit=$_commit";) sha256sums=('SKIP') -- 2.26.2
From 071f36b437a5b70f8f13e6011678ed0af3c45d65 Mon Sep 17 00:00:00 2001 From: grizzlyuser <[email protected]> Date: Sun, 26 Apr 2020 20:23:42 +0300 Subject: [PATCH 4/4] libre/opencv 4.3.0-4.par1: New version and sync with Arch Linux Arch Linux changed makedepends from gtk3 to qt5-base, and because of that, HighGUI module now doesn't build when Milky icons are removed. So added libre.patch that replaces custom icons with the ones from system icon theme. AFAIK that requires hicolor-icon-theme dependency added. Changed the license to reflect that it's BSD 3-clause. modules/xfeatures2d/ had been already removed in prepare(), so no need to remove modules/xfeatures2d/src/{sift,surf}.cpp additionally. It doesn't build with only two .cpp files removed anyway. --- libre/opencv/PKGBUILD | 33 +++++++++------- libre/opencv/libre.patch | 84 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 15 deletions(-) create mode 100644 libre/opencv/libre.patch diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD index 8d258445e..26dc1fd95 100644 --- a/libre/opencv/PKGBUILD +++ b/libre/opencv/PKGBUILD @@ -3,32 +3,36 @@ # Contributor (Hyperbola): André Silva <[email protected]> # Contributor (Hyperbola): Márcio Silva <[email protected]> # Maintainer: Omar Vega Ramos <[email protected]> +# Contributor: grizzlyuser <[email protected]> pkgbase=opencv pkgname=opencv -pkgver=4.1.1 -pkgrel=1 +pkgver=4.3.0 +pkgrel=4 pkgrel+=.par1 pkgdesc="Free Computer Vision Library, without nonfree SIFT and SURF algorithms, nonfree Milky icons and lena images" arch=(x86_64) arch+=(i686 armv7h) -license=(BSD) +license=(BSD3) url="https://opencv.org/"; depends=(intel-tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 jasper ffmpeg) -makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke gtk3 vtk glew ant java-environment) +depends+=(hicolor-icon-theme) +makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke qt5-base vtk glew ant java-environment) optdepends=('opencv-samples: samples' - 'gtk3: for the HighGUI module and the Python bindings' 'vtk: for the viz module' + 'qt5-base: for the HighGUI module and the Python bindings' 'hdf5: for the HDF5 module and the Python bindings' 'opencl-icd-loader: For coding with OpenCL' 'python-numpy: Python bindings' 'java-runtime: Java interface') -mksource=("$pkgbase-$pkgver.zip::https://github.com/opencv/opencv/archive/$pkgver.zip"; - "opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz";) +mksource=("$pkgbase-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.zip"; + "opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz"; + libre.patch) source=("https://repo.parabola.nu/other/$pkgname-libre/$pkgname-libre-$pkgver.zip"; opencv-includedir.patch) -mksha256sums=('d34985c7b4283519c032e3585b30846644f56c81acba35693295ff8930f080aa' - '9f85d380758498d800fec26307e389620cde8b1a2e86ab51cddc5200fbe37102') +mksha256sums=('36799186756c1e12adde97f0a8d1afc395d5b0f86d8ad9ef951bc33aa732f9b9' + 'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10' + '15139ab05b9713be6a7ee35b610f42668ea331a67c914b84a5696abd50076c54') sha256sums=('92de32fbd5c2239cf1b7bd52c07aab8bec76fab1dd51fef5a887f401f75ee2f6' 'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10') @@ -36,12 +40,13 @@ mksource() { cd "$srcdir/opencv_contrib-$pkgver" # remove nonfree SIFT and SURF algorithms that are patented in some countries and have some other limitations on the use - rm -v modules/xfeatures2d/src/{sift,surf}.cpp + rm -rv modules/xfeatures2d cd "$srcdir/$pkgname-$pkgver" # remove nonfree Milky icons rm -rv modules/highgui/src/files_Qt/Milky + patch -p1 -i ../libre.patch # remove nonfree lena.png and lena.jpg images rm -v $(find . -iname '*lena*') @@ -53,9 +58,7 @@ prepare() { cd $pkgname-$pkgver patch -p1 -i ../opencv-includedir.patch # Fix wrong include patch in pkgconfig file - cd "$srcdir/opencv_contrib-$pkgver" - # remove nonfree SIFT and SURF references - rm -rv modules/xfeatures2d + sed -e '/ocv_tbb_cmake_guess(HAVE_TBB)/d' -i cmake/OpenCVDetectTBB.cmake # Don't use TBB's cmake config, it breaks build } build() { @@ -75,7 +78,8 @@ build() { -DWITH_OPENCL=ON \ -DWITH_OPENGL=ON \ -DWITH_TBB=ON \ - -DOpenGL_GL_PREFERENCE=GLVND \ + -DWITH_VULKAN=ON \ + -DWITH_QT=ON \ -DBUILD_WITH_DEBUG_INFO=OFF \ -DBUILD_TESTS=OFF \ -DBUILD_PERF_TESTS=OFF \ @@ -83,7 +87,6 @@ build() { -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ $extra \ -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \ -DOPENCV_SKIP_PYTHON_LOADER=ON \ diff --git a/libre/opencv/libre.patch b/libre/opencv/libre.patch new file mode 100644 index 000000000..417c0d8a6 --- /dev/null +++ b/libre/opencv/libre.patch @@ -0,0 +1,84 @@ +diff --git a/modules/highgui/src/window_QT.cpp b/modules/highgui/src/window_QT.cpp +index 1600bd9..9a05294 100644 +--- a/modules/highgui/src/window_QT.cpp ++++ b/modules/highgui/src/window_QT.cpp +@@ -1996,47 +1996,47 @@ void CvWindow::createActions() + QWidget* view = myView->getWidget(); + + //if the shortcuts are changed in window_QT.h, we need to update the tooltip manually +- vect_QActions[0] = new QAction(QIcon(":/left-icon"), "Panning left (CTRL+arrowLEFT)", this); ++ vect_QActions[0] = new QAction(QIcon::fromTheme(QStringLiteral("go-previous")), "Panning left (CTRL+arrowLEFT)", this); + vect_QActions[0]->setIconVisibleInMenu(true); + QObject::connect(vect_QActions[0], SIGNAL(triggered()), view, SLOT(siftWindowOnLeft())); + +- vect_QActions[1] = new QAction(QIcon(":/right-icon"), "Panning right (CTRL+arrowRIGHT)", this); ++ vect_QActions[1] = new QAction(QIcon::fromTheme(QStringLiteral("go-next")), "Panning right (CTRL+arrowRIGHT)", this); + vect_QActions[1]->setIconVisibleInMenu(true); + QObject::connect(vect_QActions[1], SIGNAL(triggered()), view, SLOT(siftWindowOnRight())); + +- vect_QActions[2] = new QAction(QIcon(":/up-icon"), "Panning up (CTRL+arrowUP)", this); ++ vect_QActions[2] = new QAction(QIcon::fromTheme(QStringLiteral("go-up")), "Panning up (CTRL+arrowUP)", this); + vect_QActions[2]->setIconVisibleInMenu(true); + QObject::connect(vect_QActions[2], SIGNAL(triggered()), view, SLOT(siftWindowOnUp())); + +- vect_QActions[3] = new QAction(QIcon(":/down-icon"), "Panning down (CTRL+arrowDOWN)", this); ++ vect_QActions[3] = new QAction(QIcon::fromTheme(QStringLiteral("go-down")), "Panning down (CTRL+arrowDOWN)", this); + vect_QActions[3]->setIconVisibleInMenu(true); + QObject::connect(vect_QActions[3], SIGNAL(triggered()), view, SLOT(siftWindowOnDown()) ); + +- vect_QActions[4] = new QAction(QIcon(":/zoom_x1-icon"), "Zoom x1 (CTRL+P)", this); ++ vect_QActions[4] = new QAction(QIcon::fromTheme(QStringLiteral("zoom-original")), "Zoom x1 (CTRL+P)", this); + vect_QActions[4]->setIconVisibleInMenu(true); + QObject::connect(vect_QActions[4], SIGNAL(triggered()), view, SLOT(resetZoom())); + +- vect_QActions[5] = new QAction(QIcon(":/imgRegion-icon"), tr("Zoom x%1 (see label) (CTRL+X)").arg(threshold_zoom_img_region), this); ++ vect_QActions[5] = new QAction(QIcon::fromTheme(QStringLiteral("edit-find")), tr("Zoom x%1 (see label) (CTRL+X)").arg(threshold_zoom_img_region), this); + vect_QActions[5]->setIconVisibleInMenu(true); + QObject::connect(vect_QActions[5], SIGNAL(triggered()), view, SLOT(imgRegion())); + +- vect_QActions[6] = new QAction(QIcon(":/zoom_in-icon"), "Zoom in (CTRL++)", this); ++ vect_QActions[6] = new QAction(QIcon::fromTheme(QStringLiteral("zoom-in")), "Zoom in (CTRL++)", this); + vect_QActions[6]->setIconVisibleInMenu(true); + QObject::connect(vect_QActions[6], SIGNAL(triggered()), view, SLOT(ZoomIn())); + +- vect_QActions[7] = new QAction(QIcon(":/zoom_out-icon"), "Zoom out (CTRL+-)", this); ++ vect_QActions[7] = new QAction(QIcon::fromTheme(QStringLiteral("zoom-out")), "Zoom out (CTRL+-)", this); + vect_QActions[7]->setIconVisibleInMenu(true); + QObject::connect(vect_QActions[7], SIGNAL(triggered()), view, SLOT(ZoomOut())); + +- vect_QActions[8] = new QAction(QIcon(":/save-icon"), "Save current image (CTRL+S)", this); ++ vect_QActions[8] = new QAction(QIcon::fromTheme(QStringLiteral("document-save")), "Save current image (CTRL+S)", this); + vect_QActions[8]->setIconVisibleInMenu(true); + QObject::connect(vect_QActions[8], SIGNAL(triggered()), view, SLOT(saveView())); + +- vect_QActions[9] = new QAction(QIcon(":/copy_clipbrd-icon"), "Copy image to clipboard (CTRL+C)", this); ++ vect_QActions[9] = new QAction(QIcon::fromTheme(QStringLiteral("edit-copy")), "Copy image to clipboard (CTRL+C)", this); + vect_QActions[9]->setIconVisibleInMenu(true); + QObject::connect(vect_QActions[9], SIGNAL(triggered()), view, SLOT(copy2Clipbrd())); + +- vect_QActions[10] = new QAction(QIcon(":/properties-icon"), "Display properties window (CTRL+P)", this); ++ vect_QActions[10] = new QAction(QIcon::fromTheme(QStringLiteral("document-properties")), "Display properties window (CTRL+P)", this); + vect_QActions[10]->setIconVisibleInMenu(true); + QObject::connect(vect_QActions[10], SIGNAL(triggered()), this, SLOT(displayPropertiesWin())); + +diff --git a/modules/highgui/src/window_QT.qrc b/modules/highgui/src/window_QT.qrc +index efdd8c2..f7e6f37 100644 +--- a/modules/highgui/src/window_QT.qrc ++++ b/modules/highgui/src/window_QT.qrc +@@ -1,16 +1,5 @@ + <RCC> + <qresource prefix="/"> +- <file alias="left-icon">files_Qt/Milky/48/28.png</file> +- <file alias="right-icon">files_Qt/Milky/48/23.png</file> +- <file alias="up-icon">files_Qt/Milky/48/19.png</file> +- <file alias="down-icon">files_Qt/Milky/48/24.png</file> +- <file alias="zoom_x1-icon">files_Qt/Milky/48/27.png</file> +- <file alias="imgRegion-icon">files_Qt/Milky/48/61.png</file> +- <file alias="zoom_in-icon">files_Qt/Milky/48/106.png</file> +- <file alias="zoom_out-icon">files_Qt/Milky/48/107.png</file> +- <file alias="save-icon">files_Qt/Milky/48/7.png</file> +- <file alias="copy_clipbrd-icon">files_Qt/Milky/48/43.png</file> +- <file alias="properties-icon">files_Qt/Milky/48/38.png</file> + <file alias="stylesheet-trackbar">files_Qt/stylesheet_trackbar.qss</file> + </qresource> + </RCC> -- 2.26.2
_______________________________________________ Dev mailing list [email protected] https://lists.parabola.nu/mailman/listinfo/dev
