Add patch to allow building with vala>=0.44.0

3 files changed, 66 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4369457374ce..9df3d2bea7d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pamac-classic
 	pkgdesc = A Gtk3 frontend for libalpm - classic version
 	pkgver = 6.7.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://git.cromer.cl/cromer/pamac-classic
 	install = pamac-classic.install
 	arch = x86_64
@@ -22,8 +22,10 @@ pkgbase = pamac-classic
 	provides = pamac-aur
 	conflicts = pamac
 	conflicts = pamac-aur
-	source = pamac-classic-6.7.0-2.tar.gz::https://git.cromer.cl/cromer/pamac-classic/archive/v6.7.0.tar.gz
+	source = pamac-classic-6.7.0-3.tar.gz::https://git.cromer.cl/cromer/pamac-classic/archive/v6.7.0.tar.gz
+	source = vala-0.44-fix.patch
 	sha256sums = 35639ef352d99f813dc54cf49cd9110a6a1e5852929ea2af0ab1333022c8ed4d
+	sha256sums = 80a81cf01402c7adbabc144d36b096ca64bc613f13f55a25270e00ce867d632a
 
 pkgname = pamac-classic
 
diff --git a/PKGBUILD b/PKGBUILD
index 49742b609fdf..dfdbf1638d61 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=pamac-classic
 pkgver=6.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A Gtk3 frontend for libalpm - classic version"
 arch=('x86_64')
 url="https://git.cromer.cl/cromer/pamac-classic"
@@ -16,13 +16,18 @@ conflicts=('pamac' 'pamac-aur')
 provides=('pamac' 'pamac-aur')
 install=pamac-classic.install
 
-source=("pamac-classic-$pkgver-$pkgrel.tar.gz::$url/archive/v$pkgver.tar.gz")
-sha256sums=('35639ef352d99f813dc54cf49cd9110a6a1e5852929ea2af0ab1333022c8ed4d')
+source=(
+	"pamac-classic-$pkgver-$pkgrel.tar.gz::$url/archive/v$pkgver.tar.gz"
+	"vala-0.44-fix.patch"
+	)
+sha256sums=('35639ef352d99f813dc54cf49cd9110a6a1e5852929ea2af0ab1333022c8ed4d'
+            '80a81cf01402c7adbabc144d36b096ca64bc613f13f55a25270e00ce867d632a')
 
-#prepare() {
-#  cd "${srcdir}/pamac-classic"
-#  # patches here
-#}
+prepare() {
+  cd "${srcdir}/pamac-classic"
+
+  patch --forward --strip=1 --input="${srcdir}/vala-0.44-fix.patch"
+}
 
 build() {
   cd "${srcdir}/pamac-classic"
diff --git a/vala-0.44-fix.patch b/vala-0.44-fix.patch
new file mode 100644
index 000000000000..11565fabcb50
--- /dev/null
+++ b/vala-0.44-fix.patch
@@ -0,0 +1,50 @@
+--- a/src/vapis/libalpm.vapi
++++ b/src/vapis/libalpm.vapi
+@@ -38,9 +38,9 @@
+	}
+	public int capabilities();
+
+-	public unowned Package? find_satisfier(Alpm.List<Package> pkgs, string depstring);
++	public unowned Package? find_satisfier(Alpm.List<unowned Package> pkgs, string depstring);
+
+-	public unowned Package? pkg_find(Alpm.List<Package> haystack, string needle);
++	public unowned Package? pkg_find(Alpm.List<unowned Package> haystack, string needle);
+
+	public int pkg_vercmp(string a, string b);
+
+@@ -48,7 +48,7 @@
+	 * If a member exists in several databases, only the first database is used.
+	 * IgnorePkg is also handled.
+	 */
+-	public Alpm.List<unowned Package?> find_group_pkgs(Alpm.List<DB> dbs, string name);
++	public Alpm.List<unowned Package?> find_group_pkgs(Alpm.List<unowned DB> dbs, string name);
+
+	/** Returns the string corresponding to an error number. */
+	public unowned string strerror(Errno err);
+@@ -252,7 +252,7 @@
+		public string? fetch_pkgurl(string url);
+
+		[CCode (cname = "alpm_find_dbs_satisfier")]
+-		public unowned Package? find_dbs_satisfier(Alpm.List<DB> dbs, string depstring);
++		public unowned Package? find_dbs_satisfier(Alpm.List<unowned DB> dbs, string depstring);
+
+		/** Returns the current error code from the handle. */
+		[CCode (cname = "alpm_errno")]
+@@ -380,7 +380,7 @@
+
+		public unowned Package? get_pkg(string name);
+		public unowned Group? get_group(string name);
+-		public Alpm.List<unowned Package> search(Alpm.List<string> needles);
++		public Alpm.List<unowned Package> search(Alpm.List<unowned string> needles);
+
+		public int check_pgp_signature(out SigList siglist);
+	}
+@@ -550,7 +550,7 @@
+		public Alpm.List<string> compute_optionalfor();
+
+		[CCode (cname = "alpm_sync_newversion")]
+-		public unowned Package? sync_newversion(Alpm.List<DB> dbs);
++		public unowned Package? sync_newversion(Alpm.List<unowned DB> dbs);
+
+		public int check_pgp_signature(out SigList siglist);
+	}
\ No newline at end of file