Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 8E675781A5A for ; Sun, 1 Sep 2019 12:51:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 44B7F24E3B for ; Sun, 1 Sep 2019 14:51:16 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id H3ka7SPoD9cZ; Sun, 1 Sep 2019 14:51:14 +0200 (CEST) From: Bart Ribbers DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1567342274; bh=jeJ/KGUWzdu2m5ggWp/ABBa2HjeY188dbTwub4AJx20=; h=From:To:Cc:Subject:Date; b=Ajyd+G33c1/trj6ibPpDGb4C+c8t8B8iVXd3PqLc+dqsEm11aS0dISedBoqzJ8Lmy k9uQ/KzJry+2yb+FmaZ9lI3ee1YULpV/kXTBkFtEshPLU+M19TzX7rZF/C5BVCP5mE JCKVlybjv6WoQnYp/bspcT9HTGuDeyXm1t0lsTxme6Hq4u2fwLLl8KmJzIAm5og+73 mzjzU6jdK5NSGvxY4hUPJ4vCixCMVbCMJMKwBRiKkkpJVF/YA9mIF8TciPJVM4/j9z fDdpnN+T5JBrcLm3wBYPHfOEXVUKIMRjrG8H6nrajykKsOmD4ABm8ck4J+TZILrqCw p6pIGXVaYfvHA== To: alpine-aports@lists.alpinelinux.org Cc: Bart Ribbers Subject: [PATCH] testing/okular: remove need for patch Date: Sun, 1 Sep 2019 14:51:12 +0200 Message-Id: <20190901125112.15976-1-bribbers@disroot.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit By defining the fact that we don't have GNU_SOURCE, the previously used patch is now unnecessary. --- testing/okular/APKBUILD | 12 ++++++------ testing/okular/musl-fixes.patch | 13 ------------- 2 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 testing/okular/musl-fixes.patch 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 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); -- 2.23.0