[arch-commits] Commit in deepin-calendar/repos/community-x86_64 (4 files)

Felix Yan felixonmars at archlinux.org
Sun Nov 15 23:12:33 UTC 2020


    Date: Sunday, November 15, 2020 @ 23:12:33
  Author: felixonmars
Revision: 754967

archrelease: copy trunk to community-x86_64

Added:
  deepin-calendar/repos/community-x86_64/PKGBUILD
    (from rev 754966, deepin-calendar/trunk/PKGBUILD)
  deepin-calendar/repos/community-x86_64/dde-calendar-icon.patch
    (from rev 754966, deepin-calendar/trunk/dde-calendar-icon.patch)
Deleted:
  deepin-calendar/repos/community-x86_64/PKGBUILD
  deepin-calendar/repos/community-x86_64/dde-calendar-icon.patch

-------------------------+
 PKGBUILD                |   85 +++++++++++++++++++++++++---------------------
 dde-calendar-icon.patch |   48 ++++++++++++-------------
 2 files changed, 72 insertions(+), 61 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-15 23:12:21 UTC (rev 754966)
+++ PKGBUILD	2020-11-15 23:12:33 UTC (rev 754967)
@@ -1,37 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-calendar
-pkgver=5.7.0.19
-pkgrel=1
-pkgdesc='Calendar for Deepin Desktop Environment'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/dde-calendar"
-license=('GPL3')
-depends=('deepin-qt5integration' 'hicolor-icon-theme')
-makedepends=('cmake' 'ninja' 'qt5-tools')
-groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-calendar/archive/$pkgver.tar.gz"
-        "dde-calendar-icon.patch")
-sha512sums=('f4f388eb403933342d320421836e7000defcf26081354cd1bd5a6573383de3d978972ff30506f95be6f41960bf22a2de46a62d9bb8f11f35357c54d2bc243229'
-            '40ffae29fcbd386512dac9b91c39219b420b349f1f5facc254467b9e5407091886c8d0ed0979d566ba79539c093464cbc7719da7268c9745bc30273f9d7db7e2')
-
-prepare() {
-  cd dde-calendar-$pkgver
-
-  # Install the application icon
-  # https://github.com/linuxdeepin/dde-calendar/pull/31
-  patch -Np1 -i ../dde-calendar-icon.patch
-}
-
-build() {
-  cd dde-calendar-$pkgver
-  cmake -GNinja -DCMAKE_INSTALL_PREFIX=/usr .
-  ninja
-}
-
-package() {
-  cd dde-calendar-$pkgver
-  DESTDIR="$pkgdir" ninja install
-}

