Merge pull request #11070 from 4fury-c3440d8/b1

zathura, xournal++.

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, pisitools, get
-from pisi.actionsapi import cmaketools
-from pisi.actionsapi import pisitools
-from pisi.actionsapi import 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("-C _build")
-	cmaketools.make()
+	cmaketools.make("-C _build translations")
-	cmaketools.make("translations")
 
 def install():
-	shelltools.cd("_build")
+	cmaketools.install("-C _build install")
-	cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
-
-	pisitools.dodoc("../AUTHORS", "../CHANGELOG.md", "../LICENSE", "../README.md")
 
+	pisitools.dodoc("AUTHORS", "CHANGELOG.md")

office/misc/xournalpp/pspec.xml

@@ -15,8 +15,8 @@
 		<Description>
 			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.
 		</Description>
-		<Archive sha1sum="47d191fcd96202f6a331176f5b9a022761aa04a2" type="targz">
+		<Archive sha1sum="a0182f5fd4742d600849bf3d2aefc9c62d2a8538" type="targz">
-			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
 		</Archive>
 		<BuildDependencies>
 			<Dependency>git</Dependency>
@@ -65,6 +65,13 @@
 	</Package>
 
 	<History>
+		<Update release="4">
+			<Date>2022-11-28</Date>
+			<Version>1.1.3</Version>
+			<Comment>Version bump.</Comment>
+			<Name>fury</Name>
+			<Email>uglyside@yandex.ru</Email>
+		</Update>
 		<Update release="3">
 			<Date>2022-04-14</Date>
 			<Version>1.1.1</Version>
@@ -88,4 +95,3 @@
 		</Update>
 	</History>
 </PISI>
-

office/misc/zathura-djvu/pspec.xml

@@ -38,7 +38,7 @@
 
 	<History>
 		<Update release="1">
-			<Date>2022-06-11</Date>
+			<Date>2022-11-28</Date>
 			<Version>0.2.9</Version>
 			<Comment>First build.</Comment>
 			<Name>fury</Name>

office/misc/zathura-pdf-poppler/pspec.xml

@@ -13,8 +13,8 @@
 		<PartOf>office.misc</PartOf>
 		<Summary>PDF support (poppler backend) for zathura.</Summary>
 		<Description>The zathura-pdf-poppler plugin adds PDF support to zathura by using the poppler rendering library.</Description>
-		<Archive sha1sum="fa2b953f4f1dbeef1c4af9079710f0ee058a6a5e" type="tarbz2">
+		<Archive sha1sum="8d501be7fa4e990d85b35ded1c554683a5c46860" type="tarxz">
-			https://git.pwmt.org/pwmt/zathura-pdf-poppler/-/archive/0.3.0/zathura-pdf-poppler-0.3.0.tar.bz2
+			https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-0.3.1.tar.xz
 		</Archive>
 		<BuildDependencies>
 			<Dependency>meson</Dependency>
@@ -37,6 +37,13 @@
 	</Package>
 
 	<History>
+		<Update release="2">
+			<Date>2022-11-28</Date>
+			<Version>0.3.1</Version>
+			<Comment>Version bump.</Comment>
+			<Name>fury</Name>
+			<Email>uglyside@yandex.ru</Email>
+		</Update>
 		<Update release="1">
 			<Date>2022-06-11</Date>
 			<Version>0.3.0</Version>

office/misc/zathura/pspec.xml

@@ -13,8 +13,8 @@
 		<PartOf>office.misc</PartOf>
 		<Summary>A document viewer.</Summary>
 		<Description>zathura is a highly customizable and functional document viewer. It provides a minimalistic and space saving interface as well as an easy usage that mainly focuses on keyboard interaction.</Description>
-		<Archive sha1sum="81f7ff0b580efb590d5584b2a1f44b5e42b22100" type="tarxz">
+		<Archive sha1sum="b04193409b44f6d3001fe004629cc446d1cb281d" type="tarxz">
-			https://pwmt.org/projects/zathura/download/zathura-0.5.1.tar.xz
+			https://pwmt.org/projects/zathura/download/zathura-0.5.2.tar.xz
 		</Archive>
 		<BuildDependencies>
 			<Dependency>git</Dependency>
@@ -73,6 +73,13 @@
 	</Package>
 
 	<History>
+		<Update release="3">
+			<Date>2022-11-28</Date>
+			<Version>0.5.2</Version>
+			<Comment>Version bump.</Comment>
+			<Name>fury</Name>
+			<Email>uglyside@yandex.ru</Email>
+		</Update>
 		<Update release="2">
 			<Date>2022-09-24</Date>
 			<Version>0.5.1</Version>