diff options
| author | Bart Ribbers <bribbers@disroot.org> | 2019-09-01 14:51:12 +0200 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-09-01 10:12:37 -0300 |
| commit | 122b741869a5e377ae8cae1a857414a923f81b2f (patch) | |
| tree | 8983e3c1e720688816d5c974dc2e13c692f8a533 | |
| parent | 5742d8d398f9b175edb9ed2c941669bb1fae6cb5 (diff) | |
| download | aports-122b741869a5e377ae8cae1a857414a923f81b2f.tar.bz2 aports-122b741869a5e377ae8cae1a857414a923f81b2f.tar.xz | |
testing/okular: remove need for patch
By defining the fact that we don't have GNU_SOURCE, the previously used patch is now unnecessary.
| -rw-r--r-- | testing/okular/APKBUILD | 12 | ||||
| -rw-r--r-- | testing/okular/musl-fixes.patch | 13 |
2 files changed, 6 insertions, 19 deletions
diff --git a/testing/okular/APKBUILD b/testing/okular/APKBUILD index ae8f314547..67d4842399 100644 --- a/testing/okular/APKBUILD +++ b/testing/okular/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=okular pkgver=19.08.0 -pkgrel=0 +pkgrel=1 arch="all" url="https://kde.org/applications/office/org.kde.okular" pkgdesc="A universal document viewer" @@ -14,8 +14,7 @@ makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtspeech-dev karchive-dev kactivities-dev phonon-dev purpose-dev zlib-dev poppler-qt5-dev kirigami2-dev qca-dev kpty-dev" checkdepends="xvfb-run" -source="https://download.kde.org/stable/applications/$pkgver/src/okular-$pkgver.tar.xz - musl-fixes.patch" +source="https://download.kde.org/stable/applications/$pkgver/src/okular-$pkgver.tar.xz" subpackages="$pkgname-doc $pkgname-lang $pkgname-mobile" build() { @@ -23,7 +22,9 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_OKULARKIRIGAMI=ON + -DBUILD_OKULARKIRIGAMI=ON \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS -D_GNU_SOURCE" make } @@ -46,5 +47,4 @@ mobile() { mv "$pkgdir"/usr/share/applications/org.kde.mobile.okular_plucker.desktop "$subpkgdir"/usr/share/applications/ } -sha512sums="5abebfa223085c6e89e9e1fbb34f340c6888dfdb0415873d86dd5f7e64a3002cb6ba5a859c95eb1e68fe24b3aa29be49ad333acc4811e9360b3ebaa8f79e6934 okular-19.08.0.tar.xz -41245d4e13603d82047ef8222f212d7f0ac72de4415a8c6409e537249da52a5669e1f3d64b99db376fe384b36abfa6362ccf5686a4f0558837b7b5a8f61530b9 musl-fixes.patch" +sha512sums="5abebfa223085c6e89e9e1fbb34f340c6888dfdb0415873d86dd5f7e64a3002cb6ba5a859c95eb1e68fe24b3aa29be49ad333acc4811e9360b3ebaa8f79e6934 okular-19.08.0.tar.xz" diff --git a/testing/okular/musl-fixes.patch b/testing/okular/musl-fixes.patch deleted file mode 100644 index fdc630e62c..0000000000 --- a/testing/okular/musl-fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/core/synctex/synctex_parser.c b/core/synctex/synctex_parser.c -index 4c1923b9a..de6c92d24 100644 ---- a/core/synctex/synctex_parser.c -+++ b/core/synctex/synctex_parser.c -@@ -8199,7 +8199,7 @@ static int _synctex_updater_print_gz(synctex_updater_p updater, const char * for - char * buffer; - va_list va; - va_start(va, format); -- if (vasprintf(&buffer, format, va) < 0) { -+ if (vsprintf(&buffer, format, va) < 0) { - _synctex_error("Out of memory..."); - } else if ((result = (int)strlen(buffer))) { - result = gzwrite(updater->file.as_gzFile, buffer, (unsigned)result); |