From d23e2a1d623b7672552b80d3e5c74e9f8ac788cd Mon Sep 17 00:00:00 2001 From: uglyside Date: Mon, 10 Feb 2025 09:13:49 +0300 Subject: [PATCH] xournal++-1.2.5 --- office/misc/xournalpp/actions.py | 17 +- .../files/xournalpp-1.1.3-gcc13.patch | 12 -- office/misc/xournalpp/pspec.xml | 193 +++++++++--------- 3 files changed, 110 insertions(+), 112 deletions(-) delete mode 100644 office/misc/xournalpp/files/xournalpp-1.1.3-gcc13.patch diff --git a/office/misc/xournalpp/actions.py b/office/misc/xournalpp/actions.py index 89b73ddbab..d478ef38de 100644 --- a/office/misc/xournalpp/actions.py +++ b/office/misc/xournalpp/actions.py @@ -4,16 +4,21 @@ # 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 cmaketools, pisitools, get +from pisi.actionsapi import cmaketools, mesontools, pisitools + +i = ''.join([ + ' -DCMAKE_INSTALL_PREFIX=/usr', + ' -DCMAKE_BUILD_TYPE=Release', + ' -Bbuild -G Ninja -L ' + ]) def setup(): - cmaketools.configure("-B_build -DCMAKE_BUILD_TYPE=Release") + cmaketools.configure(i) def build(): - cmaketools.make("-C _build") - cmaketools.make("-C _build translations") + mesontools.build() def install(): - cmaketools.install("-C _build install") + mesontools.install() - pisitools.dodoc("AUTHORS", "CHANGELOG.md") + pisitools.dodoc("AUTHORS", "copyright.txt", "LICENSE") diff --git a/office/misc/xournalpp/files/xournalpp-1.1.3-gcc13.patch b/office/misc/xournalpp/files/xournalpp-1.1.3-gcc13.patch deleted file mode 100644 index 97f7fbc0d7..0000000000 --- a/office/misc/xournalpp/files/xournalpp-1.1.3-gcc13.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/894720 -https://bugs.gentoo.org/895536 ---- a/src/view/background/BackgroundConfig.h -+++ b/src/view/background/BackgroundConfig.h -@@ -11,6 +11,7 @@ - - #pragma once - -+#include - #include - #include - diff --git a/office/misc/xournalpp/pspec.xml b/office/misc/xournalpp/pspec.xml index a58a43cf2a..ac59209b91 100644 --- a/office/misc/xournalpp/pspec.xml +++ b/office/misc/xournalpp/pspec.xml @@ -1,100 +1,105 @@ - - xournalpp - https://github.com/xournalpp/xournalpp - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:gui - office.misc - Xournal++ is a handwriting notetaking software with PDF annotation support. - - 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.3.tar.gz - - - git - cmake - lua-devel - gtk3-devel - util-linux - lsb-release - libzip-devel - libxml2-devel - librsvg-devel - portaudio-devel - libsndfile-devel - poppler-glib-devel - - - xournalpp-1.1.3-gcc13.patch - - + + xournalpp + https://github.com/xournalpp/xournalpp + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:gui + office.misc + Xournal++ is a handwriting notetaking software with PDF annotation support. + Xournal++ is a handwriting notetaking software with PDF annotation support. Written in C++ with GTK3. Supports pen input from devices such as Wacom Tablets. + https://github.com/xournalpp/xournalpp/archive/v1.2.5/xournalpp-1.2.5.tar.gz + + cmake + ninja + lua-devel + gtk3-devel + util-linux + lsb-release + libzip-devel + libxml2-devel + librsvg-devel + portaudio-devel + libsndfile-devel + poppler-glib-devel + gtksourceview4-devel + + + + + - - xournalpp - - lua - gtk3 - zlib - cairo - glib2 - libXi - pango - libX11 - libgcc - libzip - libxml2 - librsvg - portaudio - gdk-pixbuf - libsndfile - - - poppler-glib - - - /usr/bin - /usr/share - /usr/share/locale - /usr/share/doc - - + + xournalpp + + lua + gtk3 + zlib + cairo + glib2 + libXi + pango + libX11 + libgcc + libzip + libxml2 + librsvg + portaudio + gdk-pixbuf + libsndfile + + + poppler-glib + gtksourceview4 + + + /usr/bin + /usr/share + /usr/share/locale + /usr/share/doc + + - - - 2023-01-04 - 1.1.3 - Version bump. - fury - uglyside@yandex.ru - - - 2022-04-14 - 1.1.1 - Version bump. - fury - uglyside@yandex.ru - - - 2021-07-21 - 1.1.0 - Version bump. - fury - uglyside@yandex.ru - - - 2021-03-05 - 1.0.20 - First build - fury - uglyside@yandex.ru - - + + + 2025-02-10 + 1.2.5 + Version bump. + Kamil Atlı + suvari@pisilinux.org + + + 2023-01-04 + 1.1.3 + Version bump. + fury + uglyside@yandex.ru + + + 2022-04-14 + 1.1.1 + Version bump. + fury + uglyside@yandex.ru + + + 2021-07-21 + 1.1.0 + Version bump. + fury + uglyside@yandex.ru + + + 2021-03-05 + 1.0.20 + First build + fury + uglyside@yandex.ru + +