Date: Thursday, October 3, 2019 @ 17:45:57
Author: felixonmars
Revision: 512514
upgpkg: deepin-wm 1.9.38-3
fix compatibility issues with new vala
Modified:
deepin-wm/trunk/PKGBUILD
Deleted:
deepin-wm/trunk/vala-0.46.diff
----------------+
PKGBUILD | 8 +++---
vala-0.46.diff | 71 -------------------------------------------------------
2 files changed, 4 insertions(+), 75 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-03 17:33:14 UTC (rev 512513)
+++ PKGBUILD 2019-10-03 17:45:57 UTC (rev 512514)
@@ -4,7 +4,7 @@
pkgname=deepin-wm
pkgver=1.9.38
-pkgrel=2
+pkgrel=3
pkgdesc='Deepin Window Manager'
arch=('x86_64')
url="https://github.com/linuxdeepin/deepin-wm";
@@ -13,13 +13,13 @@
'gnome-desktop' 'libgee')
makedepends=('gnome-common' 'intltool' 'vala')
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-wm/archive/$pkgver.tar.gz";
- vala-0.46.diff)
+ vala.patch::https://github.com/linuxdeepin/deepin-wm/pull/65.patch)
sha512sums=('3eb4e47856611e0dc257ab079eff3166ed643aa8b55686519c917c3184cd5f238d01c3c8960d715a81264ff1337aa5d7c809a6559eab82e9decb1b9b8a33917d'
-
'408db4f180b241e2e5982e1945546d7e4c731d1c7a748b6949257175652048986b6dccfdadae49c82462e25e69e212b03b0af89ec2b370be60c0b64f2b0abe19')
+
'7cdfbbd0b42f8a132565d9e0187c821707d85fddc7664fc3f3cf48b292772289867fac72e0c3f8d55b20c143a220e0523ba01332fa18fba1bea543e5cc8aa97e')
prepare() {
cd $pkgname-$pkgver
- patch -Np1 -i ../vala-0.46.diff
+ patch -Np1 -i ../vala.patch
sed -i
's#/usr/share/backgrounds/default_background.jpg#/usr/share/backgrounds/deepin/desktop.jpg#'
src/Background/BackgroundSource.vala
}
Deleted: vala-0.46.diff
===================================================================
--- vala-0.46.diff 2019-10-03 17:33:14 UTC (rev 512513)
+++ vala-0.46.diff 2019-10-03 17:45:57 UTC (rev 512514)
@@ -1,71 +0,0 @@
-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);
