Move wingpanel-rewrite-x11-bzr to wingpanel-bzr and add soprovides

1 files changed, 19 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 89030a1cfdb1..dc29a68c7414 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,23 +3,24 @@
 # Contributor: flamelab <panosfilip@gmail.com>
 
 pkgname=wingpanel-bzr
-pkgver=r218
+pkgver=r93
 pkgrel=1
+epoch=1
 pkgdesc='The Pantheon Panel'
 arch=('i686' 'x86_64')
 url='https://launchpad.net/wingpanel'
 license=('GPL3')
 groups=('pantheon-unstable')
-depends=('granite-bzr' 'ido' 'libindicator-gtk3' 'libwnck3')
-optdepends=('indicator-datetime: Display date and time'
-            'indicator-pantheon-session-bzr: Pantheon session indicator'
-            'indicator-power: Battery idicator')
+depends=('clutter' 'cogl' 'glib2' 'glibc' 'gtk3' 'libgee' 'mutter'
+         'libgala.so' 'libgranite.so')
 makedepends=('bzr' 'cmake' 'vala')
-provides=('wingpanel')
+provides=('wingpanel' 'libwingpanel-2.0.so')
 conflicts=('wingpanel')
 install='wingpanel.install'
-source=('bzr+lp:wingpanel')
-sha256sums=('SKIP')
+source=('wingpanel::bzr+lp:wingpanel/0.4.x'
+        'wingpanel-fixes.patch')
+sha256sums=('SKIP'
+            '6f5101f8575a612f8e6c6b21ee9323c82ca1ec5c90fc1abf12a8f29ab2733fd7')
 
 pkgver() {
   cd wingpanel
@@ -27,19 +28,24 @@ pkgver() {
   echo "r$(bzr revno)"
 }
 
-build() {
+prepare() {
   cd wingpanel
 
+  patch -Np1 -i ../wingpanel-fixes.patch
+
   if [[ -d build ]]; then
     rm -rf build
   fi
-  mkdir build && cd build
+  mkdir build
+}
+
+build() {
+  cd wingpanel/build
 
   cmake .. \
     -DCMAKE_INSTALL_PREFIX='/usr' \
-    -DGSETTINGS_COMPILE='FALSE' \
-    -DNO_INDICATOR_NG='TRUE' \
-    -DOLD_LIB_IDO='TRUE'
+    -DCMAKE_INSTALL_LIBDIR='/usr/lib' \
+    -DGSETTINGS_COMPILE='FALSE'
   make
 }