Merge pull request #9469 from 4fury-c3440d8/np

bump.

desktop/lookandfeel/adwaita-qt/pspec.xml

@@ -14,8 +14,8 @@
 		<PartOf>desktop.lookandfeel</PartOf>
 		<Summary>A style to bend Qt applications to look like they belong into GNOME Shell.</Summary>
 		<Description>A native style to bend Qt4 and Qt5 applications to look like they belong into GNOME Shell.</Description>
-		<Archive sha1sum="4077ad79fae1537674852135a95155b7dda0f258" type="targz">
+		<Archive sha1sum="3c6b41491bdaeeaa592f8060493714334a33d8e4" type="targz">
-			https://github.com/FedoraQt/adwaita-qt/archive/refs/tags/1.3.0.tar.gz
+			https://github.com/FedoraQt/adwaita-qt/archive/refs/tags/1.3.1.tar.gz
 		</Archive>
 		<BuildDependencies>
 			<Dependency>cmake</Dependency>
@@ -51,6 +51,13 @@
 	</Package>
 
 	<History>
+		<Update release="4">
+			<Date>2021-06-05</Date>
+			<Version>1.3.1</Version>
+			<Comment>Version bump.</Comment>
+			<Name>fury</Name>
+			<Email>wascheme@tuta.io</Email>
+		</Update>
 		<Update release="3">
 			<Date>2021-05-18</Date>
 			<Version>1.3.0</Version>

multimedia/graphics/inkscape/actions.py

@@ -9,21 +9,22 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import cmaketools
 from pisi.actionsapi import shelltools
 
-j = "-DWITH_DBUS=ON \
+j = ''.join([
-     -DBUILD_TESTING=OFF -L \
+    '-DWITH_DBUS=ON  ',
-     -DBUILD_SHARED_LIBS=ON \
+    '-DBUILD_TESTING=OFF -L ',
-     -DWITH_IMAGE_MAGICK=OFF \
+    '-DWITH_GSPELL=OFF ',
-     -DBUILD_STATIC_LIBS=OFF \
+    '-DBUILD_SHARED_LIBS=ON ',
-     -DCMAKE_INSTALL_LIBDIR=lib \
+    '-DWITH_IMAGE_MAGICK=OFF ',
-     -DCMAKE_BUILD_TYPE=Release \
+    '-DBUILD_STATIC_LIBS=OFF ',
-     -DCMAKE_INSTALL_PREFIX=/usr \
+    '-DCMAKE_INSTALL_LIBDIR=lib ',
-    "
+    '-DCYTHON_EXECUTABLE=/usr/bin/cython3 ',
-
+    '-DCMAKE_BUILD_TYPE=Release ',
-shelltools.export("PYTHON", "/usr/bin/python3")
+    '-DCMAKE_INSTALL_PREFIX=/usr '
+    ])
 
 def setup():
     # fix shebang
-    shelltools.system("find share/extensions -iname '*.py' -exec sed -i 's|env\ python$|env python3|g' {} \;")
+#    shelltools.system("find share/extensions -iname '*.py' -exec sed -i 's|env\ python$|env python3|g' {} \;")
     # if with imagemagick build.
 #    shelltools.export("PKG_CONFIG_PATH", "${PKG_CONFIG_PATH}:/usr/lib/imagemagick6/pkgconfig")
     shelltools.makedirs("build")

multimedia/graphics/inkscape/pspec.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>inkscape</Name>
@@ -14,10 +14,13 @@
         <IsA>app:gui</IsA>
         <Summary>SVG vector graphics application.</Summary>
         <Description>Inkscape is an application to create, edit, and convert SVG vector graphics images that can also import from and export to bitmap image files.</Description>
-        <Archive sha1sum="a190f3ec3bf24379ccac402490276361435c2732" type="tarbz2">
+        <Archive sha1sum="e61dc54dd15c79eeabc9cc04cc8ecaf15ead42b2" type="tarxz">
-            https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_1_0_2/inkscape-INKSCAPE_1_0_2.tar.bz2</Archive>
+            https://media.inkscape.org/dl/resources/file/inkscape-1.1.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>cmake</Dependency>
+            <Dependency>ragel</Dependency>
+            <Dependency>ccache</Dependency>
+            <Dependency>cython3</Dependency>
             <Dependency>potrace</Dependency>
             <Dependency>gc-devel</Dependency>
             <Dependency>intltool</Dependency>
@@ -30,6 +33,9 @@
             <Dependency>libXpm-devel</Dependency>
             <Dependency>libXres-devel</Dependency>
             <Dependency>libXtst-devel</Dependency>
+            <Dependency>ncurses-devel</Dependency>
+            <Dependency>xcb-util-devel</Dependency>
+            <Dependency>readline-devel</Dependency>
             <Dependency>libxkbfile-devel</Dependency>
             <!-- -->
             <Dependency>dbus-devel</Dependency>
@@ -48,6 +54,7 @@
             <Dependency>libsoup-devel</Dependency>
             <Dependency>python3-devel</Dependency>
             <Dependency>poppler-devel</Dependency>
+            <Dependency>poppler-utils</Dependency>
             <Dependency>libyaml-devel</Dependency>
             <Dependency>libvisio-devel</Dependency>
             <Dependency>libspiro-devel</Dependency>
@@ -80,6 +87,7 @@
             <Dependency>glib2</Dependency>
             <Dependency>lcms2</Dependency>
             <Dependency>pango</Dependency>
+            <Dependency>boost</Dependency>
             <Dependency>aspell</Dependency>
             <Dependency>glibmm</Dependency>
             <Dependency>gtkmm3</Dependency>
@@ -97,8 +105,10 @@
             <Dependency>libxslt</Dependency>
             <Dependency>pangomm</Dependency>
             <Dependency>poppler</Dependency>
+            <Dependency>readline</Dependency>
             <Dependency>freetype</Dependency>
             <Dependency>harfbuzz</Dependency>
+            <Dependency>lib2geom</Dependency>
             <Dependency>libvisio</Dependency>
             <Dependency>libspiro</Dependency>
             <Dependency>dbus-glib</Dependency>
@@ -114,7 +124,7 @@
             <Dependency>python3-scour</Dependency>
             <Dependency>libjpeg-turbo</Dependency>
             <Dependency>GraphicsMagick</Dependency>
-            <Dependency>double-conversion</Dependency>
+            <!-- <Dependency>double-conversion</Dependency> -->
         </RuntimeDependencies>
         <Files>
             <Path fileType="man">/usr/share/man</Path>
@@ -130,7 +140,40 @@
         </Files>
     </Package>
 
+    <Package>
+        <Name>lib2geom</Name>
+        <RuntimeDependencies>
+            <Dependency>gsl</Dependency>
+            <Dependency>glib2</Dependency>
+            <Dependency>cairo</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>double-conversion</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>lib2geom-devel</Name>
+        <RuntimeDependencies>
+            <Dependency release="current">lib2geom</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib/cmake</Path>
+            <Path fileType="library">/usr/lib/pkgconfig</Path>
+            <Path fileType="headers">/usr/include</Path>
+        </Files>
+    </Package>
+
     <History>
+        <Update release="11">
+            <Date>2021-06-05</Date>
+            <Version>1.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>fury</Name>
+            <Email>wascheme@tuta.io</Email>
+        </Update>
         <Update release="10">
             <Date>2021-03-20</Date>
             <Version>1.0.2</Version>