diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | pacman5.patch | 152 |
3 files changed, 9 insertions, 167 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Tue Feb 2 12:52:13 UTC 2016 +# Wed Feb 10 21:17:18 UTC 2016 pkgbase = pamac-aur pkgdesc = A Gtk3 frontend for libalpm pkgver = 3.0.0 - pkgrel = 1 + pkgrel = 4 url = https://github.com/manjaro/pamac install = pamac.install arch = any @@ -29,8 +29,8 @@ pkgbase = pamac-aur conflicts = pamac options = !emptydirs backup = etc/pamac.conf - source = pamac-3.0.0.tar.gz::https://github.com/manjaro/pamac/archive/v3.0.0.tar.gz - sha256sums = e1806ea77d23dbb91c56ea70c0a7279d3bcaa25989f84f360900cf39e5e93b94 + source = pamac-3.0.0-4.tar.gz::https://github.com/manjaro/pamac/archive/e53a71fc3a8d77b9d95cb7fef9fd5dab9c778756.tar.gz + sha256sums = 4d899635715a863dd554680e1eb830d7ce9fb026f7c901145e61b24c77d34641 pkgname = pamac-aur @@ -4,9 +4,9 @@ pkgname=pamac-aur pkgver=3.0.0 _pkgver=3.0.0 -pkgrel=1 +pkgrel=4 # This is the release package so the below _gitcommit variable should (usually) be commented out. -#_gitcommit="d7d393ed4e265ed0041a287e10306c6cf65971d8" +_gitcommit="e53a71fc3a8d77b9d95cb7fef9fd5dab9c778756" pkgdesc="A Gtk3 frontend for libalpm" arch=('any') url="https://github.com/manjaro/pamac" @@ -29,24 +29,18 @@ else source=("pamac-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz") fi -#source+=('notification-improvment.patch::https://github.com/manjaro/pamac/pull/88.patch') -#source+=('pacman5.patch') - -sha256sums=('e1806ea77d23dbb91c56ea70c0a7279d3bcaa25989f84f360900cf39e5e93b94') -#sha256sums+=('749d9d153fbbe5b3709423983a6da6dfafae16a09acf8ccb6d35427f47cb804a') -#sha256sums+=('282928e3292fdb8b9e60b60251779b544160a1724b4bf32379a5c9ce14ecf54f' +sha256sums=('4d899635715a863dd554680e1eb830d7ce9fb026f7c901145e61b24c77d34641') prepare() { if [ "$_gitcommit" != "" ]; then mv "$srcdir/pamac-$_gitcommit" "$srcdir/pamac-$pkgver" fi + # adjust version string cd "$srcdir/pamac-$pkgver/src" - sed -i -e "s|\"$_pkgver\"|\"$pkgver-$pkgrel\"|g" manager_window.vala + sed -i -e "s|\"$_pkgver\"|\"$pkgver-$pkgrel\"|g" pamac_config.vala cd "$srcdir/pamac-$pkgver/" # patches here -# patch -Np1 -i $srcdir/notification-improvment.patch -# patch -Np1 -i $srcdir/pacman5.patch } build() { diff --git a/pacman5.patch b/pacman5.patch deleted file mode 100644 index 7a3b4126c4d3..000000000000 --- a/pacman5.patch +++ /dev/null @@ -1,152 +0,0 @@ -diff --git a/src/alpm_config.vala b/src/alpm_config.vala -index 95ce58c..4ed8614 100644 ---- a/src/alpm_config.vala -+++ b/src/alpm_config.vala -@@ -340,7 +340,7 @@ namespace Alpm { - if ("Never" in directive) { - if (affect_package) { - default_level &= ~Signature.Level.PACKAGE; -- default_level |= Signature.Level.PACKAGE_SET; -+// default_level |= Signature.Level.PACKAGE_SET; - } - if (affect_database) { - default_level &= ~Signature.Level.DATABASE; -@@ -349,7 +349,7 @@ namespace Alpm { - if (affect_package) { - default_level |= Signature.Level.PACKAGE; - default_level |= Signature.Level.PACKAGE_OPTIONAL; -- default_level |= Signature.Level.PACKAGE_SET; -+// default_level |= Signature.Level.PACKAGE_SET; - } - if (affect_database) { - default_level |= Signature.Level.DATABASE; -@@ -359,7 +359,7 @@ namespace Alpm { - if (affect_package) { - default_level |= Signature.Level.PACKAGE; - default_level &= ~Signature.Level.PACKAGE_OPTIONAL; -- default_level |= Signature.Level.PACKAGE_SET; -+// default_level |= Signature.Level.PACKAGE_SET; - } - if (affect_database) { - default_level |= Signature.Level.DATABASE; -@@ -369,7 +369,7 @@ namespace Alpm { - if (affect_package) { - default_level &= ~Signature.Level.PACKAGE_MARGINAL_OK; - default_level &= ~Signature.Level.PACKAGE_UNKNOWN_OK; -- default_level |= Signature.Level.PACKAGE_TRUST_SET; -+// default_level |= Signature.Level.PACKAGE_TRUST_SET; - } - if (affect_database) { - default_level &= ~Signature.Level.DATABASE_MARGINAL_OK; -@@ -379,7 +379,7 @@ namespace Alpm { - if (affect_package) { - default_level |= Signature.Level.PACKAGE_MARGINAL_OK; - default_level |= Signature.Level.PACKAGE_UNKNOWN_OK; -- default_level |= Signature.Level.PACKAGE_TRUST_SET; -+// default_level |= Signature.Level.PACKAGE_TRUST_SET; - } - if (affect_database) { - default_level |= Signature.Level.DATABASE_MARGINAL_OK; -@@ -395,7 +395,7 @@ namespace Alpm { - - public Signature.Level merge_siglevel (Signature.Level base_level, Signature.Level over_level) { - if ((over_level & Signature.Level.USE_DEFAULT) == 0) { -- if ((over_level & Signature.Level.PACKAGE_SET) == 0) { -+/* if ((over_level & Signature.Level.PACKAGE_SET) == 0) { - over_level |= base_level & Signature.Level.PACKAGE; - over_level |= base_level & Signature.Level.PACKAGE_OPTIONAL; - } -@@ -403,7 +403,7 @@ namespace Alpm { - over_level |= base_level & Signature.Level.PACKAGE_MARGINAL_OK; - over_level |= base_level & Signature.Level.PACKAGE_UNKNOWN_OK; - } -- } -+*/ } - return over_level; - } - }diff --git a/src/daemon.vala b/src/daemon.vala -index 4727b9c..b7b6a2e 100644 ---- a/src/daemon.vala -+++ b/src/daemon.vala -@@ -1204,9 +1204,9 @@ private void cb_event (Event.Data data) { - case Event.Type.PACSAVE_CREATED: - details += data.pacsave_created_file; - break; -- case Event.Type.PACORIG_CREATED: -- details += data.pacorig_created_file; -- break; -+// case Event.Type.PACORIG_CREATED: -+// details += data.pacorig_created_file; -+// break; - default: - break; - }diff --git a/src/transaction.vala b/src/transaction.vala -index cae7d48..3954f55 100644 ---- a/src/transaction.vala -+++ b/src/transaction.vala -@@ -980,9 +980,9 @@ namespace Pamac { - case Alpm.Event.Type.PACSAVE_CREATED: - progress_dialog.spawn_in_term ({"echo", dgettext (null, "%s installed as %s.pacsave").printf (details[0])}); - break; -- case Alpm.Event.Type.PACORIG_CREATED: -- progress_dialog.spawn_in_term ({"echo", dgettext (null, "%s installed as %s.pacorig").printf (details[0])}); -- break; -+// case Alpm.Event.Type.PACORIG_CREATED: -+// progress_dialog.spawn_in_term ({"echo", dgettext (null, "%s installed as %s.pacorig").printf (details[0])}); -+// break; - default: - break; - }diff --git a/vapi/libalpm.vapi b/vapi/libalpm.vapi -index 0017ded..6f919d2 100644 ---- a/vapi/libalpm.vapi -+++ b/vapi/libalpm.vapi -@@ -684,8 +684,8 @@ namespace Alpm { - DATABASE_MARGINAL_OK = (1 << 12), - DATABASE_UNKNOWN_OK = (1 << 13), - -- PACKAGE_SET = (1 << 27), -- PACKAGE_TRUST_SET = (1 << 28), -+// PACKAGE_SET = (1 << 27), -+// PACKAGE_TRUST_SET = (1 << 28), - - USE_DEFAULT = (1 << 31) - } -@@ -754,7 +754,11 @@ namespace Alpm { - INTERCONFLICTS_START, - /** Inter-conflicts were checked for target package. */ - INTERCONFLICTS_DONE, -- /** Package will be installed/upgraded/downgraded/re-installed/removed; See -+ /** Processing the package transaction is starting. */ -+ TRANSACTION_START, -+ /** Processing the package transaction is finished. */ -+ TRANSACTION_DONE, -+ /** Package will be installed/upgraded/downgraded/re-installed/removed; See - * PackageOperation for arguments. */ - PACKAGE_OPERATION_START, - /** Package was installed/upgraded/downgraded/re-installed/removed; See -@@ -824,9 +828,14 @@ namespace Alpm { - /** A .pacsave file was created; See PacsaveCreated for - * arguments */ - PACSAVE_CREATED, -- /** A .pacorig file was created; See PacorigCreated for -- * arguments */ -- PACORIG_CREATED -+ /** Processing hooks will be started. */ -+ EVENT_HOOK_START, -+ /** Processing hooks is finished. */ -+ EVENT_HOOK_DONE, -+ /** A hook is starting */ -+ EVENT_HOOK_RUN_START, -+ /** A hook has finnished runnning */ -+ EVENT_HOOK_RUN_DONE - } - - [CCode (cname = "alpm_event_any_t", has_type_id = false)] -@@ -1261,6 +1270,7 @@ namespace Alpm { - TRANS_ABORT, - TRANS_TYPE, - TRANS_NOT_LOCKED, -+ TRANS_HOOK_FAILED, - /* Packages */ - PKG_NOT_FOUND, - PKG_IGNORED,
\ No newline at end of file |