summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD55
1 files changed, 30 insertions, 25 deletions
diff --git a/PKGBUILD b/PKGBUILD
index eec41c42b1f0..d157b0e0bdd1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,70 +3,75 @@
# Contributor: Ner0 <darkelfdarkelf666@yahoo.co.uk>
pkgname=pantheon-workarounds
-pkgver=5
-pkgrel=5
+pkgver=6
+pkgrel=1
pkgdesc='Workarounds for modular and minimal Pantheon Desktop Environments'
arch=('i686' 'x86_64')
url='https://launchpad.net/gala'
license=('GPL3')
groups=('pantheon-qq')
-depends=('dconf' gnome-{keyring,settings-daemon-{elementary,compat},session}
+depends=('dconf' gnome-{keyring,settings-daemon-{elementary,compat},session,user-share}
'polkit-gnome' 'xdg-user-dirs-gtk')
-optdepends=("pantheon-default-settings-bzr: Pantheon configuration and themeing"
+optdepends=("pantheon-default-settings-git: Pantheon configuration and themeing"
"contractor-git: Service for sharing data between apps"
"pantheon-print-git: Print settings dialog"
"pantheon-agent-polkit-bzr: Polkit Authentication Agent"
+ "pantheon-geoclue2-agent-git: Pantheon Geoclue2 Agent"
+ "pantheon-dpms-helper-git: Script and settings for X DPMS"
"xscreensaver-dbus-screenlock: xscreensaver locker for gnome-derivative desktops")
makedepends=('bzr' 'intltool')
-conflicts=(pantheon-session{,-bzr} gala{,-bzr,-git})
+conflicts=(pantheon-session{,-bzr,-git} gala{,-bzr,-git})
install='gala.install'
-source=("pantheon-session::bzr+lp:~elementary-os/elementaryos/pantheon-xsession-settings"
+source=("pantheon-session::git+https://github.com/elementary/session-settings#branch=meson"
+ "https://raw.githubusercontent.com/elementary/gala/master/data/org.pantheon.desktop.gala.gschema.xml.in"
'pantheon-session.sh'
'gnome-fallback-media-keys-helper-pantheon.desktop'
'gnome-fallback-background-helper-pantheon.desktop'
- 'gnome-fallback-mount-helper-pantheon.desktop')
+ 'gnome-fallback-mount-helper-pantheon.desktop'
+ 'xsessions-typo.patch')
sha512sums=('SKIP'
+ '30a488431a23ff5521a12e97fa69ed17b2033ba8f016bb922e07ad9bf2d671e14a90a38266de1567c4dcbf178b6919a8108fad3dd13e50573018dc2a8e9b070e'
'b2630c31724675c247b7017eea0862c76ec80a9f46691b65bc7f76702a9cacda46d9350d3bddc05ee21ded154f4d8ab277d536439152972dca0764f28e62cb38'
'b01a18bb7829eb7a48b72c90bdf5aa5913c24247426e0bfc509cba22f49d2d8c9eb301e1937b70f3f7f01a873c987e0bdea6dd5f24f8d900b952188fa5635d39'
'0df6355d85d2329e245593408a74d09281c0dcea206ed594a7312b78db4d3cd57941a5ec29be780f965128fe512532edae85ffaf11a94b57374d5906875967fc'
- 'c06e3b8c59681ebe64fa0dd724eea1d40a579956372ce0851f30ededdda3ac41d329d40e5463bd779daba0d55853faec357203b042a4de3d601eafc8b09c350e')
+ 'c06e3b8c59681ebe64fa0dd724eea1d40a579956372ce0851f30ededdda3ac41d329d40e5463bd779daba0d55853faec357203b042a4de3d601eafc8b09c350e'
+ '09248891b1f5dc41add3ded2150e564b86dc11eee4a695fa8eea11b51e040ca1daaa28701f791d681c88d8869821b7304e2d11eb771d439d13b708e893702108')
prepare() {
- #sed 's|policykit-1|polkit|' -i pantheon-session/autostart/polkit-gnome-authentication-agent-1-pantheon.desktop
-
- bzr cat lp:gala/data/org.pantheon.desktop.gala.gschema.xml.in > org.pantheon.desktop.gala.gschema.xml
+ cd "${srcdir}"
+ mv org.pantheon.desktop.gala.gschema.xml{.in,}
sed -i 's|@GETTEXT_PACKAGE@|gala|g' org.pantheon.desktop.gala.gschema.xml
- export pkgvergala="$(printf "r%s" "$(bzr version-info lp:gala | grep revno | tr -cd [:digit:])")"
- cd "pantheon-session"
- export pkgverpantheonsession="$(printf "r%s" "$(bzr revno)")"
+ git clone -n "https://github.com/elementary/gala.git"
+ cd "${srcdir}/gala"
+ export pkgvergala="r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+
- # TODO: sort and tweak pantheon-session's settings
+ cd "${srcdir}/pantheon-session"
+ export pkgverpantheonsession="$(printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")"
- # This space reserved for pantheon-default-settings(-bzr)
+ patch -Np2 < ../xsessions-typo.patch
+
+ # This space reserved for pantheon-default-settings(-git)
}
-provides=(pantheon-session{,-bzr}="${pkgverpantheonsession}" gala{,-bzr,-git}="${pkgvergala}")
+provides=(pantheon-session{,-bzr,-git}="${pkgverpantheonsession}" gala{,-bzr,-git}="${pkgvergala}")
package() {
install -Dm644 {"${srcdir}","${pkgdir}"/usr/share/glib-2.0/schemas}/org.pantheon.desktop.gala.gschema.xml
cd "${srcdir}"/pantheon-session
- mkdir -p "${pkgdir}"/{etc/xdg,usr/share/pantheon}
- cp -dr --no-preserve='ownership' autostart "${pkgdir}/etc/xdg/"
- cp -dr --no-preserve='ownership' unity-greeter "${pkgdir}/usr/share/"
- cp -dr --no-preserve='ownership' applications "${pkgdir}/usr/share/pantheon/"
+ meson --prefix=/usr --datadir=share builddir
+ DESTDIR=$pkgdir ninja -C builddir install
+ #These may no longer be needed
install -Dm644 {"${srcdir}","${pkgdir}"/etc/xdg/autostart}/gnome-fallback-media-keys-helper-pantheon.desktop
install -Dm644 {"${srcdir}","${pkgdir}"/etc/xdg/autostart}/gnome-fallback-background-helper-pantheon.desktop
install -Dm644 {"${srcdir}","${pkgdir}"/etc/xdg/autostart}/gnome-fallback-mount-helper-pantheon.desktop
# This space reserved for pantheon-default-settings-bzr
- find "${pkgdir}" -type d -exec chmod 755 {} +
- find "${pkgdir}" -type f -exec chmod 644 {} +
-
-# gnome-session workaround
+ # gnome-session workaround
install -Dm755 "${srcdir}"/pantheon-session.sh "${pkgdir}"/usr/bin/pantheon-session
}