summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Gauduin2019-02-12 21:28:51 +0100
committerMaxime Gauduin2019-02-12 21:28:51 +0100
commit07fd6269e8a66ea9dcff61cde67483ddd673b167 (patch)
treecfe5b05353fa04b535fa88d11dd11bd31c752dcf
parent2d3cadaebf1e887ed53bc4df7c646c8921d860b6 (diff)
downloadaur-07fd6269e8a66ea9dcff61cde67483ddd673b167.tar.gz
use my own branch for now
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD20
-rw-r--r--pantheon-applications-menu-plank.patch37
3 files changed, 7 insertions, 59 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9af52c175e65..d860e5310e46 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Feb 3 17:58:16 UTC 2019
+# Tue Feb 12 20:28:50 UTC 2019
pkgbase = pantheon-applications-menu-git
pkgdesc = The Pantheon Application Menu
- pkgver = 2.4.2.r6.58cd96a
+ pkgver = 2.4.2.r11.eb95a41
pkgrel = 1
url = https://github.com/elementary/applications-menu
arch = x86_64
@@ -25,14 +25,11 @@ pkgbase = pantheon-applications-menu-git
depends = libsoup
depends = libswitchboard-2.0.so
depends = libwingpanel-2.0.so
- depends = plank
depends = zeitgeist
provides = pantheon-applications-menu
conflicts = pantheon-applications-menu
- source = pantheon-applications-menu::git+https://github.com/elementary/applications-menu.git
- source = pantheon-applications-menu-plank.patch
+ source = pantheon-applications-menu::git+https://github.com/alucryd/applications-menu.git#branch=meson-plank
sha256sums = SKIP
- sha256sums = bf9c6e4eb7bb236e3d740ca8a2e86558ede3efe460a0a44a7ef14a84090b9d5a
pkgname = pantheon-applications-menu-git
diff --git a/PKGBUILD b/PKGBUILD
index c7ddf07db72c..36f3ddad4e55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
pkgname=pantheon-applications-menu-git
-pkgver=2.4.2.r6.58cd96a
+pkgver=2.4.2.r11.eb95a41
pkgrel=1
pkgdesc='The Pantheon Application Menu'
arch=(x86_64)
@@ -20,7 +20,6 @@ depends=(
libsoup
libswitchboard-2.0.so
libwingpanel-2.0.so
- plank
zeitgeist
)
makedepends=(
@@ -33,14 +32,9 @@ makedepends=(
)
provides=(pantheon-applications-menu)
conflicts=(pantheon-applications-menu)
-source=(
- pantheon-applications-menu::git+https://github.com/elementary/applications-menu.git
- pantheon-applications-menu-plank.patch
-)
-sha256sums=(
- SKIP
- bf9c6e4eb7bb236e3d740ca8a2e86558ede3efe460a0a44a7ef14a84090b9d5a
-)
+#source=(pantheon-applications-menu::git+https://github.com/elementary/applications-menu.git)
+source=(pantheon-applications-menu::git+https://github.com/alucryd/applications-menu.git#branch=meson-plank)
+sha256sums=(SKIP)
pkgver() {
cd pantheon-applications-menu
@@ -48,12 +42,6 @@ pkgver() {
git describe --tags | sed 's/-/.r/; s/-g/./'
}
-prepare() {
- cd pantheon-applications-menu
-
- patch -Np1 -i ../pantheon-applications-menu-plank.patch
-}
-
build() {
arch-meson pantheon-applications-menu build \
-D b_pie=false \
diff --git a/pantheon-applications-menu-plank.patch b/pantheon-applications-menu-plank.patch
deleted file mode 100644
index 3a45e233137c..000000000000
--- a/pantheon-applications-menu-plank.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -rupN pantheon-applications-menu.orig/meson.build pantheon-applications-menu/meson.build
---- pantheon-applications-menu.orig/meson.build 2019-02-03 16:28:42.642481319 +0100
-+++ pantheon-applications-menu/meson.build 2019-02-03 16:29:52.069671116 +0100
-@@ -34,19 +34,17 @@ libgnome_menu_dep = dependency('libgnome
- wingpanel_dep = dependency('wingpanel-2.0', version: '>=2.1.0')
-
- unity_dep = []
--plank_dep = []
--
- if get_option('with-unity')
- unity_dep = dependency('unity', version: '>=4.0.0')
- add_project_arguments('--define=HAVE_UNITY', language: 'vala')
-+endif
-
-- plank_dep = dependency('plank')
-- if plank_dep.version().version_compare('>=0.10.9')
-- add_project_arguments('--define=HAS_PLANK_0_11', language: 'vala')
-- endif
-- if plank_dep.version().version_compare('>=0.9.0')
-- add_project_arguments('--define=HAS_PLANK', language: 'vala')
-- endif
-+plank_dep = dependency('plank')
-+if plank_dep.version().version_compare('>=0.10.9')
-+ add_project_arguments('--define=HAS_PLANK_0_11', language: 'vala')
-+endif
-+if plank_dep.version().version_compare('>=0.9.0')
-+ add_project_arguments('--define=HAS_PLANK', language: 'vala')
- endif
-
- subdir('lib')
-@@ -54,4 +52,4 @@ subdir('src')
- subdir('data')
- subdir('po')
-
--meson.add_install_script('meson/post_install.py')
-\ No newline at end of file
-+meson.add_install_script('meson/post_install.py')