New version

4 files changed, 203 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e41f3c327fbf..9b0959e688b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = alpm_octopi_utils-dev
 	pkgdesc = Alpm utils for Octopi
 	pkgver = 1.0.2
-	pkgrel = 3
+	pkgrel = 4
 	url = https://tintaescura.com/projects/octopi/
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = vala
 	depends = pacman-contrib
-	source = pacman6.patch
+	source = 0001-Added-pacman-6.0-support.patch
+	source = 0002-Fix-missing-out-statement-s.patch
 	source = https://github.com/aarnt/alpm_octopi_utils/archive/2bb9349507f8155155c9b5f12b1f30e60e157d30.tar.gz
-	sha256sums = 0e47e06688c075b62443d8af99d8d65e70e2f231f137c386465a1bf3f27487a3
+	sha256sums = edd4bdc1972fd6dbefae6539a18b938b483a43347500ffb9f7e2830530994e90
+	sha256sums = 23d5bcf70e3c200c041041487e50c3c404428b6a11ab1d3d434cf04f2efe3939
 	sha256sums = SKIP
 
 pkgname = alpm_octopi_utils-dev
diff --git a/0001-Added-pacman-6.0-support.patch b/0001-Added-pacman-6.0-support.patch
new file mode 100644
index 000000000000..ca7721bdb4be
--- /dev/null
+++ b/0001-Added-pacman-6.0-support.patch
@@ -0,0 +1,125 @@
+From 87de5068f5ad5b03b77c3e071e7f2213460a75f1 Mon Sep 17 00:00:00 2001
+From: Arnaud Dovi <mr.dovi@gmail.com>
+Date: Tue, 1 Jun 2021 15:00:24 +0200
+Subject: [PATCH 1/2] Added pacman 6.0 support.
+
+---
+ src/alpm_config.vala       | 14 +++++++-------
+ src/alpm_octopi_utils.vala |  9 ++++++---
+ vapi/libalpm.vapi          |  8 ++++----
+ 3 files changed, 17 insertions(+), 14 deletions(-)
+
+diff --git a/src/alpm_config.vala b/src/alpm_config.vala
+index f6b3ad6..84d56f7 100644
+--- a/src/alpm_config.vala
++++ b/src/alpm_config.vala
+@@ -49,7 +49,7 @@ class AlpmConfig {
+ 	public string? dbpath;
+ 	public string? logfile;
+ 	public string? gpgdir;
+-	public string? arch;
++	public Alpm.List<unowned string> architectures;
+ 	public int usesyslog;
+ 	public int checkspace;
+ 	public Alpm.List<unowned string> cachedirs;
+@@ -120,8 +120,8 @@ class AlpmConfig {
+ 			// rootdir is defined because it contains configuration data.
+ 			gpgdir = "/etc/pacman.d/gnupg/";
+ 		}
+-		if (arch == null) {
+-			arch = Posix.utsname().machine;
++		if (architectures.length () == 0) {
++			architectures.append (Posix.utsname().machine);
+ 		}
+ 	}
+ 
+@@ -135,7 +135,7 @@ class AlpmConfig {
+ 		// define options
+ 		handle.logfile = logfile;
+ 		handle.gpgdir = gpgdir;
+-		handle.arch = arch;
++		handle.architectures = architectures;
+ 		handle.usesyslog = usesyslog;
+ 		handle.checkspace = checkspace;
+ 		handle.defaultsiglevel = siglevel;
+@@ -160,7 +160,7 @@ class AlpmConfig {
+ 			repo.siglevel = merge_siglevel (siglevel, repo.siglevel, repo.siglevel_mask);
+ 			unowned Alpm.DB db = handle.register_syncdb (repo.name, repo.siglevel);
+ 			foreach (unowned string url in repo.urls) {
+-				db.add_server (url.replace ("$repo", repo.name).replace ("$arch", handle.arch));
++				db.add_server (url.replace ("$repo", repo.name).replace ("$arch", handle.architectures.nth(0).data));
+ 			}
+ 			if (repo.usage == 0) {
+ 				db.usage = Alpm.DB.Usage.ALL;
+@@ -231,9 +231,9 @@ class AlpmConfig {
+ 							logfile = val;
+ 						} else if (key == "Architecture") {
+ 							if (val == "auto") {
+-								arch = Posix.utsname ().machine;
++							  architectures.append (Posix.utsname().machine);
+ 							} else {
+-								arch = val;
++							  architectures.append (val);
+ 							}
+ 						} else if (key == "UseSysLog") {
+ 							usesyslog = 1;
+diff --git a/src/alpm_octopi_utils.vala b/src/alpm_octopi_utils.vala
+index 1160ec2..8e3429d 100644
+--- a/src/alpm_octopi_utils.vala
++++ b/src/alpm_octopi_utils.vala
+@@ -61,20 +61,23 @@ public class AlpmUtils {
+ 
+ 	public Alpm.List<unowned Alpm.Package> search_all_dbs (string search_string) {
+ 		Alpm.List<unowned Alpm.Package> syncpkgs = null;
++		Alpm.List<unowned Alpm.Package> results = null;
++		Alpm.List<unowned Alpm.Package> ret = null;
+ 		Alpm.List<unowned string> needles = null;
+ 		string[] splitted = search_string.split (" ");
+ 		foreach (unowned string part in splitted) {
+ 			needles.append (part);
+ 		}
+-		Alpm.List<unowned Alpm.Package> results = alpm_handle.localdb.search (needles);
++		alpm_handle.localdb.search (needles, results);
+ 		unowned Alpm.List<unowned Alpm.DB> list = alpm_handle.syncdbs;
+ 		while (list != null) {
+ 			unowned Alpm.DB db = list.data;
+ 			if (syncpkgs.length () == 0) {
+-				syncpkgs = db.search (needles);
++				 db.search (needles, syncpkgs);
+ 			} else {
+ 				//syncpkgs.join (db.search (needles).diff (syncpkgs, (Alpm.List.CompareFunc) alpm_pkg_compare_name));
+-				syncpkgs.join (db.search (needles));
++				db.search (needles, ret);
++				syncpkgs.join (ret.copy());
+ 			}
+ 			list = list.next;
+ 		}
+diff --git a/vapi/libalpm.vapi b/vapi/libalpm.vapi
+index 35abf77..19c5915 100644
+--- a/vapi/libalpm.vapi
++++ b/vapi/libalpm.vapi
+@@ -64,9 +64,9 @@ namespace Alpm {
+ 		public unowned string dbpath {
+ 			[CCode (cname = "alpm_option_get_dbpath")] get;
+ 		}
+-		public unowned string arch {
+-			[CCode (cname = "alpm_option_get_arch")] get;
+-			[CCode (cname = "alpm_option_set_arch")] set;
++		public unowned Alpm.List<unowned string?> architectures {
++			[CCode (cname = "alpm_option_get_architectures")] get;
++			[CCode (cname = "alpm_option_set_architectures")] set;
+ 		}
+ 		public unowned Alpm.List<unowned string?> cachedirs {
+ 			[CCode (cname = "alpm_option_get_cachedirs")] get;
+@@ -362,7 +362,7 @@ namespace Alpm {
+ 
+ 		public unowned Package? get_pkg(string name);
+ 		public unowned Group? get_group(string name);
+-		public Alpm.List<unowned Package?> search(Alpm.List<unowned string> needles);
++		public int search(Alpm.List<unowned string> needles, Alpm.List<unowned Package?> ret);
+ 
+ 		public int check_pgp_signature(out SigList siglist);
+ 	}
+-- 
+2.31.1
+
diff --git a/0002-Fix-missing-out-statement-s.patch b/0002-Fix-missing-out-statement-s.patch
new file mode 100644
index 000000000000..10c6dcc388f2
--- /dev/null
+++ b/0002-Fix-missing-out-statement-s.patch
@@ -0,0 +1,66 @@
+From 789ba9acc52b7b0624fb08de9f4756b5d51c10f1 Mon Sep 17 00:00:00 2001
+From: Arnaud Dovi <mr.dovi@gmail.com>
+Date: Wed, 2 Jun 2021 22:30:11 +0200
+Subject: [PATCH 2/2] Fix missing out statement :s
+
+---
+ src/alpm_config.vala       | 4 ++--
+ src/alpm_octopi_utils.vala | 6 +++---
+ vapi/libalpm.vapi          | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/alpm_config.vala b/src/alpm_config.vala
+index 84d56f7..5625082 100644
+--- a/src/alpm_config.vala
++++ b/src/alpm_config.vala
+@@ -231,9 +231,9 @@ class AlpmConfig {
+ 							logfile = val;
+ 						} else if (key == "Architecture") {
+ 							if (val == "auto") {
+-							  architectures.append (Posix.utsname().machine);
++								architectures.append (Posix.utsname().machine);
+ 							} else {
+-							  architectures.append (val);
++								architectures.append (val);
+ 							}
+ 						} else if (key == "UseSysLog") {
+ 							usesyslog = 1;
+diff --git a/src/alpm_octopi_utils.vala b/src/alpm_octopi_utils.vala
+index 8e3429d..60b6f33 100644
+--- a/src/alpm_octopi_utils.vala
++++ b/src/alpm_octopi_utils.vala
+@@ -68,15 +68,15 @@ public class AlpmUtils {
+ 		foreach (unowned string part in splitted) {
+ 			needles.append (part);
+ 		}
+-		alpm_handle.localdb.search (needles, results);
++		alpm_handle.localdb.search (needles, out results);
+ 		unowned Alpm.List<unowned Alpm.DB> list = alpm_handle.syncdbs;
+ 		while (list != null) {
+ 			unowned Alpm.DB db = list.data;
+ 			if (syncpkgs.length () == 0) {
+-				 db.search (needles, syncpkgs);
++				db.search (needles, out syncpkgs);
+ 			} else {
+ 				//syncpkgs.join (db.search (needles).diff (syncpkgs, (Alpm.List.CompareFunc) alpm_pkg_compare_name));
+-				db.search (needles, ret);
++				db.search (needles, out ret);
+ 				syncpkgs.join (ret.copy());
+ 			}
+ 			list = list.next;
+diff --git a/vapi/libalpm.vapi b/vapi/libalpm.vapi
+index 19c5915..4e1d59b 100644
+--- a/vapi/libalpm.vapi
++++ b/vapi/libalpm.vapi
+@@ -362,7 +362,7 @@ namespace Alpm {
+ 
+ 		public unowned Package? get_pkg(string name);
+ 		public unowned Group? get_group(string name);
+-		public int search(Alpm.List<unowned string> needles, Alpm.List<unowned Package?> ret);
++		public int search(Alpm.List<unowned string> needles, out Alpm.List<unowned Package?> ret);
+ 
+ 		public int check_pgp_signature(out SigList siglist);
+ 	}
+-- 
+2.31.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 0ba36f8dc300..ac3dae93d7e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,22 +4,25 @@ pkgname=alpm_octopi_utils-dev
 pkgver=1.0.2
 _pkgrealbase=alpm_octopi_utils
 _commit=2bb9349507f8155155c9b5f12b1f30e60e157d30
-pkgrel=3
+pkgrel=4
 pkgdesc="Alpm utils for Octopi"
 url="https://tintaescura.com/projects/octopi/"
 arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('pacman-contrib')
 makedepends=('vala')
-source=("pacman6.patch"
+source=("0001-Added-pacman-6.0-support.patch"
+        "0002-Fix-missing-out-statement-s.patch"
         "https://github.com/aarnt/${_pkgrealbase}/archive/${_commit}.tar.gz")
-sha256sums=('0e47e06688c075b62443d8af99d8d65e70e2f231f137c386465a1bf3f27487a3'
+sha256sums=('edd4bdc1972fd6dbefae6539a18b938b483a43347500ffb9f7e2830530994e90'
+            '23d5bcf70e3c200c041041487e50c3c404428b6a11ab1d3d434cf04f2efe3939'
             'SKIP')
 
 prepare() {
     cd "${_pkgrealbase}-${_commit}"
     echo "Patching pacman 6"
-    patch --forward --strip=1 --input="${srcdir}/pacman6.patch"
+    patch --forward --strip=1 --input="${srcdir}/0001-Added-pacman-6.0-support.patch"
+    patch --forward --strip=1 --input="${srcdir}/0002-Fix-missing-out-statement-s.patch"
 }
 
 build() {