Update to version 2.4.2

3 files changed, 14 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf05da2250c6..962e9cc9920d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = natron-compositor
 	pkgdesc = Open source compositing software
-	pkgver = 2.4.1
+	pkgver = 2.4.2
 	pkgrel = 1
 	url = https://natrongithub.github.io/
 	arch = x86_64
@@ -17,23 +17,21 @@ pkgbase = natron-compositor
 	optdepends = openfx-io: Readers/Writers plugins
 	optdepends = openfx-misc: Miscellaneous OpenFX plugins
 	conflicts = natron-compositor-git
-	source = Natron-2.4.1.tar.gz::https://github.com/NatronGitHub/Natron/archive/refs/tags/v2.4.1.tar.gz
-	source = openfx-Natron-2.4.1.tar.gz::https://github.com/NatronGitHub/openfx/archive/refs/tags/Natron-2.4.1.tar.gz
+	source = Natron-2.4.2.tar.gz::https://github.com/NatronGitHub/Natron/archive/refs/tags/v2.4.2.tar.gz
+	source = openfx-Natron-2.4.2.tar.gz::https://github.com/NatronGitHub/openfx/archive/refs/tags/Natron-2.4.2.tar.gz
 	source = OpenColorIO-Configs-Natron-v2.4.tar.gz::https://github.com/NatronGitHub/OpenColorIO-Configs/archive/refs/tags/Natron-v2.4.tar.gz
 	source = google-breakpad-9474c3f7f9939391f281d46c42bfe20cc0f0abd9.tar.gz::https://github.com/NatronGitHub/google-breakpad/archive/9474c3f7f9939391f281d46c42bfe20cc0f0abd9.tar.gz
 	source = google-mock-17945db42c0b42496b2f3c6530307979f2e2a5ce.tar.gz::https://github.com/NatronGitHub/google-mock/archive/17945db42c0b42496b2f3c6530307979f2e2a5ce.tar.gz
 	source = google-test-50d6fc317c843a2e40dbf08c2efd3f068801ae6d.tar.gz::https://github.com/NatronGitHub/google-test/archive/50d6fc317c843a2e40dbf08c2efd3f068801ae6d.tar.gz
 	source = SequenceParsing-103c528347ebb2dd0ff5d79b5cee24bbcf938ce0.tar.gz::https://github.com/NatronGitHub/SequenceParsing/archive/103c528347ebb2dd0ff5d79b5cee24bbcf938ce0.tar.gz
 	source = tinydir-64fb1d4376d7580aa1013fdbacddbbeba67bb085.tar.gz::https://github.com/NatronGitHub/tinydir/archive/64fb1d4376d7580aa1013fdbacddbbeba67bb085.tar.gz
-	source = config.pri
-	sha512sums = e0cb8a28a90b66201e5ab098561fbdfe131e49aa2034e08a928639eaab84d6e9b1ca60e7a987f89f2365d13d31516911ae696df6813f759f8d288ded95413dc0
-	sha512sums = 0559401414508bdf14a785d1d43aeb0e40744a54b18ed33f9fca7bd577713ecc1841c1d4dbf14b7ad8ca5e413c1511668d16ee57c166341ab9ac45b87f2295f5
+	sha512sums = e8382ea04d6fe7b4484d2405b6fef32f21cce37d6a4b50c89db4205b91a19490530008efe90c4373ff3e580d696f258c413e47873cad6a4840a3221ecc27096f
+	sha512sums = 624530af417821d759358ccfc45ba7ba10890fd115bbfef3e3fa61f486414fe61f39bfce8593f7ab84ee3d5ed3db05149d614f1407735fd8d6529894996103fa
 	sha512sums = 1e2c20a2ccc597aec8c69352f2b0533f75afcceda427247346b64752ce0de82631ab89f47ff182c326e12d3fce2efda8ee846d6768cb8cfcb27e3da6e2399e78
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = 48017b7b9cd1854064b9ddffecedef89a4d38070f9a7d2cd506aad481a8061c5cffe5e5c84fc9b0ac5216fc99e093481db367e91ce52cb2a8a66223c4209402a
 
 pkgname = natron-compositor
diff --git a/PKGBUILD b/PKGBUILD
index 5b700e0a49fe..f99b01e534b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _SequenceParsing_commit=103c528347ebb2dd0ff5d79b5cee24bbcf938ce0
 _tinydir_commit=64fb1d4376d7580aa1013fdbacddbbeba67bb085
 
 pkgname=natron-compositor
