diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-10-13 18:38:33 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-10-15 02:29:04 -0300 |
| commit | 8a0c747bc8fa0bea8293c5a94951e54eda6e38b1 (patch) | |
| tree | 6e8e80ba162826752f8a7dffcc3393ccef5a7634 | |
| parent | 082b96a874b57d15ec6fd2fd2d8efa4f9d5ea647 (diff) | |
| download | aports-8a0c747bc8fa0bea8293c5a94951e54eda6e38b1.tar.bz2 aports-8a0c747bc8fa0bea8293c5a94951e54eda6e38b1.tar.xz | |
testing/xournalpp: upgrade to 1.0.14
| -rw-r--r-- | testing/xournalpp/APKBUILD | 8 | ||||
| -rw-r--r-- | testing/xournalpp/link-execinfo.patch | 24 |
2 files changed, 3 insertions, 29 deletions
diff --git a/testing/xournalpp/APKBUILD b/testing/xournalpp/APKBUILD index eb5aae0519..39fa260014 100644 --- a/testing/xournalpp/APKBUILD +++ b/testing/xournalpp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=xournalpp -pkgver=1.0.12 +pkgver=1.0.14 pkgrel=0 pkgdesc="Xournal++ is a handwriting notetaking software with PDF annotation support" url="https://github.com/xournalpp/xournalpp" @@ -12,8 +12,7 @@ makedepends="cmake libx11-dev libxi-dev glib-dev gtk+3.0-dev libxml2-dev libexecinfo-dev" options="!check" # no tests subpackages="$pkgname-lang $pkgname-dbg" -source="xournalpp-$pkgver.tar.gz::https://github.com/xournalpp/xournalpp/archive/$pkgver.tar.gz - link-execinfo.patch" +source="xournalpp-$pkgver.tar.gz::https://github.com/xournalpp/xournalpp/archive/$pkgver.tar.gz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,5 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6831da57c715bf70676fdd515f55475c72fb7b2e418157c2d110383bd7a5f37db1961b1b87b2af3a62f0d46f99310d499c113f3480025c6fa47ecec8a3153112 xournalpp-1.0.12.tar.gz -7c5dbf566bc1c04b705bff07b406a2403e1ab79af774390247edc75a8fa23049e05a647b609fe3e08d17869ebe6848f3638cf9e33d6bda9e43cbb14a0e02f478 link-execinfo.patch" +sha512sums="3e747660b9865c01b407bc1b0f97700710785c51dd0ee37b5f1f1b2b18a7b4432a51c66f37c8030a38f6bcc5fb6692feb2b684365856f5515d7c92de506fc441 xournalpp-1.0.14.tar.gz" diff --git a/testing/xournalpp/link-execinfo.patch b/testing/xournalpp/link-execinfo.patch deleted file mode 100644 index cf86d291bf..0000000000 --- a/testing/xournalpp/link-execinfo.patch +++ /dev/null @@ -1,24 +0,0 @@ -# https://github.com/xournalpp/xournalpp/pull/1466 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 51532a45..ff475f28 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -54,12 +54,14 @@ if (WIN32) - endif () - - ## For touch workaround, may need to be disabled for a Wayland Build --if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") -+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") - set (xournalpp_LDFLAGS ${xournalpp_LDFLAGS} "-lX11 -lXi") --elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") -- set (xournalpp_LDFLAGS ${xournalpp_LDFLAGS} "-lX11 -lXi -lexecinfo") - endif () - -+find_package(Backtrace REQUIRED) -+include_directories(${Backtrace_INCLUDE_DIRS}) -+set (xournalpp_LDFLAGS ${xournalpp_LDFLAGS} "${Backtrace_LIBRARIES}") -+ - ## Libraries ## - - macro (add_includes_ldflags LDFLAGS INCLUDES) |