summary refs log tree commit diff
path: root/pkgs/applications/editors/emacs-24
diff options
context:
space:
mode:
authorAycan iRiCAN <iricanaycan@gmail.com>2015-04-20 08:30:39 +0300
committerAycan iRiCAN <iricanaycan@gmail.com>2015-04-20 08:30:39 +0300
commit41944ca5a71d6061e0a24722e272b5c4cc1e69d2 (patch)
treee2c40b026adc78dfc26c4bc5b9ac2ddaf9e258f9 /pkgs/applications/editors/emacs-24
parent151456da27a1e25db740f502ff794775d363611f (diff)
downloadnixlib-41944ca5a71d6061e0a24722e272b5c4cc1e69d2.tar
nixlib-41944ca5a71d6061e0a24722e272b5c4cc1e69d2.tar.gz
nixlib-41944ca5a71d6061e0a24722e272b5c4cc1e69d2.tar.bz2
nixlib-41944ca5a71d6061e0a24722e272b5c4cc1e69d2.tar.lz
nixlib-41944ca5a71d6061e0a24722e272b5c4cc1e69d2.tar.xz
nixlib-41944ca5a71d6061e0a24722e272b5c4cc1e69d2.tar.zst
nixlib-41944ca5a71d6061e0a24722e272b5c4cc1e69d2.zip
Removed patch file.
Diffstat (limited to 'pkgs/applications/editors/emacs-24')
-rw-r--r--pkgs/applications/editors/emacs-24/darwin-new-sections.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/pkgs/applications/editors/emacs-24/darwin-new-sections.patch b/pkgs/applications/editors/emacs-24/darwin-new-sections.patch
deleted file mode 100644
index dfd72fe3f511..000000000000
--- a/pkgs/applications/editors/emacs-24/darwin-new-sections.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-http://bazaar.launchpad.net/~naesten/emacs/nextstep-stuff/revision/108961
-
-diff -ru emacs-24.3-orig/src/unexmacosx.c emacs-24.3/src/unexmacosx.c
---- emacs-24.3-orig/src/unexmacosx.c	2013-01-01 21:37:17.000000000 +0100
-+++ emacs-24.3/src/unexmacosx.c	2014-08-09 18:39:52.000000000 +0200
-@@ -838,7 +838,7 @@
- 	  if (!(sectp->addr <= (unsigned long)my_edata
- 		&& my_size <= sectp->size))
- 	    unexec_error ("my_edata is not in section %s", SECT_DATA);
--	  if (!unexec_write (sectp->offset, (void *) sectp->addr, my_size))
-+          if (!unexec_write (sectp->offset, (void *) sectp->addr, sectp->size))
- 	    unexec_error ("cannot write section %s", SECT_DATA);
- 	  if (!unexec_copy (sectp->offset + my_size, old_file_offset + my_size,
- 			    sectp->size - my_size))
-@@ -880,6 +880,27 @@
- 	  if (!unexec_write (header_offset, sectp, sizeof (struct section)))
- 	    unexec_error ("cannot write section %.16s's header", sectp->sectname);
- 	}
-+      else if (strncmp (sectp->sectname, "__bss", 5) == 0
-+	       || strncmp (sectp->sectname, "__pu_bss", 8) == 0)
-+	{
-+	  sectp->flags = S_REGULAR;
-+	  
-+	  /* These sections are produced by GCC 4.6+.
-+
-+	     FIXME: We possibly ought to clear uninitialized local
-+	     variables in statically linked libraries like for
-+	     SECT_BSS (__bss) above, but setting up the markers we
-+	     need in lastfile.c would be rather messy.  See
-+	     darwin_output_aligned_bss () in gcc/config/darwin.c for
-+	     the root of the problem, keeping in mind that the
-+	     sections are numbered by their alignment in GCC 4.6, but
-+	     by log2(alignment) in GCC 4.7.  */
-+
-+	  if (!unexec_write (sectp->offset, (void *) sectp->addr, sectp->size))
-+	    unexec_error ("cannot copy section %.16s", sectp->sectname);
-+	  if (!unexec_write (header_offset, sectp, sizeof (struct section)))
-+	    unexec_error ("cannot write section %.16s's header", sectp->sectname);
-+	}
-       else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0
- 	       || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0
- 	       || strncmp (sectp->sectname, "__got", 16) == 0
-@@ -891,6 +912,7 @@
- 	       || strncmp (sectp->sectname, "__program_vars", 16) == 0
- 	       || strncmp (sectp->sectname, "__mod_init_func", 16) == 0
- 	       || strncmp (sectp->sectname, "__mod_term_func", 16) == 0
-+	       || strncmp (sectp->sectname, "__static_data", 16) == 0
- 	       || strncmp (sectp->sectname, "__objc_", 7) == 0)
- 	{
- 	  if (!unexec_copy (sectp->offset, old_file_offset, sectp->size))