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

[Jiachen Yang]

    Date: Friday, December 28, 2018 @ 15:32:59
  Author: farseerfc
Revision: 418650

archrelease: copy trunk to community-x86_64

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

-------------------+
 PKGBUILD          |   76 ++++++++++++++++++++++++++--------------------------
 flameshot.install |   44 +++++++++++++++---------------
 2 files changed, 61 insertions(+), 59 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-28 15:32:11 UTC (rev 418649)
+++ PKGBUILD	2018-12-28 15:32:59 UTC (rev 418650)
@@ -1,37 +0,0 @@
-# Maintainer: Jiachen YANG <farseerfc at archlinux.org>
-# Contributor: xyzzy <628208 at gmail.com>
-
-pkgname=flameshot
-pkgver=0.6.0
-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')
-source=("https://github.com/lupoDharkael/flameshot/archive/v${pkgver}.tar.gz"
-	)
-sha256sums=('61b3a1969d6e17d80d5d90a3fce53ca5ae78fa21f9a45e5a19b0b32ea815a589')
-install="${pkgname}.install"
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ### fix locale setting
-  #sed -i 's|QLocale::system[(][)][.]language[(][)]|QLocale()|' src/main.cpp
-
-  ## add a version number from pkgver
-  sed -i "s|TAG_VERSION = .*|TAG_VERSION = v${pkgver}|" flameshot.pro 
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  qmake CONFIG+=packaging BASEDIR="${pkgdir}"
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make INSTALL_ROOT="${pkgdir}" install
-}

Copied: flameshot/repos/community-x86_64/PKGBUILD (from rev 418649, flameshot/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-12-28 15:32:59 UTC (rev 418650)
@@ -0,0 +1,39 @@
+# Maintainer: Jiachen YANG <farseerfc at archlinux.org>
+# Contributor: xyzzy <628208 at gmail.com>
+
+pkgname=flameshot
+pkgver=0.6.0
+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')
+source=("https://github.com/lupoDharkael/flameshot/archive/v${pkgver}.tar.gz"
+	"fix311.patch::https://github.com/lupoDharkael/flameshot/commit/415b059fb248eec4b4ee3be85a1594ce99bfce67.patch"
+	)
+sha256sums=('61b3a1969d6e17d80d5d90a3fce53ca5ae78fa21f9a45e5a19b0b32ea815a589'
+            '94da922546ce1b41d702e13d4ec2141f6383b2410bd9b2ddd34ce75e1d8c9209')
+install="${pkgname}.install"
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ## fix https://github.com/lupoDharkael/flameshot/issues/311
+  patch -Np1 -i ../fix311.patch
+
+  ## add a version number from pkgver
+  sed -i "s|TAG_VERSION = .*|TAG_VERSION = v${pkgver}|" flameshot.pro 
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  qmake CONFIG+=packaging BASEDIR="${pkgdir}"
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make INSTALL_ROOT="${pkgdir}" install
+}

Deleted: flameshot.install
===================================================================
--- flameshot.install	2018-12-28 15:32:11 UTC (rev 418649)
+++ flameshot.install	2018-12-28 15:32:59 UTC (rev 418650)
@@ -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 418649, flameshot/trunk/flameshot.install)
===================================================================
--- flameshot.install	                        (rev 0)
+++ flameshot.install	2018-12-28 15:32:59 UTC (rev 418650)
@@ -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
+}