diff options
author | Maxime Gauduin | 2019-02-03 18:58:17 +0100 |
---|---|---|
committer | Maxime Gauduin | 2019-02-03 18:59:22 +0100 |
commit | 2d3cadaebf1e887ed53bc4df7c646c8921d860b6 (patch) | |
tree | 0b41555c6d5a268f7af54af57c1a730636426a43 | |
parent | f421ba11779b8a7efbd8e03a0bcfa1bdcebfceb2 (diff) | |
download | aur-2d3cadaebf1e887ed53bc4df7c646c8921d860b6.tar.gz |
update applications-menu again
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | PKGBUILD | 77 | ||||
-rw-r--r-- | pantheon-applications-menu-plank.patch | 37 |
3 files changed, 90 insertions, 42 deletions
@@ -1,16 +1,15 @@ # Generated by mksrcinfo v8 -# Fri May 5 20:00:58 UTC 2017 +# Sun Feb 3 17:58:16 UTC 2019 pkgbase = pantheon-applications-menu-git pkgdesc = The Pantheon Application Menu - pkgver = r1111.ff1d629 + pkgver = 2.4.2.r6.58cd96a pkgrel = 1 url = https://github.com/elementary/applications-menu - arch = i686 arch = x86_64 groups = pantheon-unstable license = GPL3 - makedepends = cmake makedepends = git + makedepends = meson makedepends = granite-git makedepends = switchboard-git makedepends = vala @@ -18,23 +17,22 @@ pkgbase = pantheon-applications-menu-git depends = appstream depends = gdk-pixbuf2 depends = glib2 - depends = glibc depends = gnome-menus depends = gtk3 depends = json-glib depends = libgee - depends = libsoup - depends = plank - depends = zeitgeist depends = libgranite.so + depends = libsoup depends = libswitchboard-2.0.so depends = libwingpanel-2.0.so + depends = plank + depends = zeitgeist provides = pantheon-applications-menu conflicts = pantheon-applications-menu - conflicts = slingshot-launcher - replaces = slingshot-launcher-bzr source = pantheon-applications-menu::git+https://github.com/elementary/applications-menu.git + source = pantheon-applications-menu-plank.patch sha256sums = SKIP + sha256sums = bf9c6e4eb7bb236e3d740ca8a2e86558ede3efe460a0a44a7ef14a84090b9d5a pkgname = pantheon-applications-menu-git @@ -1,55 +1,68 @@ # Maintainer: Maxime Gauduin <alucryd@archlinux.org> pkgname=pantheon-applications-menu-git -pkgver=r1111.ff1d629 +pkgver=2.4.2.r6.58cd96a pkgrel=1 pkgdesc='The Pantheon Application Menu' -arch=('i686' 'x86_64') -url='https://github.com/elementary/applications-menu' -license=('GPL3') -groups=('pantheon-unstable') -depends=('appstream' 'gdk-pixbuf2' 'glib2' 'glibc' 'gnome-menus' 'gtk3' - 'json-glib' 'libgee' 'libsoup' 'plank' 'zeitgeist' - 'libgranite.so' 'libswitchboard-2.0.so' 'libwingpanel-2.0.so') -makedepends=('cmake' 'git' 'granite-git' 'switchboard-git' 'vala' - 'wingpanel-git') -provides=('pantheon-applications-menu') -conflicts=('pantheon-applications-menu' 'slingshot-launcher') -replaces=('slingshot-launcher-bzr') -source=('pantheon-applications-menu::git+https://github.com/elementary/applications-menu.git') -sha256sums=('SKIP') +arch=(x86_64) +url=https://github.com/elementary/applications-menu +license=(GPL3) +groups=(pantheon-unstable) +depends=( + appstream + gdk-pixbuf2 + glib2 + gnome-menus + gtk3 + json-glib + libgee + libgranite.so + libsoup + libswitchboard-2.0.so + libwingpanel-2.0.so + plank + zeitgeist +) +makedepends=( + git + meson + granite-git + switchboard-git + vala + wingpanel-git +) +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 +) pkgver() { cd pantheon-applications-menu - echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" + git describe --tags | sed 's/-/.r/; s/-g/./' } prepare() { cd pantheon-applications-menu - if [[ -d build ]]; then - rm -rf build - fi - mkdir build + patch -Np1 -i ../pantheon-applications-menu-plank.patch } build() { - cd pantheon-applications-menu/build - - cmake .. \ - -DCMAKE_BUILD_TYPE='Release' \ - -DCMAKE_INSTALL_PREFIX='/usr' \ - -DCMAKE_INSTALL_LIBDIR='/usr/lib' \ - -DGSETTINGS_COMPILE='OFF' \ - -DUSE_UNITY='OFF' - make + arch-meson pantheon-applications-menu build \ + -D b_pie=false \ + -D with-unity=false + ninja -C build } package() { - cd pantheon-applications-menu/build - - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" meson install -C build } # vim: ts=2 sw=2 et: diff --git a/pantheon-applications-menu-plank.patch b/pantheon-applications-menu-plank.patch new file mode 100644 index 000000000000..3a45e233137c --- /dev/null +++ b/pantheon-applications-menu-plank.patch @@ -0,0 +1,37 @@ +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') |