Merge pull request #10324 from suvari/master

psutils: version bump to 2.09

hardware/printer/psutils/pspec.xml

@@ -1,9 +1,9 @@
 <?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>psutils</Name>
-        <Homepage>http://www.cups.org/</Homepage>
+        <Homepage>https://github.com/rrthomas/psutils</Homepage>
         <Packager>
             <Name>Blue Devil</Name>
             <Email>bluedevil@sctzine.com</Email>
@@ -13,7 +13,7 @@
         <IsA>app:console</IsA>
         <Summary>PostScript Utilities</Summary>
         <Description>psutils contains tools to convert to/from postscript files.</Description>
-        <Archive sha1sum="2aac271b7aa34251ec59c20e0ccf410f559c4eb0" type="targz">https://github.com/rrthomas/psutils/archive/v2.03.tar.gz</Archive>
+        <Archive sha1sum="e748240d8c1ca5656174c07fc2986f48a96e65f6" type="targz">https://github.com/rrthomas/psutils/archive/refs/tags/v2.09.tar.gz</Archive>
         <!--
         Pisi cannot download so i manually add file
         <Archive sha1sum="972c06c6088097b3b2ec73401deb521ba057b249" type="targz">http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=snapshot;h=d279bc6d9f9323e19ad8c32b6d12ff96dfb0f5ba;sf=tgz</Archive>
@@ -22,6 +22,7 @@
             <AdditionalFile target="../gnulib-d279bc6.tar.gz" permission="0644">gnulib-d279bc6.tar.gz</AdditionalFile>
         </AdditionalFiles>
         <BuildDependencies>
+            <Dependency>paper</Dependency>
             <Dependency>help2man</Dependency>
             <Dependency>ghostscript-devel</Dependency>
         </BuildDependencies>
@@ -44,6 +45,13 @@
     </Package>
 
     <History>
+        <Update release="2">
+            <Date>2022-05-28</Date>
+            <Version>2.09</Version>
+            <Comment>Version bump</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
+        </Update>
         <Update release="1">
             <Date>2020-06-03</Date>
             <Version>2.03</Version>

hardware/printer/system-config-printer/files/autoconf-2-70.diff

@@ -0,0 +1,10 @@
+--- system-config-printer-1.5.14/configure.ac	2021-01-06 09:03:08.000000000 +0100
++++ system-config-printer-1.5.14/configure.ac.new	2021-01-06 10:38:51.997694866 +0100
+@@ -3,6 +3,7 @@
+ AM_INIT_AUTOMAKE([dist-xz dist-bzip2 subdir-objects 1.6])
+ IT_PROG_INTLTOOL
+ AM_GNU_GETTEXT([external])
++AM_GNU_GETTEXT_VERSION(0.21)
+ AM_PATH_PYTHON([3])
+ PACKAGE="AC_PACKAGE_NAME"
+ VERSION="AC_PACKAGE_VERSION"

hardware/printer/system-config-printer/pspec.xml

@@ -1,9 +1,9 @@
 <?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>system-config-printer</Name>
-        <Homepage>http://cyberelk.net/tim/software/system-config-printer</Homepage>
+        <Homepage>https://github.com/OpenPrinting/system-config-printer</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -17,29 +17,25 @@
             <AdditionalFile target="po/tr.po">tr.po</AdditionalFile>
         </AdditionalFiles>
         <BuildDependencies>
+            <Dependency>xmlto</Dependency>
             <Dependency>gtk3-devel</Dependency>
             <Dependency>util-linux</Dependency>
-            <Dependency>xmlto</Dependency>
-            <Dependency>libxslt-devel</Dependency>
-            <Dependency>intltool</Dependency>
-            <Dependency>python3-devel</Dependency>
             <Dependency>cups-devel</Dependency>
             <Dependency>eudev-devel</Dependency>
             <Dependency>glib2-devel</Dependency>
             <Dependency>libusb-devel</Dependency>
             <Dependency>gettext-devel</Dependency>
-            <Dependency>desktop-file-utils</Dependency>
+            <Dependency>python3-devel</Dependency>
+            <Dependency>libxslt-devel</Dependency>
+            <Dependency>libsecret-devel</Dependency>
             <Dependency>dbus-glib-devel</Dependency>
             <Dependency>autoconf-archive</Dependency>
+            <Dependency>desktop-file-utils</Dependency>
         </BuildDependencies>
         <Patches>
+            <Patch>autoconf-2-70.diff</Patch>
             <!-- Replace emblem-default by dialog-ok -->
-            <Patch level="1">fix-icon.patch</Patch>
+            <Patch>fix-icon.patch</Patch>
-            <!--make it actually work without libgnome-keyring -->
-<!--             <Patch>pass_libgnome_keyring_missing.diff</Patch> -->
-            
-<!--             <Patch>system-config-printer-1.5.12-check-for-null.patch</Patch> -->
-<!--             <Patch>system-config-printer-1.5.12-fix-abrt-in-udev-configure-printer.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -50,12 +46,12 @@
             <Dependency>glib2</Dependency>
             <Dependency>libusb</Dependency>
             <Dependency>libsecret</Dependency>
-            <Dependency>libgnome-keyring</Dependency>
             <Dependency>python3-cups</Dependency>
-            <Dependency>python3-pysmbc</Dependency>
             <Dependency>dbus-python3</Dependency>
-            <Dependency>python3-pygobject3</Dependency>
+            <Dependency>python3-pysmbc</Dependency>
             <Dependency>python3-requests</Dependency>
+            <Dependency>libgnome-keyring</Dependency>
+            <Dependency>python3-pygobject3</Dependency>
             <Dependency>cups</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -108,9 +104,9 @@
 
     <History>
         <Update release="15">
-            <Date>2022-03-18</Date>
+            <Date>2022-05-28</Date>
             <Version>1.5.16</Version>
-            <Comment>Version bump.</Comment>
+            <Comment>Version bump</Comment>
             <Name>Mustafa Cinasal</Name>
             <Email>muscnsl@gmail.com</Email>
         </Update>