diff --git a/office/misc/xournalpp/actions.py b/office/misc/xournalpp/actions.py index 9a02c5f5ad..89b73ddbab 100644 --- a/office/misc/xournalpp/actions.py +++ b/office/misc/xournalpp/actions.py @@ -4,25 +4,16 @@ # Licensed under the GNU General Public License, version 3. # See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import shelltools -from pisi.actionsapi import cmaketools -from pisi.actionsapi import pisitools -from pisi.actionsapi import get +from pisi.actionsapi import cmaketools, pisitools, get def setup(): -# shelltools.export("CFLAGS", "-lpthread") - pisitools.cxxflags.add("-Wno-unused-result -Wno-deprecated-declarations") - cmaketools.configure("-B_build -DCMAKE_BUILD_TYPE=Release") def build(): - shelltools.cd("_build") - cmaketools.make() - cmaketools.make("translations") + cmaketools.make("-C _build") + cmaketools.make("-C _build translations") def install(): - shelltools.cd("_build") - cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) - - pisitools.dodoc("../AUTHORS", "../CHANGELOG.md", "../LICENSE", "../README.md") + cmaketools.install("-C _build install") + pisitools.dodoc("AUTHORS", "CHANGELOG.md") diff --git a/office/misc/xournalpp/pspec.xml b/office/misc/xournalpp/pspec.xml index de80305e5a..d33e435bd1 100644 --- a/office/misc/xournalpp/pspec.xml +++ b/office/misc/xournalpp/pspec.xml @@ -15,8 +15,8 @@ Xournal++ is a handwriting notetaking software with PDF annotation support. Written in C++ with GTK3, supporting Linux, macOS and Windows 10. Supports pen input from devices such as Wacom Tablets. - - https://github.com/xournalpp/xournalpp/archive/refs/tags/v1.1.1.tar.gz + + https://github.com/xournalpp/xournalpp/archive/refs/tags/v1.1.3.tar.gz git @@ -65,6 +65,13 @@ + + 2022-11-28 + 1.1.3 + Version bump. + fury + uglyside@yandex.ru + 2022-04-14 1.1.1 @@ -88,4 +95,3 @@ -