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

cairo rebuild.

desktop/toolkit/gtk/cairo/actions.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/licenses/gpl.txt
+# See the file https://www.gnu.org/licenses/gpl-3.0.txt
 
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import autotools

desktop/toolkit/gtk/cairo/files/cairo_script_interpreter_pkgconfig.patch

@@ -0,0 +1,20 @@
+From c087722141335eed606d090929aeeb61deb102fc Mon Sep 17 00:00:00 2001
+From: Pierre Labastie
+ <19004-pierre-labastie@users.noreply.gitlab.freedesktop.org>
+Date: Sat, 14 May 2022 16:56:17 +0000
+Subject: [PATCH] Update util/cairo-script/cairo-script-interpreter.pc.in
+
+---
+ util/cairo-script/cairo-script-interpreter.pc.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/util/cairo-script/cairo-script-interpreter.pc.in b/util/cairo-script/cairo-script-interpreter.pc.in
+index d773b1509..d89c387ca 100644
+--- a/util/cairo-script/cairo-script-interpreter.pc.in
++++ b/util/cairo-script/cairo-script-interpreter.pc.in
+@@ -1,4 +1,5 @@
+ prefix=@prefix@
++exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ 

desktop/toolkit/gtk/cairo/pspec.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>cairo</Name>
@@ -13,7 +13,6 @@
         <IsA>library</IsA>
         <Summary>2D graphics library with bindings of many programming languages</Summary>
         <Description>Cairo is a 2D graphics library with support for multiple output devices (and fileformats).</Description>
-<!--         <Archive sha1sum="ce1234bd120bb0c1679a75a5c3c76d0b2edcc88f" type="tarxz">http://anduin.linuxfromscratch.org/BLFS/cairo/cairo-1.17.2+f93fc72c03e.tar.xz</Archive> -->
         <Archive sha1sum="5e42be0361fca6e81b7f8502e150df6c23c2dd0c" type="tarxz">https://download.gnome.org/sources/cairo/1.17/cairo-1.17.6.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>lzo-devel</Dependency>
@@ -30,18 +29,19 @@
             <Dependency>xcb-util-devel</Dependency>
             <Dependency>libXext-devel</Dependency>
             <Dependency>libglvnd-devel</Dependency>
-            <!--<Dependency>gtk-doc</Dependency>-->
-            <!--Dependency>librsvg-devel</Dependency--><!--circle dep-->
-<!--             <Dependency>DirectFB-devel</Dependency> -->
+            <Dependency>gtk-doc</Dependency>
+            <!-- <Dependency>librsvg-devel</Dependency> --><!--circle dep-->
+            <!-- <Dependency>DirectFB-devel</Dependency> -->
             <Dependency>valgrind</Dependency>
-            <!--<Dependency>libspectre-devel</Dependency>
-	    <Dependency>poppler-devel</Dependency>-->
+            <!-- <Dependency>libspectre-devel</Dependency> -->
+            <!-- <Dependency>poppler-devel</Dependency> -->
         </BuildDependencies>
         <Patches>
             <!--Fedora patches-->
-<!--             <Patch level="1">0001-xlib-Don-t-crash-when-swapping-a-0-sized-glyph.patch</Patch> -->
-<!--             <Patch level="1">0002-xcb-Don-t-crash-when-swapping-a-0-sized-glyph.patch</Patch> -->
-<!-- 	    <Patch level="1">git_fixes.diff</Patch> -->
+            <!-- <Patch level="1">0001-xlib-Don-t-crash-when-swapping-a-0-sized-glyph.patch</Patch> -->
+            <!-- <Patch level="1">0002-xcb-Don-t-crash-when-swapping-a-0-sized-glyph.patch</Patch> -->
+            <!-- <Patch level="1">git_fixes.diff</Patch> -->
+            <Patch level="1">cairo_script_interpreter_pkgconfig.patch</Patch>
         </Patches>
     </Source>
 
@@ -85,7 +85,7 @@
             <Dependency>libXext-devel</Dependency>
             <Dependency>fontconfig-devel</Dependency>
             <Dependency>libXrender-devel</Dependency>
-			<Dependency>libglvnd-devel</Dependency>
+            <Dependency>libglvnd-devel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
@@ -111,11 +111,13 @@
             <Dependency>freetype-32bit</Dependency>
             <Dependency>fontconfig-32bit</Dependency>
             <Dependency>libXrender-32bit</Dependency>
-           <!-- <Dependency>libspectre-32bit</Dependency>
+            <!--
+            <Dependency>libspectre-32bit</Dependency>
             <Dependency>poppler-glib-32bit</Dependency>
             <Dependency>pango-32bit</Dependency>
-	    <Dependency>librsvg-32bit</Dependency>
-	    <Dependency>gdk-pixbuf-32bit</Dependency>-->
+            <Dependency>librsvg-32bit</Dependency>
+            <Dependency>gdk-pixbuf-32bit</Dependency>
+            -->
         </BuildDependencies>
         <RuntimeDependencies>
             <Dependency release="current">cairo</Dependency>
@@ -139,13 +141,13 @@
 
     <History>
         <Update release="13">
-            <Date>2022-05-31</Date>
+            <Date>2022-07-29</Date>
             <Version>1.17.6</Version>
             <Comment>Version bump.</Comment>
             <Name>Mustafa Cinasal</Name>
             <Email>muscnsl@gmail.com</Email>
         </Update>
-	    <Update release="12">
+        <Update release="12">
             <Date>2021-10-23</Date>
             <Version>1.17.4</Version>
             <Comment>Rebuild.</Comment>
@@ -166,7 +168,7 @@
             <Name>Mustafa Cinasal</Name>
             <Email>muscnsl@gmail.com</Email>
         </Update>
-		<Update release="9">
+        <Update release="9">
             <Date>2020-01-08</Date>
             <Version>1.17.2</Version>
             <Comment>version Bump.</Comment>