From 9c1104d06c366c42063b1f9c99e06f05ace40a94 Mon Sep 17 00:00:00 2001
From: augiedoggie <augiedoggie@users.noreply.github.com>
Date: Sun, 30 Jul 2023 15:38:35 -0600
Subject: [PATCH] emacs: update to 29.1, add patch to disable `be-resources`
 (#9115)

The `be-resources` command doesn't run properly inside the chroot and isn't
necessary since we use our own rdef to customize the application.

It's also possible to fix `be-resources` on x86_64 by adding
`haiku_datatranslators` to the BUILD_PREREQUIRES but this doesn't fix the 32
bit build.  The translation roster still doesn't work right.
---
 ...macs-29.1~rc1.recipe => emacs-29.1.recipe} | 18 ++++++------
 app-editors/emacs/patches/emacs-29.1.patchset | 28 +++++++++++++++++++
 2 files changed, 36 insertions(+), 10 deletions(-)
 rename app-editors/emacs/{emacs-29.1~rc1.recipe => emacs-29.1.recipe} (88%)
 create mode 100644 app-editors/emacs/patches/emacs-29.1.patchset

diff --git a/app-editors/emacs/emacs-29.1~rc1.recipe b/app-editors/emacs/emacs-29.1.recipe
similarity index 88%
rename from app-editors/emacs/emacs-29.1~rc1.recipe
rename to app-editors/emacs/emacs-29.1.recipe
index 1c531f3ff..6cc802a30 100644
--- a/app-editors/emacs/emacs-29.1~rc1.recipe
+++ b/app-editors/emacs/emacs-29.1.recipe
@@ -14,11 +14,10 @@ HOMEPAGE="https://gnu.org/s/emacs/"
 COPYRIGHT="2001-2023 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="31cef9a4eac01fff5ff4fcb89d7e2b7815e93bad"
-SOURCE_URI="https://github.com/emacs-mirror/emacs/archive/$srcGitRev.tar.gz"
-SOURCE_DIR="emacs-$srcGitRev"
-CHECKSUM_SHA256="f3a062b5cb60871f3c30492fe918ea28ac45b2074de9c146e78564371e98c74b"
+SOURCE_URI="http://ftpmirror.gnu.org/emacs/emacs-$portVersion.tar.gz"
+CHECKSUM_SHA256="5b80e0475b0e619d2ad395ef5bc481b7cb9f13894ed23c301210572040e4b5b1"
 ADDITIONAL_FILES="emacs.rdef.in"
+PATCHES="emacs-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -38,7 +37,7 @@ PROVIDES="
 	cmd:ebrowse$commandSuffix = $portVersion
 	cmd:emacs$commandSuffix = $portVersion
 	cmd:emacsclient$commandSuffix = $portVersion
-	cmd:emacs_${portVersion%\~*}$commandSuffix = $portVersion
+	cmd:emacs_$portVersion$commandSuffix = $portVersion
 	cmd:etags$commandSuffix = $portVersion
 	"
 REQUIRES="
@@ -93,7 +92,7 @@ BUILD_PREREQUIRES="
 defineDebugInfoPackage emacs$secondaryArchSuffix \
 	$appsDir/Emacs \
 	$commandBinDir/ctags.emacs \
-	$commandBinDir/emacs-${portVersion%\~*} \
+	$commandBinDir/emacs-$portVersion \
 	$commandBinDir/emacsclient \
 	$commandBinDir/etags
 
@@ -104,10 +103,10 @@ BUILD()
 	runConfigure --omit-dirs "binDir sbinDir" ./configure \
 		--bindir="$commandBinDir" \
 		--sbindir="$commandBinDir" \
+		--with-file-notification=gfile \
 		--with-be-app
 
-	# FIXME make fails the first time around
-	make $jobArgs || make $jobArgs
+	make $jobArgs
 }
 
 INSTALL()
@@ -129,13 +128,12 @@ INSTALL()
 
 	# add our version and vector icon resources
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
-	local MIDDLE="`echo "${portVersion%\~*}" | cut -d. -f2`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
 
 	sed \
 		-e "s|@MAJOR@|$MAJOR|" \
 		-e "s|@MIDDLE@|$MIDDLE|" \
 		-e "s|@MINOR@|0|" \
-		-e "s|B_APPV_FINAL|B_APPV_DEVELOPMENT|" \
 		$portDir/additional-files/emacs.rdef.in > emacs.rdef
 
 	addResourcesToBinaries emacs.rdef $appsDir/Emacs
diff --git a/app-editors/emacs/patches/emacs-29.1.patchset b/app-editors/emacs/patches/emacs-29.1.patchset
new file mode 100644
index 000000000..5a92ea2f5
--- /dev/null
+++ b/app-editors/emacs/patches/emacs-29.1.patchset
@@ -0,0 +1,28 @@
+From f0a79ed3efc3f2b63a7115b41010b835529c64a5 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sun, 30 Jul 2023 01:14:33 -0600
+Subject: disable `be-resources` when building from HaikuPorts
+
+It isn't necessary since we add our own resources and the chroot doesn't have
+the haiku_datatranslators package active when building which causes
+`be-resources` to exit with an error when it can't translate the emacs.png
+file.
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 9bc53c0..a3e467b 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -632,8 +632,8 @@ endif
+ ifeq ($(HAVE_BE_APP),yes)
+ Emacs: emacs$(EXEEXT) $(libsrc)/be-resources
+ 	$(AM_V_GEN) cp -f emacs$(EXEEXT) $@
+-	$(AM_V_at) $(libsrc)/be-resources \
+-	  $(etc)/images/icons/hicolor/32x32/apps/emacs.png $@
++#	$(AM_V_at) $(libsrc)/be-resources \
++#	  $(etc)/images/icons/hicolor/32x32/apps/emacs.png $@
+ Emacs.pdmp: $(pdmp)
+ 	$(AM_V_GEN) cp -f $(pdmp) $@
+ endif
+-- 
+2.39.2
+