diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-06-19 00:09:54 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-19 00:09:54 +0100 |
| commit | e8df704cf9b5e9e517317b8912377c0a8ca0d11e (patch) | |
| tree | ab3f43045fb1d37471f8217c8547d2120bb3d1da /app-emacs | |
| parent | ccaccfe4f1da8c11d9fa110f6e4eb847358769d7 (diff) | |
gentoo auto-resync : 19:06:2024 - 00:09:54
Diffstat (limited to 'app-emacs')
| -rw-r--r-- | app-emacs/Manifest.gz | bin | 75309 -> 75310 bytes | |||
| -rw-r--r-- | app-emacs/calfw/Manifest | 3 | ||||
| -rw-r--r-- | app-emacs/calfw/calfw-1.6-r1.ebuild (renamed from app-emacs/calfw/calfw-1.6.ebuild) | 8 | ||||
| -rw-r--r-- | app-emacs/calfw/files/calfw-1.6-time-ranges.patch | 39 |
4 files changed, 47 insertions, 3 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz Binary files differindex acd22333e59a..63bd539eff97 100644 --- a/app-emacs/Manifest.gz +++ b/app-emacs/Manifest.gz diff --git a/app-emacs/calfw/Manifest b/app-emacs/calfw/Manifest index d55aff9cd40c..6dd0e01b33e4 100644 --- a/app-emacs/calfw/Manifest +++ b/app-emacs/calfw/Manifest @@ -1,4 +1,5 @@ AUX 50calfw-gentoo.el 118 BLAKE2B e5cd4b96817cc88b25d8da38f4d45f7c730feec236a4c636c5816d312a78f5689a7d076f4f53d0e1b947c536826057acb09a89cf8773ddb2752d148094adbb02 SHA512 55cf26db6805dc42f34c090214fc0d87594aacbab5d2113e26472453959a3d4f8d5bfacbf81954c14ac90aaaebc4e4fe8a6914aa31729459993de43a4347aa23 +AUX calfw-1.6-time-ranges.patch 1657 BLAKE2B dcf510cde1d6034c4e3f0acd0ccdc0fa39219320e56103bdd8907c2e11f6bbd061118e37132dd527e82efc4aac6997af34efd2a98dea0fd274903bdb6ea9cf1b SHA512 f0739e0cddca462ef09e8f76d5c9e1055fe411af4846239a4aeb09c44ed0cd32a4718ec3d3180ae0c98e8f3b3cff8f30d96f7bc84c0adedb9b16da2460c4373b DIST calfw-1.6.tar.gz 74776 BLAKE2B 26aee13fa7533c17eac9c32e8355c6e2fd760e8f87166d7a28ae90040a156ad8e8d8205387b37e5069705fa42095f318a40032ba5ce161f3d84f4823ee6619be SHA512 0c51c1747cfdda003a3b2244224e1bc2afe7b3dbdbb47804734504013ad94f7c5aaa30a2370ae9383f3836f266d47f695ca3d90419d899c8a639d474fab14180 -EBUILD calfw-1.6.ebuild 585 BLAKE2B 5daa74d926134c9b86cb8f55264ec262aa7d1b04cf50aedceae05f1af56b9d206a1ff8fa58dc04914e81d21124027262b1d3e171c8e1d13c4e977f5d611b5078 SHA512 78b6eacfcd55f208902908cc7dec9932c258e2a79953ba02f0f9260becfa22ae666b5ea8a7de9c5fec45e349436ebf703c28d4f72f48cf76bbd6b1bf99f7b7bf +EBUILD calfw-1.6-r1.ebuild 636 BLAKE2B 95fd9b22d40caaf36cf8d4109771a095e1d509b9696b90e5efc6ce06a76aa583134ed43a6c93dfee61215f7e0fd29d2912bfe0311d416f07241876d957ed091d SHA512 54cfca1484fbf2efa88c44bbeb44d5fdb879713e3ef6b2d08f74ff6514841125c0889ca11f313fd7a59b2a911a4ccd3d4c83764e734fffb753fb1a0eaadb3777 MISC metadata.xml 584 BLAKE2B a0e5afd297cb961ace2c3990748c60be9ce6f01505372fda7f423e18b83394f590e01eac69e54ccea74894ca67a8cb7da49de69ced0a6194f4e5866dc500326b SHA512 5adba29affefa990fe9aaeaa19f57a352c67fd686986f6cce0cac673154c719b032b389f7e01dcff61a6eccf43f3e3d1bccd77be372fb1e3a4eeb28124d82266 diff --git a/app-emacs/calfw/calfw-1.6.ebuild b/app-emacs/calfw/calfw-1.6-r1.ebuild index da8343f73582..28efbf62a8b7 100644 --- a/app-emacs/calfw/calfw-1.6.ebuild +++ b/app-emacs/calfw/calfw-1.6-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit elisp @@ -21,6 +21,10 @@ S="${WORKDIR}/emacs-${PN}-${PV}" SITEFILE="50${PN}-gentoo.el" DOCS="readme.md" +PATCHES=( + "${FILESDIR}"/${P}-time-ranges.patch +) + src_prepare() { elisp_src_prepare use howm || rm calfw-howm.el || die diff --git a/app-emacs/calfw/files/calfw-1.6-time-ranges.patch b/app-emacs/calfw/files/calfw-1.6-time-ranges.patch new file mode 100644 index 000000000000..582b8f443b45 --- /dev/null +++ b/app-emacs/calfw/files/calfw-1.6-time-ranges.patch @@ -0,0 +1,39 @@ +From fc4306c44b681b6e8f956ebc2740002bdb66d266 Mon Sep 17 00:00:00 2001 +From: Maxime Wack <MaximeWack@users.noreply.github.com> +Date: Wed, 3 Feb 2021 12:51:20 +0100 +Subject: [PATCH 1/3] Fix cfw:org-get-timerange to display the correct + timerange + +From 407b0eb31b1d16532e22316edfba5b0b76f4cd3b Mon Sep 17 00:00:00 2001 +From: Maxime Wack <maximewack@free.Fr> +Date: Mon, 7 Jun 2021 00:58:43 +0200 +Subject: [PATCH 2/3] Re-use start-date, as permitted by let* + +From 6c75fd3acb47f634d0b2c3c591e659c5bae448cc Mon Sep 17 00:00:00 2001 +From: Maxime Wack <maximewack@free.Fr> +Date: Mon, 7 Jun 2021 00:59:35 +0200 +Subject: [PATCH 3/3] Fix the double displaying of timeranges with times + +--- a/calfw-org.el ++++ b/calfw-org.el +@@ -238,14 +238,13 @@ + (match-string 1 extra))) + (total-days (string-to-number + (match-string 2 extra))) +- (start-date (time-subtract +- (org-read-date nil t date-string) +- (seconds-to-time (* 3600 24 (- cur-day 1))))) ++ (start-date (org-read-date nil t date-string)) + (end-date (time-add +- (org-read-date nil t date-string) +- (seconds-to-time (* 3600 24 (- total-days cur-day)))))) +- (list (calendar-gregorian-from-absolute (time-to-days start-date)) +- (calendar-gregorian-from-absolute (time-to-days end-date)) text)) ++ start-date ++ (seconds-to-time (* 3600 24 (- total-days 1)))))) ++ (unless (= cur-day total-days) ++ (list (calendar-gregorian-from-absolute (time-to-days start-date)) ++ (calendar-gregorian-from-absolute (time-to-days end-date)) text))) + ))))) + + (defun cfw:org-schedule-period-to-calendar (begin end) |