Date: Friday, September 13, 2019 @ 22:38:23
Author: heftig
Revision: 510428
1.9.38-2
Added:
deepin-wm/trunk/vala-0.46.diff
Modified:
deepin-wm/trunk/PKGBUILD
----------------+
PKGBUILD | 13 ++++++----
vala-0.46.diff | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 79 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-09-13 22:36:36 UTC (rev 510427)
+++ PKGBUILD 2019-09-13 22:38:23 UTC (rev 510428)
@@ -4,7 +4,7 @@
pkgname=deepin-wm
pkgver=1.9.38
-pkgrel=1
+pkgrel=2
pkgdesc='Deepin Window Manager'
arch=('x86_64')
url="https://github.com/linuxdeepin/deepin-wm";
@@ -12,12 +12,15 @@
depends=('bamf' 'clutter-gtk' 'deepin-desktop-schemas' 'deepin-menu' 'granite'
'deepin-mutter'
'gnome-desktop' 'libgee')
makedepends=('gnome-common' 'intltool' 'vala')
-options=(debug)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-wm/archive/$pkgver.tar.gz";)
-sha512sums=('3eb4e47856611e0dc257ab079eff3166ed643aa8b55686519c917c3184cd5f238d01c3c8960d715a81264ff1337aa5d7c809a6559eab82e9decb1b9b8a33917d')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-wm/archive/$pkgver.tar.gz";
+ vala-0.46.diff)
+sha512sums=('3eb4e47856611e0dc257ab079eff3166ed643aa8b55686519c917c3184cd5f238d01c3c8960d715a81264ff1337aa5d7c809a6559eab82e9decb1b9b8a33917d'
+
'408db4f180b241e2e5982e1945546d7e4c731d1c7a748b6949257175652048986b6dccfdadae49c82462e25e69e212b03b0af89ec2b370be60c0b64f2b0abe19')
prepare() {
- sed -i
's#/usr/share/backgrounds/default_background.jpg#/usr/share/backgrounds/deepin/desktop.jpg#'
$pkgname-$pkgver/src/Background/BackgroundSource.vala
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../vala-0.46.diff
+ sed -i
's#/usr/share/backgrounds/default_background.jpg#/usr/share/backgrounds/deepin/desktop.jpg#'
src/Background/BackgroundSource.vala
}
build() {
Added: vala-0.46.diff
===================================================================
--- vala-0.46.diff (rev 0)
+++ vala-0.46.diff 2019-09-13 22:38:23 UTC (rev 510428)
@@ -0,0 +1,71 @@
+diff -u -r deepin-wm-1.9.38/plugins/notify/Notification.vala
deepin-wm-1.9.38-v/plugins/notify/Notification.vala
+--- deepin-wm-1.9.38/plugins/notify/Notification.vala 2019-04-03
08:12:21.000000000 +0000
++++ deepin-wm-1.9.38-v/plugins/notify/Notification.vala 2019-09-13
22:24:04.446499116 +0000
+@@ -75,7 +75,7 @@
+ }
+ }
+
+- public Notification (uint32 id, Gdk.Pixbuf? icon,
NotificationUrgency urgency,
++ Notification (uint32 id, Gdk.Pixbuf? icon, NotificationUrgency
urgency,
+ int32 expire_timeout)
+ {
+ Object (
+diff -u -r deepin-wm-1.9.38/src/Deepin/DeepinWindowBaseContainer.vala
deepin-wm-1.9.38-v/src/Deepin/DeepinWindowBaseContainer.vala
+--- deepin-wm-1.9.38/src/Deepin/DeepinWindowBaseContainer.vala 2019-04-03
08:12:21.000000000 +0000
++++ deepin-wm-1.9.38-v/src/Deepin/DeepinWindowBaseContainer.vala
2019-09-13 22:23:50.932977243 +0000
+@@ -68,7 +68,7 @@
+ public abstract void do_select_clone (DeepinWindowClone
window_clone, bool select,
+
bool animate = true);
+
+- public DeepinWindowBaseContainer (Workspace workspace)
++ DeepinWindowBaseContainer (Workspace workspace)
+ {
+ Object (workspace: workspace);
+ }
+diff -u -r deepin-wm-1.9.38/src/Deepin/DeepinWindowClone.vala
deepin-wm-1.9.38-v/src/Deepin/DeepinWindowClone.vala
+--- deepin-wm-1.9.38/src/Deepin/DeepinWindowClone.vala 2019-04-03
08:12:21.000000000 +0000
++++ deepin-wm-1.9.38-v/src/Deepin/DeepinWindowClone.vala 2019-09-13
22:32:00.885495180 +0000
+@@ -374,13 +374,13 @@
+ position.x = outer_rect.x - offset_x;
+ position.y = outer_rect.y - offset_y;
+ var position_value = GLib.Value (typeof
(Point));
+- position_value.set_boxed (position);
++ position_value.set_boxed ((void*)position);
+
+ var size = Size.alloc ();
+ size.width = outer_rect.width;
+ size.height = outer_rect.height;
+ var size_value = GLib.Value (typeof (Size));
+- size_value.set_boxed (size);
++ size_value.set_boxed ((void*)size);
+
+ unowned AnimationSettings animation_settings =
AnimationSettings.get_default ();
+ DeepinUtils.start_animation_group (this,
"window-slot",
+@@ -433,13 +433,13 @@
+ position.x = rect.x;
+ position.y = rect.y;
+ var position_value = GLib.Value (typeof
(Point));
+- position_value.set_boxed (position);
++ position_value.set_boxed ((void*)position);
+
+ var size = Size.alloc ();
+ size.width = rect.width;
+ size.height = rect.height;
+ var size_value = GLib.Value (typeof (Size));
+- size_value.set_boxed (size);
++ size_value.set_boxed ((void*)size);
+
+ unowned AnimationSettings animation_settings =
AnimationSettings.get_default ();
+ if (!selecting) {
+diff -u -r deepin-wm-1.9.38/src/Deepin/DeepinWorkspaceThumbContainer.vala
deepin-wm-1.9.38-v/src/Deepin/DeepinWorkspaceThumbContainer.vala
+--- deepin-wm-1.9.38/src/Deepin/DeepinWorkspaceThumbContainer.vala
2019-04-03 08:12:21.000000000 +0000
++++ deepin-wm-1.9.38-v/src/Deepin/DeepinWorkspaceThumbContainer.vala
2019-09-13 22:31:19.021724652 +0000
+@@ -502,7 +502,7 @@
+ position.x = child_box.get_x ();
+ position.y = child_box.get_y ();
+ var position_value = GLib.Value (typeof
(Point));
+- position_value.set_boxed (position);
++ position_value.set_boxed ((void*)position);
+ DeepinUtils.start_animation_group (child,
"thumb-workspace-slot", LAYOUT_DURATION,
+ (tl) => { tl.progress_mode = (AnimationMode.LINEAR);
},
+ "position", &position_value);
