Date: Tuesday, October 27, 2020 @ 21:17:29
Author: felixonmars
Revision: 735164
archrelease: copy trunk to community-x86_64
Added:
deepin-calendar/repos/community-x86_64/PKGBUILD
(from rev 735163, deepin-calendar/trunk/PKGBUILD)
deepin-calendar/repos/community-x86_64/dde-calendar-icon.patch
(from rev 735163, 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 | 94 +++++++++++++++++++++++-----------------------
dde-calendar-icon.patch | 48 +++++++++++------------
2 files changed, 71 insertions(+), 71 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-10-27 21:17:10 UTC (rev 735163)
+++ PKGBUILD 2020-10-27 21:17:29 UTC (rev 735164)
@@ -1,47 +0,0 @@
-# Maintainer: Felix Yan <felixonm...@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.13
-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=('dfa0cce2a260aa5755513369909d34a885b51241c09d44822573fc71bf84c76232b6bf0b9500984f268448481db66c260e45f36ba67d9f88831d35ba1160f1a4'
-
'40ffae29fcbd386512dac9b91c39219b420b349f1f5facc254467b9e5407091886c8d0ed0979d566ba79539c093464cbc7719da7268c9745bc30273f9d7db7e2')
-
-prepare() {
- cd dde-calendar-$pkgver
- sed -i '/<QQueue>/a #include <QMouseEvent>' src/daymonthview.cpp
- sed -i '/<QStylePainter>/a #include <QMouseEvent>'
src/schcedulesearchview.cpp
- sed -i '/include <QJsonObject>/a #include <QMouseEvent>'
src/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/schcedulesearchview.cpp src/daymonthview.cpp src/weekheadview.cpp \
- src/customframe.cpp
src/yearview.cpp schedule-plugin/src/widget/modifyscheduleitem.h \
-
schedule-plugin/src/widget/itemwidget.h
- sed -i '/include <QMessageBox>/a #include <QWheelEvent>' src/yearwindow.cpp
-
- # 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 735163,
deepin-calendar/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-10-27 21:17:29 UTC (rev 735164)
@@ -0,0 +1,47 @@
+# Maintainer: Felix Yan <felixonm...@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.14
+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=('6563d5c487e7d1343e17287aa3ad791ff212d2cab5651518888f11b3f0cb1d60876a74a6a8b9774e06d0652f7671e86a8def82bab7847fe8eb93d9a7520b146e'
+
'40ffae29fcbd386512dac9b91c39219b420b349f1f5facc254467b9e5407091886c8d0ed0979d566ba79539c093464cbc7719da7268c9745bc30273f9d7db7e2')
+
+prepare() {
+ cd dde-calendar-$pkgver
+ 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
+
+ # 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
+}
Deleted: dde-calendar-icon.patch
===================================================================
--- dde-calendar-icon.patch 2020-10-27 21:17:10 UTC (rev 735163)
+++ dde-calendar-icon.patch 2020-10-27 21:17:29 UTC (rev 735164)
@@ -1,24 +0,0 @@
-From 97129644e1fdd56a9254083e22430308ff0c9db6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@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 735163, deepin-calendar/trunk/dde-calendar-icon.patch)
===================================================================
--- dde-calendar-icon.patch (rev 0)
+++ dde-calendar-icon.patch 2020-10-27 21:17:29 UTC (rev 735164)
@@ -0,0 +1,24 @@
+From 97129644e1fdd56a9254083e22430308ff0c9db6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@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)
