* [bug#44637] [PATCH] gnu: flameshot: Update to 0.8.5.
@ 2020-11-14 16:45 Zhu Zihao
[not found] ` <handler.44637.B.16053723896003.ack@debbugs.gnu.org>
0 siblings, 1 reply; 5+ messages in thread
From: Zhu Zihao @ 2020-11-14 16:45 UTC (permalink / raw)
To: 44637
[-- Attachment #1.1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 515 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-flameshot-Update-to-0.8.5.patch --]
[-- Type: text/x-patch, Size: 2221 bytes --]
From 341a4c3412325bd1f9d028db57058480512862e7 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sun, 15 Nov 2020 00:43:27 +0800
Subject: [PATCH] gnu: flameshot: Update to 0.8.5.
* gnu/packages/image.scm(flameshot): Update to 0.8.5.
[source, home-page]: Use new source URL.
[build-system]: Use cmake-build-system.
[inputs]: Add qtsvg.
[arguments]<phases>: Remove.
---
gnu/packages/image.scm | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 36d7dd606f..08f10ce55d 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1789,33 +1789,27 @@ parsing, viewing, modifying, and saving this metadata.")
(define-public flameshot
(package
(name "flameshot")
- (version "0.5.1")
+ (version "0.8.5")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/lupoDharkael/flameshot")
+ (url "https://github.com/flameshot-org/flameshot")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "13h77np93r796jf289v4r687cmnpqkyqs34dm9gif4akaig74ky0"))))
- (build-system gnu-build-system)
+ "1z77igs60lz106vsf6wsayxjafxm3llf2lm4dpvsqyyrxybfq191"))))
+ (build-system cmake-build-system)
(native-inputs
`(("qttools" ,qttools)))
(inputs
- `(("qtbase" ,qtbase)))
+ `(("qtbase" ,qtbase)
+ ("qtsvg" ,qtsvg)))
(arguments
- `(#:tests? #f ; no tests
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (invoke "qmake"
- "CONFIG+=packaging"
- (string-append "BASEDIR=" (assoc-ref outputs "out"))
- "PREFIX=/"))))))
- (home-page "https://github.com/lupoDharkael/flameshot")
+ ;; No test
+ #:tests? #f)
+ (home-page "https://github.com/flameshot-org/flameshot")
(synopsis "Powerful yet simple to use screenshot software")
(description "Flameshot is a screenshot program.
Features:
--
2.29.2
[-- Attachment #3: Type: text/plain, Size: 71 bytes --]
--
Retrieve my PGP public key: https://meta.sr.ht/~citreu.pgp
Zihao
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#44637] Acknowledgement ([PATCH] gnu: flameshot: Update to 0.8.5.)
[not found] ` <handler.44637.B.16053723896003.ack@debbugs.gnu.org>
@ 2020-11-14 16:50 ` Zhu Zihao
2020-11-14 18:08 ` Zhu Zihao
0 siblings, 1 reply; 5+ messages in thread
From: Zhu Zihao @ 2020-11-14 16:50 UTC (permalink / raw)
To: 44637
[-- Attachment #1.1: Type: text/plain, Size: 75 bytes --]
Sorry, I forget to quote the arguments field. Here is the updated patch.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 515 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-flameshot-Update-to-0.8.5.patch --]
[-- Type: text/x-patch, Size: 2235 bytes --]
From da6083f23fcf3a2d9c10bda5bf7ed2f57855a681 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sun, 15 Nov 2020 00:43:27 +0800
Subject: [PATCH] gnu: flameshot: Update to 0.8.5.
* gnu/packages/image.scm(flameshot): Update to 0.8.5.
[source, home-page]: Use new source URL.
[build-system]: Use cmake-build-system.
[inputs]: Add qtsvg.
[arguments]<phases>: Remove.
---
gnu/packages/image.scm | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 36d7dd606f..d63b28916a 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1789,33 +1789,26 @@ parsing, viewing, modifying, and saving this metadata.")
(define-public flameshot
(package
(name "flameshot")
- (version "0.5.1")
+ (version "0.8.5")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/lupoDharkael/flameshot")
+ (url "https://github.com/flameshot-org/flameshot")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "13h77np93r796jf289v4r687cmnpqkyqs34dm9gif4akaig74ky0"))))
- (build-system gnu-build-system)
+ "1z77igs60lz106vsf6wsayxjafxm3llf2lm4dpvsqyyrxybfq191"))))
+ (build-system cmake-build-system)
(native-inputs
`(("qttools" ,qttools)))
(inputs
- `(("qtbase" ,qtbase)))
+ `(("qtbase" ,qtbase)
+ ("qtsvg" ,qtsvg)))
(arguments
- `(#:tests? #f ; no tests
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (invoke "qmake"
- "CONFIG+=packaging"
- (string-append "BASEDIR=" (assoc-ref outputs "out"))
- "PREFIX=/"))))))
- (home-page "https://github.com/lupoDharkael/flameshot")
+ `(#:tests? #f)) ;no tests
+ (home-page "https://github.com/flameshot-org/flameshot")
(synopsis "Powerful yet simple to use screenshot software")
(description "Flameshot is a screenshot program.
Features:
--
2.29.2
[-- Attachment #3: Type: text/plain, Size: 72 bytes --]
--
Retrieve my PGP public key: https://meta.sr.ht/~citreu.pgp
Zihao
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#44637] Acknowledgement ([PATCH] gnu: flameshot: Update to 0.8.5.)
2020-11-14 16:50 ` [bug#44637] Acknowledgement ([PATCH] gnu: flameshot: Update to 0.8.5.) Zhu Zihao
@ 2020-11-14 18:08 ` Zhu Zihao
2020-11-14 18:16 ` Zhu Zihao
0 siblings, 1 reply; 5+ messages in thread
From: Zhu Zihao @ 2020-11-14 18:08 UTC (permalink / raw)
To: 44637
[-- Attachment #1.1: Type: text/plain, Size: 52 bytes --]
Use qt-build-system instead of cmake-build-system.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 515 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-flameshot-Update-to-0.8.5.patch --]
[-- Type: text/x-patch, Size: 2232 bytes --]
From 6a1b9ead1775733ed01ca5c330026199953152a4 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sun, 15 Nov 2020 00:43:27 +0800
Subject: [PATCH] gnu: flameshot: Update to 0.8.5.
* gnu/packages/image.scm(flameshot): Update to 0.8.5.
[source, home-page]: Use new source URL.
[build-system]: Use cmake-build-system.
[inputs]: Add qtsvg.
[arguments]<phases>: Remove.
---
gnu/packages/image.scm | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 36d7dd606f..c05e66f1b8 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1789,33 +1789,26 @@ parsing, viewing, modifying, and saving this metadata.")
(define-public flameshot
(package
(name "flameshot")
- (version "0.5.1")
+ (version "0.8.5")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/lupoDharkael/flameshot")
+ (url "https://github.com/flameshot-org/flameshot")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "13h77np93r796jf289v4r687cmnpqkyqs34dm9gif4akaig74ky0"))))
- (build-system gnu-build-system)
+ "1z77igs60lz106vsf6wsayxjafxm3llf2lm4dpvsqyyrxybfq191"))))
+ (build-system qt-build-system)
(native-inputs
`(("qttools" ,qttools)))
(inputs
- `(("qtbase" ,qtbase)))
+ `(("qtbase" ,qtbase)
+ ("qtsvg" ,qtsvg)))
(arguments
- `(#:tests? #f ; no tests
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (invoke "qmake"
- "CONFIG+=packaging"
- (string-append "BASEDIR=" (assoc-ref outputs "out"))
- "PREFIX=/"))))))
- (home-page "https://github.com/lupoDharkael/flameshot")
+ `(#:tests? #f)) ;no tests
+ (home-page "https://github.com/flameshot-org/flameshot")
(synopsis "Powerful yet simple to use screenshot software")
(description "Flameshot is a screenshot program.
Features:
--
2.29.2
[-- Attachment #3: Type: text/plain, Size: 72 bytes --]
--
Retrieve my PGP public key: https://meta.sr.ht/~citreu.pgp
Zihao
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#44637] Acknowledgement ([PATCH] gnu: flameshot: Update to 0.8.5.)
2020-11-14 18:08 ` Zhu Zihao
@ 2020-11-14 18:16 ` Zhu Zihao
2020-11-24 9:11 ` bug#44637: " Efraim Flashner
0 siblings, 1 reply; 5+ messages in thread
From: Zhu Zihao @ 2020-11-14 18:16 UTC (permalink / raw)
To: 44637
[-- Attachment #1.1: Type: text/plain, Size: 67 bytes --]
This is the final edition I think. with commit message polished.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 515 bytes --]
[-- Attachment #2: 0001-gnu-flameshot-Update-to-0.8.5.patch --]
[-- Type: text/x-patch, Size: 2617 bytes --]
From cfdef8e53b54587df31f883b79ca5535f03be3ff Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sun, 15 Nov 2020 00:43:27 +0800
Subject: [PATCH] gnu: flameshot: Update to 0.8.5.
* gnu/packages/image.scm(flameshot): Update to 0.8.5.
[source, home-page]: Use new source URL.
[build-system]: Use qt-build-system.
[inputs]: Add qtsvg.
[arguments]<phases>: Remove stale code.
---
gnu/packages/image.scm | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 36d7dd606f..d643b38e16 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -26,6 +26,7 @@
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1789,33 +1790,26 @@ parsing, viewing, modifying, and saving this metadata.")
(define-public flameshot
(package
(name "flameshot")
- (version "0.5.1")
+ (version "0.8.5")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/lupoDharkael/flameshot")
+ (url "https://github.com/flameshot-org/flameshot")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "13h77np93r796jf289v4r687cmnpqkyqs34dm9gif4akaig74ky0"))))
- (build-system gnu-build-system)
+ "1z77igs60lz106vsf6wsayxjafxm3llf2lm4dpvsqyyrxybfq191"))))
+ (build-system qt-build-system)
(native-inputs
`(("qttools" ,qttools)))
(inputs
- `(("qtbase" ,qtbase)))
+ `(("qtbase" ,qtbase)
+ ("qtsvg" ,qtsvg)))
(arguments
- `(#:tests? #f ; no tests
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (invoke "qmake"
- "CONFIG+=packaging"
- (string-append "BASEDIR=" (assoc-ref outputs "out"))
- "PREFIX=/"))))))
- (home-page "https://github.com/lupoDharkael/flameshot")
+ `(#:tests? #f)) ;no tests
+ (home-page "https://github.com/flameshot-org/flameshot")
(synopsis "Powerful yet simple to use screenshot software")
(description "Flameshot is a screenshot program.
Features:
--
2.29.2
[-- Attachment #3: Type: text/plain, Size: 71 bytes --]
--
Retrieve my PGP public key: https://meta.sr.ht/~citreu.pgp
Zihao
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#44637: Acknowledgement ([PATCH] gnu: flameshot: Update to 0.8.5.)
2020-11-14 18:16 ` Zhu Zihao
@ 2020-11-24 9:11 ` Efraim Flashner
0 siblings, 0 replies; 5+ messages in thread
From: Efraim Flashner @ 2020-11-24 9:11 UTC (permalink / raw)
To: Zhu Zihao; +Cc: 44637-done
[-- Attachment #1: Type: text/plain, Size: 240 bytes --]
Looks good. Patch pushed!
--
Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-11-24 9:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-14 16:45 [bug#44637] [PATCH] gnu: flameshot: Update to 0.8.5 Zhu Zihao
[not found] ` <handler.44637.B.16053723896003.ack@debbugs.gnu.org>
2020-11-14 16:50 ` [bug#44637] Acknowledgement ([PATCH] gnu: flameshot: Update to 0.8.5.) Zhu Zihao
2020-11-14 18:08 ` Zhu Zihao
2020-11-14 18:16 ` Zhu Zihao
2020-11-24 9:11 ` bug#44637: " Efraim Flashner
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).