summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorBrian Leung <leungbk@mailfence.com>2019-10-11 02:41:21 +0200
committerBrian Leung <leungbk@mailfence.com>2019-10-11 05:13:41 +0200
commitf7b3d9104e7149d1aca0ac257932eb759956b790 (patch)
tree62917b07f4720d55b9ec3abadba82a93553b9297 /gnu
parent8f1471149f6baa77a04348ee44db4cdadb4edd5c (diff)
downloadpatches-f7b3d9104e7149d1aca0ac257932eb759956b790.tar
patches-f7b3d9104e7149d1aca0ac257932eb759956b790.tar.gz
gnu: emacs-helm-org-ql: Remove patch file.
* gnu/local.mk (emacs-helm-org-ql): Remove entry. * gnu/packages/emacs-xyz.scm: Remove patch file. * gnu/packages/patches/emacs-helm-org-ql.patch: Delete file.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/emacs-xyz.scm15
-rw-r--r--gnu/packages/patches/emacs-helm-org-ql.patch42
3 files changed, 10 insertions, 48 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index e768c3cefb..2451698503 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -791,7 +791,6 @@ dist_patch_DATA = \
%D%/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch \
%D%/packages/patches/emacs-exec-path.patch \
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \
- %D%/packages/patches/emacs-helm-org-ql.patch \
%D%/packages/patches/emacs-json-reformat-fix-tests.patch \
%D%/packages/patches/emacs-highlight-stages-add-gexp.patch \
%D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index bc74e8fb4c..6893711d87 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -11753,7 +11753,7 @@ according to a parsing expression grammar.")
(define-public emacs-org-ql
(let ((commit "949a06c3ab50482b749fd2d4350837a197660d96")
- (revision "2"))
+ (revision "3"))
(package
(name "emacs-org-ql")
(version (git-version "0.3.1" revision commit))
@@ -11765,9 +11765,6 @@ according to a parsing expression grammar.")
(sha256
(base32
"0apcg63xm0242mjgsgw0jrcda4p4iqj7fy3sgh0p7khi4hrs5ch0"))
- (patches
- (search-patches
- "emacs-helm-org-ql.patch"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(propagated-inputs
@@ -11784,7 +11781,15 @@ according to a parsing expression grammar.")
(native-inputs
`(("emacs-buttercup" ,emacs-buttercup)))
(arguments
- `(#:tests? #t
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'require-helm
+ (lambda _
+ (substitute* "helm-org-ql.el"
+ (("^;;;; Requirements")
+ ";;;; Requirements\n(require 'helm)\n(require 'helm-org)"))
+ #t)))
+ #:tests? #t
#:test-command '("buttercup" "-L" ".")))
(home-page "https://github.com/alphapapa/org-ql/")
(synopsis "Query language for Org buffers")
diff --git a/gnu/packages/patches/emacs-helm-org-ql.patch b/gnu/packages/patches/emacs-helm-org-ql.patch
deleted file mode 100644
index 362e3d7d15..0000000000
--- a/gnu/packages/patches/emacs-helm-org-ql.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3918944856834ef4a7ed613243a1612424d2daba Mon Sep 17 00:00:00 2001
-From: Brian Leung <leungbk@mailfence.com>
-Date: Thu, 10 Oct 2019 06:54:33 +0200
-Subject: [PATCH] Use require statements.
-
----
- helm-org-ql.el | 19 ++-----------------
- 1 file changed, 2 insertions(+), 17 deletions(-)
-
-diff --git a/helm-org-ql.el b/helm-org-ql.el
-index 26beab9..113b7f2 100644
---- a/helm-org-ql.el
-+++ b/helm-org-ql.el
-@@ -35,23 +35,8 @@
- (require 'org-ql)
- (require 'org-ql-search)
-
--;; (require 'helm)
--;; (require 'helm-org)
--
--;;;; Compatibility
--
--;; Declare Helm functions since Helm may not be installed.
--(declare-function helm "ext:helm")
--(declare-function helm-run-after-exit "ext:helm")
--(declare-function helm-window "ext:helm-lib")
--(declare-function helm-buffer-get "ext:helm-lib")
--(declare-function helm-make-source "ext:helm-source")
--(declare-function helm-org-goto-marker "ext:helm-org")
--
--;; Silence byte-compiler about variables.
--(defvar helm-map)
--(defvar helm-pattern)
--(defvar helm-input-idle-delay)
-+(require 'helm)
-+(require 'helm-org)
-
- ;;;; Variables
-
---
-2.23.0
-