diff options
| author | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
|---|---|---|
| committer | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
| commit | 9297468fa579836e3a6a381b798feb6b78217c2d (patch) | |
| tree | 53168212f427afbcf0693b534530a4af803152e9 /user/alkimia | |
| parent | a63cc05c53a6f4c22422dc8c69808b14d87a6f6e (diff) | |
| parent | da5a69b65a8791fffa6e93366ee585f87eff136d (diff) | |
| download | packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.gz packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.bz2 packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.xz packages-9297468fa579836e3a6a381b798feb6b78217c2d.zip | |
Merge branch 'master' into zfs
Diffstat (limited to 'user/alkimia')
| -rw-r--r-- | user/alkimia/APKBUILD | 9 | ||||
| -rw-r--r-- | user/alkimia/webkit.patch | 32 |
2 files changed, 38 insertions, 3 deletions
diff --git a/user/alkimia/APKBUILD b/user/alkimia/APKBUILD index b864f1105..fa4d4c35d 100644 --- a/user/alkimia/APKBUILD +++ b/user/alkimia/APKBUILD @@ -14,7 +14,9 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qtwebkit-dev kconfig-dev kcoreaddons-dev kdelibs4support-dev knewstuff-dev kpackage-dev plasma-framework-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/alkimia/$pkgver/alkimia-$pkgver.tar.xz" +source="https://download.kde.org/stable/alkimia/$pkgver/alkimia-$pkgver.tar.xz + webkit.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -27,7 +29,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -39,4 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5c0c121cac121f68042208ea9b126e4916ee4fa11f41d99709fbf11c44f433ec5eb0c0e112a4e6dc9ccfbc8a5295729cee566783f089bbe9ec2b32b5084839a6 alkimia-8.0.2.tar.xz" +sha512sums="5c0c121cac121f68042208ea9b126e4916ee4fa11f41d99709fbf11c44f433ec5eb0c0e112a4e6dc9ccfbc8a5295729cee566783f089bbe9ec2b32b5084839a6 alkimia-8.0.2.tar.xz +0a9db2efedb01bcd31a3d15890b00f2186d4ff1fc37426f09bd659ae757afca15f996a52f4b6cc64b6b8dfd7010683bbb6e72c8e89a3332b37f4c85828e2de76 webkit.patch" diff --git a/user/alkimia/webkit.patch b/user/alkimia/webkit.patch new file mode 100644 index 000000000..224ac2e8b --- /dev/null +++ b/user/alkimia/webkit.patch @@ -0,0 +1,32 @@ +--- alkimia-8.0.2/src/CMakeLists.txt.old 2019-09-06 16:21:26.219957302 +0000 ++++ alkimia-8.0.2/src/CMakeLists.txt 2020-01-14 09:56:58.676667188 +0000 +@@ -115,7 +115,6 @@ + alkimia-internal + ${QT_USE_LIBSPREFIX}Core + ${ALKIMIA_LIBS} +- ${QT_USE_LIBSPREFIX}WebKit + ${QT_USE_LIBSPREFIX}DBus + PUBLIC + ${MP_LIBRARIES} +--- alkimia-8.0.2/autotests/CMakeLists.txt.old 2019-09-06 16:21:26.211957302 +0000 ++++ alkimia-8.0.2/autotests/CMakeLists.txt 2020-01-14 09:57:05.305955497 +0000 +@@ -5,7 +5,7 @@ + ${QT_USE_LIBSPREFIX}Test + ${QT_USE_LIBSPREFIX}Core + ${QT_USE_LIBSPREFIX}DBus +- ${QT_USE_LIBSPREFIX}WebKit ++ ${QT_USE_LIBSPREFIX}WebKitWidgets + ${MP_LIBRARIES} + ) + +--- alkimia-8.0.2/tests/CMakeLists.txt.old 2019-09-06 16:21:26.219957302 +0000 ++++ alkimia-8.0.2/tests/CMakeLists.txt 2020-01-14 09:57:10.785367251 +0000 +@@ -3,7 +3,7 @@ + alkimia + alkimia-internal + ${QT_USE_LIBSPREFIX}Core +- ${QT_USE_LIBSPREFIX}WebKit ++ ${QT_USE_LIBSPREFIX}WebKitWidgets + ) + + if(BUILD_QT4) |