summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD21
-rw-r--r--pamacclassic-6.0.gir23
-rw-r--r--vala-0.44-fix.patch50
4 files changed, 40 insertions, 67 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9df3d2bea7d8..43b9c72aaaf9 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 = 3
+ pkgver = 6.7.2
+ pkgrel = 1
url = https://git.cromer.cl/cromer/pamac-classic
install = pamac-classic.install
arch = x86_64
@@ -9,6 +9,7 @@ pkgbase = pamac-classic
makedepends = vala
makedepends = cmake
makedepends = gettext
+ makedepends = gobject-introspection
depends = curl
depends = libsoup
depends = polkit
@@ -22,10 +23,10 @@ pkgbase = pamac-classic
provides = pamac-aur
conflicts = pamac
conflicts = pamac-aur
- 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
+ source = pamac-classic-6.7.2.tar.gz::https://git.cromer.cl/cromer/pamac-classic/archive/v6.7.2.tar.gz
+ source = pamacclassic-6.0.gir
+ sha256sums = 453620021cb9345a133db3ceed80eba62e23398358e8868bfc8e9602d4889055
+ sha256sums = 8ec24aee43b1d4ad6788174a3ffb41eacd2b5438c065fc058dfccb31ceb0b57f
pkgname = pamac-classic
diff --git a/PKGBUILD b/PKGBUILD
index dfdbf1638d61..fdcdf16b83b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
-# Maintainer: Thomas Bork <tab.epic@gmail.com>
+# Maintainer: Thomas Bork <sudobash418@gmail.com>
pkgname=pamac-classic
-pkgver=6.7.0
-pkgrel=3
+pkgver=6.7.2
+pkgrel=1
pkgdesc="A Gtk3 frontend for libalpm - classic version"
arch=('x86_64')
url="https://git.cromer.cl/cromer/pamac-classic"
license=('GPL3')
depends=('curl' 'libsoup' 'polkit' 'pacman' 'libnotify' 'vte3')
-makedepends=('vala' 'cmake' 'gettext')
+makedepends=('vala' 'cmake' 'gettext' 'gobject-introspection')
optdepends=('polkit-gnome: needed for authentication in Cinnamon, Gnome'
'mate-polkit: needed for authentication in MATE'
'lxsession: needed for authentication in Xfce, LXDE etc.')
@@ -17,16 +17,15 @@ provides=('pamac' 'pamac-aur')
install=pamac-classic.install
source=(
- "pamac-classic-$pkgver-$pkgrel.tar.gz::$url/archive/v$pkgver.tar.gz"
- "vala-0.44-fix.patch"
+ "pamac-classic-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+ "pamacclassic-6.0.gir"
)
-sha256sums=('35639ef352d99f813dc54cf49cd9110a6a1e5852929ea2af0ab1333022c8ed4d'
- '80a81cf01402c7adbabc144d36b096ca64bc613f13f55a25270e00ce867d632a')
+sha256sums=('453620021cb9345a133db3ceed80eba62e23398358e8868bfc8e9602d4889055'
+ '8ec24aee43b1d4ad6788174a3ffb41eacd2b5438c065fc058dfccb31ceb0b57f')
prepare() {
- cd "${srcdir}/pamac-classic"
-
- patch --forward --strip=1 --input="${srcdir}/vala-0.44-fix.patch"
+ # install missing file from 6.7.0 sources
+ cp "${srcdir}/pamacclassic-6.0.gir" "${srcdir}/pamac-classic/src/pamacclassic-1.0.gir"
}
build() {
diff --git a/pamacclassic-6.0.gir b/pamacclassic-6.0.gir
new file mode 100644
index 000000000000..e39390d33b9b
--- /dev/null
+++ b/pamacclassic-6.0.gir
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!-- pamacclassic-6.0.gir generated by valac 0.44.5, do not modify. -->
+<repository version="1.2" xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
+<package name="pamacclassic"/>
+<c:include name="pamacclassic.h"/>
+<namespace name="pamacclassic" version="6.0" c:prefix="pamacclassicConstants">
+ <constant name="DATADIR" c:identifier="PAMACCLASSIC_CONSTANTS_DATADIR" value="/usr/share">
+ <type name="utf8" c:type="const gchar*"/>
+ </constant>
+ <constant name="PKGDATADIR" c:identifier="PAMACCLASSIC_CONSTANTS_PKGDATADIR" value="/usr/share/pamac">
+ <type name="utf8" c:type="const gchar*"/>
+ </constant>
+ <constant name="GETTEXT_PACKAGE" c:identifier="PAMACCLASSIC_CONSTANTS_GETTEXT_PACKAGE" value="pamac">
+ <type name="utf8" c:type="const gchar*"/>
+ </constant>
+ <constant name="RELEASE_NAME" c:identifier="PAMACCLASSIC_CONSTANTS_RELEASE_NAME" value="pamac">
+ <type name="utf8" c:type="const gchar*"/>
+ </constant>
+ <constant name="VERSION" c:identifier="PAMACCLASSIC_CONSTANTS_VERSION" value="6.7.0">
+ <type name="utf8" c:type="const gchar*"/>
+ </constant>
+</namespace>
+</repository>
diff --git a/vala-0.44-fix.patch b/vala-0.44-fix.patch
deleted file mode 100644
index 11565fabcb50..000000000000
--- a/vala-0.44-fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- 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