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

[Jiachen Yang]

    Date: Friday, September 25, 2020 @ 02:02:32
  Author: farseerfc
Revision: 711949

archrelease: copy trunk to community-x86_64

Added:
  flameshot/repos/community-x86_64/PKGBUILD
    (from rev 711948, flameshot/trunk/PKGBUILD)
  flameshot/repos/community-x86_64/flameshot.install
    (from rev 711948, flameshot/trunk/flameshot.install)
Deleted:
  flameshot/repos/community-x86_64/PKGBUILD
  flameshot/repos/community-x86_64/flameshot.install

-------------------+
 PKGBUILD          |   70 +++++++++++++++++++++++++++++-----------------------
 flameshot.install |   44 ++++++++++++++++----------------
 2 files changed, 62 insertions(+), 52 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-25 02:01:47 UTC (rev 711948)
+++ PKGBUILD	2020-09-25 02:02:32 UTC (rev 711949)
@@ -1,30 +0,0 @@
-# Maintainer: Jiachen YANG <farseerfc at archlinux.org>
-# Contributor: xyzzy <628208 at gmail.com>
-
-pkgname=flameshot
-pkgver=0.8.1
-pkgrel=1
-pkgdesc="Powerful yet simple to use screenshot software"
-arch=('x86_64')
-url="https://github.com/lupoDharkael/flameshot"
-license=('GPL')
-depends=('qt5-svg' 'hicolor-icon-theme')
-makedepends=('make' 'qt5-tools' 'cmake')
-source=("${pkgname}-v${pkgver}.tar.gz::https://github.com/lupoDharkael/flameshot/archive/v${pkgver}.tar.gz")
-sha256sums=('92394c469536b264f36e592b51468d9bbe4ea619888bb0090e8a4831c2ce2d7c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  mkdir build
-  cd build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-  
-  # zsh _flameshot completion is provided by zsh-completions so exclude from packaging
-  rm -rf ${pkgdir}/usr/share/zsh/
-}

Copied: flameshot/repos/community-x86_64/PKGBUILD (from rev 711948, flameshot/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-09-25 02:02:32 UTC (rev 711949)
@@ -0,0 +1,40 @@
+# Maintainer: Jiachen YANG <farseerfc at archlinux.org>
+# Contributor: xyzzy <628208 at gmail.com>
+
+pkgname=flameshot
+pkgver=0.8.1
+pkgrel=2
+pkgdesc="Powerful yet simple to use screenshot software"
+arch=('x86_64')
+url="https://github.com/lupoDharkael/flameshot"
+license=('GPL')
+depends=('qt5-svg' 'hicolor-icon-theme')
+makedepends=('make' 'qt5-tools' 'cmake')
+source=("${pkgname}-v${pkgver}.tar.gz::https://github.com/lupoDharkael/flameshot/archive/v${pkgver}.tar.gz"
+"pr969.patch::https://github.com/flameshot-org/flameshot/commit/0d5386edd4223dca682c0a50e53f6931af080ee9.patch"
+"pr648.patch::https://github.com/flameshot-org/flameshot/commit/e1214e23e5a2641d585e47aa064cfcbb8a2b6111.patch")
+sha256sums=('92394c469536b264f36e592b51468d9bbe4ea619888bb0090e8a4831c2ce2d7c'
+            'c69c5055452e688cd3f2ca8b2d7ba9e3f8985727884f5ee6cba8e1d686e815f2'
+            '0f5aeb9cab8540ef0fec2ce71de18aabb7fd8ffeb2b080fab1ff88b88569a22c')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/pr969.patch # https://github.com/flameshot-org/flameshot/commit/0d5386edd4223dca682c0a50e53f6931af080ee9
+  patch -Np1 -i ${srcdir}/pr648.patch # https://github.com/flameshot-org/flameshot/commit/e1214e23e5a2641d585e47aa064cfcbb8a2b6111
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  mkdir build
+  cd build
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/build"
+  make DESTDIR="${pkgdir}" install
+  
+  # zsh _flameshot completion is provided by zsh-completions so exclude from packaging
+  rm -rf ${pkgdir}/usr/share/zsh/
+}

Deleted: flameshot.install
===================================================================
--- flameshot.install	2020-09-25 02:01:47 UTC (rev 711948)
+++ flameshot.install	2020-09-25 02:02:32 UTC (rev 711949)
@@ -1,22 +0,0 @@
-echo_shortcut() {
-	echo "See the link about keyboard shortcuts: https://github.com/lupoDharkael/flameshot#keyboard-shortcuts"
-}
-
-echo_gnome3() {
-	echo "For Gnome3 users: please install one of the tray icons extension to use the systray icon"
-}
-
-post_upgrade(){
-	if [ $(vercmp $2 0.5.1) -lt 0 ]; then
-        echo_shortcut
-	fi
-
-	if [ $(vercmp $2 0.5.1-3) -lt 0 ]; then
-        echo_gnome3
-	fi
-}
-
-post_install(){
-    echo_shortcut
-    echo_gnome3
-}

Copied: flameshot/repos/community-x86_64/flameshot.install (from rev 711948, flameshot/trunk/flameshot.install)
===================================================================
--- flameshot.install	                        (rev 0)
+++ flameshot.install	2020-09-25 02:02:32 UTC (rev 711949)
@@ -0,0 +1,22 @@
+echo_shortcut() {
+	echo "See the link about keyboard shortcuts: https://github.com/lupoDharkael/flameshot#keyboard-shortcuts"
+}
+
+echo_gnome3() {
+	echo "For Gnome3 users: please install one of the tray icons extension to use the systray icon"
+}
+
+post_upgrade(){
+	if [ $(vercmp $2 0.5.1) -lt 0 ]; then
+        echo_shortcut
+	fi
+
+	if [ $(vercmp $2 0.5.1-3) -lt 0 ]; then
+        echo_gnome3
+	fi
+}
+
+post_install(){
+    echo_shortcut
+    echo_gnome3
+}