[bug#74047] [PATCH 0/2] gnu: ghostwriter: Redefine variable.

[bug#74047] [PATCH 0/2] gnu: ghostwriter: Redefine variable.

[Sughosha via Guix-patches via]

ghostwriter has moved to the KDE project, as stated in its home-page, so
removing it and defining the new version in gnu/packages/kde-office.scm.

Sughosha (2):
  gnu: Remove ghostwriter.
  gnu: Add ghostwriter.

 gnu/packages/kde-office.scm   | 40 +++++++++++++++++++++++++
 gnu/packages/text-editors.scm | 56 -----------------------------------
 2 files changed, 40 insertions(+), 56 deletions(-)


base-commit: 091131af64fd4e4e925fff829fa19097cfcdfcc5
-- 
2.46.0

[bug#74047] [PATCH 1/2] gnu: Remove ghostwriter.

[Sughosha via Guix-patches via]

* gnu/packages/text-editors.scm (ghostwriter): Remove variable.

Change-Id: I3bf4f80a232539bad72dec1110734408d5054453
---
 gnu/packages/text-editors.scm | 56 -----------------------------------
 1 file changed, 56 deletions(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index bfd9a7a060..fae021f012 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -89,7 +89,6 @@ (define-module (gnu packages text-editors)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages haskell-xyz)
-  #:use-module (gnu packages hunspell)
   #:use-module (gnu packages image)
   #:use-module (gnu packages lesstif)
   #:use-module (gnu packages libbsd)
@@ -869,61 +868,6 @@ (define-public qemacs
 @end itemize")
     (license license:lgpl2.1+)))
 
-(define-public ghostwriter
-  (package
-    (name "ghostwriter")
-    (version "2.1.4")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/wereturtle/ghostwriter")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1w8a6vkhmdbp4kzb7aprvfni9ny47dj0vigbcnsh539dn3sp1gan"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     (list pkg-config qttools-5))       ; for lrelease
-    (inputs
-     (list bash-minimal
-           hunspell
-           qtbase-5
-           qtdeclarative-5
-           qtmultimedia-5
-           qtquickcontrols-5
-           qtsvg-5
-           qtwebchannel-5))
-    (propagated-inputs                  ; To get native-search-path
-     (list qtwebengine-5))
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'configure
-            (lambda* (#:key outputs #:allow-other-keys)
-              (invoke "qmake" (string-append "PREFIX=" #$output))))
-          (add-after 'configure 'create-translations
-            (lambda _
-              ;; `lrelease` will not overwrite, so delete existing .qm files
-              (for-each delete-file (find-files "translations" ".*\\.qm"))
-              (apply invoke "lrelease" (find-files "translations" ".*\\.ts"))))
-          ;; Ensure that icons are found at runtime.
-          (add-after 'install 'wrap-executable
-            (lambda* (#:key inputs outputs #:allow-other-keys)
-              (wrap-program (string-append #$output "/bin/ghostwriter")
-                `("QT_PLUGIN_PATH" ":" prefix
-                  #$(map (lambda (label)
-                           (file-append (this-package-input label)
-                                        "/lib/qt5/plugins"))
-                         '("qtsvg" "qtmultimedia")))))))))
-    (home-page "https://wereturtle.github.io/ghostwriter/")
-    (synopsis "Write without distractions")
-    (description
-     "@code{ghostwriter} provides a relaxing, distraction-free writing
-environment with Markdown markup.")
-    (license license:gpl3+)))           ; icons/* under CC-BY-SA3
-
 (define-public manuskript
   (package
     (name "manuskript")

base-commit: 091131af64fd4e4e925fff829fa19097cfcdfcc5
-- 
2.46.0

[bug#74047] [PATCH 2/2] gnu: Add ghostwriter.

[Sughosha via Guix-patches via]

* gnu/packages/kde-office.scm (ghostwriter): New variable.

Change-Id: I634e4ecab8c53aa67eb521f479d1acff6540c9fe
---
 gnu/packages/kde-office.scm | 40 +++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/kde-office.scm b/gnu/packages/kde-office.scm
index c4e3c757b5..66ec5ec0ec 100644
--- a/gnu/packages/kde-office.scm
+++ b/gnu/packages/kde-office.scm
@@ -30,6 +30,7 @@ (define-module (gnu packages kde-office)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages graphics)
+  #:use-module (gnu packages hunspell)
   #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages libreoffice)
@@ -142,3 +143,42 @@ (define-public calligra
 @item KFormula: Mathematical formulas
 @end itemize")
     (license (list license:lgpl2.0+ license:gpl2+))))
+
+(define-public ghostwriter
+  (package
+    (name "ghostwriter")
+    (version "24.05.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kde/stable/release-service/" version
+                                    "/src/ghostwriter-" version ".tar.xz"))
+              (sha256
+               (base32 "181izld9wnbwlknw7h876ysranqqvbvb0h2p4ky54jfb82f9h513"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:qtbase qtbase
+            #:configure-flags
+            #~(list "-DQT_MAJOR_VERSION=6"
+                     "-DBUILD_TESTING=ON")))
+    (native-inputs
+     (list extra-cmake-modules kdoctools pkg-config qttools))
+    (inputs
+     (list hunspell
+            kconfigwidgets
+            kcoreaddons
+            kwidgetsaddons
+            kxmlgui
+            qt5compat
+            qtsvg
+            qtwebchannel
+            qtwebengine
+            sonnet))
+    (home-page "https://ghostwriter.kde.org/")
+    (synopsis "Text editor for Markdown")
+    (description "@code{ghostwriter} is a text editor for Markdown, which is a plain
+text markup format.  It features a live HTML preview as you type, theme
+creation, focus mode, fullscreen mode, live word count, and document navigation
+in an aesthetic writing environment.  It comes with the cmark-gfm Markdown
+processor built in, and can integrate with Pandoc, MultiMarkdown, Discount, and
+cmark processors if they are installed.")
+    (license license:gpl3+)))
-- 
2.46.0

[bug#74047] [PATCH 0/2] gnu: ghostwriter: Redefine variable.

[Z572]

[-- Attachment #1: Type: text/plain, Size: 553 bytes --]

Sughosha via Guix-patches via <guix-patches@gnu.org> writes:

> ghostwriter has moved to the KDE project, as stated in its home-page, so
> removing it and defining the new version in gnu/packages/kde-office.scm.
>
> Sughosha (2):
>   gnu: Remove ghostwriter.
>   gnu: Add ghostwriter.
>
>  gnu/packages/kde-office.scm   | 40 +++++++++++++++++++++++++
>  gnu/packages/text-editors.scm | 56 -----------------------------------
>  2 files changed, 40 insertions(+), 56 deletions(-)
>
>
> base-commit: 091131af64fd4e4e925fff829fa19097cfcdfcc5

push, close.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]