-pkgver=2.4.1
+pkgver=2.4.2
 pkgrel=1
 pkgdesc="Open source compositing software"
 arch=('x86_64')
@@ -36,17 +36,15 @@ source=("${_pkgname}.tar.gz::${_url}/${_pkgname%-*}/archive/refs/tags/v${pkgver}
         "google-mock-${_google_mock_commit}.tar.gz::${_url}/google-mock/archive/${_google_mock_commit}.tar.gz"
         "google-test-${_google_test_commit}.tar.gz::${_url}/google-test/archive/${_google_test_commit}.tar.gz"
         "SequenceParsing-${_SequenceParsing_commit}.tar.gz::${_url}/SequenceParsing/archive/${_SequenceParsing_commit}.tar.gz"
-        "tinydir-${_tinydir_commit}.tar.gz::${_url}/tinydir/archive/${_tinydir_commit}.tar.gz"
-        "config.pri")
-sha512sums=('e0cb8a28a90b66201e5ab098561fbdfe131e49aa2034e08a928639eaab84d6e9b1ca60e7a987f89f2365d13d31516911ae696df6813f759f8d288ded95413dc0'
-            '0559401414508bdf14a785d1d43aeb0e40744a54b18ed33f9fca7bd577713ecc1841c1d4dbf14b7ad8ca5e413c1511668d16ee57c166341ab9ac45b87f2295f5'
+	"tinydir-${_tinydir_commit}.tar.gz::${_url}/tinydir/archive/${_tinydir_commit}.tar.gz")
+sha512sums=('e8382ea04d6fe7b4484d2405b6fef32f21cce37d6a4b50c89db4205b91a19490530008efe90c4373ff3e580d696f258c413e47873cad6a4840a3221ecc27096f'
+            '624530af417821d759358ccfc45ba7ba10890fd115bbfef3e3fa61f486414fe61f39bfce8593f7ab84ee3d5ed3db05149d614f1407735fd8d6529894996103fa'
             '1e2c20a2ccc597aec8c69352f2b0533f75afcceda427247346b64752ce0de82631ab89f47ff182c326e12d3fce2efda8ee846d6768cb8cfcb27e3da6e2399e78'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
-            '48017b7b9cd1854064b9ddffecedef89a4d38070f9a7d2cd506aad481a8061c5cffe5e5c84fc9b0ac5216fc99e093481db367e91ce52cb2a8a66223c4209402a')
+	    'SKIP')
 
 prepare() {
   mv "OpenColorIO-Configs-Natron-v${pkgver%.*}/" \
@@ -66,8 +64,10 @@ prepare() {
   tar -xzf "openfx-${_pkgname}.tar.gz" --strip 1 \
       -C   "${_pkgname}/libs/OpenFX/"
 
-  mv "config.pri" \
-     "${_pkgname}/config.pri"
+#  mv "config.pri" \
+#     "${_pkgname}/config.pri"
+  mv "${_pkgname}/build-configs/arch-linux/config.pri" \
+     "${_pkgname}"
 }
 
 build() {
diff --git a/config.pri b/config.pri
deleted file mode 100644
index 5448ccb497ea..000000000000
--- a/config.pri
+++ /dev/null
@@ -1,20 +0,0 @@
-boost: LIBS += -lboost_serialization
-expat: LIBS += -lexpat
-expat: PKGCONFIG -= expat
-cairo {
-        PKGCONFIG += cairo
-        LIBS -=  $$system(pkg-config --variable=libdir cairo)/libcairo.a
-}
-pyside {
-        PKGCONFIG -= pyside
-        INCLUDEPATH += $$system(pkg-config --variable=includedir pyside-py2)
-        INCLUDEPATH += $$system(pkg-config --variable=includedir pyside-py2)/QtCore
-        INCLUDEPATH += $$system(pkg-config --variable=includedir pyside-py2)/QtGui
-        INCLUDEPATH += $$system(pkg-config --variable=includedir QtGui)
-        LIBS += -lpyside-python2.7
-}
-shiboken {
-        PKGCONFIG -= shiboken
-        INCLUDEPATH += $$system(pkg-config --variable=includedir shiboken-py2)
-        LIBS += -lshiboken-python2.7
-}