Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [PRETEST] emacs: update to 29.0.92.
@ 2023-07-21 10:23 leahneukirchen
  2023-07-30 15:13 ` [PR PATCH] [Merged]: emacs: update to 29.1 leahneukirchen
  2023-08-02 18:27 ` leahneukirchen
  0 siblings, 2 replies; 3+ messages in thread
From: leahneukirchen @ 2023-07-21 10:23 UTC (permalink / raw)
  To: ml

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

There is a new pull request by leahneukirchen against master on the void-packages repository

https://github.com/leahneukirchen/void-packages emacs29
https://github.com/void-linux/void-packages/pull/45168

[PRETEST] emacs: update to 29.0.92.
<!-- Uncomment relevant sections and delete options which are not applicable -->

People wanting to pretest Emacs 29 can use this branch.

#### Testing the changes
- I tested the changes in this PR: **YES** (on x86_64)


A patch file from https://github.com/void-linux/void-packages/pull/45168.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-emacs29-45168.patch --]
[-- Type: text/x-diff, Size: 4300 bytes --]

From 35389dd69345cd659df5524e6db8fc068669f67c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 21 Jul 2023 12:22:21 +0200
Subject: [PATCH] emacs: update to 29.0.92.

---
 srcpkgs/emacs/template | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 328d0a36ce03..1124bd4da106 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,53 +1,54 @@
 # Template file for 'emacs'
 pkgname=emacs
-version=28.2
-revision=2
+version=29.0.92
+revision=1
 create_wrksrc=required
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules
  $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
- $(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick)
+ $(vopt_with webp) $(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick)
  $(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt)
  $(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)
- $(vopt_with nativecomp native-compilation)"
+ $(vopt_with sqlite) $(vopt_with treesitter tree-sitter)
+ $(vopt_with nativecomp native-compilation=aot)"
 hostmakedepends="pkg-config tar"
-makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel
+makedepends="ncurses-devel libXaw-devel libXi-devel gtk+3-devel webkit2gtk-devel
  dbus-devel acl-devel
  $(vopt_if jpeg libjpeg-turbo-devel) $(vopt_if tiff tiff-devel)
- $(vopt_if gif giflib-devel) $(vopt_if png libpng-devel) $(vopt_if xpm libXpm-devel)
+ $(vopt_if gif giflib-devel) $(vopt_if png libpng-devel)
+ $(vopt_if webp libwebp-devel) $(vopt_if xpm libXpm-devel)
  $(vopt_if svg librsvg-devel) $(vopt_if imagemagick libmagick-devel)
  $(vopt_if xml libxml2-devel) $(vopt_if gnutls gnutls-devel)
  $(vopt_if sound alsa-lib-devel) $(vopt_if m17n m17n-lib-devel)
  $(vopt_if json jansson-devel) $(vopt_if harfbuzz harfbuzz-devel)
  $(vopt_if cairo cairo-devel) $(vopt_if gmp gmp-devel)
+ $(vopt_if treesitter tree-sitter-devel) $(vopt_if sqlite sqlite-devel)
  $(vopt_if nativecomp libgccjit-devel)"
 depends="emacs-common-${version}_${revision}"
 short_desc="GNU Emacs editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/emacs/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=ee21182233ef3232dc97b486af2d86e14042dbb65bbc535df562c3a858232488
+distfiles="https://alpha.gnu.org/gnu/emacs/pretest/emacs-29.0.92.tar.xz"
+checksum=a85b3c3d9cc52d7e3ce5ef70da23a5a830715f1b9425702dfdb5bc41d3fc2304
 nocross=yes
 nopie=yes
 
 # Package build options
-build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus json harfbuzz cairo gmp nativecomp"
+build_options="cairo dbus gif gmp gnutls harfbuzz imagemagick jpeg json m17n
+ nativecomp png sound sqlite svg tiff treesitter webp xml xpm"
 desc_option_cairo="Enable support for drawing with Cairo"
 desc_option_gmp="Enable support for big numbers using GMP"
 desc_option_json="Enable support for native JSON parsing"
 desc_option_m17n="Enable support for m17n multilingual text processing"
 desc_option_nativecomp="Enable support for native compilation"
 desc_option_sound="Enable support for sound"
+desc_option_sqlite="Enable support for SQLite3"
+desc_option_treesitter="Enable support for tree-sitter parsers"
+desc_option_webp="Enable support for WebP format"
 desc_option_xpm="Enable support for XPM images"
-build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n
- png sound svg tiff xml xpm"
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc64*) build_options_default+=" nativecomp";;
-	ppc*) ;; # assembler errors
-	*) build_options_default+=" nativecomp";;
-esac
+build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n nativecomp
+ png sound sqlite svg tiff treesitter webp xml xpm"
 
 post_extract() {
 	# Just configuring in different directories results in
@@ -73,8 +74,8 @@ do_configure() {
 
 do_build() {
 	make ${makejobs} -C nox
-	make ${makejobs} -C x11 $(vopt_if nativecomp NATIVE_FULL_AOT=1)
-	make ${makejobs} -C gtk3 $(vopt_if nativecomp NATIVE_FULL_AOT=1)
+	make ${makejobs} -C x11
+	make ${makejobs} -C gtk3
 }
 
 do_install() {

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: emacs: update to 29.1.
  2023-07-21 10:23 [PR PATCH] [PRETEST] emacs: update to 29.0.92 leahneukirchen
@ 2023-07-30 15:13 ` leahneukirchen
  2023-08-02 18:27 ` leahneukirchen
  1 sibling, 0 replies; 3+ messages in thread
From: leahneukirchen @ 2023-07-30 15:13 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

emacs: update to 29.1.
https://github.com/void-linux/void-packages/pull/45168

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (on x86_64)


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: emacs: update to 29.1.
  2023-07-21 10:23 [PR PATCH] [PRETEST] emacs: update to 29.0.92 leahneukirchen
  2023-07-30 15:13 ` [PR PATCH] [Merged]: emacs: update to 29.1 leahneukirchen
@ 2023-08-02 18:27 ` leahneukirchen
  1 sibling, 0 replies; 3+ messages in thread
From: leahneukirchen @ 2023-08-02 18:27 UTC (permalink / raw)
  To: ml

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/45168#issuecomment-1662737179

Comment:
Sorry, mismerged this. -.- Fixed in dd7515b6fb

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-08-02 18:27 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-21 10:23 [PR PATCH] [PRETEST] emacs: update to 29.0.92 leahneukirchen
2023-07-30 15:13 ` [PR PATCH] [Merged]: emacs: update to 29.1 leahneukirchen
2023-08-02 18:27 ` leahneukirchen

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 NNTP newsgroup(s).