Copied: deepin-calendar/repos/community-x86_64/PKGBUILD (from rev 754966, deepin-calendar/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-15 23:12:33 UTC (rev 754967)
@@ -0,0 +1,48 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-calendar
+pkgver=5.7.0.20
+pkgrel=1
+pkgdesc='Calendar for Deepin Desktop Environment'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/dde-calendar"
+license=('GPL3')
+depends=('deepin-qt5integration' 'hicolor-icon-theme')
+makedepends=('cmake' 'ninja' 'qt5-tools')
+groups=('deepin')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-calendar/archive/$pkgver.tar.gz"
+        "dde-calendar-icon.patch")
+sha512sums=('d2f2f62b3af28b68f16c38978c98369325c44e0e44cf57f4ccce66d91e3e24b04acad0bb65883a348448436dee31cbdeba4428d5c1dc5517c6dbd194bf46c95b'
+            '40ffae29fcbd386512dac9b91c39219b420b349f1f5facc254467b9e5407091886c8d0ed0979d566ba79539c093464cbc7719da7268c9745bc30273f9d7db7e2')
+
+prepare() {
+  cd dde-calendar-$pkgver
+
+  # Install the application icon
+  # https://github.com/linuxdeepin/dde-calendar/pull/31
+  patch -Np1 -i ../dde-calendar-icon.patch
+
+  sed -i '/<QQueue>/a #include <QMouseEvent>' src/widget/dayWidget/daymonthview.cpp
+  sed -i '/<QStylePainter>/a #include <QMouseEvent>' src/widget/schcedulesearchview.cpp
+  sed -i '/include <QJsonObject>/a #include <QMouseEvent>' src/view/draginfographicsview.cpp
+  sed -i '/include <QPainter>/a #include <QMouseEvent>' schedule-plugin/src/widget/itemwidget.h schedule-plugin/src/widget/modifyscheduleitem.h
+
+  # Not included in https://github.com/linuxdeepin/dde-calendar/pull/30 yet
+  sed -i '/include <QPainter>/a #include <QPainterPath>' src/widget/schcedulesearchview.cpp src/widget/dayWidget/daymonthview.cpp src/widget/weekWidget/weekheadview.cpp \
+                                                         src/customWidget/customframe.cpp src/widget/yearWidget/yearview.cpp schedule-plugin/src/widget/modifyscheduleitem.h \
+                                                         schedule-plugin/src/widget/itemwidget.h
+  sed -i '/include <QMessageBox>/a #include <QWheelEvent>' src/widget/yearWidget/yearwindow.cpp
+}
+
+build() {
+  cd dde-calendar-$pkgver
+  cmake -GNinja -DCMAKE_INSTALL_PREFIX=/usr .
+  ninja
+}
+
+package() {
+  cd dde-calendar-$pkgver
+  DESTDIR="$pkgdir" ninja install
+}

Deleted: dde-calendar-icon.patch
===================================================================
--- dde-calendar-icon.patch	2020-11-15 23:12:21 UTC (rev 754966)
+++ dde-calendar-icon.patch	2020-11-15 23:12:33 UTC (rev 754967)
@@ -1,24 +0,0 @@
-From 97129644e1fdd56a9254083e22430308ff0c9db6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Sat, 1 Aug 2020 13:54:20 +0200
-Subject: [PATCH] Install the application icon
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 863aa2f..946ba53 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -102,8 +102,8 @@ install(TARGETS dde-calendar DESTINATION bin)
- 
- file(GLOB APP_QM_FILES "translations/*.qm")
- 
--#install(FILES /usr/share/icons/bloom/apps/96/dde-calendar.svg
--#        DESTINATION /share/icons/hicolor/scalable/apps/)
-+install(FILES assets/resources/icon/dde-calendar.svg
-+        DESTINATION share/icons/hicolor/scalable/apps)
- install(FILES ${APP_QM_FILES} DESTINATION share/dde-calendar/translations)
- install(FILES ${APP_DESKTOP} DESTINATION share/applications)
- install(FILES ${APP_SERVICE} DESTINATION share/dbus-1/services)

Copied: deepin-calendar/repos/community-x86_64/dde-calendar-icon.patch (from rev 754966, deepin-calendar/trunk/dde-calendar-icon.patch)
===================================================================
--- dde-calendar-icon.patch	                        (rev 0)
+++ dde-calendar-icon.patch	2020-11-15 23:12:33 UTC (rev 754967)
@@ -0,0 +1,24 @@
+From 97129644e1fdd56a9254083e22430308ff0c9db6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Sat, 1 Aug 2020 13:54:20 +0200
+Subject: [PATCH] Install the application icon
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 863aa2f..946ba53 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -102,8 +102,8 @@ install(TARGETS dde-calendar DESTINATION bin)
+ 
+ file(GLOB APP_QM_FILES "translations/*.qm")
+ 
+-#install(FILES /usr/share/icons/bloom/apps/96/dde-calendar.svg
+-#        DESTINATION /share/icons/hicolor/scalable/apps/)
++install(FILES assets/resources/icon/dde-calendar.svg
++        DESTINATION share/icons/hicolor/scalable/apps)
+ install(FILES ${APP_QM_FILES} DESTINATION share/dde-calendar/translations)
+ install(FILES ${APP_DESKTOP} DESTINATION share/applications)
+ install(FILES ${APP_SERVICE} DESTINATION share/dbus-1/services)



More information about the arch-commits mailing list