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

3 files changed, 71 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc7c167b5207..794715f78219 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = wingpanel-bzr
 	pkgdesc = The Pantheon Panel
-	pkgver = r218
+	pkgver = r93
 	pkgrel = 1
+	epoch = 1
 	url = https://launchpad.net/wingpanel
 	install = wingpanel.install
 	arch = i686
@@ -11,17 +12,22 @@ pkgbase = wingpanel-bzr
 	makedepends = bzr
 	makedepends = cmake
 	makedepends = vala
-	depends = granite-bzr
-	depends = ido
-	depends = libindicator-gtk3
-	depends = libwnck3
-	optdepends = indicator-datetime: Display date and time
-	optdepends = indicator-pantheon-session-bzr: Pantheon session indicator
-	optdepends = indicator-power: Battery idicator
+	depends = clutter
+	depends = cogl
+	depends = glib2
+	depends = glibc
+	depends = gtk3
+	depends = libgee
+	depends = mutter
+	depends = libgala.so
+	depends = libgranite.so
 	provides = wingpanel
+	provides = libwingpanel-2.0.so
 	conflicts = wingpanel
-	source = bzr+lp:wingpanel
+	source = wingpanel::bzr+lp:wingpanel/0.4.x
+	source = wingpanel-fixes.patch
 	sha256sums = SKIP
+	sha256sums = 6f5101f8575a612f8e6c6b21ee9323c82ca1ec5c90fc1abf12a8f29ab2733fd7
 
 pkgname = wingpanel-bzr
 
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
 }
 
diff --git a/wingpanel-fixes.patch b/wingpanel-fixes.patch
new file mode 100644
index 000000000000..584cc4f28ecf
--- /dev/null
+++ b/wingpanel-fixes.patch
@@ -0,0 +1,37 @@
+diff -rupN wingpanel-rewrite-x11.orig/vapi/xfixes-4.0.vapi wingpanel-rewrite-x11/vapi/xfixes-4.0.vapi
+--- wingpanel-rewrite-x11.orig/vapi/xfixes-4.0.vapi	1970-01-01 01:00:00.000000000 +0100
++++ wingpanel-rewrite-x11/vapi/xfixes-4.0.vapi	2015-06-04 15:31:20.177646063 +0200
+@@ -0,0 +1,24 @@
++/* xfixes-4.0.vapi generated by vapigen, do not modify. */
++/* Manually edited, so feel free to add and adjust it directly */
++
++[CCode (cprefix = "X", gir_namespace = "xfixes", gir_version = "4.0", lower_case_cprefix = "X_")]
++namespace X {
++	namespace Fixes {
++		[CCode (cheader_filename = "X11/extensions/Xfixes.h", cname = "XFixesCreateRegion")]
++		public static X.XserverRegion create_region (X.Display display, [CCode (array_length = true)] X.Xrectangle[] rectangles);
++		[CCode (cheader_filename = "X11/extensions/Xfixes.h", cname = "XFixesDestroyRegion")]
++		public static void destroy_region (X.Display display, X.XserverRegion region);
++	}
++	[SimpleType]
++	[CCode (cheader_filename = "X11/extensions/Xfixes.h", cname = "XserverRegion", has_type_id = false)]
++	public struct XserverRegion {
++	}
++	[SimpleType]
++	[CCode (cheader_filename = "X11/Xlib.h", cname = "XRectangle", has_type_id = false)]
++	public struct Xrectangle {
++		public short x;
++		public short y;
++		public ushort width;
++		public ushort height;
++	}
++}
+diff -rupN wingpanel-rewrite-x11.orig/wingpanel-interface/CMakeLists.txt wingpanel-rewrite-x11/wingpanel-interface/CMakeLists.txt
+--- wingpanel-rewrite-x11.orig/wingpanel-interface/CMakeLists.txt	2015-06-04 15:30:20.002739439 +0200
++++ wingpanel-rewrite-x11/wingpanel-interface/CMakeLists.txt	2015-06-04 15:31:35.983849788 +0200
+@@ -30,4 +30,4 @@ OPTIONS
+ add_library (${WINGPANELINTERFACE} MODULE ${VALA_C})
+ target_link_libraries(${WINGPANELINTERFACE} ${DEPS_LIBRARIES})
+ 
+-install (TARGETS ${WINGPANELINTERFACE} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/x86_64-linux-gnu/gala/plugins")
++install (TARGETS ${WINGPANELINTERFACE} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/gala/plugins")